电话区号判断

src/views/ecw/offer/detail.vue

@@ -25,7 +25,7 @@
                         {{consigneeData.length>0?consigneeData[0].customerName||$t('无'):$t('无')}}
                     </el-descriptions-item>
                     <el-descriptions-item :label="$t('手机号:')">
-                      {{consigneeData.length>0?(consigneeData[0].areaCode+consigneeData[0].phoneNew)||$t('无'):$t('无')}}
+                      {{consigneeData.length>0?(checkCode(consigneeData[0].areaCode)+consigneeData[0].phoneNew)||$t('无'):$t('无')}}
                     </el-descriptions-item>
                     <el-descriptions-item :label="$t('联系地址:')">
                       {{consigneeData.length>0?consigneeData[0].address||$t('无'):$t('无')}}
@@ -46,7 +46,7 @@
                      {{consigneeData.length>1?consigneeData[1].customerName||$t('无'):$t('无')}}
                    </el-descriptions-item>
                    <el-descriptions-item :label="$t('手机号:')">
-                     {{consigneeData.length>1?(consigneeData[1].areaCode+consigneeData[1].phoneNew)||$t('无'):$t('无')}}
+                     {{consigneeData.length>1?(checkCode(consigneeData[1].areaCode)+consigneeData[1].phoneNew)||$t('无'):$t('无')}}
                    </el-descriptions-item>
                    <el-descriptions-item :label="$t('联系地址:')">
                      {{consigneeData.length>1?consigneeData[1].address||$t('无'):$t('无')}}
@@ -234,7 +234,7 @@
           <div slot="header" class="card-title">{{$t('通用信息')}}</div>
             <el-descriptions :column="4">
               <el-descriptions-item :label="$t('唛头')">
-                  {{list.marks}}
+                  {{list.marks||'/'}}
               </el-descriptions-item>
               <el-descriptions-item :label="$t('报关方式')">
                   <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="list.customsType"></dict-tag>
@@ -242,13 +242,13 @@
               </el-descriptions>
             <el-descriptions :column="4">
              <el-descriptions-item :label="$t('预计结束时间')">
-                  {{list.stopTime}}
+                  {{list.stopTime||'/'}}
               </el-descriptions-item>
               <el-descriptions-item :label="$t('控货')">
                    {{list.control?$t('是'):$t('否')}}
                </el-descriptions-item>
                <el-descriptions-item :label="$t('竞争对手')">
-                  {{list.competitor}}
+                  {{list.competitor||'/'}}
                 </el-descriptions-item>
                 <el-descriptions-item :label="$t('重要程度')">
                     <el-rate v-model="list.importance"></el-rate>
@@ -265,7 +265,7 @@
           </el-descriptions>
           <el-descriptions >
               <el-descriptions-item :label="$t('备注')">
-                   {{list.remarks}}
+                   {{list.remarks||'/'}}
                </el-descriptions-item>
           </el-descriptions>
         </el-card>
@@ -276,12 +276,12 @@
           <div class="line">
             <el-descriptions>
                 <el-descriptions-item :label="[3,4].indexOf(list.transportId)>-1?$t('空运路线'):$t('海运路线')">
-                    {{getRouterNameById(list.lineId)}}
+                    {{getRouterNameById(list.lineId)||'/'}}
                 </el-descriptions-item>
             </el-descriptions>
             <el-descriptions v-if="[3,4].indexOf(list.transportId) > -1">
                <el-descriptions-item :label="$t('出货渠道')">
-                   {{channelName}}
+                   {{channelName||'/'}}
                 </el-descriptions-item>
             </el-descriptions>
           </div>
@@ -292,12 +292,12 @@
           </el-descriptions>
           <el-descriptions v-if="[3,4].indexOf(list.transportId) > -1">
               <el-descriptions-item :label="$t('航空公司')">
-                 {{getSupplierData(list.transportVO.airlineCompany)}}
+                 {{getSupplierData(list.transportVO.airlineCompany)||'/'}}
               </el-descriptions-item>
           </el-descriptions>
           <el-descriptions v-if="list.transportId==2">
               <el-descriptions-item :label="$t('船公司')">
-                 {{getSupplierData(list.transportVO.shippingCompany)}}
+                 {{getSupplierData(list.transportVO.shippingCompany)||'/'}}
               </el-descriptions-item>
           </el-descriptions>
           <el-descriptions v-if="[2,3,4].indexOf(list.transportId) > -1">
@@ -307,7 +307,7 @@
           </el-descriptions>
           <el-descriptions v-if="[2,3,4].indexOf(list.transportId) > -1">
               <el-descriptions-item :label="$t('清关证书备注')">
-                 {{list.transportVO.remarks}}
+                 {{list.transportVO.remarks||'/'}}
               </el-descriptions-item>
           </el-descriptions>
           <el-descriptions class="card" v-if="[3,4].indexOf(list.transportId) > -1">
@@ -330,7 +330,7 @@
           </el-descriptions>
           <el-descriptions>
               <el-descriptions-item :label="$t('特殊要求备注')">
-                {{list.transportVO.packageRemarks}}
+                {{list.transportVO.packageRemarks||'/'}}
               </el-descriptions-item>
           </el-descriptions>
         </el-card>
@@ -466,6 +466,12 @@
       }
     },
     methods: {
+      checkCode(data){
+        if(data.indexOf('+')==-1){
+        	return '+'+data
+        }
+        return data
+      },
       getOrderData(id) {
         let that = this
         that.loading = true;

src/views/ecw/order/pending.vue

@@ -34,7 +34,7 @@
                 {{orderData.consignorVO?orderData.consignorVO.company||$t('无'):$t('无')}}
             </el-descriptions-item>
             <el-descriptions-item :label="$t('发货电话')">
-                {{orderData.consignorVO?orderData.consignorVO.phone||$t('无'):$t('无')}}
+                {{orderData.consignorVO?((orderData.consignorVO.countryCode?checkCode(orderData.consignorVO.countryCode):'')+orderData.consignorVO.phone)||$t('无'):$t('无')}}
             </el-descriptions-item>
           </el-descriptions>
           <el-descriptions :column="4">
@@ -45,7 +45,7 @@
                 {{orderData.consigneeVO?orderData.consigneeVO.company||$t('无'):$t('无')}}
             </el-descriptions-item>
             <el-descriptions-item :label="$t('收货电话')">
-                {{orderData.consigneeVO?orderData.consigneeVO.phone||$t('无'):$t('无')}}
+                {{orderData.consigneeVO?((orderData.consigneeVO.countryCode?checkCode(orderData.consigneeVO.countryCode):'')+orderData.consigneeVO.phone)||$t('无'):$t('无')}}
             </el-descriptions-item>
         </el-descriptions>
     </el-card>
@@ -151,6 +151,12 @@ export default {
         this.loading = false;
       });
     },
+    checkCode(data){
+      if(data.indexOf('+')==-1){
+      	return '+'+data
+      }
+      return data
+    },
     getOrders(){
       getOrder(this.orderId).then(response => {
         this.orderData = response.data

src/views/ecw/order/singleApply.vue

@@ -37,7 +37,7 @@
                 {{orderData.consignorVO?orderData.consignorVO.company||$t('无'):$t('无')}}
             </el-descriptions-item>
             <el-descriptions-item :label="$t('发货电话')">
-                  {{!orderData.consignorVO?$t('无'):!orderData.consignorVO.phone?$t('无'):(orderData.consignorVO.countryCode+orderData.consignorVO.phone)}}
+                  {{!orderData.consignorVO?$t('无'):!orderData.consignorVO.phone?$t('无'):(checkCode(orderData.consignorVO.countryCode)+orderData.consignorVO.phone)}}
             </el-descriptions-item>
         </el-descriptions>
         <el-descriptions :column="4">
@@ -48,7 +48,7 @@
                 {{orderData.consigneeVO?orderData.consigneeVO.company||$t('无'):$t('无')}}
             </el-descriptions-item>
             <el-descriptions-item :label="$t('收货电话')">
-                 {{!orderData.consigneeVO?$t('无'):!orderData.consigneeVO.phone?$t('无'):(orderData.consigneeVO.countryCode+orderData.consigneeVO.phone)}}
+                 {{!orderData.consigneeVO?$t('无'):!orderData.consigneeVO.phone?$t('无'):(checkCode(orderData.consigneeVO.countryCode)+orderData.consigneeVO.phone)}}
             </el-descriptions-item>
         </el-descriptions>
 
@@ -209,6 +209,12 @@ export default {
     getTradeCityList().then(res => this.tradeCityList = res.data)
   },
   methods: {
+    checkCode(data){
+      if(data.indexOf('+')==-1){
+      	return '+'+data
+      }
+      return data
+    },
     /** 查询列表 */
     getList() {
       this.loading = true;

src/views/ecw/order/splitApply.vue

@@ -40,7 +40,7 @@
               {{orderData.consignorVO?orderData.consignorVO.company||$t('无'):$t('无')}}
           </el-descriptions-item>
           <el-descriptions-item :label="$t('发货电话')">
-                {{!orderData.consignorVO?$t('无'):!orderData.consignorVO.phone?$t('无'):(orderData.consignorVO.countryCode+orderData.consignorVO.phone)}}
+                {{!orderData.consignorVO?$t('无'):!orderData.consignorVO.phone?$t('无'):(checkCode(orderData.consignorVO.countryCode)+orderData.consignorVO.phone)}}
           </el-descriptions-item>
         </el-descriptions>
         <el-descriptions :column="4">
@@ -51,7 +51,7 @@
                 {{orderData.consigneeVO?orderData.consigneeVO.company||$t('无'):$t('无')}}
             </el-descriptions-item>
             <el-descriptions-item :label="$t('收货电话')">
-              {{!orderData.consigneeVO?$t('无'):!orderData.consigneeVO.phone?$t('无'):(orderData.consigneeVO.countryCode+orderData.consigneeVO.phone)}}
+              {{!orderData.consigneeVO?$t('无'):!orderData.consigneeVO.phone?$t('无'):(checkCode(orderData.consigneeVO.countryCode)+orderData.consigneeVO.phone)}}
             </el-descriptions-item>
         </el-descriptions>
 
@@ -359,6 +359,12 @@ export default {
     }
   },
   methods: {
+    checkCode(data){
+      if(data.indexOf('+')==-1){
+      	return '+'+data
+      }
+      return data
+    },
     getOrder(){
       this.loading = true;
       getOrder(this.queryParams.orderId).then(response => {

src/views/ecw/order/weightDeal.vue

@@ -34,7 +34,7 @@
                 {{orderData.consignorVO?orderData.consignorVO.company||$t('无'):$t('无')}}
             </el-descriptions-item>
             <el-descriptions-item :label="$t('发货电话')">
-                {{orderData.consignorVO?orderData.consignorVO.phone||$t('无'):$t('无')}}
+                {{orderData.consignorVO?((orderData.consignorVO.countryCode?checkCode(orderData.consignorVO.countryCode):'')+orderData.consignorVO.phone)||$t('无'):$t('无')}}
             </el-descriptions-item>
           </el-descriptions>
           <el-descriptions :column="4">
@@ -45,7 +45,7 @@
                 {{orderData.consigneeVO?orderData.consigneeVO.company||$t('无'):$t('无')}}
             </el-descriptions-item>
             <el-descriptions-item :label="$t('收货电话')">
-                {{orderData.consigneeVO?orderData.consigneeVO.phone||$t('无'):$t('无')}}
+                {{orderData.consigneeVO?((orderData.consigneeVO.countryCode?checkCode(orderData.consigneeVO.countryCode):'')+orderData.consigneeVO.phone)||$t('无'):$t('无')}}
             </el-descriptions-item>
         </el-descriptions>
     </el-card>
@@ -147,6 +147,12 @@ export default {
         this.getOrders()
       });
     },
+    checkCode(data){
+      if(data.indexOf('+')==-1){
+      	return '+'+data
+      }
+      return data
+    },
     getOrders(){
       getOrder(this.list.orderId).then(response => {
         this.orderData = response.data