From fde4963aaa85d4f02a58ed8d5cc58396604537ae Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期五, 21 七月 2023 18:55:56 +0800
Subject: [PATCH] 服务管理相关联调
---
src/views/sales/generatePlan/AddGeneratePlanDialog.vue | 68 ++
src/views/other/commonDialog/SelectClientDialog.vue | 205 +++++++
src/views/service/serviceFollowup/AddServiceFollowupDialog.vue | 78 ++
src/views/client/followupRecords/AddFollowupRecordsDialog.vue | 101 ++-
src/views/sales/masterOrder/index.vue | 5
src/views/sales/salesDetails/AddSalesDetailsDialog.vue | 73 ++
src/views/backgroundConfig/rolePermssion/AddRolePermssionDialog.vue | 1
src/views/service/orderManage/AddOrderManageDialog.vue | 83 ++
src/views/service/serviceFeeManage/AddServiceFeeManageDialog.vue | 75 ++
src/views/sales/salesDetails/index.vue | 5
src/views/backgroundConfig/memberManage/AddMemberManageDialog.vue | 1
src/views/service/serviceContract/AddServiceContractDialog.vue | 73 ++
src/store/modules/getClientName.js | 24
src/views/client/contacts/AddContactsDialog.vue | 101 ++-
src/views/sales/subOrder/index.vue | 5
src/store/index.js | 10
src/views/sales/masterOrder/AddMasterOrderDialog.vue | 70 ++
src/views/sales/salesReturn/AddSalesReturnDialog.vue | 88 ++
src/views/sales/refundForm/AddRefundFormDialog.vue | 101 ++-
src/views/client/client/AddClientManageDialog.vue | 22
src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue | 85 ++
src/main.js | 2
src/views/sales/quotation/AddQuotationDialog.vue | 80 ++
src/views/sales/subOrder/AddSubOrderDialog.vue | 66 ++
src/views/sales/contractManage/AddContractManageDialog.vue | 84 ++
25 files changed, 1,208 insertions(+), 298 deletions(-)
diff --git a/src/main.js b/src/main.js
index cda3af3..6b8ee12 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,6 +1,7 @@
import Vue from "vue"
import App from "./App.vue"
import router from "./router"
+import store from "./store"
import ElementUI from "element-ui"
import "element-ui/lib/theme-chalk/index.css"
import "@/assets/style/index.scss"
@@ -12,5 +13,6 @@
new Vue({
router,
+ store,
render: (h) => h(App)
}).$mount("#app")
diff --git a/src/store/index.js b/src/store/index.js
new file mode 100644
index 0000000..1d8741c
--- /dev/null
+++ b/src/store/index.js
@@ -0,0 +1,10 @@
+import Vue from "vue"
+import Vuex from "vuex"
+import getClientName from "./modules/getClientName"
+
+Vue.use(Vuex)
+export default new Vuex.Store({
+ modules: {
+ getClientName
+ }
+})
diff --git a/src/store/modules/getClientName.js b/src/store/modules/getClientName.js
new file mode 100644
index 0000000..0070ce8
--- /dev/null
+++ b/src/store/modules/getClientName.js
@@ -0,0 +1,24 @@
+import { getClientList } from "@/api/client/client" // 瀵煎叆鎺ュ彛
+import { Message } from "element-ui"
+
+export default {
+ state: {
+ clientList: [] // 瀹㈡埛鍒楄〃
+ },
+ mutations: {
+ clientNameList(state, payload) {
+ state.clientList = payload
+ }
+ },
+ actions: {
+ geClient(context) {
+ getClientList().then((res) => {
+ if (res.code == 200) {
+ context.commit("clientNameList", res.data.list)
+ } else {
+ Message.error(res.msg)
+ }
+ })
+ }
+ }
+}
diff --git a/src/views/backgroundConfig/memberManage/AddMemberManageDialog.vue b/src/views/backgroundConfig/memberManage/AddMemberManageDialog.vue
index c302762..5b278a5 100644
--- a/src/views/backgroundConfig/memberManage/AddMemberManageDialog.vue
+++ b/src/views/backgroundConfig/memberManage/AddMemberManageDialog.vue
@@ -404,6 +404,7 @@
.common-select-btn {
margin-left: 5px;
font-size: 16px;
+ cursor: pointer;
}
}
}
diff --git a/src/views/backgroundConfig/rolePermssion/AddRolePermssionDialog.vue b/src/views/backgroundConfig/rolePermssion/AddRolePermssionDialog.vue
index 6b55bd2..fae0389 100644
--- a/src/views/backgroundConfig/rolePermssion/AddRolePermssionDialog.vue
+++ b/src/views/backgroundConfig/rolePermssion/AddRolePermssionDialog.vue
@@ -300,6 +300,7 @@
.common-select-btn {
margin-left: 5px;
font-size: 16px;
+ cursor: pointer;
}
}
}
diff --git a/src/views/client/client/AddClientManageDialog.vue b/src/views/client/client/AddClientManageDialog.vue
index d586e99..f8bf2da 100644
--- a/src/views/client/client/AddClientManageDialog.vue
+++ b/src/views/client/client/AddClientManageDialog.vue
@@ -677,29 +677,21 @@
.basic-info-view {
margin-top: 10px;
padding-right: 40px;
- .client-name {
+ .custom-name,
+ .common-select {
display: flex;
.common-select-btn {
margin-left: 5px;
font-size: 18px;
- }
- }
- .common-select {
- display: flex;
- .common-select-sel {
- width: 270px;
- }
- .common-select-btn {
- margin-left: 5px;
- font-size: 16px;
cursor: pointer;
}
}
+ .common-select {
+ .common-select-sel {
+ width: 270px;
+ }
+ }
}
- // .address-view {
- // margin-top: 10px;
- // padding-right: 40px;
- // }
.annex-view {
display: flex;
color: #6166d3;
diff --git a/src/views/client/contacts/AddContactsDialog.vue b/src/views/client/contacts/AddContactsDialog.vue
index 8e1b95d..03ebb74 100644
--- a/src/views/client/contacts/AddContactsDialog.vue
+++ b/src/views/client/contacts/AddContactsDialog.vue
@@ -5,6 +5,7 @@
:visible.sync="editConfig.visible"
:width="dialogWidth"
:before-close="handleClose"
+ :close-on-click-modal="false"
>
<el-form
ref="form"
@@ -31,11 +32,19 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="瀹㈡埛鍚嶇О" prop="client_id">
+ <el-form-item label="瀹㈡埛鍚嶇О" prop="client_name">
<div class="custom-name">
- <el-input v-model="editConfig.infomation.client_id"></el-input>
- <div class="common-select-btn">
- <i class="el-icon-circle-plus-outline"></i>
+ <el-autocomplete
+ v-model="editConfig.infomation.client_name"
+ :fetch-suggestions="querySearchAsync"
+ value-key="name"
+ @select="handleSelectClient"
+ ></el-autocomplete>
+ <div class="common-select-btn" @click="selClientClick">
+ <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
+ </div>
+ <div class="common-select-btn" @click="clearupClient">
+ <i class="el-icon-edit-outline" title="娓呴櫎"></i>
</div>
</div>
</el-form-item>
@@ -212,6 +221,12 @@
<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"
+ />
</el-dialog>
</div>
</template>
@@ -219,6 +234,7 @@
<script>
import { getAddContact, getUpdateContact } from "@/api/client/contacts"
import { getAllData } from "@/api/client/client"
+import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
export default {
name: "AddContactsDialog",
props: {
@@ -228,31 +244,17 @@
return {
visible: false,
title: "鏂板缓",
- infomation: {
- name: "",
- number: "",
- client_id: "",
- phone: "",
- position: "",
- member_id: "5",
- is_first: false,
- wechat: "1",
- birthday: "",
- email: "",
- nextFollowupDate: "",
- country_id: "",
- province_id: "",
- city_id: "",
- region_id: "",
- postalCode: "",
- desc: ""
- }
+ infomation: {}
}
}
}
},
- components: {},
- computed: {},
+ components: { SelectClientDialog },
+ computed: {
+ clientList() {
+ return this.$store.state.getClientName.clientList
+ }
+ },
data() {
return {
dialogWidth: "80%",
@@ -278,10 +280,16 @@
cityOptions: [], // 鍩庡競
regionOptions: [], // 鍖哄煙
unflodCollapseStr: "鏀惰捣",
- isUnflod: true
+ isUnflod: true,
+ editSelectClientConfig: {
+ editVisible: false,
+ title: "",
+ infomation: {}
+ }
}
},
created() {
+ this.$store.dispatch("geClient")
this.getCommonData()
},
methods: {
@@ -354,7 +362,7 @@
id: this.editConfig.title === "鏂板缓" ? 0 : data.id,
birthday: data.birthday || "",
city_id: data.city_id || 0,
- client_id: 0,
+ client_id: parseInt(data.client_id) || 0,
country_id: data.country_id || 0,
desc: data.desc || "",
email: data.email || "",
@@ -369,6 +377,33 @@
wechat: data.wechat || ""
}
return params
+ },
+ // 閫夋嫨瀹㈡埛鐩稿叧鏂规硶
+ querySearchAsync(queryString, cb) {
+ var restaurants = this.clientList
+ var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants
+ cb(results)
+ },
+ createStateFilter(queryString) {
+ return (state) => {
+ return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
+ }
+ },
+ handleSelectClient(item) {
+ this.editConfig.infomation.client_id = item.id
+ },
+ selClientClick() {
+ this.editSelectClientConfig.editVisible = true
+ },
+ selClient(row) {
+ console.log(row)
+ this.editConfig.infomation.client_name = row.name
+ this.editConfig.infomation.client_id = row.id
+ },
+ // 娓呴櫎宸查�夋嫨鐢ㄦ埛
+ clearupClient() {
+ this.editConfig.infomation.client_name = ""
+ this.editConfig.infomation.client_id = 0
},
// 娣诲姞闄勪欢
addAnnexClick() {},
@@ -404,22 +439,18 @@
.basic-info-view {
margin-top: 10px;
padding-right: 40px;
- .custom-name {
+ .custom-name,
+ .common-select {
display: flex;
.common-select-btn {
margin-left: 5px;
- font-size: 16px;
+ font-size: 18px;
+ cursor: pointer;
}
}
.common-select {
- display: flex;
.common-select-sel {
width: 270px;
- }
- .common-select-btn {
- margin-left: 5px;
- font-size: 16px;
- cursor: pointer;
}
}
}
diff --git a/src/views/client/followupRecords/AddFollowupRecordsDialog.vue b/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
index 3828cfd..0302ab4 100644
--- a/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
+++ b/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
@@ -23,9 +23,18 @@
<el-col :span="12">
<el-form-item label="瀹㈡埛鍚嶇О" prop="client_name">
<div class="custom-name">
- <el-input v-model="editConfig.infomation.client_name"></el-input>
- <div class="common-select-btn"><i class="el-icon-circle-plus-outline"></i></div>
- <div class="common-select-btn"><i class="el-icon-edit-outline"></i></div>
+ <el-autocomplete
+ v-model="editConfig.infomation.client_name"
+ :fetch-suggestions="querySearchAsync"
+ value-key="name"
+ @select="handleSelectClient"
+ ></el-autocomplete>
+ <div class="common-select-btn" @click="selClientClick">
+ <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
+ </div>
+ <div class="common-select-btn" @click="clearupClient">
+ <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ </div>
</div>
</el-form-item>
</el-col>
@@ -181,6 +190,12 @@
<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"
+ />
</el-dialog>
</div>
</template>
@@ -188,6 +203,7 @@
<script>
import { getAllData } from "@/api/client/client"
import { getAddFollowRecord, getUpdateFollowRecord } from "@/api/client/followupRecords"
+import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
export default {
name: "AddFollowupRecordsDialog",
props: {
@@ -197,30 +213,18 @@
return {
visible: false,
title: "鏂板缓",
- infomation: {
- client_name: "",
- number: "",
- client_status_id: "",
- contact_id: "",
- member_id: "",
- topic: "",
- record: "",
- phoneNumber: "",
- sale_chance_id: "",
- sales_leads_id: "",
- follow_time: "",
- next_follow_time: "",
- purpose: "",
- content: ""
- }
+ infomation: {}
}
}
}
},
- components: {},
+ components: { SelectClientDialog },
computed: {
searchCommonHeight() {
return this.$refs.searchCommonView.offsetHeight
+ },
+ clientList() {
+ return this.$store.state.getClientName.clientList
}
},
data() {
@@ -236,10 +240,16 @@
clientStatusOptions: [], // 瀹㈡埛鐘舵��
memberOptions: [],
unflodCollapseStr: "鏀惰捣",
- isUnflod: true
+ isUnflod: true,
+ editSelectClientConfig: {
+ editVisible: false,
+ title: "",
+ infomation: {}
+ }
}
},
created() {
+ this.$store.dispatch("geClient")
this.getCommonData()
},
methods: {
@@ -331,6 +341,33 @@
}
return params
},
+ // 閫夋嫨瀹㈡埛鐩稿叧鏂规硶
+ querySearchAsync(queryString, cb) {
+ var restaurants = this.clientList
+ var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants
+ cb(results)
+ },
+ createStateFilter(queryString) {
+ return (state) => {
+ return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
+ }
+ },
+ handleSelectClient(item) {
+ this.editConfig.infomation.client_id = item.id
+ },
+ selClientClick() {
+ this.editSelectClientConfig.editVisible = true
+ },
+ selClient(row) {
+ console.log(row)
+ this.editConfig.infomation.client_name = row.name
+ this.editConfig.infomation.client_id = row.id
+ },
+ // 娓呴櫎宸查�夋嫨鐢ㄦ埛
+ clearupClient() {
+ this.editConfig.infomation.client_name = ""
+ this.editConfig.infomation.client_id = 0
+ },
// 娣诲姞闄勪欢
addAnnexClick() {},
// 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
@@ -365,28 +402,20 @@
.basic-info-view {
margin-top: 10px;
padding-right: 40px;
- .custom-name {
- display: flex;
- .common-select-btn {
- margin-left: 5px;
- font-size: 16px;
- }
- }
+ .custom-name,
.common-select {
display: flex;
- .common-select-sel {
- width: 270px;
- }
.common-select-btn {
margin-left: 5px;
- font-size: 16px;
+ font-size: 18px;
cursor: pointer;
}
}
- }
- .address-view {
- margin-top: 10px;
- padding-right: 40px;
+ .common-select {
+ .common-select-sel {
+ width: 270px;
+ }
+ }
}
.annex-view {
display: flex;
diff --git a/src/views/other/commonDialog/SelectClientDialog.vue b/src/views/other/commonDialog/SelectClientDialog.vue
new file mode 100644
index 0000000..1a62eb9
--- /dev/null
+++ b/src/views/other/commonDialog/SelectClientDialog.vue
@@ -0,0 +1,205 @@
+<template>
+ <div class="edit-selClient-box">
+ <el-dialog
+ :title="'瀹㈡埛绠＄悊'"
+ :visible.sync="editConfig.editVisible"
+ :width="dialogWidth"
+ :before-close="handleClose"
+ :append-to-body="true"
+ :close-on-click-modal="false"
+ >
+ <div class="bg-view">
+ <div class="query-bg">
+ <el-input placeholder="璇疯緭鍏ュ唴瀹�" v-model="queryInput" size="mini" class="input-with-select">
+ <el-select v-model="select" slot="prepend" placeholder="璇烽�夋嫨">
+ <el-option label="鍏ㄩ儴瀛楁" value="1"></el-option>
+ <el-option label="瀹㈡埛缂栧彿" value="2"></el-option>
+ <el-option label="瀹㈡埛鐘舵��" value="3"></el-option>
+ <el-option label="閿�鍞礋璐ｄ汉" value="4"></el-option>
+ <el-option label="娉曞畾浠ｈ〃浜�" value="5"></el-option>
+ <el-option label="娉ㄥ唽鏃堕棿" value="6"></el-option>
+ <el-option label="缁忚惀鑼冨洿" value="7"></el-option>
+ <el-option label="璇︾粏鍦板潃" value="8"></el-option>
+ <el-option label="澶囨敞" value="9"></el-option>
+ </el-select>
+ </el-input>
+ <div class="btn">
+ <el-button type="primary" size="mini" disabled>璁剧疆瀛楁</el-button>
+ <el-button type="primary" size="mini" disabled>蹇�熷垱寤�</el-button>
+ </div>
+ </div>
+ <el-table
+ :data="tableData"
+ border
+ size="mini"
+ v-loading="loading"
+ :header-cell-style="{ background: '#f7f7f7' }"
+ >
+ <el-table-column label="瀹㈡埛鍚嶇О" prop="name" show-overflow-tooltip>
+ <template slot-scope="scope">
+ <!-- <div style="margin-right: 10px"> -->
+ <span class="sel-name" @click="selNameClick(scope.row)">{{ scope.row.name }}</span>
+ <!-- </div> -->
+ </template>
+ </el-table-column>
+ <el-table-column label="瀹㈡埛缂栧彿" prop="number"></el-table-column>
+ <el-table-column label="瀹㈡埛鐘舵��" prop="client_status"></el-table-column>
+ <el-table-column label="閿�鍞礋璐ｄ汉" prop="member_id"></el-table-column>
+ <!-- <el-table-column label="绾跨储鍗囩骇鐘舵��" prop="setDefault"></el-table-column> -->
+ <el-table-column label="娉曞畾浠ｈ〃浜�" prop="representative"></el-table-column>
+ <el-table-column label="娉ㄥ唽鏃堕棿" prop="registration_time" show-overflow-tooltip>
+ <template slot-scope="scope">
+ <span>{{
+ dateFormat("YYYY-mm-dd HH:MM:SS", scope.row.registration_time) === "1900-01-01 08:00:00"
+ ? "--"
+ : dateFormat("YYYY-mm-dd HH:MM:SS", scope.row.registration_time)
+ }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="缁忚惀鑼冨洿" prop="business_scope"></el-table-column>
+ <el-table-column label="璇︾粏鍦板潃" prop="detail_address"></el-table-column>
+ <el-table-column label="澶囨敞" prop="remark"></el-table-column>
+ <div slot="empty">
+ <el-empty :image-size="100"></el-empty>
+ </div>
+ </el-table>
+ <div slot="footer" class="dialog-footer">
+ <div class="remark">璇存槑锛氭敮鎸佸瀛楁妯＄硦鏌ヨ锛屼粎鏄剧ず绗﹀悎鏉′欢鐨勫墠5鏉℃暟鎹�</div>
+ </div>
+ </div>
+ </el-dialog>
+ </div>
+</template>
+
+<script>
+import { getClientList } from "@/api/client/client"
+export default {
+ name: "EditSelClientDialog",
+ props: {
+ editCommonConfig: {
+ type: Object,
+ default: () => {
+ return {
+ editVisible: false,
+ title: "",
+ infomation: {
+ name: "",
+ color: "",
+ setDefault: ""
+ }
+ }
+ }
+ }
+ },
+ components: {},
+ computed: {},
+ data() {
+ return {
+ dialogWidth: "50%",
+ editConfig: this.editCommonConfig,
+ queryInput: "",
+ select: "1",
+ tableData: [],
+ searchSelOptions: [],
+ loading: false
+ }
+ },
+ created() {
+ this.getData()
+ },
+ methods: {
+ handleClose() {
+ this.editConfig.editVisible = false
+ },
+ // 璇锋眰鏁版嵁
+ async getData() {
+ this.loading = true
+ await getClientList()
+ .then((res) => {
+ console.log(res)
+ if (res.code === 200) {
+ if (res.data.list && res.data.list.length > 0) {
+ const list = res.data.list.map((item) => {
+ return {
+ ...item,
+ client_status: item.client_status.name
+ }
+ })
+ this.tableData = list.slice(0, 5) || []
+ } else {
+ this.tableData = []
+ }
+ } else {
+ this.tableData = []
+ }
+ this.loading = false
+ })
+ .catch((err) => {
+ console.log(err)
+ this.tableData = []
+ this.loading = false
+ })
+ },
+ selNameClick(row) {
+ this.editConfig.editVisible = false
+ this.$emit("selClient", row)
+ },
+ // 鏃堕棿鏄剧ず
+ dateFormat(fmt, date) {
+ let ret = ""
+ date = new Date(date)
+ const opt = {
+ "Y+": date.getFullYear().toString(), // 骞�
+ "m+": (date.getMonth() + 1).toString(), // 鏈�
+ "d+": date.getDate().toString(), // 鏃�
+ "H+": date.getHours().toString(), // 鏃�
+ "M+": date.getMinutes().toString(), // 鍒�
+ "S+": date.getSeconds().toString() // 绉�
+ // 鏈夊叾浠栨牸寮忓寲瀛楃闇�姹傚彲浠ョ户缁坊鍔狅紝蹇呴』杞寲鎴愬瓧绗︿覆
+ }
+ for (let k in opt) {
+ ret = new RegExp("(" + k + ")").exec(fmt)
+ if (ret) {
+ fmt = fmt.replace(ret[1], ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, "0"))
+ }
+ }
+ return fmt
+ }
+ }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="scss" scoped>
+.bg-view {
+ margin: 10px;
+ .query-bg {
+ margin-bottom: 10px;
+ display: flex;
+ justify-content: space-between;
+ .el-input {
+ width: 310px;
+ .el-select {
+ width: 100px;
+ }
+ }
+ .btn {
+ float: right;
+ }
+ }
+}
+.sel-name {
+ color: $color-primary;
+ cursor: pointer;
+}
+.dialog-footer {
+ height: 40px;
+ line-height: 40px;
+ color: red;
+}
+::v-deep {
+ .input-with-select .el-input-group__prepend {
+ background-color: #fff;
+ }
+}
+</style>
diff --git a/src/views/sales/contractManage/AddContractManageDialog.vue b/src/views/sales/contractManage/AddContractManageDialog.vue
index 2e1baa7..c6926a3 100644
--- a/src/views/sales/contractManage/AddContractManageDialog.vue
+++ b/src/views/sales/contractManage/AddContractManageDialog.vue
@@ -21,11 +21,20 @@
<div class="basic-info-view">
<el-row>
<el-col :span="12">
- <el-form-item label="瀹㈡埛鍚嶇О" prop="client_id">
+ <el-form-item label="瀹㈡埛鍚嶇О" prop="client_name">
<div class="custom-name">
- <el-input v-model="editConfig.infomation.client_id"></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="querySearchAsync"
+ value-key="name"
+ @select="handleSelectClient"
+ ></el-autocomplete>
+ <div class="common-select-btn" @click="selClientClick">
+ <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
+ </div>
+ <div class="common-select-btn" @click="clearupClient">
+ <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ </div>
</div>
</el-form-item>
</el-col>
@@ -153,6 +162,12 @@
<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"
+ />
</el-dialog>
</div>
</template>
@@ -160,6 +175,7 @@
<script>
import { getAllData } from "@/api/client/client"
import { getAddContract, getUpdateContract } from "@/api/sales/contractManage"
+import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
export default {
name: "AddContractManageDialog",
props: {
@@ -174,8 +190,12 @@
}
}
},
- components: {},
- computed: {},
+ components: { SelectClientDialog },
+ computed: {
+ clientList() {
+ return this.$store.state.getClientName.clientList
+ }
+ },
data() {
return {
dialogWidth: "80%",
@@ -185,18 +205,19 @@
member_id: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }]
},
memberOptions: [],
- statusOptions: [
- { id: "1", name: "寰呭鎵�" },
- { id: "2", name: "瀹℃壒涓�" },
- { id: "3", name: "宸插鎵�" },
- { id: "4", name: "宸插綊妗�" }
- ], // 鍚堝悓鐘舵��
+ statusOptions: [], // 鍚堝悓鐘舵��
approvalWorkflowOptions: [], // 瀹℃壒娴佺▼
unflodCollapseStr: "鏀惰捣",
- isUnflod: true
+ isUnflod: true,
+ editSelectClientConfig: {
+ editVisible: false,
+ title: "",
+ infomation: {}
+ }
}
},
created() {
+ this.$store.dispatch("geClient")
this.getCommonData()
},
methods: {
@@ -204,6 +225,7 @@
getAllData()
.then((res) => {
this.memberOptions = res.data.member
+ this.statusOptions = res.data.serviceContractStatus
})
.catch((err) => {
console.log(err)
@@ -271,6 +293,33 @@
handleClose() {
this.editConfig.visible = false
},
+ // 閫夋嫨瀹㈡埛鐩稿叧鏂规硶
+ querySearchAsync(queryString, cb) {
+ var restaurants = this.clientList
+ var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants
+ cb(results)
+ },
+ createStateFilter(queryString) {
+ return (state) => {
+ return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
+ }
+ },
+ handleSelectClient(item) {
+ this.editConfig.infomation.client_id = item.id
+ },
+ selClientClick() {
+ this.editSelectClientConfig.editVisible = true
+ },
+ selClient(row) {
+ console.log(row)
+ this.editConfig.infomation.client_name = row.name
+ this.editConfig.infomation.client_id = row.id
+ },
+ // 娓呴櫎宸查�夋嫨鐢ㄦ埛
+ clearupClient() {
+ this.editConfig.infomation.client_name = ""
+ this.editConfig.infomation.client_id = 0
+ },
// 娣诲姞闄勪欢
addAnnexClick() {},
// 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
@@ -305,7 +354,8 @@
.basic-info-view {
margin-top: 10px;
padding-right: 40px;
- .custom-name {
+ .custom-name,
+ .common-select {
display: flex;
.common-select-btn {
margin-left: 5px;
@@ -313,14 +363,8 @@
}
}
.common-select {
- display: flex;
.common-select-sel {
width: 270px;
- }
- .common-select-btn {
- margin-left: 5px;
- font-size: 16px;
- cursor: pointer;
}
}
}
diff --git a/src/views/sales/generatePlan/AddGeneratePlanDialog.vue b/src/views/sales/generatePlan/AddGeneratePlanDialog.vue
index 92e275b..97c0605 100644
--- a/src/views/sales/generatePlan/AddGeneratePlanDialog.vue
+++ b/src/views/sales/generatePlan/AddGeneratePlanDialog.vue
@@ -21,11 +21,20 @@
<div class="basic-info-view">
<el-row>
<el-col v-if="isUnflod" :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="querySearchAsync"
+ value-key="name"
+ @select="handleSelectClient"
+ ></el-autocomplete>
+ <div class="common-select-btn" @click="selClientClick">
+ <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
+ </div>
+ <div class="common-select-btn" @click="clearupClient">
+ <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ </div>
</div>
</el-form-item>
</el-col>
@@ -133,6 +142,12 @@
<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"
+ />
</el-dialog>
</div>
</template>
@@ -140,6 +155,7 @@
<script>
import { getAllData } from "@/api/client/client"
import { getAddPlan, getUpdatePlan } from "@/api/sales/generatePlan"
+import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
export default {
name: "AddGeneratePlanDialog",
props: {
@@ -154,8 +170,12 @@
}
}
},
- components: {},
- computed: {},
+ components: { SelectClientDialog },
+ computed: {
+ clientList() {
+ return this.$store.state.getClientName.clientList
+ }
+ },
data() {
return {
dialogWidth: "80%",
@@ -166,10 +186,16 @@
},
memberOptions: [],
unflodCollapseStr: "鏀惰捣",
- isUnflod: true
+ isUnflod: true,
+ editSelectClientConfig: {
+ editVisible: false,
+ title: "",
+ infomation: {}
+ }
}
},
created() {
+ this.$store.dispatch("geClient")
this.getCommonData()
},
methods: {
@@ -249,6 +275,33 @@
handleClose() {
this.editConfig.visible = false
},
+ // 閫夋嫨瀹㈡埛鐩稿叧鏂规硶
+ querySearchAsync(queryString, cb) {
+ var restaurants = this.clientList
+ var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants
+ cb(results)
+ },
+ createStateFilter(queryString) {
+ return (state) => {
+ return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
+ }
+ },
+ handleSelectClient(item) {
+ this.editConfig.infomation.client_id = item.id
+ },
+ selClientClick() {
+ this.editSelectClientConfig.editVisible = true
+ },
+ selClient(row) {
+ console.log(row)
+ this.editConfig.infomation.client_name = row.name
+ this.editConfig.infomation.client_id = row.id
+ },
+ // 娓呴櫎宸查�夋嫨鐢ㄦ埛
+ clearupClient() {
+ this.editConfig.infomation.client_name = ""
+ this.editConfig.infomation.client_id = 0
+ },
// 娣诲姞闄勪欢
addAnnexClick() {},
// 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
@@ -288,6 +341,7 @@
.common-select-btn {
margin-left: 5px;
font-size: 18px;
+ cursor: pointer;
}
}
}
diff --git a/src/views/sales/masterOrder/AddMasterOrderDialog.vue b/src/views/sales/masterOrder/AddMasterOrderDialog.vue
index df97052..012cd7f 100644
--- a/src/views/sales/masterOrder/AddMasterOrderDialog.vue
+++ b/src/views/sales/masterOrder/AddMasterOrderDialog.vue
@@ -20,12 +20,21 @@
<div v-if="isUnflod" class="basic-info-title">鍩烘湰淇℃伅</div>
<div class="basic-info-view">
<el-row>
- <el-col v-if="isUnflod" :span="12">
- <el-form-item label="瀹㈡埛鍚嶇О" prop="client_id">
+ <el-col :span="12">
+ <el-form-item label="瀹㈡埛鍚嶇О" prop="client_name">
<div class="custom-name">
- <el-input v-model="editConfig.infomation.client_id"></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="querySearchAsync"
+ value-key="name"
+ @select="handleSelectClient"
+ ></el-autocomplete>
+ <div class="common-select-btn" @click="selClientClick">
+ <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
+ </div>
+ <div class="common-select-btn" @click="clearupClient">
+ <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ </div>
</div>
</el-form-item>
</el-col>
@@ -105,6 +114,12 @@
<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"
+ />
</el-dialog>
</div>
</template>
@@ -112,6 +127,7 @@
<script>
import { getAllData } from "@/api/client/client"
import { getAddMasterOrder, getUpdateMasterOrder } from "@/api/sales/masterOrder"
+import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
export default {
name: "QuotationDialog",
props: {
@@ -126,8 +142,12 @@
}
}
},
- components: {},
- computed: {},
+ components: { SelectClientDialog },
+ computed: {
+ clientList() {
+ return this.$store.state.getClientName.clientList
+ }
+ },
data() {
return {
dialogWidth: "80%",
@@ -138,10 +158,16 @@
},
memberOptions: [],
unflodCollapseStr: "鏀惰捣",
- isUnflod: true
+ isUnflod: true,
+ editSelectClientConfig: {
+ editVisible: false,
+ title: "",
+ infomation: {}
+ }
}
},
created() {
+ this.$store.dispatch("geClient")
this.getCommonData()
},
methods: {
@@ -216,6 +242,33 @@
handleClose() {
this.editConfig.visible = false
},
+ // 閫夋嫨瀹㈡埛鐩稿叧鏂规硶
+ querySearchAsync(queryString, cb) {
+ var restaurants = this.clientList
+ var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants
+ cb(results)
+ },
+ createStateFilter(queryString) {
+ return (state) => {
+ return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
+ }
+ },
+ handleSelectClient(item) {
+ this.editConfig.infomation.client_id = item.id
+ },
+ selClientClick() {
+ this.editSelectClientConfig.editVisible = true
+ },
+ selClient(row) {
+ console.log(row)
+ this.editConfig.infomation.client_name = row.name
+ this.editConfig.infomation.client_id = row.id
+ },
+ // 娓呴櫎宸查�夋嫨鐢ㄦ埛
+ clearupClient() {
+ this.editConfig.infomation.client_name = ""
+ this.editConfig.infomation.client_id = 0
+ },
// 娣诲姞闄勪欢
addAnnexClick() {},
// 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
@@ -255,6 +308,7 @@
.common-select-btn {
margin-left: 5px;
font-size: 18px;
+ cursor: pointer;
}
}
}
diff --git a/src/views/sales/masterOrder/index.vue b/src/views/sales/masterOrder/index.vue
index d01e15d..56d7cf9 100644
--- a/src/views/sales/masterOrder/index.vue
+++ b/src/views/sales/masterOrder/index.vue
@@ -75,7 +75,7 @@
tableInfomation: [],
tableColumn: [
{ label: "鍗曟嵁缂栧彿", prop: "number", min: 100 }, // 鍗曟嵁缂栧彿
- { label: "瀹㈡埛鍚嶇О", prop: "client_id", min: 120 }, // 瀹㈡埛鍚嶇О
+ { label: "瀹㈡埛鍚嶇О", prop: "client_name", min: 120 }, // 瀹㈡埛鍚嶇О
{ label: "鏈嶅姟寮�濮嬫椂闂�", prop: "start_time", isTime: true }, // 鏈嶅姟寮�濮嬫椂闂�
{ label: "鏈嶅姟鎴鏃堕棿", prop: "end_time", isTime: true }, // 鏈嶅姟鎴鏃堕棿
{ label: "鍚堝悓閲戦", prop: "money" }, // 鍚堝悓閲戦
@@ -99,7 +99,8 @@
if (res.data.list && res.data.list.length > 0) {
const list = res.data.list.map((item) => {
return {
- ...item
+ ...item,
+ client_name: item.client.name
}
})
this.tableList.tableInfomation = list || []
diff --git a/src/views/sales/quotation/AddQuotationDialog.vue b/src/views/sales/quotation/AddQuotationDialog.vue
index b02b5b5..576dfc2 100644
--- a/src/views/sales/quotation/AddQuotationDialog.vue
+++ b/src/views/sales/quotation/AddQuotationDialog.vue
@@ -22,11 +22,20 @@
<div class="basic-info-view">
<el-row>
<el-col :span="12">
- <el-form-item label="瀹㈡埛鍚嶇О" prop="client_id">
+ <el-form-item label="瀹㈡埛鍚嶇О" prop="client_name">
<div class="custom-name">
- <el-input v-model="editConfig.infomation.client_id"></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="querySearchAsync"
+ value-key="name"
+ @select="handleSelectClient"
+ ></el-autocomplete>
+ <div class="common-select-btn" @click="selClientClick">
+ <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
+ </div>
+ <div class="common-select-btn" @click="clearupClient">
+ <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ </div>
</div>
</el-form-item>
</el-col>
@@ -193,21 +202,26 @@
</div> -->
</div>
</el-form>
-
<div slot="footer" class="dialog-footer">
<!-- <el-button type="primary" size="small" @click="editConfig.visible = false">淇濆苟鎻愪氦瀹℃壒</el-button> -->
<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"
+ />
</el-dialog>
</div>
</template>
<script>
-// import CommonSelectView from "@/components/makepager/CommonSelectView"
// import CommonFormTableView from "@/components/makepager/CommonFormTableView"
import { getAllData } from "@/api/client/client"
import { getAddQuotation, getUpdateQuotation } from "@/api/sales/quotation"
+import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
export default {
name: "QuotationDialog",
props: {
@@ -222,10 +236,13 @@
}
}
},
- // components: { CommonSelectView, CommonFormTableView },
+ components: { SelectClientDialog },
computed: {
searchCommonHeight() {
return this.$refs.searchCommonView.offsetHeight
+ },
+ clientList() {
+ return this.$store.state.getClientName.clientList
}
},
data() {
@@ -240,11 +257,7 @@
},
memberOptions: [],
quotationStatusOptions: [{ id: 1, name: "涓嶇煡閬�" }], // 鎶ヤ环鍗曠姸鎬�
- currencyOptions: [
- { value: "1", label: "浜烘皯甯�(楼)" },
- { value: "2", label: "鑻遍晳(拢)" },
- { value: "3", label: "娆у厓(鈧�)" }
- ], // 甯佺
+ currencyOptions: [], // 甯佺
approvalWorkflowOptions: [], // 瀹℃壒娴佺▼
productTableList: {},
showSummary: {
@@ -252,10 +265,16 @@
total: true,
sumProp: ["other1", "other2", "other3", "other4"],
mergeNumber: 3
+ },
+ editSelectClientConfig: {
+ editVisible: false,
+ title: "",
+ infomation: {}
}
}
},
created() {
+ this.$store.dispatch("geClient")
this.setTableForm()
this.getCommonData()
},
@@ -263,8 +282,8 @@
getCommonData() {
getAllData()
.then((res) => {
- // 缂� 甯佺 鎶ヤ环鍗曠姸鎬�
this.memberOptions = res.data.member
+ this.quotationStatusOptions = res.data.quotationStatus
})
.catch((err) => {
console.log(err)
@@ -335,6 +354,33 @@
handleClose() {
this.editConfig.visible = false
},
+ // 閫夋嫨瀹㈡埛鐩稿叧鏂规硶
+ querySearchAsync(queryString, cb) {
+ var restaurants = this.clientList
+ var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants
+ cb(results)
+ },
+ createStateFilter(queryString) {
+ return (state) => {
+ return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
+ }
+ },
+ handleSelectClient(item) {
+ this.editConfig.infomation.client_id = item.id
+ },
+ selClientClick() {
+ this.editSelectClientConfig.editVisible = true
+ },
+ selClient(row) {
+ console.log(row)
+ this.editConfig.infomation.client_name = row.name
+ this.editConfig.infomation.client_id = row.id
+ },
+ // 娓呴櫎宸查�夋嫨鐢ㄦ埛
+ clearupClient() {
+ this.editConfig.infomation.client_name = ""
+ this.editConfig.infomation.client_id = 0
+ },
// 娣诲姞闄勪欢
addAnnexClick() {},
// 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
@@ -391,13 +437,7 @@
.basic-info-view {
margin-top: 10px;
padding-right: 40px;
- .custom-name {
- display: flex;
- .common-select-btn {
- margin-left: 5px;
- font-size: 18px;
- }
- }
+ .custom-name,
.common-select {
display: flex;
.common-select-sel {
diff --git a/src/views/sales/refundForm/AddRefundFormDialog.vue b/src/views/sales/refundForm/AddRefundFormDialog.vue
index 9e3503a..0eb0266 100644
--- a/src/views/sales/refundForm/AddRefundFormDialog.vue
+++ b/src/views/sales/refundForm/AddRefundFormDialog.vue
@@ -22,11 +22,20 @@
<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="querySearchAsync"
+ value-key="name"
+ @select="handleSelectClient"
+ ></el-autocomplete>
+ <div class="common-select-btn" @click="selClientClick">
+ <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
+ </div>
+ <div class="common-select-btn" @click="clearupClient">
+ <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ </div>
</div>
</el-form-item>
</el-col>
@@ -225,6 +234,12 @@
<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"
+ />
</el-dialog>
</div>
</template>
@@ -233,6 +248,7 @@
import CommonFormTableView from "@/components/makepager/CommonFormTableView"
import { getAllData } from "@/api/client/client"
import { getAddSalesRefund, getUpdateSalesRefund } from "@/api/sales/refundForm"
+import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
export default {
name: "AddRefundFormDialog",
props: {
@@ -247,8 +263,12 @@
}
}
},
- components: { CommonFormTableView },
- computed: {},
+ components: { CommonFormTableView, SelectClientDialog },
+ computed: {
+ clientList() {
+ return this.$store.state.getClientName.clientList
+ }
+ },
data() {
return {
dialogWidth: "80%",
@@ -261,25 +281,11 @@
account: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }]
},
memberOptions: [],
- selSourceOrderOptions: [{ value: "1", label: "閿�鍞��璐у崟" }], // 閫夋嫨婧愬崟
- refundMethodOptions: [
- { value: "1", label: "鐜伴噾" },
- { value: "2", label: "鏀エ" },
- { value: "3", label: "鐢垫眹" },
- { value: "4", label: "閭斂姹囨" },
- { value: "5", label: "缃戜笂閾惰" },
- { value: "6", label: "鍏朵粬" }
- ], // 浠樻鏂瑰紡
- accountOptions: [{ value: "1", label: "浜烘皯甯佽处鎴�" }], // 璐︽埛
- isInvoiceOptions: [
- { value: "1", label: "鏈紑" },
- { value: "2", label: "宸插紑" }
- ], // 鏄惁寮�绁�
- currencyOptions: [
- { value: "1", label: "浜烘皯甯�(楼)" },
- { value: "2", label: "鑻遍晳(拢)" },
- { value: "3", label: "娆у厓(鈧�)" }
- ], // 甯佺
+ // selSourceOrderOptions: [{ value: "1", label: "閿�鍞��璐у崟" }], // 閫夋嫨婧愬崟
+ refundMethodOptions: [], // 浠樻鏂瑰紡
+ accountOptions: [], // 璐︽埛
+ isInvoiceOptions: [], // 鏄惁寮�绁�
+ currencyOptions: [], // 甯佺
approvalWorkflowOptions: [], // 瀹℃壒娴佺▼
productTableList: {},
showSummary: {
@@ -287,10 +293,16 @@
total: true,
sumProp: ["other1", "other2", "other3", "other4"],
mergeNumber: 5
+ },
+ editSelectClientConfig: {
+ editVisible: false,
+ title: "",
+ infomation: {}
}
}
},
created() {
+ this.$store.dispatch("geClient")
this.setTableForm()
this.getCommonData()
},
@@ -299,6 +311,10 @@
getAllData()
.then((res) => {
this.memberOptions = res.data.member
+ this.refundMethodOptions = res.data.refundMethod
+ this.accountOptions = res.data.accountId
+ this.isInvoiceOptions = res.data.isInvoice
+ this.currencyOptions = res.data.currency
})
.catch((err) => {
console.log(err)
@@ -381,6 +397,33 @@
handleClose() {
this.editConfig.visible = false
},
+ // 閫夋嫨瀹㈡埛鐩稿叧鏂规硶
+ querySearchAsync(queryString, cb) {
+ var restaurants = this.clientList
+ var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants
+ cb(results)
+ },
+ createStateFilter(queryString) {
+ return (state) => {
+ return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
+ }
+ },
+ handleSelectClient(item) {
+ this.editConfig.infomation.client_id = item.id
+ },
+ selClientClick() {
+ this.editSelectClientConfig.editVisible = true
+ },
+ selClient(row) {
+ console.log(row)
+ this.editConfig.infomation.client_name = row.name
+ this.editConfig.infomation.client_id = row.id
+ },
+ // 娓呴櫎宸查�夋嫨鐢ㄦ埛
+ clearupClient() {
+ this.editConfig.infomation.client_name = ""
+ this.editConfig.infomation.client_id = 0
+ },
// 娣诲姞闄勪欢
addAnnexClick() {},
// 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
@@ -437,13 +480,7 @@
.basic-info-view {
margin-top: 10px;
padding-right: 40px;
- .custom-name {
- display: flex;
- .common-select-btn {
- margin-left: 5px;
- font-size: 18px;
- }
- }
+ .custom-name,
.common-select {
display: flex;
.common-select-sel {
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index 2ce0cd5..7f9c24d 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -22,11 +22,20 @@
<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="querySearchAsync"
+ value-key="name"
+ @select="handleSelectClient"
+ ></el-autocomplete>
+ <div class="common-select-btn" @click="selClientClick">
+ <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
+ </div>
+ <div class="common-select-btn" @click="clearupClient">
+ <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ </div>
</div>
</el-form-item>
</el-col>
@@ -257,6 +266,12 @@
<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"
+ />
</el-dialog>
</div>
</template>
@@ -265,6 +280,7 @@
import CommonFormTableView from "@/components/makepager/CommonFormTableView"
import { getAllData } from "@/api/client/client"
import { getAddSalesDetails, getUpdateSalesDetails } from "@/api/sales/salesDetails"
+import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
export default {
name: "AddSalesDetailsDialog",
props: {
@@ -279,8 +295,12 @@
}
}
},
- components: { CommonFormTableView },
- computed: {},
+ components: { CommonFormTableView, SelectClientDialog },
+ computed: {
+ clientList() {
+ return this.$store.state.getClientName.clientList
+ }
+ },
data() {
return {
dialogWidth: "80%",
@@ -307,10 +327,16 @@
total: true,
sumProp: ["other1", "other7"],
mergeNumber: 2
+ },
+ editSelectClientConfig: {
+ editVisible: false,
+ title: "",
+ infomation: {}
}
}
},
created() {
+ this.$store.dispatch("geClient")
this.setTableForm()
this.getCommonData()
},
@@ -407,6 +433,33 @@
handleClose() {
this.editConfig.visible = false
},
+ // 閫夋嫨瀹㈡埛鐩稿叧鏂规硶
+ querySearchAsync(queryString, cb) {
+ var restaurants = this.clientList
+ var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants
+ cb(results)
+ },
+ createStateFilter(queryString) {
+ return (state) => {
+ return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
+ }
+ },
+ handleSelectClient(item) {
+ this.editConfig.infomation.client_id = item.id
+ },
+ selClientClick() {
+ this.editSelectClientConfig.editVisible = true
+ },
+ selClient(row) {
+ console.log(row)
+ this.editConfig.infomation.client_name = row.name
+ this.editConfig.infomation.client_id = row.id
+ },
+ // 娓呴櫎宸查�夋嫨鐢ㄦ埛
+ clearupClient() {
+ this.editConfig.infomation.client_name = ""
+ this.editConfig.infomation.client_id = 0
+ },
// 娣诲姞闄勪欢
addAnnexClick() {},
// 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
@@ -447,13 +500,7 @@
.basic-info-view {
margin-top: 10px;
padding-right: 40px;
- .custom-name {
- display: flex;
- .common-select-btn {
- margin-left: 5px;
- font-size: 18px;
- }
- }
+ .custom-name,
.common-select {
display: flex;
.common-select-sel {
diff --git a/src/views/sales/salesDetails/index.vue b/src/views/sales/salesDetails/index.vue
index 576f6ce..fa85409 100644
--- a/src/views/sales/salesDetails/index.vue
+++ b/src/views/sales/salesDetails/index.vue
@@ -87,7 +87,7 @@
tableInfomation: [],
tableColumn: [
{ label: "璁㈠崟缂栧彿", prop: "number" },
- { label: "瀹㈡埛鍚嶇О", prop: "clientId" },
+ { label: "瀹㈡埛鍚嶇О", prop: "client_name" },
{ label: "绛剧害鏃ユ湡", prop: "signTime", isTime: true, width: 150 },
{ label: "閿�鍞礋璐ｄ汉", prop: "memberId" },
{ label: "鍑哄簱鐘舵��", prop: "outboundStatus" },
@@ -119,7 +119,8 @@
if (res.data.list && res.data.list.length > 0) {
const list = res.data.list.map((item) => {
return {
- ...item
+ ...item,
+ client_name: item.client.name
}
})
this.tableList.tableInfomation = list || []
diff --git a/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue b/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
index 91d50da..9a8ff45 100644
--- a/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
+++ b/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
@@ -22,11 +22,20 @@
<div class="basic-info-view">
<el-row>
<el-col :span="12">
- <el-form-item label="瀹㈡埛鍚嶇О" prop="client_id">
+ <el-form-item label="瀹㈡埛鍚嶇О" prop="client_name">
<div class="custom-name">
- <el-input v-model="editConfig.infomation.client_id"></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="querySearchAsync"
+ value-key="name"
+ @select="handleSelectClient"
+ ></el-autocomplete>
+ <div class="common-select-btn" @click="selClientClick">
+ <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
+ </div>
+ <div class="common-select-btn" @click="clearupClient">
+ <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ </div>
</div>
</el-form-item>
</el-col>
@@ -467,6 +476,12 @@
<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"
+ />
</el-dialog>
</div>
</template>
@@ -474,6 +489,7 @@
<script>
import { getAllData } from "@/api/client/client"
import { getAddSaleChance, getUpdateSaleChance } from "@/api/sales/salesOpportunity"
+import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
export default {
name: "AddSalesOpportunityDialog",
props: {
@@ -488,10 +504,13 @@
}
}
},
- components: {},
+ components: { SelectClientDialog },
computed: {
searchCommonHeight() {
return this.$refs.searchCommonView.offsetHeight
+ },
+ clientList() {
+ return this.$store.state.getClientName.clientList
}
},
data() {
@@ -513,20 +532,22 @@
saleStageOptions: [], // 閿�鍞樁娈�
oldCustomerMarketOptions: [], // 鑰佸鎴疯惀閿�
possibleOptions: [], // 鍙兘鎬�
- currencyOptions: [
- {
- id: 1,
- name: "浜烘皯甯�"
- }
- ], // 甯佺
+ currencyOptions: [], // 甯佺
currentStateOptions: [], // 褰撳墠鐘舵��
countryOptions: [], // 鍥藉
provinceOptions: [], // 鐪佷唤
cityOptions: [], // 鍩庡競
- regionOptions: [] // 鍖哄煙
+ regionOptions: [], // 鍖哄煙
+ editSelectClientConfig: {
+ editVisible: false,
+ title: "",
+ infomation: {}
+ },
+ restaurants: []
}
},
created() {
+ this.$store.dispatch("geClient")
this.getCommonData()
},
methods: {
@@ -543,6 +564,9 @@
this.provinceOptions = res.data.province
this.cityOptions = res.data.city
this.regionOptions = res.data.region
+ this.possibleOptions = res.data.possibility
+ this.currencyOptions = res.data.currency
+ this.currentStateOptions = res.data.status
})
.catch((err) => {
console.log(err)
@@ -638,6 +662,33 @@
}
return params
},
+ // 閫夋嫨鐢ㄦ埛鐩稿叧鏂规硶
+ querySearchAsync(queryString, cb) {
+ console.log(this.clientList)
+ var restaurants = this.clientList
+ var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants
+ cb(results)
+ },
+ createStateFilter(queryString) {
+ return (state) => {
+ return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
+ }
+ },
+ handleSelectClient(item) {
+ this.editConfig.infomation.client_id = item.id
+ },
+ selClientClick() {
+ this.editSelectClientConfig.editVisible = true
+ },
+ selClient(row) {
+ this.editConfig.infomation.client_name = row.name
+ this.editConfig.infomation.client_id = row.id
+ },
+ // 娓呴櫎宸查�夋嫨鐢ㄦ埛
+ clearupClient() {
+ this.editConfig.infomation.client_name = ""
+ this.editConfig.infomation.client_id = 0
+ },
// 娣诲姞闄勪欢
addAnnexClick() {},
// 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
@@ -662,22 +713,18 @@
.basic-info-view {
margin-top: 10px;
padding-right: 40px;
- .custom-name {
+ .custom-name,
+ .common-select {
display: flex;
.common-select-btn {
margin-left: 5px;
font-size: 18px;
+ cursor: pointer;
}
}
.common-select {
- display: flex;
.common-select-sel {
width: 270px;
- }
- .common-select-btn {
- margin-left: 5px;
- font-size: 16px;
- cursor: pointer;
}
}
}
diff --git a/src/views/sales/salesReturn/AddSalesReturnDialog.vue b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
index e7276ba..5eba853 100644
--- a/src/views/sales/salesReturn/AddSalesReturnDialog.vue
+++ b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
@@ -22,11 +22,20 @@
<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="querySearchAsync"
+ value-key="name"
+ @select="handleSelectClient"
+ ></el-autocomplete>
+ <div class="common-select-btn" @click="selClientClick">
+ <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
+ </div>
+ <div class="common-select-btn" @click="clearupClient">
+ <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ </div>
</div>
</el-form-item>
</el-col>
@@ -166,6 +175,12 @@
<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"
+ />
</el-dialog>
</div>
</template>
@@ -174,6 +189,7 @@
import CommonFormTableView from "@/components/makepager/CommonFormTableView"
import { getAllData } from "@/api/client/client"
import { getAddSalesReturn, getUpdateSalesReturn } from "@/api/sales/salesReturn"
+import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
export default {
name: "AddSalesReturnDialog",
props: {
@@ -188,8 +204,12 @@
}
}
},
- components: { CommonFormTableView },
- computed: {},
+ components: { CommonFormTableView, SelectClientDialog },
+ computed: {
+ clientList() {
+ return this.$store.state.getClientName.clientList
+ }
+ },
data() {
return {
dialogWidth: "80%",
@@ -201,17 +221,9 @@
},
memberOptions: [],
selSourceOrderOptions: [], // 閫夋嫨婧愬崟
- repositoryOptions: [
- { value: "1", label: "鎬讳粨" },
- { value: "2", label: "璧犲搧浠�" },
- { value: "3", label: "鍏朵粬浠�" }
- ], // 閫�鍏ヤ粨搴�
+ repositoryOptions: [], // 閫�鍏ヤ粨搴�
statusOptions: [], // 鐘舵��
- currencyOptions: [
- { value: "1", label: "浜烘皯甯�(楼)" },
- { value: "2", label: "鑻遍晳(拢)" },
- { value: "3", label: "娆у厓(鈧�)" }
- ], // 甯佺
+ currencyOptions: [], // 甯佺
productTableList: {},
showSummary: {
show: true,
@@ -219,10 +231,16 @@
refundable: true,
sumProp: ["other1", "other2", "other3", "other4"],
mergeNumber: 4
+ },
+ editSelectClientConfig: {
+ editVisible: false,
+ title: "",
+ infomation: {}
}
}
},
created() {
+ this.$store.dispatch("geClient")
this.setTableForm()
this.getCommonData()
},
@@ -231,6 +249,9 @@
getAllData()
.then((res) => {
this.memberOptions = res.data.member
+ this.repositoryOptions = res.data.repository
+ this.currencyOptions = res.data.currency
+ this.statusOptions = res.data.status
})
.catch((err) => {
console.log(err)
@@ -312,6 +333,33 @@
handleClose() {
this.editConfig.visible = false
},
+ // 閫夋嫨瀹㈡埛鐩稿叧鏂规硶
+ querySearchAsync(queryString, cb) {
+ var restaurants = this.clientList
+ var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants
+ cb(results)
+ },
+ createStateFilter(queryString) {
+ return (state) => {
+ return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
+ }
+ },
+ handleSelectClient(item) {
+ this.editConfig.infomation.client_id = item.id
+ },
+ selClientClick() {
+ this.editSelectClientConfig.editVisible = true
+ },
+ selClient(row) {
+ console.log(row)
+ this.editConfig.infomation.client_name = row.name
+ this.editConfig.infomation.client_id = row.id
+ },
+ // 娓呴櫎宸查�夋嫨鐢ㄦ埛
+ clearupClient() {
+ this.editConfig.infomation.client_name = ""
+ this.editConfig.infomation.client_id = 0
+ },
// 娣诲姞闄勪欢
addAnnexClick() {},
// 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
@@ -358,13 +406,7 @@
.basic-info-view {
margin-top: 10px;
padding-right: 40px;
- .custom-name {
- display: flex;
- .common-select-btn {
- margin-left: 5px;
- font-size: 18px;
- }
- }
+ .custom-name,
.common-select {
display: flex;
.common-select-sel {
diff --git a/src/views/sales/subOrder/AddSubOrderDialog.vue b/src/views/sales/subOrder/AddSubOrderDialog.vue
index 2dd9a08..bdd8ef5 100644
--- a/src/views/sales/subOrder/AddSubOrderDialog.vue
+++ b/src/views/sales/subOrder/AddSubOrderDialog.vue
@@ -21,11 +21,20 @@
<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="querySearchAsync"
+ value-key="name"
+ @select="handleSelectClient"
+ ></el-autocomplete>
+ <div class="common-select-btn" @click="selClientClick">
+ <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
+ </div>
+ <div class="common-select-btn" @click="clearupClient">
+ <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ </div>
</div>
</el-form-item>
</el-col>
@@ -169,6 +178,12 @@
<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"
+ />
</el-dialog>
</div>
</template>
@@ -177,9 +192,10 @@
import CommonFormTableView from "@/components/makepager/CommonFormTableView"
import { getAllData } from "@/api/client/client"
import { getAddSubOrder, getUpdateSubOrder } from "@/api/sales/subOrder"
+import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
export default {
name: "SubOrderDialog",
- components: { CommonFormTableView },
+ components: { CommonFormTableView, SelectClientDialog },
props: {
editCommonConfig: {
type: Object,
@@ -192,7 +208,11 @@
}
}
},
- computed: {},
+ computed: {
+ clientList() {
+ return this.$store.state.getClientName.clientList
+ }
+ },
data() {
return {
dialogWidth: "80%",
@@ -219,10 +239,16 @@
total: false,
sumProp: ["other1", "other7"],
mergeNumber: 7
+ },
+ editSelectClientConfig: {
+ editVisible: false,
+ title: "",
+ infomation: {}
}
}
},
created() {
+ this.$store.dispatch("geClient")
this.setTableForm()
this.getCommonData()
},
@@ -310,6 +336,33 @@
handleClose() {
this.editConfig.visible = false
},
+ // 閫夋嫨瀹㈡埛鐩稿叧鏂规硶
+ querySearchAsync(queryString, cb) {
+ var restaurants = this.clientList
+ var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants
+ cb(results)
+ },
+ createStateFilter(queryString) {
+ return (state) => {
+ return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
+ }
+ },
+ handleSelectClient(item) {
+ this.editConfig.infomation.client_id = item.id
+ },
+ selClientClick() {
+ this.editSelectClientConfig.editVisible = true
+ },
+ selClient(row) {
+ console.log(row)
+ this.editConfig.infomation.client_name = row.name
+ this.editConfig.infomation.client_id = row.id
+ },
+ // 娓呴櫎宸查�夋嫨鐢ㄦ埛
+ clearupClient() {
+ this.editConfig.infomation.client_name = ""
+ this.editConfig.infomation.client_id = 0
+ },
// 娣诲姞闄勪欢
addAnnexClick() {},
// 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
@@ -367,6 +420,7 @@
.common-select-btn {
margin-left: 5px;
font-size: 18px;
+ cursor: pointer;
}
}
}
diff --git a/src/views/sales/subOrder/index.vue b/src/views/sales/subOrder/index.vue
index 3a03dcc..a4b24b9 100644
--- a/src/views/sales/subOrder/index.vue
+++ b/src/views/sales/subOrder/index.vue
@@ -79,7 +79,7 @@
tableInfomation: [],
tableColumn: [
{ label: "鍗曟嵁缂栧彿", prop: "number", min: 120 }, // 鍗曟嵁缂栧彿
- { label: "瀹㈡埛鍚嶇О", prop: "clientId", min: 120 }, // 瀹㈡埛鍚嶇О
+ { label: "瀹㈡埛鍚嶇О", prop: "client_name", min: 120 }, // 瀹㈡埛鍚嶇О
{ label: "閿�鍞�诲崟", prop: "masterOrderId", min: 90 }, // 閿�鍞�诲崟
{ label: "璐熻矗浜�", prop: "memberId" }, // 璐熻矗浜�
{ label: "瀹℃壒鐘舵��", prop: "approvalStatus" }, // 瀹℃壒鐘舵��
@@ -103,7 +103,8 @@
if (res.data.list && res.data.list.length > 0) {
const list = res.data.list.map((item) => {
return {
- ...item
+ ...item,
+ client_name: item.client.name
}
})
this.tableList.tableInfomation = list || []
diff --git a/src/views/service/orderManage/AddOrderManageDialog.vue b/src/views/service/orderManage/AddOrderManageDialog.vue
index 35f5062..27c15f6 100644
--- a/src/views/service/orderManage/AddOrderManageDialog.vue
+++ b/src/views/service/orderManage/AddOrderManageDialog.vue
@@ -22,11 +22,20 @@
<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="querySearchAsync"
+ value-key="name"
+ @select="handleSelectClient"
+ ></el-autocomplete>
+ <div class="common-select-btn" @click="selClientClick">
+ <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
+ </div>
+ <div class="common-select-btn" @click="clearupClient">
+ <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ </div>
</div>
</el-form-item>
</el-col>
@@ -181,12 +190,17 @@
</div> -->
</div>
</el-form>
-
<div slot="footer" class="dialog-footer">
<!-- <el-button type="primary" size="small" @click="editConfig.visible = false">淇濆苟鎻愪氦瀹℃壒</el-button> -->
<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"
+ />
</el-dialog>
</div>
</template>
@@ -194,6 +208,7 @@
<script>
import { getAllData } from "@/api/client/client"
import { getAddOrderManage, getUpdateOrderManage } from "@/api/serviceManage/orderManage"
+import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
export default {
name: "AddOrderManageDialog",
props: {
@@ -208,8 +223,11 @@
}
}
},
- components: {},
+ components: { SelectClientDialog },
computed: {
+ clientList() {
+ return this.$store.state.getClientName.clientList
+ },
searchCommonHeight() {
return this.$refs.searchCommonView.offsetHeight
}
@@ -226,14 +244,20 @@
},
orderTypeOptions: [{ id: 1, name: "绫诲瀷1" }], // 宸ュ崟绫诲瀷
reportSourceOptions: [], // 鎶ヤ慨鏉ユ簮
- sourceSheetOptions: [
- { value: "1", label: "閿�鍞槑缁嗗崟" },
- { value: "2", label: "鏈嶅姟鍚堝悓" }
- ],
- approvalWorkflowOptions: [] // 瀹℃壒娴佺▼
+ // sourceSheetOptions: [
+ // { value: "1", label: "閿�鍞槑缁嗗崟" },
+ // { value: "2", label: "鏈嶅姟鍚堝悓" }
+ // ],
+ approvalWorkflowOptions: [], // 瀹℃壒娴佺▼
+ editSelectClientConfig: {
+ editVisible: false,
+ title: "",
+ infomation: {}
+ }
}
},
created() {
+ this.$store.dispatch("geClient")
this.getCommonData()
},
methods: {
@@ -241,6 +265,8 @@
getAllData()
.then((res) => {
this.memberOptions = res.data.member
+ this.orderTypeOptions = res.data.orderType
+ this.reportSourceOptions = res.data.reportSource
})
.catch((err) => {
console.log(err)
@@ -311,6 +337,33 @@
handleClose() {
this.editConfig.visible = false
},
+ // 閫夋嫨瀹㈡埛鐩稿叧鏂规硶
+ querySearchAsync(queryString, cb) {
+ var restaurants = this.clientList
+ var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants
+ cb(results)
+ },
+ createStateFilter(queryString) {
+ return (state) => {
+ return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
+ }
+ },
+ handleSelectClient(item) {
+ this.editConfig.infomation.client_id = item.id
+ },
+ selClientClick() {
+ this.editSelectClientConfig.editVisible = true
+ },
+ selClient(row) {
+ console.log(row)
+ this.editConfig.infomation.client_name = row.name
+ this.editConfig.infomation.client_id = row.id
+ },
+ // 娓呴櫎宸查�夋嫨鐢ㄦ埛
+ clearupClient() {
+ this.editConfig.infomation.client_name = ""
+ this.editConfig.infomation.client_id = 0
+ },
// 娣诲姞闄勪欢
addAnnexClick() {},
// 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
@@ -335,13 +388,7 @@
.basic-info-view {
margin-top: 10px;
padding-right: 40px;
- .custom-name {
- display: flex;
- .common-select-btn {
- margin-left: 5px;
- font-size: 18px;
- }
- }
+ .custom-name,
.common-select {
display: flex;
.common-select-sel {
diff --git a/src/views/service/serviceContract/AddServiceContractDialog.vue b/src/views/service/serviceContract/AddServiceContractDialog.vue
index 232dcb4..db49c39 100644
--- a/src/views/service/serviceContract/AddServiceContractDialog.vue
+++ b/src/views/service/serviceContract/AddServiceContractDialog.vue
@@ -22,11 +22,20 @@
<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="querySearchAsync"
+ value-key="name"
+ @select="handleSelectClient"
+ ></el-autocomplete>
+ <div class="common-select-btn" @click="selClientClick">
+ <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
+ </div>
+ <div class="common-select-btn" @click="clearupClient">
+ <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ </div>
</div>
</el-form-item>
</el-col>
@@ -273,6 +282,12 @@
<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"
+ />
</el-dialog>
</div>
</template>
@@ -281,6 +296,7 @@
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"
export default {
name: "AddServiceContractDialog",
props: {
@@ -295,10 +311,13 @@
}
}
},
- components: { CommonFormTableView },
+ components: { CommonFormTableView, SelectClientDialog },
computed: {
searchCommonHeight() {
return this.$refs.searchCommonView.offsetHeight
+ },
+ clientList() {
+ return this.$store.state.getClientName.clientList
}
},
data() {
@@ -325,10 +344,16 @@
total: true,
sumProp: ["other1", "other2", "other3", "other4"],
mergeNumber: 3
+ },
+ editSelectClientConfig: {
+ editVisible: false,
+ title: "",
+ infomation: {}
}
}
},
created() {
+ this.$store.dispatch("geClient")
this.setTableForm()
this.getCommonData()
},
@@ -338,6 +363,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) => {
@@ -427,6 +455,33 @@
handleClose() {
this.editConfig.visible = false
},
+ // 閫夋嫨瀹㈡埛鐩稿叧鏂规硶
+ querySearchAsync(queryString, cb) {
+ var restaurants = this.clientList
+ var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants
+ cb(results)
+ },
+ createStateFilter(queryString) {
+ return (state) => {
+ return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
+ }
+ },
+ handleSelectClient(item) {
+ this.editConfig.infomation.client_id = item.id
+ },
+ selClientClick() {
+ this.editSelectClientConfig.editVisible = true
+ },
+ selClient(row) {
+ console.log(row)
+ this.editConfig.infomation.client_name = row.name
+ this.editConfig.infomation.client_id = row.id
+ },
+ // 娓呴櫎宸查�夋嫨鐢ㄦ埛
+ clearupClient() {
+ this.editConfig.infomation.client_name = ""
+ this.editConfig.infomation.client_id = 0
+ },
// 娣诲姞闄勪欢
addAnnexClick() {},
// 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
@@ -483,13 +538,7 @@
.basic-info-view {
margin-top: 10px;
padding-right: 40px;
- .custom-name {
- display: flex;
- .common-select-btn {
- margin-left: 5px;
- font-size: 18px;
- }
- }
+ .custom-name,
.common-select {
display: flex;
.common-select-sel {
diff --git a/src/views/service/serviceFeeManage/AddServiceFeeManageDialog.vue b/src/views/service/serviceFeeManage/AddServiceFeeManageDialog.vue
index 8d60e84..99f705d 100644
--- a/src/views/service/serviceFeeManage/AddServiceFeeManageDialog.vue
+++ b/src/views/service/serviceFeeManage/AddServiceFeeManageDialog.vue
@@ -22,11 +22,20 @@
<div class="basic-info-view">
<el-row>
<el-col :span="12">
- <el-form-item label="瀹㈡埛鍚嶇О" prop="name">
+ <el-form-item label="瀹㈡埛鍚嶇О" prop="client_name">
<div class="custom-name">
- <el-input v-model="editConfig.infomation.name"></el-input>
- <div class="common-select-btn"><i class="el-icon-house" title="宸ュ晢鏌ヨ"></i></div>
- <div class="common-select-btn"><i class="el-icon-search" title="鏌ラ噸"></i></div>
+ <el-autocomplete
+ v-model="editConfig.infomation.client_name"
+ :fetch-suggestions="querySearchAsync"
+ value-key="name"
+ @select="handleSelectClient"
+ ></el-autocomplete>
+ <div class="common-select-btn" @click="selClientClick">
+ <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
+ </div>
+ <div class="common-select-btn" @click="clearupClient">
+ <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ </div>
</div>
</el-form-item>
</el-col>
@@ -400,6 +409,12 @@
<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"
+ />
</el-dialog>
</div>
</template>
@@ -407,6 +422,7 @@
<script>
import { getAllData } from "@/api/client/client"
import { getAddServiceFeeManage, getUpdateServiceFeeManage } from "@/api/serviceManage/serviceFeeManage"
+import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
export default {
name: "AddServiceFeeManageDialog",
props: {
@@ -421,8 +437,12 @@
}
}
},
- components: {},
- computed: {},
+ components: { SelectClientDialog },
+ computed: {
+ clientList() {
+ return this.$store.state.getClientName.clientList
+ }
+ },
data() {
return {
dialogWidth: "80%",
@@ -448,10 +468,16 @@
cityOptions: [], // 鍩庡競
regionOptions: [], // 鍖哄煙
unflodCollapseStr: "鏀惰捣",
- isUnflod: true
+ isUnflod: true,
+ editSelectClientConfig: {
+ editVisible: false,
+ title: "",
+ infomation: {}
+ }
}
},
created() {
+ this.$store.dispatch("geClient")
this.getCommonData()
},
methods: {
@@ -574,6 +600,33 @@
handleClose() {
this.editConfig.visible = false
},
+ // 閫夋嫨瀹㈡埛鐩稿叧鏂规硶
+ querySearchAsync(queryString, cb) {
+ var restaurants = this.clientList
+ var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants
+ cb(results)
+ },
+ createStateFilter(queryString) {
+ return (state) => {
+ return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
+ }
+ },
+ handleSelectClient(item) {
+ this.editConfig.infomation.client_id = item.id
+ },
+ selClientClick() {
+ this.editSelectClientConfig.editVisible = true
+ },
+ selClient(row) {
+ console.log(row)
+ this.editConfig.infomation.client_name = row.name
+ this.editConfig.infomation.client_id = row.id
+ },
+ // 娓呴櫎宸查�夋嫨鐢ㄦ埛
+ clearupClient() {
+ this.editConfig.infomation.client_name = ""
+ this.editConfig.infomation.client_id = 0
+ },
// 娣诲姞闄勪欢
addAnnexClick() {},
// 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
@@ -608,13 +661,7 @@
.basic-info-view {
margin-top: 10px;
padding-right: 40px;
- .custom-name {
- display: flex;
- .common-select-btn {
- margin-left: 5px;
- font-size: 18px;
- }
- }
+ .custom-name,
.common-select {
display: flex;
.common-select-sel {
diff --git a/src/views/service/serviceFollowup/AddServiceFollowupDialog.vue b/src/views/service/serviceFollowup/AddServiceFollowupDialog.vue
index 352ffbf..583942e 100644
--- a/src/views/service/serviceFollowup/AddServiceFollowupDialog.vue
+++ b/src/views/service/serviceFollowup/AddServiceFollowupDialog.vue
@@ -22,11 +22,20 @@
<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="querySearchAsync"
+ value-key="name"
+ @select="handleSelectClient"
+ ></el-autocomplete>
+ <div class="common-select-btn" @click="selClientClick">
+ <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
+ </div>
+ <div class="common-select-btn" @click="clearupClient">
+ <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ </div>
</div>
</el-form-item>
</el-col>
@@ -189,11 +198,16 @@
</div>
</div>
</el-form>
-
<div slot="footer" class="dialog-footer">
<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"
+ />
</el-dialog>
</div>
</template>
@@ -201,6 +215,7 @@
<script>
import { getAllData } from "@/api/client/client"
import { getAddServiceFollowup, getUpdateServiceFollowup } from "@/api/serviceManage/serviceFollowup"
+import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
export default {
name: "AddServiceFollowupDialog",
props: {
@@ -215,10 +230,13 @@
}
}
},
- components: {},
+ components: { SelectClientDialog },
computed: {
searchCommonHeight() {
return this.$refs.searchCommonView.offsetHeight
+ },
+ clientList() {
+ return this.$store.state.getClientName.clientList
}
},
data() {
@@ -234,10 +252,16 @@
solveRateOptions: [], // 瑙ｅ喅鐜�
oldMemberOptions: [], // 鍘熸湇鍔′汉鍛�
isVisitOptions: [], // 鏈嶅姟浜哄憳鏄惁鏉ヨ繃
- memberOptions: []
+ memberOptions: [],
+ editSelectClientConfig: {
+ editVisible: false,
+ title: "",
+ infomation: {}
+ }
}
},
created() {
+ this.$store.dispatch("geClient")
this.getCommonData()
},
methods: {
@@ -245,6 +269,11 @@
getAllData()
.then((res) => {
this.memberOptions = res.data.member
+ this.satisfactionOptions = res.data.satisfaction // 婊℃剰搴�
+ this.timelyRateOptions = res.data.timely_rate // 鍙婃椂鐜�
+ this.solveRateOptions = res.data.solve_rate // 瑙ｅ喅鐜�
+ this.oldMemberOptions = res.data.member // 鍘熸湇鍔′汉鍛�
+ this.isVisitOptions = res.data.isVisit // 鏈嶅姟浜哄憳鏄惁鏉ヨ繃
})
.catch((err) => {
console.log(err)
@@ -319,6 +348,33 @@
handleClose() {
this.editConfig.visible = false
},
+ // 閫夋嫨瀹㈡埛鐩稿叧鏂规硶
+ querySearchAsync(queryString, cb) {
+ var restaurants = this.clientList
+ var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants
+ cb(results)
+ },
+ createStateFilter(queryString) {
+ return (state) => {
+ return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
+ }
+ },
+ handleSelectClient(item) {
+ this.editConfig.infomation.client_id = item.id
+ },
+ selClientClick() {
+ this.editSelectClientConfig.editVisible = true
+ },
+ selClient(row) {
+ console.log(row)
+ this.editConfig.infomation.client_name = row.name
+ this.editConfig.infomation.client_id = row.id
+ },
+ // 娓呴櫎宸查�夋嫨鐢ㄦ埛
+ clearupClient() {
+ this.editConfig.infomation.client_name = ""
+ this.editConfig.infomation.client_id = 0
+ },
// 娣诲姞闄勪欢
addAnnexClick() {},
// 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
@@ -343,13 +399,7 @@
.basic-info-view {
margin-top: 10px;
padding-right: 40px;
- .custom-name {
- display: flex;
- .common-select-btn {
- margin-left: 5px;
- font-size: 18px;
- }
- }
+ .custom-name,
.common-select {
display: flex;
.common-select-sel {
--
Gitblit v1.8.0