From 1249ca8ff44f8de7992fdb5866eae19613d606c3 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 16 八月 2023 19:37:49 +0800
Subject: [PATCH] 详情页联调
---
src/views/service/serviceContract/AddServiceContractDialog.vue | 501 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 376 insertions(+), 125 deletions(-)
diff --git a/src/views/service/serviceContract/AddServiceContractDialog.vue b/src/views/service/serviceContract/AddServiceContractDialog.vue
index 232dcb4..e6d5459 100644
--- a/src/views/service/serviceContract/AddServiceContractDialog.vue
+++ b/src/views/service/serviceContract/AddServiceContractDialog.vue
@@ -5,6 +5,8 @@
:visible.sync="editConfig.visible"
:width="dialogWidth"
:before-close="handleClose"
+ append-to-body
+ custom-class="iframe-dialog"
>
<el-form
ref="form"
@@ -22,11 +24,24 @@
<div class="basic-info-view">
<el-row>
<el-col :span="12">
- <el-form-item label="瀹㈡埛鍚嶇О" prop="clientId">
+ <el-form-item label="瀹㈡埛鍚嶇О" prop="client_name">
<div class="custom-name">
- <el-input v-model="editConfig.infomation.clientId"></el-input>
- <div class="common-select-btn"><i class="el-icon-circle-plus-outline" title="閫夋嫨"></i></div>
- <div class="common-select-btn"><i class="el-icon-edit" title="缂栬緫"></i></div>
+ <el-autocomplete
+ v-model="editConfig.infomation.client_name"
+ :fetch-suggestions="
+ (queryString, callback) => {
+ querySearchAsync(queryString, callback, 'client')
+ }
+ "
+ value-key="name"
+ @select="handleSelectClient('client', $event)"
+ ></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>
</div>
</el-form-item>
</el-col>
@@ -51,36 +66,88 @@
<el-col :span="12">
<el-form-item label="鑱旂郴浜哄鍚�" prop="contactId">
<div class="custom-name">
- <el-input v-model="editConfig.infomation.contactId"></el-input>
- <div class="common-select-btn"><i class="el-icon-circle-plus-outline" title="閫夋嫨"></i></div>
- <div class="common-select-btn"><i class="el-icon-edit" title="缂栬緫"></i></div>
+ <el-autocomplete
+ v-model="editConfig.infomation.contact_name"
+ :fetch-suggestions="
+ (queryString, callback) => {
+ querySearchAsync(queryString, callback, 'contact')
+ }
+ "
+ value-key="name"
+ @select="handleSelectClient('contact', $event)"
+ ></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>
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="閿�鍞満浼�" prop="saleChanceId">
<div class="custom-name">
- <el-input v-model="editConfig.infomation.saleChanceId"></el-input>
- <div class="common-select-btn"><i class="el-icon-circle-plus-outline" title="閫夋嫨"></i></div>
- <div class="common-select-btn"><i class="el-icon-edit" title="缂栬緫"></i></div>
+ <el-autocomplete
+ v-model="editConfig.infomation.sale_chance_name"
+ :fetch-suggestions="
+ (queryString, callback) => {
+ querySearchAsync(queryString, callback, 'chance')
+ }
+ "
+ value-key="name"
+ @select="handleSelectClient('chance', $event)"
+ ></el-autocomplete>
+ <div class="common-select-btn" @click="selClientClick('chance')">
+ <i class="el-icon-circle-plus-outline"></i>
+ </div>
+ <div class="common-select-btn" @click="clearupClient('chance')">
+ <i class="el-icon-edit-outline"></i>
+ </div>
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鍚堝悓璁㈠崟" prop="contractId">
<div class="custom-name">
- <el-input v-model="editConfig.infomation.contractId"></el-input>
- <div class="common-select-btn"><i class="el-icon-circle-plus-outline" title="閫夋嫨"></i></div>
- <div class="common-select-btn"><i class="el-icon-edit" title="缂栬緫"></i></div>
+ <el-autocomplete
+ v-model="editConfig.infomation.contract_number"
+ :fetch-suggestions="
+ (queryString, callback) => {
+ querySearchAsync(queryString, callback, 'contract')
+ }
+ "
+ value-key="number"
+ @select="handleSelectClient('contract', $event)"
+ ></el-autocomplete>
+ <div class="common-select-btn" @click="selClientClick('contract')">
+ <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
+ </div>
+ <div class="common-select-btn" @click="clearupClient('contract')">
+ <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ </div>
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鎶ヤ环鍗�" prop="quotationId">
<div class="custom-name">
- <el-input v-model="editConfig.infomation.quotationId"></el-input>
- <div class="common-select-btn"><i class="el-icon-circle-plus-outline" title="閫夋嫨"></i></div>
- <div class="common-select-btn"><i class="el-icon-edit" title="缂栬緫"></i></div>
+ <el-autocomplete
+ v-model="editConfig.infomation.quotation_number"
+ :fetch-suggestions="
+ (queryString, callback) => {
+ querySearchAsync(queryString, callback, 'quotation')
+ }
+ "
+ value-key="number"
+ @select="handleSelectClient('quotation', $event)"
+ ></el-autocomplete>
+ <div class="common-select-btn" @click="selClientClick('quotation')">
+ <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
+ </div>
+ <div class="common-select-btn" @click="clearupClient('quotation')">
+ <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ </div>
</div>
</el-form-item>
</el-col>
@@ -96,25 +163,40 @@
<el-option v-for="item in contractTypeOptions" :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="signTime">
- <el-date-picker v-model="editConfig.infomation.signTime" type="date" placeholder="閫夋嫨鏃ユ湡">
+ <el-date-picker
+ v-model="editConfig.infomation.signTime"
+ value-format="yyyy-MM-dd"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡"
+ >
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鏈嶅姟寮�濮嬫棩鏈�" prop="startTime">
- <el-date-picker v-model="editConfig.infomation.startTime" type="date" placeholder="閫夋嫨鏃ユ湡">
+ <el-date-picker
+ v-model="editConfig.infomation.startTime"
+ value-format="yyyy-MM-dd"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡"
+ >
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鏈嶅姟鍒版湡鏃�" prop="endTime">
- <el-date-picker v-model="editConfig.infomation.endTime" type="date" placeholder="閫夋嫨鏃ユ湡">
+ <el-date-picker
+ v-model="editConfig.infomation.endTime"
+ value-format="yyyy-MM-dd"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡"
+ >
</el-date-picker>
</el-form-item>
</el-col>
@@ -141,7 +223,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>
@@ -185,7 +267,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">
@@ -210,7 +292,7 @@
</el-form-item>
</el-col>
</el-row>
- </div>
+ </div> -->
<!-- 浜у搧绠＄悊 -->
<div class="basic-info-title" style="display: flex">
浜у搧绠＄悊
@@ -223,7 +305,11 @@
</div>
</div>
<div class="product-view">
- <CommonFormTableView :show-summary="showSummary" :product-table-list="productTableList" />
+ <CommonFormTableView
+ :show-summary="showSummary"
+ :product-table-list="productTableList"
+ @addProductClick="addProductClick"
+ />
</div>
<!-- 閫夋嫨瀹℃壒娴佺▼ -->
<!-- <div class="basic-info-title">閫夋嫨瀹℃壒娴佺▼</div>
@@ -273,6 +359,30 @@
<el-button type="primary" size="small" @click="saveClick('form')">淇濆瓨</el-button>
<el-button size="small" @click="editConfig.visible = false">鍙栨秷</el-button>
</div>
+ <!-- 閫夋嫨瀹㈡埛 -->
+ <SelectClientDialog
+ v-if="editSelectClientConfig.editVisible"
+ :edit-common-config="editSelectClientConfig"
+ @selClient="selClient"
+ />
+ <!-- 閫夋嫨鑱旂郴浜� -->
+ <SelectContactDialog
+ v-if="editSelectContactConfig.editVisible"
+ :edit-common-config="editSelectContactConfig"
+ @selClient="selClient"
+ />
+ <!-- 閫夋嫨閿�鍞満浼� -->
+ <SelectChanceDialog
+ v-if="editSelectChanceConfig.editVisible"
+ :edit-common-config="editSelectChanceConfig"
+ @selClient="selClient"
+ />
+ <!-- 鍚堝悓璁㈠崟 -->
+ <SelectCommonDialog
+ v-if="editSelCommonConfig.editVisible"
+ :edit-common-config="editSelCommonConfig"
+ @selClient="selClient"
+ />
</el-dialog>
</div>
</template>
@@ -281,6 +391,10 @@
import CommonFormTableView from "@/components/makepager/CommonFormTableView"
import { getAllData } from "@/api/client/client"
import { getAddServiceContract, getUpdateServiceContract } from "@/api/serviceManage/serviceContract"
+import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
+import SelectContactDialog from "@/views/other/commonDialog/SelectContactDialog"
+import SelectChanceDialog from "@/views/other/commonDialog/SelectChanceDialog"
+import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
export default {
name: "AddServiceContractDialog",
props: {
@@ -295,10 +409,25 @@
}
}
},
- components: { CommonFormTableView },
+ components: { CommonFormTableView, SelectClientDialog, SelectContactDialog, SelectChanceDialog, SelectCommonDialog },
computed: {
searchCommonHeight() {
return this.$refs.searchCommonView.offsetHeight
+ },
+ clientList() {
+ return this.$store.state.getClientName.clientList
+ },
+ contactNamelist() {
+ return this.$store.state.getClientName.contactNamelist
+ },
+ saleChancelist() {
+ return this.$store.state.getClientName.saleChancelist
+ },
+ salesDetailsList() {
+ return this.$store.state.getClientName.salesDetailsList
+ },
+ quotationList() {
+ return this.$store.state.getClientName.quotationList
}
},
data() {
@@ -325,10 +454,41 @@
total: true,
sumProp: ["other1", "other2", "other3", "other4"],
mergeNumber: 3
- }
+ },
+ editSelectClientConfig: {
+ editVisible: false,
+ title: "",
+ infomation: {}
+ },
+ editSelectContactConfig: {
+ editVisible: false,
+ title: "",
+ infomation: {}
+ },
+ editSelectChanceConfig: {
+ editVisible: false,
+ title: "",
+ infomation: {}
+ },
+ editSelCommonConfig: {
+ editVisible: false,
+ title: "",
+ infomation: {}
+ },
+ clientId: this.editCommonConfig.infomation.clientId,
+ contactId: this.editCommonConfig.infomation.contactId,
+ saleChanceId: this.editCommonConfig.infomation.saleChanceId,
+ contractId: this.editCommonConfig.infomation.salesDetailsId,
+ quotationId: this.editCommonConfig.infomation.quotationId,
+ tableData: []
}
},
created() {
+ this.$store.dispatch("geClient")
+ this.$store.dispatch("geContact")
+ this.$store.dispatch("geChance")
+ this.$store.dispatch("geSalesDetails")
+ this.$store.dispatch("geQuotation")
this.setTableForm()
this.getCommonData()
},
@@ -338,6 +498,9 @@
.then((res) => {
if (res.code === 200) {
this.memberOptions = res.data.member
+ this.contractTypeOptions = res.data.serviceContractType
+ this.contractStatusOptions = res.data.serviceContractStatus
+ this.currencyOptions = res.data.currency
}
})
.catch((err) => {
@@ -352,37 +515,23 @@
const params = this.saveParams()
console.log(params)
if (this.editConfig.title === "鏂板缓") {
- getAddServiceContract(params)
- .then((res) => {
- console.log(res)
- this.editConfig.visible = false
- if (res.code === 200) {
- this.$message({
- message: "娣诲姞鎴愬姛",
- type: "success"
- })
- this.$parent.getData()
- }
- })
- .catch((err) => {
- console.log(err)
- })
+ getAddServiceContract(params).then((res) => {
+ console.log(res)
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success("娣诲姞鎴愬姛")
+ this.$parent.getData()
+ }
+ })
} else {
- getUpdateServiceContract(params)
- .then((res) => {
- console.log(res)
- this.editConfig.visible = false
- if (res.code === 200) {
- this.$message({
- message: "缂栬緫鎴愬姛",
- type: "success"
- })
- this.$parent.getData()
- }
- })
- .catch((err) => {
- console.log(err)
- })
+ getUpdateServiceContract(params).then((res) => {
+ console.log(res)
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success("缂栬緫鎴愬姛")
+ this.$parent.getData()
+ }
+ })
}
} else {
console.log("error submit")
@@ -394,9 +543,8 @@
let data = this.editConfig.infomation
let params = {
id: this.editConfig.title === "鏂板缓" ? 0 : data.id,
- clientId: parseInt(data.clientId) || 0,
- contactId: data.contactId || 0,
- contractId: data.contractId || 0,
+ clientId: this.clientId || 0,
+ contactId: this.contactId || 0,
endTime: data.endTime || "",
memberId: data.memberId || 0,
number: data.number || "",
@@ -411,9 +559,10 @@
total: 0
}
],
- quotationId: data.quotationId || 0,
+ quotationId: this.quotationId || 0,
remark: data.remark || "",
- saleChanceId: data.saleChanceId || 0,
+ saleChanceId: this.saleChanceId || 0,
+ salesDetailsId: this.contractId || 0,
serviceTimes: data.serviceTimes || 0,
signTime: data.signTime || "",
startTime: data.startTime || "",
@@ -423,45 +572,151 @@
}
return params
},
-
handleClose() {
this.editConfig.visible = false
+ },
+ // 閫夋嫨瀹㈡埛鐩稿叧鏂规硶
+ querySearchAsync(queryString, cb, value) {
+ var restaurants = []
+ if (value === "client") {
+ restaurants = this.clientList
+ } else if (value === "contact") {
+ restaurants = this.contactNamelist
+ } else if (value === "chance") {
+ restaurants = this.saleChancelist
+ } else if (value === "contract") {
+ restaurants = this.salesDetailsList
+ } else if (value === "quotation") {
+ restaurants = this.quotationList
+ }
+ var results = queryString ? restaurants.filter(this.createStateFilter(queryString, value)) : restaurants
+ cb(results)
+ },
+ createStateFilter(queryString, value) {
+ return (state) => {
+ if (value === "contract" || value === "quotation") {
+ return state.number.toLowerCase().indexOf(queryString.toLowerCase()) === 0
+ } else {
+ return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
+ }
+ }
+ },
+ handleSelectClient(value, item) {
+ console.log(value)
+ if (value === "client") {
+ this.clientId = item.id
+ } else if (value === "contact") {
+ this.contactId = item.id
+ } else if (value === "chance") {
+ this.saleChanceId = item.id
+ } else if (value === "contract") {
+ this.contractId = item.id
+ } else if (value === "quotation") {
+ this.quotationId = item.id
+ }
+ },
+ selClientClick(value) {
+ if (value === "client") {
+ this.editSelectClientConfig.editVisible = true
+ } else if (value === "contact") {
+ this.editSelectContactConfig.editVisible = true
+ } else if (value === "chance") {
+ this.editSelectChanceConfig.editVisible = true
+ } else if (value === "contract") {
+ this.editSelCommonConfig.title = "閿�鍞槑缁嗗崟"
+ this.editSelCommonConfig.editVisible = true
+ } else if (value === "quotation") {
+ this.editSelCommonConfig.title = "鎶ヤ环鍗�"
+ this.editSelCommonConfig.editVisible = true
+ }
+ },
+ selClient(row, value) {
+ console.log(value)
+ if (value === "contact") {
+ this.editConfig.infomation.contact_name = row.name
+ this.contactId = row.id
+ } else if (value === "client") {
+ this.editConfig.infomation.client_name = row.name
+ this.clientId = row.id
+ } else if (value === "chance") {
+ this.editConfig.infomation.sale_chance_name = row.name
+ this.saleChanceId = row.id
+ } else if (value === "contract") {
+ this.editConfig.infomation.contract_number = row.number
+ this.contractId = row.id
+ } else if (value === "quotation") {
+ this.editConfig.infomation.quotation_number = row.number
+ this.quotationId = row.id
+ }
+ },
+ // 娓呴櫎宸查�夋嫨鐢ㄦ埛
+ clearupClient(value) {
+ if (value === "client") {
+ this.editConfig.infomation.client_name = ""
+ this.clientId = 0
+ } else if (value === "contact") {
+ this.editConfig.infomation.contact_name = ""
+ this.contactId = 0
+ } else if (value === "chance") {
+ this.editConfig.infomation.sale_chance_name = ""
+ this.saleChanceId = 0
+ } else if (value === "contract") {
+ this.editConfig.infomation.contract_number = ""
+ this.contractId = 0
+ } else if (value === "quotation") {
+ this.editConfig.infomation.quotation_number = ""
+ this.quotationId = 0
+ }
},
// 娣诲姞闄勪欢
addAnnexClick() {},
// 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
setFormatClick() {},
setTableForm() {
- this.productTableList = {
- tableData: [
+ if (this.editConfig.title === "鏂板缓") {
+ this.tableData = [
{
- id: "1",
- productName: "涓婃捣鏈夐檺鍏徃",
- other0: "ZDYBD03-1",
- other1: "12",
- other2: "5.00",
- other4: "3.00",
- other3: "2.00"
+ Amount: 0,
+ IsSale: true,
+ MaterialMode: "",
+ MinInventory: 0,
+ Name: "",
+ Number: "",
+ PurchaseType: "",
+ SalePrice: 0,
+ Unit: ""
}
- ],
+ ]
+ } else {
+ this.tableData = this.editConfig.infomation.products
+ }
+ this.productTableList = {
+ tableData: this.tableData,
tableColumn: [
{ label: "#", prop: "id", width: 40 },
- { label: "浜у搧鍚嶇О", prop: "productName", input: true, isRequird: true },
- { label: "浜у搧缂栧彿", prop: "other0" },
+ { label: "浜у搧鍚嶇О", prop: "Name", input: true, isRequird: true },
+ { label: "浜у搧缂栧彿", prop: "Number" },
{ label: "鏈嶅姟寮�濮嬫棩", prop: "other5", date: true, isRequird: true, min: 100 },
{ label: "鏈嶅姟鍒版湡鏃�", prop: "other6", date: true, isRequird: true, min: 100 },
- { label: "鏁伴噺", prop: "other1", input: true, isRequird: true },
- { label: "鍚◣鍗曚环", prop: "other9", input: true },
- { label: "涓嶅惈绋庡崟浠�", prop: "other7", input: true },
- { label: "鎶樻墸鐜�(%)", prop: "other6", input: true },
- { label: "鎶樻墸棰�", prop: "other2" },
- { label: "绋�(閿�鍞�)", prop: "other7", input: true },
- { label: "瀹為檯鍚◣鍗曚环", prop: "other3" },
- { label: "涓嶅惈绋庨噾棰�", prop: "other4" },
+ { label: "鏁伴噺", prop: "amount", input: true, isRequird: true },
+ { label: "閿�鍞崟浠�", prop: "Unit", input: true },
{ label: "浠风◣鍚堣", prop: "other3", input: true },
{ label: "鎻忚堪", prop: "other8" }
]
}
+ },
+ addProductClick() {
+ this.tableData.push({
+ Amount: 0,
+ IsSale: true,
+ MaterialMode: "",
+ MinInventory: 0,
+ Name: "",
+ Number: "",
+ PurchaseType: "",
+ SalePrice: 0,
+ Unit: ""
+ })
}
}
}
@@ -469,58 +724,54 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
-.add-service-contract {
- .basic-info {
- .basic-info-title {
- background-color: #f4f8fe;
- padding-left: 10px;
- font-size: 15px;
- font-weight: bold;
- color: #666;
- height: 42px;
- line-height: 42px;
- }
- .basic-info-view {
- margin-top: 10px;
- padding-right: 40px;
- .custom-name {
- display: flex;
- .common-select-btn {
- margin-left: 5px;
- font-size: 18px;
+::v-deep {
+ .iframe-dialog .el-dialog__body {
+ .basic-info {
+ .basic-info-title {
+ background-color: #f4f8fe;
+ padding-left: 10px;
+ font-size: 15px;
+ font-weight: bold;
+ color: #666;
+ height: 42px;
+ line-height: 42px;
+ }
+ .basic-info-view {
+ margin-top: 10px;
+ padding-right: 40px;
+ .custom-name,
+ .common-select {
+ display: flex;
+ .common-select-sel {
+ width: 270px;
+ }
+ .common-select-btn {
+ margin-left: 5px;
+ font-size: 16px;
+ cursor: pointer;
+ }
}
}
- .common-select {
+ .annex-view {
display: flex;
- .common-select-sel {
- width: 270px;
- }
- .common-select-btn {
- margin-left: 5px;
- font-size: 16px;
- cursor: pointer;
+ color: #6166d3;
+ .setFormat {
+ margin-left: 10px;
}
}
}
- .annex-view {
+ .unflod-collapse {
display: flex;
+ height: 30px;
+ justify-content: center;
+ align-items: center;
color: #6166d3;
- .setFormat {
- margin-left: 10px;
- }
}
- }
- .unflod-collapse {
- display: flex;
- height: 30px;
- justify-content: center;
- align-items: center;
- color: #6166d3;
- }
- .dialog-footer {
- background-color: #f5f5f5;
- height: 55px;
- line-height: 55px;
+ .dialog-footer {
+ background-color: #f5f5f5;
+ height: 55px;
+ line-height: 55px;
+ }
}
}
</style>
--
Gitblit v1.8.0