From 822eaead378df182afba549b7a18e4e3e3daec0a Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期三, 18 十月 2023 09:03:56 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.5.5:29418/web/crm-web into dev
---
src/views/other/commonDialog/SelectContactDialog.vue | 4 ++--
src/store/modules/getClientName.js | 2 ++
src/api/common/payment.js | 2 +-
src/views/sales/refundForm/AddRefundFormDialog.vue | 18 ++++++++++++++----
4 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/api/common/payment.js b/src/api/common/payment.js
index e81d8e1..9950a40 100644
--- a/src/api/common/payment.js
+++ b/src/api/common/payment.js
@@ -120,7 +120,7 @@
// 鑾峰彇鏀粯鏂瑰紡鍒楄〃
export const getPaymentTypeList = async (data) => {
return await request({
- url: "/api/paymentType/list",
+ url: "/api/refundType/list",
method: "get",
params: data
})
diff --git a/src/store/modules/getClientName.js b/src/store/modules/getClientName.js
index 743d9f3..94d01e9 100644
--- a/src/store/modules/getClientName.js
+++ b/src/store/modules/getClientName.js
@@ -111,6 +111,8 @@
} else {
Message.error(res.msg)
}
+ },err=>{
+ console.error(err)
})
},
getChanceFilter({commit},newData){
diff --git a/src/views/other/commonDialog/SelectContactDialog.vue b/src/views/other/commonDialog/SelectContactDialog.vue
index 1b291da..5d97367 100644
--- a/src/views/other/commonDialog/SelectContactDialog.vue
+++ b/src/views/other/commonDialog/SelectContactDialog.vue
@@ -74,11 +74,11 @@
search_map: {},
tableColumn: [
{ label: "鑱旂郴浜哄鍚�", prop: "name", isContactClick: true, default: true }, // 鑱旂郴浜哄鍚�
- { label: "鑱旂郴浜虹紪鍙�", prop: "number" }, // 鑱旂郴浜虹紪鍙�
+ // { label: "鑱旂郴浜虹紪鍙�", prop: "number" }, // 鑱旂郴浜虹紪鍙�
{ label: "瀹㈡埛鍚嶇О", prop: "client_name" }, // 瀹㈡埛鍚嶇О
{ label: "鎵嬫満", prop: "phone" } // 鎵嬫満鍙风爜
],
- showCol: ["鑱旂郴浜哄鍚�", "鑱旂郴浜虹紪鍙�", "瀹㈡埛鍚嶇О", "鎵嬫満"]
+ showCol: ["鑱旂郴浜哄鍚�", "瀹㈡埛鍚嶇О", "鎵嬫満"]
}
},
created() {
diff --git a/src/views/sales/refundForm/AddRefundFormDialog.vue b/src/views/sales/refundForm/AddRefundFormDialog.vue
index eff816e..5736232 100644
--- a/src/views/sales/refundForm/AddRefundFormDialog.vue
+++ b/src/views/sales/refundForm/AddRefundFormDialog.vue
@@ -312,7 +312,7 @@
import { getAddSalesRefund, getUpdateSalesRefund } from "@/api/sales/refundForm"
import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
-import { getPaymentTypeList } from "@/api/common/payment"
+import {getBankAccountList, getPaymentTypeList} from "@/api/common/payment"
import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
import { getSalesReturnList } from "@/api/sales/salesReturn"
import { mapActions } from "vuex"
@@ -410,18 +410,28 @@
this.objCode.codeStandID = this.editConfig.infomation.codeStandID
}
this.getRCodeStandardList()
+ this.getBankAccountList()
},
getCommonData() {
getAllData().then((res) => {
this.memberOptions = res.data.member
- this.accountOptions = res.data.accountId
+ // this.accountOptions = res.data.accountId
})
this.getPaymentTypeList()
},
async getPaymentTypeList() {
await getPaymentTypeList().then((res) => {
- if (res.data.code === 200) {
- this.paymentTypeListOptions = res.data.data.data
+ if (res.code === 200) {
+ this.paymentTypeListOptions = res.data.data ?? []
+ }
+ })
+ },
+ async getBankAccountList() {
+ await getBankAccountList().then((res) => {
+ console.log("璐︽埛")
+ console.log('璐︽埛',res)
+ if (res.code === 200) {
+ this.accountOptions = res.data.data
}
})
},
--
Gitblit v1.8.0