Sfoglia il codice sorgente

fix: 定额上下移造成取费类别改变

vian 5 anni fa
parent
commit
c82f90e025

+ 2 - 17
web/building_saas/main/js/models/ration.js

@@ -303,28 +303,13 @@ var Ration = {
                 }
             }
         }
-
-        ration.prototype.getChangePosUpdateData = function (ration1, ration2) {
-            var updateData = [];
-            updateData.push({updateType: 'ut_update', updateData: this.getTempRationData(ration1.ID, ration1.billsItemID, ration2.serialNo)});
-            updateData.push({updateType: 'ut_update', updateData: this.getTempRationData(ration2.ID, ration2.billsItemID, ration1.serialNo)});
-            return updateData;
-        };
-        ration.prototype.changePos = function (ration1, ration2) {
-            var updateData = this.getChangePosUpdateData(ration1, ration2);
-            this.project.pushNow('insertRation', [this.getSourceType()], [updateData]);
-
-            var preSerialNo = ration1.serialNo;
-            ration1.serialNo = ration2.serialNo;
-            ration2.serialNo = preSerialNo;
-        };
         ration.prototype.changeMultiPos = function (baseRation, rations) {
             const updateData = [];
             let tempSerialNo = baseRation.serialNo;
             rations.forEach(ration => {
                 updateData.push({
                     updateType: 'ut_update',
-                    updateData: this.getTempRationData(ration.ID, ration.billsItemID, tempSerialNo)
+                    updateData: { ID: ration.ID, serialNo: tempSerialNo, projectID: this.project.ID()}
                 });
                 let orgSerialNo = ration.serialNo;
                 ration.serialNo = tempSerialNo;
@@ -332,7 +317,7 @@ var Ration = {
             });
             updateData.push({
                 updateType: 'ut_update',
-                updateData: this.getTempRationData(baseRation.ID, baseRation.billsItemID, tempSerialNo)
+                updateData: { ID: baseRation.ID, serialNo: tempSerialNo, projectID: this.project.ID()}
             });
             baseRation.serialNo = tempSerialNo;
             this.project.pushNow('insertRation', [this.getSourceType()], [updateData]);

+ 0 - 1
web/building_saas/main/js/views/project_view.js

@@ -2234,7 +2234,6 @@ const throttleUpMove = _.throttle(() => {
         project.Bills.multiUpMoveBills(project.Bills.tree, sourceNodes);
         controller.multiUpMove(mainTreeNodes);
     } else if (firstNode.sourceType === commonConstants.SourceType.RATION) {
-        //project.Ration.changePos(selected.source, selected.preSibling.source);
         project.Ration.changeMultiPos(mainTreeNodes[0].preSibling.source, sourceNodes);
         controller.multiUpMove(mainTreeNodes);
     };