From f1a65e94d0a05861e9d2ea303fd55662b31c6f2b Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Sat, 20 Jan 2024 22:29:52 +0800
Subject: [PATCH 1/5] =?UTF-8?q?feat:=20=E6=B7=B7=E6=96=99=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=AE=8C=E6=95=B4=E7=89=A9=E6=96=99=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm/mlog_hun.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wpm/mlog_hun.vue b/src/views/wpm/mlog_hun.vue
index 7efdc0c6..c2a0aaf5 100644
--- a/src/views/wpm/mlog_hun.vue
+++ b/src/views/wpm/mlog_hun.vue
@@ -14,7 +14,7 @@
                         </el-table-column>
                         <el-table-column label="产物" prop="material" show-overflow-tooltip>
                             <template #default="scope"><span v-if="scope.row.material_out_">{{
-                                scope.row.material_out_.name
+                                scope.row.material_out_.full_name
                             }}</span>
                             </template>
                         </el-table-column>
@@ -65,7 +65,7 @@
                         </el-table-column>
                         <el-table-column label="产物" prop="material" show-overflow-tooltip>
                             <template #default="scope"><span v-if="scope.row.material_">{{
-                                scope.row.material_.name
+                                scope.row.material_.full_name
                             }}</span>
                             </template>
                         </el-table-column>

From 0a47b93517f3886ca8c9ada6686e8b679c7ad849 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Sat, 20 Jan 2024 22:30:48 +0800
Subject: [PATCH 2/5] =?UTF-8?q?feat:=20=E9=80=80=E7=81=AB=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=AE=8C=E6=95=B4=E7=89=A9=E6=96=99=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm/mlog_tui.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wpm/mlog_tui.vue b/src/views/wpm/mlog_tui.vue
index a92aa826..aca24083 100644
--- a/src/views/wpm/mlog_tui.vue
+++ b/src/views/wpm/mlog_tui.vue
@@ -13,7 +13,7 @@
                         <el-table-column label="物料名" prop="material_out_name">
                             <template #default="scope">
                                 <span v-if="scope.row.material_out_">
-                                    {{ scope.row.material_out_.name }}
+                                    {{ scope.row.material_out_.full_name }}
                                 </span>
                             </template>
                         </el-table-column>
@@ -67,7 +67,7 @@
                                 <el-table-column label="产物" prop="material" show-overflow-tooltip>
                                     <template #default="scope">
                                         <span v-if="scope.row.material_out_">
-                                            {{ scope.row.material_out_.name }}
+                                            {{ scope.row.material_out_.full_name }}
                                         </span>
                                     </template>
                                 </el-table-column>

From d9cf2d8b724f8ddb454f1706b22e47deb2774452 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Sat, 20 Jan 2024 22:31:36 +0800
Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E8=B7=AF=E7=BA=BF=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9Eitem=E9=9C=80=E8=A6=81=E4=BD=BF=E7=94=A8value?=
 =?UTF-8?q?-key?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm/worktask_form.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/wpm/worktask_form.vue b/src/views/wpm/worktask_form.vue
index 7f65e39e..e37d0d70 100644
--- a/src/views/wpm/worktask_form.vue
+++ b/src/views/wpm/worktask_form.vue
@@ -38,6 +38,7 @@
           <el-form-item label="生产路线" v-if="mode == 'add'">
             <el-select
               v-model="currentRoute"
+              value-key="id"
               placeholder="生产路线"
               clearable
               filterable
@@ -48,7 +49,7 @@
                 v-for="item in routeOptions"
                 :key="item.id"
                 :label="item.label"
-                :value="item.id"
+                :value="item"
               ></el-option>
             </el-select>
           </el-form-item>
@@ -174,8 +175,10 @@
           <el-form-item label="生产路线" v-if="mode == 'add'">
             <el-select
               v-model="currentRoute"
+              value-key="id"
               placeholder="生产路线"
               filterable
+              clearable
               style="width: 100%"
               @change="routeChange"
             >

From 03698ba1092d4526ce94a24694ea54f27d41d6d5 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Sat, 20 Jan 2024 22:39:54 +0800
Subject: [PATCH 4/5] =?UTF-8?q?fix:=20count=5Fn=5Fw=E6=94=B9=E4=B8=BAcount?=
 =?UTF-8?q?=5Fn=5Fwq?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm/mlog6_form.vue        | 6 +++---
 src/views/wpm/mlog_dept6_detail.vue | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/wpm/mlog6_form.vue b/src/views/wpm/mlog6_form.vue
index c12e7c4b..c6022371 100644
--- a/src/views/wpm/mlog6_form.vue
+++ b/src/views/wpm/mlog6_form.vue
@@ -430,7 +430,7 @@
         <el-col :md="12" :sm="24" v-if="material_name.indexOf('管')>-1">
           <el-form-item label="弯">
             <el-input-number
-              v-model="form.count_n_w"
+              v-model="form.count_n_wq"
               controls-position="right"
               :min="0"
               :step="1"
@@ -517,7 +517,7 @@ export default {
         count_n_tydd:0,//椭圆度大
         count_n_sw:0,//水雾
         count_n_bhpcd:0,//壁厚偏差大
-        count_n_w:0,//弯
+        count_n_wq:0,//弯
 
         handle_user:''
       },
@@ -634,7 +634,7 @@ export default {
       Number(this.form.count_n_tydd)+
       Number(this.form.count_n_sw)+
       Number(this.form.count_n_bhpcd)+
-      Number(this.form.count_n_w)
+      Number(this.form.count_n_wq)
       ;
     },
     //提交
diff --git a/src/views/wpm/mlog_dept6_detail.vue b/src/views/wpm/mlog_dept6_detail.vue
index 3513adce..d2e4d756 100644
--- a/src/views/wpm/mlog_dept6_detail.vue
+++ b/src/views/wpm/mlog_dept6_detail.vue
@@ -67,7 +67,7 @@
                 <el-table-column prop="count_n_tydd" label="椭圆度大" />
                 <el-table-column prop="count_n_sw" label="水雾" />
                 <el-table-column prop="count_n_bhpcd" label="壁厚偏差大" />
-                <el-table-column prop="count_n_w" label="弯" />
+                <el-table-column prop="count_n_wq" label="弯" />
               </template>
             </el-table-column>
             <el-table-column label="操作人" prop="update_by_name"></el-table-column>

From 1d896185a241162982073c17d1cf281cc88a9ab2 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Sat, 20 Jan 2024 22:50:02 +0800
Subject: [PATCH 5/5] =?UTF-8?q?fix:=206=E8=BD=A6=E9=97=B4=E7=82=B8?=
 =?UTF-8?q?=E7=BA=B9=E6=9C=AA=E7=BA=B3=E5=85=A5count=5Fok=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm/mlog6_form.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/wpm/mlog6_form.vue b/src/views/wpm/mlog6_form.vue
index c6022371..b39ebc03 100644
--- a/src/views/wpm/mlog6_form.vue
+++ b/src/views/wpm/mlog6_form.vue
@@ -634,7 +634,8 @@ export default {
       Number(this.form.count_n_tydd)+
       Number(this.form.count_n_sw)+
       Number(this.form.count_n_bhpcd)+
-      Number(this.form.count_n_wq)
+      Number(this.form.count_n_wq)+
+      Number(this.form.count_n_zw)
       ;
     },
     //提交