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

app/public/js/change_information_show.js

@@ -20,7 +20,7 @@ $(document).ready(() => {
             {title: '|金额', colSpan: '|1', rowSpan: '|1', field: 'oa_tp', hAlign: 2, width: 80, type: 'Number', getValue: 'getValue.oa_tp'},
             {title: '申请变更增(+)减(-)|数量', colSpan: '2|1', rowSpan: '1|1', field: 'camount', hAlign: 2, width: 60, type: 'Number', getValue: 'getValue.camount'},
             {title: '|金额', colSpan: '|1', rowSpan: '|1', field: 'ca_tp', hAlign: 2, width: 80, type: 'Number', getValue: 'getValue.ca_tp'},
-            {title: '审批后变更|数量', colSpan: '2|1', rowSpan: '1|1', field: 'samount', hAlign: 2, width: 60, type: 'Number', getValue: 'getValue.samount'},
+            {title: '批复变更|数量', colSpan: '2|1', rowSpan: '1|1', field: 'samount', hAlign: 2, width: 60, type: 'Number', getValue: 'getValue.samount'},
             {title: '|金额', colSpan: '|1', rowSpan: '|1', field: 'sa_tp', hAlign: 2, width: 80, type: 'Number', getValue: 'getValue.sa_tp'},
         ],
         emptyRows: 0,

app/public/js/change_plan_information.js

@@ -189,7 +189,7 @@ $(document).ready(() => {
             {title: '|金额', colSpan: '|1', rowSpan: '|1', field: 'oa_tp', hAlign: 2, width: 80, type: 'Number', readOnly: true, getValue: 'getValue.oa_tp'},
             {title: '申请变更增(+)减(-)|数量', colSpan: '2|1', rowSpan: '1|1', field: 'camount', hAlign: 2, width: 60, type: 'Number', readOnly: 'readOnly.isEdit', getValue: 'getValue.camount'},
             {title: '|金额', colSpan: '|1', rowSpan: '|1', field: 'ca_tp', hAlign: 2, width: 80, type: 'Number', readOnly: true, getValue: 'getValue.ca_tp'},
-            {title: '审批后变更|数量', colSpan: '2|1', rowSpan: '1|1', field: 'samount', hAlign: 2, width: 60, type: 'Number', getValue: 'getValue.samount'},
+            {title: '批复变更|数量', colSpan: '2|1', rowSpan: '1|1', field: 'samount', hAlign: 2, width: 60, type: 'Number', getValue: 'getValue.samount'},
             {title: '|金额', colSpan: '|1', rowSpan: '|1', field: 'sa_tp', hAlign: 2, width: 80, type: 'Number', readOnly: true, getValue: 'getValue.sa_tp'},
         ],
         emptyRows: !readOnly ? 3 : 0,

app/public/js/material_list.js

@@ -740,7 +740,7 @@ $(document).ready(() => {
             const sheet = ledgerSpread.getActiveSheet();
             const select = SpreadJsObj.getSelectObject(sheet);
             const index = gclGatherData.indexOf(select);
-            const gcl = gclGatherData[index].leafXmjs.filter(item => item.gather_qty !== null && item.gather_qty !== undefined);
+            const gcl = gclGatherData[index].leafXmjs;
             const ms_id = isStageSelf ? parseInt($('#myTab').find('.active').data('msid')) : null;
             const datas = [];
             for (const xmj of gcl) {
@@ -1064,7 +1064,7 @@ $(document).ready(() => {
                 const index = gclGatherData.indexOf(select);
                 // const leafXmjSheet = leafXmjSpread.getActiveSheet();
                 // const leafXmjSelect = SpreadJsObj.getSelectObject(leafXmjSheet);
-                const gcl = gclGatherData[index].leafXmjs.filter(item => item.gather_qty !== null && item.gather_qty !== undefined);
+                const gcl = gclGatherData[index].leafXmjs;
                 // const leafXmjIndex = gcl.indexOf(leafXmjSelect);
                 const datas = [];
                 for (const xmj of gcl) {
@@ -1187,7 +1187,7 @@ $(document).ready(() => {
                     const ledgerSheet = ledgerSpread.getActiveSheet();
                     const ledgerSelect = SpreadJsObj.getSelectObject(ledgerSheet);
                     const index = gclGatherData.indexOf(ledgerSelect);
-                    const gcl = gclGatherData[index].leafXmjs.filter(item => item.gather_qty !== null && item.gather_qty !== undefined);
+                    const gcl = gclGatherData[index].leafXmjs;
                     // const xmjSheet = leafXmjSpread.getActiveSheet();
                     // const xmjSelect = SpreadJsObj.getSelectObject(xmjSheet);
                     // const xmjIndex = gcl.indexOf(xmjSelect);
@@ -1339,7 +1339,7 @@ $(document).ready(() => {
                 const ledgerSheet = ledgerSpread.getActiveSheet();
                 const ledgerSelect = SpreadJsObj.getSelectObject(ledgerSheet);
                 const index = gclGatherData.indexOf(ledgerSelect);
-                const gcl = gclGatherData[index].leafXmjs.filter(item => item.gather_qty !== null && item.gather_qty !== undefined);
+                const gcl = gclGatherData[index].leafXmjs;
                 // const xmjSheet = leafXmjSpread.getActiveSheet();
                 // const xmjSelect = SpreadJsObj.getSelectObject(xmjSheet);
                 // const xmjIndex = gcl.indexOf(xmjSelect);

app/view/login/login.ejs

@@ -25,14 +25,14 @@
         <div class="logo-sm-title mt-1">计量支付&nbsp;&nbsp;&nbsp;结算决算</div>
     </div>
     <div class="side-border ml-4 mr-4"></div>
-    <div class="top-subtitle">施工舒心 / 监理省心 / 业主安心</div>
+    <div class="top-subtitle">管好项目每一分钱</div>
 </div>
 <div class="container">
     <div class="d-flex justify-content-center align-items-center content-center">
         <div class="left-login text-white pt-5 px-5">
             <h2>Hi，您好！</h2>
             <div class="login-border my-4"></div>
-            <div class="left-login-title" id="project_name"><% if (projectData) { %><%- projectData.name %><% } else { %>纵横捭阖  数“智”管家<% } %></div>
+            <div class="left-login-title" id="project_name"><% if (projectData) { %><%- projectData.name %><% } else { %>管好项目每一分钱<% } %></div>
         </div>
         <% if (maintainData.status === maintainConst.status.ongoing) { %>
         <form class="right-login position-relative text-center">

app/view/login/login_management.ejs

@@ -25,14 +25,14 @@
         <div class="logo-sm-title mt-1">计量支付&nbsp;&nbsp;&nbsp;结算决算</div>
     </div>
     <div class="side-border ml-4 mr-4"></div>
-    <div class="top-subtitle">施工舒心 / 监理省心 / 业主安心</div>
+    <div class="top-subtitle">管好项目每一分钱</div>
 </div>
 <div class="container">
     <div class="d-flex justify-content-center align-items-center content-center">
         <div class="left-login text-white pt-5 px-5">
             <h2>Hi，您好！</h2>
             <div class="login-border my-4"></div>
-            <div class="left-login-title" id="project_name"><%- projectData ? projectData.name : '纵横捭阖  数“智”管家' %></div>
+            <div class="left-login-title" id="project_name"><%- projectData ? projectData.name : '管好项目每一分钱' %></div>
         </div>
         <% if (maintainData.status === maintainConst.status.ongoing) { %>
             <form class="right-login position-relative text-center">

app/view/login/login_port.ejs

@@ -25,14 +25,14 @@
         <div class="logo-sm-title mt-1">计量支付&nbsp;&nbsp;&nbsp;结算决算</div>
     </div>
     <div class="side-border ml-4 mr-4"></div>
-    <div class="top-subtitle">施工舒心 / 监理省心 / 业主安心</div>
+    <div class="top-subtitle">管好项目每一分钱</div>
 </div>
 <div class="container">
     <div class="d-flex justify-content-center align-items-center content-center">
         <div class="left-login text-white pt-5 px-5">
             <h2>Hi，您好！</h2>
             <div class="login-border my-4"></div>
-            <div class="left-login-title" id="project_name"><%- projectData ? projectData.name : '纵横捭阖  数“智”管家' %></div>
+            <div class="left-login-title" id="project_name"><%- projectData ? projectData.name : '管好项目每一分钱' %></div>
         </div>
         <% if (maintainData.status === maintainConst.status.ongoing) { %>
             <form class="right-login position-relative text-center">