|
@@ -149,9 +149,16 @@ var billsLibObj = {
|
|
|
//特征及内容转化
|
|
|
pageCCOprObj.setItemContentNode(stdBillsTree.items[args.row], getBillsJobs(stdBillsTree.items[args.row]), getBillsFeatures(stdBillsTree.items[args.row]));
|
|
|
if (/\//.test(selectNode.data.unit)) {
|
|
|
- ConfirmModal.stdBillsUnit.check(selectNode.data, function (std) {
|
|
|
+ let existB = projectObj.project.Bills.sameStdCodeBillsData(selectNode.data.code);
|
|
|
+ if (existB) {
|
|
|
+ let std = JSON.parse(JSON.stringify(selectNode.data));
|
|
|
+ std.unit = existB.unit;
|
|
|
ProjectController.addBills(projectObj.project, projectObj.mainController, std);
|
|
|
- });
|
|
|
+ } else {
|
|
|
+ ConfirmModal.stdBillsUnit.check(selectNode.data, function (std) {
|
|
|
+ ProjectController.addBills(projectObj.project, projectObj.mainController, std);
|
|
|
+ });
|
|
|
+ }
|
|
|
} else {
|
|
|
ProjectController.addBills(projectObj.project, projectObj.mainController, selectNode.data);
|
|
|
}
|