From 0f468916436608a0e450ffbfd52173479399c0c5 Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 2 Apr 2025 10:35:26 +0800 Subject: [PATCH 01/29] =?UTF-8?q?fix:=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0web=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login/index.vue | 4 ++-- src/views/ops/setting.vue | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/views/login/index.vue b/src/views/login/index.vue index efdd85bb..804a4367 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -62,7 +62,7 @@ 刷脸登录 --> -
VERSION @ {{ config_index.APP_VER }}
+
WEB版本：{{ config_index.APP_VER }}
@@ -408,7 +408,7 @@ export default { position: absolute; bottom: 30px; left: 30px; - font-size: 16px; + font-size: 14px; color: #fff; } .copyright { diff --git a/src/views/ops/setting.vue b/src/views/ops/setting.vue index 701a3991..96ee95db 100644 --- a/src/views/ops/setting.vue +++ b/src/views/ops/setting.vue @@ -12,6 +12,7 @@ >

{{ form.base_name }}

SERVER版本: {{ form.sys_version }}

+

WEB版本: {{ config.APP_VER }}

@@ -54,7 +55,7 @@ + + From a33d5d06ffa7c4962df4da94b6aeef70556f83fb Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 3 Apr 2025 11:25:22 +0800 Subject: [PATCH 10/29] =?UTF-8?q?=E5=85=89=E5=AD=90=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qm/behavior.vue | 2 +- src/views/qm/behavior_form.vue | 9 ++++++- src/views/qm/product_form.vue | 46 ++++++++++++++-------------------- 3 files changed, 28 insertions(+), 29 deletions(-) diff --git a/src/views/qm/behavior.vue b/src/views/qm/behavior.vue index a523a449..a0f26bfd 100644 --- a/src/views/qm/behavior.vue +++ b/src/views/qm/behavior.vue @@ -228,7 +228,7 @@ export default { }, state_xj: { S: "析晶", - K: "不析晶", + R: "不析晶", θ: "未化", }, form: { diff --git a/src/views/qm/behavior_form.vue b/src/views/qm/behavior_form.vue index e1e06d22..15891082 100644 --- a/src/views/qm/behavior_form.vue +++ b/src/views/qm/behavior_form.vue @@ -262,6 +262,13 @@ export default { trigger: "blur", }, ], + sample_number:[ + { + required: true, + message: "请输入样品编号", + trigger: "blur" + }, + ], test_user: [ { required: true, @@ -297,7 +304,7 @@ export default { ], xjOptios: [ { id: "S", name: "析晶" }, - { id: "K", name: "不析晶" }, + { id: "R", name: "不析晶" }, { id: "θ", name: "未化" }, ], visible: false, diff --git a/src/views/qm/product_form.vue b/src/views/qm/product_form.vue index af85cf43..e91d91e4 100644 --- a/src/views/qm/product_form.vue +++ b/src/views/qm/product_form.vue @@ -17,23 +17,18 @@ - - - - + + + + @@ -104,6 +99,7 @@ export default { emits: ["success", "closed"], data() { return { + apiObjBatch:this.$API.inm.warehouse.batch, apiUserObj: this.$API.system.user.list, loading: false, form: { @@ -126,6 +122,7 @@ export default { }, ], }, + selectBatch:null, visible: false, isSaveing: false, options: [], @@ -170,17 +167,12 @@ export default { that.options = res; }); }, - handleChange(val) { + handleBatchChange() { let that = this; - console.log(val); - that.options.forEach((item) => { - if (item.id == val) { - that.form.count = item.count; - that.form.batch = item.batch; - that.form.material = item.material; - that.form.mb = item.id; - } - }); + that.form.count = that.selectBatch.count; + that.form.batch = that.selectBatch.batch; + that.form.material = that.selectBatch.material; + that.form.mb = that.selectBatch.id; }, //提交 submit() { From e6c0069e7467b00770548f1e79f90b37377646cf Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 3 Apr 2025 15:48:45 +0800 Subject: [PATCH 11/29] =?UTF-8?q?fix:=E5=87=BA=E5=85=A5=E5=BA=93=E6=97=B6?= =?UTF-8?q?=E7=89=A9=E6=96=99=E9=80=89=E6=8B=A9=E6=9B=B4=E6=8D=A2=E7=BB=84?= =?UTF-8?q?=E4=BB=B6xselect?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inm/mioitem_form.vue | 36 +++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/src/views/inm/mioitem_form.vue b/src/views/inm/mioitem_form.vue index ed23f5fa..14b818ea 100644 --- a/src/views/inm/mioitem_form.vue +++ b/src/views/inm/mioitem_form.vue @@ -15,7 +15,18 @@ - + + + @@ -254,6 +265,7 @@ export default { }, ], }, + selectObj:{}, visible: false, isSaveing: false, materialOptions: [], @@ -271,6 +283,7 @@ export default { mioitemw:[], project_code:'', mTracking:10, + apiObj:this.$API.mtm.material.list, }; }, mounted() { @@ -372,9 +385,11 @@ export default { } else { query = { page: 0 ,is_hidden:false}; } - this.$API.mtm.material.list.req(query).then((res) => { - this.materialOptions = res; - }); + this.query = query; + this.apiObj=this.$API.mtm.material.list; + // this.$API.mtm.material.list.req(query).then((res) => { + // this.materialOptions = res; + // }); }, async initAssemb(item) { this.selectBatchDisable = true; @@ -422,15 +437,14 @@ export default { }) }, - selectMaterialChange(item) { + selectMaterialChange() { var that = this; var type = this.form.type; - var material = item.id; - that.form.material = material; - that.mTracking = item.tracking; + that.form.material = that.selectObj.id; + that.mTracking = that.selectObj.tracking; if (type == "do_in") { - if (item.is_assemb) { - this.initAssemb(item); + if (that.selectObj.is_assemb) { + this.initAssemb(that.selectObj); } else { this.selectBatchDisable = false; this.components = []; From ebf0a9a058dbe2c3a18a8f7fb2d39a4eec1f82cc Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 3 Apr 2025 16:46:02 +0800 Subject: [PATCH 12/29] =?UTF-8?q?feat=EF=BC=9A=E6=B7=BB=E5=8A=A0=E5=B7=A5?= =?UTF-8?q?=E8=89=BA=E8=B7=AF=E7=BA=BF=E5=A4=8D=E5=88=B6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/model/mtm.js | 4 +- src/views/mtm/routepack.vue | 114 +++++++++++++++++++++++++++++++++--- 2 files changed, 107 insertions(+), 11 deletions(-) diff --git a/src/api/model/mtm.js b/src/api/model/mtm.js index ad286a5a..339cc355 100644 --- a/src/api/model/mtm.js +++ b/src/api/model/mtm.js @@ -440,8 +440,8 @@ export default { }, copy:{ name: "复制", - req: async function (id,data) { - return await http.post(`${config.API_URL}/mtm/routepack/${id}/copy/`,data) + req: async function (data) { + return await http.post(`${config.API_URL}/mtm/routepack/copy/`,data) } }, togglestate:{ diff --git a/src/views/mtm/routepack.vue b/src/views/mtm/routepack.vue index 239440af..cf66411b 100644 --- a/src/views/mtm/routepack.vue +++ b/src/views/mtm/routepack.vue @@ -93,14 +93,14 @@ @click="table_show(scope.row, scope.$index)" >查看 - + + + + + + + + + + + + + + + + + + + + + + + + + + + { + that.materialIn = res; + }); + }, + getMaterialOut() { + let that = this; + that.$API.mtm.material.list.req({ page: 0, type__in: "10,20",is_hidden: false}).then((res) => { + that.materialOut = res; + }); + }, getType(state) { if (state == 10) { return "warning"; @@ -252,13 +331,30 @@ export default { }, //复制 table_copy(row){ - this.$API.mtm.routepack.copy.req(row.id).then((res) => { - this.$message.success("复制成功"); - this.$refs.table.refresh(); - return res; - }).catch((err) => { - return err; - }); + let that = this; + that.form.routepack = row.id; + that.form.new_name = ''; + that.form.material_in = ''; + that.form.material_out =''; + that.dialogVisible = true; + }, + form_save(){ + let that = this; + that.$refs.dialogForm.validate(async (valid) => { + if (valid) { + that.isSaveing = true; + that.$API.mtm.routepack.copy.req(that.form).then((res) => { + that.$message.success("复制成功"); + that.$refs.table.refresh(); + that.isSaveing = false; + that.dialogVisible = false; + return res; + }).catch((err) => { + that.isSaveing = false; + return err; + }); + } + }) }, // handleWatch(row) { // let that = this; From 4f2bcc4acd98afaead26107d64ec3aa484f1ad6d Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 3 Apr 2025 16:49:23 +0800 Subject: [PATCH 13/29] =?UTF-8?q?fix:=E7=89=88=E6=9C=AC=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/index.js b/src/config/index.js index de058dc9..1cc4531f 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -6,7 +6,7 @@ const DEFAULT_CONFIG = { DASHBOARD_URL: "/dashboard", //版本号 - APP_VER: "2.6.2025040209", + APP_VER: "2.6.2025040316", //内核版本号 CORE_VER: "1.6.9", From a6184fbdb45ef93e78d6f7bf011fc44c406d8358 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 3 Apr 2025 16:49:47 +0800 Subject: [PATCH 14/29] =?UTF-8?q?fix:=E6=96=87=E6=A1=88=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/login/index.vue b/src/views/login/index.vue index bc2c4fa4..d4d78cb3 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -63,7 +63,7 @@ -->
WEB版本：{{ config_index.APP_VER }}
-
VERSION版本：{{ baseConfig.sys_version }}
+
SERVER版本：{{ baseConfig.sys_version }}
From 71af6a5fe010315d6f974ef0fa28796bb3b072b5 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 7 Apr 2025 09:11:35 +0800 Subject: [PATCH 15/29] fix:chatTest --- changelog.md | 11 +++ src/views/home/chatTest.vue | 185 ++++++++++++++++++++++++++++++++++++ 2 files changed, 196 insertions(+) create mode 100644 src/views/home/chatTest.vue diff --git a/changelog.md b/changelog.md index 90e51275..3ff43142 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,14 @@ +## 2.6.2025040316 + +- fix: 问题修复 + - 出入库时物料选择更换组件xselect [shijing] + - 批次统计完善 [shijing] + - fix：性能检验析晶选型纠正 [shijing] + - dag优化 [shijing] + - 成品检验时批次选择实用xselect组件 [shijing] + - 登录页展示前后端版本号 [shijing] + - 扭转工段mlog中不填设备和人员；mlogb中选择设备、操作人、开始时间和结束时间 [shijing] + - 检验表中添加检验物料搜索时，展示full_name [shijing] ## 2.6.2025040209 - feat: 新增功能 diff --git a/src/views/home/chatTest.vue b/src/views/home/chatTest.vue new file mode 100644 index 00000000..2ed95270 --- /dev/null +++ b/src/views/home/chatTest.vue @@ -0,0 +1,185 @@ + + + \ No newline at end of file From d769ae239b26ae5ea8d230f2791b091814ca3ab6 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 7 Apr 2025 15:43:59 +0800 Subject: [PATCH 16/29] =?UTF-8?q?fix:=E5=B7=A5=E8=89=BA=E8=B7=AF=E7=BA=BF?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=97=B6=E5=B1=95=E7=A4=BA=E8=BF=BD=E8=B8=AA?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mtm/routepack_form.vue | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/views/mtm/routepack_form.vue b/src/views/mtm/routepack_form.vue index 5d76ed91..11265d62 100644 --- a/src/views/mtm/routepack_form.vue +++ b/src/views/mtm/routepack_form.vue @@ -134,6 +134,11 @@ + + + @@ -230,6 +235,10 @@ export default { rules: { name: [{ required: true, message: "请输入" }], }, + tracking_:{ + 10:"批次", + 20:"单个", + }, nodes:[], edges:[], routepack: "", From c9497ba140e69bd8c37d6ec90b60845c6792aa46 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 7 Apr 2025 15:51:15 +0800 Subject: [PATCH 17/29] =?UTF-8?q?feat:=E8=AE=BE=E5=A4=87=E7=9A=84=E7=9B=91?= =?UTF-8?q?=E6=B5=8B=E7=82=B9=E5=AE=9E=E6=97=B6=E6=95=B0=E6=8D=AE=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/mlogs.vue | 40 ++++++++-- src/views/wpm_bx/monitor_detail.vue | 112 ++++++++++++++++++++++++++++ 2 files changed, 145 insertions(+), 7 deletions(-) create mode 100644 src/views/wpm_bx/monitor_detail.vue diff --git a/src/views/wpm_bx/mlogs.vue b/src/views/wpm_bx/mlogs.vue index f5345901..d85529d8 100644 --- a/src/views/wpm_bx/mlogs.vue +++ b/src/views/wpm_bx/mlogs.vue @@ -121,15 +121,14 @@ width="150" > + + From fd237101b085de15669be3d14d1b34dc46fba321 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 7 Apr 2025 16:10:02 +0800 Subject: [PATCH 18/29] =?UTF-8?q?fix:=E4=BC=9A=E8=AF=9D=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/chatTest.vue | 69 ++++++++++++++++++++----------------- 1 file changed, 37 insertions(+), 32 deletions(-) diff --git a/src/views/home/chatTest.vue b/src/views/home/chatTest.vue index 2ed95270..dfca0b0d 100644 --- a/src/views/home/chatTest.vue +++ b/src/views/home/chatTest.vue @@ -1,45 +1,48 @@