diff --git a/src/views/EquipmentEntryApply/EquipmentDetailList.vue b/src/views/EquipmentEntryApply/EquipmentDetailList.vue index 67f01b13..847712a5 100644 --- a/src/views/EquipmentEntryApply/EquipmentDetailList.vue +++ b/src/views/EquipmentEntryApply/EquipmentDetailList.vue @@ -70,7 +70,7 @@ - + 查询 @@ -189,7 +189,7 @@ - + diff --git a/src/views/EquipmentEntryApply/EquipmentMainList.vue b/src/views/EquipmentEntryApply/EquipmentMainList.vue index de88bf59..cbd3ee83 100644 --- a/src/views/EquipmentEntryApply/EquipmentMainList.vue +++ b/src/views/EquipmentEntryApply/EquipmentMainList.vue @@ -24,12 +24,12 @@ - + 查询 - - 重置 + + 重置 @@ -38,7 +38,7 @@ - + 装备录入 diff --git a/src/views/EquipmentEntryApply/equipmentInput/index.vue b/src/views/EquipmentEntryApply/equipmentInput/index.vue index 2e9f7dac..2fcb5cf6 100644 --- a/src/views/EquipmentEntryApply/equipmentInput/index.vue +++ b/src/views/EquipmentEntryApply/equipmentInput/index.vue @@ -144,9 +144,8 @@ v-model.trim="queryParams.maxBuyPrice" /> - - - + + 查询 @@ -155,6 +154,14 @@ > 重置 + + + + + + + + @@ -169,6 +176,7 @@ size="mini" @click="equipmentDeployment" v-show="!isAddVisible" + style="margin-right: -12px" > 新增装备 diff --git a/src/views/EquipmentEntryApproval/EquipmentMainList.vue b/src/views/EquipmentEntryApproval/EquipmentMainList.vue index f8ff9a8f..53a7f7de 100644 --- a/src/views/EquipmentEntryApproval/EquipmentMainList.vue +++ b/src/views/EquipmentEntryApproval/EquipmentMainList.vue @@ -4,12 +4,12 @@ :model="queryParams" ref="queryFormRef" :inline="false" - label-width="100px" + label-width="auto" size="small" > - + - - + + - + 查询 @@ -94,7 +94,7 @@ /> - + diff --git a/src/views/EquipmentRetire/index.vue b/src/views/EquipmentRetire/index.vue index 9b498531..b5e12f87 100644 --- a/src/views/EquipmentRetire/index.vue +++ b/src/views/EquipmentRetire/index.vue @@ -4,9 +4,9 @@ - + - + - - + + - + - + - + - + @@ -30,6 +30,7 @@ --> - + 查询 重置 diff --git a/src/views/EquipmentRetireApply/index.vue b/src/views/EquipmentRetireApply/index.vue index 1757c55c..a10c7e47 100644 --- a/src/views/EquipmentRetireApply/index.vue +++ b/src/views/EquipmentRetireApply/index.vue @@ -1,16 +1,16 @@ @@ -359,4 +365,23 @@ export default { gap: 10px; /* 统一设置内部元素的间距 */ width: 100%; } + +.search-box { + margin-bottom: 20px; + border-radius: 8px; + padding: 0; + + ::v-deep .el-card__body { + padding: 20px !important; + } +} + +.table-container { + flex: 1; + overflow: hidden; + margin-bottom: 0; + min-height: 0; + display: flex; + flex-direction: column; +} diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index 3d2db01b..d7c263da 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -37,7 +37,7 @@ icon="el-icon-search" size="mini" @click="handleQuery" - >搜索查询 - 搜索 + 查询 重置 diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue index ca892068..bf81fce8 100644 --- a/src/views/system/dict/index.vue +++ b/src/views/system/dict/index.vue @@ -1,6 +1,8 @@ @@ -360,4 +366,24 @@ export default { gap: 10px; /* 统一设置内部元素的间距 */ width: 100%; } + + + .search-box { + margin-bottom: 20px; + border-radius: 8px; + padding: 0; + + ::v-deep .el-card__body { + padding: 20px !important; + } + } + + .table-container { + flex: 1; + overflow: hidden; + margin-bottom: 0; + min-height: 0; + display: flex; + flex-direction: column; + } diff --git a/src/views/system/log/abnormalLog/index.vue b/src/views/system/log/abnormalLog/index.vue index 0682f748..c062acb0 100644 --- a/src/views/system/log/abnormalLog/index.vue +++ b/src/views/system/log/abnormalLog/index.vue @@ -1,17 +1,22 @@ diff --git a/src/views/system/log/businessLog/index.vue b/src/views/system/log/businessLog/index.vue index 1d2aa208..0b23278e 100644 --- a/src/views/system/log/businessLog/index.vue +++ b/src/views/system/log/businessLog/index.vue @@ -1,17 +1,24 @@ diff --git a/src/views/system/log/logAnalyse/index.vue b/src/views/system/log/logAnalyse/index.vue index 94c976bd..395305ee 100644 --- a/src/views/system/log/logAnalyse/index.vue +++ b/src/views/system/log/logAnalyse/index.vue @@ -1,6 +1,11 @@ diff --git a/src/views/system/log/systemLog/index.vue b/src/views/system/log/systemLog/index.vue index 1fd12ca8..81974b95 100644 --- a/src/views/system/log/systemLog/index.vue +++ b/src/views/system/log/systemLog/index.vue @@ -1,17 +1,24 @@ diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index 53590071..0d44f173 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -1,6 +1,8 @@ @@ -499,4 +505,23 @@ export default { gap: 10px; /* 统一设置内部元素的间距 */ width: 100%; } + +.search-box { + margin-bottom: 20px; + border-radius: 8px; + padding: 0; + + ::v-deep .el-card__body { + padding: 20px !important; + } +} + +.table-container { + flex: 1; + overflow: hidden; + margin-bottom: 0; + min-height: 0; + display: flex; + flex-direction: column; +} diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue index 518d3491..ba4d2f6f 100644 --- a/src/views/system/notice/index.vue +++ b/src/views/system/notice/index.vue @@ -1,6 +1,8 @@ @@ -495,4 +501,23 @@ export default { gap: 10px; /* 统一设置内部元素的间距 */ width: 100%; } + +.search-box { + margin-bottom: 20px; + border-radius: 8px; + padding: 0; + + ::v-deep .el-card__body { + padding: 20px !important; + } +} + +.table-container { + flex: 1; + overflow: hidden; + margin-bottom: 0; + min-height: 0; + display: flex; + flex-direction: column; +} diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue index 5d5ef882..974912a7 100644 --- a/src/views/system/post/index.vue +++ b/src/views/system/post/index.vue @@ -1,6 +1,8 @@ @@ -319,4 +325,23 @@ export default { gap: 10px; /* 统一设置内部元素的间距 */ width: 100%; } + +.search-box { + margin-bottom: 20px; + border-radius: 8px; + padding: 0; + + ::v-deep .el-card__body { + padding: 20px !important; + } +} + +.table-container { + flex: 1; + overflow: hidden; + margin-bottom: 0; + min-height: 0; + display: flex; + flex-direction: column; +} diff --git a/src/views/system/project/index.vue b/src/views/system/project/index.vue index 840c1278..5d83bf83 100644 --- a/src/views/system/project/index.vue +++ b/src/views/system/project/index.vue @@ -10,7 +10,8 @@ :model="searchParams" > - + +
- - -
diff --git a/src/views/system/role/selectUser.vue b/src/views/system/role/selectUser.vue index b2b072f9..9507502f 100644 --- a/src/views/system/role/selectUser.vue +++ b/src/views/system/role/selectUser.vue @@ -19,7 +19,7 @@ />
- 搜索 + 查询 重置
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 7862180e..6b769ed0 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -54,7 +54,7 @@ - 搜索 + 查询 重置 diff --git a/src/views/tool/gen/importTable.vue b/src/views/tool/gen/importTable.vue index 3ea9532b..3aa4a770 100644 --- a/src/views/tool/gen/importTable.vue +++ b/src/views/tool/gen/importTable.vue @@ -19,7 +19,7 @@ /> - 搜索 + 查询 重置 diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue index 881f8c2c..7e0ee6b9 100644 --- a/src/views/tool/gen/index.vue +++ b/src/views/tool/gen/index.vue @@ -29,7 +29,7 @@ > - 搜索 + 查询 重置 diff --git a/src/views/toolsManage/codeToolsLedger/index.vue b/src/views/toolsManage/codeToolsLedger/index.vue index 8f6738b2..0b17599f 100644 --- a/src/views/toolsManage/codeToolsLedger/index.vue +++ b/src/views/toolsManage/codeToolsLedger/index.vue @@ -73,7 +73,7 @@ - + 查询 重置 diff --git a/src/views/toolsManage/toolsApplication/applicantList.vue b/src/views/toolsManage/toolsApplication/applicantList.vue index a59d0442..ef8ccf5e 100644 --- a/src/views/toolsManage/toolsApplication/applicantList.vue +++ b/src/views/toolsManage/toolsApplication/applicantList.vue @@ -4,7 +4,7 @@ - + - 新增工具 + 新增工具 diff --git a/src/views/toolsManage/toolsApplication/components/AddCode.vue b/src/views/toolsManage/toolsApplication/components/AddCode.vue index 739b3874..32823b45 100644 --- a/src/views/toolsManage/toolsApplication/components/AddCode.vue +++ b/src/views/toolsManage/toolsApplication/components/AddCode.vue @@ -10,6 +10,7 @@ size="small" inline @submit.native.prevent + style="height: 32px;" > @@ -54,7 +55,7 @@ style="width: 240px" /> - + 点击填充 diff --git a/src/views/toolsManage/toolsApplication/components/AddNum.vue b/src/views/toolsManage/toolsApplication/components/AddNum.vue index 39dfa129..c26ee6f9 100644 --- a/src/views/toolsManage/toolsApplication/components/AddNum.vue +++ b/src/views/toolsManage/toolsApplication/components/AddNum.vue @@ -10,7 +10,7 @@ :props="{ value: 'typeId', label: 'typeName' }" clearable @change="handleChange" - style="width: 400px" + style="width: 240px" /> diff --git a/src/views/toolsManage/toolsApprove/approveList.vue b/src/views/toolsManage/toolsApprove/approveList.vue index 0527516f..0ad3c312 100644 --- a/src/views/toolsManage/toolsApprove/approveList.vue +++ b/src/views/toolsManage/toolsApprove/approveList.vue @@ -4,7 +4,7 @@ - +