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

src/views/ecw/box/cancelClear.vue

@@ -3,7 +3,7 @@
     <div class="message-title">{{$t(`您确定撤销${cancelClearInfo.orderNo}已清关状态吗?`)}}</div>
     <el-form ref="arrivalForm" :rules="rules" :model="cusClearanceObj" label-width="120px">
       <el-form-item :label="$t('撤销理由')" prop="clEstTime">
-        <el-input v-if="[0,3,4].includes(apply.approvalStatus)" v-model="cusClearanceObj.applyReason" type="textarea" :rows="4"></el-input>
+        <el-input v-if="!flag" v-model="cusClearanceObj.applyReason" type="textarea" :rows="4"></el-input>
         <template v-else>
           {{apply.applyReason}}
         </template>
@@ -11,9 +11,9 @@
     </el-form>
 
     <el-row class="operate-button">
-      <el-button v-if="[0,3,4].includes(apply.approvalStatus)" type="primary" @click="onSubmit">{{$t('确定')}}</el-button>
-      <el-button v-if="apply.approvalStatus == 1" type="primary" @click="$router.push({path: '/bpm/process-instance/detail', query: {id: apply.bpmProcessId}})">{{$t('审核中')}}</el-button>
-      <el-button v-if="apply.approvalStatus == 1" plain type="primary" @click="canclAudit">{{$t('取消审核')}}</el-button>
+      <el-button v-if="!flag" type="primary" @click="onSubmit">{{$t('确定')}}</el-button>
+      <el-button v-if="flag" type="primary" @click="$router.push({path: '/bpm/process-instance/detail', query: {id: apply.bpmProcessId}})">{{$t('审核中')}}</el-button>
+      <el-button v-if="flag" plain type="primary" @click="canclAudit">{{$t('取消审核')}}</el-button>
       <el-button @click="cancel">{{$t('取消')}}</el-button>
     </el-row>
   </div>
@@ -41,14 +41,19 @@ export default {
           { required: true, message: this.$t("必填"), trigger: "change" },
         ]
       },
-      apply: {}
+      apply: {},
+      flag: false
     };
   },
   created() {
     let orders = this.shipmentObj.clearanceInfo?.clearanceOrderBackList
     let order = orders.find(item=>item.orderId == this.cancelClearInfo.orderId)
+    console.log(order,11,this.cancelClearInfo.orderId,orders);
     if(order){
       this.apply = order
+      if(this.apply.approvalStatus == 1){
+        this.flag = true
+      }
     }
   },
   methods: {

src/views/ecw/box/regError.vue

@@ -92,7 +92,6 @@ export default {
     },
     regprocess(){
       var data = ''
-      this.$set(this.errorObj, 'billAbnId', null)
       switch(this.errorObj.opStep){
         case '10':
           data = 'FLYING_TICKET_EXCEPTION'

src/views/ecw/box/shippingAir/nodePage/checkout.vue

@@ -56,7 +56,7 @@
 
       </div>
 
-      <el-form-item :label="$t('出仓日期')">
+      <el-form-item :label="$t('出仓日期')" prop="checkoutTime">
           <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="airCheckoutObj.checkoutTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
 
@@ -104,6 +104,7 @@ export default {
       // 校验
       rules: {
         //deliverType: [{ required: true, message: this.$t("必填"), trigger: "change" }],
+        checkoutTime: [{ required: true, message: this.$t("必填"), trigger: "change" }]
       },
     };
   },

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

@@ -88,8 +88,7 @@
                   </template>
                   <template v-else>
                     {{$t('全包价')}}<el-input v-model="scope.row.oneSeaFreight" @change="updateField(scope.row, 'oneSeaFreight')" size="mini" style="width: 80px"></el-input>
-                    {{currencyMap[scope.row.currencyId]}}
-                    {{unitMap[scope.row.clearanceFreightVolume]}}
+                    {{currencyMap[scope.row.seaFreightCurrency]}} / {{unitMap[scope.row.seaFreightVolume]}}
                   </template>
                 </template>
               </el-table-column>

src/views/ecw/order/prepayDeal.vue

@@ -1403,11 +1403,16 @@
               return
             }
           }
+
           if((this.orderExceptionData.orderExceptionType=='not_shipping_channel_exception'&&this.handlerParams.orderExceptionHandlerResult=='change_channel')||(this.orderExceptionData.orderExceptionType=='channel_exception'&&this.handlerParams.orderExceptionHandlerResult=='set_shipment_channel')){
             if(!this.handlerParams.channelId||this.handlerParams.channelId==0){
               this.$modal.msgError(this.$t('请选择出货渠道'));
               return
             }
+            if(!this.handlerParams.lineId||this.handlerParams.lineId==0){
+              this.$modal.msgError(this.$t('请选择线路'));
+              return
+            }
           }
           if(['channel_packaging_overweight_exception','overweight_exception'].indexOf(this.orderExceptionData.orderExceptionType)>-1&&this.handlerParams.orderExceptionHandlerResult=='update_weight_limit'){
             if(!this.handlerParams.weightLimit){

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

@@ -227,8 +227,7 @@
                 </template>
                 <template v-else>
 									{{$t('全包价')}}<el-input v-model="scope.row.oneSeaFreight" @change="updateField(scope.row, 'oneSeaFreight')" size="mini" style="width: 80px"></el-input>
-									{{currencyMap[scope.row.currencyId]}}
-									{{unitMap[scope.row.clearanceFreightVolume]}}
+									{{currencyMap[scope.row.seaFreightCurrency]}} / {{unitMap[scope.row.seaFreightVolume]}}
                 </template>
 							</template>
 						</el-table-column>
@@ -941,7 +940,7 @@ export default {
       if(!this.orderData || !this.orderData.orderItemVOList ||this.orderData.length==0){
         return sums
       }
-      var orderSum = 0
+      /*var orderSum = 0
       var orderV = 0
       var orderW = 0
       var leviteSum = 0
@@ -956,6 +955,17 @@ export default {
         leviteW += column.warehouseInInfoVO?column.warehouseInInfoVO.weight:0
       });
       sums[1] = this.$t('下单统计')+' '+ orderSum+' '+this.$t('箱')+' '+ orderV.toFixed(2) +' m³ ' + orderW + ' kg ' + ' '+this.$t('入仓统计：')+ leviteSum+' '+this.$t('箱')+' '+ leviteV.toFixed(2) +' m³ ' + leviteW + ' kg'
+      */
+      sums[1] = [
+        this.$t('下单统计'),
+        this.orderData.costVO?.totalNum + ' '+this.$t('箱'),
+        this.orderData.costVO?.totalVolume + ' m³',
+        this.orderData.costVO?.totalWeight + ' kg',
+        this.$t('入仓统计：'),
+        this.orderData.sumNum +' '+this.$t('箱'),
+        this.orderData.sumVolume +' m³',
+        this.orderData.sumWeight +' kg'
+      ].join(' ')
 
       return sums;
     },