From 9ae3baca4c8730fcc5f7c8daf3b6368cec554ae6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 25 十二月 2024 18:39:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/platform/oil.vue | 102 +++++++++++++++++++++++----------------------------
1 files changed, 46 insertions(+), 56 deletions(-)
diff --git a/admin/src/views/platform/oil.vue b/admin/src/views/platform/oil.vue
index a6b5680..8ae45c5 100644
--- a/admin/src/views/platform/oil.vue
+++ b/admin/src/views/platform/oil.vue
@@ -1,30 +1,17 @@
<template>
<TableLayout :permissions="['business:platformwatergas:query']">
<SearchFormCollapse slot="search-form" :need-more="false">
- <el-form ref="searchForm" :model="searchForm" label-width="100px" inline >
- <el-form-item title="璇疯緭鍏ヨ溅鐗屽彿" >
- <el-input v-model="searchForm.carCode" clearable placeholder="璇疯緭鍏ヨ溅鐗屽彿" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="浣跨敤鏃堕棿锛�" >
- <el-date-picker
- @change="search"
- v-model="searchForm.startTime"
- format="yyyy-MM"
- style="width: 140px"
- placeholder="寮�濮嬫椂闂�"
- value-format="yyyy-MM-dd HH:mm:ss"
- type="month"
- />~
- <el-date-picker
- @change="search"
- v-model="searchForm.endTime"
- format="yyyy-MM"
- style="width: 140px"
- placeholder="缁撴潫鏃堕棿"
- value-format="yyyy-MM-dd HH:mm:ss"
- type="month"
- />
- </el-form-item>
+ <el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
+ <el-form-item title="璇疯緭鍏ヨ溅鐗屽彿">
+ <el-input v-model="searchForm.carCode" clearable placeholder="璇疯緭鍏ヨ溅鐗屽彿"
+ @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="浣跨敤鏃堕棿锛�">
+ <el-date-picker @change="search" v-model="searchForm.startTime" format="yyyy-MM" style="width: 140px"
+ placeholder="寮�濮嬫椂闂�" value-format="yyyy-MM-dd HH:mm:ss" type="month" /> ~
+ <el-date-picker @change="search" v-model="searchForm.endTime" format="yyyy-MM" style="width: 140px"
+ placeholder="缁撴潫鏃堕棿" value-format="yyyy-MM-dd HH:mm:ss" type="month" />
+ </el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
<el-button @click="reset">閲嶇疆</el-button>
@@ -33,51 +20,45 @@
</SearchFormCollapse>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:platformwatergas:create','business:platformwatergas:delete','business:notice:exportExcel']">
- <li><el-button type="primary" @click="$refs.OperaPlatformOilWindow.open('鏂板缓娌硅��')" icon="el-icon-plus" v-permissions="['business:platformwatergas:create']">鏂板缓</el-button></li>
- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:platformwatergas:delete']">鍒犻櫎</el-button></li>
- <el-button type="primary" :loading="isWorking.export" v-permissions="['business:platformwatergas:exportExcel']" @click="exportExcel">瀵煎嚭</el-button>
- <el-button type="primary" :loading="isWorking.export" v-permissions="['business:platformwatergas:exportExcel']" @click="handleImport">瀵煎叆</el-button>
+ <ul class="toolbar"
+ v-permissions="['business:platformwatergas:create', 'business:platformwatergas:delete', 'business:notice:exportExcel']">
+ <li><el-button type="primary" @click="$refs.OperaPlatformOilWindow.open('鏂板缓娌硅��')" icon="el-icon-plus"
+ v-permissions="['business:platformwatergas:create']">鏂板缓</el-button></li>
+ <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete"
+ v-permissions="['business:platformwatergas:delete']">鍒犻櫎</el-button></li>
+ <el-button type="primary" :loading="isWorking.export" v-permissions="['business:platformwatergas:exportExcel']"
+ @click="exportExcel">瀵煎嚭</el-button>
+ <el-button type="primary" :loading="isWorking.export" v-permissions="['business:platformwatergas:exportExcel']"
+ @click="handleImport">瀵煎叆</el-button>
</ul>
- <el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- @selection-change="handleSelectionChange"
- >
+ <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="carCode" label="杞︾墝鍙�" fixed min-width="150px"></el-table-column>
<el-table-column prop="timeInfo" label="浣跨敤鏈堜唤" fixed min-width="100px">
<template slot-scope="{row}">
- {{(row.timeInfo || row.timeInfo.length >7 )?row.timeInfo.substr(0,7):'-'}}
+ {{ (row.timeInfo || row.timeInfo.length > 7) ? row.timeInfo.substr(0, 7) : '-' }}
</template>
</el-table-column>
<el-table-column prop="num" label="娌硅�楋紙鍗囷級" fixed min-width="150px"></el-table-column>
<el-table-column prop="content" label="璇存槑" min-width="120px"></el-table-column>
<el-table-column prop="editDate" label="鏈�杩戞搷浣滄椂闂�" min-width="140px"></el-table-column>
<el-table-column
- v-if="containPermissions(['business:platformwatergas:update', 'business:platformwatergas:delete'])"
- label="鎿嶄綔"
- align="center"
- min-width="150"
- fixed="right"
- >
+ v-if="containPermissions(['business:platformwatergas:update', 'business:platformwatergas:delete'])" label="鎿嶄綔"
+ align="center" min-width="150" fixed="right">
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.OperaPlatformOilWindow.open('缂栬緫娌硅��', row)" icon="el-icon-edit" v-permissions="['business:platformwatergas:update']">缂栬緫</el-button>
- <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:platformwatergas:delete']">鍒犻櫎</el-button>
+ <el-button type="text" @click="$refs.OperaPlatformOilWindow.open('缂栬緫娌硅��', row)" icon="el-icon-edit"
+ v-permissions="['business:platformwatergas:update']">缂栬緫</el-button>
+ <el-button type="text" @click="deleteById(row)" icon="el-icon-delete"
+ v-permissions="['business:platformwatergas: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>
<!-- 鏂板缓/淇敼 -->
- <OperaPlatformOilWindow ref="OperaPlatformOilWindow" @success="handlePageChange"/>
- <oilImportTem ref="oilImportTem" @success="handlePageChange"/>
+ <OperaPlatformOilWindow ref="OperaPlatformOilWindow" @success="handlePageChange" />
+ <oilImportTem ref="oilImportTem" @success="handlePageChange" />
</TableLayout>
</template>
@@ -93,21 +74,21 @@
name: 'Platform',
extends: BaseTable,
components: { SearchFormCollapse, TableLayout, Pagination, OperaPlatformOilWindow, oilImportTem },
- data () {
+ data() {
return {
groupList: [],
// 鎼滅储
working: false,
working1: false,
searchForm: {
- carCode:'',
+ carCode: '',
startTime: '',
endTime: '',
type: 2
}
}
},
- created () {
+ created() {
this.config({
module: '娌硅�椾俊鎭〃',
api: '/platform/platformWaterGas',
@@ -118,16 +99,25 @@
this.loadGroupList()
},
methods: {
+ reset() {
+ this.searchForm = {
+ carCode: '',
+ startTime: '',
+ endTime: '',
+ type: 2
+ }
+ this.search()
+ },
handleImport() {
this.$refs.oilImportTem.open('鎵归噺瀵煎叆')
},
- loadGroupList () {
+ loadGroupList() {
allList({})
.then(res => {
this.groupList = res || []
})
},
- changeStatus (e, row) {
+ changeStatus(e, row) {
this.api.updateStatusById({
id: row.id,
status: e
--
Gitblit v1.9.3