From 49b0b5d183766fe0ecbaf45d547886c60ca31e20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com>
Date: Mon, 28 Oct 2024 19:22:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A5=E5=8D=95=E7=BB=B4?=
 =?UTF-8?q?=E4=BF=AE=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/icons/menu/Service.vue    |   2 +-
 src/config/route.js                  |  12 +--
 src/views/order/create-order.vue     |  24 ++---
 src/views/order/repair-info.vue      | 125 ++++++++++++++++++---------
 src/views/order/repairList/index.vue |   2 +-
 5 files changed, 97 insertions(+), 68 deletions(-)

diff --git a/src/assets/icons/menu/Service.vue b/src/assets/icons/menu/Service.vue
index efb9e45..89974aa 100644
--- a/src/assets/icons/menu/Service.vue
+++ b/src/assets/icons/menu/Service.vue
@@ -1,5 +1,5 @@
 <template>
-	<svg t="1719388001057" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2117" width="200" height="200"><path d="M949.23434667 425.71093333a88.63744 88.63744 0 0 0-67.33824-62.53226666c-66.46442667-13.76256-90.00277333-54.72256-68.64896-119.33013334a89.12896 89.12896 0 0 0-20.31616-89.78432c-37.95626667-39.54005333-95.51872-72.96341333-148.71210667-86.28906666a88.4736 88.4736 0 0 0-87.70901333 27.30666666c-45.00138667 50.89962667-92.18730667 50.89962667-137.18869334 0a88.30976 88.30976 0 0 0-87.70901333-27.30666666c-53.13877333 13.32565333-110.64661333 46.74901333-148.71210667 86.28906666a89.18357333 89.18357333 0 0 0-20.31616 89.78432c21.40842667 64.7168-2.07530667 105.6768-68.64896 119.33013334A88.80128 88.80128 0 0 0 26.65130667 425.71093333c-15.07328 52.86570667-15.07328 119.6032 0 172.57813334a88.80128 88.80128 0 0 0 67.28362666 62.53226666c66.46442667 13.76256 90.00277333 54.72256 68.64896 119.33013334a89.18357333 89.18357333 0 0 0 20.31616 89.78432c38.06549333 39.54005333 95.68256 72.85418667 148.82133334 86.28906666a88.4736 88.4736 0 0 0 87.6544-27.30666666c45.056-50.89962667 92.18730667-50.89962667 137.24330666 0 21.84533333 24.79445333 55.59637333 35.28021333 87.6544 27.30666666 53.13877333-13.32565333 110.75584-46.74901333 148.82133334-86.28906666 22.9376-23.81141333 30.69269333-58.43626667 20.31616-89.78432-21.40842667-64.7168 2.12992-105.6768 68.64896-119.33013334a88.63744 88.63744 0 0 0 67.39285333-62.53226666c14.96405333-52.86570667 14.96405333-119.71242667-0.21845333-172.57813334zM487.97013333 718.65685333A206.27456 206.27456 0 0 1 282.07786667 512a206.27456 206.27456 0 0 1 205.89226666-206.65685333A206.27456 206.27456 0 0 1 693.8624 512a206.27456 206.27456 0 0 1-205.89226667 206.65685333z" p-id="2118"></path><path d="M635.04384 512c0 39.37621333-15.29173333 76.45866667-43.14453333 104.31146667a145.48992 145.48992 0 0 1-103.92917334 43.30837333c-39.26698667 0-76.1856-15.29173333-103.98378666-43.25376-27.8528-27.8528-43.08992-64.98986667-43.08992-104.36608 0-39.37621333 15.29173333-76.45866667 43.14453333-104.31146667a145.48992 145.48992 0 0 1 103.92917333-43.30837333c39.21237333 0 76.1856 15.29173333 103.92917334 43.25376 27.8528 27.8528 43.14453333 64.98986667 43.14453333 104.36608z" p-id="2119"></path></svg>
+	<svg t="1730103266201" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6123" width="200" height="200"><path d="M967.7824 259.7376L915.456 312.32a142.848 142.848 0 0 1-202.4448 0 144.2816 144.2816 0 0 1 0-203.264s23.5008-23.5008 52.3776-52.5824c28.8768-28.9792 9.6256-63.1808-42.496-55.04a260.608 260.608 0 0 0-144.7936 73.7792 264.1408 264.1408 0 0 0-70.9632 240.64l-439.04 440.9344a144.1792 144.1792 0 0 0 0 203.1616 142.848 142.848 0 0 0 202.3424 0l439.1936-440.9344a261.888 261.888 0 0 0 313.088-216.576c8.0384-52.224-26.0096-71.68-54.8864-42.7008zM202.8544 892.2112a47.5136 47.5136 0 0 1-67.4816 0 48.128 48.128 0 0 1 15.5136-78.1312 47.616 47.616 0 0 1 62.3616 25.9072 47.872 47.872 0 0 1-10.3936 52.224z m-47.616-623.7184L320.512 434.5856 388.096 366.7968l-165.376-165.9904-37.0176-71.1168L67.584 45.056 0.1024 112.7936l84.3264 118.528 70.8096 37.1712z m553.2672 352.256a23.8592 23.8592 0 0 0-33.7408 0l-101.2224 101.632a24.064 24.064 0 0 0 0 33.8944l238.7456 239.6672a95.1808 95.1808 0 0 0 134.912 0 96.0512 96.0512 0 0 0 0-135.4752l-238.6944-239.7184z" p-id="6124"></path></svg>
 </template>
 
 <script>
diff --git a/src/config/route.js b/src/config/route.js
index 9191ba4..c752c07 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -13,19 +13,9 @@ const routes = [
 			code:"",
 			icon: "sc-icon-Home",
 			title: "系统搜索",
+			hidden: true
 		},
 	},
-	// {
-	// 	name: "repair-info",
-	// 	path:"/repair-info",
-	// 	component:"order/repairList/repair-info",
-	// 	meta: {
-	// 		code:"",
-	// 		icon: "sc-icon-Home",
-	// 		title: "维修明细",
-	// 	},
-	// },
-
 
 	{
 		name: "home",
diff --git a/src/views/order/create-order.vue b/src/views/order/create-order.vue
index 6b6993a..b2408bf 100644
--- a/src/views/order/create-order.vue
+++ b/src/views/order/create-order.vue
@@ -44,18 +44,18 @@
 							</el-row>
 						</div>
 					</div>
-					<div class="boxMain">
-						<div class="title">维保单号</div>
-						<div class="boxCom">
-							<el-row>
-								<el-col :span="8" :lg="6">
-									<el-form-item label="维修单号" prop="repair_order_no">
-										<el-input class="input" type="text" v-model="form.repair_order_no" disabled placeholder="请输入维修单号"></el-input>
-									</el-form-item>
-								</el-col>
-							</el-row>
-						</div>
-					</div>
+<!--					<div class="boxMain">-->
+<!--						<div class="title">维保单号</div>-->
+<!--						<div class="boxCom">-->
+<!--							<el-row>-->
+<!--								<el-col :span="8" :lg="6">-->
+<!--									<el-form-item label="维修单号" prop="repair_order_no">-->
+<!--										<el-input class="input" type="text" v-model="form.repair_order_no" disabled placeholder="请输入维修单号"></el-input>-->
+<!--									</el-form-item>-->
+<!--								</el-col>-->
+<!--							</el-row>-->
+<!--						</div>-->
+<!--					</div>-->
 					<div class="boxMain">
 						<div class="title">维保工单信息</div>
 						<div class="boxCom">
diff --git a/src/views/order/repair-info.vue b/src/views/order/repair-info.vue
index 28a83fb..9de0749 100644
--- a/src/views/order/repair-info.vue
+++ b/src/views/order/repair-info.vue
@@ -4,7 +4,7 @@
 			<el-scrollbar style="width: 100%;">
 				<div class="title">维修单信息</div>
 				<div class="boxList boxListBorderBottom">
-					<el-row :gutter="24">
+					<el-row :gutter="24" style="margin: 0">
 						<el-col :span="6" :lg="6" :md="8" :xs="24">
 							<span class="name">维修单号</span>
 							<div class="text">
@@ -30,7 +30,7 @@
 							</div>
 						</el-col>
 					</el-row>
-					<el-row :gutter="24">
+					<el-row :gutter="24" style="margin: 0">
 						<el-col :span="6" :lg="6" :md="8" :xs="24">
 							<span class="name">保修期结束</span>
 							<div class="text">
@@ -41,63 +41,72 @@
 				</div>
 				<div class="title">部件信息</div>
 				<div class="boxList boxListBorderBottom">
-					<el-row :gutter="24">
+					<el-row :gutter="24" style="margin: 0">
 						<el-col :span="6" :lg="6" :md="8" :xs="24">
 							<span class="name">部件序列号</span>
 							<div class="text">
-								<el-input disabled :size="size"></el-input>
+								<el-input disabled v-model="info.component_serial_no" :size="size"></el-input>
 							</div>
 						</el-col>
 						<el-col :span="6" :lg="6" :md="8" :xs="24">
 							<span class="name">部件厂商</span>
 							<div class="text">
-								<el-input disabled :size="size"></el-input>
+								<el-input disabled v-model="info.component_manufacturer" :size="size"></el-input>
 							</div>
 						</el-col>
 						<el-col :span="6" :lg="6" :md="8" :xs="24">
 							<span class="name">部件型号</span>
 							<div class="text">
-								<el-input disabled :size="size"></el-input>
+								<el-input disabled v-model="info.component_model" :size="size"></el-input>
 							</div>
 						</el-col>
 						<el-col :span="6" :lg="6" :md="8" :xs="24">
 							<span class="name">零部件PN号</span>
 							<div class="text">
-								<el-input disabled :size="size"></el-input>
-							</div>
-						</el-col>
-					</el-row>
-					<el-row>
-						<el-col :span="24">
-							<span></span>
-						</el-col>
-					</el-row>
-					<el-row :gutter="24">
-						<el-col :span="6" :lg="6" :md="8" :xs="24">
-							<span class="name">不良原因</span>
-							<div class="text">
-								<el-input disabled :size="size"></el-input>
-							</div>
-						</el-col>
-						<el-col :span="6" :lg="6" :md="8" :xs="24">
-							<span class="name">不良现象</span>
-							<div class="text">
-								<el-input disabled :size="size"></el-input>
-							</div>
-						</el-col>
-						<el-col :span="6" :lg="6" :md="8" :xs="24">
-							<span class="name">现场步骤分析</span>
-							<div class="text">
-								<el-input disabled :size="size"></el-input>
-							</div>
-						</el-col>
-						<el-col :span="6" :lg="6" :md="8" :xs="24">
-							<span class="name">SLA不达标原因</span>
-							<div class="text">
-								<el-input disabled :size="size"></el-input>
+								<el-input disabled v-model="info.component_pn" :size="size"></el-input>
 							</div>
 						</el-col>
 					</el-row>
+					<div v-for="(item,index) in params.repair_info" :key="index">
+						<el-row style="margin: 0">
+							<el-col :span="24" class="flexCol">
+								<span class="name">维修动作</span>
+								<span class="text">
+									<el-radio-group v-model="item.action" :size="size">
+									  <el-radio value="1">更换</el-radio>
+									  <el-radio value="2">修复</el-radio>
+									  <el-radio value="3">无需修复</el-radio>
+									</el-radio-group>
+								</span>
+							</el-col>
+						</el-row>
+						<el-row :gutter="24" style="margin: 0">
+							<el-col :span="6" :lg="6" :md="8" :xs="24">
+								<span class="name">不良原因</span>
+								<div class="text">
+									<el-input :size="size" v-model="item.new_part_mpn"></el-input>
+								</div>
+							</el-col>
+							<el-col :span="6" :lg="6" :md="8" :xs="24">
+								<span class="name">不良现象</span>
+								<div class="text">
+									<el-input :size="size" v-model="item.new_part_sn"></el-input>
+								</div>
+							</el-col>
+							<el-col :span="6" :lg="6" :md="8" :xs="24">
+								<span class="name">现场步骤分析</span>
+								<div class="text">
+									<el-input :size="size" v-model="item.sla_non_compliance_reason"></el-input>
+								</div>
+							</el-col>
+							<el-col :span="6" :lg="6" :md="8" :xs="24">
+								<span class="name">SLA不达标原因</span>
+								<div class="text">
+									<el-input :size="size" v-model="item.confirmed_defects"></el-input>
+								</div>
+							</el-col>
+						</el-row>
+					</div>
 					<div class="btnAdd">
 						<el-button type="primary" plain :size="size">添加部件信息</el-button>
 						<div class="cardBody">
@@ -113,7 +122,7 @@
 					</div>
 				</div>
 				<div class="btnBox">
-					<el-button type="primary" @click="submit">提交维修</el-button>
+					<el-button type="primary" @click="submit" :size="size">提交维修</el-button>
 				</div>
 			</el-scrollbar>
 		</el-main>
@@ -127,7 +136,19 @@ export default {
 		return{
 			size:'small',
 			params:{
-				order_id:Number(this.$route.query.id)
+				order_id:Number(this.$route.query.order_id),
+				repair_id:Number(this.$route.query.id),
+				repair_info:[
+					{
+						new_part_mpn:"",
+						new_part_sn:"",
+						sla:"",
+						sla_non_compliance_reason:"",
+						confirmed_defects:"",
+						analysis_steps:"",
+						action:""
+					}
+				]
 			},
 			info:{
 				component_info:[],
@@ -142,13 +163,16 @@ export default {
 	},
 	methods:{
 		async getInfo() {
-			const res = await this.$API.orders.order.repair.info.post(this.params);
+			let params = {
+				order_id:this.params.order_id
+			}
+			const res = await this.$API.orders.order.repair.info.post(params);
 			if(res.code == 200){
 				this.info = res.data;
 			}
 		},
 		async submit() {
-			const res = await this.$API.orders.order.repair.submit.post();
+			const res = await this.$API.orders.order.repair.submit.post(this.params);
 			if(res.code == 200){
 				console.log(res.data)
 			}
@@ -169,14 +193,18 @@ export default {
 	.boxList{
 		margin-top: 15px;
 		.el-row{
-			margin: 0 !important;
+			margin: 0;
 			padding: 0;
 			.el-col{
 				margin: 0 0 12px 0;
 				padding: 0;
 			}
+			.flexCol{
+				padding: 5px 12px 6px 12px;
+			}
 		}
 		.name{
+			color: #555;
 			display: inline-block;
 			margin-bottom: 6px;
 		}
@@ -187,4 +215,15 @@ export default {
 	.cardBody{
 		margin-top: 15px;
 	}
+	.flexCol{
+		display: flex;align-items: center;
+		.name{
+			margin-bottom: 0;
+			margin-right: 15px;
+		}
+		.text{
+			font-weight: 400;
+		}
+	}
+	.btnAdd{margin-top: 15px;}
 </style>
diff --git a/src/views/order/repairList/index.vue b/src/views/order/repairList/index.vue
index a510518..4d35e7a 100644
--- a/src/views/order/repairList/index.vue
+++ b/src/views/order/repairList/index.vue
@@ -159,7 +159,7 @@ export default {
 		},
 		// 执行维修
 		table_upkeep(row){
-			eventBus.$emit('tagClose','/order/repair-info',{id:row.order_id});
+			eventBus.$emit('tagClose','/order/repair-info',{id:row.id,order_id:row.order_id});
 		},
 		//查看
 		table_show(row){