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

app/public/js/stage.js

@@ -182,6 +182,7 @@ function getHintMsg () {
 
 let ledgerData, posData = '';
 $(document).ready(() => {
+    const completePerField = tenderInfo.display.stage.correct ? 'end_correct_1_percent' : 'end_final_1_percent';
     const exportExcelSetting = {
         cols: [
             {title: '项目节编号', colSpan: '1', rowSpan: '2', field: 'code', hAlign: 0, width: 145, formatter: '@', cellType: 'tree'},
@@ -4413,7 +4414,7 @@ $(document).ready(() => {
                             {title: '单位', field: 'unit', width: 50, hAlign: 1, formatter: '@'},
                             {title: '单价', field: 'unit_price', hAlign: 2, width: 50},
                             {title: '数量', field: 'quantity', hAlign: 2, width: 50},
-                            {title: '完成率(%)', field: 'end_gather_percent', hAlign: 2, width: 70},
+                            {title: '完成率(%)', field: completePerField, hAlign: 2, width: 70},
                             {title: '部位', field: 'bw', hAlign: 2, width: 90},
                         ],
                         emptyRows: 0,
@@ -4424,6 +4425,7 @@ $(document).ready(() => {
                         headerFont: '12px 微软雅黑',
                         font: '12px 微软雅黑',
                         selectedBackColor: '#fffacd',
+                        readOnly: true,
                     },
                     afterLocated: function () {
                         stagePosSpreadObj.loadCurPosData();

app/service/report_memory.js

@@ -1439,7 +1439,7 @@ module.exports = app => {
                 sign_path: user.sign_path,
                 opinion: user.opinion,
                 end_time: auditors && auditors.length > 0 ? auditors[0].begin_time : null,
-                sort: 0,
+                sort: 0, order: 0, audit_order: 0
             }, ...auditors];
             return result;
         }