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

@@ -26,21 +26,17 @@
              <el-col :span="12" v-if="isUnflod">
                <el-form-item label="联系人编号" prop="number">
                  <WordInput
                    v-if="codenumer && (explain != '' || isIdDisabled)&&method == 0"
                    v-if="codenumer && (explain != '' || isIdDisabled) && method == 0"
                    :codenumer="codenumer"
                    :sum="sum"
                    :disabled="editConfig.infomation.id || isIdDisabled"
                    :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
                    >请优先配置编码规范 <el-button type="text" @click="numberClick"> 配置规范 </el-button></span
                  >
                  <span  v-else>自动生成</span>
                  <span v-else>自动生成</span>
                </el-form-item>
              </el-col>
              <el-col :span="12">
@@ -88,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" style="width: 100%">
                  <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>
@@ -271,7 +272,7 @@
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";
import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
export default {
  name: "AddContactsDialog",
  mixins: [codeMixin],
@@ -300,7 +301,7 @@
      rules: {
        name: [{ required: true, message: "请输入", trigger: "blur" }],
        number: [{ required: true, message: "请输入", trigger: "blur" }],
        client_name:[{ required: true, message: "请选择客户名称", trigger: "change" }],
        client_name: [{ required: true, message: "请选择客户名称", trigger: "blur" }],
        member_id: [{ required: true, message: "请选择", trigger: "change" }],
        phone: [
          { required: false, message: "", trigger: "blur" },
@@ -351,27 +352,27 @@
      this.getCityList(this.editConfig.infomation.province_id, "edit")
    }
    this.getCommonData()
    this.formInfo();
    this.formInfo()
  },
  watch:{
    'editContactsConfig.visible'(val){
      if(val){
  watch: {
    "editContactsConfig.visible"(val) {
      if (val) {
        this.formInfo()
      }
    },
    'editContactsConfig.infomation.codeStandID'(){
    "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;
    formInfo() {
      this.objCode.type = "联系人编码"
      this.objCode.codeStandID = ""
      if (this.editConfig.infomation.codeStandID) {
        this.objCode.codeStandID = this.editConfig.infomation.codeStandID
      }
      this.getRCodeStandardList();
    }, 
      this.getRCodeStandardList()
    },
    getCommonData() {
      this.editConfig.infomation.country_id = 1
      this.editConfig.infomation.province_id =
@@ -452,8 +453,8 @@
        province_id: data.province_id || 0,
        region_id: data.region_id || 0,
        wechat: data.wechat || "",
        codeStandID:data.ID,
        codeRule:this.codeRule,
        codeStandID: data.ID,
        codeRule: this.codeRule
      }
      return params
    },
@@ -550,7 +551,7 @@
        }
        .common-select {
          .common-select-sel {
            width:100%;
            width: 100%;
          }
        }
      }