Merge branch 'feature/dmx' into 'testing/inspect'

fix:送检地址回现问题

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!469

src/views/shop/create-shop.vue

@@ -1178,7 +1178,7 @@
               </el-form-item>
               <el-form-item label="送检地址管理" class="warehouseAdress-wrap" v-if="formData.storeType < 3">
                 <p class="warehouseAdress-tip">(该地址用于机构回寄样本地址，请准确填写)</p>
-                <el-button type="success" class="warehouseAdress-add" size="small" @click="createDetectionAdress(0)">+新增地址</el-button>
+                <el-button type="success" class="warehouseAdress-add" size="small" v-if="!formData.tradeStoreDetectionAddress.receiverMobile" @click="createDetectionAdress(0)">+新增地址</el-button>
                 <div class="detectionAddress" v-if="formData.tradeStoreDetectionAddress && formData.tradeStoreDetectionAddress.receiverMobile">
                   <div class="warehouseAdress-item">
                 <span class="warehouseAdress-main">
@@ -2642,6 +2642,7 @@ export default {
       this.warehouseAdressFormTitle = type ? '编辑地址' : '添加地址';
       this.warehouseAdressIndex = 0;
       if (type) {
+        this.formData.tradeStoreDetectionAddress.addr = this.formData.tradeStoreDetectionAddress.address;
         Object.assign(this.warehouseAdressForm,this.formData.tradeStoreDetectionAddress);
         this.getCitiesList();
         this.getCountiesList();
@@ -2903,6 +2904,7 @@ export default {
     // 格式化地址
     setAddress(arg) {
       let townName = arg.townName || '';
+      console.log(arg,arg.addr, arg.address);
       return arg.provinceName + arg.cityName + arg.countyName + townName + (arg.addr || arg.address);
     },
     // 获取退货物流