fix: 设计细目分表上下移

modules/bills_lib/models/bills_lib_interfaces.js

@@ -1147,6 +1147,56 @@ billsLibDao.prototype.updateSerialNo = function (data, callback) {
             }
         });
     }
+    else if (field === 'designs') {
+        async.parallel([
+            function (cb) {
+                async.each(updateArr, function (updateObj, ecb) {
+                    Bills.update({ billsLibId: billsLibId, ID: billsId, deleted: false, 'designs.id': updateObj.id }, { $set: { 'designs.$.serialNo': updateObj.serialNo } }, function (err) {
+                        if (err) {
+                            ecb(err);
+                        }
+                        else {
+                            ecb(null);
+                        }
+                    });
+                }, function (err) {
+                    if (err) {
+                        cb(err);
+                    }
+                    else {
+                        cb(null);
+                    }
+                });
+            },
+            function (cb) {
+                StdBillsLib.find({ billsLibId: billsLibId }, function (err, result) {
+                    if (err) {
+                        cb(err);
+                    }
+                    else {
+                        if (result.length > 0) {
+                            let newRecentOpr = getNewOprArr(result[0].recentOpr, lastOperator, lastOperateDate);
+                            StdBillsLib.update({ billsLibId: billsLibId }, { $set: { recentOpr: newRecentOpr } }, function (err) {
+                                if (err) {
+                                    cb(err);
+                                }
+                                else {
+                                    cb(null);
+                                }
+                            });
+                        }
+                    }
+                });
+            }
+        ], function (err) {
+            if (err) {
+                callback(1, 'Error');
+            }
+            else {
+                callback(0, '');
+            }
+        });
+    }
     else {
         async.parallel([
             function (cb) {

web/maintain/bills_lib/html/qingdan.html

@@ -472,6 +472,9 @@
                 else if(controller.tree.selected.field === 'item'){
                     itemsController.upMove(controller, itemsSpread.getActiveSheet());
                 }
+                else if(controller.tree.selected.field === 'design'){
+                    designsController.upMove(controller, designsSpread.getActiveSheet());
+                }
             }
         });
         btnDownMove.click(function(){
@@ -485,6 +488,9 @@
                 else if(controller.tree.selected.field === 'item'){
                     itemsController.downMove(controller, itemsSpread.getActiveSheet());
                 }
+                else if(controller.tree.selected.field === 'design'){
+                    designsController.downMove(controller, designsSpread.getActiveSheet());
+                }
             }
         });
     }
@@ -651,9 +657,9 @@
                 btnDownMove.attr('fcsOnBills', 'false');
                 let selected;
                 if(controller.tree.selected){
-                    selected = controller.tree.selected.jobs[args.row];
+                    selected = controller.tree.selected.designs[args.row];
                 }
-                if(tools.canUpMove(selected, controller.tree.selected.jobs)){
+                if(tools.canUpMove(selected, controller.tree.selected.designs)){
                     tools.btnAction(btnUpMove);
                     btnUpMove.attr('canMove', 'true');
                 }
@@ -661,7 +667,7 @@
                     tools.btnClose(btnUpMove);
                     btnUpMove.attr('canMove', 'false');
                 }
-                if(tools.canDownMove(selected, controller.tree.selected.jobs)){
+                if(tools.canDownMove(selected, controller.tree.selected.designs)){
                     tools.btnAction(btnDownMove);
                     btnDownMove.attr('canMove', 'true');
                 }

web/maintain/bills_lib/scripts/db_controller.js

@@ -2677,7 +2677,7 @@ var designsController = {
         updateSelArr.push({ id: controller.tree.selected.designs[controller.tree.selected.args.row].design.data.id, serialNo: controller.tree.selected.designs[controller.tree.selected.args.row].serialNo });
         updateSelArr.push({ id: controller.tree.selected.designs[controller.tree.selected.args.row + 1].design.data.id, serialNo: controller.tree.selected.designs[controller.tree.selected.args.row + 1].serialNo });
         billsAjax.updateSerialNo(billsLibId, controller.tree.selected.getID(), updateSelArr, 'designs', function () {
-            tools.orderReshowData(sheet, controller.tree.selected.designs, jobsSetting, 'design', true);
+            tools.orderReshowData(sheet, controller.tree.selected.designs, designsSetting, 'design', true);
             sheet.setActiveCell(controller.tree.selected.args.row + 1, controller.tree.selected.args.col);
             controller.tree.selected.args.row = controller.tree.selected.args.row + 1;
             $('#downMove').attr('doing', 'false');