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

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

@@ -12,7 +12,7 @@
       </el-form-item> -->
      
 
-      <el-form-item :label="$t('实际二程起飞时间')" prop="actSecondTime" v-show="this.$attrs.shipmentObj.bookAirInfo.voyage">
+      <el-form-item v-if="dtRealHeadTimeFlag" :label="$t('实际二程起飞时间')" prop="actSecondTime">
         <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="airArrivalInfo.actSecondTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
       <el-form-item :label="$t('预计到港时间')" prop="estTime">
@@ -73,6 +73,7 @@ export default {
       inspectionTimeArrival: this.getDictDatas(
         this.DICT_TYPE.BOX_INSPECTION_TIME_ARRIVAL
       )[0].value,
+      dtRealHeadTimeFlag: false
     };
   },
   created() {
@@ -84,6 +85,9 @@ export default {
       "YYYY-MM-DD HH:mm:ss"
     );
     this.airArrivalInfo = oldData;
+    if(this.$attrs.shipmentObj['bookAirInfo'].voyage && this.$attrs.shipmentObj['bookAirInfo'].voyage == 2){
+      this.dtRealHeadTimeFlag = true
+    }
   },
   watch: {
     // 实际二程起飞时间

src/views/ecw/box/shippingAir/seaProcess.vue

@@ -143,6 +143,12 @@ export default {
         this.$message.error(this.$t("没有此操作的权限"));
         return;
       }
+      if(node.type == 'checkout'){
+        if(this.shipmentObj.airShipmentStatus != 175){
+          this.$message.error(this.$t("请先完成出货操作"));
+          return;
+        }
+      }
       if (currIndex > this.currIndex) {
         console.log(currIndex,this.currIndex)
         this.$message.error(this.errorMsg);

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

@@ -58,9 +58,9 @@
             <span class="ml-5">{{orderSummary.sumWeight}}kg</span>
             <span class="ml-5" v-if="orderSummary.sumQuantity">{{orderSummary.sumQuantity}}{{$t('个')}}</span>
         </el-descriptions-item>
-        <el-descriptions-item :label="$t('是否重货')">
+        <el-descriptions-item :label="$t('是否重货/泡货')">
           <!--1 普货 2 重货 3 泡货-->
-          <dict-tag :type="DICT_TYPE.ECW_YESNO" :value="orderSummary.orderType != 1 ? '1' : '0'"></dict-tag>
+          <dict-tag :type="DICT_TYPE.ORDER_TYPE" :value="orderSummary.orderType"></dict-tag>
         </el-descriptions-item>
         <el-descriptions-item :label="$t('原重货标准')" v-if="[1,2].indexOf(orderSummary.transportId) > -1">
           {{orderSummary.orgWeightUnit}}KG/m³

src/views/ecw/order/transferWarehousing.vue

@@ -18,9 +18,11 @@
       </el-table-column>
       <el-table-column :label="$t('填单货物属性')">
         <template v-slot="{row}">
-          <div>{{$t('品牌')}}：{{(brandList.find(item => item.id == row.brand) || {}).titleZh}} <span v-if="!row.brand">
-            {{$t('无')}}
-          </span> </div>
+          <div>{{$t('品牌')}}：
+            <span v-if="row.brandType === 0">{{$t('无')}}</span>
+            <span v-if="row.brandType === 1">{{$t('有')}}</span>
+            <span v-if="row.brandType === 2">{{$t('中性')}}</span>
+          </div>
           <div>{{$t('箱数')}}：{{row.num}}</div>
           <div>{{$t('体积')}}：{{ row.volume }}m³</div>
           <div>{{$t('重量')}}：{{row.weight}}Kg</div>

src/views/system/download/index.vue

@@ -87,7 +87,7 @@ export default {
               return downloadFileResponse(res.data)
           }).then(res => {
               console.log({res})
-              this.$download.download0(res.data, row.name + row.fileSuffix, res.headers['content-type'])
+              this.$download.download0(res.data, row.name + '.' + row.fileSuffix, res.headers['content-type'])
           }).finally(() => {
               // 刷新列表状态
               this.getList()