Merge branch 'dev' into songshankun/adjust-style

songshankun

2023-10-11 22b4ff2a9e7eca77b2cdcc393ef552cc627054c4

 src/views/client/client/AddClientManageDialog.vue

@@ -24,17 +24,32 @@
          <div class="basic-info-view">
            <el-row>
              <el-col :span="12">
                <el-form-item label="客户编号" prop="number">
                  <WordInput
                    v-if="codenumer && (explain != '' || isIdDisabled)&&method == 0"
                    :codenumer="codenumer"
                    :sum="sum"
                    :disabled="editConfig.infomation.id || 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">
                  <div class="custom-name">
                    <el-input v-model="editConfig.infomation.name"></el-input>
                    <!-- <div class="common-select-btn"><i class="el-icon-house" title="工商查询"></i></div> -->
                    <!-- <div class="common-select-btn"><i class="el-icon-search" title="查重"></i></div> -->
                  </div>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="客户编号" prop="number">
                  <el-input v-model="editConfig.infomation.number"></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
@@ -495,8 +510,10 @@
<script>
import { getAllData, getAddClient, getUpdateClient, checkNameClient } from "@/api/client/client"
import { getCityList } from "@/api/common/address"
import codeMixin from "@/views/client/followupRecords/mixin/codeMixin";
export default {
  name: "AddClientManageDialog",
  mixins: [codeMixin],
  props: {
    editClientManageConfig: {
      type: Object,
@@ -572,8 +589,27 @@
      this.getCityList(this.editConfig.infomation.province_id, "edit")
    }
    this.getCommonData()
    this.formInfo();
  },
  watch:{
    'editClientManageConfig.visible'(val){
      if(val){
        this.formInfo()
      }
    },
    'editClientManageConfig.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 =
@@ -688,7 +724,9 @@
        representative: data.representative || "",
        service_member_id: data.service_member_id || 0,
        sales_leads_id: data.sales_leads_id || 0,
        contact_id: data.contact_id || 0
        contact_id: data.contact_id || 0,
        codeStandID:data.ID,
        codeRule:this.codeRule,
      }
      return params
    },