From d7dca690cedd12e271f0ee0b9050679d73796f5c Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 06 一月 2025 09:28:10 +0800
Subject: [PATCH] 1

---
 admin/src/views/Inspection/task.vue |   67 +++++++++++++++++++--------------
 1 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/admin/src/views/Inspection/task.vue b/admin/src/views/Inspection/task.vue
index 99b3ea0..7084b40 100644
--- a/admin/src/views/Inspection/task.vue
+++ b/admin/src/views/Inspection/task.vue
@@ -2,11 +2,11 @@
   <TableLayout :permissions="['business:ywpatroltask:query']">
     <!-- 鎼滅储琛ㄥ崟 -->
     <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
-      <el-form-item label="璁″垝鍚嶇О" prop="title">
-        <el-input v-model="searchForm.title" placeholder="璇疯緭鍏ヨ鍒掑悕绉�" @keypress.enter.native="search"></el-input>
+      <el-form-item label="璁″垝鍚嶇О" prop="planTitle">
+        <el-input v-model="searchForm.planTitle" placeholder="璇疯緭鍏ヨ鍒掑悕绉�" @keypress.enter.native="search"></el-input>
       </el-form-item>
-      <el-form-item >
-        <el-select v-model="searchForm.status" filterable clearable>
+      <el-form-item label="浠诲姟鐘舵��" prop="status">
+        <el-select v-model="searchForm.status" label="浠诲姟鐘舵��" filterable clearable>
           <el-option value="0" label="寰呭紑濮�"></el-option>
           <el-option value="1" label="杩涜涓�"></el-option>
           <el-option value="2" label="宸茶秴鏈�"></el-option>
@@ -16,25 +16,25 @@
       </el-form-item>
       <section>
         <el-button type="primary" @click="search">鎼滅储</el-button>
-        <el-button type="primary" :loading="isWorking.export" v-permissions="['business:ywpatroltask:exportExcel']" @click="exportExcel">瀵煎嚭</el-button>
+
         <el-button @click="reset">閲嶇疆</el-button>
       </section>
     </el-form>
     <!-- 琛ㄦ牸鍜屽垎椤� -->
     <template v-slot:table-wrap>
-      <el-table
-        v-loading="isWorking.search"
-        :data="tableData.list"
-        stripe
-        @selection-change="handleSelectionChange"
-      >
+      <div>
+        <el-button type="primary" plain :loading="isWorking.export"
+          v-permissions="['business:ywpatroltask:exportExcel']" @click="exportExcel">瀵煎嚭</el-button>
+      </div>
+      <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column prop="planTitle" label="璁″垝鍚嶇О" min-width="100px"></el-table-column>
-        <el-table-column prop="schemeId" label="璁″垝缂栧彿" min-width="100px"></el-table-column>
+        <el-table-column prop="planCode" label="璁″垝缂栧彿" min-width="100px"></el-table-column>
         <el-table-column prop="code" label="浠诲姟缂栧彿" min-width="100px"></el-table-column>
-        <el-table-column prop="dealDate" label="浠诲姟鏃堕棿" min-width="100px">
+        <el-table-column prop="dealDate" label="浠诲姟鏃堕棿" min-width="140px">
           <template v-slot="scope">
-            <span>{{ scope.row.startDate }} {{ scope.row.endDate }}</span>
+            <span v-if="scope.row.startDate && scope.row.endDate">{{ scope.row.startDate.slice(0, 16) }} - {{
+              scope.row.endDate.slice(11, 16) }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="dealDate" label="瀹為檯瀹屾垚鏃堕棿" min-width="100px"></el-table-column>
@@ -48,22 +48,16 @@
             <span class="gray" v-if="scope.row.status == 4">宸插彇娑�</span>
           </template>
         </el-table-column>
-        <el-table-column
-          v-if="containPermissions(['business:ywpatroltask:update', 'business:ywpatroltask:delete'])"
-          label="鎿嶄綔"
-          min-width="120"
-          fixed="right"
-        >
+        <el-table-column v-if="containPermissions(['business:ywpatroltask:update', 'business:ywpatroltask:delete'])"
+          label="鎿嶄綔" min-width="120" fixed="right">
           <template slot-scope="{row}">
-            <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:ywpatroltask:delete']">鍙栨秷</el-button>
+            <el-button type="text" @click="handleDetail(row)">鏌ョ湅璇︽儏</el-button>
+            <el-button v-if="row.status == 0" type="text" class="red" @click="cancelById(row)"
+              v-permissions="['business:ywpatroltask:delete']">鍙栨秷</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <pagination
-        @size-change="handleSizeChange"
-        @current-change="handlePageChange"
-        :pagination="tableData.pagination"
-      >
+      <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
       </pagination>
     </template>
     <!--  -->
@@ -76,20 +70,22 @@
 import TableLayout from '@/layouts/TableLayout'
 import Pagination from '@/components/common/Pagination'
 import TaskDetail from './components/taskDetail'
+import { cancelById } from '@/api/Inspection/ywPatrolTask'
+import { Message } from 'element-ui'
 export default {
   name: 'YwPatrolTask',
   extends: BaseTable,
   components: { TableLayout, Pagination, TaskDetail },
-  data () {
+  data() {
     return {
       // 鎼滅储
       searchForm: {
-        title:'',
+        title: '',
         status: ''
       }
     }
   },
-  created () {
+  created() {
     this.config({
       module: '杩愮淮宸℃浠诲姟淇℃伅琛�',
       api: '/Inspection/ywPatrolTask',
@@ -104,6 +100,19 @@
       this.$refs.TaskDetailRef.id = row.id
       this.$refs.TaskDetailRef.getDetail()
     },
+    cancelById(row) {
+      this.$confirm('纭畾鍙栨秷褰撳墠浠诲姟, 鏄惁缁х画?', '鎻愮ず', {
+        confirmButtonText: '纭畾',
+        cancelButtonText: '鍙栨秷',
+        type: 'warning'
+      }).then(() => {
+        cancelById(row.id).then(res => {
+          Message.success('鍙栨秷鎴愬姛')
+          this.search()
+        })
+      })
+      // 
+    },
   }
 }
 </script>

--
Gitblit v1.9.3