From 528e5477b924f53bd6785533921107482e3f85d9 Mon Sep 17 00:00:00 2001
From: zane <zane0312@foxmail.com>
Date: Fri, 30 Aug 2024 11:23:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E6=95=B4=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/IoSplitFifoCodePanel.vue | 14 +++++++-------
 src/views/collect/ioSplitFifoCode.vue      | 13 ++++++++-----
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/views/collect/IoSplitFifoCodePanel.vue b/src/views/collect/IoSplitFifoCodePanel.vue
index ce83d15a..fd1b9612 100644
--- a/src/views/collect/IoSplitFifoCodePanel.vue
+++ b/src/views/collect/IoSplitFifoCodePanel.vue
@@ -461,11 +461,11 @@ import ioSplitFifoCodeRemindSetDialog from "./ioSplitFifoCodeRemindSetDialog.vue
 export default {
   name: "IoSplitFifoCodePanel",
   props: {
-    panelType: {
-      type: Object,
-      default: 1,
-      required: true
-    },
+    // panelType: {
+    //   type: Object,
+    //   default: 1,
+    //   required: true
+    // },
     workPlaceCode: {
       type: Number,
       default: null,
@@ -573,7 +573,7 @@ export default {
 
     getList() {
       this.loading = true;
-      this.filterQuery.fifoSplit = this.panelType
+      // this.filterQuery.fifoSplit = this.panelType
       splitFifoPage(this.filterQuery).then(res => {
         this.loading = false
         this.list = res.data.list || []
@@ -666,7 +666,7 @@ export default {
       this.viewType = 1
     }
     this.findWorkPlace(this,"")
-    console.log(this.panelType)
+    // console.log(this.panelType)
     getHead("ioSplitFifoCode", "1").then((re) => {
       // 处理返回的数据
       this.tableObj = re.data;
diff --git a/src/views/collect/ioSplitFifoCode.vue b/src/views/collect/ioSplitFifoCode.vue
index 749bb7b7..570b6b0e 100644
--- a/src/views/collect/ioSplitFifoCode.vue
+++ b/src/views/collect/ioSplitFifoCode.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
 
-    <el-tabs type="border-card" style="margin: 15px">
+    <!-- <el-tabs type="border-card" style="margin: 15px">
 
       <el-tab-pane label="拆零库存">
         <fifoPanel
@@ -17,10 +17,13 @@
           :panelType="2"
           :workPlaceCode="workPlaceCode"
         ></fifoPanel>
-      </el-tab-pane>
-
-    </el-tabs>
-
+      </el-tab-pane> 
+      
+    </el-tabs>-->
+    <fifoPanel
+      :workPlaceCode="workPlaceCode"
+    ></fifoPanel>
+    
 
   </div>
 </template>

From 4304ad6c0d83f1e4ff2d8a7a5d33025c323b5d28 Mon Sep 17 00:00:00 2001
From: zane <zane0312@foxmail.com>
Date: Fri, 30 Aug 2024 11:45:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=E5=88=86=E9=A1=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/IoSplitFifoCodePanel.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/views/collect/IoSplitFifoCodePanel.vue b/src/views/collect/IoSplitFifoCodePanel.vue
index fd1b9612..e97d96b2 100644
--- a/src/views/collect/IoSplitFifoCodePanel.vue
+++ b/src/views/collect/IoSplitFifoCodePanel.vue
@@ -562,7 +562,14 @@ export default {
       this.showSearch = !this.showSearch;
     },
     onReset() {
-      this.filterQuery = {};
+      this.filterQuery = {
+        fifoSplit: null,
+        workPlaceCode: null,
+        code: null,
+        billNo: null,
+        page: 1,
+        limit: 10,
+      };
       this.actDateRange = [];
       this.getList();
     },