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

app/controller/report_controller.js

@@ -169,7 +169,7 @@ module.exports = app => {
                 // 获取所有项目参与者
                 const accountList = await ctx.service.projectAccount.getAllDataByCondition({
                     where: { project_id: ctx.session.sessionProject.id, enable: 1 },
-                    columns: ['id', 'name', 'company', 'role', 'enable', 'is_admin', 'account_group'],
+                    columns: ['id', 'name', 'company', 'role', 'enable', 'is_admin', 'account_group', 'mobile'],
                 });
                 const newAccountGroup = accountGroup.map((item, idx) => {
                     const groupList = accountList.filter(item => item.account_group === idx);

app/view/stage/audit_modal.ejs

@@ -797,15 +797,17 @@
 <% if (ctx.stage && (ctx.session.sessionUser.accountId === ctx.stage.user_id && (ctx.stage.status === auditConst.status.uncheck || ctx.stage.status === auditConst.status.checkNo))) { %>
 <script>
     const accountGroup = JSON.parse('<%- JSON.stringify(accountGroup) %>');
+    const accountList = JSON.parse('<%- JSON.stringify(accountList) %>');
 </script>
 <% } %>
 <script>
     const preUrl = '<%- preUrl %>';
+    const cur_uid = parseInt('<%- ctx.session.sessionUser.accountdId %>');
     <% if (ctx.stage && ctx.url !== '/tender/' + ctx.tender.id + '/measure/stage/' + ctx.stage.order) { %>
     const dataChecker = DataChecker({
         checkUrl: '/tender/<%- ctx.tender.id %>/measure/stage/<%- ctx.stage.order %>/check',
         errorList: $.cs_errorList({
-            storeKey: 'stage-error-' + <% - ctx.stage.id %>,
+            storeKey: 'stage-error-' + '<% - ctx.stage.id %>',
         }),
     });
 

app/view/stage/index.ejs

@@ -589,7 +589,7 @@
     let attData = JSON.parse('<%- JSON.stringify(attData) %>');
     const ckColSetting = 'stage-col-visible-1.0.3-<%- tender.id %>';
     const auditConst = JSON.parse('<%- JSON.stringify(auditConst) %>');
-    const cur_uid = parseInt('<%- ctx.session.sessionUser.accountId %>');
+    // const cur_uid = parseInt('<%- ctx.session.sessionUser.accountId %>');
     const curAuditor = JSON.parse('<%- JSON.stringify(curAuditor) %>');
     const thirdParty = JSON.parse('<%- JSON.stringify(thirdParty) %>');
 </script>