From 3ae57dfba022086cb380282fd71c2651d4399f73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com>
Date: Thu, 9 Jan 2025 18:46:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=8D=95=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order/orderList/index.vue | 31 +++++++++----------------
 src/views/order/preview-order.vue   | 36 ++++-------------------------
 2 files changed, 16 insertions(+), 51 deletions(-)

diff --git a/src/views/order/orderList/index.vue b/src/views/order/orderList/index.vue
index faa8017..e17449b 100644
--- a/src/views/order/orderList/index.vue
+++ b/src/views/order/orderList/index.vue
@@ -340,26 +340,19 @@ export default {
 				if(res.code == 200){
 					this.$refs.table.refresh();
 				}
-			}).catch(() => {
-				this.dialog.companyWf = true;
-				this.$nextTick(() => {
-					this.$refs.companyWfDialog.open('review');
-				})
+			}).catch(async () => {
+				let params = {
+					order_ids: this.selection.map(em => em.id),
+					status: true,
+					is_verify_erp_inventory: false,
+				}
+				const res = await this.$API.orders.order.maintenance.review.post(params);
+				if (res.code == 200) {
+					this.$refs.companyWfDialog.hideVisible();
+					this.$refs.table.refresh();
+				}
 			})
 		},
-		async reviewSave(data) {
-			let params = {
-				order_ids: this.selection.map(em => em.id),
-				status: true,
-				is_verify_erp_inventory:false,
-				maintenance_vendor:data.company_id
-			}
-			const res = await this.$API.orders.order.maintenance.review.post(params);
-			if (res.code == 200) {
-				this.$refs.companyWfDialog.hideVisible();
-				this.$refs.table.refresh();
-			}
-		},
 
 		save_maintenance() {
 			// eventBus.$emit('tagClose','/order/submit-order',{id:this.selection.map(em => em.id)[0]});
@@ -381,8 +374,6 @@ export default {
 					this.$refs.companyWfDialog.hideVisible();
 					this.$refs.table.refresh();
 				}
-			}else if(mode === 'review'){
-				await this.reviewSave(data);
 			}
 		},
 		// 工单设置
diff --git a/src/views/order/preview-order.vue b/src/views/order/preview-order.vue
index efba7e3..b85bf75 100644
--- a/src/views/order/preview-order.vue
+++ b/src/views/order/preview-order.vue
@@ -37,24 +37,18 @@
 			</el-scrollbar>
 		</el-main>
 	</el-container>
-	<manufacturer-dialog v-if="dialog.companyWf" ref="companyWfDialog" @success="handleWfSuccess" @closed="dialog.companyWf=false"></manufacturer-dialog>
 </template>
 
 <script>
 import detailView from "@/views/order/orderList/detailView";
-import manufacturerDialog from "@/views/order/orderList/components/manufacturer"
 export default {
 	name: "",
 	components:{
-		detailView,
-		manufacturerDialog
+		detailView
 	},
 	data(){
 		return{
 			size:'small',
-			dialog: {
-				companyWf:false
-			},
 			loading:false,
 			confirmLoading:false,
 			cancelLoading:false,
@@ -114,21 +108,6 @@ export default {
 			}
 			return obj;
 		},
-		async handleWfSuccess(data, mode) {
-			if (mode === 'review') {
-				let params = {
-					order_ids: [this.params.order_id],
-					status: true,
-					opinion: this.opinion,
-					maintenance_vendor: data.company_id
-				}
-				const res = await this.$API.orders.order.maintenance.review.post(params);
-				if (res.code == 200) {
-					this.$refs.companyWfDialog.hideVisible();
-					await this.getData();
-				}
-			}
-		},
 		async save(type) {
 			let params = {
 				order_ids: [this.params.order_id],
@@ -138,17 +117,12 @@ export default {
 			if (type == 1) {
 				delete params.opinion
 				this.confirmLoading = true;
-				this.dialog.companyWf = true;
-				this.$nextTick(() => {
-					this.saveLoading = false;
-					this.$refs.companyWfDialog.open('review');
-				})
 			}else{
 				this.cancelLoading = true;
-				const res = await this.$API.orders.order.maintenance.review.post(params);
-				if (res.code == 200) {
-					await this.getData();
-				}
+			}
+			const res = await this.$API.orders.order.maintenance.review.post(params);
+			if (res.code == 200) {
+				await this.getData();
 			}
 			this.confirmLoading = false;
 			this.cancelLoading = false;