From 52e18000ace434b2acdebce5e118c45c337a3fe7 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 28 五月 2024 13:31:54 +0800
Subject: [PATCH] 合并冲突
---
src/views/accounting/jmreport/index.vue | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/views/accounting/jmreport/index.vue b/src/views/accounting/jmreport/index.vue
index 3996c08..b2b0d10 100644
--- a/src/views/accounting/jmreport/index.vue
+++ b/src/views/accounting/jmreport/index.vue
@@ -18,6 +18,7 @@
import { mapGetters } from 'vuex'
import ttable from '@/views/common/ztt-table.vue'
import { pageList } from '@/api/accounting/personReport'
+import { remote } from '@/api/admin/dict'
export default {
components: {
ttable
@@ -66,8 +67,10 @@
prop: 'workShop',
label: '杞﹂棿',
isTrue: true,
- isSearch: true,
- searchInfoType: 'text',
+ isSearch: true,searchInfoType:'select',
+ optList: () => {
+ return this.workShopList
+ }
},
{
minWidth: '100',
@@ -132,13 +135,26 @@
operator: null
},
prelang: "operation",
+ workShopList:[],
}
+ },
+ mounted(){
+ this.getWorkShopList()
},
methods:{
// table鑷甫浜嬩欢
handleSelectionChange(val) {
this.multipleSelection = val
},
+ getWorkShopList(){
+ remote('work_shop').then((response) => {
+ if (response.data.code === 0) {
+ this.workShopList = response.data.data
+ } else {
+ this.workShopList = []
+ }
+ })
+ },
formatDutyDate(row, column, cellValue) {
if (cellValue) {
const dutyDateList = /\d{4}-\d{1,2}-\d{1,2}/g.exec(cellValue)
--
Gitblit v1.9.3