From d2e867966539004b6b5a73ae3566a659ac6f8b6d Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 30 十月 2025 11:55:34 +0800
Subject: [PATCH] 检验任务数据分类查询问题修复

---
 src/views/business/inspectionTask/components/InspectionWord.vue |   36 +++++++++++++++++++++---------------
 1 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/views/business/inspectionTask/components/InspectionWord.vue b/src/views/business/inspectionTask/components/InspectionWord.vue
index 620a42f..e4095f4 100644
--- a/src/views/business/inspectionTask/components/InspectionWord.vue
+++ b/src/views/business/inspectionTask/components/InspectionWord.vue
@@ -17,8 +17,8 @@
             </el-radio-group>
           </div>
           <div style="display: flex;align-items: center;">
-            <span v-if="typeSource == '1'">&nbsp;&nbsp;澶嶆祴娆℃暟锛�</span>
-            <el-select v-if="typeSource == '1'" v-model="retestTag" placeholder="璇烽�夋嫨" size="small"
+            <span>&nbsp;&nbsp;澶嶆祴娆℃暟锛�</span>
+            <el-select v-model="retestTag" placeholder="璇烽�夋嫨" size="small"
               @change="m => handleChangeCableTag(currentSample.id, 4, 'cableTag', m)">
               <el-option v-for="item in unPassNumList" :key="item.retestTag" :label="item.retestTag"
                 :value="item.retestTag">
@@ -207,7 +207,7 @@
                 <td>{{ m.name }}</td>
                 <td style="text-align: left;">
                   <el-checkbox-group v-model="getDataIndex" :max="m.maxNum">
-                    <el-checkbox v-for="(n, j) in m.arr" :key="j" :label="j">{{ n }}</el-checkbox>
+                    <el-checkbox v-for="(n, j) in m.arr" :key="j" :label="j" >{{ n }}</el-checkbox>
                   </el-checkbox-group>
                 </td>
               </tr>
@@ -253,8 +253,10 @@
   verifyPlan
 } from "@/api/business/inspectionTask";
 import { getUserNow, saveUnqualifiedContext } from "@/api/business/rawMaterialOrder";
+import InspectionWorker from '@/workers/InspectionWorker.worker';
+import DataWorker from '@/workers/DataWorker.worker';
 export default {
-  props: ['sonLaboratory', 'orderId', 'state', 'inspectorList', 'typeSource', 'unPassCheck', 'rawMaterialTag'],
+  props: ['sonLaboratory', 'orderId', 'state', 'inspectorList', 'typeSource', 'unPassCheck', 'rawMaterialTag','cableTag', 'repetitionTag'],
   components: {
     AddUnPass,
     UnPassDialog
@@ -427,7 +429,7 @@
       getDataTypeId: '',
       getDataType: null,
       unPassDialog: false, // 涓嶅悎鏍煎鐞嗗脊妗�
-      retestTag: '', // 澶嶆祴娆℃暟
+      retestTag: '1', // 澶嶆祴娆℃暟
       addCheck: false, // 鎸囧畾瀹℃牳浜哄憳寮规
       checkUser: '',
       type: '',
@@ -514,7 +516,7 @@
             }
           }
         })
-        await this.determineWhetherToCollectData()//鏄惁闇�瑕佹暟閲�
+        // await this.determineWhetherToCollectData()//鏄惁闇�瑕佹暟閲�
         if (this.currentSample.index == undefined) this.currentSample['index'] = 1
         let bushing = this.currentSample.bushing
         this.getTableLists();//澶勭悊妯℃澘鍒楄〃淇℃伅
@@ -817,12 +819,12 @@
         this.stopWorker(); // 纭繚涔嬪墠鐨� Worker 宸插仠姝�
       }
       // 鍒涘缓 Worker 瀹炰緥
-      this.worker = new Worker('/static/js/worker.js');
+      this.worker = new InspectionWorker();
       if (this.worker0) {
         this.stopWorker(); // 纭繚涔嬪墠鐨� Worker 宸插仠姝�
       }
       // 鍒涘缓 Worker 瀹炰緥
-      this.worker0 = new Worker('/static/js/worker0.js');
+      this.worker0 = new DataWorker();
     },
     // 鍋滄澶氱嚎绋�
     stopWorker() {
@@ -846,8 +848,11 @@
         laboratory: this.sonLaboratory,
         retestTag: this.retestTag,
         rawMaterialTag: this.rawMaterialTag,
+        repetitionTag: this.repetitionTag,
+        cableTag: this.cableTag,
       }
-      let res = getInsProductUnqualifiedRetest(params)
+      let res = await getInsProductUnqualifiedRetest(params)
+      console.log('res---', res)
       if (res.code === 200 && res.data.length > 0) {
         this.tableLoading = false;
         this.scrollInit()
@@ -1281,7 +1286,8 @@
           }
         })
         // 浠ヤ笅鏄牱寮忓鐞嗛�昏緫
-        set = Array.sort(set)
+        // set = Array.sort(set)
+        set = [...set]
         set.forEach(b => {
           let arr = []
           a.template.forEach(c => {
@@ -1477,10 +1483,10 @@
       }, 200)
     },
     // 鏄惁闇�瑕佹暟閲�
-    async determineWhetherToCollectData() {
-      let res = determineWhetherToCollectData({ managementNumber: '' })
-      this.isGet = res.data
-    },
+    // async determineWhetherToCollectData() {
+    //   let res = determineWhetherToCollectData({ managementNumber: '' })
+    //   this.isGet = res.data
+    // },
     // 鏍规嵁鍚庣浼犲弬鏇存柊椤甸潰鏁版嵁   param => this.tableList[0].insProductResult
     getCurrentInsProduct(pId) {
       if (!this.tableList[0].insProductResult) {
@@ -1919,7 +1925,7 @@
       }
     },
     getAuthorizedPerson() {
-      selectUserCondition({ type: 0 }).then((res) => {
+      selectUserCondition({ type: 1 }).then((res) => {
         let data = [];
         res.data.forEach((a) => {
           data.push({

--
Gitblit v1.9.3