WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

参数项收集清单-动态表头添加认证类型

Browse Source
This commit is contained in:
zhn
2023-10-30 18:00:57 +08:00
parent 2fded9534a
commit e70a42c824
2 changed files with 1125 additions and 1094 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+21
View File
@@ -1533,6 +1533,23 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
//过滤列表字段(is_show_list-->列表是否显示0否 1是) //过滤列表字段(is_show_list-->列表是否显示0否 1是)
fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList()))).collect(Collectors.toList()); fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList()))).collect(Collectors.toList());
} }
//参数项认证清单-认证类型
List<String> categoryList = new ArrayList<>();
if(ModuleEnum.PARAMS_COLLECT_MANIFEST.getValue().equals(flag)){
List<SysDictItem> sysDictItemList = sysDictItemService.selectItemsByDictCode("cert_category");
if(ObjectUtil.isNotEmpty(sysDictItemList)){
categoryList = sysDictItemList.stream().map(SysDictItem::getItemValue).collect(Collectors.toList());
}
List<OnlCgformField> onlCgformFieldList = new LinkedList<>();
for (SysDictItem sysDictItem : sysDictItemList) {
OnlCgformField onlCgformField = new OnlCgformField();
onlCgformField.setDbFieldTxt(sysDictItem.getItemText());
onlCgformField.setDbFieldEnName(sysDictItem.getEnName());
onlCgformField.setDbFieldName(sysDictItem.getItemValue());
onlCgformFieldList.add(onlCgformField);
}
fieldList.addAll(onlCgformFieldList);
}
ParamsManifestEO paramsManifestEO = paramsManifestEOService.getById(paramsManifestId); ParamsManifestEO paramsManifestEO = paramsManifestEOService.getById(paramsManifestId);
List<ParamsConfigEO> paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); List<ParamsConfigEO> paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId);
List<Map<String, Object>> listConfig = new LinkedList<>(); List<Map<String, Object>> listConfig = new LinkedList<>();
@@ -1590,6 +1607,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
if (!"references_col".equals(dbFieldName)) { if (!"references_col".equals(dbFieldName)) {
map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName)); map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName));
} }
if(ObjectUtil.isNotEmpty(categoryList) && categoryList.contains(dbFieldName)){
map.put("show", "1");//认证类型动态表头默认不展示，列表设置展示，用show=1来区分
map.put("sort", "true");
}
if (CutEnum.CN.getValue().equals(cut)) { if (CutEnum.CN.getValue().equals(cut)) {
if ("references_col".equals(dbFieldName)) { if ("references_col".equals(dbFieldName)) {
if (ObjectUtils.isNotEmpty(paramsManifestEO) && StringUtils.isNotBlank(paramsManifestEO.getReferencesColName())) { if (ObjectUtils.isNotEmpty(paramsManifestEO) && StringUtils.isNotBlank(paramsManifestEO.getReferencesColName())) {
jero-web/src/components/tableCollection/index.vue
+86 -76
View File
@@ -25,7 +25,7 @@
</span> </span>
<div :slot="'titleName'+(index+1)" v-for="(item,index) in content"> <div :slot="'titleName'+(index+1)" v-for="(item,index) in content">
<span v-if="item.isLock == 1" style="padding-right: 20px"><a-icon type="lock" theme="twoTone" <span v-if="item.isLock == 1" style="padding-right: 20px"><a-icon type="lock" theme="twoTone"
two-tone-color="#00B3BE" /></span> two-tone-color="#00B3BE"/></span>
<span style="padding-right: 10px">{{ item.db_field_txt }} </span> <span style="padding-right: 10px">{{ item.db_field_txt }} </span>
<a-button @click="onClickSee(item)">{{ $t('See') }}</a-button> <a-button @click="onClickSee(item)">{{ $t('See') }}</a-button>
</div> </div>
@@ -85,7 +85,7 @@
<collection-type :detailDate="text" :recordList="record" :columName="content" <collection-type :detailDate="text" :recordList="record" :columName="content"
:currentPersonRole="currentPersonRole" :currentPersonRole="currentPersonRole"
@consolidateData="consolidateData" @consolidateData="consolidateData"
@collectionForm="collectionForm" /> @collectionForm="collectionForm"/>
</span> </span>
</a-table> </a-table>
</div> </div>
@@ -169,7 +169,7 @@
@input="handleInput('queryzr')" @input="handleInput('queryzr')"
:placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')" :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
:type="'select'" :type="'select'"
:triggerChange="false" :dictCode="'duty_territory'" /> :triggerChange="false" :dictCode="'duty_territory'"/>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row> </a-row>
@@ -281,18 +281,18 @@
</template> </template>
<script> <script>
import eventBUs from '../../common/event' import eventBUs from '../../common/event'
import { getAction, postAction } from '@/api/manage' import {getAction, postAction} from '@/api/manage'
import CollectionType from '@/components/CollectionType' import CollectionType from '@/components/CollectionType'
import { ACCESS_TOKEN } from '@/store/mutation-types' import {ACCESS_TOKEN} from '@/store/mutation-types'
import axios from 'axios' import axios from 'axios'
import Vue from 'vue' import Vue from 'vue'
// import VueDraggableResizable from 'vue-draggable-resizable' // import VueDraggableResizable from 'vue-draggable-resizable'
import { mapGetters } from 'vuex' import {mapGetters} from 'vuex'
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' import {ResizeHeader, ResizeColumnProvide} from '@/mixins/header'
import historyTable from './historyTable.vue' import historyTable from './historyTable.vue'
export default { export default {
name: 'index', name: 'index',
mixins: [ResizeHeader, ResizeColumnProvide], mixins: [ResizeHeader, ResizeColumnProvide],
props: { props: {
@@ -412,12 +412,12 @@ export default {
] ]
}, },
wrapperCol: { wrapperCol: {
xs: { span: 24 }, xs: {span: 24},
sm: { span: 14 } sm: {span: 14}
}, },
labelCol: { labelCol: {
xs: { span: 24 }, xs: {span: 24},
sm: { span: 7 } sm: {span: 7}
}, },
queryParamQuery: {}, queryParamQuery: {},
queryParam: {}, queryParam: {},
@@ -436,7 +436,7 @@ export default {
align: 'left', align: 'left',
width: 320, width: 320,
ellipsis: true, ellipsis: true,
scopedSlots: { customRender: 'content' } scopedSlots: {customRender: 'content'}
}, },
{ {
title: this.$t('OperationTime'), title: this.$t('OperationTime'),
@@ -457,7 +457,7 @@ export default {
}, },
watch: { watch: {
currentPersonRole: { currentPersonRole: {
handler: function() { handler: function () {
this.getTableList() this.getTableList()
}, },
immediate: true immediate: true
@@ -475,7 +475,7 @@ export default {
}, },
handleInput(value) { handleInput(value) {
this.$nextTick(() => { this.$nextTick(() => {
this.Dateline = { ...this.Dateline } this.Dateline = {...this.Dateline}
this.$refs.ruleFormOne.validateField([value]) this.$refs.ruleFormOne.validateField([value])
}) })
}, },
@@ -514,7 +514,7 @@ export default {
axios({ axios({
url: url, url: url,
method: 'get', method: 'get',
transformRequest: [function(data) { transformRequest: [function (data) {
let ret = '' let ret = ''
for (let it in data) { for (let it in data) {
ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&' ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
@@ -568,7 +568,7 @@ export default {
url: '/jero-boot/params/collectManifest/updateDutyTerritory', url: '/jero-boot/params/collectManifest/updateDutyTerritory',
method: 'post', method: 'post',
data: param, data: param,
transformRequest: [function(data) { transformRequest: [function (data) {
let ret = '' let ret = ''
for (let it in data) { for (let it in data) {
ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&' ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
@@ -602,14 +602,14 @@ export default {
// 工程接口人 保存 // 工程接口人 保存
handleSubmit(record) { handleSubmit(record) {
let _this = this let _this = this
let param = { sdt: this.Dateline.querySdt, ids: this.getquerySdtId } let param = {sdt: this.Dateline.querySdt, ids: this.getquerySdtId}
this.$refs.ruleForm.validate(valid => { this.$refs.ruleForm.validate(valid => {
if (valid) { if (valid) {
axios({ axios({
url: '/jero-boot/params/collectManifest/updateSdt', url: '/jero-boot/params/collectManifest/updateSdt',
method: 'post', method: 'post',
data: param, data: param,
transformRequest: [function(data) { transformRequest: [function (data) {
let ret = '' let ret = ''
for (let it in data) { for (let it in data) {
ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&' ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
@@ -652,7 +652,7 @@ export default {
// this.$refs.ruleForm.clearValidate() // this.$refs.ruleForm.clearValidate()
this.$nextTick(() => { this.$nextTick(() => {
this.Dateline = { ...this.Dateline } this.Dateline = {...this.Dateline}
this.getquerySdtList(record) this.getquerySdtList(record)
this.$refs.ruleForm.clearValidate() this.$refs.ruleForm.clearValidate()
}) })
@@ -663,7 +663,7 @@ export default {
// this.$refs.ruleForm.clearValidate() // this.$refs.ruleForm.clearValidate()
this.$nextTick(() => { this.$nextTick(() => {
this.Dateline = { ...this.Dateline } this.Dateline = {...this.Dateline}
this.getquerySdtId = record.id this.getquerySdtId = record.id
this.$refs.ruleFormOne.clearValidate() this.$refs.ruleFormOne.clearValidate()
}) })
@@ -754,7 +754,7 @@ export default {
} }
getAction('/params/userTypeLog/queryCurrentType', query).then((res) => { getAction('/params/userTypeLog/queryCurrentType', query).then((res) => {
if (res.success) { if (res.success) {
this.queryParamQuery = { ...this.queryParamQuery } this.queryParamQuery = {...this.queryParamQuery}
if (res.result && res.result.userType) { if (res.result && res.result.userType) {
if (!(result.some(val => val.value == res.result.userType))) { if (!(result.some(val => val.value == res.result.userType))) {
@@ -908,7 +908,10 @@ export default {
if (res.headFieldCn == '操作') { if (res.headFieldCn == '操作') {
res.field = 'operation' res.field = 'operation'
} }
if (!res.show) {
checkedList.push(res.field) checkedList.push(res.field)
}
// checkedList.push(res.field)
if (res.type) { if (res.type) {
// console.log('配置') // console.log('配置')
this.columns.push({ this.columns.push({
@@ -934,7 +937,8 @@ export default {
// ellipsis: true, // ellipsis: true,
fixed: res.click5 ? 'left' : '', fixed: res.click5 ? 'left' : '',
sorter: res.sort, sorter: res.sort,
width: 160 width: 160,
show: res.show
}) })
this.columns[index].scopedSlots = { this.columns[index].scopedSlots = {
customRender: 'titleName' customRender: 'titleName'
@@ -980,6 +984,12 @@ export default {
this.colIndexs.push(index) this.colIndexs.push(index)
} }
}) })
for (let i = 0; i < this.columns.length; i++) {
if (this.columns[i].show == '1') {
this.columns.splice(i, 1)
i--
}
}
this.columns = [...this.columns] this.columns = [...this.columns]
this.colIndexs.forEach((item) => { this.colIndexs.forEach((item) => {
this.minWidthColumns.push([this.columns[item], 300]) this.minWidthColumns.push([this.columns[item], 300])
@@ -1246,10 +1256,10 @@ export default {
// this.$emit('detailClick', item) // this.$emit('detailClick', item)
} }
} }
} }
</script> </script>
<style lang="less"> <style lang="less">
.imports-footer { .imports-footer {
.imports-footer-wrap { .imports-footer-wrap {
margin: 20px 0; margin: 20px 0;
text-align: center; text-align: center;
@@ -1258,17 +1268,17 @@ export default {
margin-right: 20px; margin-right: 20px;
} }
} }
} }
.table .ant-table-column-title { .table .ant-table-column-title {
font-weight: bold; font-weight: bold;
} }
.textData { .textData {
font-family: cursive; font-family: cursive;
} }
.nio-drag-handler { .nio-drag-handler {
position: absolute; position: absolute;
right: 0; right: 0;
top: 0; top: 0;
@@ -1276,53 +1286,53 @@ export default {
width: 5px; width: 5px;
z-index: 1; z-index: 1;
border-right: 1px #e8e8e8 solid; border-right: 1px #e8e8e8 solid;
} }
.nio-drag-handler:hover, .nio-drag-handler:hover,
.nio-drag-handler:focus { .nio-drag-handler:focus {
cursor: col-resize !important; cursor: col-resize !important;
border-right: 2px solid #0bd9d9 !important; border-right: 2px solid #0bd9d9 !important;
} }
.nio-header-th { .nio-header-th {
position: relative; position: relative;
isolation: isolate; isolation: isolate;
} }
</style> </style>
<style scoped lang="less"> <style scoped lang="less">
@import '~@assets/less/common.less'; @import '~@assets/less/common.less';
.box { .box {
width: 100%; width: 100%;
height: calc(100% - 100px); height: calc(100% - 100px);
overflow: auto; overflow: auto;
} }
.text { .text {
margin-right: 10px; margin-right: 10px;
} }
.page { .page {
text-align: right; text-align: right;
margin-top: 20px; margin-top: 20px;
} }
/deep/ .ant-table-tbody .yellow { /deep/ .ant-table-tbody .yellow {
background-color: #ffff001f !important; background-color: #ffff001f !important;
height: 40px !important; height: 40px !important;
border: none !important; border: none !important;
padding: 0 !important; padding: 0 !important;
} }
//::v-deep .ant-table-row:first-child { //::v-deep .ant-table-row:first-child {
// background: #fff!important; // background: #fff!important;
// /*opacity: 0.9;*/ // /*opacity: 0.9;*/
//} //}
// //
//::v-deep .ant-table-body { //::v-deep .ant-table-body {
// background: transparent!important; // background: transparent!important;
//} //}
.content-text { .content-text {
width: 100%; width: 100%;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
@@ -1383,9 +1393,9 @@ export default {
font-weight: 400; font-weight: 400;
} }
} }
} }
.textName { .textName {
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
display: -webkit-box; display: -webkit-box;
@@ -1396,26 +1406,26 @@ export default {
/*! autoprefixer: on;*/ /*! autoprefixer: on;*/
text-justify: inter-ideograph; text-justify: inter-ideograph;
word-break: break-all word-break: break-all
} }
::v-deep .ant-table-placeholder { ::v-deep .ant-table-placeholder {
margin-top: 8px !important; margin-top: 8px !important;
} }
.box-button-text { .box-button-text {
white-space: pre-wrap; white-space: pre-wrap;
word-break: break-all; word-break: break-all;
width: 40%; width: 40%;
float: left; float: left;
text-align: left; text-align: left;
} }
</style> </style>
<style> <style>
.resize-table-th { .resize-table-th {
position: relative; position: relative;
} }
.table-draggable-handle { .table-draggable-handle {
/* width: 10px !important; */ /* width: 10px !important; */
height: 100% !important; height: 100% !important;
left: auto !important; left: auto !important;
@@ -1426,14 +1436,14 @@ export default {
position: absolute; position: absolute;
transform: none !important; transform: none !important;
bottom: 0; bottom: 0;
} }
.rowClassRed { .rowClassRed {
background: #f3d9de; background: #f3d9de;
} }
.rowClassRedYellow { .rowClassRedYellow {
background: yellow; background: yellow;
} }
</style> </style>