|
|
@@ -570,7 +570,13 @@ let BlockController = {
|
|
|
}
|
|
|
|
|
|
function createRationData(rationData) {
|
|
|
- let tem_ration = _.cloneDeep(rationData);
|
|
|
+ let tem_ration = {};
|
|
|
+ for(let key in rationData){
|
|
|
+ if(key.indexOf('function(') !== -1){//有时候会出现field里包含一串 function(e){if(e.length>0)... 这些东西,本地测试又不出现,这里先忽略掉
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ tem_ration[key] = rationData[key];
|
|
|
+ }
|
|
|
//删除旧数据
|
|
|
delete tem_ration._id;
|
|
|
delete tem_ration.fees;
|
|
|
@@ -599,8 +605,13 @@ let BlockController = {
|
|
|
}
|
|
|
|
|
|
function createBillsData(billsData) { //ID、重新生成code
|
|
|
- let temData = _.cloneDeep(billsData);
|
|
|
- console.log(temData.children);
|
|
|
+ let temData = {};
|
|
|
+ for(let key in billsData){
|
|
|
+ if(key.indexOf('function(') !== -1){//有时候会出现field里包含一串 function(e){if(e.length>0)... 这些东西,本地测试又不出现,这里先忽略掉
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ temData[key] = billsData[key];
|
|
|
+ }
|
|
|
//删除旧数据
|
|
|
if(temData.children && temData.children.length>0){//如果是有子项,说明是计算得到的,要删除重新计算,没有子项,但是fees有值,说明是自已输入的,值要一起粘贴
|
|
|
delete temData.fees;
|
|
|
@@ -614,6 +625,9 @@ let BlockController = {
|
|
|
delete temData.quantityCoe;
|
|
|
delete temData.rationQuantityCoe;
|
|
|
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
temData.projectID = projectObj.project.ID();
|
|
|
let newID = uuid.v1(); //新的清单ID
|
|
|
billsIDMap[temData.ID] = newID;
|