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

app/public/js/shares/cs_gcl_gather.js

@@ -17,10 +17,10 @@
                 cols: [
                     {title: '清单编号', field: 'b_code', width: 80, formatter: '@'},
                     {title: '名称', field: 'name', width: 150, formatter: '@'},
-                    {title: '单位', field: 'unit', width: 50, formatter: '@'},
-                    {title: '单价', field: 'unit_price', width: 60, formatter: '@'},
-                    {title: '数量', field: 'quantity', width: 60, },
-                    {title: '数量', field: 'total_price', width: 60, },
+                    {title: '单位', field: 'unit', width: 50, formatter: '@', hAlign: 1, },
+                    {title: '单价', field: 'unit_price', width: 60, hAlign: 2, },
+                    {title: '数量', field: 'quantity', width: 60, hAlign: 2, },
+                    {title: '数量', field: 'total_price', width: 60, hAlign: 2, },
                 ],
                 emptyRows: 0,
                 headRows: 1,

app/public/js/stage_gather.js

@@ -283,7 +283,7 @@ $(document).ready(function () {
                 end_qc_qty: gcl.end_qc_qty, end_qc_tp: gcl.end_qc_tp,
                 end_gather_qty: gcl.end_gather_qty, end_gather_tp: gcl.end_gather_tp,
                 end_gather_percent: gcl.end_gather_percent,
-                end_final_qty: gcl.end_final_qty, end_final_tp: gcl.end_final_tp,
+                end_final_qty: gcl.end_final_qty, end_final_tp: gcl.end_final_tp, end_final_1_percent: gcl.end_final_1_percent,
             });
             if (gcl.leafXmjs && gcl.leafXmjs.length > 0) {
                 for (const xmj of gcl.leafXmjs) {
@@ -295,6 +295,7 @@ $(document).ready(function () {
                         end_gather_qty: xmj.end_gather_qty, end_gather_percent: xmj.end_gather_percent,
                         dwgc: xmj.dwgc, fbgc: xmj.fbgc, fxgc: xmj.fxgc,
                         jldy: xmj.jldy, bwmx: xmj.bwmx, drawing_code: xmj.drawing_code,
+                        end_final_1_percent:: xmj.end_final_1_percent,
                     });
                 }
             }