Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter

src/views/collect/IoSplitFifoCodePanel.vue

@@ -456,7 +456,7 @@
       </el-tab-pane>
       <el-tab-pane>
         <span slot="label"> {{ currentRow.cpmctymc }}-拆零明细</span>
-        <el-form v-if="queryList5 && queryList5.length > 0" :inline="true" :model="resultQuery" class="query-form"
+        <el-form v-if="queryList5 && queryList5.length > 0" :inline="true" :model="codeQuery" class="query-form"
                  size="mini">
           <el-row style=" display:flex;  flex-wrap: wrap; ">
             <template v-for="(item, index) in queryList5">
@@ -937,6 +937,27 @@ export default {
           this.apartTotal = res.data.total || 0
         })
     },
+    onResultSubmit() {
+      this.resultQuery = {
+        code: this.resultQuery.code,
+        relId: this.currentRow.relId,
+        batchNo: this.currentRow.batchNo,
+        workPlaceCode: this.currentRow.workPlaceCode,
+        page: 1,
+        limit: 10
+      }
+      this.getResultDetailList()
+    },
+    onResultReset() {
+      this.resultQuery = {
+        relId: this.currentRow.relId,
+        batchNo: this.currentRow.batchNo,
+        workPlaceCode: this.currentRow.workPlaceCode,
+        page: 1,
+        limit: 10
+      }
+      this.getResultDetailList()
+    },
     onCodeResultSubmit() {
       this.codeQuery = {
         code: this.codeQuery.code,