Merge pull request 'fix : 修复专项资金权限, 费用台账时间搜索' (#511) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/511
This commit is contained in:
@@ -33,7 +33,7 @@ const searchConfig = reactive([
|
|||||||
clearable: true,
|
clearable: true,
|
||||||
type:'month',
|
type:'month',
|
||||||
format: 'YYYY-MM',
|
format: 'YYYY-MM',
|
||||||
valueFormat:'YYYY-MM-DD HH:mm:ss',
|
valueFormat:'YYYY-MM',
|
||||||
},
|
},
|
||||||
colProps: {}
|
colProps: {}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -123,10 +123,10 @@ const tableConfig = reactive({
|
|||||||
let btn = []
|
let btn = []
|
||||||
let buttons = new Set(Array.from(row.buttons))
|
let buttons = new Set(Array.from(row.buttons))
|
||||||
if (buttons.has("details")) {
|
if (buttons.has("details")) {
|
||||||
btn.push({label: '详情', prem: ['mosr:collect:info'], func: () => handleDetail(row), type: 'primary'})
|
btn.push({label: '详情', prem: ['special:fund:info'], func: () => handleDetail(row), type: 'primary'})
|
||||||
}
|
}
|
||||||
if (buttons.has("edit")) {
|
if (buttons.has("edit")) {
|
||||||
btn.push({label: '编辑', prem: ['mosr:collect:resubmit'], func: () => handleEdit(row), type: 'primary'})
|
btn.push({label: '编辑', prem: ['special:fund:edit'], func: () => handleEdit(row), type: 'primary'})
|
||||||
}
|
}
|
||||||
return (
|
return (
|
||||||
<div style={{width: '100%'}}>
|
<div style={{width: '100%'}}>
|
||||||
@@ -145,7 +145,6 @@ const tableConfig = reactive({
|
|||||||
{
|
{
|
||||||
buttons.has("delete") ?
|
buttons.has("delete") ?
|
||||||
<popover-delete name={row.name} type={'专项资金'} btnType={'danger'}
|
<popover-delete name={row.name} type={'专项资金'} btnType={'danger'}
|
||||||
perm={['mosr:requirement:del']}
|
|
||||||
onDelete={() => handleDelete(row)}/>
|
onDelete={() => handleDelete(row)}/>
|
||||||
: ''
|
: ''
|
||||||
}
|
}
|
||||||
@@ -157,7 +156,7 @@ const tableConfig = reactive({
|
|||||||
api: '/workflow/mosr/special/fund',
|
api: '/workflow/mosr/special/fund',
|
||||||
params: {},
|
params: {},
|
||||||
btns: [
|
btns: [
|
||||||
{name: '新增', key: 'add', color: '#DED0B2', auth: ''},
|
{name: '新增', key: 'add', color: '#DED0B2', auth: ['special:fund:add']},
|
||||||
// {name: '导出', key: '_export', color: '#DED0B2', auth: ''},
|
// {name: '导出', key: '_export', color: '#DED0B2', auth: ''},
|
||||||
]
|
]
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user