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 | 75 +++++++++++++++++++++++--------------
1 files changed, 47 insertions(+), 28 deletions(-)
diff --git a/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue b/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue
index 6afd7f5..80de50b 100644
--- a/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue
+++ b/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue
@@ -25,19 +25,35 @@
<el-row>
<el-col :span="12">
<el-form-item label="鏈嶅姟鍗曠紪鍙�" prop="serviceNumber">
- <!-- <el-input v-model="editConfig.infomation.serviceNumber" style="width: 100%"></el-input> -->
- <WordInput
+ <el-input
+ v-if="
+ editConfig.title == '缂栬緫' ||
+ (editConfig.title == '鏂板缓' &&
+ codenumer &&
+ (explain != '' || isIdDisabled))
+ "
+ :disabled="editConfig.title == '缂栬緫'"
+ v-model="editConfig.infomation.serviceNumber"
+ placeholder="璇疯緭鍏ョ紪鐮�"
+ >
+ </el-input>
+ <span v-else-if="editConfig.title == '鏂板缓'" style="color: #f56c6c"
+ >璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span
+ >
+ <!-- <WordInput
v-if="codenumer && (explain != '' || isIdDisabled) && method == 0"
:codenumer="codenumer"
:sum="sum"
- :disabled="editConfig.infomation.id || isIdDisabled"
+ :disabled="editConfig.title !== '鏂板缓' || isIdDisabled"
:inputValue="inputValue"
@codeList="codeList"
/>
<span v-else-if="method == 0" style="color: #f56c6c"
>璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span
>
- <span v-else>鑷姩鐢熸垚</span>
+ <span v-else>{{
+ editConfig.title === "鏂板缓" ? "鑷姩鐢熸垚" : editConfig.infomation.serviceNumber
+ }}</span> -->
</el-form-item>
</el-col>
<el-col :span="12">
@@ -262,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"
@@ -687,8 +703,8 @@
dialogWidth: "50%",
editConfig: this.editCommonConfig,
rules: {
- serviceNumber: [{ required: true, message: "璇疯緭鍏ユ湇鍔″崟缂栧彿", trigger: "blur" }],
- // faultTypeId: [{ required: true, message: "璇烽�夋嫨鏁呴殰绫诲埆", trigger: "change" }],
+ 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" }],
serviceManId: [{ required: true, message: "璇烽�夋嫨浜у搧绫诲埆", trigger: "change" }],
@@ -773,9 +789,6 @@
this.formInfo()
}
},
- "editCommonConfig.infomation.codeStandID"() {
- this.formInfo()
- }
},
methods: {
formInfo() {
@@ -874,14 +887,13 @@
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,
subject: data.subject || "",
timeSpentId: data.timeSpentId || 0,
codeStandID: data.ID,
- codeRule: this.codeRule
}
return params
},
@@ -1010,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