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] =?UTF-8?q?feat:=20=E7=95=8C=E9=9D=A2=E5=AD=97=E6=AE=B5?=
 =?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/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"
 				>