From 6f717b03ec5bbfe847c4166f33fecab87a7d22b7 Mon Sep 17 00:00:00 2001 From: shijing Date: Fri, 1 Nov 2024 09:11:17 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:fmlog=E6=97=A5=E5=BF=97=E4=B8=AD?= =?UTF-8?q?=E7=BC=96=E8=BE=91mlog=E6=97=B6=E5=8F=96=E6=B6=88=E9=A2=86?= =?UTF-8?q?=E6=96=99=E6=95=B0=E9=87=8F=E4=B8=8D=E8=83=BD=E5=A4=A7=E4=BA=8E?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E5=B7=A5=E6=AE=B5=E5=BA=93=E5=AD=98=E6=95=B0?= =?UTF-8?q?=E7=9A=84=E9=99=90=E5=88=B6=EF=BC=8C=E4=B8=94=E5=90=88=E6=A0=BC?= =?UTF-8?q?=E4=B8=8D=E5=90=88=E6=A0=BC=E7=A6=81=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_gx/f_mlogs_form.vue | 34 ++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/src/views/wpm_gx/f_mlogs_form.vue b/src/views/wpm_gx/f_mlogs_form.vue index 75319b36..fd21c3e8 100644 --- a/src/views/wpm_gx/f_mlogs_form.vue +++ b/src/views/wpm_gx/f_mlogs_form.vue @@ -131,8 +131,7 @@ - @@ -176,9 +174,8 @@ @@ -397,7 +394,7 @@ export default { work_end_time:[{required: true,message: "请选择生产开始时间",trigger: "blur",},], route: [{required: true,message: "请选择工艺路线",trigger: "blur",},] }, - materialCount:1, + materialCount:1,//领料批次现有库存数 material_in:'', material_out:'', shiftOtions:[], @@ -475,8 +472,21 @@ export default { let that = this; that.materialOptions.forEach(item=>{ if(item.id == val){ - that.materialCount = item.count; - that.form.count_use = item.count; + that.form.count_n_hs = + that.form.count_n_qp = + that.form.count_n_swen = + that.form.count_n_bb = + that.form.count_n_xbb = + that.form.count_n_md = + that.form.count_n_xh = + that.form.count_n_ps = + that.form.count_n_zq = + that.form.count_n_qt = + that.form.count_n_wm=0; + that.materialCount = + that.form.count_use = + that.form.count_real = + that.form.count_ok = item.count; that.form.count_real = item.count-that.form.count_pn_jgqbl; } }) @@ -512,9 +522,9 @@ export default { this.form.count_n_wm; this.form.count_ok = this.form.count_real - this.form.count_notok; }, - countChanges(){ - this.form.count_ok = this.form.count_real - this.form.count_notok; - }, + // countChanges(){ + // this.form.count_ok = this.form.count_real - this.form.count_notok; + // }, //表单提交方法 submit() { let that = this; From 7cb112bde80e2be0e5532f51515f3e6233a7a8c1 Mon Sep 17 00:00:00 2001 From: shijing Date: Fri, 1 Nov 2024 09:24:04 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=E5=87=BA=E5=85=A5=E5=BA=93=E5=90=8E?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=BA=93=E5=AD=98=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_gx/inm.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/wpm_gx/inm.vue b/src/views/wpm_gx/inm.vue index 70a944cb..74838781 100644 --- a/src/views/wpm_gx/inm.vue +++ b/src/views/wpm_gx/inm.vue @@ -317,7 +317,10 @@ export default { this.dialog.scrap = false; this.$refs.table.refresh(); }, - handleinmSuccess(){}, + //出入库后刷新页面 + handleinmSuccess(){ + this.$refs.table.refresh(); + }, //搜索 handleQuery() { this.$refs.table.queryData(this.query); From d7965ef1705009b6f0d61350d66d5bf1ee710296 Mon Sep 17 00:00:00 2001 From: shijing Date: Fri, 1 Nov 2024 09:26:17 +0800 Subject: [PATCH 3/5] fix:coding507 --- src/views/mtm/process.vue | 24 +++++++++++++++--------- src/views/wpm_gx/handover.vue | 1 + 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/views/mtm/process.vue b/src/views/mtm/process.vue index b81cdd54..d3fa094d 100644 --- a/src/views/mtm/process.vue +++ b/src/views/mtm/process.vue @@ -49,26 +49,32 @@ > diff --git a/src/views/wpm_gx/handover.vue b/src/views/wpm_gx/handover.vue index 0f2b01ec..2d26c035 100644 --- a/src/views/wpm_gx/handover.vue +++ b/src/views/wpm_gx/handover.vue @@ -14,6 +14,7 @@ icon="el-icon-plus" @click="table_add(20)" v-auth="'handover.create'" + v-if="mgroupName!=='切片'" >返工 Date: Fri, 1 Nov 2024 09:26:50 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9xtSelect=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/{xSelect => xtSelect}/index.vue | 0 src/components/{xSelect => xtSelect}/index2.vue | 0 src/xui.js | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename src/components/{xSelect => xtSelect}/index.vue (100%) rename src/components/{xSelect => xtSelect}/index2.vue (100%) diff --git a/src/components/xSelect/index.vue b/src/components/xtSelect/index.vue similarity index 100% rename from src/components/xSelect/index.vue rename to src/components/xtSelect/index.vue diff --git a/src/components/xSelect/index2.vue b/src/components/xtSelect/index2.vue similarity index 100% rename from src/components/xSelect/index2.vue rename to src/components/xtSelect/index2.vue diff --git a/src/xui.js b/src/xui.js index 7c01d58e..6f3298cf 100644 --- a/src/xui.js +++ b/src/xui.js @@ -2,13 +2,13 @@ import ehsUserSelect from './components/ehsSelect/userselect' import ehsEpSelect from './components/ehsSelect/epselect' import ehsSelect from './components/ehsSelect/select' import ehsTableSelect from './components/ehsSelect/tableSelect' -import xSelect from './components/xSelect/index.vue' +import xtSelect from './components/xtSelect/index.vue' export default { install(app) { app.component('ehsUserSelect', ehsUserSelect); app.component('ehsEpSelect', ehsEpSelect); app.component('ehsSelect', ehsSelect); app.component('ehsTableSelect', ehsTableSelect); - app.component('xSelect', xSelect); + app.component('xtSelect', xtSelect); } } From ddb83f7eb4de371e6c6ed678682037c0fd7aaf79 Mon Sep 17 00:00:00 2001 From: shijing Date: Fri, 1 Nov 2024 14:35:53 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=E6=B5=81=E7=A8=8B=E5=9B=BE=E6=94=B9?= =?UTF-8?q?=E5=8A=A8=EF=BC=88=E6=8A=BD=E5=87=BA=E7=BB=84=E4=BB=B6=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wf/degraD3.vue | 229 ++++++++++++++++++++++++++++++++++++++ src/views/wf/workflow.vue | 200 +++++---------------------------- 2 files changed, 254 insertions(+), 175 deletions(-) create mode 100644 src/views/wf/degraD3.vue diff --git a/src/views/wf/degraD3.vue b/src/views/wf/degraD3.vue new file mode 100644 index 00000000..98b198e5 --- /dev/null +++ b/src/views/wf/degraD3.vue @@ -0,0 +1,229 @@ + + + + + diff --git a/src/views/wf/workflow.vue b/src/views/wf/workflow.vue index bb1ad2c6..2cb8c95c 100644 --- a/src/views/wf/workflow.vue +++ b/src/views/wf/workflow.vue @@ -83,7 +83,7 @@ link size="small" type="primary" - @click="handleWatch(scope)" + @click="handleWatch(scope.row)" > 流程图 @@ -106,23 +106,14 @@ -
-
-
- 工作流流程图 -
-
- -
-
-
+ + @@ -487,44 +375,6 @@ export default { -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.5); background-color: #f5f5f5; } - -.svgMark { - width: 100%; - height: 100%; - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - overflow: auto; - margin: 0; - z-index: 2000; - background: rgba(0, 0, 0, 0.3); -} - -.svgWrapper { - background: #fff; - width: 800px; - margin: 5vh auto; - height: 90vh; - text-align: center; - border-radius: 2px; - overflow-y: scroll; -} - -.svgItem { - padding: 20px 40px 0; - font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, - Microsoft YaHei, Arial, sans-serif; - font-size: 18px; - display: flex; - justify-content: space-between; -} - -svg { - font-size: 14px; -} - .node rect { stroke: #606266; fill: #fff;