Просмотр исходного кода

设计量明细,计算模板,导入导出

MaiXinRong 1 неделя назад
Родитель
Сommit
0845d53304
3 измененных файлов с 5 добавлено и 3 удалено
  1. 2 1
      app/controller/template_controller.js
  2. 1 0
      app/lib/budget_final.js
  3. 2 2
      app/view/template/pos_calc.ejs

+ 2 - 1
app/controller/template_controller.js

@@ -243,7 +243,8 @@ module.exports = app => {
                 const Cpd = require('../lib/crypt').cpd;
                 const Cpd = require('../lib/crypt').cpd;
                 const cpd = new Cpd();
                 const cpd = new Cpd();
                 const data = await cpd.decrypt(filepath);
                 const data = await cpd.decrypt(filepath);
-                if (!data.col_set || !data.multi_header) throw '模板文件格式错误';
+                // if (!data.col_set || !data.multi_header) throw '模板文件格式错误';
+                if (!data.col_set) throw '模板文件格式错误';
                 if (template.type !== data.type) throw '导入的模板文件与当前模板类型不一致,不可导入';
                 if (template.type !== data.type) throw '导入的模板文件与当前模板类型不一致,不可导入';
 
 
                 const result =await ctx.service.calcTmpl.saveTemplate({ update: { id: template.id, col_set: data.col_set, multi_header: data.multi_header } });
                 const result =await ctx.service.calcTmpl.saveTemplate({ update: { id: template.id, col_set: data.col_set, multi_header: data.multi_header } });

+ 1 - 0
app/lib/budget_final.js

@@ -319,6 +319,7 @@ class BudgetFinal {
     async _loadDeal(deal, stage) {
     async _loadDeal(deal, stage) {
         if (!deal || deal.length === 0) return;
         if (!deal || deal.length === 0) return;
 
 
+        this.final.contract = deal;
         const helper = this.ctx.helper;
         const helper = this.ctx.helper;
         const treeData = await this.ctx.service.contractTree.getAllDataByCondition({ where: { id: deal, spid: this.ctx.subProject.id, contract_type: 1 } });
         const treeData = await this.ctx.service.contractTree.getAllDataByCondition({ where: { id: deal, spid: this.ctx.subProject.id, contract_type: 1 } });
         const contractData = await this.ctx.service.contract.getAllDataByCondition({ where: { id: deal, spid: this.ctx.subProject.id, contract_type: 1 } });
         const contractData = await this.ctx.service.contract.getAllDataByCondition({ where: { id: deal, spid: this.ctx.subProject.id, contract_type: 1 } });

+ 2 - 2
app/view/template/pos_calc.ejs

@@ -23,8 +23,8 @@
                     <div id="detail-ctrl" style="display: none;">
                     <div id="detail-ctrl" style="display: none;">
                         <a href="javascript: void(0);" class="btn btn-sm btn-light text-primary" id="reset"> 重置</a>
                         <a href="javascript: void(0);" class="btn btn-sm btn-light text-primary" id="reset"> 重置</a>
                         <a href="javascript: void(0);" class="btn btn-sm btn-light text-primary" id="save"> 保存</a>
                         <a href="javascript: void(0);" class="btn btn-sm btn-light text-primary" id="save"> 保存</a>
-                        <!--<a href="javascript: void(0);" class="btn btn-sm btn-light text-primary" id="export"> 导出</a>-->
-                        <!--<a href="javascript: void(0);" class="btn btn-sm btn-light text-primary" id="import"> 导入</a>-->
+                        <a href="javascript: void(0);" class="btn btn-sm btn-light text-primary" id="export"> 导出</a>
+                        <a href="javascript: void(0);" class="btn btn-sm btn-light text-primary" id="import"> 导入</a>
                     </div>
                     </div>
                     <div id="detail-user-info" class="ml-auto"></div>
                     <div id="detail-user-info" class="ml-auto"></div>
                 </div>
                 </div>