Merge branch 'dev' of http://120.25.63.219:6088/rex/portalhtml into dev

src/api/lov-data.js

@@ -181,18 +181,18 @@ export default {
       Status: {
         label: '状态',
         type: 'input',
-        layout: 12,
+        layout: 8,
         vif: false,
       },
       Name: {
         label: '公司名称',
         type: 'input',
-        layout: 14
+        layout: 22
       },
       OperName: {
         label: '法人',
         type: 'input',
-        layout: 12,
+        layout: 8,
         vif: false,
       },
       CreditCode: {

src/views/customers/customers-details/index.vue

@@ -12,6 +12,7 @@
         @request-success="handleSuccess"
       />
     </div>
+    <CustomerAddress :objectID='objectID' v-if="showAdress"/>
     <PersonalInFo :addBtnStart='addBtnStart' :dedeleBtnStart="dedeleBtnStart" :type-code="typeCode" :searchUrl="searchUrl"/>
   </div>
 </template>
@@ -22,11 +23,13 @@ import { customerCreate, provinceSearch, citySearch, districtSearch, customerGet
 import { qccGetOne } from '@/api/qcc'
 import PersonalInFo from '../personal-customers/conponents/personal-info'
 import { uploadCode } from '@/api/upload'
+import CustomerAddress from '../personal-customers/conponents/customersAdd-adress'
 
 export default {
   components: {
     Title,
     PersonalInFo,
+    CustomerAddress,
     customerCreate,
     provinceSearch,
     citySearch,
@@ -43,6 +46,7 @@ export default {
       addBtnStart: true,
       dedeleBtnStart: true,
       objectID: '',
+      showAdress: true,
       btnStart: true,
       formData: {},
       isShowSubmitBtn: false,
@@ -271,6 +275,7 @@ export default {
     getOneData() {
       this.loading = true
       this.searchUrl = '/file/search'
+      this.objectID =  this.$route.query.objectID
       const dataId =  this.$route.query.objectID
       customerGetOne({ objectID: dataId }).then(res => {
         this.formData = res.results[0]