From c99dfeb46562bdf114b6853feb273cd55b856cba Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 20 Mar 2025 09:32:36 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix:=E4=BB=BB=E5=8A=A1=E5=92=8C=E5=87=BA?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E7=BC=96=E5=8F=B7=E6=94=BE=E5=BC=80=E9=9D=9E?= =?UTF-8?q?=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inm/mio_form.vue | 4 ++-- src/views/pm/utask_form.vue | 4 ++-- src/views/pm/utask_form_2.vue | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/inm/mio_form.vue b/src/views/inm/mio_form.vue index fa95efae..fe545cdc 100644 --- a/src/views/inm/mio_form.vue +++ b/src/views/inm/mio_form.vue @@ -12,9 +12,9 @@ :rules="rules" label-width="120px" > - + - + - + From 6c10a0d5d6b183b77fda2ee2439604ea24b10a10 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 20 Mar 2025 13:38:32 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix:=E7=94=9F=E4=BA=A7=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0wm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inm/mioitem_form.vue | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/views/inm/mioitem_form.vue b/src/views/inm/mioitem_form.vue index f308d217..27e25d61 100644 --- a/src/views/inm/mioitem_form.vue +++ b/src/views/inm/mioitem_form.vue @@ -53,6 +53,8 @@ clearable style="width: 100%" :disabled="inputBatchDisable" + @clear="selectBatchClear" + @change="selectChange" > { + if(that.form.batch == item.batch){ + that.form.count = item.count; + that.form.wm = item.id; + } + }) + + }, selectMaterialChange(item) { var that = this; var type = this.form.type; @@ -446,6 +459,7 @@ export default { }, selectBatchClear() { this.form.mb = ""; + this.form.wm = ""; this.form.batch = ""; this.form.count = ""; this.form.warehouse = ""; From ca1e8c9cb0e297fb8af6678a1cd462ed1233ea1d Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 20 Mar 2025 16:06:35 +0800 Subject: [PATCH 3/6] =?UTF-8?q?fix:=E5=85=89=E8=8A=AF=E6=94=BE=E5=BC=80?= =?UTF-8?q?=E8=BD=A6=E9=97=B4=E5=BA=93=E5=AD=98=E6=A3=80=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_gx/inmOut.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wpm_gx/inmOut.vue b/src/views/wpm_gx/inmOut.vue index 28099ae5..dc88371e 100644 --- a/src/views/wpm_gx/inmOut.vue +++ b/src/views/wpm_gx/inmOut.vue @@ -107,7 +107,7 @@ width="100" > From 95b3ecad9aa496026f59efde9b711d544a438b95 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 20 Mar 2025 16:09:35 +0800 Subject: [PATCH 4/6] =?UTF-8?q?fix:=E6=97=A5=E5=BF=97mlog=E4=B8=AD?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=93=8D=E4=BD=9C=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/mlog_form.vue | 12 ++++-- src/views/wpm_bx/mlogs.vue | 5 ++- src/views/wpm_gx/index.vue | 3 ++ src/views/wpm_gx/mlog_form.vue | 73 ++++++++++++++++++++++++++++++---- src/views/wpm_gx/mlogs.vue | 9 +++-- 5 files changed, 86 insertions(+), 16 deletions(-) diff --git a/src/views/wpm_bx/mlog_form.vue b/src/views/wpm_bx/mlog_form.vue index 39e9ed84..7b1a35d7 100644 --- a/src/views/wpm_bx/mlog_form.vue +++ b/src/views/wpm_bx/mlog_form.vue @@ -17,7 +17,7 @@ style="padding: 0 10px" > - + + const defaultForm = { - mtype: "", + mtype: 10, supplier:'', route: "", equipment: "", @@ -265,6 +265,10 @@ export default { type: String, default: "", }, + mgroupMtype: { + type: String, + default: "", + } }, computed: { title() { diff --git a/src/views/wpm_bx/mlogs.vue b/src/views/wpm_bx/mlogs.vue index f00f630d..478c2cb5 100644 --- a/src/views/wpm_bx/mlogs.vue +++ b/src/views/wpm_bx/mlogs.vue @@ -160,6 +160,7 @@ :mgroup="mgroupId" :dept="deptId" :mgroupName = "mgroupName" + :mgroupMtype="mgroupMtype" @success="handleSaveSuccess" @closed="dialog.save = false" > @@ -211,6 +212,7 @@ export default { deptId: null, processId: "", processCate: "", + mgroupMtype: "", }; }, watch: { @@ -239,10 +241,11 @@ export default { } that.deptId = res.belong_dept; that.processId = res.process; + that.mgroupMtype = res.mtype; that.processCate = res.process_cate; that.params.mgroup = res.id; that.apiObj = that.$API.wpm.mlog.list; - that.$refs.table.refresh(); + // that.$refs.table.refresh(); }); }, getRemaTime(row){ diff --git a/src/views/wpm_gx/index.vue b/src/views/wpm_gx/index.vue index 73821719..8bd639e4 100644 --- a/src/views/wpm_gx/index.vue +++ b/src/views/wpm_gx/index.vue @@ -14,6 +14,7 @@ v-if="values == '日志'&&componentsShow" :mgroupName="mgroupName" :mgroupId="mgroupId" + :mgroupMtype = "mgroupMtype" :mgroupcode="mgroup_code" :processId="processId" :deptId = "mgroupDept" @@ -84,6 +85,7 @@ export default { selectedIndex:0, mgroup_code:'', mgroupDept:'', + mgroupMtype:'', processtype:'', processId:'', componentsShow:false, @@ -122,6 +124,7 @@ export default { that.mgroupName = res[0].name; that.mgroupId = res[0].id; that.processId = res[0].process; + that.mgroupMtype = res[0].mtype; that.processtype = res[0].process_type; that.mgroupDept = res[0].belong_dept; that.componentsShow = true; diff --git a/src/views/wpm_gx/mlog_form.vue b/src/views/wpm_gx/mlog_form.vue index 3bba92a5..87bbee85 100644 --- a/src/views/wpm_gx/mlog_form.vue +++ b/src/views/wpm_gx/mlog_form.vue @@ -17,7 +17,7 @@ style="padding: 0 10px" > - + + - + + + + + + + + + + + + + + + + + + + - 0&&row.reminder_interval_list[0]){ if(temp Date: Thu, 20 Mar 2025 16:11:04 +0800 Subject: [PATCH 5/6] =?UTF-8?q?fix:fmlog->mlog=E7=BB=93=E6=9E=84=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E4=B8=AD=E6=B7=BB=E5=8A=A0=E6=93=8D=E4=BD=9C=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_gx/f_mlogs_form.vue | 73 +++++++++++++++++++++++++++++++ src/views/wpm_gx/fmlog_detail.vue | 5 +++ src/views/wpm_gx/fmlogs.vue | 1 + 3 files changed, 79 insertions(+) diff --git a/src/views/wpm_gx/f_mlogs_form.vue b/src/views/wpm_gx/f_mlogs_form.vue index 09f0c304..933d4051 100644 --- a/src/views/wpm_gx/f_mlogs_form.vue +++ b/src/views/wpm_gx/f_mlogs_form.vue @@ -102,6 +102,61 @@ + + + + + + + + + + + + + + + + + + { + res.results.forEach((item) => { + let obj = {}; + Object.assign(obj, item); + obj.value = ''; + that.testitems.push(obj); + }) + }); + }, disabledDateFn(time) { return time.getTime() > new Date().getTime(); }, diff --git a/src/views/wpm_gx/fmlog_detail.vue b/src/views/wpm_gx/fmlog_detail.vue index 5ce16001..0171490a 100644 --- a/src/views/wpm_gx/fmlog_detail.vue +++ b/src/views/wpm_gx/fmlog_detail.vue @@ -174,6 +174,7 @@ :fmlog="params.fmlog" :mgroup="mgroup" :mtask="mtask" + :process="processId" @success="handleSaveSuccess" @closed="dialog.save = false" > @@ -201,6 +202,10 @@ export default { type: String, default: "", }, + processId:{ + type: String, + default: "", + }, }, components: { saveDialog, diff --git a/src/views/wpm_gx/fmlogs.vue b/src/views/wpm_gx/fmlogs.vue index dfaed964..33359808 100644 --- a/src/views/wpm_gx/fmlogs.vue +++ b/src/views/wpm_gx/fmlogs.vue @@ -148,6 +148,7 @@ v-if="dialog.detail" ref="detailDialog" :fmlogId="fmlogId" + :processId="processId" @closed="detailClose" > From fde88e8af9eea75d3ad61a8a5a7b3931d6afcabd Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 20 Mar 2025 16:12:06 +0800 Subject: [PATCH 6/6] =?UTF-8?q?fix:=E6=91=84=E5=83=8F=E5=A4=B4=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/QRCodeScanner.vue | 89 ++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 src/views/wpm_bx/QRCodeScanner.vue diff --git a/src/views/wpm_bx/QRCodeScanner.vue b/src/views/wpm_bx/QRCodeScanner.vue new file mode 100644 index 00000000..a9d6df4b --- /dev/null +++ b/src/views/wpm_bx/QRCodeScanner.vue @@ -0,0 +1,89 @@ + + + + + +