Browse Source

合同管理测试bug修复

ellisran 10 months ago
parent
commit
fdd7744f13
2 changed files with 4 additions and 4 deletions
  1. 1 1
      app/public/js/contract_detail.js
  2. 3 3
      app/service/contract_tree.js

+ 1 - 1
app/public/js/contract_detail.js

@@ -81,7 +81,7 @@ $(document).ready(function() {
         order: 'order',
         level: 'level',
         rootId: -1,
-        keys: ['id', 'tid', 'spid'],
+        keys: ['id', 'tid', 'spid', 'contract_type'],
         calcFields: ['pay_price', 'total_price', 'sf_price', 'debit_price', 'yf_price'],
         autoExpand: 3,
         markExpandKey: 'contract-bills-expand' + window.location.pathname.split('/')[2] + contractConst.typeMap[contract_type],

+ 3 - 3
app/service/contract_tree.js

@@ -305,7 +305,7 @@ module.exports = app => {
                 const maxOrder = await this.ctx.service.contract.getMaxOrder(options, select[this.setting.kid], transaction);
                 const newDatas = [];
                 const maxId = await this._getMaxLid(options);
-                for (let i = 0; i < count; i++) {
+                for (let i = 1; i < count + 1; i++) {
                     const newData = [];
                     if (this.setting.uuid) newData.id = this.uuid.v4();
                     newData[this.setting.kid] = maxId + i;
@@ -314,7 +314,7 @@ module.exports = app => {
                     newData[this.setting.type] = options[this.setting.type];
                     newData[this.setting.mid] = options.tid || null;
                     newData[this.setting.level] = select[this.setting.level] + 1;
-                    newData[this.setting.order] = maxOrder + i;
+                    newData[this.setting.order] = maxOrder - 1 + i;
                     newData[this.setting.fullPath] = select[this.setting.fullPath] + '-' + newData[this.setting.kid];
                     newData[this.setting.isLeaf] = true;
                     newDatas.push(newData);
@@ -336,7 +336,7 @@ module.exports = app => {
 
             let createData = await this.getLastChildData(options, select[this.setting.kid]);
             let updateData = select;
-            return { create: createData, update: updateData };
+            return { create: [createData], update: [updateData] };
         }
 
         /**