Selaa lähdekoodia

修复资金测试bug

ellisran 9 kuukautta sitten
vanhempi
commit
b9a012d2cf
3 muutettua tiedostoa jossa 16 lisäystä ja 2 poistoa
  1. 1 1
      app/controller/financial_controller.js
  2. 14 1
      app/public/js/financial_pay_detail.js
  3. 1 0
      config/web.js

+ 1 - 1
app/controller/financial_controller.js

@@ -875,7 +875,7 @@ module.exports = app => {
                         break;
                     case 'contract_list':
                         responseData.data.contracts = await ctx.service.contract.getAllDataByCondition({ where: { tid: ctx.financialPay.tid, contract_type: 1 } });
-                        responseData.data.contractTrees = await ctx.service.contractTree.getAllDataByCondition({ where: { tid: ctx.financialPay.tid, contract_type: 1, level: 2 } });
+                        responseData.data.contractTrees = await ctx.service.contractTree.getAllDataByCondition({ where: { tid: ctx.financialPay.tid, contract_type: 1 } });
                         break;
                     case 'contract_white_add':
                         responseData.data = await ctx.service.financialPayContract.addWhiteContract(ctx.financialPay);

+ 14 - 1
app/public/js/financial_pay_detail.js

@@ -436,6 +436,15 @@ $(function () {
         });
         let contracts = [];
         let contractTrees = [];
+        const sqTreeSetting = {
+            id: 'contract_id',
+            pid: 'contract_pid',
+            order: 'order',
+            level: 'level',
+            rootId: -1,
+            keys: ['id', 'tid', 'spid'],
+        };
+        const sqTree = createNewPathTree('base', sqTreeSetting);
         $('#add-deal').on('show.bs.modal', function () {
             $('#contract-tree').val('0');
             $('#contract-keyword').val('');
@@ -443,9 +452,13 @@ $(function () {
             postData(preUrl + '/save', { type: 'contract_list' }, function (result) {
                 contracts = result.contracts;
                 contractTrees = result.contractTrees;
+                sqTree.loadDatas(contractTrees);
+                const level2Tree = _.filter(sqTree.nodes, function (item) {
+                    return item.level === 2;
+                });
                 makeContractListHtml(contracts);
                 let html2 = '<option value="0">全部</option>';
-                for (const t of contractTrees) {
+                for (const t of level2Tree) {
                     html2 += `<option value="${t.contract_id}">${t.name}</option>`;
                 }
                 $('#contract-tree').html(html2);

+ 1 - 0
config/web.js

@@ -1704,6 +1704,7 @@ const JsFiles = {
                     '/public/js/spreadjs_rela/spreadjs_zh.js',
                     '/public/js/shares/sjs_setting.js',
                     '/public/js/shares/cs_tools.js',
+                    '/public/js/path_tree.js',
                     '/public/js/financial_pay_detail.js',
                 ],
                 mergeFile: 'financial_pay_detail',