未报价异常空运

src/views/ecw/order/pending.vue

@@ -22,6 +22,10 @@
             <el-descriptions-item :label="$t('运输方式')">
                 <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="orderData.transportId" />
               </el-descriptions-item>
+            <!-- v2.0空运专线，显示出货渠道 -->
+              <el-descriptions-item :label="$t('出货渠道')" v-if="getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, orderData.transportId).cssClass == 'channel'">
+                  {{channelName}}
+              </el-descriptions-item>
             <el-descriptions-item :label="$t('始发地')">
                  {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startTitleZh:$t('无')}}
             </el-descriptions-item>
@@ -163,6 +167,8 @@ import {getOrder} from '@/api/ecw/order'
 import FilePreview from '@/components/FilePreview'
 import {getProduct} from '@/api/ecw/product'
 import {getProductPriceGetPrice} from '@/api/ecw/productPrice'
+import { getChannel } from '@/api/ecw/channel';
+import {getDictData, getDictDatas} from  '@/utils/dict'
 
 export default {
   name: "Pending",
@@ -181,7 +187,8 @@ export default {
       timers:"", //时间戳
       FilePreAll:[], // 预览数组
       TragetPic:{},
-      currencyList:[]
+      currencyList:[],
+      channelName:'/'
     };
   },
   computed:{
@@ -192,6 +199,9 @@ export default {
         })
         return map
       },
+      getDictData(){
+          return (type, value) => getDictData(type, value) || {}
+      },
   },
   created() {
     getCurrencyList().then(res => this.currencyList = res.data)
@@ -201,6 +211,11 @@ export default {
       this.getOrders()
     }
   },
+  watch:{
+      'orderData.channelId'(){
+        this.getChannel()
+      },
+  },
   methods: {
     /** 查询列表 */
     getList() {
@@ -218,6 +233,12 @@ export default {
         this.loading = false;
       });
     },
+    getChannel(){
+      if(!this.order || !this.order.channelId || this.order.transportId == 1 || this.order.transportId == 2) return
+      getChannel(this.order.channelId).then(res => {
+        this.channelName = res.data.nameZh
+      })
+    },
     checkCode(data){
       if(data.indexOf('+')==-1){
       	return '+'+data
@@ -254,11 +275,22 @@ export default {
                   lineId: this.orderData.logisticsInfoDto.lineId,
                   channelId: this.orderData.logisticsInfoDto.channelId
                 }
-                let url = '../../lineProject/product-price/edit?' + (new URLSearchParams(params)).toString()
+                let url = ''
+                if([3,4].indexOf(this.orderData.transportId) > -1){
+                  url = '../../lineProject/product-price/edit-air?' + (new URLSearchParams(params)).toString()
+                }else{
+                  url = '../../lineProject/product-price/edit-sea?' + (new URLSearchParams(params)).toString()
+                }
+
                 getProductPriceGetPrice(queryParams).then(res=>{
                   console.log(res)
                   if(res.data){
-                    url =  '../../lineProject/product-price/edit?action=update&id='+res.data.id
+                     if([3,4].indexOf(+this.orderData.transportId) > -1){
+                        url =  '../../lineProject/product-price/edit-air?action=update&id='+res.data.id
+                     }else{
+                        url =  '../../lineProject/product-price/edit-sea?action=update&id='+res.data.id
+                     }
+
                   }
                   return this.$router.push(url)
                 })

src/views/ecw/order/prepayDeal.vue

@@ -26,6 +26,7 @@
        <el-row>
            <el-form-item :label="$t('运输路线')+':'" >
                <span v-if="orderData">{{ $t('【') }}<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="orderData.transportId" />{{ $t('】') }}</span>
+               <span v-if="getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, orderData.transportId).cssClass == 'channel'">{{ $t('【') }}{{channelName}}{{ $t('】') }}</span>
                 {{orderData?getRouterNameById():''}}
            </el-form-item>
        </el-row>
@@ -173,11 +174,23 @@
             </template>
           </el-table-column>
         <el-table-column :label="$t('填单箱数')" prop="num" />
+        <!-- v2.0  入仓特性异常 -->
+        <el-table-column :label="$t('填单特性')" prop="prodAttrIds">
+          <template slot-scope="scope">
+                {{getProdAtrr(scope.row.prodAtrIds)}}
+            </template>
+          </el-table-column>
         <el-table-column :label="$t('入仓箱数')">
           <template slot-scope="scope">
               {{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.cartonsNum:0}}
           </template>
         </el-table-column>
+        <!-- v2.0  入仓特性异常 -->
+        <el-table-column :label="$t('入仓特性')" prop="num">
+        <template slot-scope="scope">
+              {{scope.row.warehouseInInfoVO&&scope.row.warehouseInInfoVO.prodAtrIds?getProdAtrr(scope.row.warehouseInInfoVO.prodAtrIds):''}}
+          </template>
+        </el-table-column>
         <el-table-column :label="$t('方数')" prop="volume">
           <template slot-scope="scope">
               {{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.volume:0}}
@@ -493,6 +506,7 @@
   import {cancelProcessInstance} from '@/api/bpm/processInstance'
   import {getCustomer} from '@/api/ecw/customer'
   import ProductSelector from '@/components/ProductSelector'
+  import {getProductAttrList} from '@/api/ecw/productAttr'
   export default {
     name: "PrepayDeal",
     components: {
@@ -531,16 +545,19 @@
         customerData:{},//归属客户
         customerServiceList:[],//客户经理
         productId1:null,
-        productId2:null
+        productId2:null,
+        productAttrList:[],  // 商品属性
+        channelName:'/'
       };
     },
-    created() {
+    async created() {
       if(this.$route.query.id){
         this.orderExceptionId = this.$route.query.id
         this.handlerParams.orderExceptionId = this.$route.query.id
         this.getList()
 
       }
+      this.productAttrList = (await getProductAttrList()).data
       listServiceUser().then(r=>{
         this.customerServiceList = r.data;
       })
@@ -567,7 +584,10 @@
           })
           this.region = region
         })
-      }
+      },
+      'orderData.channelId'(){
+        this.getChannel()
+      },
     },
     computed: {
       currencyMap(){
@@ -586,6 +606,17 @@
           }
           return this.orderData.orderItemVOList.find(item => item.orderItemId == this.orderExceptionData.orderItemId)
         }
+      },
+      getProdAtrr(ids){
+        if(!ids) return ''
+        let attr = []
+        let attrIds = ids.split(',')
+        this.productAttrList.forEach(item=>{
+           if(attrIds.indexOf(item.id)!==-1){
+             attr.push(this.$l(item, 'attrName'))
+           }
+        })
+        return attr.join(',')
       }
     },
     methods: {
@@ -598,6 +629,12 @@
 	    if(label.length>0) return label[0].titleZh
 	    return ''
 	  },
+    getChannel(){
+      if(!this.order || !this.order.channelId || this.order.transportId == 1 || this.order.transportId == 2) return
+      getChannel(this.order.channelId).then(res => {
+        this.channelName = res.data.nameZh
+      })
+    },
       getList() {
         let that = this
         that.loading = true;