From a40e6a45b2207a9b172b7687ce6e4fe7da8b9ac6 Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期二, 03 十二月 2024 16:46:49 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei --- admin/src/views/Inspection/plan.vue | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-) diff --git a/admin/src/views/Inspection/plan.vue b/admin/src/views/Inspection/plan.vue index 2ae79a1..2dcd367 100644 --- a/admin/src/views/Inspection/plan.vue +++ b/admin/src/views/Inspection/plan.vue @@ -2,8 +2,8 @@ <TableLayout :permissions="['business:ywpatrolscheme: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="title"> + <el-input v-model="searchForm.title" placeholder="璇疯緭鍏ヨ鍒掑悕绉�" @keypress.enter.native="search"></el-input> </el-form-item> <el-form-item label="璁″垝鏃ユ湡" prop="selDate"> <el-date-picker type="daterange" v-model="searchForm.selDate" clearable value-format="yyyy-MM-dd" @@ -12,8 +12,6 @@ <section> <el-button type="primary" @click="search">鎼滅储</el-button> - <el-button type="primary" :loading="isWorking.export" v-permissions="['business:ywpatrolscheme:exportExcel']" - @click="exportExcel">瀵煎嚭</el-button> <el-button @click="reset">閲嶇疆</el-button> </section> </el-form> @@ -22,8 +20,10 @@ <ul class="toolbar" v-permissions="['business:ywpatrolscheme:create', 'business:ywpatrolscheme:delete']"> <li><el-button type="primary" @click="editClick()" icon="el-icon-plus" v-permissions="['business:ywpatrolscheme:create']">鏂板缓</el-button></li> - <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" - v-permissions="['business:ywpatrolscheme:delete']">鍒犻櫎</el-button></li> + <el-button type="primary" plain :loading="isWorking.export" v-permissions="['business:ywpatrolscheme:exportExcel']" + @click="exportExcel">瀵煎嚭</el-button> + <!-- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" + v-permissions="['business:ywpatrolscheme:delete']">鍒犻櫎</el-button></li> --> </ul> <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange"> <el-table-column type="selection" width="55"></el-table-column> @@ -52,7 +52,8 @@ </el-table-column> <el-table-column label="鐘舵��" min-width="100px"> <template v-slot="scope"> - <el-switch v-model="scope.row.status" @change="e => changeStatus(scope.row)" :active-value="0" :inactive-value="1"> + <el-switch v-model="scope.row.status" @change="e => changeStatus(scope.row)" :active-value="0" + :inactive-value="1"> </el-switch> </template> </el-table-column> @@ -89,7 +90,7 @@ return { // 鎼滅储 searchForm: { - title: '' + title: '' } } }, @@ -104,7 +105,7 @@ }, methods: { changeStatus(e) { - console.log(e); + console.log(e) updateStatusById(e).then(res => { this.search() Message.success('鐘舵�佷慨鏀规垚鍔�') @@ -113,14 +114,14 @@ }) }, changeDate(e) { - if(e && e.length > 0){ + if (e && e.length > 0) { this.$set(this.searchForm, 'startDate', e[0]) this.$set(this.searchForm, 'endDate', e[1]) - }else{ + } else { this.$set(this.searchForm, 'startDate', '') this.$set(this.searchForm, 'endDate', '') } - + }, reset() { this.searchForm = {} @@ -134,7 +135,7 @@ this.$refs.operaYwPatrolSchemeWindow.open('鏂板缓宸℃璁″垝') } this.$refs.operaYwPatrolSchemeWindow.initData() - + }, } } -- Gitblit v1.9.3