From 46ed69e3b72658140a40127f4bae16bef9a02d56 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期一, 21 八月 2023 11:23:34 +0800
Subject: [PATCH] bug修复
---
src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue | 83 +++++++++++++++++++++++++++++------------
1 files changed, 59 insertions(+), 24 deletions(-)
diff --git a/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue b/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue
index e308dae..3b1b54c 100644
--- a/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue
+++ b/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue
@@ -54,7 +54,7 @@
<el-form-item label="鏈嶅姟鍚堝悓">
<div class="custom-name">
<el-autocomplete
- v-model="editConfig.infomation.service_number"
+ v-model="editConfig.infomation.serviceContract_Number"
:fetch-suggestions="
(queryString, callback) => {
querySearchAsync(queryString, callback, 'serviceContract')
@@ -85,7 +85,7 @@
<el-option v-for="item in faultTypeOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
- <div class="common-select-btn"><i class="el-icon-setting"></i></div>
+ <!-- <div class="common-select-btn"><i class="el-icon-setting"></i></div> -->
</div>
</el-form-item>
</el-col>
@@ -147,7 +147,7 @@
querySearchAsync(queryString, callback, 'productName')
}
"
- value-key="name"
+ value-key="Name"
@select="handleSelectClient('productName', $event)"
></el-autocomplete>
<div class="common-select-btn" @click="selClientClick('productName')">
@@ -171,7 +171,7 @@
<el-option v-for="item in serviceTypeOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
- <div class="common-select-btn"><i class="el-icon-setting"></i></div>
+ <!-- <div class="common-select-btn"><i class="el-icon-setting"></i></div> -->
</div>
</el-form-item>
</el-col>
@@ -229,7 +229,7 @@
<el-option v-for="item in severityOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
- <div class="common-select-btn"><i class="el-icon-setting"></i></div>
+ <!-- <div class="common-select-btn"><i class="el-icon-setting"></i></div> -->
</div>
</el-form-item>
</el-col>
@@ -260,7 +260,7 @@
>
</el-option>
</el-select>
- <div class="common-select-btn"><i class="el-icon-setting"></i></div>
+ <!-- <div class="common-select-btn"><i class="el-icon-setting"></i></div> -->
</div>
</el-form-item>
</el-col>
@@ -314,7 +314,7 @@
<el-option v-for="item in statusOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
- <div class="common-select-btn"><i class="el-icon-setting"></i></div>
+ <!-- <div class="common-select-btn"><i class="el-icon-setting"></i></div> -->
</div>
</el-form-item>
</el-col>
@@ -326,13 +326,23 @@
<el-row>
<el-col :span="12">
<el-form-item label="甯屾湜澶勭悊鏃堕棿" prop="expectTime">
- <el-date-picker v-model="editConfig.infomation.expectTime" type="datetime" placeholder="閫夋嫨鏃堕棿">
+ <el-date-picker
+ v-model="editConfig.infomation.expectTime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ type="datetime"
+ placeholder="閫夋嫨鏃堕棿"
+ >
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="瀹為檯澶勭悊鏃堕棿" prop="realTime">
- <el-date-picker v-model="editConfig.infomation.startTime" type="realTime" placeholder="閫夋嫨鏃堕棿">
+ <el-date-picker
+ v-model="editConfig.infomation.realTime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ type="datetime"
+ placeholder="閫夋嫨鏃堕棿"
+ >
</el-date-picker>
</el-form-item>
</el-col>
@@ -370,7 +380,7 @@
<el-option v-for="item in timeSpentOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
- <div class="common-select-btn"><i class="el-icon-setting"></i></div>
+ <!-- <div class="common-select-btn"><i class="el-icon-setting"></i></div> -->
</div>
</el-form-item>
</el-col>
@@ -398,7 +408,16 @@
<el-row>
<el-col :span="12">
<el-form-item label="甯歌闂" prop="faqId">
- <el-input v-model="editConfig.infomation.faqId"></el-input>
+ <!-- <el-input v-model="editConfig.infomation.faqId"></el-input> -->
+ <el-select
+ v-model="editConfig.infomation.faqId"
+ placeholder="璇烽�夋嫨"
+ class="common-select-sel"
+ size="mini"
+ >
+ <el-option v-for="item in faqOptions" :key="item.id" :label="item.name" :value="item.id">
+ </el-option>
+ </el-select>
</el-form-item>
</el-col>
<el-col :span="24">
@@ -559,6 +578,7 @@
import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
import SelectContactDialog from "@/views/other/commonDialog/SelectContactDialog"
import SelectChanceDialog from "@/views/other/commonDialog/SelectChanceDialog"
+import { getFaqList } from "@/api/common/other"
import {
getFaultTypeList,
getServiceTypeList,
@@ -599,6 +619,9 @@
},
saleChancelist() {
return this.$store.state.getClientName.saleChancelist
+ },
+ productList() {
+ return this.$store.state.getClientName.productList
}
},
data() {
@@ -607,7 +630,7 @@
editConfig: this.editCommonConfig,
rules: {
serviceNumber: [{ required: true, message: "璇疯緭鍏ユ湇鍔″崟缂栧彿", trigger: "blur" }],
- faultTypeId: [{ required: true, message: "璇烽�夋嫨鏁呴殰绫诲埆", trigger: "change" }],
+ // faultTypeId: [{ required: true, message: "璇烽�夋嫨鏁呴殰绫诲埆", trigger: "change" }],
subject: [{ required: true, message: "璇疯緭鍏ヤ富棰�", trigger: "blur" }],
// productCategory: [{ required: true, message: "璇烽�夋嫨浜у搧绫诲埆", trigger: "change" }],
serviceManId: [{ required: true, message: "璇烽�夋嫨浜у搧绫诲埆", trigger: "change" }],
@@ -626,6 +649,7 @@
priorityLevelOptions: [], // 浼樺厛绾у埆
statusOptions: Status.processStatus, // 澶勭悊鐘舵��
timeSpentOptions: [], // 鑺辫垂鏃堕棿
+ faqOptions: [], // 甯歌闂
editSelectClientConfig: {
editVisible: false,
title: "",
@@ -664,7 +688,7 @@
contactId: this.editCommonConfig.infomation.contactId,
serviceContractId: this.editCommonConfig.infomation.serviceContractId,
SalesDetailsId: this.editCommonConfig.infomation.SalesDetailsId,
- productNameId: this.editCommonConfig.infomation.productId,
+ productName: this.editCommonConfig.infomation.productName,
saleChanceId: this.editCommonConfig.infomation.saleChanceId
}
},
@@ -678,6 +702,7 @@
this.$store.dispatch("geSalesDetails")
this.$store.dispatch("geContact")
this.$store.dispatch("geChance")
+ this.$store.dispatch("geProductList")
this.getFaultTypeList()
this.getSeverityList()
this.getPriorityLevelList()
@@ -705,6 +730,16 @@
this.reportSourceOptions = res.data.reportSource
})
this.getServiceTypeList()
+ this.getFaqList()
+ },
+ // 鑾峰彇甯歌闂鍒楄〃
+ async getFaqList() {
+ await getFaqList().then((res) => {
+ console.log(res)
+ if (res.data.code === 200) {
+ this.faqOptions = res.data.data.data
+ }
+ })
},
// 淇濆瓨
saveClick(formName) {
@@ -755,7 +790,8 @@
SalesDetailsId: this.SalesDetailsId || 0,
priorityLevelId: data.priorityLevelId || 0,
problemDesc: data.problemDesc || "",
- productId: this.productNameId,
+ productName: this.productName,
+ productTypeName: "",
realTime: data.realTime || "",
remark: data.remark || "",
saleChanceId: this.saleChanceId || 0,
@@ -784,7 +820,7 @@
} else if (value === "contract") {
restaurants = this.salesDetailsList
} else if (value === "productName") {
- restaurants = this.productNameList
+ restaurants = this.productList
} else if (value === "contact") {
restaurants = this.contactNamelist
} else if (value === "chance") {
@@ -797,6 +833,8 @@
return (state) => {
if (value === "serviceContract" || value === "contract") {
return state.number.toLowerCase().indexOf(queryString.toLowerCase()) === 0
+ } else if (value === "productName") {
+ return state.Name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
} else {
return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
}
@@ -810,7 +848,7 @@
} else if (value === "contract") {
this.SalesDetailsId = item.id
} else if (value === "productName") {
- this.productCategoryId = item.id
+ this.productName = item.Name
} else if (value === "contact") {
this.contactId = item.id
} else if (value === "chance") {
@@ -824,15 +862,12 @@
} else if (value === "serviceContract") {
this.editSelCommonConfig.title = "鏈嶅姟鍚堝悓"
this.editSelCommonConfig.editVisible = true
- this.editSelCommonConfig.tableInfomation = [...this.serviceContractList]
} else if (value === "contract") {
this.editSelCommonConfig.title = "閿�鍞槑缁嗗崟"
this.editSelCommonConfig.editVisible = true
- this.editSelCommonConfig.tableInfomation = [...this.salesDetailsList]
} else if (value === "productName") {
this.editSelCommonConfig.title = "浜у搧鍚嶇О"
this.editSelCommonConfig.editVisible = true
- this.editSelCommonConfig.tableInfomation = [...this.productNameList]
} else if (value === "contact") {
this.editSelectContactConfig.editVisible = true
} else if (value === "chance") {
@@ -848,14 +883,14 @@
this.editConfig.infomation.client_name = row.name
this.clientId = row.id
} else if (value === "serviceContract") {
- this.editConfig.infomation.service_number = row.number
+ this.editConfig.infomation.serviceContract_Number = row.number
this.serviceContractId = row.id
} else if (value === "contract") {
this.editConfig.infomation.number = row.number
this.SalesDetailsId = row.id
} else if (value === "productName") {
- this.editConfig.infomation.product_name = row.name
- this.productNameId = row.id
+ this.editConfig.infomation.product_name = row.Name
+ this.productName = row.Name
} else if (value === "chance") {
this.editConfig.infomation.sale_chance_name = row.name
this.saleChanceId = row.id
@@ -867,14 +902,14 @@
this.editConfig.infomation.client_name = ""
this.clientId = 0
} else if (value === "serviceContract") {
- this.editConfig.infomation.service_number = ""
+ this.editConfig.infomation.serviceContract_Number = ""
this.serviceContractId = 0
} else if (value === "contract") {
this.editConfig.infomation.number = ""
this.SalesDetailsId = 0
} else if (value === "productName") {
this.editConfig.infomation.product_name = ""
- this.productNameId = 0
+ this.productName = ""
} else if (value === "contact") {
this.editConfig.infomation.contact_name = ""
this.contactId = 0
--
Gitblit v1.8.0