修复报价单优惠异常

src/views/ecw/offer/edit.vue

@@ -28,7 +28,7 @@
                 </el-form-item>
                 <el-form-item :label="$t('发货人电话')" prop="consignorPhone">
                     <!-- <area-code-selector v-model="form.consignorCountryCode" class="w-200 mr-10" disabled /> -->
-                    <el-input :value="form.consignorCountryCode + ' ' + form.consignorPhone" class="w-200" disabled />
+                    <el-input :value="`${form.consignorCountryCode || ''} ${form.consignorPhone || ''}`" class="w-200" disabled />
                 </el-form-item>
                 <el-form-item :label="$t('发货人公司')" prop="consignorCompany">
                     <el-input v-model="form.consignorCompany" disabled />
@@ -47,7 +47,7 @@
                 </el-form-item>
                 <el-form-item :label="$t('收货人电话')" prop="consigneePhone">
                     <!-- <area-code-selector v-model="form.consigneeCountryCode" class="w-200 mr-10" disabled/> -->
-                    <el-input :value="form.consigneeCountryCode + ' ' +  form.consigneePhone" class="w-200" disabled/>
+                    <el-input :value="`${form.consigneeCountryCode || ''} ${form.consigneePhone || ''}`" class="w-200" disabled/>
                 </el-form-item>
                 <el-form-item :label="$t('收货人公司')" prop="consigneeCompany">
                     <el-input v-model="form.consigneeCompany" :disabled="true" />
@@ -291,6 +291,7 @@
                 </el-descriptions-item>
             </el-descriptions>
 
+            
             <div class="card-title" style="padding:20px 0;">{{$t('优惠信息')}}</div>
             <el-table :data="couponList" :show-header="false">
                 <el-table-column label="">
@@ -323,7 +324,7 @@
             </el-table>
 
             <el-descriptions :column="1" class="mt-20">
-                <el-descriptions-item :label="$t('优惠费用')">
+                <el-descriptions-item :label="$t('优惠费用')"  v-if="couponTotalAmountList && couponTotalAmountList.length">
                     <div v-for="(item, discountIndex) in couponTotalAmountList" :key="discountIndex">
                         {{item.totalAmount}} {{currentcyMap[item.currencyId]}}
                     </div>
@@ -586,7 +587,7 @@ export default {
         this.couponAvailableGroupDtoList.forEach(item => {
             if(item.couponAvailableDtoList && item.couponAvailableDtoList.length){
                 // 只取第一个
-                let item = item.couponAvailableDtoList[0]
+                let it = item.couponAvailableDtoList[0]
                 arr.push({
                         prodId: item.prodId,
                         type: it.type,
@@ -761,6 +762,7 @@ export default {
             titleZh: product.titleZh,
             titleEn: product.titleEn
         })
+        this.calculationPrice()
     },
     onLineChange(row){
         this.calculationPrice()
@@ -897,13 +899,13 @@ export default {
             isCargoControl: this.form.control,
             orderType: this.form.orderType,
         }).then(res => {
-            /* this.$set(this, 'fee', res.data.costDto)
+            this.$set(this, 'fee', res.data.costDto)
             this.$set(this, 'couponTotalAmountList', res.data.availableDto.couponTotalAmountList)
             this.$set(this, 'couponAvailableGroupDtoList', res.data.availableDto.couponAvailableGroupDtoList)
             
             this.productList.map((item, index) => {
-                this.$set(item, 'fee', res.data.prodCostDtoList[index])
-            }) */
+                this.$set(item, 'fee', res.data.prodCostDtoList[index] || null)
+            })
         }).finally(() => {
             this.calculating = false
         })

src/views/ecw/order/components/Transfer.vue

@@ -3,10 +3,10 @@
         <div class="" v-if="agreement">
             <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="120px">
               <el-form-item :label="$t('原控货人')">
-                <el-input v-model="cargoControlName" readonly></el-input>
+                <el-input v-model="cargoControlName" disabled></el-input>
               </el-form-item>
               <el-form-item :label="$t('原控货手机号')">
-                <el-input v-model="cargoControlPhone" readonly></el-input>
+                <el-input :value="cargoControlPhone" disabled></el-input>
               </el-form-item>
               
               <el-form-item :label="$t('新控货人')" prop="name">
@@ -49,7 +49,8 @@ export default {
         orderId: [String, Number],
         cargoControlName: String,
         cargoControlPhone: String,
-        orderNo: String
+        orderNo: String,
+
     },
     components: {SendSmsCode, NeedKnow, AreaCodeSelector},
     data(){

src/views/ecw/order/detail.vue

@@ -9,7 +9,9 @@
         <el-col :span="8" v-if="order.consignorVO">
           <el-descriptions class="margin-top" border :title="$t('发货人')" :column="1" :labelStyle="{width:'150px'}">
             <el-descriptions-item :label="$t('发货人')">{{order.consignorVO.name}}</el-descriptions-item>
-            <el-descriptions-item :label="$t('发货人电话')">{{order.consignorVO.phone}}</el-descriptions-item>
+            <el-descriptions-item :label="$t('发货人电话')">
+              {{order.consignorVO.countryCode}} {{order.consignorVO.phone}}
+            </el-descriptions-item>
             <el-descriptions-item :label="$t('发货人邮箱')">{{order.consignorVO.email}}</el-descriptions-item>
             <el-descriptions-item :label="$t('发货人公司名称')">
               {{order.consignorVO.company}}
@@ -19,7 +21,9 @@
         <el-col :span="16" v-if="order.consigneeVO">
           <el-descriptions class="margin-top" border :title="$t('收货人')" :column="2" :labelStyle="{width:'150px'}">
             <el-descriptions-item :label="$t('收货人')">{{order.consigneeVO.name}}</el-descriptions-item>
-            <el-descriptions-item :label="$t('收货人电话')">{{order.consigneeVO.phone}}</el-descriptions-item>
+            <el-descriptions-item :label="$t('收货人电话')">
+              {{order.consigneeVO.countryCode}} {{order.consigneeVO.phone}}
+            </el-descriptions-item>
             <el-descriptions-item :label="$t('收货人邮箱')">{{order.consigneeVO.email}}</el-descriptions-item>
             <el-descriptions-item :label="$t('收货人公司名称')">
               {{order.consigneeVO.company}}