From 4633d12cd534c9e991f6e2bd256c192fbe687199 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E9=A3=9E?= <guofei2922@boe.com.cn>
Date: Fri, 14 Mar 2025 16:35:25 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/StockIn/index.ts                               |  2 +-
 src/api/StockOut/index.ts                              |  2 +-
 .../Query/BasicQuery/materialBoxStockedQuery/index.vue | 10 +++++++++-
 src/views/stockOut/shipRequestReserve/index.vue        |  6 +++---
 src/views/stocked/NoOrMoveLibrary/index.vue            |  3 ++-
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/api/StockIn/index.ts b/src/api/StockIn/index.ts
index 72bb20c..fe56053 100644
--- a/src/api/StockIn/index.ts
+++ b/src/api/StockIn/index.ts
@@ -94,7 +94,7 @@ export function PurInSendERPByCharge(ChangeParams: any) {
 
 export function CommitMove(ChangeParams: any) {
   return request({
-      url: '/api/location/CommitMove2',
+      url: '/api/api/location/CommitMove2',
       method: 'post',
       data: ChangeParams,
   });
diff --git a/src/api/StockOut/index.ts b/src/api/StockOut/index.ts
index 16187df..fb2c6ef 100644
--- a/src/api/StockOut/index.ts
+++ b/src/api/StockOut/index.ts
@@ -109,7 +109,7 @@ export function Commit4CToERP(data: any) {
  * */
 export function RejectsAndExpCheck(data: any) {
   return request({
-    url: '/api/api/SaleOut/RejectsAndExpCheck',
+    url: '/api/SaleOut/RejectsAndExpCheck',
     method: 'post',
     data: data,
   });
diff --git a/src/views/Query/BasicQuery/materialBoxStockedQuery/index.vue b/src/views/Query/BasicQuery/materialBoxStockedQuery/index.vue
index 3730543..3779e98 100644
--- a/src/views/Query/BasicQuery/materialBoxStockedQuery/index.vue
+++ b/src/views/Query/BasicQuery/materialBoxStockedQuery/index.vue
@@ -564,6 +564,14 @@
             })
   }
   function exportExcel() {
+    let paramsObjet = state.queryParams.params;
+    const parmlist = Object.keys(paramsObjet).filter((key: any) => key !== 'SITENAME')
+    const allEmpty = parmlist.every(el => !(paramsObjet as any)[el] || (paramsObjet as any)[el] == '')
+    if(allEmpty) {
+      proxy.$ElMessage.warning('最少有一个查询条件！');
+      return;
+    }
+    
     state.queryParams.version = 'WEB00033'
     getQueryList(state.queryParams).then((res: any) => {
       if (res.data.length > 0) {
@@ -572,7 +580,7 @@
         proxy.$ElMessage.warning('当前查询没有数据可以导出');
       }
     });
-  }
+  }		
 
   const getSummaries = (param: any) => {
     const { columns, data } = param
diff --git a/src/views/stockOut/shipRequestReserve/index.vue b/src/views/stockOut/shipRequestReserve/index.vue
index e1ba6e7..4aadacd 100644
--- a/src/views/stockOut/shipRequestReserve/index.vue
+++ b/src/views/stockOut/shipRequestReserve/index.vue
@@ -77,8 +77,8 @@
               </el-row>
             <el-table :height="tableHeight" border v-loading="loading" :data="state.MaterialPackingList" highlight-current-row row-key="id"
             style="width: 100%;min-height:50px" @selection-change="handleSelectionChange2">
-            <el-table-column type="index" width="50" />  
             <el-table-column fixed="left" type="selection" width="40" :selectable="selectable" :reserve-selection="false" />
+            <el-table-column type="index" width="50" />  
               <template v-for="(col, index) in column1" :key="index">
                 <el-table-column v-if="!col.hide" :label="col.header" show-overflow-tooltip>
                   <template #default="scope">
@@ -116,8 +116,8 @@
             </div>
             <el-table :height="tableHeight" border v-loading="loading" :data="state.MaterialPackingUsername" highlight-current-row
               row-key="id" style="width: 100%;min-height:50px" @selection-change="handleSelectionChange">
-              <el-table-column type="index" width="50" />
               <el-table-column fixed="left" type="selection" width="50" />
+              <el-table-column type="index" width="50" />
               <el-table-column prop="MATERIALQUANTITY2" label="本次发货数量" width="140">
                 <template #default="scope">
                   <el-input v-model="scope.row.MATERIALQUANTITY2" min = 0  type =number style="width: 140px">
@@ -476,7 +476,7 @@ function searchFn() {
   handleQuery()
 }
 function tableRowClassName({ row, rowIndex }) {
-  console.log(11,row, rowIndex)
+  // console.log(11,row, rowIndex)
   row.iIndex = rowIndex
 }
 async function handleQuery() {
diff --git a/src/views/stocked/NoOrMoveLibrary/index.vue b/src/views/stocked/NoOrMoveLibrary/index.vue
index c771181..14ceabf 100644
--- a/src/views/stocked/NoOrMoveLibrary/index.vue
+++ b/src/views/stocked/NoOrMoveLibrary/index.vue
@@ -751,6 +751,7 @@ function changeNum(row: any) {
   }, 0)
 }
 function handleSelectionChange(selection: any) {
+  console.log(selection)
   state.column4 = selection
   let sumList = [...state.column4];
   state.BQSUM = 0
@@ -759,7 +760,7 @@ function handleSelectionChange(selection: any) {
      return (cals.add(accumulator,currentValue.SPLITQUANTITY)).toNumber();
   }, 0)
   state.GSSUM = sumList.length
-  console.log(state.column4)
+ 
   if (state.column4.length > 0) {
     StorageList(state.column4[0].ERPFACTORY)
   }