From 0fe07c82aaf1d81511e524647cf2bc473b5ec298 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 25 十月 2023 17:37:27 +0800
Subject: [PATCH] Merge branch 'zhengwenfeng/modify-style' into dev
---
src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue | 48 ++++++++++++++++++++++++++----------------------
1 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue b/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue
index a33549e..80de50b 100644
--- a/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue
+++ b/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue
@@ -278,10 +278,10 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="涓ラ噸绋嬪害" prop="severity">
+ <el-form-item label="涓ラ噸绋嬪害" prop="severityId">
<div class="common-select">
<el-select
- v-model="editConfig.infomation.severity"
+ v-model="editConfig.infomation.severityId"
placeholder="璇烽�夋嫨"
class="common-select-sel"
size="mini"
@@ -703,7 +703,7 @@
dialogWidth: "50%",
editConfig: this.editCommonConfig,
rules: {
- serviceNumber: [{ required: true, validator: this.validateCheckCode, trigger: "blur" }],
+ serviceNumber: [{ required: true, validator: this.validateCheckCode, trigger: ["blur",'change'] }],
client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: "change" }],
subject: [{ required: true, message: "璇疯緭鍏ヤ富棰�", trigger: "blur" }],
// productCategory: [{ required: true, message: "璇烽�夋嫨浜у搧绫诲埆", trigger: "change" }],
@@ -789,9 +789,6 @@
this.formInfo()
}
},
- "editCommonConfig.infomation.codeStandID"() {
- this.formInfo()
- }
},
methods: {
formInfo() {
@@ -890,7 +887,7 @@
serviceManId: data.serviceManId || 0,
serviceNumber: data.serviceNumber || "",
serviceTypeId: data.serviceTypeId || 0,
- severity: data.severity || 0,
+ severityId: data.severityId || 0,
solution: data.solution || "",
solutionRemark: data.solutionRemark || "",
serviceOrderStatusId: data.serviceOrderStatusId || 0,
@@ -1025,33 +1022,40 @@
}
},
// 鏁呴殰绫诲埆
- async getFaultTypeList() {
- await getFaultTypeList().then((res) => {
- this.faultTypeOptions = res.data.data
+ getFaultTypeList() {
+ getFaultTypeList().then((res) => {
+ this.faultTypeOptions = res.data.data?res.data.data:[]
+ this.$set(this.editConfig.infomation,'faultTypeId',this.editConfig.infomation.faultTypeId)
})
},
// 鏈嶅姟鏂瑰紡
- async getServiceTypeList() {
- await getServiceTypeList().then((res) => {
- this.serviceTypeOptions = res.data.data
+ getServiceTypeList() {
+ getServiceTypeList().then((res) => {
+ this.serviceTypeOptions = res.data.data?res.data.data:[]
+ this.$set(this.editConfig.infomation,'serviceTypeId',this.editConfig.infomation.serviceTypeId)
})
},
// 涓ラ噸绋嬪害
- async getSeverityList() {
- await getSeverityList().then((res) => {
- this.severityOptions = res.data.data
+ getSeverityList() {
+ getSeverityList().then((res) => {
+ this.severityOptions = res.data.data?res.data.data:[]
+
+ this.$set(this.editConfig.infomation,'severityId',this.editConfig.infomation.severityId)
})
},
// 浼樺厛绾у埆
- async getPriorityLevelList() {
- await getPriorityLevelList().then((res) => {
- this.priorityLevelOptions = res.data.data
+ getPriorityLevelList() {
+ getPriorityLevelList().then((res) => {
+ this.priorityLevelOptions = res.data.data?res.data.data:[]
+
+ this.$set(this.editConfig.infomation,'priorityLevelId',this.editConfig.infomation.priorityLevelId)
})
},
// 鑺辫垂鏃堕棿
- async getTimeSpentList() {
- await getTimeSpentList().then((res) => {
- this.timeSpentOptions = res.data.data
+ getTimeSpentList() {
+ getTimeSpentList().then((res) => {
+ this.timeSpentOptions = res.data.data?res.data.data:[]
+ this.$set(this.editConfig.infomation,'timeSpentId',this.editConfig.infomation.timeSpentId)
})
}
}
--
Gitblit v1.8.0