From 0509974c82c022f4e7fa2985251e6b995795bd48 Mon Sep 17 00:00:00 2001
From: xiaofajia <1665375861@qq.com>
Date: Wed, 23 Oct 2024 14:33:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81=EF=BC=8C?=
 =?UTF-8?q?=E6=9A=82=E6=8F=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repair/tickets/Components/TicketManagerItem.vue      | 9 ++++++---
 src/views/repair/tickets/TicketManager.vue               | 3 +++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/views/repair/tickets/Components/TicketManagerItem.vue b/src/views/repair/tickets/Components/TicketManagerItem.vue
index ac2c3c7..9ef33a7 100644
--- a/src/views/repair/tickets/Components/TicketManagerItem.vue
+++ b/src/views/repair/tickets/Components/TicketManagerItem.vue
@@ -70,11 +70,12 @@
 <!--          <el-button @click="handleRecord(scope.row, 'zj')" size="mini" type="text" icon="el-icon-monitor" v-if="userRole === 'general_inspection' && scope.row.ticketsWorkStatus === '05'">-->
 <!--            终检-->
 <!--          </el-button>-->
-          <el-button @click="handleReTake(scope.row)" size="mini" type="text" icon="el-icon-refresh" v-if="(userRole === 'repair_staff' ? leader : false) && !(scope.row.ticketsWorkStatus !== '01' && userRole === 'repair_staff' && !isFinish)">
+          <el-button @click="handleReTake(scope.row)" size="mini" type="text" icon="el-icon-refresh"
+                     v-if="(userRole === 'repair_staff' ? (leader ? !isFinish : false) : false) && !(scope.row.ticketsWorkStatus !== '01' && userRole === 'repair_staff' && !isFinish)">
             重新指派
           </el-button>
           <el-dropdown
-            v-if="scope.row.ticketsWorkStatus !== '01'"
+            v-if="scope.row.ticketsWorkStatus !== '01' && ((userRole === 'service_advisor' || userRole === 'general_inspection') && !isFinish)"
             @command="(command) => handleCommand(command, scope.$index, scope.row)">
             <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
             <el-dropdown-menu slot="dropdown">
@@ -145,7 +146,6 @@ import {getPageType, updateTake, getTicketsById} from "@/api/repair/tickets/Tick
 import TicketsShow from "@/views/repair/tickets/Components/TicketsShow.vue";
 import UpdateRepair from "@/views/repair/tickets/form/UpdateRepair.vue";
 import TWOperate from "@/views/repair/tickets/form/TWOperate.vue";
-import {listTwItem} from "@/api/repair/tickets/TWItem";
 import {createUniqueCodeByHead} from "@/utils/createUniqueCode";
 import {updateTicketWares} from "@/api/repair/tickets/TicketWares";
 import {getIfLeader} from "@/api/repair/repairworker";
@@ -163,6 +163,9 @@ export default {
       type: String,
       default: '',
       required: true
+    },
+    isType:{
+      type: String,
     }
   },
   data() {
diff --git a/src/views/repair/tickets/TicketManager.vue b/src/views/repair/tickets/TicketManager.vue
index ae1ee13..7589f74 100644
--- a/src/views/repair/tickets/TicketManager.vue
+++ b/src/views/repair/tickets/TicketManager.vue
@@ -16,6 +16,9 @@
       <el-tab-pane label="退料确认" name="finishBackWares" v-if="userRole === 'repair_staff'">
         <GetAndBackWares :type="false" />
       </el-tab-pane>
+      <el-tab-pane label="待总检工单" name="unInspection" v-if="userRole === 'general_inspection'">
+        <TicketManagerItem :user-role="userRole" :is-finish="false"/>
+      </el-tab-pane>
 <!--      <el-tab-pane label="退料申请单" name="backApply">-->
 <!--        <TicketWares :type="false" :user-role="userRole"/>-->
 <!--      </el-tab-pane>-->