diff --git a/src/views/repair/tickets/Components/TicketManagerItem.vue b/src/views/repair/tickets/Components/TicketManagerItem.vue
index d17eb05..9e1ce44 100644
--- a/src/views/repair/tickets/Components/TicketManagerItem.vue
+++ b/src/views/repair/tickets/Components/TicketManagerItem.vue
@@ -50,20 +50,23 @@
           <el-button v-if="userRole === 'service_advisor' && scope.row.ticketsWorkStatus === '01'" size="mini" type="text" icon="el-icon-check" @click="handleNotify(scope.row)">
             通知施工
           </el-button>
-          <el-button size="mini" v-if="userRole === 'repair_staff' && !isFinish" type="text" icon="el-icon-monitor" @click="handleRecord(scope.row, 'sgz')">
+          <el-button size="mini" v-if=" scope.row.ticketsWorkStatus !== '01' && userRole === 'repair_staff' && !isFinish" type="text" icon="el-icon-monitor" @click="handleRecord(scope.row, 'sgz')">
             过程记录
           </el-button>
-          <el-button size="mini" v-if="userRole === 'repair_staff'  && !isFinish" type="text" icon="el-icon-monitor" @click="handleRecord(scope.row, 'kssg')">
+          <el-button size="mini" v-if="scope.row.ticketsWorkStatus !== '01' &&userRole === 'repair_staff'  && !isFinish" type="text" icon="el-icon-monitor" @click="handleRecord(scope.row, 'kssg')">
             开始施工
           </el-button>
-          <el-button size="mini" v-if="userRole === 'repair_staff' && !isFinish" type="text" icon="el-icon-monitor" @click="handleRecord(scope.row, 'sgwczj')">
+          <el-button size="mini" v-if="scope.row.ticketsWorkStatus !== '01' && userRole === 'repair_staff' && !isFinish" type="text" icon="el-icon-monitor" @click="handleRecord(scope.row, 'sgwczj')">
             施工完成
           </el-button>
           <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>
           <el-dropdown
-            v-if="userRole !== 'general_inspection'"
+            v-if="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">
@@ -75,7 +78,7 @@
               </el-dropdown-item>
               <!-- 还要判断是不是员工 -->
               <el-dropdown-item
-                v-if="(userRole === 'repair_staff' ? leader : true) && !isFinish"
+                v-if="userRole !== 'repair_staff'  && !isFinish && scope.row.ticketsWorkStatus !== '01'"
                 command="handleReTake" size="mini" type="text" icon="el-icon-refresh"
               >重新指派
               </el-dropdown-item>
@@ -101,12 +104,12 @@
                 @selection-change="rowSelect"
       >
         <el-table-column type="selection" align="center" />
-        <el-table-column label="商品名称" prop="waresName" align="center"/>
-        <el-table-column label="规格" prop="wares.model" align="center"/>
-        <el-table-column label="数量" prop="waresCount" align="center">
+        <el-table-column label="商品名称" prop="itemName" align="center"/>
+        <el-table-column label="规格" prop="ware.model" align="center"/>
+        <el-table-column label="数量" prop="itemCount" align="center">
           <div v-if="scope.row.id" class="item" slot-scope="scope">
-            <el-input @blur="save(scope.row)" class="item__input" v-model="scope.row.waresCount"/>
-            <span class="item__txt">{{ scope.row.waresCount }}</span>
+            <el-input @blur="save(scope.row)" class="item__input" v-model="scope.row.itemCount"/>
+            <span class="item__txt">{{ scope.row.itemCount }}</span>
           </div>
         </el-table-column>
         <el-table-column label="备注" prop="remark" align="center">
@@ -130,7 +133,7 @@
 </template>
 
 <script>
-import {getPageType, updateTake} from "@/api/repair/tickets/Tickets";
+import {getPageType, updateTake, getTicketsById} from "@/api/repair/tickets/Tickets";
 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";
@@ -160,7 +163,7 @@ export default {
         pageSize: 10,
         ticketNo: null,
         searchTimeArray: [],
-        isFinish: this.isFinish ? "1" : "0"
+        isFinish: this.isFinish ? "1" : "0",
       },
       showSearch: true,
       loading: false,
@@ -172,7 +175,7 @@ export default {
       // 保存进入编辑的cell
       clickCellMap: {},
       // 需要编辑的属性
-      editProp: ['remark', 'waresCount'],
+      editProp: ['remark', 'itemCount'],
       selections: [],
       formData: {},
       remark: null,
@@ -242,13 +245,8 @@ export default {
       this.backVisible = true
       try {
         this.backLoading = true
-        const data = {
-          twId: row.twId
-        }
-        const res = await listTwItem(data)
-        this.partList = res.data
-        // 未领料的不要
-        this.partList = this.partList.filter(item => item.waresStatus === '01')
+        const res = await getTicketsById(row.id)
+        this.partList = res.data.wares
       }finally {
         this.backLoading = false
       }
@@ -326,7 +324,7 @@ export default {
     /** 保存数据 */
     save(row) {
       // 更新表格的数据
-      row.totalPrice = row.count * row.newPrice
+      console.log(row, this.clickCellMap)
       const id = row.id
       // 取消本行所有cell的编辑状态
       this.clickCellMap[id].forEach(cell => {