From b700b592845208c47d6bbe46d25a92def4a49ee8 Mon Sep 17 00:00:00 2001
From: liangzhou <594755172@qq.com>
Date: Mon, 14 Oct 2024 18:44:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0=EF=BC=9A?=
 =?UTF-8?q?=201.=20=E6=95=B4=E7=90=86=E7=9B=92=E5=AD=90=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=A7=E7=9B=92=E5=AD=90=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/kateWork.js      | 12 +++++++++++-
 src/layout/doKitting.vue |  2 +-
 src/layout/sortBoxs.vue  | 35 ++++++++++-------------------------
 3 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/src/api/kateWork.js b/src/api/kateWork.js
index 1ddfb71..d180f4f 100644
--- a/src/api/kateWork.js
+++ b/src/api/kateWork.js
@@ -121,6 +121,15 @@ const genClcKanbanRequirement = (params) => {
   })
 }
 
+const getBigBoxList = (params) => {
+  return request({
+    url: '/kateWork/getBigBoxList',
+    method: 'post',
+    data: params,
+    timeout: 10000
+  })
+}
+
 export {
     getDbs,
     deleteDbs,
@@ -136,5 +145,6 @@ export {
     updateWorkFlows,
     getWorkSummary,
     getClcKanbanByPage,
-    genClcKanbanRequirement
+    genClcKanbanRequirement,
+    getBigBoxList
 }
\ No newline at end of file
diff --git a/src/layout/doKitting.vue b/src/layout/doKitting.vue
index 4bc8e30..982c5bc 100644
--- a/src/layout/doKitting.vue
+++ b/src/layout/doKitting.vue
@@ -320,7 +320,7 @@ export default {
             })
         },
         showStockDealDialog() {
-            this.dialogVisible = true
+            // this.dialogVisible = true
         },
         exceptionHandle() {
             if (this.exceptionHandleFormEntity.vehicleId == '' || this.exceptionHandleFormEntity.goodsId == '') {
diff --git a/src/layout/sortBoxs.vue b/src/layout/sortBoxs.vue
index 6ee7d70..eb2a8e1 100644
--- a/src/layout/sortBoxs.vue
+++ b/src/layout/sortBoxs.vue
@@ -70,22 +70,17 @@
             </div>
             <el-dialog v-model="showBoxListDialogFlag" title="大盒子列表" width="40%" draggable :show-close="true">
                 <el-table :data="bixBoxList" stripe border v-loading="loading" class="table-class"
-                highlight-current-row max-height="650px" @row-click="getCurrentRow"
+                highlight-current-row max-height="350px" @row-click="getCurrentRow"
                 :header-cell-style="{ 'text-align': 'center' }" :cell-style="{ 'text-align': 'center' }">
                 <el-table-column width="65px" fixed="left">
                     <template v-slot="scope">
                         <el-radio :label="scope.row.bigBoxNo" v-model="bigBoxNo">&nbsp;</el-radio>
                     </template>
                 </el-table-column>
-                <el-table-column prop="bigBoxNo" label="大盒子号" fixed="left" min-width="120px" show-overflow-tooltip />
                 <el-table-column prop="standId" label="站台号" min-width="120px" show-overflow-tooltip />
+                <el-table-column prop="bigBoxNo" label="大盒子号" min-width="120px" show-overflow-tooltip />
                 <el-table-column prop="boxQuantity" label="需要数量" min-width="120px" show-overflow-tooltip />
             </el-table>
-            <br />
-            <el-pagination v-model:current-page="currentPage" v-model:page-size="pageSize" :page-sizes="[10, 25, 50]"
-                :small="false" :disabled="false" :background="false" :default-page-size="10"
-                layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="search"
-                @current-change="search" />
             </el-dialog>
         </el-container>
     </el-config-provider>
@@ -94,6 +89,7 @@
 <script setup>
 import store from '@/store'
 import { requestSortBox, requestSumOfBox } from '@/api/task'
+import { getBigBoxList } from '@/api/kateWork'
 import { reactive, ref } from 'vue'
 import { errorBox } from '@/utils/myMessageBox.js'
 import { ElMessage } from 'element-plus'
@@ -117,9 +113,6 @@ export default {
             rules: reactive({}),
             showBoxListDialogFlag: false,
             bixBoxList: [],
-            currentPage: 1,
-            pageSize: 10,
-            total: 0,
             loading: true,
             bigBoxNo: '',
         }
@@ -191,33 +184,25 @@ export default {
             this.bigBoxNo = row.bigBoxNo
         },
         showStockDealDialog() {
-            this.dialogVisible = true
-            // this.search()
+            this.showBoxListDialogFlag = true
+            this.searchBigBox()
         },
-        search() {
+        searchBigBox() {
             this.loading = true
             const request = {
-                pageNo: this.currentPage,
-                pageSize: this.pageSize,
-                standId: this.standIdQuery.trim(),
-                workOrder: this.workOrderQuery.trim(),
-                workCenter: this.workCenterQuery.trim(),
-                goodsId: this.goodsIdQuery.trim(),
-                lackStatus: this.lackStatusQuery == -99 ? null : this.lackStatusQuery,
-                workDate: timeFormatter(this.workDateQuery),
+                standId: this.standId,
                 userName: store.getters.getUserName
             }
-            getWorkSummary(request).then(res => {
+            getBigBoxList(request).then(res => {
                 const tableResponse = res.data
                 if (tableResponse.code == 0) {
-                    this.workSummaryList = tableResponse.returnData.lists
-                    this.total = tableResponse.returnData.total
+                    this.bixBoxList = tableResponse.returnData
                 } else {
                     errorBox(tableResponse.message)
                 }
             }).catch(err => {
                 console.log(err)
-                errorBox('查询工作总结错误')
+                errorBox('查询大盒子列表错误')
             })
             this.loading = false
         },