From a2299a6d4a6f99e9c11132138f5d3e9ec68f03ea Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 06 六月 2025 19:19:34 +0800
Subject: [PATCH] 开发更新
---
admin/src/views/Inspection/task.vue | 135 +++++++++++++++++++++++---------------------
1 files changed, 71 insertions(+), 64 deletions(-)
diff --git a/admin/src/views/Inspection/task.vue b/admin/src/views/Inspection/task.vue
index 9544842..7084b40 100644
--- a/admin/src/views/Inspection/task.vue
+++ b/admin/src/views/Inspection/task.vue
@@ -2,65 +2,66 @@
<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 label="寮�濮嬫棩鏈�" prop="startDate">
- <el-date-picker v-model="searchForm.startDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ紑濮嬫棩鏈�" @change="search"/>
- </el-form-item>
- <el-form-item label="缁撴潫鏃ユ湡" prop="endDate">
- <el-date-picker v-model="searchForm.endDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ョ粨鏉熸棩鏈�" @change="search"/>
+ <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>
+ <el-option value="3" label="宸插畬鎴�"></el-option>
+ <el-option value="4" label="宸插彇娑�"></el-option>
+ </el-select>
</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>
- <ul class="toolbar" v-permissions="['business:ywpatroltask:create', 'business:ywpatroltask:delete']">
- <li><el-button type="primary" @click="$refs.operaYwPatrolTaskWindow.open('鏂板缓宸℃浠诲姟')" icon="el-icon-plus" v-permissions="['business:ywpatroltask:create']">鏂板缓</el-button></li>
- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:ywpatroltask:delete']">鍒犻櫎</el-button></li>
- </ul>
- <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="title" label="鏍囬" min-width="100px"></el-table-column>
- <el-table-column prop="status" label="鐘舵�� 0寰呭紑濮� 1杩涜涓� 2宸茶秴鏈� 3宸插畬鎴� 4宸插彇娑�" min-width="100px"></el-table-column>
- <el-table-column prop="schemeId" label="宸℃璁″垝缂栫爜(鍏宠仈yw_patrol_scheme)" min-width="100px"></el-table-column>
-
- <el-table-column prop="dealUserId" label="澶勭悊浜虹紪鐮�(鍏宠仈system_user)" min-width="100px"></el-table-column>
- <el-table-column prop="dealDate" label="澶勭悊鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="dealInfo" label="澶勭悊澶囨敞" min-width="100px"></el-table-column>
- <el-table-column prop="startDate" label="寮�濮嬫棩鏈�" min-width="100px"></el-table-column>
- <el-table-column prop="endDate" label="缁撴潫鏃ユ湡" min-width="100px"></el-table-column>
- <el-table-column prop="dealStatus" label="宸℃缁撴灉 0姝ｅ父 1寮傚父" min-width="100px"></el-table-column>
- <el-table-column
- v-if="containPermissions(['business:ywpatroltask:update', 'business:ywpatroltask:delete'])"
- label="鎿嶄綔"
- min-width="120"
- fixed="right"
- >
+ <el-table-column prop="planTitle" 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="140px">
+ <template v-slot="scope">
+ <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>
+ <el-table-column prop="userName" label="鎵ц浜�" min-width="100px"></el-table-column>
+ <el-table-column prop="dealStatus" label="浠诲姟鐘舵��" min-width="100px">
+ <template v-slot="scope">
+ <span class="primaryColor" v-if="scope.row.status == 0">寰呭紑濮�</span>
+ <span class="green" v-if="scope.row.status == 1">杩涜涓�</span>
+ <span class="red" v-if="scope.row.status == 2">宸茶秴鏈�</span>
+ <span class="gray" v-if="scope.row.status == 3">宸插畬鎴�</span>
+ <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">
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaYwPatrolTaskWindow.open('缂栬緫宸℃浠诲姟', row)" icon="el-icon-edit" v-permissions="['business:ywpatroltask:update']">缂栬緫</el-button>
- <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>
-
+ <!-- -->
+ <TaskDetail ref="TaskDetailRef" />
</TableLayout>
</template>
@@ -68,37 +69,23 @@
import BaseTable from '@/components/base/BaseTable'
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 },
- data () {
+ components: { TableLayout, Pagination, TaskDetail },
+ data() {
return {
// 鎼滅储
searchForm: {
- id: '',
- creator: '',
- createDate: '',
- editor: '',
- editDate: '',
- isdeleted: '',
title: '',
- remark: '',
- status: '',
- sortnum: '',
- schemeId: '',
- pointId: '',
- dealUserId: '',
- dealDate: '',
- dealInfo: '',
- circleType: '',
- startDate: '',
- endDate: '',
- dealStatus: ''
+ status: ''
}
}
},
- created () {
+ created() {
this.config({
module: '杩愮淮宸℃浠诲姟淇℃伅琛�',
api: '/Inspection/ywPatrolTask',
@@ -106,6 +93,26 @@
'field.main': 'id'
})
this.search()
+ },
+ methods: {
+ handleDetail(row) {
+ this.$refs.TaskDetailRef.isShowModal = true
+ 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