diff --git a/src/views/mtm/routepack_form.vue b/src/views/mtm/routepack_form.vue index f226d646..ae72997c 100644 --- a/src/views/mtm/routepack_form.vue +++ b/src/views/mtm/routepack_form.vue @@ -48,11 +48,12 @@ diff --git a/src/views/pum/supplier.vue b/src/views/pum/supplier.vue index e571a1af..29f6984d 100644 --- a/src/views/pum/supplier.vue +++ b/src/views/pum/supplier.vue @@ -1,121 +1,175 @@ \ No newline at end of file + diff --git a/src/views/wpm_gx/mlog_detail.vue b/src/views/wpm_gx/mlog_detail.vue index cb21d9a8..5e5da294 100644 --- a/src/views/wpm_gx/mlog_detail.vue +++ b/src/views/wpm_gx/mlog_detail.vue @@ -188,6 +188,7 @@ ref="saveDialog" :mlog="mlogId" :mgroup="mgroup" + :materialIn="materialIn" @success="handleSaveSuccess" @closed="dialog.save = false" > @@ -330,6 +331,7 @@ export default { that.$API.wpm.mlog.item.req(that.mlogId).then((res) => { that.mlogItem = res; that.mgroup = res.mgroup; + that.materialIn = res.material_in; that.belongDeptId = res.belong_dept; }); }, diff --git a/src/views/wpm_gx/mlog_form.vue b/src/views/wpm_gx/mlog_form.vue index 4f96810c..18dcb787 100644 --- a/src/views/wpm_gx/mlog_form.vue +++ b/src/views/wpm_gx/mlog_form.vue @@ -130,6 +130,26 @@ + + + + + + + + - {{ item.material_out_name }} + @@ -46,6 +46,15 @@ :label="item.batch" :value="item.id" > +
+ {{ item.batch }}{{ item.count }} +
@@ -86,6 +95,10 @@ export default { type: String, default: "", }, + materialIn: { + type: String, + default: "", + }, }, emits: ["success", "closed"], data() { @@ -142,7 +155,11 @@ export default { getMaterial() { let that = this; this.$API.wpm.wmaterial.list - .req({ mgroupx: that.mgroup, page: 0 }) + .req({ + mgroupx: that.mgroup, + material: that.materialIn, + page: 0, + }) .then((res) => { that.materialOptions = res; });