|
@@ -637,9 +637,10 @@ module.exports = app => {
|
|
|
renderData.auditList3 = auditList3;
|
|
|
|
|
|
// 获取已选清单
|
|
|
- let changeList = await ctx.service.changeAuditList.getAllDataByCondition({ where: { cid: ctx.params.cid } });
|
|
|
+ // let changeList = await ctx.service.changeAuditList.getAllDataByCondition({ where: { cid: ctx.params.cid } });
|
|
|
+ const changeList = await ctx.service.changeAuditList.getList(change.cid);
|
|
|
|
|
|
- changeList = JSON.parse(JSON.stringify(changeList.sort())).sort().sort();
|
|
|
+ // changeList = JSON.parse(JSON.stringify(changeList.sort())).sort().sort();
|
|
|
for (const cl of changeList) {
|
|
|
const audit_amount = cl.audit_amount !== null && cl.audit_amount !== '' ? cl.audit_amount.split(',') : '';
|
|
|
// 清单表页赋值
|
|
@@ -685,9 +686,10 @@ module.exports = app => {
|
|
|
renderData.auditList4 = auditList4;
|
|
|
|
|
|
// 获取已选清单
|
|
|
- let changeList = await ctx.service.changeAuditList.getAllDataByCondition({ where: { cid: ctx.params.cid } });
|
|
|
+ // let changeList = await ctx.service.changeAuditList.getAllDataByCondition({ where: { cid: ctx.params.cid } });
|
|
|
+ const changeList = await ctx.service.changeAuditList.getList(change.cid);
|
|
|
|
|
|
- changeList = JSON.parse(JSON.stringify(changeList.sort())).sort().sort();
|
|
|
+ // changeList = JSON.parse(JSON.stringify(changeList.sort())).sort().sort();
|
|
|
for (const cl of changeList) {
|
|
|
const audit_amount = cl.audit_amount !== null && cl.audit_amount !== '' ? cl.audit_amount.split(',') : '';
|
|
|
// 清单表页赋值
|