|
@@ -407,10 +407,10 @@ var Ration = {
|
|
|
let selectedLib = (cleanzmhs == true && recodes.length > 0)? recodes[0].node.data.libID : sessionStorage.getItem("stdRationLib");
|
|
|
selectedLib&&selectedLib!='undefined'?libIDs.unshift(selectedLib):libIDs.unshift(defaultLibID);
|
|
|
for(let r of recodes){
|
|
|
- let needInstall = false;
|
|
|
- if(projectObj.project.isInstall()) {//如果是安装工程,要看需不需要生成安装增加费
|
|
|
+ let needInstall = projectObj.project.isInstall();
|
|
|
+ /* if(projectObj.project.isInstall()) {//如果是安装工程,要看需不需要生成安装增加费
|
|
|
needInstall = project.Bills.isFBFX(r.node);
|
|
|
- }
|
|
|
+ } */
|
|
|
r.value===null||r.value===undefined?"":r.value = r.value.replace(/[\s\r\n]/g, "");//去掉空格回车换行等字符
|
|
|
if(cleanzmhs == true||r.value != r.node.data.code){
|
|
|
nodeInfo.push({ID:r.node.data.ID,billsItemID:r.node.data.billsItemID,newCode:r.value,needInstall:needInstall});
|
|
@@ -479,10 +479,11 @@ var Ration = {
|
|
|
};
|
|
|
if(billItemID){
|
|
|
let calQuantity = optionsOprObj.getOption(optionsOprObj.optionsTypes.GENERALOPTS, 'rationQuanACToBillsQuan');
|
|
|
- if(projectObj.project.isInstall()) {//如果是安装工程,要看需不需要生成安装增加费
|
|
|
+ needInstall = projectObj.project.isInstall();
|
|
|
+ /* if(projectObj.project.isInstall()) {//如果是安装工程,要看需不需要生成安装增加费
|
|
|
let billsNode = project.mainTree.getNodeByID(billItemID);
|
|
|
needInstall = project.Bills.isFBFX(billsNode);//在分部分项插入的定额才需要定额安装增加费
|
|
|
- }
|
|
|
+ } */
|
|
|
for(let i = 0; i < items.length; i++){
|
|
|
let newData = me.getTempRationData(me.getNewRationID(), billItemID, serialNo, items[i].rationType);
|
|
|
serialNo++;
|
|
@@ -612,10 +613,11 @@ var Ration = {
|
|
|
brUpdate.push({projectID:newData.projectID,ID:br[i].ID,serialNo:br[i].serialNo});
|
|
|
}
|
|
|
}
|
|
|
- if(projectObj.project.isInstall()) {//如果是安装工程,要看需不需要生成安装增加费
|
|
|
+ needInstall = projectObj.project.isInstall();
|
|
|
+ /* if(projectObj.project.isInstall()) {//如果是安装工程,要看需不需要生成安装增加费
|
|
|
let billsNode = project.mainTree.getNodeByID(billItemID);
|
|
|
needInstall = project.Bills.isFBFX(billsNode);//在分部分项插入的定额才需要定额安装增加费
|
|
|
- }
|
|
|
+ } */
|
|
|
if(ext) gljUtil.setProperty(newData,ext);
|
|
|
$.bootstrapLoading.start();
|
|
|
CommonAjax.post("/ration/addNewRation",{projectID:me.project.ID(),itemQuery:itemQuery,newData:newData,defaultLibID: rationLibObj.getDefaultStdRationLibID(),calQuantity:calQuantity,brUpdate:brUpdate,needInstall:needInstall},function (data) {
|
|
@@ -701,14 +703,15 @@ var Ration = {
|
|
|
brUpdate.push({projectID:newData.projectID,ID:br[i].ID,serialNo:br[i].serialNo});
|
|
|
}
|
|
|
}
|
|
|
- if(projectObj.project.isInstall()) {//如果是安装工程,要看需不需要生成安装增加费
|
|
|
+ needInstall = projectObj.project.isInstall();
|
|
|
+ /* if(projectObj.project.isInstall()) {//如果是安装工程,要看需不需要生成安装增加费
|
|
|
let billsNode = project.mainTree.getNodeByID(billItemID);
|
|
|
- }
|
|
|
+ } */
|
|
|
$.bootstrapLoading.start();
|
|
|
newNode = project.mainTree.insert(billItemID, nextID, newID);
|
|
|
newNode.sourceType = project.Ration.getSourceType();
|
|
|
newNode.data = newData;
|
|
|
- CommonAjax.post("/ration/addNewRation",{itemQuery:null,newData:newData,defaultLibID: rationLibObj.getDefaultStdRationLibID(),calQuantity:false,brUpdate:brUpdate,needInstall:false},function (data) {
|
|
|
+ CommonAjax.post("/ration/addNewRation",{itemQuery:null,newData:newData,defaultLibID: rationLibObj.getDefaultStdRationLibID(),calQuantity:false,brUpdate:brUpdate,needInstall:needInstall},function (data) {
|
|
|
//更新缓存
|
|
|
me.datas.push(data.ration);
|
|
|
me.addSubListOfRation(data);
|