Merge remote-tracking branch 'gitee/0.8.X' into 0.8.X

klp-ui/src/views/crm/components/CustomerEdit.vue

@@ -86,11 +86,16 @@
         </el-col>
         <el-col :span="24" v-hasPermi="['crm:customer:address']">
           <el-form-item label="客户地址" prop="address">
-            <el-input 
+            <!-- <el-input 
               type="textarea" 
               v-model="customer.address" 
               placeholder="请输入客户地址"
               @input="handleInputChange" 
+            /> -->
+            <ChinaAreaSelect
+              v-model="customer.address"
+              placeholder="请选择客户地址"
+              @change="handleInputChange"
             />
           </el-form-item>
         </el-col>
@@ -110,11 +115,13 @@
 
 <script>
 import JSONTableInput from './JSONTableInput.vue'
+import ChinaAreaSelect from '@/components/ChinaAreaSelect/index.vue'
 
 export default {
   name: 'CustomerEdit',
   components: {
-    JSONTableInput
+    JSONTableInput,
+    ChinaAreaSelect
   },
   props: {
     // 客户信息对象（双向绑定）

klp-ui/src/views/crm/customer/index.vue

@@ -135,7 +135,10 @@
           </el-select>
         </el-form-item>
         <el-form-item label="客户地址" prop="address">
-          <el-input v-model="form.address" placeholder="请输入客户地址" />
+          <ChinaAreaSelect 
+            v-model="form.address" 
+            placeholder="请选择客户地址" 
+          />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
@@ -161,6 +164,7 @@ import JSONTableInput from '../components/JSONTableInput.vue'
 import CustomerDetail from '../components/CustomerInfo.vue'
 import CustomerEdit from '../components/CustomerEdit.vue'
 import CustomerOrder from '../components/CustomerOrder.vue'
+import ChinaAreaSelect from '@/components/ChinaAreaSelect/index.vue'
 
 import { listCustomer, addCustomer, updateCustomer, delCustomer } from '@/api/crm/customer'
 
@@ -171,7 +175,8 @@ export default {
     JSONTableInput,
     CustomerDetail,
     CustomerEdit,
-    CustomerOrder
+    CustomerOrder,
+    ChinaAreaSelect
   },
   dicts: ['customer_industry', 'customer_level'],
   data() {