From 3c456949b70671cc2ad95ad5395dfaceda519f17 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 23 二月 2024 10:12:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
company/src/views/business/taxes.vue | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/company/src/views/business/taxes.vue b/company/src/views/business/taxes.vue
index 3d42e64..b8a8de4 100644
--- a/company/src/views/business/taxes.vue
+++ b/company/src/views/business/taxes.vue
@@ -10,10 +10,12 @@
<el-option label="宸插啿绾�" value="3"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="鐢宠鏃ユ湡" prop="status">
+ <el-form-item label="鐢宠鏃ユ湡" prop="time">
<el-date-picker
- v-model="searchForm.status"
+ v-model="searchForm.time"
+ @change="changeTime"
type="daterange"
+ value-format="yyyy-MM-dd"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡">
@@ -82,9 +84,9 @@
</el-table-column>
<el-table-column label="鎿嶄綔" min-width="180px">
<template slot-scope="{row}">
- <el-button v-if="row.status == 0" type="text" @click="$refs.OperaTaxesUploadWindow.open('涓婁紶鍙戠エ',row)">涓婁紶鍙戠エ</el-button>
+ <el-button v-if="row.status == 0 && userInfo.type === 0" type="text" @click="$refs.OperaTaxesUploadWindow.open('涓婁紶鍙戠エ',row)">涓婁紶鍙戠エ</el-button>
<el-button v-if="row.status == 1 && userInfo.type === 0" type="text" @click="$refs.OperaTaxesUploadWindow.open('淇敼鍙戠エ',row)">淇敼鍙戠エ</el-button>
- <el-button type="text" @click="$refs.OperaTaxesWindow.open('寮�绁ㄧ敵璇疯鎯�',row)">鐢宠璇︽儏</el-button>
+ <el-button type="text" @click="$refs.OperaTaxesWindow.open('寮�绁ㄨ鎯�',row)">鐢宠璇︽儏</el-button>
</template>
</el-table-column>
</el-table>
@@ -153,7 +155,10 @@
companyList: [],
searchForm: {
status: '',
- companyId: ''
+ companyId: '',
+ startDate: '',
+ endDate: '',
+ time: '',
},
visible: false
}
@@ -172,6 +177,22 @@
this.loadSelectList()
},
methods: {
+ reset () {
+ this.$refs.searchForm.resetFields()
+ this.searchForm.startDate = ''
+ this.searchForm.endDate = ''
+ this.search()
+ },
+ changeTime(e) {
+ if (e.length > 0) {
+ this.searchForm.startDate = e[0] + ' 00:00:00'
+ this.searchForm.endDate = e[1] + ' 23:59:59'
+ } else {
+ this.searchForm.startDate = ''
+ this.searchForm.endDate = ''
+ }
+ this.search()
+ },
handleRemove (file, fileList) {
console.log(file, fileList)
},
--
Gitblit v1.9.3