From b461c6527e3a85e9af59e7680e792bcb5ffb6b7e Mon Sep 17 00:00:00 2001
From: ZN <zhang_12370@163.com>
Date: 星期二, 10 三月 2026 15:53:37 +0800
Subject: [PATCH] Merge branch 'dev_New' of http://114.132.189.42:9002/r/product-inventory-management into dev_New
---
src/views/customerService/afterSalesHandling/components/formDia.vue | 115 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 82 insertions(+), 33 deletions(-)
diff --git a/src/views/customerService/afterSalesHandling/components/formDia.vue b/src/views/customerService/afterSalesHandling/components/formDia.vue
index 08eacfa..4b2964b 100644
--- a/src/views/customerService/afterSalesHandling/components/formDia.vue
+++ b/src/views/customerService/afterSalesHandling/components/formDia.vue
@@ -2,7 +2,7 @@
<div>
<el-dialog
v-model="dialogFormVisible"
- title="璁惧鑳借��"
+ title="鍞悗澶勭悊"
width="70%"
@close="closeDia"
>
@@ -10,7 +10,7 @@
:model="form"
label-width="140px"
label-position="top"
- :rules="rules"
+ :rules="operationType === 'view' ? {} : rules"
ref="formRef"
>
<el-row :gutter="30">
@@ -24,6 +24,7 @@
type="date"
placeholder="璇烽�夋嫨"
clearable
+ disabled
/>
</el-form-item>
</el-col>
@@ -33,6 +34,7 @@
v-model="form.checkUserId"
placeholder="璇烽�夋嫨"
clearable
+ disabled
>
<el-option
v-for="item in userList"
@@ -51,6 +53,7 @@
v-model="form.customerName"
placeholder="璇疯緭鍏�"
clearable
+ disabled
/>
</el-form-item>
</el-col>
@@ -60,15 +63,64 @@
v-model="form.proDesc"
placeholder="璇疯緭鍏�"
clearable
+ :disabled="operationType === 'view'"
+ type="textarea"
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="24">
+ <el-form-item label="澶勭悊缁撴灉锛�" prop="disRes">
+ <el-input
+ v-model="form.disRes"
+ placeholder="璇疯緭鍏�"
+ clearable
+ :disabled="operationType === 'view'"
+ type="textarea"
/>
</el-form-item>
</el-col>
</el-row>
</el-form>
+ <el-row :gutter="30">
+ <el-col :span="12">
+ <el-form-item label="澶勭悊浜猴細" prop="disposeUserId">
+ <el-select
+ v-model="form.disposeUserId"
+ placeholder="璇烽�夋嫨"
+ clearable
+ disabled
+ >
+ <el-option
+ v-for="item in userList"
+ :key="item.userId"
+ :label="item.nickName"
+ :value="item.userId"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="澶勭悊鏃堕棿锛�" prop="disDate">
+ <el-date-picker
+ style="width: 100%"
+ v-model="form.disDate"
+ value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD"
+ type="date"
+ placeholder="璇烽�夋嫨"
+ clearable
+ disabled
+ />
+ </el-form-item>
+ </el-col>
+ </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>
@@ -79,7 +131,8 @@
import {ref} from "vue";
import useUserStore from "@/store/modules/user.js";
import {userListNoPageByTenantId} from "@/api/system/user.js";
-import {afterSalesServiceAdd, afterSalesServiceUpdate} from "@/api/customerService/index.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);
@@ -92,12 +145,18 @@
checkUserId: "",
customerName: "",
proDesc: "",
+ disposeUserId: "",
+ disDate: "",
+ disRes: "",
},
rules: {
feedbackDate: [{required: true, message: "璇烽�夋嫨", trigger: "change"}],
checkUserId: [{required: true, message: "璇烽�夋嫨", trigger: "change"}],
customerName: [{required: true, message: "璇疯緭鍏�", trigger: "blur"}],
proDesc: [{required: true, message: "璇疯緭鍏�", trigger: "blur"}],
+ disRes: [{required: true, message: "璇疯緭鍏�", trigger: "blur"}],
+ disposeUserId: [{required: true, message: "璇烽�夋嫨", trigger: "change"}],
+ disDate: [{required: true, message: "璇烽�夋嫨", trigger: "change"}],
}
})
const { form, rules } = toRefs(data);
@@ -107,15 +166,17 @@
const openDialog = (type, row) => {
operationType.value = type;
dialogFormVisible.value = true;
- form.value = {}
- proxy.resetForm("formRef");
- form.value.checkUserId = userStore.id;
- form.value.feedbackDate = getCurrentDate();
userListNoPageByTenantId().then((res) => {
userList.value = res.data;
});
- if (type === "edit") {
- form.value = {...row}
+ form.value = {...row}
+ if (type === 'approve') {
+ if (!form.value.disposeUserId) {
+ form.value.disposeUserId = userStore.id;
+ }
+ if (!form.value.disDate) {
+ form.value.disDate = getCurrentDate();
+ }
}
}
// const setName = (code) => {
@@ -126,20 +187,16 @@
// }
// }
const submitForm = () => {
+ if (operationType.value === 'view') {
+ closeDia();
+ return;
+ }
proxy.$refs["formRef"].validate(valid => {
- if (valid) {
- if (operationType.value === "add") {
- afterSalesServiceAdd(form.value).then(response => {
- proxy.$modal.msgSuccess("鏂板鎴愬姛")
- closeDia()
- })
- } else {
- afterSalesServiceUpdate(form.value).then(response => {
- proxy.$modal.msgSuccess("淇敼鎴愬姛")
- closeDia()
- })
- }
- }
+ if (!valid) return;
+ afterSalesServiceDispose(form.value).then(() => {
+ proxy.$modal.msgSuccess("澶勭悊鎴愬姛")
+ closeDia()
+ })
})
}
// 鍏抽棴寮规
@@ -148,14 +205,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,
});
@@ -163,4 +212,4 @@
<style scoped>
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3