ソースを参照

修复变更和调差bug

laiguoran 2 年 前
コミット
fdccd06aaa
2 ファイル変更3 行追加3 行削除
  1. 1 1
      app/public/js/change_information_set.js
  2. 2 2
      app/view/material/info.ejs

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

@@ -984,7 +984,7 @@ $(document).ready(() => {
                 const quantity = leaf.quantity !== undefined && leaf.quantity !== null ? leaf.quantity : 0;
                 const gcl_id = leaf.gcl_id ? leaf.gcl_id : '';
                 const mx_id = leaf.mx_id ? leaf.mx_id : '';
-                const bwmx = leaf.bwmx !== undefined ? leaf.bwmx : (gcl.leafXmjs.length > 1 && gcl.name ? gcl.name : undefined);
+                const bwmx = leaf.bwmx !== undefined ? leaf.bwmx : undefined;
                 const pushMsg = leaf.code + '!_!' + (leaf.jldy ? leaf.jldy : '') + '!_!' +
                     (leaf.dwgc ? leaf.dwgc : '') + '!_!' + (leaf.fbgc ? leaf.fbgc : '') + '!_!' + (leaf.fxgc ? leaf.fxgc : '')
                     + '!_!' + (leaf.gcl_id ? leaf.gcl_id : '0') + '!_!' + (leaf.mx_id ? leaf.mx_id : '') + '!_!' +

+ 2 - 2
app/view/material/info.ejs

@@ -228,12 +228,12 @@
 <script>
     const materialType = JSON.parse('<%- materialType %>');
     const isStageSelf = parseInt('<%- material.is_stage_self %>');
-    const editTaxPermission = <%- material.editTaxPermission %>;
+    const editTaxPermission = <%- material.editTaxPermission ? material.editTaxPermission : false %>;
     const editForAudit = <%- material.editForAudit %>;
     let materialBillsData = JSON.parse(unescape('<%- escape(JSON.stringify(materialBillsData)) %>'));
     let materialStageData = isStageSelf ? JSON.parse(unescape('<%- escape(JSON.stringify(materialStageData)) %>')) : [];
     let materialStageBillsData = isStageSelf ? JSON.parse(unescape('<%- escape(JSON.stringify(materialStageBillsData)) %>')) : [];
-    const materialListData = JSON.parse('<%- JSON.stringify(materialListData) %>');
+    const materialListData = JSON.parse(unescape('<%- escape(JSON.stringify(materialListData)) %>'));
     const readOnly = <%- material.readOnly %>;
     const materialID = <%- material.id %>;
     const materialTax = <%- material.material_tax %>;