From 69ce2a8be175f8ba3ab9d2dca4e4e79fb011cd2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E4=B8=BD=E5=90=9B?= <664953382@qq.com>
Date: Wed, 15 Sep 2021 11:53:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E9=A1=B5--?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=B7=BB=E5=8A=A0=E5=85=B6=E5=AE=83=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/customer/add.vue   | 14 +++++++++++---
 src/views/customer/index.vue | 16 ++++++++++++++--
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/views/customer/add.vue b/src/views/customer/add.vue
index 09bd09d..51a5711 100644
--- a/src/views/customer/add.vue
+++ b/src/views/customer/add.vue
@@ -56,7 +56,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="10">
+        <el-col :span="10" v-if="ruleForm.addressType!=4">
           <el-form-item prop="cityId">
             <el-select
               v-model="ruleForm.cityId"
@@ -202,7 +202,11 @@ export default {
         {
           value: 3,
           label: '合肥区县'
-        }
+        },
+        {
+          value: 4,
+          label: '其它'
+        },
       ],
       optionList2: [],
       dialogVisible: false,
@@ -318,8 +322,10 @@ export default {
       // 地级市
       if (e === 2) {
         this.getType(false);
-      } else {
+      } else if(e === 3) {
         this.getCity(false);
+      }else{
+        this.ruleForm.cityId = '';
       }
     },
     // 获取地级市
@@ -381,6 +387,8 @@ export default {
             this.getType(true, data);
           } else if(data.addressType == 3) {
             this.getCity(true, data);
+          }else if(data.addressType == 4){
+            this.ruleForm = data
           }
         });
       });
diff --git a/src/views/customer/index.vue b/src/views/customer/index.vue
index 98e0ef6..3be941d 100644
--- a/src/views/customer/index.vue
+++ b/src/views/customer/index.vue
@@ -61,12 +61,20 @@
         </el-image>
       </template>
       </el-table-column>
-      <el-table-column label="企业地址" align="center" prop="cityType">
+      <el-table-column label="企业地址" align="center" prop="addressType">
         <template slot-scope="scope">
-          {{
+          <div v-if="scope.row.addressType==4">
+            {{
+            optionList1.filter(item => item.value == scope.row.addressType)[0]
+              .label
+          }}
+          </div>
+          <div v-else>
+            {{
             optionList1.filter(item => item.value == scope.row.addressType)[0]
               .label
           }}——{{ scope.row.cityName }}
+          </div>
         </template>
       </el-table-column>
       <el-table-column
@@ -140,6 +148,10 @@ export default {
         {
           value: '3',
           label: '合肥区县'
+        },
+        {
+          value: '4',
+          label: '其它'
         }
       ]
     };