zuozhengqing
2023-10-18 822eaead378df182afba549b7a18e4e3e3daec0a
Merge branch 'dev' of ssh://192.168.5.5:29418/web/crm-web into dev
4个文件已修改
26 ■■■■ 已修改文件
src/api/common/payment.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/store/modules/getClientName.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/other/commonDialog/SelectContactDialog.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sales/refundForm/AddRefundFormDialog.vue 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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
  })
src/store/modules/getClientName.js
@@ -111,6 +111,8 @@
        } else {
          Message.error(res.msg)
        }
      },err=>{
        console.error(err)
      })
    },
    getChanceFilter({commit},newData){
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() {
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
        }
      })
    },