|
@@ -262,7 +262,7 @@ module.exports = app => {
|
|
|
columns: ['id', 'tid', 'order', 't_type', 'code', 'name', 'unit', 'spec', 'm_type', 'basic_price', 'basic_times', 'in_time', 'origin', 'remark'],
|
|
|
where: { tid }
|
|
|
});
|
|
|
- const fields = ['quantity', 'tp', 'm_tax_tp', 'expr', 'msg_tp', 'msg_times', 'msg_spread', 'm_up_risk', 'm_down_risk', 'm_spread', 'm_tax'];
|
|
|
+ const fields = ['quantity', 'm_tp', 'm_tax_tp', 'expr', 'msg_tp', 'msg_times', 'msg_spread', 'm_up_risk', 'm_down_risk', 'm_spread', 'm_tax'];
|
|
|
const calcPrefix = [];
|
|
|
|
|
|
for (const m of gsCustom.materials) {
|
|
@@ -277,7 +277,7 @@ module.exports = app => {
|
|
|
const curMaterial = material.status === auditConst.material.status.checked
|
|
|
? await this.ctx.service.materialBillsHistory.getAllDataByCondition({ where: { mid: material.id } })
|
|
|
: await this.ctx.service.materialBills.getAllDataByCondition({ where: { tid }});
|
|
|
-
|
|
|
+
|
|
|
this.ctx.helper.assignRelaData(materialData, [
|
|
|
{data: curMaterial, fields, prefix: prefix, relaId: 'mb_id', defaultData: defaultData}
|
|
|
]);
|