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

haoxuan

2023-10-17 d5ed072db0c236ba505971471460e24789c58562

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

 src/views/client/contacts/index.vue

@@ -148,7 +148,7 @@
      this.search_map = {}
    } else {
      this.search_map = {
        [this.addConfig.id_name]: this.addConfig.client_name
        [this.addConfig.id_name]: this.addConfig.client_id
      }
    }
    this.getData(this.search_map)

 src/views/other/payment/receipt/addReceipt.vue

@@ -391,6 +391,7 @@
    }
  },
  created() {
    console.log()
    this.$store.dispatch("geClient")
    this.$store.dispatch("geServiceContract")
    this.$store.dispatch("geSalesDetails")

 src/views/other/payment/receipt/index.vue

@@ -247,6 +247,7 @@
      this.editConfig.visible = true
      this.editConfig.title = "新建"
      this.editConfig.sourceType = this.addConfig.keywordType === "客户名称" ? 1 : this.sourceType
      console.log(this.addConfig)
      this.editConfig.infomation = { ...this.addConfig, saleDetailNumber: "" }
    }
  }

 src/views/sales/salesDetails/DetailSpecification.vue

@@ -274,7 +274,7 @@
      common_name: this.detailConfig.infomation.name,
      client_name: this.detailConfig.infomation.client.name,
      contact_name: this.detailConfig.infomation.contact_name,
      client_id: this.detailConfig.infomation.client_id,
      client_id: this.detailConfig.infomation.clientId,
      contact_id: this.detailConfig.infomation.contact_id,
      amountTotal: this.detailConfig.infomation.amountTotal
    }

 src/views/sales/salesReturn/AddSalesReturnDialog.vue

@@ -480,7 +480,7 @@
      } else if (value === "contract") {
        this.editSelCommonConfig.title = "销售明细单"
        this.editSelCommonConfig.editVisible = true
        this.editSelCommonConfig.client_name = this.editConfig.infomation.client_name
        // this.editSelCommonConfig.salesDetailNumber = this.editConfig.infomation.salesDetailNumber
      }
    },
    async selClient(row, value) {
@@ -504,14 +504,14 @@
    // 清除已选择用户
    clearupClient(value) {
      if (value === "client") {
        this.editConfig.infomation = {}
        // this.editConfig.infomation.client_name = ""
        // this.clientId = 0
        // this.editConfig.infomation = {}
        this.editConfig.infomation.client_name = ""
        this.clientId = 0
      } else if (value === "contract") {
        this.editConfig.infomation.salesDetailNumber = ""
        this.productTableList.tableData = []
        this.tableData = []
        this.SalesDetailsId = 0
        // this.productTableList.tableData = []
        // this.tableData = []
        // this.SalesDetailsId = 0
      }
    },
    // 添加附件

 src/views/sales/salesReturn/index.vue

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