From fb487d66f1930780fe1cde09da3fec89b13db2f9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 27 十一月 2024 16:52:07 +0800
Subject: [PATCH] 开发更新
---
admin/src/views/Inspection/task.vue | 150 +++++++++++++++----------------------------------
1 files changed, 47 insertions(+), 103 deletions(-)
diff --git a/admin/src/views/Inspection/task.vue b/admin/src/views/Inspection/task.vue
index e2e9040..e3a57eb 100644
--- a/admin/src/views/Inspection/task.vue
+++ b/admin/src/views/Inspection/task.vue
@@ -2,62 +2,17 @@
<TableLayout :permissions="['business:ywpatroltask:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="涓婚敭" prop="id">
- <el-input v-model="searchForm.id" 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="creator">
- <el-input v-model="searchForm.creator" placeholder="璇疯緭鍏ュ垱寤轰汉缂栫爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿" prop="createDate">
- <el-date-picker v-model="searchForm.createDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ垱寤烘椂闂�" @change="search"/>
- </el-form-item>
- <el-form-item label="鏇存柊浜虹紪鐮�" prop="editor">
- <el-input v-model="searchForm.editor" placeholder="璇疯緭鍏ユ洿鏂颁汉缂栫爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鏇存柊鏃堕棿" prop="editDate">
- <el-date-picker v-model="searchForm.editDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ユ洿鏂版椂闂�" @change="search"/>
- </el-form-item>
- <el-form-item label="鏄惁鍒犻櫎0鍚� 1鏄�" prop="isdeleted">
- <el-input v-model="searchForm.isdeleted" placeholder="璇疯緭鍏ユ槸鍚﹀垹闄�0鍚� 1鏄�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鏍囬" prop="title">
- <el-input v-model="searchForm.title" placeholder="璇疯緭鍏ユ爣棰�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="searchForm.remark" placeholder="璇疯緭鍏ュ娉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鐘舵�� 0寰呭紑濮� 1杩涜涓� 2宸茶秴鏈� 3宸插畬鎴� 4宸插彇娑�" prop="status">
- <el-input v-model="searchForm.status" placeholder="璇疯緭鍏ョ姸鎬� 0寰呭紑濮� 1杩涜涓� 2宸茶秴鏈� 3宸插畬鎴� 4宸插彇娑�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鎺掑簭鐮�" prop="sortnum">
- <el-input v-model="searchForm.sortnum" placeholder="璇疯緭鍏ユ帓搴忕爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="宸℃璁″垝缂栫爜(鍏宠仈yw_patrol_scheme)" prop="schemeId">
- <el-input v-model="searchForm.schemeId" placeholder="璇疯緭鍏ュ贰妫�璁″垝缂栫爜(鍏宠仈yw_patrol_scheme)" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="宸℃鐐圭紪鐮�(鍏宠仈yw_patrol_point)" prop="pointId">
- <el-input v-model="searchForm.pointId" placeholder="璇疯緭鍏ュ贰妫�鐐圭紪鐮�(鍏宠仈yw_patrol_point)" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="澶勭悊浜虹紪鐮�(鍏宠仈system_user)" prop="dealUserId">
- <el-input v-model="searchForm.dealUserId" placeholder="璇疯緭鍏ュ鐞嗕汉缂栫爜(鍏宠仈system_user)" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="澶勭悊鏃堕棿" prop="dealDate">
- <el-date-picker v-model="searchForm.dealDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ鐞嗘椂闂�" @change="search"/>
- </el-form-item>
- <el-form-item label="澶勭悊澶囨敞" prop="dealInfo">
- <el-input v-model="searchForm.dealInfo" placeholder="璇疯緭鍏ュ鐞嗗娉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="寰幆鍛ㄦ湡 0姣忓ぉ 1姣忓懆 2姣忓ぉ" prop="circleType">
- <el-input v-model="searchForm.circleType" placeholder="璇疯緭鍏ュ惊鐜懆鏈� 0姣忓ぉ 1姣忓懆 2姣忓ぉ" @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>
- <el-form-item label="宸℃缁撴灉 0姝ｅ父 1寮傚父" prop="dealStatus">
- <el-input v-model="searchForm.dealStatus" placeholder="璇疯緭鍏ュ贰妫�缁撴灉 0姝ｅ父 1寮傚父" @keypress.enter.native="search"></el-input>
+ <el-form-item label="浠诲姟鐘舵��">
+ <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>
@@ -67,10 +22,6 @@
</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"
@@ -78,25 +29,25 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="id" label="涓婚敭" min-width="100px"></el-table-column>
- <el-table-column prop="creator" label="鍒涘缓浜虹紪鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="editor" label="鏇存柊浜虹紪鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="isdeleted" label="鏄惁鍒犻櫎0鍚� 1鏄�" min-width="100px"></el-table-column>
- <el-table-column prop="title" label="鏍囬" min-width="100px"></el-table-column>
- <el-table-column prop="remark" 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="sortnum" label="鎺掑簭鐮�" 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="pointId" label="宸℃鐐圭紪鐮�(鍏宠仈yw_patrol_point)" 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="circleType" label="寰幆鍛ㄦ湡 0姣忓ぉ 1姣忓懆 2姣忓ぉ" 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 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="鎿嶄綔"
@@ -104,8 +55,8 @@
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 type="text" @click="cancelById(row)" v-permissions="['business:ywpatroltask:delete']">鍙栨秷</el-button>
</template>
</el-table-column>
</el-table>
@@ -116,8 +67,8 @@
>
</pagination>
</template>
- <!-- 鏂板缓/淇敼 -->
- <OperaYwPatrolTaskWindow ref="operaYwPatrolTaskWindow" @success="handlePageChange"/>
+ <!-- -->
+ <TaskDetail ref="TaskDetailRef" />
</TableLayout>
</template>
@@ -125,34 +76,17 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
-import OperaYwPatrolTaskWindow from './components/OperaYwPatrolTaskWindow'
+import TaskDetail from './components/taskDetail'
export default {
name: 'YwPatrolTask',
extends: BaseTable,
- components: { TableLayout, Pagination, OperaYwPatrolTaskWindow },
+ 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: ''
+ title:'',
+ status: ''
}
}
},
@@ -164,6 +98,16 @@
'field.main': 'id'
})
this.search()
+ },
+ methods: {
+ handleDetail(row) {
+ this.$refs.TaskDetailRef.isShowModal = true
+ this.$refs.TaskDetailRef.id = row.id
+ this.$refs.TaskDetailRef.getDetail()
+ },
+ cancelById() {
+
+ },
}
}
</script>
--
Gitblit v1.9.3