沃尔玛装箱数据导入问题

src/api/ecss/ecss.js

@@ -110,6 +110,8 @@ export const updateDetailInfo = data => createAPI(`/ecss/coDel/updateDetailInfo`
 export const deleteDetailInfo = data => createAPI(`/ecss/coDel/deleteDetailInfo`,'post',data)
 // 批量修改装箱明细
 export const batchUpdatePackingInfo = data => createAPI(`/ecss/coDel/batchUpdatePackingInfo`,'post',data)
+// 批量删除箱
+export const batchDeleteBoxes = data => createAPI(`/ecss/coDel/batchDeleteBoxes`,'post',data)
 // 调整总毛重
 export const adjustTotalGrossWeight = data => createAPI(`/ecss/coDel/adjustTotalGrossWeight`,'post',data)
 

src/utils/export-options.js

@@ -1,32 +1,20 @@
 const PalletSku = {
     columnMapping: [
       {
-        columnProp: "seqNo",
+        columnProp: "item_no",
         columnLabel: "序号",
       },
-      {
-        columnProp: "cmcInvoice",
-        columnLabel: "发票号",
-      },
       {
         columnProp: "boxQty",
         columnLabel: "箱数",
       },
       {
-        columnProp: "grossWeight",
-        columnLabel: "毛重",
-      },
-      {
-        columnProp: "netWeight",
-        columnLabel: "净重",
-      },
-      {
-        columnProp: "customerPO",
-        columnLabel: "PO",
+        columnProp: "pn",
+        columnLabel: "SKU",
       },
       {
-        columnProp: "pn",
-        columnLabel: "PN",
+        columnProp: "salesOrder",
+        columnLabel: "SO",
       },
       {
         columnProp: "qty",
@@ -37,12 +25,12 @@ const PalletSku = {
         columnLabel: "Rolls",
       },
       {
-        columnProp: "shippingMode",
-        columnLabel: "运输方式",
+        columnProp: "grossWeight",
+        columnLabel: "毛重",
       },
       {
-        columnProp: "destination",
-        columnLabel: "客户目的地",
+        columnProp: "cmcInvoice",
+        columnLabel: "发票号",
       },
     ],
     mergeSetting: {

src/views/modules/ecss/codelnotifyConfirm.vue

@@ -161,12 +161,12 @@
       </el-tab-pane>
 
       <el-tab-pane label="手工装箱" name="box">
-        <el-button @click="oneClickPacking()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'一键装箱'}}</el-button>
-        <el-button @click="upLoadPallet()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'导入装箱单'}}</el-button>
-        <el-button @click="newPalletModel()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'装箱'}}</el-button>
-        <el-button @click="openMergeBoxDialog()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'批量装箱'}}</el-button>
+<!--        <el-button @click="oneClickPacking()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'一键装箱'}}</el-button>
+        <el-button @click="newPalletModel()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'装箱'}}</el-button>-->
+        <el-button @click="openMergeBoxDialog()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'装箱'}}</el-button>
         <el-button @click="palletMaintenance()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'栈板维护'}}</el-button>
         <el-button @click="exportExcel()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'导出装箱数据'}}</el-button>
+        <el-button @click="upLoadPallet()" type="success" style="margin-left: 2px;margin-top: 0px">{{'导入装箱单'}}</el-button>
         <el-table ref="detailTable"
           :data="dataList4"
           :height="height"
@@ -601,13 +601,13 @@
           </el-table-column>
 
           <!-- 明细信息列（不合并） -->
-          <el-table-column label="PO" prop="poNo" min-width="120" align="left">
+          <el-table-column label="PO" prop="poNo" min-width="120" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.poNo || '-' }}</span>
             </template>
           </el-table-column>
 
-          <el-table-column label="PN" prop="pn" min-width="120" align="left">
+          <el-table-column label="PN" prop="pn" min-width="120" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.pn || '-' }}</span>
             </template>
@@ -703,7 +703,7 @@
         </div>
       </div>
       <el-footer style="height:40px;margin-top: 10px;text-align:center">
-        <el-button type="primary" @click="savePalletMaintenance()">确定</el-button>
+        <el-button type="primary" :loading="saveLoading" :disabled="saveLoading"  @click="savePalletMaintenance()">确定</el-button>
         <el-button type="primary" @click="palletMaintenanceModelFlag=false">关闭</el-button>
       </el-footer>
     </el-dialog>
@@ -909,6 +909,7 @@
 
         // 栈板维护相关
         palletMaintenanceModelFlag: false,
+        saveLoading: false,
         palletMaintenanceRecords: [],
         palletModelFlag:false,
         palletEditFlag:false,
@@ -4217,7 +4218,7 @@
             return false
           }
         }
-
+        this.saveLoading = true
         // 这里只新增栈板记录，不做其他事情
         let saveData = {
           site: this.currentRow.site,
@@ -4238,11 +4239,18 @@
               duration: 1500,
               onClose: () => {}
             })
+            this.saveLoading = false
           } else {
             this.$alert(data.msg, '错误', {
               confirmButtonText: '确定'
             })
+            this.saveLoading = false
           }
+        }).catch((error) => {
+          console.error('保存失败:', error)
+          this.$message.error('保存失败，请重试')
+        }).finally(() => {
+          this.saveLoading = false
         })
       },
       getSummaries(param) {

src/views/modules/ecss/pallet_upload_excel.vue

@@ -204,7 +204,7 @@
 
         updateExportFlag(updateData).then(({data}) => {
           if (data.code === 0) {
-            console.info('更新采购:');
+            console.info('更新成功:');
           }
         }).catch(error => {
           this.$message.warning('导出成功，但更新导出状态失败');