变更测试bug修复

app/controller/change_controller.js

@@ -364,11 +364,14 @@ module.exports = app => {
                             if (change.userGroups[au][0].audit_order !== 0) {
                                 cl['audit_amount_' + change.userGroups[au][0].audit_order] =
                                     (change.userGroups[au][0].audit_type === auditType.key.and &&
-                                        ctx.helper._.findIndex(change.userGroups[au], { status: audit.change.status.checked }) !== -1) ||
+                                        ctx.helper._.findIndex(change.userGroups[au], { uid: ctx.session.sessionUser.accountId, status: audit.change.status.checked }) !== -1) ||
                                     (change.shenpiPower && ctx.helper._.findIndex(change.userGroups[au], { uid: ctx.session.sessionUser.accountId }) !== -1) ?
                                         cl.spamount : (audit_amount[au - 1] !== undefined ? parseFloat(audit_amount[au - 1]) : null);
                             }
                         }
+                        if (change.readOnly && !change.shenpiPower) {
+                            cl.checked_amount = audit_amount.length > 0 ? audit_amount[audit_amount.length - 1] : 0;
+                        }
                     }
                 }
 
@@ -437,7 +440,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'],
                     });
                     renderData.accountList = accountList;
                     renderData.accountGroup = unitList.map(item => {

app/public/js/change_information_show.js

@@ -99,7 +99,7 @@ $(document).ready(() => {
             },
             changed_amount: function (data) {
                 return ZhCalc.round(ZhCalc.add(data.oamount, data.spamount), findDecimal(data.unit));
-                // return ZhCalc.add(ZhCalc.round(data.oamount, findDecimal(data.unit)), ZhCalc.round(data.checked_amount, findDecimal(data.unit)));
+                // return ZhCalc.round(ZhCalc.add(data.oamount, data.checked_amount), findDecimal(data.unit));
             },
             changed_tp: function (data) {
                 return ZhCalc.add(ZhCalc.round(ZhCalc.mul(ZhCalc.round(data.unit_price, unitPriceUnit), ZhCalc.round(data.oamount, findDecimal(data.unit))), totalPriceUnit),

app/service/change_audit.js

@@ -1251,7 +1251,7 @@ module.exports = app => {
         async saveAudit(cid, times, data) {
             const transaction = await this.db.beginTransaction();
             try {
-                const auditors = await this.getListGroupByWithoutYB(cid, times);
+                const auditors = await this.getAuditGroupByList(cid, times);
                 const now_audit = this._.find(auditors, { uid: data.old_aid });
                 if (data.operate !== 'del') {
                     const exist = await this.getDataByCondition({ cid, times, uid: data.new_aid });
@@ -1263,18 +1263,11 @@ module.exports = app => {
                     }
                     const nowAuditInfo = await this.ctx.service.projectAccount.getDataById(data.new_aid);
                     const newAudit = {
-                        tid: this.ctx.tender.id,
-                        cid,
-                        uid: data.new_aid,
-                        name: nowAuditInfo.name,
-                        company: nowAuditInfo.company,
-                        jobs: nowAuditInfo.role,
-                        usort: now_audit.usort + 1,
-                        usite: now_audit.usite + 1,
-                        audit_order: now_audit.audit_order + 1,
-                        audit_type: auditType.key.common,
-                        times: times,
-                        status: auditConst.status.uncheck,
+                        tid: this.ctx.tender.id, cid, uid: data.new_aid,
+                        name: nowAuditInfo.name, company: nowAuditInfo.company, jobs: nowAuditInfo.role,
+                        usort: now_audit.usort + 1, usite: now_audit.usite + 1,
+                        audit_order: now_audit.audit_order + 1, audit_type: auditType.key.common,
+                        times: times, status: auditConst.status.uncheck,
                     };
                     // order+1
                     await this._syncOrderByDelete(transaction, cid, now_audit.usite + 1, now_audit.usort + 1, times, '+');
@@ -1286,16 +1279,10 @@ module.exports = app => {
                     }
                     const nowAuditInfo = await this.ctx.service.projectAccount.getDataById(data.new_aid);
                     const newAudit = {
-                        tid: this.ctx.tender.id,
-                        cid,
-                        uid: data.new_aid,
-                        name: nowAuditInfo.name,
-                        company: nowAuditInfo.company,
-                        jobs: nowAuditInfo.role,
-                        usort: now_audit.usort,
-                        usite: now_audit.usite,
-                        audit_order: now_audit.audit_order,
-                        audit_type: now_audit.audit_type,
+                        tid: this.ctx.tender.id, cid, uid: data.new_aid,
+                        name: nowAuditInfo.name, company: nowAuditInfo.company, jobs: nowAuditInfo.role,
+                        usort: now_audit.usort, usite: now_audit.usite,
+                        audit_order: now_audit.audit_order, audit_type: now_audit.audit_type,
                         times: times,
                         status: auditConst.status.uncheck,
                     };
@@ -1304,7 +1291,7 @@ module.exports = app => {
                     if (now_audit.status !== auditConst.status.uncheck) {
                         throw '当前人无法操作删除';
                     }
-                    const flowAuditors = auditors.filter(x => { return x.order === now_audit.order; });
+                    const flowAuditors = auditors.filter(x => { return x.audit_order === now_audit.audit_order; });
                     await transaction.delete(this.tableName, { cid, times, uid: now_audit.uid, usite: now_audit.usite });
                     if (flowAuditors.length === 1) await this._syncOrderByDelete(transaction, cid, now_audit.usite, now_audit.usort, times);
                     // 旧的更新为is_old为1

app/view/change/information.ejs

@@ -587,7 +587,6 @@
 <script>
     const auditors2 = JSON.parse(unescape('<%- escape(JSON.stringify(change.auditors2)) %>'));
     auditors2.shift();
-    console.log(auditors2);
     const aidList = [];
     for (let i = 0; i < auditors2.length; i++) {
         aidList.push(auditors2[i][0].audit_order);