Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator

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

@@ -87,13 +87,21 @@ export default {
           p1.push(item)
        }
       })
-      specialNeedCreate(p1).then(r=>{
-        if(r.code === 0){
-          this.$emit('update:show',false)
-          this.$emit('determine')
-          this.$message.success('提交成功');
-        }
-      })
+     let p2 =  p1.filter(i => Number(i.transFee) > 0)
+      if(p2.every(i => !!i.payType)){
+        specialNeedCreate(p1).then(r=>{
+          if(r.code === 0){
+            this.$emit('update:show',false)
+            this.$emit('determine')
+            this.$message.success('提交成功');
+          }
+        })
+      }else {
+       let v = p2.map(i => i.advanceType);
+       console.log(this.getDictDatas(this.DICT_TYPE.ORDER_SPECIAL_NEEDS),'this.getDictDatas(this.DICT_TYPE.ORDER_SPECIAL_NEEDS)')
+        let v2 = this.getDictDatas(this.DICT_TYPE.ORDER_SPECIAL_NEEDS).filter(i => v.includes(i.value))
+        this.$modal.notifyWarning(`请选择"${ v2.map(i => i.label).join('，')}"的付款类型。`)
+      }
     },
   },
   watch:{
@@ -105,7 +113,7 @@ export default {
                orderId:this.orderId,
                transFee:'',//预计金额
                transCurrency:1,//运输费币种
-               payType:'1'
+               payType:''
                })
          })
         //特需回显

src/views/ecw/order/exception/index.vue

@@ -111,13 +111,14 @@
       </el-table-column>
       <el-table-column :label="$t('总箱数/入仓箱数')" align="center" >
       <template slot-scope="scope">
-          <span>{{scope.row.totalBox+$t('箱/')+scope.row.warehousingBox+$t('箱')}}</span>
+          <span v-if="scope.row.orderExceptionType!='order_doc_exception'">{{scope.row.totalBox+$t('箱/')+scope.row.warehousingBox+$t('箱')}}</span>
+          <span style="color:#ff4949" v-if="scope.row.orderExceptionType=='order_doc_exception'">{{scope.row.totalBox+$t('箱/')+scope.row.warehousingBox+$t('箱')}}</span>
            <dict-tag style="color:#ff4949" v-if="scope.row.orderExceptionType=='order_doc_exception'" :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="scope.row.customsType"></dict-tag>
         </template>
       </el-table-column>
       <el-table-column :label="$t('体积/重量')" align="center">
           <template slot-scope="scope">
-                <div v-if="scope.row.orderExceptionType!='order_heavy_cargo_exception'">
+                <div v-if="scope.row.orderExceptionType!='order_heavy_cargo_exception'&&scope.row.orderExceptionType!='order_bulky_cargo_exception'">
                   <span v-if="scope.row.orderStatus >= 5 ">{{scope.row.volume+"m³/"+scope.row.weight+"kg"}}</span>
                   <span v-else>{{scope.row.totalVolume+"m³/"+scope.row.totalWeight+"kg"}}</span>
                 </div>
@@ -125,6 +126,10 @@
                   <span style="color:#ff4949" v-if="scope.row.orderStatus >= 5 ">{{scope.row.volume+"m³/"+scope.row.weight+"kg"}}</span>
                   <span style="color:#ff4949" v-else>{{scope.row.totalVolume+"m³/"+scope.row.totalWeight+"kg"}}</span>
                 </el-tooltip>
+                <el-tooltip v-if="scope.row.orderExceptionType=='order_bulky_cargo_exception'" class="item" effect="dark" :content="(scope.row.vweight||0)+'kg'" placement="bottom">
+                  <span style="color:#ff4949" v-if="scope.row.orderStatus >= 5 ">{{scope.row.volume+"m³/"+scope.row.weight+"kg"}}</span>
+                  <span style="color:#ff4949" v-else>{{scope.row.totalVolume+"m³/"+scope.row.totalWeight+"kg"}}</span>
+                </el-tooltip>
           </template>
       </el-table-column>
       <el-table-column :label="$t('运输方式/目的地')" align="center">

src/views/ecw/order/weightDeal.vue

@@ -87,9 +87,19 @@
             <span>{{scope.row.wvolume||0}}CBM</span>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('泡货方数')" v-else >
+        <el-table-column :label="$t('泡货方数')" v-if="type!='order_heavy_cargo_exception'">
           <template slot-scope="scope">
-            <span>{{scope.row.vweight||0}}CBM</span>
+            <span>{{scope.row.wvolume||0}}CBM</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('重货重量')"  v-if="type=='order_heavy_cargo_exception'">
+          <template slot-scope="scope">
+            <span>{{scope.row.vweight||0}}KG</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('泡货重量')" v-if="type!='order_heavy_cargo_exception'" >
+          <template slot-scope="scope">
+            <span>{{scope.row.vweight||0}}KG</span>
           </template>
         </el-table-column>
         <el-table-column :label="$t('最后操作时间')" scope="handlerTime" />