Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/public/js/contract_detail.js

@@ -1267,6 +1267,7 @@ $(document).ready(function() {
             }
             if (node.children.length === data.length) {
                 node.is_leaf = 1;
+                node.total_price = null;
                 data.push({
                     id: node.id,
                     is_leaf: 1,
@@ -1297,8 +1298,10 @@ $(document).ready(function() {
                 toastr.success('合同已移动成功');
                 const refreshNode = contractTree.loadPostData(result);
                 contractTreeSpreadObj.refreshTree(contractSheet, refreshNode);
-                const newNode = SpreadJsObj.getSelectObject(contractSheet);
-                contractTreeSpreadObj.changeContractTab(newNode, true);
+                contractTreeSpreadObj.setContract(contractSheet);
+                contractTreeSpreadObj.refreshOperationValid(contractSheet);
+                // const newNode = SpreadJsObj.getSelectObject(contractSheet);
+                // contractTreeSpreadObj.changeContractTab(newNode, true);
                 $('#cons-move2').modal('hide');
             });
         });

app/service/contract_sp_audit.js

@@ -444,8 +444,8 @@ module.exports = app => {
             // });
             // const [sql, sqlParam] = this.sqlBuilder.build(this.tableName, 'update');
             // const data = await transaction.query(sql, sqlParam);
-            const sql = 'UPDATE ?? SET `order` = `order` ' + selfOperate + ' ?, audit_order = audit_order ' + selfOperate + ' ? WHERE `cid` = ? AND `cpid` ' + (cpid ? '= ' + cpid : 'is null') + ' AND `order` >= ? AND `times` = ?';
-            const sqlParam = [this.tableName, 1, 1, cid, cpid, order, times];
+            const sql = 'UPDATE ?? SET `order` = `order` ' + selfOperate + ' ?, `audit_order` = `audit_order` ' + selfOperate + ' ? WHERE `cid` = ? AND `cpid` ' + (cpid ? '= ' + cpid : 'is null') + ' AND `order` >= ? AND `times` = ?';
+            const sqlParam = [this.tableName, 1, 1, cid, order, times];
             const data = await transaction.query(sql, sqlParam);
             return data;
         }