订单异常添加匹配条件

src/utils/dict.js

@@ -193,7 +193,7 @@ export const DICT_TYPE = {
   ECW_AUTH_TYPE:'auth_type',//品牌授权
 
   NEED_ORDER_INQUIRY: 'need_order_inquiry', // 是否需要単询
-
+  EXCEPTION_SELECT_FILED:'exception_select_filed',
   ECASH_INIT:'ecash_init', //e-cash
   FEE_TYPE:'receivable_fee_type',
   // PAY_TYPE:'payment_type',

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

@@ -47,7 +47,11 @@
             <dict-selector :type="DICT_TYPE.ORDER_ERROR_TYPE" :clearable="true" v-model="queryParams.orderExceptionType" @keyup.enter.native="handleQuery"/>
         </el-form-item>
         <el-form-item :label="$t('订单号')+':'">
-          <el-input v-model="queryParams.orderNo" :placeholder="$t('请输入订单号')" clearable @keyup.enter.native="handleQuery"/>
+          <el-input v-model="queryParams.orderNo" :placeholder="$t('请输入订单号')" clearable @keyup.enter.native="handleQuery">
+            <template slot="prepend">
+              <dict-selector :type="DICT_TYPE.EXCEPTION_SELECT_FILED" v-model="queryParams.orderNoKey" class="w-50" />
+            </template>
+          </el-input>
         </el-form-item>
       </el-row>
       <el-row>
@@ -64,10 +68,11 @@
           <el-input v-model="queryParams.consigneeText" :placeholder="$t('收货人')" clearable @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item :label="$t('唛头')+':'">
-          <el-input v-model="queryParams.marks" :placeholder="$t('请输入唛头')" clearable @keyup.enter.native="handleQuery"/>
-        </el-form-item>
-        <el-form-item :label="$t('品名')+':'">
-          <product-selector v-model="queryParams.goodsName" :clearable="true" @keyup.enter.native="handleQuery" />
+          <el-input v-model="queryParams.marks" :placeholder="$t('请输入唛头')" clearable @keyup.enter.native="handleQuery">
+            <template slot="prepend">
+              <dict-selector :type="DICT_TYPE.EXCEPTION_SELECT_FILED" v-model="queryParams.marksKey" class="w-50" />
+            </template>
+          </el-input>
         </el-form-item>
       </el-row>
       <el-row>
@@ -85,6 +90,13 @@
             <el-option :label="$t('自有仓')" :value="0"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item :label="$t('品名')+':'">
+          <div style="display: flex;width: 100%;">
+            <dict-selector :type="DICT_TYPE.EXCEPTION_SELECT_FILED" style="width: 90px;" v-model="queryParams.goodsNameKey" />
+            <product-selector v-model="queryParams.goodsName"  style="flex:1;" :clearable="true" @keyup.enter.native="handleQuery" />
+          </div>
+
+        </el-form-item>
       </el-row>
       <el-row>
         <el-form-item label="">
@@ -244,7 +256,10 @@ export default {
       // 查询参数
       queryParams: {
         page: 1,
-        rows: 10
+        rows: 10,
+        goodsNameKey:'eq',
+        orderNoKey:'eq',
+        marksKey:'eq'
       },
        tradeCityList:[],
        warehouseList:[],

src/views/ecw/order/prepayDeal.vue

@@ -509,7 +509,7 @@
               </el-form-item>
               <!--select是原生组件，不受el-form的disabled控制-->
               <select size="5" v-model="handlerParams.lineId" style="min-width: 300px; border:1px solid #DCDFE6; border-radius:4px" @change="changeLined">
-                  <option v-for="item in routerList" :value="item.id" :key="item.id">
+                  <option v-for="item in routerList" :value="item.id" :key="item.id" :disabled="orderExceptionData.orderExceptionStatus>0">
                     {{$l(item, 'startTitle')}} >> {{$l(item, 'destTitle')}}
                     (<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="item.transportType"></dict-tag>)
                   </option>
@@ -982,6 +982,7 @@
           }
           if(this.orderExceptionData.orderExceptionType=='not_shipping_channel_exception'){
             // this.handlerParams.channelPriceList = []
+            this.getOpenedRouterList()
             if(this.orderExceptionData.orderExceptionStatus==0){
               this.orderData.orderItemVOList.map(v=>{
                 if(!v.oneSeaFreight){
@@ -993,7 +994,7 @@
                   v.clearanceFreightVolume = this.unitList[1]['id']
                 }
               })
-            }else{
+            }else if(handlerParams.orderExceptionHandlerResult=='continue_channel'){
               this.getExceptionPriceList()
             }
           }
@@ -1027,9 +1028,9 @@
         getOrderFeeById({id:this.orderId}).then(response => {
           this.orderFee = response.data
           this.handlerParams.orderExceptionHandlerResult = this.orderFee.result[0]
-          if(this.orderExceptionData.orderExceptionStatus==2){
-            this.getOrderExcptionResult()
-          }
+          // if(this.orderExceptionData.orderExceptionStatus==2){
+          //   this.getOrderExcptionResult()
+          // }
 
         })
       },