Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system-vue into dev

src/views/repair/tickets/Components/TicketWares.vue

@@ -36,10 +36,10 @@
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center">
         <template slot-scope="scope">
-          <el-button type="text" size="mini" icon="el-icon-view" @click="handleShow(scope.row)">
+          <el-button v-if="scope.row.status === '02' || userRole === 3 || userRole === 4" type="text" size="mini" icon="el-icon-view" @click="handleShow(scope.row)">
             查看
           </el-button>
-          <el-button v-if="userRole === 1 || userRole === 2 && scope.row.status === '01'" type="text" size="mini" icon="el-icon-s-check">
+          <el-button v-if="userRole === 1 || userRole === 2 && scope.row.status === '01'" @click="handleAudit(scope.row)" type="text" size="mini" icon="el-icon-s-check">
             审核
           </el-button>
           <el-button v-if="userRole === 3 || userRole === 4 && scope.row.status !== '01'" type="text" size="mini" icon="el-icon-finished">
@@ -108,6 +108,9 @@ export default {
     },
     handleShow(row){
       this.$refs.ticketWaresShow.open(row)
+    },
+    handleAudit(row){
+      this.handleShow(row)
     }
   }
 }

src/views/repair/tickets/Components/TicketWaresShow.vue

@@ -172,6 +172,10 @@
           </el-table>
         </div>
       </el-card>
+      <div slot="footer" class="dialog-footer" v-if="info.status === '01' && (userRole === 1 || userRole === 2)">
+        <el-button type="primary" @click="handleAudit(true)">通 过</el-button>
+        <el-button @click="handleAudit(false)">驳 回</el-button>
+      </div>
     </el-dialog>
   </div>
 </template>
@@ -204,6 +208,7 @@ export default {
       if (row){
         const res = await getTicketsById(row.ticketId)
         this.info = res.data
+        this.info.status = row.status
         this.queryParams.twId = row.id
         await this.getTwItem()
       }
@@ -233,7 +238,11 @@ export default {
       }finally {
         this.loading = false
       }
-    }
+    },
+    // TODO 审核
+    handleAudit(flag){
+
+    },
   }
 }
 </script>