From 17218d6e600458f0275b8adb53611be11db650cc Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 13 Aug 2024 09:35:46 +0800
Subject: [PATCH 1/5] =?UTF-8?q?fix:=20mioitem=20form=20=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E6=97=A0=E5=8F=8D=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inm/mioitem.vue      | 1 +
 src/views/inm/mioitem_form.vue | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/inm/mioitem.vue b/src/views/inm/mioitem.vue
index 447b4791..f7761a94 100644
--- a/src/views/inm/mioitem.vue
+++ b/src/views/inm/mioitem.vue
@@ -66,6 +66,7 @@
 							>新增</el-button
 						>
 					</div>
+					<div style="height: 8px"></div>
 					<scTable
 						ref="table"
 						:apiObj="apiObj"
diff --git a/src/views/inm/mioitem_form.vue b/src/views/inm/mioitem_form.vue
index 6c400a16..b5457999 100644
--- a/src/views/inm/mioitem_form.vue
+++ b/src/views/inm/mioitem_form.vue
@@ -173,7 +173,7 @@
 			<el-button type="primary" :loading="isSaveing" @click="submit">
 				保存
 			</el-button>
-			<el-button @click="dialogVisible = false">取消</el-button>
+			<el-button @click="visible = false">取消</el-button>
 		</template>
 	</el-dialog>
 </template>

From d6d1f9231d78ceb32edcca25aac431e11eed58e1 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 13 Aug 2024 09:42:44 +0800
Subject: [PATCH 2/5] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/icons/Shebei.vue | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/assets/icons/Shebei.vue b/src/assets/icons/Shebei.vue
index 20b90aa4..28b735bd 100644
--- a/src/assets/icons/Shebei.vue
+++ b/src/assets/icons/Shebei.vue
@@ -1,8 +1,5 @@
 <template>
-	<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 32 32">
-		<g fill="currentColor">
-			<path d="M24.37 13.49a1.62 1.62 0 1 1-3.24 0a1.62 1.62 0 0 1 3.24 0M11.5 8.5a1.99 1.99 0 1 0 0-3.98a1.99 1.99 0 0 0 0 3.98m4.715 18a.75.75 0 1 0 0-1.5a.75.75 0 0 0 0 1.5" />
-			<path d="M6 6.462C6.025 3.444 8.512.976 11.538 1h.002a5.53 5.53 0 0 1 3.188 1.05l.006.006l.103.077l.02.02l10.48 7.9l.007.004l.031.025l.003.001a4.303 4.303 0 0 1 .968 5.764l-3.258 5.66a4.29 4.29 0 0 1-4.633 2.047l.024.03l3.774 3.317c.079.07.174.102.259.1H23c1.102 0 2 .897 2 2c0 1.101-.898 2-2 2h-7.89A2.107 2.107 0 0 1 13 28.89v-3.48c0-1.682 1.393-3 3.055-3q.153 0 .305.015a4.29 4.29 0 0 1-.715-5.216l1.531-2.65l-1.026-.809a.25.25 0 0 0-.193-.036l-.73.178h-.003a4.03 4.03 0 0 1-3.073-.503l-3.58-2.23l-.004-.003A5.5 5.5 0 0 1 6 6.464zm2 .015a3.5 3.5 0 0 0 1.631 2.986l.002.001l3.576 2.227a2.02 2.02 0 0 0 1.546.257h.001l.751-.183a2.25 2.25 0 0 1 1.835.379l.014.01l2.418 1.907l-.001.004l1.79 1.375c.281.207.661.395 1.044.53c.391.138.733.203.935.2q.165-.001.322-.02l.781-1.357l.019-.028a2.3 2.3 0 0 0-.49-3.083l-.08-.055l-.031-.03l-10.52-7.93l-.017-.017A3.53 3.53 0 0 0 11.521 3C9.608 2.985 8.016 4.557 8 6.477m9.376 11.734a2.293 2.293 0 0 0 .843 3.133a2.294 2.294 0 0 0 3.133-.831l1.932-3.356a4.6 4.6 0 0 1-1.01-.244a5.2 5.2 0 0 1-1.31-.672l-.007-.005l-1.69-1.298zM15 25.41v1.726c.29.179.63.303 1 .363c.336.055.234.5 0 .5h-1v.89c0 .062.046.11.11.11h7.342a2.4 2.4 0 0 1-1.523-.6h-.002l-3.932-3.457l-.067-.093a1.07 1.07 0 0 0-.873-.44c-.608 0-1.055.473-1.055 1" />
-		</g>
+	<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24">
+		<path fill="currentColor" d="M3.975 21v-3h3.1l-2.55-8.35q-.675-.375-1.112-1.1T2.975 7q0-1.25.875-2.125T5.975 4q.975 0 1.738.563T8.775 6h3.2V5q0-.425.288-.712T12.975 4q.225 0 .438.1t.362.3l1.7-1.6q.225-.225.538-.288t.612.088l3.9 1.8q.3.15.413.438t-.013.562q-.15.3-.437.388t-.563-.038l-3.6-1.65l-2.35 2.2v1.4l2.35 2.15l3.6-1.65q.275-.125.575-.025t.425.375q.15.3.025.575t-.425.425l-3.9 1.85q-.3.15-.612.087t-.538-.287l-1.7-1.6q-.15.15-.362.275t-.438.125q-.425 0-.712-.287T11.975 9V8h-3.2q-.075.2-.162.375t-.238.375l5 9.25h3.6v3zm2-13q.425 0 .713-.288T6.975 7t-.287-.712T5.975 6t-.712.288T4.975 7t.288.713t.712.287" />
 	</svg>
 </template>

From 009e2c05bbc58a5341d2574a7d3968b40abab5e2 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 13 Aug 2024 09:56:19 +0800
Subject: [PATCH 3/5] =?UTF-8?q?fix:=20handover=20form=20wm=E5=81=9A?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/handover_form.vue | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/views/wpm_gx/handover_form.vue b/src/views/wpm_gx/handover_form.vue
index 97b5cac1..dac1620d 100644
--- a/src/views/wpm_gx/handover_form.vue
+++ b/src/views/wpm_gx/handover_form.vue
@@ -19,6 +19,7 @@
 						<el-select
 							v-model="form.wm"
 							placeholder="交接物料"
+							filterable
 							clearable
 							style="width: 100%"
 							@change="materialChange"
@@ -276,8 +277,19 @@ export default {
 		//获取车间物料
 		getMaterial() {
 			let that = this;
+			var req = {
+				mgroupx: that.mgroupId,
+				page: 0,
+			};
+			if (this.type == 10) {
+				req.notok_sign__isnull = 1;
+			} else if (this.type == 20) {
+				req.notok_sign__isnull = 0;}
+				else if (this.type == 30) {
+				req.notok_sign__isnull = 1;
+			}
 			this.$API.wpm.wmaterial.list
-				.req({ mgroupx: that.mgroupId, page: 0 })
+				.req(req)
 				.then((res) => {
 					that.materialOptions = res;
 				});

From 28516c89dd37a43ff0bcb4cb6b9947bf1c1030a3 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 13 Aug 2024 10:33:48 +0800
Subject: [PATCH 4/5] =?UTF-8?q?feat:=20wpm=5Fgx=20mlog=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/chaoxi.vue   |  4 ++--
 src/views/wpm_gx/chaoxi2.vue  |  4 ++--
 src/views/wpm_gx/chaoxi3.vue  |  4 ++--
 src/views/wpm_gx/daojiao.vue  |  4 ++--
 src/views/wpm_gx/handover.vue |  1 +
 src/views/wpm_gx/heihua.vue   |  4 ++--
 src/views/wpm_gx/jianbo.vue   |  4 ++--
 src/views/wpm_gx/jingdiao.vue |  4 ++--
 src/views/wpm_gx/mlogs.vue    | 21 +++++++++++----------
 src/views/wpm_gx/mopao.vue    |  4 ++--
 src/views/wpm_gx/mtask.vue    | 18 +++---------------
 src/views/wpm_gx/qiepian.vue  |  4 ++--
 src/views/wpm_gx/saobian.vue  |  4 ++--
 src/views/wpm_gx/shaojie.vue  |  4 ++--
 14 files changed, 37 insertions(+), 47 deletions(-)

diff --git a/src/views/wpm_gx/chaoxi.vue b/src/views/wpm_gx/chaoxi.vue
index 1c2d1429..25f9dc35 100644
--- a/src/views/wpm_gx/chaoxi.vue
+++ b/src/views/wpm_gx/chaoxi.vue
@@ -12,12 +12,12 @@
 			<mlogs
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 60%"
 			></mlogs>
 			<mtask
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 40%"
 			></mtask>
 			<!-- 交接记录 -->
 			<handover
diff --git a/src/views/wpm_gx/chaoxi2.vue b/src/views/wpm_gx/chaoxi2.vue
index 9a9f64ab..160ad744 100644
--- a/src/views/wpm_gx/chaoxi2.vue
+++ b/src/views/wpm_gx/chaoxi2.vue
@@ -12,12 +12,12 @@
 			<mlogs
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 60%"
 			></mlogs>
 			<mtask
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 40%"
 			></mtask>
 			<!-- 交接记录 -->
 			<handover
diff --git a/src/views/wpm_gx/chaoxi3.vue b/src/views/wpm_gx/chaoxi3.vue
index 03a62136..fb1f8ddf 100644
--- a/src/views/wpm_gx/chaoxi3.vue
+++ b/src/views/wpm_gx/chaoxi3.vue
@@ -12,12 +12,12 @@
 			<mlogs
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 60%"
 			></mlogs>
 			<mtask
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 40%"
 			></mtask>
 			<!-- 交接记录 -->
 			<handover
diff --git a/src/views/wpm_gx/daojiao.vue b/src/views/wpm_gx/daojiao.vue
index 2fba2562..73a95b50 100644
--- a/src/views/wpm_gx/daojiao.vue
+++ b/src/views/wpm_gx/daojiao.vue
@@ -12,12 +12,12 @@
 			<mlogs
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 60%"
 			></mlogs>
 			<mtask
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 40%"
 			></mtask>
 			<!-- 交接记录 -->
 			<handover
diff --git a/src/views/wpm_gx/handover.vue b/src/views/wpm_gx/handover.vue
index 10a1f622..02ca8232 100644
--- a/src/views/wpm_gx/handover.vue
+++ b/src/views/wpm_gx/handover.vue
@@ -82,6 +82,7 @@
 							type="primary"
 							>交送</el-text
 						>
+						<span style="width: 4px;"></span>
 						<el-text
 							v-if="scope.row.recive_mgroup == mgroupId"
 							type="success"
diff --git a/src/views/wpm_gx/heihua.vue b/src/views/wpm_gx/heihua.vue
index a3863d3a..1a708034 100644
--- a/src/views/wpm_gx/heihua.vue
+++ b/src/views/wpm_gx/heihua.vue
@@ -12,12 +12,12 @@
 			<mlogs
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 60%"
 			></mlogs>
 			<mtask
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 40%"
 			></mtask>
 			<!-- 交接记录 -->
 			<handover
diff --git a/src/views/wpm_gx/jianbo.vue b/src/views/wpm_gx/jianbo.vue
index cf785ed7..dcb2e739 100644
--- a/src/views/wpm_gx/jianbo.vue
+++ b/src/views/wpm_gx/jianbo.vue
@@ -12,12 +12,12 @@
 			<mlogs
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 60%"
 			></mlogs>
 			<mtask
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 40%"
 			></mtask>
 			<!-- 交接记录 -->
 			<handover
diff --git a/src/views/wpm_gx/jingdiao.vue b/src/views/wpm_gx/jingdiao.vue
index dbd2c523..24e2297a 100644
--- a/src/views/wpm_gx/jingdiao.vue
+++ b/src/views/wpm_gx/jingdiao.vue
@@ -12,12 +12,12 @@
 			<mlogs
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 60%"
 			></mlogs>
 			<mtask
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 40%"
 			></mtask>
 			<!-- 交接记录 -->
 			<handover
diff --git a/src/views/wpm_gx/mlogs.vue b/src/views/wpm_gx/mlogs.vue
index 59faf69e..940ab98a 100644
--- a/src/views/wpm_gx/mlogs.vue
+++ b/src/views/wpm_gx/mlogs.vue
@@ -41,17 +41,13 @@
 				<el-table-column
 					label="生产路线"
 					prop="material_out_name"
-					min-width="100"
+					min-width="130"
 				>
 				</el-table-column>
 				<el-table-column
 					label="预计工时"
 					prop="hour_work"
-				></el-table-column>
-				<el-table-column
-					label="工段名称"
-					prop="mgroup_name"
-					min-width="100"
+					width="80"
 				></el-table-column>
 				<el-table-column
 					label="生产设备"
@@ -59,12 +55,17 @@
 					min-width="150"
 				></el-table-column>
 				<el-table-column
-					label="所属部门"
+					label="部门/工段"
 					prop="belong_dept_name"
-				></el-table-column>
+				>
+				<template #default="scope">
+					{{scope.row.belong_dept_name}}/{{scope.row.mgroup_name}}
+				</template>
+				</el-table-column>
 				<el-table-column
 					label="处理人"
 					prop="handle_user_name"
+					width="80"
 				></el-table-column>
 				<el-table-column
 					label="开始时间"
@@ -74,10 +75,10 @@
 					label="结束时间"
 					prop="work_end_time"
 				></el-table-column>
-				<el-table-column
+				<!-- <el-table-column
 					label="创建时间"
 					prop="create_time"
-				></el-table-column>
+				></el-table-column> -->
 				<el-table-column
 					label="操作"
 					fixed="right"
diff --git a/src/views/wpm_gx/mopao.vue b/src/views/wpm_gx/mopao.vue
index 718254df..e983c6ef 100644
--- a/src/views/wpm_gx/mopao.vue
+++ b/src/views/wpm_gx/mopao.vue
@@ -12,12 +12,12 @@
 			<mlogs
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 60%"
 			></mlogs>
 			<mtask
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 40%"
 			></mtask>
 			<!-- 交接记录 -->
 			<handover
diff --git a/src/views/wpm_gx/mtask.vue b/src/views/wpm_gx/mtask.vue
index 1a50da76..3951f11f 100644
--- a/src/views/wpm_gx/mtask.vue
+++ b/src/views/wpm_gx/mtask.vue
@@ -1,8 +1,5 @@
 <template>
 	<el-container>
-		<el-header>
-			<h2>任务列表</h2>
-		</el-header>
 		<el-main>
 			<scTable
 				ref="table"
@@ -12,25 +9,16 @@
 				:params="params"
 			>
 				<el-table-column
-					label="#"
+					label="任务列表"
 					type="index"
-					width="50"
+					width="80"
 				></el-table-column>
 				<el-table-column
-					label="产品名称"
+					label="产品名"
 					prop="material_out_name"
 					show-overflow-tooltip
 				>
 				</el-table-column>
-				<el-table-column label="型号规格">
-					<template #default="scope">
-						<span v-if="scope.row.material_out_"
-							>{{ scope.row.material_out_.specification }}|{{
-								scope.row.material_out_.model
-							}}</span
-						>
-					</template>
-				</el-table-column>
 				<el-table-column
 					label="任务编号"
 					prop="number"
diff --git a/src/views/wpm_gx/qiepian.vue b/src/views/wpm_gx/qiepian.vue
index 4dd98842..1c1d319a 100644
--- a/src/views/wpm_gx/qiepian.vue
+++ b/src/views/wpm_gx/qiepian.vue
@@ -12,12 +12,12 @@
 			<mlogs
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 60%"
 			></mlogs>
 			<mtask
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 40%"
 			></mtask>
 			<!-- 交接记录 -->
 			<handover
diff --git a/src/views/wpm_gx/saobian.vue b/src/views/wpm_gx/saobian.vue
index e2529f39..00a225f5 100644
--- a/src/views/wpm_gx/saobian.vue
+++ b/src/views/wpm_gx/saobian.vue
@@ -12,12 +12,12 @@
 			<mlogs
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 60%"
 			></mlogs>
 			<mtask
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 40%"
 			></mtask>
 			<!-- 交接记录 -->
 			<handover
diff --git a/src/views/wpm_gx/shaojie.vue b/src/views/wpm_gx/shaojie.vue
index d2a0419a..1939edab 100644
--- a/src/views/wpm_gx/shaojie.vue
+++ b/src/views/wpm_gx/shaojie.vue
@@ -12,12 +12,12 @@
 			<mlogs
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 60%"
 			></mlogs>
 			<mtask
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 40%"
 			></mtask>
 			<!-- 交接记录 -->
 			<handover

From 1a0b85b9a1d3cbfde2c22e9dd1bdc4b8e8205d5c Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 13 Aug 2024 10:46:03 +0800
Subject: [PATCH 5/5] =?UTF-8?q?feat:=20=E7=95=8C=E9=9D=A2=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pm/utask.vue           |  2 +-
 src/views/pm/utask_form.vue      |  8 ++++----
 src/views/wpm/worktask_form.vue  | 12 ++++++------
 src/views/wpm_gx/handover.vue    | 12 +++++++-----
 src/views/wpm_gx/mlog_detail.vue |  1 +
 src/views/wpm_gx/mlog_form.vue   |  6 +++---
 src/views/wpm_gx/mlogb_check.vue |  1 +
 src/views/wpm_gx/mlogs.vue       |  2 +-
 8 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/views/pm/utask.vue b/src/views/pm/utask.vue
index 2578ba16..55ef5709 100644
--- a/src/views/pm/utask.vue
+++ b/src/views/pm/utask.vue
@@ -65,7 +65,7 @@
 						>
 						</el-table-column>
 						<el-table-column
-							label="生产工艺"
+							label="工艺路线"
 							prop="material_"
 							min-width="150"
 							show-overflow-tooltip
diff --git a/src/views/pm/utask_form.vue b/src/views/pm/utask_form.vue
index 383aa4d9..2fa944c8 100644
--- a/src/views/pm/utask_form.vue
+++ b/src/views/pm/utask_form.vue
@@ -40,7 +40,7 @@
 							</el-option>
 						</el-select>
 					</el-form-item>
-					<el-form-item label="生产路线" prop="route" v-else>
+					<el-form-item label="工艺路线" prop="route" v-else>
 						<el-input
 							v-if="type == 'routepack'"
 							disabled
@@ -150,15 +150,15 @@ export default {
 			setFiltersVisible: false,
 			belong_dept_options: [],
 			group: [],
-			routeText: "生产工艺",
+			routeText: "工艺路线",
 		};
 	},
 	mounted() {
 		if (this.type == "routepack") {
-			this.routeText = "生产工艺";
+			this.routeText = "工艺路线";
 			this.getRoutePackes();
 		} else {
-			this.routeText = "生产路线";
+			this.routeText = "工艺路线";
 			this.getRouteOptions();
 		}
 	},
diff --git a/src/views/wpm/worktask_form.vue b/src/views/wpm/worktask_form.vue
index cb9dbf62..b47aa7c9 100644
--- a/src/views/wpm/worktask_form.vue
+++ b/src/views/wpm/worktask_form.vue
@@ -17,11 +17,11 @@
 		>
 			<el-row>
 				<el-col :md="12" :sm="24">
-					<el-form-item label="生产路线" v-if="mode == 'add'">
+					<el-form-item label="工艺路线" v-if="mode == 'add'">
 						<el-select
 							v-model="currentRoute"
 							value-key="id"
-							placeholder="生产路线"
+							placeholder="工艺路线"
 							clearable
 							filterable
 							style="width: 100%"
@@ -35,7 +35,7 @@
 							></el-option>
 						</el-select>
 					</el-form-item>
-					<el-form-item label="生产路线" v-if="mode == 'edit'">
+					<el-form-item label="工艺路线" v-if="mode == 'edit'">
 						<span
 							>{{ form.material_in_name }}->{{
 								form.material_out_name
@@ -149,11 +149,11 @@
 		>
 			<el-row>
 				<el-col :md="12" :sm="24">
-					<el-form-item label="生产路线" v-if="mode == 'add'">
+					<el-form-item label="工艺路线" v-if="mode == 'add'">
 						<el-select
 							v-model="currentRoute"
 							value-key="id"
-							placeholder="生产路线"
+							placeholder="工艺路线"
 							filterable
 							clearable
 							style="width: 100%"
@@ -167,7 +167,7 @@
 							></el-option>
 						</el-select>
 					</el-form-item>
-					<el-form-item label="生产路线" v-if="mode == 'edit'">
+					<el-form-item label="工艺路线" v-if="mode == 'edit'">
 						<span
 							>{{ form.material_in_name }}->{{
 								form.material_out_name
diff --git a/src/views/wpm_gx/handover.vue b/src/views/wpm_gx/handover.vue
index 02ca8232..701027cd 100644
--- a/src/views/wpm_gx/handover.vue
+++ b/src/views/wpm_gx/handover.vue
@@ -70,12 +70,12 @@
 				<el-table-column
 					label="物料"
 					prop="material_name"
-					min-width="120"
+					min-width="140"
 				></el-table-column>
-				<el-table-column label="批次" prop="batch" min-width="100">
+				<el-table-column label="批次" prop="batch" min-width="140">
 				</el-table-column>
-				<el-table-column label="数量" prop="count"></el-table-column>
-				<el-table-column label="交接类型" prop="type">
+				<el-table-column label="数量" prop="count" width="80"></el-table-column>
+				<el-table-column label="交接类型" prop="type" width="100">
 					<template #default="scope">
 						<el-text
 							v-if="scope.row.send_mgroup == mgroupId"
@@ -90,7 +90,7 @@
 						>
 					</template>
 				</el-table-column>
-				<el-table-column label="交接类别" prop="type">
+				<el-table-column label="交接类别" prop="type" width="80">
 					<template #default="scope">
 						<el-tag v-if="scope.row.type == 10" type="success"
 							>正常</el-tag
@@ -106,10 +106,12 @@
 				<el-table-column
 					label="交送人"
 					prop="send_user_name"
+					width="80"
 				></el-table-column>
 				<el-table-column
 					label="接收人"
 					prop="recive_user_name"
+					width="80"
 				></el-table-column>
 				<el-table-column
 					label="交接日期"
diff --git a/src/views/wpm_gx/mlog_detail.vue b/src/views/wpm_gx/mlog_detail.vue
index ef239460..7dc7c634 100644
--- a/src/views/wpm_gx/mlog_detail.vue
+++ b/src/views/wpm_gx/mlog_detail.vue
@@ -72,6 +72,7 @@
 						>新增</el-button
 					>
 				</div>
+				<div style="height: 4px"></div>
 				<scTable
 					ref="tableIn"
 					:apiObj="apiObj"
diff --git a/src/views/wpm_gx/mlog_form.vue b/src/views/wpm_gx/mlog_form.vue
index 0cd87712..d9387ba5 100644
--- a/src/views/wpm_gx/mlog_form.vue
+++ b/src/views/wpm_gx/mlog_form.vue
@@ -60,10 +60,10 @@
 					</el-row>
 					<el-row>
 						<el-col :md="12" :sm="24">
-							<el-form-item label="生产路线" prop="route">
+							<el-form-item label="工艺路线" prop="route">
 								<el-select
 									v-model="form.route"
-									placeholder="生产路线"
+									placeholder="工艺路线"
 									clearable
 									style="width: 100%"
 									:disabled="mode == 'edit'"
@@ -266,7 +266,7 @@ export default {
 				route: [
 					{
 						required: true,
-						message: "请选择生产路线",
+						message: "请选择工艺路线",
 						trigger: "blur",
 					},
 				],
diff --git a/src/views/wpm_gx/mlogb_check.vue b/src/views/wpm_gx/mlogb_check.vue
index 791de3bc..2f2e1d50 100644
--- a/src/views/wpm_gx/mlogb_check.vue
+++ b/src/views/wpm_gx/mlogb_check.vue
@@ -55,6 +55,7 @@
 								/>
 							</el-form-item>
 						</el-col>
+						<el-divider></el-divider>
 						<el-col :md="12" :sm="24">
 							<el-form-item label="划伤">
 								<el-input-number
diff --git a/src/views/wpm_gx/mlogs.vue b/src/views/wpm_gx/mlogs.vue
index 940ab98a..70498675 100644
--- a/src/views/wpm_gx/mlogs.vue
+++ b/src/views/wpm_gx/mlogs.vue
@@ -39,7 +39,7 @@
 					width="50"
 				></el-table-column>
 				<el-table-column
-					label="生产路线"
+					label="工艺路线"
 					prop="material_out_name"
 					min-width="130"
 				>