Merge branch 'dev' of ssh://192.168.5.5:29418/web/crm-web into dev

zuozhengqing

2023-10-17 68eb60800a453078e55927dcde6ee9956963f68f

Merge branch 'dev' of ssh://192.168.5.5:29418/web/crm-web into dev

 src/views/client/client/AddClientManageDialog.vue

@@ -538,32 +538,32 @@
      dialogWidth: "50%",
      editConfig: this.editClientManageConfig,
      rules: {
        number: [{ required: true, message: "请输入客户编号", trigger: "blur" }],
        number: [{ required: true, message: "请输入客户编号", trigger: ["change",'blur' ]}],
        name: [
          { required: true, message: "请输入客户名称", trigger: "blur" },
          { required: true, message: "请输入客户名称", trigger: ["change",'blur' ] },
          {
            validator: this.checkNameClient,
            trigger: "blur"
            trigger: ["change",'blur' ]
          }
        ],
        client_status_id: [{ required: true, message: "请选择客户状态", trigger: "change" }],
        member_id: [{ required: false, message: "请选择销售负责人", trigger: "change" }],
        approvalOpinion: [{ required: true, message: "请输入审批意见", trigger: "blur" }],
        client_status_id: [{ required: true, message: "请选择客户状态", trigger: ["change",'blur' ] }],
        member_id: [{ required: false, message: "请选择销售负责人", trigger: ["change",'blur' ] }],
        approvalOpinion: [{ required: true, message: "请输入审批意见", trigger: ["change",'blur' ] }],
        contact_phone: [
          { required: false, message: "", trigger: "blur" },
          { len: 11, message: "长度在11个字符", trigger: "blur" },
          { required: false, message: "", trigger:["change",'blur' ] },
          { len: 11, message: "长度在11个字符", trigger: ["change",'blur' ] },
          {
            pattern: /^1(3\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\d|9[0-35-9])\d{8}$/,
            message: "请输入正确的手机号",
            trigger: "blur"
            trigger: ["change",'blur' ]
          }
        ],
        contact_email: [
          { required: false, message: "", trigger: "blur" },
          { required: false, message: "", trigger: ["change",'blur' ] },
          {
            pattern: /^[a-zA-Z0-9_\\.]+@[a-zA-Z0-9-]+[\\.a-zA-Z]+$/,
            message: "请输入正确的邮箱格式",
            trigger: "blur"
            trigger: ["change",'blur' ]
          }
        ]
      },
@@ -748,8 +748,8 @@
    async getCityList(val, value) {
      await getCityList({ province_id: val }).then((res) => {
        console.log(res)
        if (res.data.code === 200) {
          this.cityOptions = res.data.data.list
        if (res.code === 200) {
          this.cityOptions = res.data.list
          if (value === "sel") {
            this.editConfig.infomation.city_id = ""
          }

 src/views/client/client/index.vue

@@ -293,7 +293,8 @@
        registered_capital_id: 1,
        enterprise_nature_id: 1,
        enterprise_scale_id: 1,
        industry_id: 1
        industry_id: 1,
        province_id:''
      }
      this.editConfig.visible = true
    },

 src/views/client/contacts/AddContactsDialog.vue

@@ -299,25 +299,25 @@
      dialogWidth: "50%",
      editConfig: this.editContactsConfig,
      rules: {
        name: [{ required: true, message: "请输入", trigger: "blur" }],
        number: [{ required: true, message: "请输入", trigger: "blur" }],
        client_name: [{ required: true, message: "请选择客户名称", trigger: "blur" }],
        member_id: [{ required: true, message: "请选择", trigger: "change" }],
        name: [{ required: true, message: "请输入", trigger:  ["change",'blur'] }],
        number: [{ required: true, message: "请输入", trigger: ["change",'blur'] }],
        client_name: [{ required: true, message: "请选择客户名称", trigger: ["change",'blur'] }],
        member_id: [{ required: true, message: "请选择", trigger: ["change",'blur'] }],
        phone: [
          { required: false, message: "", trigger: "blur" },
          { len: 11, message: "长度在11个字符", trigger: "blur" },
          { required: false, message: "", trigger: ["change",'blur'] },
          { len: 11, message: "长度在11个字符", trigger: ["change",'blur'] },
          {
            pattern: /^1(3\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\d|9[0-35-9])\d{8}$/,
            message: "请输入正确的手机号",
            trigger: "blur"
            trigger: ["change",'blur']
          }
        ],
        email: [
          { required: false, message: "", trigger: "blur" },
          { required: false, message: "", trigger: ["change",'blur'] },
          {
            pattern: /^[a-zA-Z0-9_\\.]+@[a-zA-Z0-9-]+[\\.a-zA-Z]+$/,
            message: "请输入正确的邮箱格式",
            trigger: "blur"
            trigger: ["change",'blur']
          }
        ]
      },

 src/views/client/followupRecords/mixin/codeMixin.js

@@ -82,7 +82,6 @@
      }
    },
    codeList(val) {
      console.log(val, "===val  codelist")
      this.inputValue = val
      this.codenumberList = val.toString()
      this.editConfig.infomation.number = this.codenumberList.length > 0 ? this.codenumberList.replace(/,/g, "") : ""

 src/views/client/salesLead/AddSalesLeadDialog.vue

@@ -270,17 +270,17 @@
      dialogWidth: "50%",
      editConfig: this.editSalesLeadConfig,
      rules: {
        name: [{ required: true, message: "请输入客户名称", trigger: "blur" }],
        number: [{ required: true, message: "请输入销售线索编号", trigger: "blur" }],
        businessStatus: [{ required: true, message: "请输入商机状态", trigger: "blur" }],
        sales_sources_id: [{ required: true, message: "请选择商机来源", trigger: "change" }],
        name: [{ required: true, message: "请输入客户名称", trigger: ["change",'blur' ]}],
        number: [{ required: true, message: "请输入销售线索编号", trigger: ["change",'blur' ] }],
        businessStatus: [{ required: true, message: "请输入商机状态", trigger: ["change",'blur' ] }],
        sales_sources_id: [{ required: true, message: "请选择商机来源", trigger: ["change",'blur' ] }],
        contact_phone: [
          { required: true, message: "请输入手机号码", trigger: "blur" },
          { len: 11, message: "长度在11个字符", trigger: "blur" },
          { required: true, message: "请输入手机号码", trigger: ["change",'blur' ] },
          { len: 11, message: "长度在11个字符", trigger: ["change",'blur' ] },
          {
            pattern: /^1(3\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\d|9[0-35-9])\d{8}$/,
            message: "请输入正确的手机号",
            trigger: "blur"
            trigger: ["change",'blur' ]
          }
        ]
      },

 src/views/sales/salesDetails/AddSalesDetailsDialog.vue

@@ -489,7 +489,7 @@
        editVisible: false,
        title: "",
        infomation: {},
        search_map:{},
        search_map: {}
      },
      editSelCommonConfig: {
        editVisible: false,
@@ -548,7 +548,7 @@
      getAllData()
        .then((res) => {
          this.memberOptions = res.data.member
          this.dataProcess()
          // this.dataProcess()
        })
        .catch((err) => {
          console.log(err)
@@ -673,31 +673,37 @@
        }
      }
    },
    async handleSelectClient(value, item) {
    // 销售机会列表
    async getSaleChanceList(item) {
      await getSaleChanceList({
        page: 1,
        pageSize: 15,
        search_map: {
          client_id: item.id
        }
      }).then((res) => {
        console.log(res)
        this.saleChancelist = res.data.list
      })
    },
    // 销售子单列表
    async getSubOrderList(item) {
      await getSubOrderList({
        page: 1,
        pageSize: 15,
        search_map: {
          client_id: item.id
        }
      }).then((res) => {
        this.subOrderList = res.data.list
      })
    },
    handleSelectClient(value, item) {
      if (value === "client") {
        this.clientId = item.id
        this.editConfig.infomation.client_name = item.name
        this.editSelectChanceConfig.search_map.client_id=item.id
        // 需要修改
        await getSaleChanceList({
          page: 1,
          pageSize: 15,
          search_map: {
            client_id: item.id
          }
        }).then((res) => {
          console.log(res)
          this.saleChancelist = res.data.list
        })
        await getSubOrderList({
          page: 1,
          pageSize: 15,
          search_map: {
            client_id: item.id
          }
        }).then((res) => {
          this.subOrderList = res.data.list
        })
        this.getSaleChanceList(item)
        this.getSubOrderList(item)
      } else if (value === "chance") {
        this.saleChanceId = item.id
        this.editConfig.infomation.client_name = item.name
@@ -723,6 +729,8 @@
      if (value === "client") {
        this.editConfig.infomation.client_name = row.name
        this.clientId = row.id
        this.getSaleChanceList(row)
        this.getSubOrderList(row)
      } else if (value === "chance") {
        this.editConfig.infomation.sale_chance_name = row.name
        this.saleChanceId = row.id

 src/views/sales/salesDetails/index.vue

@@ -290,7 +290,12 @@
    addBtnClick() {
      this.editConfig.visible = true
      this.editConfig.title = "新建"
      this.editConfig.infomation = { ...this.addConfig, currency: "人民币" }
      console.log(this.addConfig)
      this.editConfig.infomation = {
        ...this.addConfig,
        currency: "人民币",
        client_name: Object.keys(this.addConfig).length === 0 ? "" : this.addConfig.client_name
      }
    },
    // 编辑
    handleClick(row) {