From bdd5bbc58a2e6987eec63097cfb36c690ce0490b Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期一, 24 二月 2025 10:52:53 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev

---
 src/views/business/inspectionTask/inspection.vue |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue
index a633db3..9b70b4e 100644
--- a/src/views/business/inspectionTask/inspection.vue
+++ b/src/views/business/inspectionTask/inspection.vue
@@ -94,8 +94,8 @@
           </el-radio-group>
         </div>
         <div style="display: flex; align-items: center">
-          <el-button v-if="state === 1" size="small" type="primary" @click="openAddUnpass">鏂板涓嶅悎鏍煎娴�</el-button>
-          <el-button v-if="state === 1" size="small" type="primary" @click="unpassCheck">涓嶅悎鏍煎娴�</el-button>
+          <el-button v-if="state == 1" size="small" type="primary" @click="openAddUnpass">鏂板涓嶅悎鏍煎娴�</el-button>
+          <el-button v-if="state == 1" size="small" type="primary" @click="unpassCheck">涓嶅悎鏍煎娴�</el-button>
           <el-button v-if="state > 1" size="small" type="primary" @click="viewUnpassCheck">鏌ョ湅涓嶅悎鏍煎娴�</el-button>
           <span v-if="cableTagList.length > 0">&nbsp;&nbsp;鐢电紗閰嶇疆锛�</span>
           <el-select v-if="cableTagList.length > 0" v-model="currentTab" clearable placeholder="璇烽�夋嫨" size="small"
@@ -508,9 +508,9 @@
       @resetAddUnPass="resetAddUnPass"></add-un-pass>
     <UnPassDialog v-if="unPassDialog" ref="unPassDialog" :orderId="orderId" :unPassDialog="unPassDialog"
       @resetForm="resetForm"></UnPassDialog>
-    <!-- <InspectionWord v-if="unPassCheck" :inspectorList="inspectorList" :orderId="orderId"
+    <InspectionWord v-if="unPassCheck" :inspectorList="inspectorList" :orderId="orderId"
       :rawMaterialTag="rawMaterialTag" :sonLaboratory="sonLaboratory" :state="state" :typeSource="typeSource"
-      :unPassCheck="unPassCheck" @closeUnPassCheckDialog="closeUnPassCheckDialog" @refreshView="refreshView" /> -->
+      :unPassCheck="unPassCheck" @closeUnPassCheckDialog="closeUnPassCheckDialog" @refreshView="refreshView" />
     <purchase-verification v-if="purchaseDialog" ref="purchaseDialog" :orderId="orderId"
       :purchaseDialog="purchaseDialog" @resetPurchaseDialog="resetPurchaseDialog"></purchase-verification>
   </div>
@@ -521,7 +521,7 @@
 import limsTable from "@/components/Table/lims-table.vue";
 import UnPassDialog from "../unpass/components/addUnPass.vue";
 import AddUnPass from "../unpass/components/addUnPass.vue";
-// import InspectionWord from "./components/InspectionWord.vue";
+import InspectionWord from "./components/InspectionWord.vue";
 import PurchaseVerification from "../unpass/components/PurchaseVerification.vue";
 import {
   doInsOrder,
@@ -546,13 +546,15 @@
 import DataWorker from '../../../DataWorker.worker';
 import html2canvas from "html2canvas";
 import { mapGetters } from "vuex";
+import { getToken } from "@/utils/auth";
 export default {
+  name: 'inspection',
   components: {
     PurchaseVerification,
     AddUnPass,
     limsTable,
     UnPassDialog,
-    // InspectionWord,
+    InspectionWord,
   },
   data() {
     return {
@@ -770,7 +772,7 @@
     ...mapGetters(["userId"]),
     headers() {
       return {
-        token: sessionStorage.getItem("token"),
+        'Authorization': "Bearer " + getToken()
       };
     },
     action() {

--
Gitblit v1.9.3