浏览代码

变更令中增加标记

laiguoran 3 年之前
父节点
当前提交
a7a28931b0
共有 3 个文件被更改,包括 7 次插入0 次删除
  1. 2 0
      app/controller/change_controller.js
  2. 3 0
      app/public/js/change_information_set.js
  3. 2 0
      app/view/change/information.ejs

+ 2 - 0
app/controller/change_controller.js

@@ -632,6 +632,8 @@ module.exports = app => {
                     // 获取已选清单
                     const changeList = await ctx.service.changeAuditList.getList(change.cid);
                     renderData.changeList = changeList;
+                    renderData.changeLedgerList = await ctx.service.changeLedger.getAllDataByCondition({ where: { tender_id: ctx.tender.id } });
+                    renderData.changePosList = await ctx.service.changePos.getAllDataByCondition({ where: { tid: ctx.tender.id } });
                 } else if (auditStatus === 3 || auditStatus === 4 || auditStatus === 5 || auditStatus === 7 || auditStatus === 8) {
                     // 展示页左侧审批流程列表和清单审批列表数据
                     const times = change.status === audit.flow.status.back ?

+ 3 - 0
app/public/js/change_information_set.js

@@ -121,6 +121,9 @@ $(document).ready(() => {
                     indent: 16,
                     getColor: function (index, data) {
                         if (!data) return;
+                        if (_.findIndex(changeLedgerList, { id: data.gcl_id }) !== -1 || _.findIndex(changePosList, { id: data.mx_id }) !== -1) {
+                            return '#dc3545';
+                        }
                         if(data.lid != 0) return;
                         return '#007bff';
                     }

+ 2 - 0
app/view/change/information.ejs

@@ -418,6 +418,8 @@
     changeUnits.push('');
     const accountGroup = JSON.parse(unescape('<%- escape(JSON.stringify(accountGroup)) %>'));
     const accountList = JSON.parse(unescape('<%- escape(JSON.stringify(accountList)) %>'));
+    const changeLedgerList = JSON.parse(unescape('<%- escape(JSON.stringify(changeLedgerList)) %>'));
+    const changePosList = JSON.parse(unescape('<%- escape(JSON.stringify(changePosList)) %>'));
     const shenpi_status = <%- ctx.tender.info.shenpi.change %>;
     const shenpiConst = JSON.parse('<%- JSON.stringify(shenpiConst) %>');
     const changesUid = <%- change.uid %>;