From b169e0fe3ecad3713880626bd6152c58d8ed4222 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期二, 10 十月 2023 19:59:57 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into wn
---
src/views/service/serviceFollowup/AddServiceFollowupDialog.vue | 93 ++++++++++++++++++++++++++++------------------
1 files changed, 56 insertions(+), 37 deletions(-)
diff --git a/src/views/service/serviceFollowup/AddServiceFollowupDialog.vue b/src/views/service/serviceFollowup/AddServiceFollowupDialog.vue
index 83ed22f..caebbba 100644
--- a/src/views/service/serviceFollowup/AddServiceFollowupDialog.vue
+++ b/src/views/service/serviceFollowup/AddServiceFollowupDialog.vue
@@ -13,7 +13,7 @@
:model="editConfig.infomation"
:rules="rules"
label-position="right"
- label-width="308px"
+ label-width="168px"
size="mini"
style="height: 60vh; overflow-x: hidden"
>
@@ -35,23 +35,28 @@
"
value-key="name"
@select="handleSelectClient('client', $event)"
+ style="width: 100%"
></el-autocomplete>
<div class="common-select-btn" @click="selClientClick('client')">
<i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
</div>
- <div class="common-select-btn" @click="clearupClient('client')">
- <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ <div
+ v-if="editConfig.infomation.client_name && editConfig.infomation.client_name.length > 0"
+ class="common-select-btn"
+ @click="clearupClient('client')"
+ >
+ <i class="el-icon-remove-outline" title="娓呴櫎"></i>
</div>
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鍥炶鍗曠紪鍙�" prop="number">
- <el-input v-model="editConfig.infomation.number"></el-input>
+ <el-input v-model="editConfig.infomation.number" style="width: 100%"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鑱旂郴浜哄鍚�" prop="contactId">
+ <el-form-item label="鑱旂郴浜哄鍚�" prop="contact_name">
<div class="custom-name">
<el-autocomplete
v-model="editConfig.infomation.contact_name"
@@ -62,12 +67,17 @@
"
value-key="name"
@select="handleSelectClient('contact', $event)"
+ style="width: 100%"
></el-autocomplete>
<div class="common-select-btn" @click="selClientClick('contact')">
<i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
</div>
- <div class="common-select-btn" @click="clearupClient('contact')">
- <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ <div
+ v-if="editConfig.infomation.contact_name && editConfig.infomation.contact_name.length > 0"
+ class="common-select-btn"
+ @click="clearupClient('contact')"
+ >
+ <i class="el-icon-remove-outline" title="娓呴櫎"></i>
</div>
</div>
</el-form-item>
@@ -84,25 +94,30 @@
"
value-key="serviceNumber"
@select="handleSelectClient('customService', $event)"
+ style="width: 100%"
></el-autocomplete>
<div class="common-select-btn" @click="selClientClick('customService')">
<i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
</div>
- <div class="common-select-btn" @click="clearupClient('customService')">
- <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ <div
+ v-if="editConfig.infomation.service_number && editConfig.infomation.service_number.length > 0"
+ class="common-select-btn"
+ @click="clearupClient('customService')"
+ >
+ <i class="el-icon-remove-outline" title="娓呴櫎"></i>
</div>
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鍥炶浜�" prop="memberId">
- <el-select v-model="editConfig.infomation.memberId" size="mini">
+ <el-select v-model="editConfig.infomation.memberId" size="mini" style="width: 100%">
<el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="椤圭洰璁″垝" prop="planId">
<div class="custom-name">
<el-input v-model="editConfig.infomation.planId"></el-input>
@@ -110,76 +125,80 @@
<div class="common-select-btn"><i class="el-icon-edit" title="缂栬緫"></i></div>
</div>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="12">
- <el-form-item label="婊℃剰搴�" prop="satisfaction">
+ <el-form-item label="婊℃剰搴�" prop="satisfactionId">
<div class="common-select">
<el-select
- v-model="editConfig.infomation.satisfaction"
+ v-model="editConfig.infomation.satisfactionId"
placeholder="璇烽�夋嫨"
class="common-select-sel"
size="mini"
+ style="width: 100%"
>
<el-option v-for="item in satisfactionOptions" :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>
<el-col :span="12">
- <el-form-item label="鍙婃椂鐜�" prop="timelyRate">
+ <el-form-item label="鍙婃椂鐜�" prop="timelyRateId">
<div class="common-select">
<el-select
- v-model="editConfig.infomation.timelyRate"
+ v-model="editConfig.infomation.timelyRateId"
placeholder="璇烽�夋嫨"
class="common-select-sel"
size="mini"
+ style="width: 100%"
>
<el-option v-for="item in timelyRateOptions" :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>
<el-col :span="12">
- <el-form-item label="瑙ｅ喅鐜�" prop="solveRate">
+ <el-form-item label="瑙ｅ喅鐜�" prop="solveRateId">
<div class="common-select">
<el-select
- v-model="editConfig.infomation.solveRate"
+ v-model="editConfig.infomation.solveRateId"
placeholder="璇烽�夋嫨"
class="common-select-sel"
size="mini"
+ style="width: 100%"
>
<el-option v-for="item in solveRateOptions" :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>
<el-col :span="12">
<el-form-item label="鍘熸湇鍔′汉鍛�" prop="oldMemberId">
- <el-select v-model="editConfig.infomation.oldMemberId" size="mini">
+ <el-select v-model="editConfig.infomation.oldMemberId" size="mini" style="width: 100%">
<el-option v-for="item in oldMemberOptions" :key="item.id" :label="item.username" :value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鏈嶅姟浜哄憳鏄惁鏉ヨ繃" prop="isVisit">
+ <el-form-item label="鏈嶅姟浜哄憳鏄惁鏉ヨ繃" prop="isVisitId">
<div class="common-select">
<el-select
- v-model="editConfig.infomation.isVisit"
+ v-model="editConfig.infomation.isVisitId"
placeholder="璇烽�夋嫨"
class="common-select-sel"
size="mini"
+ style="width: 100%"
>
<el-option v-for="item in isVisitOptions" :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>
@@ -202,7 +221,7 @@
</el-row>
</div>
<!-- 闄勪欢淇℃伅 -->
- <div class="basic-info-title">闄勪欢淇℃伅</div>
+ <!-- <div class="basic-info-title">闄勪欢淇℃伅</div>
<div class="basic-info-view">
<el-row>
<el-col :span="12">
@@ -227,7 +246,7 @@
</el-form-item>
</el-col>
</el-row>
- </div>
+ </div> -->
</div>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -290,7 +309,7 @@
},
data() {
return {
- dialogWidth: "80%",
+ dialogWidth: "50%",
editConfig: this.editCommonConfig,
rules: {
number: [{ required: true, message: "璇疯緭鍏ュ洖璁垮崟鍗曠紪鍙�", trigger: "blur" }],
@@ -319,7 +338,7 @@
},
clientId: this.editCommonConfig.infomation.clientId,
contactId: this.editCommonConfig.infomation.contactId,
- serviceId: this.editCommonConfig.infomation.serviceId
+ serviceOrderId: this.editCommonConfig.infomation.serviceOrderId
}
},
created() {
@@ -382,16 +401,16 @@
clientId: this.clientId || 0,
contactId: this.contactId || 0,
file: data.file || "",
- isVisit: data.isVisit || 0,
+ isVisit: data.isVisitId || 0,
memberId: data.memberId || 0,
number: data.number || "",
oldMemberId: data.oldMemberId || 0,
planId: data.planId || 0,
remark: data.remark || "",
- satisfaction: data.satisfaction || 0,
- serviceId: this.serviceId || 0,
- solveRate: data.solveRate || 0,
- timelyRate: data.timelyRate || 0
+ satisfaction: data.satisfactionId || 0,
+ serviceOrderId: this.serviceOrderId || 0,
+ solveRate: data.solveRateId || 0,
+ timelyRate: data.timelyRateId || 0
}
return params
},
@@ -428,7 +447,7 @@
} else if (value === "contact") {
this.contactId = item.id
} else if (value === "customService") {
- this.serviceId = item.id
+ this.serviceOrderId = item.id
}
},
selClientClick(value) {
@@ -452,7 +471,7 @@
this.clientId = row.id
} else if (value === "customService") {
this.editConfig.infomation.service_number = row.serviceNumber
- this.serviceId = row.id
+ this.serviceOrderId = row.id
}
},
// 娓呴櫎宸查�夋嫨鐢ㄦ埛
@@ -465,7 +484,7 @@
this.contactId = 0
} else if (value === "customService") {
this.editConfig.infomation.service_number = ""
- this.serviceId = 0
+ this.serviceOrderId = 0
}
},
// 娣诲姞闄勪欢
--
Gitblit v1.8.0