From b412841492a9a3010c50f2ce5a02496b736b2f71 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 25 Sep 2025 08:54:41 +0800 Subject: [PATCH 1/7] =?UTF-8?q?fix:=E4=BC=9A=E8=AE=AE=E5=AE=A4=E9=A2=84?= =?UTF-8?q?=E7=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/model/ofm.js | 8 + src/views/ofm/booking_form.vue | 299 +++++++++++++++++++++++++++++++++ src/views/ofm/mroombooking.vue | 297 +++++++++++++++++--------------- 3 files changed, 471 insertions(+), 133 deletions(-) create mode 100644 src/views/ofm/booking_form.vue diff --git a/src/api/model/ofm.js b/src/api/model/ofm.js index d46bf10c..94b47f4e 100644 --- a/src/api/model/ofm.js +++ b/src/api/model/ofm.js @@ -97,6 +97,14 @@ export default { return await http.post(this.url, data); } }, + update: { + name: "更新", + req: async function(id, data){ + return await http.put( + `${config.API_URL}/ofm/mroombooking/${id}/`,data + ); + } + }, delete: { url: `${config.API_URL}/ofm/mroombooking/delete/`, name: "批量物理删除", diff --git a/src/views/ofm/booking_form.vue b/src/views/ofm/booking_form.vue new file mode 100644 index 00000000..c4553ffd --- /dev/null +++ b/src/views/ofm/booking_form.vue @@ -0,0 +1,299 @@ + + + + + diff --git a/src/views/ofm/mroombooking.vue b/src/views/ofm/mroombooking.vue index 9b298306..c4553ffd 100644 --- a/src/views/ofm/mroombooking.vue +++ b/src/views/ofm/mroombooking.vue @@ -25,21 +25,13 @@ - - - + + + + + @@ -68,23 +58,41 @@ - + - - - - - - - - + + + + + + + + + + + + + + + + + +
+
{{ item.label }}
+
{{ item.label }}
+
+ - + From ff210937e9eb3f86473baec713fad15190bc4e53 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 25 Sep 2025 09:28:19 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix:=E4=BA=A4=E6=8E=A5=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/handover_form.vue | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/views/wpm_bx/handover_form.vue b/src/views/wpm_bx/handover_form.vue index 1ccfccb8..8e21381c 100644 --- a/src/views/wpm_bx/handover_form.vue +++ b/src/views/wpm_bx/handover_form.vue @@ -189,7 +189,7 @@ - + @@ -216,7 +216,7 @@ - + @@ -596,7 +596,9 @@ export default { data = that.materialOptions.filter((item) => { return that.selectItems.indexOf(item.id)>-1; }); - that.form.new_batch = data[0].batch+'g'; + if(that.type==50){ + that.form.new_batch = data[0].batch+'-G'; + } let materialId = data[0].material; if(that.type==50){}else{ let params = { @@ -773,7 +775,9 @@ export default { let hasArr = []; that.materialOptions.forEach((item) => { if(item.batch == res.batch){ - that.form.new_batch = res.batch+'g'; + if(that.type==50){ + that.form.new_batch = data[0].batch+'-G'; + } hasArr.push(item); let params = {material: item.material,type: that.type}; that.$API.wpm.handover.mgroups.req(params).then((res0) => { @@ -827,7 +831,9 @@ export default { if(arr2.length>0){ that.$message.error("该批次已存在") }else{ - that.form.new_batch = arr[0].batch+'g'; + if(that.type==50){ + that.form.new_batch = data[0].batch+'-G'; + } let params = {material: arr[0].material,type: that.type}; that.$API.wpm.handover.mgroups.req(params).then((res0) => { that.mgroupOptions = res0; @@ -882,7 +888,9 @@ export default { }else{//handoverb里没有有这个物料批次 that.materialOptions.forEach((item) => { if(item.id == res[0].wm){ - that.form.new_batch = item.batch+'g'; + if(that.type==50){ + that.form.new_batch = data[0].batch+'-G'; + } let params = {material: item.material,type: that.type}; that.$API.wpm.handover.mgroups.req(params).then((res1) => { that.mgroupOptions = res1; From 67b517d4f88b45d4be184c1db774a727844f9db7 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 25 Sep 2025 09:28:48 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix:=E6=A3=80=E6=B5=8B=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=BD=AE=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/monitor_detail.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/wpm_bx/monitor_detail.vue b/src/views/wpm_bx/monitor_detail.vue index b1c87c24..9e25c1ca 100644 --- a/src/views/wpm_bx/monitor_detail.vue +++ b/src/views/wpm_bx/monitor_detail.vue @@ -93,6 +93,7 @@ export default { methods: { open() { let that = this; + that.mpointList = []; this.visible = true; that.$nextTick(() => { let height = document.getElementById("tableWap").clientHeight; @@ -114,13 +115,13 @@ export default { }, handleClick(val){ let that = this; + that.option.xAxis.data = []; + that.option.series.data = []; that.mpointList.forEach(item=>{ if(item.nickname == that.activeName){ that.query.mpoint = item.id; that.query.page = 1; that.option.title.text = that.activeName; - that.option.xAxis.data = []; - that.option.series.data = []; let params = {}; params.mpoint = item.id; params.timex__gte = that.startTime; From c1fbda96f032ddfd6712f003511e42eeb46296b6 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 25 Sep 2025 15:31:37 +0800 Subject: [PATCH 4/7] =?UTF-8?q?fix:=E6=94=B9=E7=89=88=E4=BA=A4=E6=8E=A5?= =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/handover_form.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wpm_bx/handover_form.vue b/src/views/wpm_bx/handover_form.vue index 8e21381c..5eb03395 100644 --- a/src/views/wpm_bx/handover_form.vue +++ b/src/views/wpm_bx/handover_form.vue @@ -361,6 +361,7 @@ export default { let that = this; that.form.type = that.type; if(that.type==50){ + that.form.mtype=30; that.change_batch = true; } let materialObj = that.$TOOL.data.get("MATERIAL_OBJECT"); @@ -669,7 +670,6 @@ export default { that.$refs.dialogForm.validate(async (valid) => { if (valid) { if(that.mtype==30){ - that.form.mtype = 30; that.form.recive_mgroup = that.form.send_mgroup; } //合批、分批、报废，这三个交接操作直接创建并提交 From db46b1d87873718eee82b8f1e56c72e0d7ddafd5 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 25 Sep 2025 17:19:08 +0800 Subject: [PATCH 5/7] =?UTF-8?q?fix:=E9=A2=84=E5=AE=9A=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=8F=90=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/model/ofm.js | 18 ++- src/views/ofm/booking_form.vue | 211 ++++++++++++++------------------- src/views/ofm/mroombooking.vue | 205 ++++---------------------------- 3 files changed, 120 insertions(+), 314 deletions(-) diff --git a/src/api/model/ofm.js b/src/api/model/ofm.js index 94b47f4e..06b6f15e 100644 --- a/src/api/model/ofm.js +++ b/src/api/model/ofm.js @@ -69,11 +69,10 @@ export default { } }, delete: { - url: `${config.API_URL}/ofm/mroom/delete/`, - name: "批量物理删除", - req: async function(data){ - return await http.post(this.url, data); - } + name: "删除", + req: async function (id) { + return await http.delete(`${config.API_URL}/ofm/mroom/${id}/`); + }, }, }, mroombooking: { @@ -106,11 +105,10 @@ export default { } }, delete: { - url: `${config.API_URL}/ofm/mroombooking/delete/`, - name: "批量物理删除", - req: async function(data){ - return await http.post(this.url, data); - } + name: "删除", + req: async function (id) { + return await http.delete(`${config.API_URL}/ofm/mroombooking/${id}/`); + }, }, }, mroomslot: { diff --git a/src/views/ofm/booking_form.vue b/src/views/ofm/booking_form.vue index c4553ffd..c03b0a8e 100644 --- a/src/views/ofm/booking_form.vue +++ b/src/views/ofm/booking_form.vue @@ -1,117 +1,79 @@ From 4b50910cddd48697ad9de3be8dc09c4bd81aa2db Mon Sep 17 00:00:00 2001 From: shijing Date: Fri, 26 Sep 2025 14:00:57 +0800 Subject: [PATCH 6/7] =?UTF-8?q?fix:=E9=A2=84=E5=AE=9A=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ofm/booking_form.vue | 53 +++++++++++++++++++++++++--------- src/views/ofm/mroombooking.vue | 50 +++++++++++++++++--------------- 2 files changed, 66 insertions(+), 37 deletions(-) diff --git a/src/views/ofm/booking_form.vue b/src/views/ofm/booking_form.vue index c03b0a8e..e54e0268 100644 --- a/src/views/ofm/booking_form.vue +++ b/src/views/ofm/booking_form.vue @@ -13,7 +13,7 @@ - + { + if(item.id == that.form.mroom){ + that.mroomName = item.name; + that.bookingTitle = item.name+"预定"; + } + }) + }, selectTime(index){ let that = this; that.form.slots = []; @@ -221,24 +250,20 @@ export default { that.isSaving = false; } }, - handleEidt(row) { + handleEidt(id) { let that = this; - that.type = "edit"; - that.editId = row.id; - that.$API.ofm.mroomslot.list.req({booking:row.id,page:0}).then(res=>{ - console.log('mroomslotres',res); + that.$API.ofm.mroomslot.list.req({booking:id,page:0}).then(res=>{ res.forEach(item=>{ that.timesList[item.slot].isSelect = true; }) }) - that.limitedVisible = true; - that.form = Object.assign({}, row); - } }, //搜索 handleQuery() { this.$refs.table.queryData(this.query); }, + }, + };