Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into zhengwenf...

yangfeng

2023-10-17 d3c0cce8e77ea1986b2cd0c82135d926f1e2137a

Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into zhengwenfeng/modify-style

 src/views/client/client/DetailClientManage.vue

@@ -269,7 +269,7 @@
    this.getContactList()
    this.setData(this.detailConfig.infomation)
    this.addConfig = {
      id_name: "client_name",
      id_name: "client_id",
      keywordType: "客户名称",
      keyword: this.detailConfig.infomation.name,
      id: this.detailConfig.infomation.id,

 src/views/other/commonDialog/SelectCommonDialog.vue

@@ -352,8 +352,9 @@
    // 销售明细单
    async getSalesDetailsList() {
      await getSalesDetailsList({
        keyword: this.keyword,
        keywordType: this.keywordType,
        // keyword: this.keyword,
        // keywordType: this.keywordType,
        clientId:this.editCommonConfig.clientId,
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize
      }).then((res) => {
@@ -433,8 +434,9 @@
    },
    async getSalesReturnList() {
      await getSalesReturnList({
        keyword: this.keyword,
        keywordType: this.keywordType,
        // keyword: this.keyword,
        // keywordType: this.keywordType,
        clientId:this.editCommonConfig.clientId,
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize
      }).then((res) => {

 src/views/sales/quotation/AddQuotationDialog.vue

@@ -358,7 +358,7 @@
        number: [{ required: true, message: "请输入", trigger: "blur" }],
        quotationName: [{ required: true, message: "请输入", trigger: "blur" }],
        quotation_status_id: [{ required: true, message: "请选择", trigger: "change" }],
        sale_chance_name: [{ required: true, validator: this.checkChance, trigger: "blur" }],
        sale_chance_name: [{ required: true, validator: this.checkChance, trigger: "change" }],
        member_id: [{ required: true, message: "请选择负责人", trigger: "change" }]
      },
      memberOptions: [],
@@ -506,7 +506,8 @@
        validity_date: data.validity_date || "",
        products: this.tableData,
        codeStandID: data.ID,
        codeRule: this.codeRule
        codeRule: this.codeRule,
        client_id: this.clientId || 0,
      }
      return params
    },

 src/views/sales/quotation/index.vue

@@ -224,9 +224,9 @@
    },
    // 新建
    addBtnClick() {
      this.editConfig.visible = true
      this.editConfig.title = "新建"
      this.editConfig.infomation = { ...this.addConfig, currency: "人民币" }
      this.editConfig.visible = true
    },
    // 编辑
    handleClick(row) {

 src/views/sales/refundForm/AddRefundFormDialog.vue

@@ -374,7 +374,8 @@
      editSelCommonConfig: {
        editVisible: false,
        title: "",
        infomation: {}
        infomation: {},
        clientId:""
      },
      clientId: this.editCommonConfig.infomation.client_id,
      sourceId: this.editCommonConfig.infomation.sourceId,
@@ -515,6 +516,7 @@
    async handleSelectClient(value, item) {
      if (value === "client") {
        this.clientId = item.id
        this.editSelCommonConfig.clientId=item.id
        console.log("客户名称",this.clientId,value,item)
        await getSalesReturnList({
          clientId:this.clientId

 src/views/sales/salesDetails/AddSalesDetailsDialog.vue

@@ -488,7 +488,8 @@
      editSelectChanceConfig: {
        editVisible: false,
        title: "",
        infomation: {}
        infomation: {},
        search_map: {}
      },
      editSelCommonConfig: {
        editVisible: false,

 src/views/sales/salesDetails/index.vue

@@ -239,7 +239,7 @@
      let params = {}
      if (this.addConfig.id) {
        params = {
          saleChanceId: this.addConfig.id,
          clientId: this.addConfig.id,
          page: this.pagerOptions.currPage,
          pageSize: this.pagerOptions.pageSize
        }

 src/views/sales/salesReturn/AddSalesReturnDialog.vue

@@ -308,7 +308,8 @@
      editSelCommonConfig: {
        editVisible: false,
        title: "",
        infomation: {}
        infomation: {},
        clientId:""
      },
      productId: 1,
      isNoProduct: true,
@@ -459,6 +460,7 @@
    async handleSelectClient(value, item) {
      if (value === "client") {
        this.clientId = item.id
        this.editSelCommonConfig.clientId=item.id
        await getSalesDetailsList({
          clientId: this.clientId
        }).then((res) => {