From 69c63eea06542dad325530d127c848dd6b365055 Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 3 Dec 2025 13:17:27 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=E7=94=9F=E4=BA=A7=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_gx/inmrecord.vue | 61 ++++++++++------------------------ 1 file changed, 17 insertions(+), 44 deletions(-) diff --git a/src/views/wpm_gx/inmrecord.vue b/src/views/wpm_gx/inmrecord.vue index 17039e88..5199b1b9 100644 --- a/src/views/wpm_gx/inmrecord.vue +++ b/src/views/wpm_gx/inmrecord.vue @@ -2,9 +2,9 @@
- 领料 + >领料 --> 入库 - - + @@ -136,7 +135,17 @@ prop="participant" v-if="addForm.participant_type == 1" > - + + + + + - + + + + + - - - - + + - - - - + + + { + this.type = "edit"; + this.editId = row.id; + this.dialogVisible = true; + this.addForm = Object.assign({}, res); + }) }, handleDelete(row) { this.$API.wf.state.delete.req(row.id).then((res) => { diff --git a/src/views/wf/transform.vue b/src/views/wf/transform.vue index 4ef12482..a61812ca 100644 --- a/src/views/wf/transform.vue +++ b/src/views/wf/transform.vue @@ -9,12 +9,24 @@ - + + + - + @@ -167,7 +179,6 @@ }, mounted() { this.getList(); - this.getStateList(); }, methods: { onJsonChange (value) { @@ -187,10 +198,12 @@ } }, handleAdd() { + this.getStateList(); this.type = 'add'; this.dialogVisible = true; }, handleEdit(row) { + this.getStateList(); this.type = 'edit'; this.editId = row.id; this.dialogVisible = true; @@ -208,7 +221,6 @@ }, async getStateList() { let res = await this.$API.wf.workflow.states.req(this.id); - console.log(res); this.stateList = res; }, async submitHandle(){ From f558d282b76d93082170fca78aa3c82062a34953 Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 3 Dec 2025 15:08:10 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=E7=A6=85=E9=81=93198?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inm/mioitem.vue | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/views/inm/mioitem.vue b/src/views/inm/mioitem.vue index fd907c3c..0be1b495 100644 --- a/src/views/inm/mioitem.vue +++ b/src/views/inm/mioitem.vue @@ -100,7 +100,7 @@ @@ -113,7 +113,7 @@ - + @@ -354,7 +354,6 @@ export default { mounted() { let url1 = window.location.hash; this.url_code = url1.split('/')[2]; - console.log(this.url_code); this.checkTemplate = this.checkTemplate+"?t=" + new Date().getTime(); this.project_code = this.$TOOL.data.get("BASE_INFO").base.base_code; this.params.mio = this.mioId; From 04a468ee7eefac8ac10354d1988f4f913ad56176 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 4 Dec 2025 09:18:44 +0800 Subject: [PATCH 4/5] fix:yuanliaofeipinku --- src/views/inm/inmScrap.vue | 18 ++++++++-- src/views/inm/mainso_mio.vue | 26 ++++++++++---- src/views/inm/mio_form.vue | 65 +++++++++++++++++++++++----------- src/views/inm/mioitem_form.vue | 39 +++++++++++++++----- 4 files changed, 111 insertions(+), 37 deletions(-) diff --git a/src/views/inm/inmScrap.vue b/src/views/inm/inmScrap.vue index a4de08e3..1c14032d 100644 --- a/src/views/inm/inmScrap.vue +++ b/src/views/inm/inmScrap.vue @@ -2,8 +2,8 @@
- - 返工交接 + 返工交接 + 合批报废
{ that.mgroupOptions = res; res.forEach(item=>{ @@ -145,6 +150,13 @@ export default { this.$refs.saveDialog.open("add"); }); }, + table_bsofei(type,mtype) { + this.dialog.save = true; + this.type = type; + this.$nextTick(() => { + this.$refs.saveDialog.open("add",null,mtype); + }); + }, //搜索 handleQuery() { this.$refs.table.queryData(this.query); diff --git a/src/views/inm/mainso_mio.vue b/src/views/inm/mainso_mio.vue index 2923a4ab..58472a54 100644 --- a/src/views/inm/mainso_mio.vue +++ b/src/views/inm/mainso_mio.vue @@ -12,8 +12,13 @@ type="primary" @click="add('pur_in')" v-auth="'mio.pur'" - >采购入库 + >采购入库 + 报废 @@ -124,7 +130,7 @@ type="primary" @click="table_submit(scope.row)" v-auth="'mio.submit'" - v-if="scope.row.state == 10" + v-if="scope.row.state == 10&&scope.row.type!=='do_out'" > 提交 @@ -208,17 +214,25 @@ export default { apiObj: this.$API.inm.mio.list, selection: [], type: "", + htype: "", cate: "mainso", mioId: "", + project_code: "", visibleDrawer: false, }; }, + mounted() {this.project_code = this.$TOOL.data.get("BASE_INFO").base.base_code;}, methods: { //添加 - add(type) { + add(type,htype) { this.dialog.save = true; + this.htype = htype; this.$nextTick(() => { - this.$refs.saveDialog.open("add", type); + if(htype!==undefined){ + this.$refs.saveDialog.open("add", type,htype); + }else{ + this.$refs.saveDialog.open("add", type); + } }); }, //编辑 diff --git a/src/views/inm/mio_form.vue b/src/views/inm/mio_form.vue index 7ab1a385..a820a051 100644 --- a/src/views/inm/mio_form.vue +++ b/src/views/inm/mio_form.vue @@ -115,7 +115,7 @@ - + { + that.form.recive_mgroup = item.id; + that.getCkUserList();//废品库接收人 + }); + } }, methods: { init() { + let that = this; this.getDeptUser(); var type = this.form.type; if (type == "pur_in") { @@ -234,9 +246,16 @@ export default { this.getOrderOptions(); this.getCustomerOptions(); } else if (type == "do_in" || type == "do_out" || type == "borrow_out" || type == "return_in") { - this.getDeptOptions(); - this.getmgroupOptions(); - this.getgetDeptUsers(); + if(that.htype=='baofei'){ + that.$API.mtm.mgroup.list.req({ name:'废品库',page: 0}).then((res) => { + that.mgroupOptions = res; + that.form.mgroup = res[0].id; + }); + }else{ + this.getDeptOptions(); + this.getmgroupOptions(); + this.getgetDeptUsers(); + } } else if (type == "other_in") { this.getSupplierOptions(); } else if (type == "other_out") { @@ -293,15 +312,18 @@ export default { }); }, getDeptUser() { - this.$API.system.user.list - .req({ posts__name: "库管", page: 0 }) - .then((res) => { - this.userOption = res; - }); + let that = this; + let userOption = []; + that.$API.system.user.list.req({ posts__code__contains: "inm", page: 0 }).then((res) => { + userOption = Array.from(new Map(res.map(item => [item.id, item])).values()); + that.userOption = userOption; + // console.log('userOption',userOption); + }); }, //显示 - open(mode = "add", type = "") { + open(mode = "add", type = "",htype="") { this.mode = mode; + this.htype = htype; this.form.type = type; this.init(); this.visible = true; @@ -314,6 +336,9 @@ export default { this.isSaveing = true; try { var res; + if(this.htype=='baofei'){ + this.form.do_user = this.form.mio_user + } if (this.mode == "add") { res = await this.$API.inm.mio.create.req(this.form); } else if (this.mode == "edit") { diff --git a/src/views/inm/mioitem_form.vue b/src/views/inm/mioitem_form.vue index b0834ea8..66b91885 100644 --- a/src/views/inm/mioitem_form.vue +++ b/src/views/inm/mioitem_form.vue @@ -139,7 +139,7 @@ /> - + { + that.form.recive_mgroup = item.id; + that.getCkUserList();//废品库接收人 + }); + } }, methods: { init() { this.getMaterialOptions(); this.getWarehouseOptions(); }, - + //获取仓库人员 + getCkUserList() { + let that = this; + this.$API.system.user.list.req({ page: 0, posts__code: "inm&check" }) + .then((res) => { + if(that.type==40){ + that.userList2 = []; + that.userList2 = res; + }else if(that.type==20&&that.mgroupName=='废品库'){ + that.userList = []; + that.userList = res; + } + }); + }, getWarehouseOptions() { let that = this; this.$API.inm.warehouse.list.req({ page: 0 }).then((res) => { @@ -541,9 +564,11 @@ export default { } else { this.getBatchOptions(); } - if(that.project_code=='gx'&&that.type == 'pur_in'){ - that.form.batch = '无' + if(that.type == 'pur_in'){ that.batchcount = 99999999999; + if(that.project_code=='gx'){ + that.form.batch = '无' + } } }, getItem(options, id) { @@ -628,10 +653,8 @@ export default { this.init(); } this.visible = true; - // console.log('that.type',that.type); if(that.type=='other_in'||that.type=='do_out'){ let mioitemSelecObj =JSON.parse(sessionStorage.getItem("mioitemSelecObj")); - // console.log('mioitemSelecObj',mioitemSelecObj); if(mioitemSelecObj!==null){ that.selectObj = mioitemSelecObj; that.form.material = that.selectObj.id; From b2ddc571794c01119706e1834fe332cfe6fdf4c3 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 4 Dec 2025 09:47:08 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=E4=BB=93=E5=BA=93=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E4=BA=BA=E6=9F=A5=E8=AF=A2posts=5F=5Fcode=5F=5Fcontains:=20"in?= =?UTF-8?q?m"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inm/helpso_mioitem.vue | 6 ++++-- src/views/wpm_gx/inm_record.vue | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/views/inm/helpso_mioitem.vue b/src/views/inm/helpso_mioitem.vue index 62653f31..e1fc481c 100644 --- a/src/views/inm/helpso_mioitem.vue +++ b/src/views/inm/helpso_mioitem.vue @@ -295,8 +295,10 @@ export default { }, getUsers(){ let that = this; - that.$API.system.user.list.req({ posts__name: "库管", page: 0 }).then((res) => { - that.userOption = res; + let userOption = []; + that.$API.system.user.list.req({ posts__code__contains: "inm", page: 0 }).then((res) => { + userOption = Array.from(new Map(res.map(item => [item.id, item])).values()); + that.userOption = userOption; }); }, deptChange(){ diff --git a/src/views/wpm_gx/inm_record.vue b/src/views/wpm_gx/inm_record.vue index 20f9c3a7..8b33e2be 100644 --- a/src/views/wpm_gx/inm_record.vue +++ b/src/views/wpm_gx/inm_record.vue @@ -453,8 +453,10 @@ export default { //仓库人员 getDeptUser() { let that = this; + let userOption = []; this.$API.system.user.list.req({ page: 0, posts__code__contains: "inm" }).then((res) => { - that.userOption = res; + userOption = Array.from(new Map(res.map(item => [item.id, item])).values()); + that.userOption = userOption; }); }, //仓库物料