Merge branch 'dev' into test

src/views/ecw/order/edit.vue

@@ -69,7 +69,7 @@
               </el-radio-group>
             </div>
           </template>
-          <el-form-item :label="$t('名称')" prop="consigneeContactsId">
+          <el-form-item v-if="hasConsignee" :label="$t('名称')" prop="consigneeContactsId">
             <!-- <customer-contact-selector v-model="form.consignorContactsId" @change="consignorContact = $event" type="1" /> -->
             <div class="contact">
               <el-input v-model="form.consigneeName" placeholder="" :disabled="!hasConsignee"/>
@@ -79,29 +79,29 @@
           </el-form-item>
           <!-- v1.7新增 -->
 
-          <el-form-item :label="$t('电话')" prop="consigneePhone">
+          <el-form-item v-if="hasConsignee" :label="$t('电话')" prop="consigneePhone">
             <area-code-selector v-model="form.consigneeCountryCode" class="w-200 mr-10" disabled/>
             <el-input v-model="form.consigneePhone" class="w-200" disabled/>
           </el-form-item>
 
-          <el-button circle icon="el-icon-circle-plus" v-if="!showFullConsignee" @click="showFullConsignee=true"></el-button>
-          <el-button circle icon="el-icon-remove" v-else @click="showFullConsignee=false"></el-button>
+          <el-button circle icon="el-icon-circle-plus" v-if="hasConsignee && !showFullConsignee" @click="showFullConsignee=true"></el-button>
+          <el-button circle icon="el-icon-remove"  v-if="hasConsignee && showFullConsignee" @click="showFullConsignee=false"></el-button>
 
           <div v-if="showFullConsignee">
-            <el-form-item :label="$t('英文名称')" prop="consigneeNameEn">
+            <el-form-item v-if="hasConsignee" :label="$t('英文名称')" prop="consigneeNameEn">
               <!-- <customer-contact-selector v-model="form.consignorContactsId" @change="consignorContact = $event" type="1" /> -->
               <div class="contact">
                 <el-input v-model="form.consigneeNameEn" placeholder="" :disabled="!hasConsignee"/>
               </div>
             </el-form-item>
-            <el-form-item :label="$t('公司中文名称')" prop="consigneePhone">
+            <el-form-item v-if="hasConsignee" :label="$t('公司中文名称')" prop="consigneePhone">
               <el-input v-model="form.consigneeCompany" :disabled="!hasConsignee" />
             </el-form-item>
             <!-- v1.7新增 -->
-            <el-form-item :label="$t('公司英文名称')" prop="consigneePhone">
+            <el-form-item v-if="hasConsignee" :label="$t('公司英文名称')" prop="consigneePhone">
               <el-input v-model="form.consigneeCompanyEn" :disabled="!hasConsignee" />
             </el-form-item>
-            <el-form-item label="Email" prop="consigneePhone">
+            <el-form-item v-if="hasConsignee" label="Email" prop="consigneePhone">
               <el-input v-model="form.consigneeEmail" :disabled="!hasConsignee"/>
             </el-form-item>
           </div>
@@ -1417,6 +1417,7 @@ export default {
         this.$set(this.form, this.contactChooseType + 'Phone', contact.phoneNew)
 
         if(this.contactChooseType == 'consignor'){
+
           this.noConsignee = contact.noConsignee
           // 如果允许无收货人，则默认无收货人、控货
           // 241023 根据最新的原型，默认有收货人