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

app/public/js/material_checklist.js

@@ -419,7 +419,7 @@ $(document).ready(() => {
         const sheet = ledgerSpread.getActiveSheet();
         const select = SpreadJsObj.getSelectObject(sheet);
         const gclIndex = _.findIndex(gclGatherData, { b_code: select.b_code, name: select.name, unit: select.unit, unit_price: select.unit_price });
-        const gcl = gclGatherData[gclIndex].leafXmjs.filter(item => item.gather_qty !== null && item.gather_qty !== undefined);
+        const gcl = gclGatherData[gclIndex].leafXmjs;
         const ms_id = isStageSelf ? materialStageData[0].id : null;
         const index = materialChecklistData.indexOf(select);
         const datas = [];
@@ -481,7 +481,7 @@ $(document).ready(() => {
                 const select = SpreadJsObj.getSelectObject(sheet);
                 const index = materialChecklistData.indexOf(select);
                 const gclIndex = _.findIndex(gclGatherData, { b_code: select.b_code, name: select.name, unit: select.unit, unit_price: select.unit_price });
-                const gcl = gclGatherData[gclIndex].leafXmjs.filter(item => item.gather_qty !== null && item.gather_qty !== undefined);
+                const gcl = gclGatherData[gclIndex].leafXmjs;
                 const datas = [];
                 const ms_id = isStageSelf ? materialStageData[0].id : null;
                 for (const xmj of gcl) {
@@ -591,7 +591,7 @@ $(document).ready(() => {
                     const ledgerSheet = ledgerSpread.getActiveSheet();
                     const ledgerSelect = SpreadJsObj.getSelectObject(ledgerSheet);
                     const gclIndex = _.findIndex(gclGatherData, { b_code: ledgerSelect.b_code, name: ledgerSelect.name, unit: ledgerSelect.unit, unit_price: ledgerSelect.unit_price });
-                    const gcl = gclGatherData[gclIndex].leafXmjs.filter(item => item.gather_qty !== null && item.gather_qty !== undefined);
+                    const gcl = gclGatherData[gclIndex].leafXmjs;
                     const datas = [];
                     const ms_id = isStageSelf ? materialStageData[0].id : null;
                     for (const xmj of gcl) {
@@ -713,7 +713,7 @@ $(document).ready(() => {
                 const ledgerSheet = ledgerSpread.getActiveSheet();
                 const ledgerSelect = SpreadJsObj.getSelectObject(ledgerSheet);
                 const gclIndex = _.findIndex(gclGatherData, { b_code: ledgerSelect.b_code, name: ledgerSelect.name, unit: ledgerSelect.unit, unit_price: ledgerSelect.unit_price });
-                const gcl = gclGatherData[gclIndex].leafXmjs.filter(item => item.gather_qty !== null && item.gather_qty !== undefined);
+                const gcl = gclGatherData[gclIndex].leafXmjs;
                 const datas = [];
                 const ms_id = isStageSelf ? materialStageData[0].id : null;
                 for (const xmj of gcl) {
@@ -1311,7 +1311,7 @@ $(document).ready(() => {
                 }
 
                 const gclIndex = _.findIndex(gclGatherData, { b_code: t.b_code, name: t.name, unit: t.unit, unit_price: t.unit_price ? parseFloat(t.unit_price) : null });
-                const gcl = gclGatherData[gclIndex].leafXmjs.filter(item => item.gather_qty !== null && item.gather_qty !== undefined);
+                const gcl = gclGatherData[gclIndex].leafXmjs;
                 const ms_id = isStageSelf ? materialStageData[0].id : null;
                 // const index = materialChecklistData.indexOf(select);
                 const datas = [];

app/router.js

@@ -708,7 +708,10 @@ module.exports = app => {
     app.post('/budget/:id/decimal', sessionAuth, budgetCheck, 'budgetController.decimal');
 
     // 支付审批
-    // app.get('/payment/:rid/detail/:id', sessionAuth, 'paymentController.detail');
+    // app.get('/payment', sessionAuth, 'paymentController.index');
+    // app.post('/payment/permission/save', sessionAuth, 'paymentController.permissionSave');
+    app.get('/payment/:rid/detail/:id', sessionAuth, 'paymentController.detail');
+    // app.post('/payment/save', sessionAuth, 'paymentController.save');
 
     // 企业微信回调
     app.get('/wx/work/callback/command', 'wechatController.command');