Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z

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,
@@ -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();
     },
@@ -573,7 +580,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 +673,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;

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
@@ -19,7 +19,10 @@
         ></fifoPanel>
       </el-tab-pane> 
       
-    </el-tabs>
+    </el-tabs>-->
+    <fifoPanel
+      :workPlaceCode="workPlaceCode"
+    ></fifoPanel>
     
 
   </div>