From bc46f9370b6ea7a4592eed2827f4f0368e4ba3b5 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 26 十一月 2024 09:42:23 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei
---
admin/src/views/finance/bull.vue | 63 ++++++++++---------------------
1 files changed, 21 insertions(+), 42 deletions(-)
diff --git a/admin/src/views/finance/bull.vue b/admin/src/views/finance/bull.vue
index c0aea32..99cc8ed 100644
--- a/admin/src/views/finance/bull.vue
+++ b/admin/src/views/finance/bull.vue
@@ -7,9 +7,9 @@
<div class="tab" :class="{ active: activeTabs == 1 }" @click="tabsClick(1)">浠樻璐﹀崟</div>
</div>
<div class="btns">
- <el-button type="primary" @click="handleEdit()" icon="el-icon-plus"
+ <el-button type="primary" @click="$refs.EditRef.open('鍒涘缓鏀舵璐﹀崟')" icon="el-icon-plus"
v-permissions="['business:ywpatrolline:create']">鏂板缓</el-button>
- <el-button @click="handleEx" v-permissions="['business:ywpatrolline:create']">瀵煎嚭</el-button>
+ <el-button @click="handleDetail" v-permissions="['business:ywpatrolline:create']">瀵煎嚭</el-button>
</div>
</div>
<el-table v-loading="loading" :data="list" stripe>
@@ -20,19 +20,25 @@
<el-table-column prop="remark" label="缁撴竻鐘舵��" min-width="100" show-overflow-tooltip />
<el-table-column prop="createTime" label="璐﹀崟閲戦" min-width="100" show-overflow-tooltip />
<el-table-column prop="createTime" label="搴旀敹閲戦" min-width="100" show-overflow-tooltip />
- <el-table-column prop="createTime" label="鍚堝悓鐘舵��" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="createTime" label="瀹炴敹閲戦" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="createTime" label="闇�鏀堕噾棰�" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="createTime" label="璐圭敤绫诲瀷" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="createTime" label="鏄惁閫炬湡" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="createTime" label="璁¤垂鍛ㄦ湡" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="createTime" label="搴旀敹鏃ユ湡" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="createTime" label="璐﹀崟鏉ユ簮" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="statusName" label="鍚堝悓鐘舵��" min-width="100" fixed="right" show-overflow-tooltip />
<el-table-column label="鎿嶄綔" min-width="120" fixed="right">
<template slot-scope="{row}">
- <el-button type="text" @click="handleDetail(row)" icon="el-icon-edit"
- v-permissions="['business:category:update']">鏌ョ湅璇︽儏</el-button>
+ <el-button type="text" @click="handleDetail(row)" icon="el-icon-edit" v-permissions="['business:category:update']">鏌ョ湅璇︽儏</el-button>
</template>
</el-table-column>
</el-table>
<div class="mt20">
<Pagination @size-change="handleSizeChange" @current-change="getList" :pagination="pagination" />
</div>
- <Edit v-if="showEdit" ref="EditRef" @success="getList" @close="showEdit = false" />
- <Detail ref="DetailRef" @success="getList" @close="showEdit = false" />
+ <Edit ref="EditRef" @success="getList" />
+ <Detail ref="DetailRef" @success="getList" />
</div>
</template>
@@ -41,7 +47,7 @@
import QueryForm from '@/components/common/QueryForm'
import Edit from './components/bullEdit.vue'
import Detail from './components/bullDetail.vue'
-import { fetchList, deleteById } from '@/api/Inspection/device'
+import { fetchList } from '@/api/bill'
export default {
components: {
Pagination,
@@ -52,7 +58,6 @@
data() {
return {
loading: false,
- showEdit: false,
pagination: {
pageSize: 10,
page: 1,
@@ -105,57 +110,32 @@
this.getList()
},
methods: {
- getList(page) {
+ getList (page) {
const { pagination, filters } = this
this.loading = true
fetchList({
model: {
- ...filters,
+ ...filters
},
capacity: pagination.pageSize,
- page: page || pagination.page,
+ page: page || pagination.page
}).then(res => {
+ console.log(res)
this.loading = false
this.list = res.records || []
this.list.forEach(item => {
- item.stautsName = item.status == 0 ? '姝ｅ父' : item.status == 1 ? '鎹熷潖' : '鎶ュ簾'
+ item.statusName = item.status === 1 ? '鎹熷潖' : item.status === 2 ? '鎶ュ簾' : '姝ｅ父'
})
this.pagination.total = res.total || 0
}, () => {
this.loading = false
})
},
- handleEx() {
-
- },
tabsClick(val) {
this.activeTabs = val
},
- handleEdit(row) {
- this.showEdit = true
- this.$nextTick(() => {
- this.$refs.EditRef.isShowModal = true
- if (row && row.id) {
- this.$refs.EditRef.getDetail(row.id)
- }
- })
-
- },
- handleDetail() {
-
- },
- handleDel(row) {
- let message = `纭鍒犻櫎璇ヨ褰曞悧?`
- this.$dialog.deleteConfirm(message)
- .then(() => {
- this.isWorking.delete = true
- deleteById(row.id)
- .then(() => {
- this.$tip.apiSuccess('鍒犻櫎鎴愬姛')
- this.getList()
- })
- })
- .catch(() => { })
+ handleDetail(row) {
+ this.$refs.DetailRef.open()
},
clear() {
this.filters = {}
@@ -175,7 +155,6 @@
@import '@/assets/style/variables.scss';
.tabs {
- border-bottom: 1px solid #DFE2E8;
display: flex;
margin-bottom: 20px;
display: flex;
--
Gitblit v1.9.3