diff --git a/src/views/repair/tickets/Components/TicketManagerItem.vue b/src/views/repair/tickets/Components/TicketManagerItem.vue
index bb52c87..56e851c 100644
--- a/src/views/repair/tickets/Components/TicketManagerItem.vue
+++ b/src/views/repair/tickets/Components/TicketManagerItem.vue
@@ -12,7 +12,7 @@
           type="daterange"
           range-separator="至"
           start-placeholder="开始日期"
-          end-placeholder="结束日期" />
+          end-placeholder="结束日期"/>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -21,7 +21,6 @@
     </el-form>
     <!-- 操作 -->
     <el-row :gutter="10" class="mb8">
-      <!-- todo 待补充 -->
       <right-toolbar :showSearch.sync="showSearch"></right-toolbar>
     </el-row>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
@@ -45,6 +44,9 @@
           <el-button size="mini" type="text" icon="el-icon-view" @click="handleShow(scope.row)"
           >查看
           </el-button>
+          <el-button size="mini" type="text" icon="el-icon-document-add" @click="handleGet(scope.row)">
+            申请领料
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -52,26 +54,27 @@
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
                 @pagination="listTickets"
     />
+    <TicketsShow ref="ticketsShow"/>
   </div>
 </template>
 
 <script>
 import {getPageType} from "@/api/repair/tickets/Tickets";
+import TicketsShow from "@/views/repair/tickets/Components/TicketsShow.vue";
 
 export default {
   name: "TicketManagerItem",
-  props:{
-    // 是否展示了页面，是才请求
-    isShow:{
-      type: Boolean,
-    },
-    isFinish:{
+  components: {TicketsShow},
+  props: {
+    isFinish: {
       type: Boolean,
     }
   },
   data() {
     return {
       queryParams: {
+        pageNo: 1,
+        pageSize: 10,
         ticketNo: null,
         searchTimeArray: [],
         isFinish: this.isFinish ? "1" : "0"
@@ -83,25 +86,33 @@ export default {
     }
   },
   mounted() {
-    if(this.isShow){
-      this.listTickets()
-    }
+    this.listTickets()
   },
-  methods:{
-    async listTickets(){
-      const res = await getPageType(this.queryParams)
-      if (res.data){
-        this.list = res.data.records
-        this.total = res.data.total
+  methods: {
+    async listTickets() {
+      try {
+        this.loading = true
+        const res = await getPageType(this.queryParams)
+        if (res.data) {
+          this.list = res.data.records
+          this.total = res.data.total
+        }
+      }finally {
+        this.loading = false
       }
     },
-    handleQuery(){
-
+    handleQuery() {
+      this.queryParams.pageNo = 1
+      this.listTickets()
     },
-    resetQuery(){
-
+    resetQuery() {
+      this.resetForm('queryForm')
+      this.handleQuery()
     },
-    handleShow(row){
+    handleShow(row) {
+      this.$refs.ticketsShow.open(row)
+    },
+    handleGet(row){
 
     }
   }
diff --git a/src/views/repair/tickets/TicketManager.vue b/src/views/repair/tickets/TicketManager.vue
index 2e7ec28..dd73888 100644
--- a/src/views/repair/tickets/TicketManager.vue
+++ b/src/views/repair/tickets/TicketManager.vue
@@ -2,10 +2,10 @@
   <div class="app-container">
     <el-tabs v-model="activeTab">
       <el-tab-pane label="待完成工单" name="unFinish">
-        <TicketManagerItem :is-show="activeTab === 'unFinish'" :is-finish="false"/>
+        <TicketManagerItem :is-finish="false"/>
       </el-tab-pane>
       <el-tab-pane label="已完成工单" name="finish">
-        <TicketManagerItem :is-show="activeTab === 'finish'" :is-finish="true"/>
+        <TicketManagerItem :is-finish="true"/>
       </el-tab-pane>
       <el-tab-pane label="领料申请单" name="getApply">
       </el-tab-pane>