From fc2b573fe6ec700eac77c05fa76699c1ddaa59c7 Mon Sep 17 00:00:00 2001
From: xiaofajia <1665375861@qq.com>
Date: Fri, 25 Oct 2024 17:13:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tickets/Components/TicketManagerItem.vue       |  4 ++--
 .../repair/tickets/Components/TicketWaresShow.vue  | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/repair/tickets/Components/TicketManagerItem.vue b/src/views/repair/tickets/Components/TicketManagerItem.vue
index c898b0a..768d910 100644
--- a/src/views/repair/tickets/Components/TicketManagerItem.vue
+++ b/src/views/repair/tickets/Components/TicketManagerItem.vue
@@ -63,7 +63,7 @@
           <el-button size="mini"
                      v-if=" scope.row.ticketsWorkStatus !== '01' && userRole === 'repair_staff' && !isFinish && nowUser.id === scope.row.nowRepairId"
                      type="text" icon="el-icon-monitor" @click="handleRecord(scope.row, 'sgz')">
-            过程记录
+            过程记录{{scope.row.ticketsWorkStatus !== '01' && ((userRole === 'service_advisor' || userRole === 'general_inspection') && !isFinish)}}
           </el-button>
           <el-button size="mini"
                      v-if="scope.row.ticketsWorkStatus !== '01' && userRole === 'repair_staff' && !isFinish && nowUser.id === scope.row.nowRepairId"
@@ -78,7 +78,7 @@
             重新指派
           </el-button>
           <el-dropdown
-            v-if="scope.row.ticketsWorkStatus !== '01' && ((userRole === 'service_advisor' || userRole === 'general_inspection') && !isFinish)"
+            v-if="(scope.row.ticketsWorkStatus !== '01' && ((userRole === 'service_advisor' || userRole === 'general_inspection') && !isFinish)) || (userRole === 'repair_staff' && !isFinish && scope.row.ticketsWorkStatus !== '01')"
             @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">
diff --git a/src/views/repair/tickets/Components/TicketWaresShow.vue b/src/views/repair/tickets/Components/TicketWaresShow.vue
index 112e9d0..a65565d 100644
--- a/src/views/repair/tickets/Components/TicketWaresShow.vue
+++ b/src/views/repair/tickets/Components/TicketWaresShow.vue
@@ -168,12 +168,12 @@
             <el-table-column label="规格" align="center" prop="wares.model" width="180"/>
             <el-table-column label="数量" align="center" prop="waresCount" width="180"/>
             <el-table-column v-if="userRole === 'service_advisor' && type" label="折扣" align="center" prop="itemDiscount" width="180">
-              <div v-if="formData.status === '01'"  class="item" slot-scope="scope">
-<!--                <el-input @blur="save(scope.row)" class="item__input" v-model="scope.row.itemDiscount"/>-->
-                <DiscountInput @input-blur="save(scope.row)" class="item__input" v-model="scope.row.itemDiscount" />
-                <span class="item__txt">{{ scope.row.itemDiscount === 1 ? "无折扣" : scope.row.itemDiscount }}</span>
-              </div>
-              <div v-else slot-scope="scope">
+<!--              <div v-if="formData.status === '01'"  class="item" slot-scope="scope">-->
+<!--&lt;!&ndash;                <el-input @blur="save(scope.row)" class="item__input" v-model="scope.row.itemDiscount"/>&ndash;&gt;-->
+<!--                <DiscountInput @input-blur="save(scope.row)" class="item__input" v-model="scope.row.itemDiscount" />-->
+<!--                <span class="item__txt">{{ scope.row.itemDiscount === 1 ? "无折扣" : scope.row.itemDiscount }}</span>-->
+<!--              </div>-->
+              <div slot-scope="scope">
                 <span>{{ scope.row.itemDiscount === 1 ? "无折扣" : scope.row.itemDiscount }}</span>
               </div>
             </el-table-column>
@@ -221,7 +221,7 @@ export default {
       loading: false,
       formData: {},
       clickCellMap: {},
-      editProp: ['itemDiscount'],
+      editProp: [],
     }
   },
   methods:{