Merge branch 'main' of http://8.130.49.250:3000/admin/gr_report_web
This commit is contained in:
@@ -237,7 +237,7 @@ const initTable = async () => {
|
|||||||
type: 'input',
|
type: 'input',
|
||||||
overHidden: true,
|
overHidden: true,
|
||||||
isExport: item.isExport == 'Y',
|
isExport: item.isExport == 'Y',
|
||||||
search: item.queryIsWeb == 'Y',
|
search: item.queryIsWeb == 'Y'&&item.isHideSearch !== 'Y',
|
||||||
fixed: true
|
fixed: true
|
||||||
}
|
}
|
||||||
tableOption.value.column[item.fieldCode] = config
|
tableOption.value.column[item.fieldCode] = config
|
||||||
@@ -265,11 +265,11 @@ const initTable = async () => {
|
|||||||
overHidden: true,
|
overHidden: true,
|
||||||
isExport: item.isExport == 'Y',
|
isExport: item.isExport == 'Y',
|
||||||
sortable: item.isShowSort == 'Y' ? 'custom' : false,
|
sortable: item.isShowSort == 'Y' ? 'custom' : false,
|
||||||
search: item.queryIsWeb == 'Y',
|
search: item.queryIsWeb == 'Y'&&item.isHideSearch !== 'Y',
|
||||||
_hasChildConfig: childFieldConfigs.has(item.fieldCode),
|
_hasChildConfig: childFieldConfigs.has(item.fieldCode),
|
||||||
_childConfigs: childFieldConfigs.get(item.fieldCode) || []
|
_childConfigs: childFieldConfigs.get(item.fieldCode) || []
|
||||||
}
|
}
|
||||||
if(item.queryIsWeb == 'Y') isSearch.value=true
|
if(item.queryIsWeb == 'Y'&&item.isHideSearch !== 'Y') isSearch.value=true
|
||||||
if(!!item.searchDefaultValue){
|
if(!!item.searchDefaultValue){
|
||||||
if(['年','年度','年份'].includes(item.fieldName)&&item.searchDefaultValue=='本年'){
|
if(['年','年度','年份'].includes(item.fieldName)&&item.searchDefaultValue=='本年'){
|
||||||
tableSearch.value[config.prop]=getCurrentDate().year
|
tableSearch.value[config.prop]=getCurrentDate().year
|
||||||
|
|||||||
@@ -153,8 +153,8 @@ $prefix-cls: #{$namespace}-login;
|
|||||||
}
|
}
|
||||||
|
|
||||||
.module img {
|
.module img {
|
||||||
width: 80px;
|
width: 72px;
|
||||||
height: 80px;
|
height: 72px;
|
||||||
margin-bottom: 16px;
|
margin-bottom: 16px;
|
||||||
object-fit: contain;
|
object-fit: contain;
|
||||||
}
|
}
|
||||||
@@ -176,8 +176,8 @@ $prefix-cls: #{$namespace}-login;
|
|||||||
background: linear-gradient(180deg, rgb(109 147 245 / 75%), rgb(7 38 111 / 75%));
|
background: linear-gradient(180deg, rgb(109 147 245 / 75%), rgb(7 38 111 / 75%));
|
||||||
|
|
||||||
img {
|
img {
|
||||||
width: 140px;
|
width: 130px;
|
||||||
height: 140px;
|
height: 130px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -164,6 +164,7 @@ const infoColumn = {
|
|||||||
dictCode: { title: '字典Code', width: 180, editRender: { name: 'LowSelect', verifyEdit: true, filterable: true, noStop: true, dicData: [] } },
|
dictCode: { title: '字典Code', width: 180, editRender: { name: 'LowSelect', verifyEdit: true, filterable: true, noStop: true, dicData: [] } },
|
||||||
isExport: { title: '是否可导出', width: 90, align: "center", editRender: { name: 'LowCheckbox' } },
|
isExport: { title: '是否可导出', width: 90, align: "center", editRender: { name: 'LowCheckbox' } },
|
||||||
isHideCol: { title: '隐藏列', width: 90, align: "center", editRender: { name: 'LowCheckbox' } },
|
isHideCol: { title: '隐藏列', width: 90, align: "center", editRender: { name: 'LowCheckbox' } },
|
||||||
|
isHideSearch: { title: '隐藏搜索', width: 90, align: "center", editRender: { name: 'LowCheckbox' } },
|
||||||
isAmount: { title: '是否合计', width: 75, align: "center", editRender: { name: 'LowCheckboxSum' } },
|
isAmount: { title: '是否合计', width: 75, align: "center", editRender: { name: 'LowCheckboxSum' } },
|
||||||
isDimension: { title: '是否维度', width: 75, align: "center", editRender: { name: 'LowCheckbox' } },
|
isDimension: { title: '是否维度', width: 75, align: "center", editRender: { name: 'LowCheckbox' } },
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user