From 270f3ed6ad6e1b8770ec61afbb49ae865c6533c6 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期一, 16 十月 2023 09:34:13 +0800
Subject: [PATCH] 销售退款单关联客户，销售明细单关联客户
---
src/store/modules/getClientName.js | 9 ++++
src/components/makepager/CommonFormTableView.vue | 8 ++--
src/views/sales/salesDetails/AddSalesDetailsDialog.vue | 12 +++++
src/views/other/commonDialog/SelectCommonDialog.vue | 4 +-
src/views/sales/salesReturn/AddSalesReturnDialog.vue | 33 +++++++++++-----
src/views/sales/refundForm/AddRefundFormDialog.vue | 15 ++++++-
6 files changed, 61 insertions(+), 20 deletions(-)
diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index 35e69fb..fbdc6fe 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -229,10 +229,10 @@
page: 1,
pageSize: 5
}).then((res) => {
- console.log(res.data)
- if (res.data.code === 200) {
- if (res.data.data.data && res.data.data.data.length > 0) {
- this.productList = res.data.data.data
+ console.log(res,"浜у搧鍚嶇О")
+ if (res.code === 200) {
+ if (res.data.data && res.data.data.length > 0) {
+ this.productList = res.data.data
}
}
})
diff --git a/src/store/modules/getClientName.js b/src/store/modules/getClientName.js
index 5ae3def..194f2b0 100644
--- a/src/store/modules/getClientName.js
+++ b/src/store/modules/getClientName.js
@@ -96,6 +96,9 @@
}
})
},
+ getChanceFilter({commit},newData){
+ commit("saleChancelist",newData)
+ },
geLead(context) {
getSalesLeadsList().then((res) => {
if (res.code == 200) {
@@ -141,6 +144,9 @@
}
})
},
+ getSalesDetailsFliter({commit},newData){
+ commit("salesDetailsList", newData)
+ },
geQuotation(context) {
getQuotationList().then((res) => {
if (res.code == 200) {
@@ -178,6 +184,9 @@
Message.error(res.msg)
}
})
+ },
+ getReturnListFliter({commit},newData){
+ commit("salesReturnList",newData)
}
}
}
diff --git a/src/views/other/commonDialog/SelectCommonDialog.vue b/src/views/other/commonDialog/SelectCommonDialog.vue
index cb6563e..7dd718a 100644
--- a/src/views/other/commonDialog/SelectCommonDialog.vue
+++ b/src/views/other/commonDialog/SelectCommonDialog.vue
@@ -396,8 +396,8 @@
}).then((res) => {
console.log(res.data)
if (res.data.code === 200) {
- if (res.data.data.data && res.data.data.data.length > 0) {
- const list = res.data.data.data.map((item) => {
+ if (res.data.data && res.data.data.length > 0) {
+ const list = res.data.data.map((item) => {
return {
...item
}
diff --git a/src/views/sales/refundForm/AddRefundFormDialog.vue b/src/views/sales/refundForm/AddRefundFormDialog.vue
index 4a7f564..61d8fdf 100644
--- a/src/views/sales/refundForm/AddRefundFormDialog.vue
+++ b/src/views/sales/refundForm/AddRefundFormDialog.vue
@@ -314,6 +314,9 @@
import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
import { getPaymentTypeList } from "@/api/common/payment"
import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
+import { getSalesReturnList } from "@/api/sales/salesReturn"
+import { mapActions } from 'vuex';
+
export default {
name: "AddRefundFormDialog",
mixins: [codeMixin],
@@ -397,7 +400,8 @@
this.formInfo()
}
},
- methods: {
+ methods: {
+ ...mapActions(["getReturnListFliter"]),
formInfo() {
this.objCode.type = "閿�鍞��娆剧紪鐮�"
this.objCode.codeStandID = ""
@@ -508,9 +512,16 @@
}
}
},
- handleSelectClient(value, item) {
+ async handleSelectClient(value, item) {
if (value === "client") {
this.clientId = item.id
+ console.log("瀹㈡埛鍚嶇О",this.clientId,value,item)
+ await getSalesReturnList({
+ clientId:this.clientId
+ }).then((res)=>{
+ this.getReturnListFliter(res.data.list)
+ })
+
} else if (value === "salesReturn") {
console.log(item)
this.editConfig.infomation.sale_return_nunber = item.number
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index e487891..76b4762 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -385,6 +385,9 @@
import SelectChanceDialog from "@/views/other/commonDialog/SelectChanceDialog"
import AddCollectionPlan from "@/views/other/payment/collectionPlan/AddCollectionPlan"
import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
+import { getSaleChanceList} from "@/api/sales/salesOpportunity"
+import {mapActions} from "vuex"
+
export default {
name: "AddSalesDetailsDialog",
mixins: [codeMixin],
@@ -479,6 +482,7 @@
}
},
methods: {
+ ...mapActions(["getChanceFilter"]),
formInfo() {
this.objCode.type = "閿�鍞槑缁嗙紪鐮�"
this.objCode.codeStandID = ""
@@ -609,10 +613,16 @@
return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
}
},
- handleSelectClient(value, item) {
+ async handleSelectClient(value, item) {
if (value === "client") {
this.clientId = item.id
this.editConfig.infomation.client_name = item.name
+ // 闇�瑕佷慨鏀�
+ await getSaleChanceList({
+ client_id:this.clientId
+ }).then((res)=>{
+ this.getChanceFilter(res.data.list)
+ })
} else if (value === "chance") {
this.saleChanceId = item.id
this.editConfig.infomation.client_name = item.name
diff --git a/src/views/sales/salesReturn/AddSalesReturnDialog.vue b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
index 0b271ca..763434c 100644
--- a/src/views/sales/salesReturn/AddSalesReturnDialog.vue
+++ b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
@@ -68,7 +68,7 @@
</el-col>
<el-col :span="12">
- <el-form-item label="鍚堝悓璁㈠崟">
+ <el-form-item label="閿�鍞槑缁嗗崟">
<div class="custom-name">
<el-autocomplete
style="width: 100%"
@@ -130,8 +130,8 @@
</el-row>
</div>
<!-- 鍔ㄦ�佷俊鎭� -->
- <div class="basic-info-title">鍔ㄦ�佷俊鎭�</div>
- <div class="basic-info-view">
+ <!-- <div class="basic-info-title">鍔ㄦ�佷俊鎭�</div> -->
+ <!-- <div class="basic-info-view">
<el-row>
<el-col :span="12">
<el-form-item label="鐘舵��" prop="salesReturnStatusId">
@@ -145,13 +145,14 @@
>
<el-option v-for="item in statusOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
- </el-select>
+ </el-select> -->
<!-- <div class="common-select-btn"><i class="el-icon-setting"></i></div> -->
- </div>
+ <!-- </div>
</el-form-item>
</el-col>
</el-row>
- </div>
+ </div> -->
+
<!-- 澶囨敞淇℃伅 -->
<div class="basic-info-title">澶囨敞淇℃伅</div>
<div class="basic-info-view">
@@ -247,6 +248,9 @@
import { getProductList } from "@/api/common/other"
import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
+import { getSalesDetailsList } from "@/api/sales/salesDetails"
+import {mapActions} from "vuex"
+
export default {
name: "AddSalesReturnDialog",
mixins: [codeMixin],
@@ -327,6 +331,7 @@
}
},
methods: {
+ ...mapActions(["getSalesDetailsFliter"]),
formInfo() {
this.objCode.type = "閿�鍞��璐х紪鐮�"
this.objCode.codeStandID = ""
@@ -349,12 +354,12 @@
// 鑾峰彇浜у搧鍒楄〃
async getProductList() {
await getProductList({
- page: 0,
- pageSize: 0,
+ page: 1,
+ pageSize: 15,
productName: "",
- productNumber: ""
+ productNumber: "",
+ // clientId:"100"
}).then((res) => {
- console.log(res)
})
},
// 淇濆瓨
@@ -444,9 +449,15 @@
}
}
},
- handleSelectClient(value, item) {
+ async handleSelectClient(value, item) {
if (value === "client") {
this.clientId = item.id
+ await getSalesDetailsList({
+ clientId:this.clientId
+ }).then((res)=>{
+ this.getSalesDetailsFliter(res.data.list)
+ })
+
} else if (value === "contract") {
this.SalesDetailsId = item.id
}
--
Gitblit v1.8.0