Merge remote-tracking branch 'origin/dev' into dev

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

@@ -204,6 +204,7 @@
           <el-button v-else-if="scope.row.orderExceptionType=='goods_weight_exception'" v-hasPermi="['ecw:exception:goodsWeightException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
           <el-button v-else-if="scope.row.orderExceptionType=='in_warehousing_diff_exception'" v-hasPermi="['ecw:exception:inWarehousingException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
           <el-button v-else-if="scope.row.orderExceptionType=='stock_up_exception'" v-hasPermi="['ecw:exception:stockUpException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
+          <el-button v-else-if="scope.row.orderExceptionType=='channel_exception'" v-hasPermi="['ecw:exception:channelException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
         </template>
       </el-table-column>
     </el-table>

src/views/ecw/order/pending.vue

@@ -21,11 +21,13 @@
             </el-descriptions-item>
             <el-descriptions-item :label="$t('运输方式')">
                 <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="orderData.transportId" />
+                 <!-- v2.0空运专线，显示出货渠道 -->
+                <span v-if="getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, orderData.transportId).cssClass == 'channel'" style="margin-left:10px">{{$t('出货渠道')}}:{{channelName}}</span>
               </el-descriptions-item>
             <!-- v2.0空运专线，显示出货渠道 -->
-              <el-descriptions-item :label="$t('出货渠道')" v-if="getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, orderData.transportId).cssClass == 'channel'">
+<!--              <el-descriptions-item :label="$t('出货渠道')" v-if="getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, orderData.transportId).cssClass == 'channel'">
                   {{channelName}}
-              </el-descriptions-item>
+              </el-descriptions-item> -->
             <el-descriptions-item :label="$t('始发地')">
                  {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startTitleZh:$t('无')}}
             </el-descriptions-item>
@@ -139,6 +141,7 @@
             <el-button v-else-if="scope.row.orderExceptionStatus==2&&scope.row.orderExceptionType=='goods_weight_exception'" v-hasPermi="['ecw:exception:goodsWeightException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('查看')}}</el-button>
             <el-button v-else-if="scope.row.orderExceptionStatus==2&&scope.row.orderExceptionType=='in_warehousing_diff_exception'" v-hasPermi="['ecw:exception:inWarehousingException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('查看')}}</el-button>
             <el-button v-else-if="scope.row.orderExceptionStatus==2&&scope.row.orderExceptionType=='stock_up_exception'" v-hasPermi="['ecw:exception:stockUpException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('查看')}}</el-button>
+            <el-button v-else-if="scope.row.orderExceptionStatus==2&&scope.row.orderExceptionType=='channel_exception'" v-hasPermi="['ecw:exception:channelException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('查看')}}</el-button>
             
             <el-tag style="margin-left:10px" v-if="scope.row.orderExceptionStatus==2">{{$t('已完成')}}</el-tag>
             <el-button v-else-if="scope.row.orderExceptionType=='order_superfluous_box_exception'" v-hasPermi="['ecw:exception:superfluousBox']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
@@ -166,6 +169,7 @@
             <el-button v-else-if="scope.row.orderExceptionType=='goods_weight_exception'" v-hasPermi="['ecw:exception:goodsWeightException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
             <el-button v-else-if="scope.row.orderExceptionType=='in_warehousing_diff_exception'" v-hasPermi="['ecw:exception:inWarehousingException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
             <el-button v-else-if="scope.row.orderExceptionType=='stock_up_exception'" v-hasPermi="['ecw:exception:stockUpException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
+            <el-button v-else-if="scope.row.orderExceptionType=='channel_exception'" v-hasPermi="['ecw:exception:channelException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -269,7 +273,7 @@ export default {
 
     handEdit(row){
       // 未报价异常
-      if(row.orderExceptionType=='order_no_quote_exception'){
+      if(row.orderExceptionType=='order_no_quote_exception'||row.orderExceptionType=='customs_fee_not_quote_exception'){
 
         if(row.orderItemId){
           var productData = this.orderData.orderItemVOList.find(item=>item.orderItemId==row.orderItemId)
@@ -320,7 +324,12 @@ export default {
           }
         }else{
           return this.$confirm(this.$t('数据缺少orderItemId参数，确定要跳转设置路线价格么？')).then(res => {
-            let url = '../../lineProject/product-price/edit'
+              let url = ''
+              if([3,4].indexOf(this.orderData.transportId) > -1){
+                  url = '../../lineProject/product-price/edit-air?'
+              }else{
+                  url = '../../lineProject/product-price/edit-sea?'
+              }
             this.$router.push(url)
           })
 

src/views/ecw/order/warehousing/components/Warehouse.vue

@@ -157,10 +157,10 @@
                     </el-form-item>
                   </template>
                 </el-table-column>
-                <el-table-column :label="$t('数量')" width="130px">
+                <el-table-column :label="$t('数量')" width="140px">
                   <template v-slot="{r,c,$index}">
                     <el-form-item :rules="tableFormRules.quantityAll">
-                      <el-input :disabled="$index < protectRowCount" v-model.number="form.table[$index].quantityAll" placeholder="">
+                      <el-input :disabled="$index < protectRowCount" v-model.number="form.table[$index].quantityAll" placeholder="" type="number">
                         <template slot="append">{{ $t('个') }}</template>
                       </el-input>
                     </el-form-item>
@@ -371,11 +371,11 @@
                     </el-form-item>
                   </template>
                 </el-table-column>
-                <el-table-column :label="$t('数量')" width="130px">
+                <el-table-column :label="$t('数量')" width="140px">
                   <template v-slot="{r,c,$index}">
                     <el-form-item>
                       <span v-if="form1.table[$index].id">{{ form1.table[$index].quantityAll }}</span>
-                      <el-input v-else v-model.number="form1.table[$index].quantityAll" placeholder="">
+                      <el-input v-else type="number" v-model.number="form1.table[$index].quantityAll" placeholder="">
                         <template slot="append">{{ $t('个') }}</template>
                       </el-input>
                     </el-form-item>