From b01b18c05b3e0d00576a02c9c83df8c8033e5986 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 11 十月 2023 16:28:06 +0800
Subject: [PATCH] Merge branch 'zhengwenfeng/modify-style' into dev

---
 src/views/client/contacts/AddContactsDialog.vue |   61 +++++++++++++++++++++++++-----
 1 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/src/views/client/contacts/AddContactsDialog.vue b/src/views/client/contacts/AddContactsDialog.vue
index 3b3bc45..a814978 100644
--- a/src/views/client/contacts/AddContactsDialog.vue
+++ b/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,29 @@
           <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="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">
                   <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 +56,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 +88,7 @@
               </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 +111,7 @@
                     v-model="editConfig.infomation.birthday"
                     value-format="yyyy-MM-dd"
                     type="date"
+                    style="width: 100%"
                     placeholder="閫夋嫨鏃ユ湡"
                   >
                   </el-date-picker>
@@ -254,8 +271,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,7 +295,7 @@
   },
   data() {
     return {
-      dialogWidth: "80%",
+      dialogWidth: "50%",
       editConfig: this.editContactsConfig,
       rules: {
         name: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
@@ -331,8 +350,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 +450,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 +549,7 @@
         }
         .common-select {
           .common-select-sel {
-            width: 270px;
+            width:100%;
           }
         }
       }
@@ -527,6 +567,7 @@
       justify-content: center;
       align-items: center;
       color: #6166d3;
+      cursor: pointer;
     }
     .dialog-footer {
       background-color: #f5f5f5;

--
Gitblit v1.8.0