Merge branch 'dev' into songshankun/adjust-style

songshankun

2023-10-17 42819fb733c99c39b705edcc022e5801f28e8cb0

Merge branch 'dev' into songshankun/adjust-style

 src/views/client/followupRecords/index.vue

@@ -256,7 +256,7 @@
    // 新建
    addBtnClick() {
      this.editConfig.title = "新建"
      this.editConfig.infomation = { ...this.addConfig }
      this.editConfig.infomation = { ...this.addConfig ,contact_name:"",sales_leads_name:"",sale_chance_name:""}
      this.editConfig.visible = true
    },
    // 编辑

 src/views/other/commonDialog/SelectContactDialog.vue

@@ -54,8 +54,8 @@
        return {
          editVisible: false,
          title: "",
          infomation: {},
          search_map: {}
          clientId: 0,
          infomation: {}
        }
      }
    }
@@ -71,7 +71,7 @@
      tableList: [],
      searchSelOptions: [],
      loading: false,
      // search_map: {},
      search_map: {},
      tableColumn: [
        { label: "联系人姓名", prop: "name", isContactClick: true, default: true }, // 联系人姓名
        { label: "联系人编号", prop: "number" }, // 联系人编号
@@ -82,6 +82,9 @@
    }
  },
  created() {
    this.search_map = {
      client_id: this.editConfig.clientId
    }
    this.setTable()
    this.getData()
  },
@@ -121,7 +124,7 @@
    async getData() {
      this.loading = true
      await getContactList({
        search_map: this.editConfig.search_map,
        search_map: this.search_map,
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize
      })
@@ -158,13 +161,13 @@
    // 搜索
    searchClick(val, content) {
      console.log(val, content)
      this.editConfig.search_map = {
      this.search_map = {
        [val.value]: content
      }
      this.getData()
    },
    resetClick() {
      this.editConfig.search_map = {}
      this.search_map = {}
      this.getData()
    }
  }

 src/views/sales/salesDetails/index.vue

@@ -308,6 +308,8 @@
      this.editConfig.infomation = {
        ...this.addConfig,
        currency: "人民币",
        sale_chance_name:"",
        subbill_name:"",
        client_name: Object.keys(this.addConfig).length === 0 ? "" : this.addConfig.client_name
      }
    },

 src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue

@@ -656,7 +656,7 @@
    }
    this.getCommonData()
    this.formInfo()
    if (this.editConfig.title === '编辑'){
    if (this.editConfig.title === "编辑") {
      this.isContact = false
      this.getContactList(this.editConfig.infomation.contact_id)
    }
@@ -778,7 +778,6 @@
        status_id: data.status_id || 0,
        threats: data.threats || "",
        whether_established: data.whether_established || "",

        remark: data.remark || "",
        detail_address: data.detail_address || "",

@@ -790,10 +789,11 @@
    // 获取联系人列表
    getContactList(id) {
      getContactList({
        clientId: id,
        page: 0,
        pageSize: 0,
        search_map: {}
        search_map: {
          client_id: id
        }
      }).then((res) => {
        if (res.code == 200) {
          this.contactNamelist = res.data.list
@@ -820,7 +820,7 @@
      if (value === "client") {
        this.clientId = item.id
        this.editConfig.infomation.client_name = item.name
        this.editConfig.infomation.contact_name = ''
        this.editConfig.infomation.contact_name = ""
        this.contactId = 0
        this.isContact = false
        this.getContactList(item.id)
@@ -835,6 +835,7 @@
        this.editSelectClientConfig.editVisible = true
      } else if (value === "contact") {
        this.editSelectContactConfig.editVisible = true
        this.editSelectContactConfig.clientId = this.clientId
      }
    },
    selClient(row, value) {
@@ -844,7 +845,7 @@
      } else if (value === "client") {
        this.editConfig.infomation.client_name = row.name
        this.clientId = row.id
        this.editConfig.infomation.contact_name = ''
        this.editConfig.infomation.contact_name = ""
        this.contactId = 0
        this.isContact = false
        this.getContactList(row.id)

 src/views/service/clientServiceOrder/mixin/codeMixin.js

@@ -89,6 +89,10 @@
        this.codenumberList.length > 0 ? this.codenumberList.replace(/,/g, "") : ""
      console.log(this.codenumberList.replace(/,/g, ""))
    },
    validateFormNumber(){
      this.$set(this.editConfig.infomation,'serviceNumber',this.editConfig.infomation.serviceNumber)
      this.$refs.form.validateField('serviceNumber')
    },
    // 配置编码规范的跳转
    numberClick() {
      window.open("http://www.fai365.com:9080/facilty", "_blank")