Procházet zdrojové kódy

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

TonyKang před 3 roky
rodič
revize
9cb815f618
1 změnil soubory, kde provedl 2 přidání a 2 odebrání
  1. 2 2
      app/public/js/stage.js

+ 2 - 2
app/public/js/stage.js

@@ -1573,7 +1573,7 @@ $(document).ready(() => {
                 name: '生成收方单',
                 disabled: function (key, opt) {
                     const node = SpreadJsObj.getSelectObject(slSpread.getActiveSheet());
-                    if (!node || !node.b_code) return true;
+                    if (!node || !node.b_code || !node.is_leaf) return true;
                 },
                 callback: function (key, opt) {
                     const node = SpreadJsObj.getSelectObject(slSpread.getActiveSheet());
@@ -4465,7 +4465,7 @@ function makeReportData(sfid) {
     replace_key_params['KEY_子目号及子目名称'] = ledger_code + ' ' + lData.name;
     replace_key_params['KEY_桩号及工程部位'] = pos_name;
     const req_params = {
-        rpt_tpl_id: 1784,
+        rpt_tpl_id: window.location.host === '127.0.0.1:7002' || window.location.host === 'jlqa.smartcost.com.cn:7002' ? 1784 : 2138, // 1784(qa的,外网是2138)
         pageSize: 'A4',
         project_id: tender.project_id,
         tender_id: tender.id,