|
@@ -296,7 +296,7 @@ var projectObj = {
|
|
|
let searchStdBillsAndUpdate = function (stdCode, formatCode) {
|
|
|
let orgCode = node.data.code?node.data.code.substr(0, 9):"";
|
|
|
if (projectObj.project.projectInfo.engineeringInfo.bill_lib.length === 0 || updateCodeCheck(value,stdCode === orgCode)) {
|
|
|
- normalUpdate(node,value,stdCode === orgCode);
|
|
|
+ normalUpdate(node,formatCode,stdCode === orgCode);
|
|
|
} else if (projectObj.project.projectInfo.engineeringInfo.bill_lib.length > 0) {
|
|
|
let libId = projectObj.project.projectInfo.engineeringInfo.bill_lib[0].id;
|
|
|
CommonAjax.post('/stdBillsEditor/getStdBillsByCode', {userId: userID, billsLibId: libId, code: stdCode}, function (data) {
|
|
@@ -363,7 +363,7 @@ var projectObj = {
|
|
|
return;
|
|
|
} else {
|
|
|
hintBox.infoBox("系统提示","已存在该编码的清单,将自动修改编码后3位,是否继续?",2,function () {
|
|
|
- let newFormatCode = project.Bills.newFormatCode(stdMatchCode);
|
|
|
+ let newFormatCode = project.Bills.newFormatCode(stdMatchCode,node.data.code);// 传入node.data.code表示排除本身源始值 (ps:存在:001,002 把 002改成001, 这时候应该自动编成002)
|
|
|
searchStdBillsAndUpdate(stdMatchCode, newFormatCode);
|
|
|
},function () {
|
|
|
me.mainController.refreshTreeNode([node], false);
|