From e6e3ff9166c219af461bad39edf0019db7c65315 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 29 十月 2025 15:05:36 +0800
Subject: [PATCH] 外购成品报检相关问题调整

---
 src/views/business/inspectionTask/index.vue |   37 ++++++++++++++++++++++++++++++-------
 1 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/src/views/business/inspectionTask/index.vue b/src/views/business/inspectionTask/index.vue
index 29e15e7..246b94b 100644
--- a/src/views/business/inspectionTask/index.vue
+++ b/src/views/business/inspectionTask/index.vue
@@ -3,6 +3,11 @@
     <div style="height: 100%">
       <div class="search">
         <el-form :model="queryParams" ref="queryParams" size="small" :inline="true">
+          <el-form-item label="鎵瑰彿" prop="updateBatchNo" v-if="tabIndex!==0">
+            <el-input v-model="queryParams.updateBatchNo" clearable placeholder="璇疯緭鍏�" size="small"
+                      @keyup.enter.native="refreshTable()">
+            </el-input>
+          </el-form-item>
           <el-form-item label="濮旀墭缂栧彿" prop="entrustCode">
             <el-input v-model="queryParams.entrustCode" clearable placeholder="璇疯緭鍏�" size="small"
                       @keyup.enter.native="refreshTable()"></el-input>
@@ -19,7 +24,7 @@
           </el-form-item>
         </el-form>
       </div>
-      <div class="center">
+      <div class="center" v-loading="tableLoading">
         <div class="center-options">
           <div style="display: flex; align-items: center">
             <span style="font-size: 14px">璇曢獙瀹ょ绫�:</span>
@@ -38,7 +43,7 @@
             <span>{{ page.total }}</span>
           </div>
         </div>
-        <lims-table :tableData="tableData" :column="column" :page="page" :tableLoading="tableLoading"
+        <lims-table :tableData="tableData" :column="column" :page="page"
           :rowClassName="rowClassName" :height="'calc(100vh - 300px)'" @pagination="pagination"
           key="tableData0">
           <div slot="action" slot-scope="scope">
@@ -61,9 +66,10 @@
                 )"
                        @click="handleConnect(scope.row)">浜ゆ帴</el-button>
             <el-button type="text" size="small" @click="viewInspectInfo(scope.row)">鍘熷璁板綍</el-button>
-            <el-popover placement="bottom" trigger="hover" style="margin-left: 6px">
+            <el-popover placement="bottom" trigger="hover" style="margin-left: 6px" :disabled="(scope.row.insState != 3 || scope.row.userName == null ||(scope.row.userName && !scope.row.userName.includes(nickName)))">
               <template #reference>
-                <el-button link type="text" size="small">鏇村</el-button>
+                <el-button link type="text" size="small" :disabled="(scope.row.insState != 3 || scope.row.userName == null ||
+                  (scope.row.userName && !scope.row.userName.includes(nickName)))">鏇村</el-button>
               </template>
               <div>
                 <el-button :disabled="(scope.row.insState != 3 || scope.row.userName == null ||
@@ -140,7 +146,7 @@
           </el-form>
         </div>
         <lims-table :tableData="lookTableData" :column="lookColumn" :page="lookPage" :tableLoading="lookTableLoading"
-          :height="'60vh'" @pagination="lookPagination" key="tableData1"></lims-table>
+          :height="'60vh'" @pagination="lookPagination" key="tableData1" :key="upIndex"></lims-table>
       </div>
     </el-dialog>
     <el-dialog :visible.sync="bindDialogVisible" title="妫�楠岄」缁戝畾" width="600px">
@@ -279,6 +285,7 @@
       tabList: [
         { label: "濮旀墭", value: 0 },
         { label: "鍘熸潗鏂�", value: 1 },
+        { label: "澶栬喘", value: 2 },
       ],
       active: 1,
       tabIndex: 0,
@@ -342,6 +349,11 @@
       inspectionTaskState: [],
       tableData: [],
       column: [
+        {
+          label: "鎵瑰彿",
+          prop: "updateBatchNo",
+          width: "120px",
+        },
         {
           label: "濮旀墭缂栧彿",
           prop: "entrustCode",
@@ -539,6 +551,8 @@
       lookTableLoading: false,
       // 鏁版嵁鏌ョ湅鐩稿叧瀛楁---缁撴潫
       retestVisible: false,
+      upIndex: 0,
+      tabLabel: ''
     };
   },
   mounted() {
@@ -555,7 +569,6 @@
   },
   activated() {
     this.getAuthorizedPerson();
-    this.queryParams.userId = this.userId;
     this.currentTime = getYearAndMonthAndDays();
     this.getDicts("urgency_level").then((response) => {
       this.urgencyLevel = this.dictToValue(response.data);
@@ -597,6 +610,7 @@
           if (res.code === 200) {
             this.lookTableData = res.data.records;
             this.lookPage.total = res.data.total;
+            this.upIndex++
             this.dataDialogVisible = true;
           }
         })
@@ -634,7 +648,14 @@
     },
     refreshTable(e) {
       this.page.current = 1;
-      this.queryParams.typeSource = this.tabIndex;
+      let typeSource = null;
+      if(this.tabIndex===1){
+          typeSource=1
+      }else if(this.tabIndex===2){
+        typeSource = 0
+      }
+      this.queryParams.tabLabel = this.tabLabel;
+      this.queryParams.typeSource = typeSource;
       this.getList();
     },
     // 涓嬭浇鎶ュ憡
@@ -721,6 +742,7 @@
     },
     handleTab(m, i) {
       this.tabIndex = i;
+      this.tabLabel = m.label;
       this.queryParams.sonLaboratory = "";
       this.refreshTable();
     },
@@ -792,6 +814,7 @@
           state: this.state,
           typeSource: this.typeSource,
           orderId: this.orderId,
+          isSplit: row.isSplitOrder
         },
       });
     },

--
Gitblit v1.9.3