出货详情-表单未显示下载已装单

src/api/ecw/box.js

@@ -328,6 +328,18 @@ export function downloadLoadGoodsList(params) {
   });
 }
 
+/**
+ *  下载空运已装单
+ */
+export function downloadLoadGoods(params) {
+  return request({
+    url: "/ecw/box-preload-goods/downloadAirLoadGoodsList",
+    method: "get",
+    timeout: 120000,
+    params,
+  })
+}
+
 // 下载预装单
 export function downloadPreloadGoodsList(params) {
   return request({

src/views/ecw/box/queryAir.vue

@@ -321,27 +321,33 @@ export default {
       costDetail: {},
       // 下载
       downloadList: [
-        { title: this.$t("预装单"), serviceName: "downloadPreloadGoodsList", hasPermi: "shipment:box:download:downloadPreloadGoodsList" },
+        { title: this.$t("预装单"), serviceName: "downloadPreloadGoodsList", hasPermi: "shipment:air:download:downloadPreloadGoodsList" },
         // { title: this.$t("已装单"), serviceName: "downloadLoadGoodsList", hasPermi: "shipment:box:download:downloadLoadGoodsList" },
-        { title: this.$t("应收汇总表"), serviceName: "downloadReceivableList", hasPermi: "shipment:box:download:downloadReceivableList" },
+        { title: this.$t("应收汇总表"), serviceName: "downloadReceivableList", hasPermi: "shipment:air:download:downloadReceivableList" },
         {
           title: this.$t("提货单"),
           serviceName: "zipDownload",
           fileFormat: "zip",
-          hasPermi: "shipment:box:download:zipDownload"
+          hasPermi: "shipment:air:download:zipDownload"
         },
         {
           title: "agent list",
           serviceName: "downloadAgentListFiles",
           type: "url",
-          hasPermi: "shipment:box:download:downloadAgentListFiles"
+          hasPermi: "shipment:air:download:downloadAgentListFiles"
         },
-        { title: "soncap", serviceName: "downloadSoncapFiles", type: "url", hasPermi: "shipment:box:download:downloadSoncapFiles" },
+        { title: "soncap", serviceName: "downloadSoncapFiles", type: "url", hasPermi: "shipment:air:download:downloadSoncapFiles" },
         {
           title: this.$t("提单Copy"),
           serviceName: "downloadLadingCopy",
           type: "url",
-          hasPermi: "shipment:box:download:downloadLadingCopy"
+          hasPermi: "shipment:air:download:downloadLadingCopy"
+        },
+        {
+          title: this.$t("已装单"),
+          serviceName: "downloadLoadGoods",
+          type: "url",
+          hasPermi: "shipment:air:download:downloadLoadGoods"
         },
       ],
       // 选中行

src/views/ecw/box/shippingAir/nodePage/tally/index.vue

@@ -20,9 +20,21 @@
         </el-card>
 
         <el-row style="margin-top: 15px">
-          <el-row>
+          <el-row class="table-title">
+            <div>
               <el-button :disabled="shipmentObj.approvaling" size="small" type="primary" @click="()=>tallyClick('batch')">{{$t('批量理货')}}</el-button>
               <el-button :disabled="shipmentObj.approvaling" size="small" type="primary" @click="()=>removeClick('batch')">{{$t('批量移出')}}</el-button>
+            </div>
+            <div>
+              <template>
+                <el-input v-model="qrCode" :placeholder="$t('请输入二维码/条码编号')" clearable></el-input>
+                <el-button type="primary" @click="handlerBatchCreate('single')">{{$t('确定')}}</el-button>
+                <el-button type="primary" @click="handlerClick('batchInput',$t('批量输入'))">{{$t('批量输入')}}</el-button>
+                <el-button type="primary" @click="handlerClick('correction',$t('理货纠错'))">{{$t('理货纠错')}}</el-button>
+                <el-button type="primary" @click="handlerClick('correctionOrder',$t('批量理货纠错'))">{{$t('批量理货纠错')}}</el-button>
+              </template>
+            </div>
+            
           </el-row>
           <el-row style="margin-top: 5px">
             <el-table border :data="tallyList" @select="checkboxSelect" @select-all="checkboxSelect" max-height="600px">
@@ -123,13 +135,83 @@
       append-to-body
       @cancel="currentTurnExceptionOrder=null"
       @success="currentTurnExceptionOrder=null" />
+    <!-- 对话框 -->
+    <el-dialog custom-class="shipping-dialog" :title="dialogConfig.title" :visible.sync="dialogConfig.dialogVisible" :fullscreen="dialogConfig.fullscreen" :width="dialogConfig.width" :modal-append-to-body=false append-to-body>
+      <!-- 装柜纠错 -->
+      <template v-if="dialogConfig.type === 'correction' && dialogConfig.dialogVisible">
+        <el-form ref="correctionForm" :rules="rules" :model="correctionObj" label-position="top">
+          <el-form-item :label="$t('装柜纠错（二维码/条形码编号）')" prop="qrCode">
+            <el-input v-model="correctionObj.qrCode" :placeholder="$t('请输入二维码/条形码编号')" clearable />
+          </el-form-item>
+        </el-form>
+        <el-row class="operate-button">
+          <el-button type="primary" @click="onSubmit('correctionForm')">{{$t('提交')}}</el-button>
+          <el-button @click="closeDialog2">{{$t('取消')}}</el-button>
+        </el-row>
+      </template>
+      <!-- 批量装柜纠错（订单号） -->
+      <template v-if="dialogConfig.type === 'correctionOrder' && dialogConfig.dialogVisible">
+        <el-form ref="orderForm" :rules="rules" :model="orderObj" label-position="top">
+          <el-form-item :label="$t('装柜纠错') +'（' + $t('订单号') + '）'" prop="orderNo">
+            <el-input type="textarea" :rows="3" v-model="orderObj.orderNo" :placeholder="$t('请输入，多个以逗号分隔')" clearable />
+          </el-form-item>
+        </el-form>
+        <el-row class="operate-button">
+          <el-button type="primary" @click="onSubmit('orderForm')">{{$t('提交')}}</el-button>
+          <el-button @click="closeDialog2">{{$t('取消')}}</el-button>
+        </el-row>
+      </template>
+      <!-- 装柜批量输入 -->
+      <template v-if="dialogConfig.type === 'batchInput' && dialogConfig.dialogVisible">
+        <el-form ref="batchForm" :rules="rules" :model="batchObj">
+          <el-form-item label="" prop="qrCode" class="two-element">
+            <el-input v-model="batchObj.qrCode" :placeholder="$t('请输入订单号')" clearable />
+            <el-button style="marginLeft:10px;" type="primary" @click="queryOrderInfo">{{$t('确定')}}</el-button>
+          </el-form-item>
+
+          <el-row>
+            <el-col :span="12">
+              <el-form-item :label="$t('订单号')">
+                {{boxOrderInfo.orderNo}}
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item :label="$t('箱数')">
+                <el-input-number v-if="boxOrderInfo.isExternalWarehouse === 1" v-model="batchObj.boxNum" :min="0" :max="boxOrderInfo.num" />
+                <template v-else>
+                  {{boxOrderInfo.num}}
+                </template>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="12">
+              <el-form-item :label="$t('方数')">
+                {{getTotlContent(boxOrderInfo, ['volume'])}}
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item :label="$t('重量')">
+                {{getTotlContent(boxOrderInfo, ['weight'])}}
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+        </el-form>
+        <el-row class="operate-button">
+          <el-button type="primary" :disabled="boxOrderInfo.orderId ? false : true" @click="batchLoad">{{$t('提交')}}</el-button>
+          <el-button @click="closeDialog2">{{$t('取消')}}</el-button>
+        </el-row>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import batchTally from "./batchTally.vue";
 import { getTallyList, tallyRemove, tallyCommit } from "@/api/ecw/boxSea";
-import { formatDate, serviceMsg } from "../../utils";
+import { formatDate, serviceMsg, getTotlContent } from "../../utils";
 import WarehouseDetail from "./warehouseDetail";
 import {getOrder, orderSpecialNeed} from "@/api/ecw/order";
 import Exception from "@/views/ecw/box/components/Exception.vue";
@@ -163,7 +245,27 @@ export default {
         fullscreen: false,
       },
       // 当前转异订单
-      currentTurnExceptionOrder: null
+      currentTurnExceptionOrder: null,
+      // 二维码/条码编号
+      qrCode: "",
+      // 批量输入
+      batchObj: {
+        boxNum: 0,
+      },
+      // 批量纠错（订单号）
+      orderObj: {},
+      // 纠错
+      correctionObj: {},
+      // 弹窗配置
+      dialogConfig: {
+        title: "",
+        dialogVisible: false,
+        width: "30%",
+        type: "",
+        fullscreen: false,
+      },
+      // 订单信息
+      boxOrderInfo: {},
     };
   },
   created() {
@@ -172,6 +274,7 @@ export default {
   methods: {
     // 格式化日期
     formatDate,
+    getTotlContent,
     //去重
     notset(string){
       if(!string) return string
@@ -357,6 +460,31 @@ export default {
         this.showWarehouseInItemId = row.orderItemId;
       });
     },
+    /** 点击事件统一入口 */
+    handlerClick(type, title) {
+      this.shwoDialog({ type, title });
+    },
+    /** 弹窗事件 */
+    shwoDialog(config) {
+      this.$set(this.dialogConfig, "title", config.title);
+      this.$set(this.dialogConfig, "type", config.type);
+      switch (config.type) {
+        case "batchInput":
+          this.$set(this.dialogConfig, "fullscreen", false);
+          this.batchObj = { boxNum: 0 };
+          this.boxOrderInfo = {};
+          break;
+        case "correction":
+          this.$set(this.dialogConfig, "fullscreen", false);
+          this.correctionObj = {};
+          break;
+        case "correctionOrder":
+          this.$set(this.dialogConfig, "fullscreen", false);
+          this.orderObj = {};
+          break;
+      }
+      this.$set(this.dialogConfig, "dialogVisible", true);
+    },
   },
   computed: {
     /* 获取仓库 */
@@ -371,4 +499,19 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.table-title {
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+  > div:first-child {
+    flex: 1;
+    font-size: 16px;
+  }
+  > div:last-child {
+    display: flex;
+    > .el-input {
+      margin-right: 10px;
+    }
+  }
+}
 </style>