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

zuozhengqing

2023-10-13 cdae87d86d3516b6275fc9ae2c251f83635c954c

 src/views/client/contacts/AddContactsDialog.vue

@@ -14,7 +14,7 @@
        :model="editConfig.infomation"
        :rules="rules"
        label-position="right"
        label-width="308px"
        label-width="120px"
        size="mini"
      >
        <!-- 信息 -->
@@ -23,14 +23,25 @@
          <div v-if="isUnflod" class="basic-info-title">基本信息</div>
          <div class="basic-info-view">
            <el-row>
              <el-col :span="12" v-if="isUnflod">
                <el-form-item label="联系人编号" prop="number">
                  <WordInput
                    v-if="codenumer && (explain != '' || isIdDisabled) && method == 0"
                    :codenumer="codenumer"
                    :sum="sum"
                    :disabled="this.editConfig.title !== '新建' || isIdDisabled"
                    :inputValue="inputValue"
                    @codeList="codeList"
                  />
                  <span v-else-if="method == 0" style="color: #f56c6c"
                    >请优先配置编码规范 <el-button type="text" @click="numberClick"> 配置规范 </el-button></span
                  >
                  <span v-else>自动生成</span>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="联系人姓名" prop="name">
                  <el-input v-model="editConfig.infomation.name"></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12" v-if="isUnflod">
                <el-form-item label="联系人编号" prop="number">
                  <el-input v-model="editConfig.infomation.number"></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
@@ -41,6 +52,7 @@
                      :fetch-suggestions="querySearchAsync"
                      value-key="name"
                      @select="handleSelectClient"
                      style="width: 100%"
                    ></el-autocomplete>
                    <div class="common-select-btn" @click="selClientClick">
                      <i class="el-icon-circle-plus-outline" title="选择"></i>
@@ -72,7 +84,12 @@
              </el-col>
              <el-col :span="12">
                <el-form-item v-if="isUnflod" label="销售负责人" prop="member_id">
                  <el-select v-model="editConfig.infomation.member_id" placeholder="请选择" size="mini">
                  <el-select
                    v-model="editConfig.infomation.member_id"
                    placeholder="请选择"
                    size="mini"
                    style="width: 100%"
                  >
                    <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
                    </el-option>
                  </el-select>
@@ -95,6 +112,7 @@
                    v-model="editConfig.infomation.birthday"
                    value-format="yyyy-MM-dd"
                    type="date"
                    style="width: 100%"
                    placeholder="选择日期"
                  >
                  </el-date-picker>
@@ -254,8 +272,10 @@
import { getAllData } from "@/api/client/client"
import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
import { getCityList } from "@/api/common/address"
import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
export default {
  name: "AddContactsDialog",
  mixins: [codeMixin],
  props: {
    editContactsConfig: {
      type: Object,
@@ -276,11 +296,12 @@
  },
  data() {
    return {
      dialogWidth: "80%",
      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" }],
        phone: [
          { required: false, message: "", trigger: "blur" },
@@ -331,8 +352,27 @@
      this.getCityList(this.editConfig.infomation.province_id, "edit")
    }
    this.getCommonData()
    this.formInfo()
  },
  watch: {
    "editContactsConfig.visible"(val) {
      if (val) {
        this.formInfo()
      }
    },
    "editContactsConfig.infomation.codeStandID"() {
      this.formInfo()
    }
  },
  methods: {
    formInfo() {
      this.objCode.type = "联系人编码"
      this.objCode.codeStandID = ""
      if (this.editConfig.infomation.codeStandID) {
        this.objCode.codeStandID = this.editConfig.infomation.codeStandID
      }
      this.getRCodeStandardList()
    },
    getCommonData() {
      this.editConfig.infomation.country_id = 1
      this.editConfig.infomation.province_id =
@@ -412,7 +452,9 @@
        position: data.position || "",
        province_id: data.province_id || 0,
        region_id: data.region_id || 0,
        wechat: data.wechat || ""
        wechat: data.wechat || "",
        codeStandID: data.ID,
        codeRule: this.codeRule
      }
      return params
    },
@@ -509,7 +551,7 @@
        }
        .common-select {
          .common-select-sel {
            width: 270px;
            width: 100%;
          }
        }
      }
@@ -527,6 +569,7 @@
      justify-content: center;
      align-items: center;
      color: #6166d3;
      cursor: pointer;
    }
    .dialog-footer {
      background-color: #f5f5f5;