From 7726b6cdab80596d2e2f7dd3fe1ec3dfbdeee155 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 12 六月 2026 09:42:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

---
 src/views/customerService/afterSalesHandling/components/formDia.vue |   74 ++++++++++++++++++++++++++----------
 1 files changed, 53 insertions(+), 21 deletions(-)

diff --git a/src/views/customerService/afterSalesHandling/components/formDia.vue b/src/views/customerService/afterSalesHandling/components/formDia.vue
index cfdb01c..9abf4fc 100644
--- a/src/views/customerService/afterSalesHandling/components/formDia.vue
+++ b/src/views/customerService/afterSalesHandling/components/formDia.vue
@@ -10,7 +10,7 @@
 				:model="form"
 				label-width="140px"
 				label-position="top"
-				:rules="rules"
+				:rules="operationType === 'view' ? {} : rules"
 				ref="formRef"
 			>
 				<el-row :gutter="30">
@@ -63,7 +63,7 @@
 								v-model="form.proDesc"
 								placeholder="璇疯緭鍏�"
 								clearable
-								disabled
+								:disabled="operationType === 'view'"
 								type="textarea"
 							/>
 						</el-form-item>
@@ -78,6 +78,33 @@
 								clearable
 								:disabled="operationType === 'view'"
 								type="textarea"
+							/>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="30">
+					<el-col :span="12">
+						<el-form-item label="璇勫垎锛�" prop="rating">
+							<el-rate
+								v-model="form.rating"
+								:disabled="operationType === 'view'"
+								:max="5"
+								show-text
+								:texts="['闈炲父涓嶆弧鎰�', '涓嶆弧鎰�', '涓�鑸�', '婊℃剰', '闈炲父婊℃剰']"
+							/>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="30">
+					<el-col :span="24">
+						<el-form-item label="璇勪环鍐呭鎻忚堪锛�" prop="evaluation">
+							<el-input
+								v-model="form.evaluation"
+								placeholder="璇疯緭鍏ヨ瘎浠峰唴瀹规弿杩�"
+								clearable
+								:disabled="operationType === 'view'"
+								type="textarea"
+								:rows="3"
 							/>
 						</el-form-item>
 					</el-col>
@@ -118,8 +145,9 @@
 			</el-row>
 			<template #footer>
 				<div class="dialog-footer">
-					<el-button type="primary" @click="submitForm">纭</el-button>
-					<el-button @click="closeDia">鍙栨秷</el-button>
+					<el-button v-if="operationType === 'approve'" type="primary" @click="submitForm">纭</el-button>
+					<el-button v-if="operationType === 'approve'" @click="closeDia">鍙栨秷</el-button>
+					<el-button v-else type="primary" @click="closeDia">鍏抽棴</el-button>
 				</div>
 			</template>
     </el-dialog>
@@ -131,6 +159,7 @@
 import useUserStore from "@/store/modules/user.js";
 import {userListNoPageByTenantId} from "@/api/system/user.js";
 import {afterSalesServiceAdd, afterSalesServiceDispose, afterSalesServiceUpdate} from "@/api/customerService/index.js";
+import { getCurrentDate } from "@/utils/index.js";
 const { proxy } = getCurrentInstance()
 const emit = defineEmits(['close'])
 const dialogFormVisible = ref(false);
@@ -146,6 +175,8 @@
 		disposeUserId: "",
 		disDate: "",
 		disRes: "",
+		rating: null,
+		evaluation: "",
 	},
 	rules: {
 		feedbackDate: [{required: true, message: "璇烽�夋嫨", trigger: "change"}],
@@ -168,8 +199,14 @@
 		userList.value = res.data;
 	});
 	form.value = {...row}
-	form.value.disposeUserId = userStore.id;
-	form.value.disDate = getCurrentDate();
+	if (type === 'approve') {
+		if (!form.value.disposeUserId) {
+			form.value.disposeUserId = userStore.id;
+		}
+		if (!form.value.disDate) {
+			form.value.disDate = getCurrentDate();
+		}
+	}
 }
 // const setName = (code) => {
 // 	const index = userList.value.findIndex(item => item.deviceModel === code);
@@ -179,13 +216,16 @@
 // 	}
 // }
 const submitForm = () => {
+	if (operationType.value === 'view') {
+		closeDia();
+		return;
+	}
 	proxy.$refs["formRef"].validate(valid => {
-		if (valid) {
-			afterSalesServiceDispose(form.value).then(response => {
-				proxy.$modal.msgSuccess("鏂板鎴愬姛")
-				closeDia()
-			})
-		}
+		if (!valid) return;
+		afterSalesServiceDispose(form.value).then(() => {
+			proxy.$modal.msgSuccess("澶勭悊鎴愬姛")
+			closeDia()
+		})
 	})
 }
 // 鍏抽棴寮规
@@ -194,14 +234,6 @@
   dialogFormVisible.value = false;
   emit('close')
 };
-// 鑾峰彇褰撳墠鏃ユ湡骞舵牸寮忓寲涓� YYYY-MM-DD
-function getCurrentDate() {
-	const today = new Date();
-	const year = today.getFullYear();
-	const month = String(today.getMonth() + 1).padStart(2, "0"); // 鏈堜唤浠�0寮�濮�
-	const day = String(today.getDate()).padStart(2, "0");
-	return `${year}-${month}-${day}`;
-}
 defineExpose({
   openDialog,
 });
@@ -209,4 +241,4 @@
 
 <style scoped>
 
-</style>
\ No newline at end of file
+</style>

--
Gitblit v1.9.3