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

src/api/ecw/box.js

@@ -199,7 +199,6 @@ export function getBillService(params) {
 export function zipDownload(params) {
   return request({
     url: "/shipment/make-bill-of-lading/zipDownload",
-    responseType: "blob",
     method: "get",
     timeout: 120000,
     params,
@@ -327,7 +326,6 @@ export function downloadPreloadGoodsList(params) {
 export function downloadReceivableList(params) {
   return request({
     url: "/ecw/box-preload-goods/downloadReceivableList",
-    responseType: "blob",
     timeout: 3*60*1000,
     method: "get",
     params,

src/views/ecw/box/indexAir.vue

@@ -576,9 +576,6 @@ export default {
       this.exportLoading = true;
       func(params).then(res => {
         console.log({res})
-        if(!fileName){
-          fileName = this.$t('订单')
-        }
         this.$message.success(this.$t('已加入导出队列，请稍后在下载日志中下载'))
         // this.$download.excel(res, fileName + '.xls');
       }).finally(() => {

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

@@ -110,6 +110,11 @@
       <el-form-item :label="$t('超重订单')" prop="overOrders"  v-show="cusDeclarationObj.overMachineStatus == 2&&cusDeclarationObj.weightMisreport == 4">
         <ordersSelect v-model="cusDeclarationObj.overOrders" :placeholder="$t('请选择超重订单')" :shipmentId="shipmentObj.id" />
       </el-form-item>
+      <el-form-item prop="overOrders"  v-show="cusDeclarationObj.overOrders.length > 0">
+        <div v-for="order in cusDeclarationObj.overOrders" :key="order">
+          {{getOrders(order)}} <el-button type="text" @click="$router.push('/order/warehousing-update?id='+order)">{{$t('入仓修改')}}</el-button>
+        </div>
+      </el-form-item>
 
       <!-- <el-form-item :label="$t('装箱单')">
         <el-button type="primary">{{$t('下载装箱单')}}</el-button>
@@ -206,7 +211,8 @@ import {
   resetById,
   resetByShipmentId,
   customsOrderList,
-  approvalCreate
+  approvalCreate,
+  boxGoodsDetail
 } from "@/api/ecw/boxSea";
 import {
   formatNumberString,
@@ -278,6 +284,7 @@ export default {
       isDownload: false,
       normalOrderList: [],
       isShowNormal: false,
+      sectionOrderList: []
     };
   },
   created() {
@@ -320,6 +327,12 @@ export default {
         this.$set(this.cusDeclarationObj, "deleteExitTime", details.deleteExitTime)
       }
     }
+    boxGoodsDetail({
+                shipmentId: this.shipmentObj.id,
+                secId: 0
+            }).then((res) => {
+                this.sectionOrderList = res.data.sectionOrderList;
+            });
   },
   methods: {
     strToArray(str) {
@@ -340,6 +353,13 @@ export default {
         }
       });
     },
+    getOrders(id) {
+      let order = this.sectionOrderList.find(item=>item.orderId==id)
+      if(order){
+        return order.orderNo
+      }
+      return ''
+    },
     regCloseDialog(type) {
       this.regDialogVisible = false;
       if (type === "error") {

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

@@ -2,7 +2,7 @@
   <div>
     <el-descriptions class="margin-top" border :column="4">
       <el-descriptions-item :label="$t('唛头')">{{details.marks}}</el-descriptions-item>
-      <el-descriptions-item label="已到箱数/总箱数">{{details.sumNum || 0}}/{{details.sumNum || 0 }}</el-descriptions-item>
+      <el-descriptions-item :label="$t('已到箱数/总箱数')">{{details.sumNum || 0}}/{{details.costVO.totalNum || 0 }}</el-descriptions-item>
       <el-descriptions-item :label="$t('订单状态')">
         <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="details.status" />
       </el-descriptions-item>

src/views/ecw/order/detail.vue

@@ -743,7 +743,7 @@ export default {
         coupons: row.couponInfoVOList,
         airClearanceSource: row.airClearanceSource == 1 ? this.$t('商品') : this.$t('渠道'), // 空运清关费来源：1 商品 2 渠道
         airClearanceInfo: JSON.parse(row.airClearanceInfo), //空运清关费来源数据详情,
-        sourceName: row.airClearanceSource == 1 ? this.$l(row, 'prodTitle') : this.channelName
+        sourceName: row.airClearanceSource == 1 ? this.$l(row, 'prodTitle') : this.order?.channelName
       }
 
     },

src/views/ecw/warehouse/index.vue

@@ -319,11 +319,6 @@
               <el-radio :label="0">不可见</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item v-if="['3','4'].includes(lineform.transportType)" label="空运提单制作节点">
-           <el-select v-model="lineform.makeBillNode">
-             <el-option v-show="item.value !== '1'" v-for="(item, index) in getDictDatas(DICT_TYPE.AIR_SHIPMENT_PROCESS)" :label="$l(item, 'label')" :value="item.value"></el-option>
-           </el-select>
-          </el-form-item>
           <el-form-item :label="$t('保费币种')">
             <el-select @change="modifyAmountUnit" v-model="lineform.currencyUnit">
               <el-option v-for="(item) in currencyList" :disabled="item.status === 1" :label="$l(item, 'title')" :value="item.id"></el-option>

src/views/system/download/index.vue

@@ -31,6 +31,11 @@
               <span>{{ parseTime(scope.row.createTime) }}</span>
           </template>
       </el-table-column>
+      <!--<el-table-column :label="$t('结果')" align="center" prop="createTime"  width="150">
+        <template slot-scope="scope">
+          {{scope.row.result}}
+        </template>
+      </el-table-column>-->
       <el-table-column :label="$t('下载状态')" align="center" prop="createBy"  width="150">
           <template v-slot:default="{row}">
               <!--status ==2 表示已处理，配合downNum来判断是否已下载-->