Skip to content

M
mes-pad
Commit aac174dd authored by 李驰骋's avatar 李驰骋
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 6e1852a9 9e0f6f89
Expand all Show whitespace changes
Inline Side-by-side
Showing with 356 additions and 211 deletions
common/http.api.js
View file @ aac174dd
This diff is collapsed.
pages/mes/prodReport/components/dModelList.vue
View file @ aac174dd
...@@ -83,10 +83,12 @@ ...@@ -83,10 +83,12 @@
} }
} }
const params = { const params = this.tableSelectData.map(v => {
toolMachinesRecordIdList: this.tableSelectData.map(v => v.toolMachinesRecordId), return {
toolMachinesId: v.toolMachinesId,
type type
} }
})
const {code} = await this.$u.api.dModel.tmToolMachinesRecord(params) const {code} = await this.$u.api.dModel.tmToolMachinesRecord(params)
if (code == 200) { if (code == 200) {
this.$emit('action') this.$emit('action')
......
pages/mes/prodReport/index.vue
View file @ aac174dd
...@@ -1065,6 +1065,7 @@ export default { ...@@ -1065,6 +1065,7 @@ export default {
workunitName: this.vuex_workunit.workunitName, workunitName: this.vuex_workunit.workunitName,
processId: selectData.processId, processId: selectData.processId,
taskId: selectData.taskId, taskId: selectData.taskId,
taskWorkunitId: selectData.taskWorkunitId,
workorderId: selectData.workorderId, workorderId: selectData.workorderId,
toolRequestUseId: data[0].toolRequestUseId, toolRequestUseId: data[0].toolRequestUseId,
toolMachinesRecordList: data.map((v) => { toolMachinesRecordList: data.map((v) => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment