Merge remote-tracking branch 'origin/feature_dev_20221129_UI' into fix_2nd_period

# Conflicts:
#	jero-web/src/components/tableCollection/index1.vue
#	jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
#	jero-web/src/views/documentManage/collection/index.vue
#	jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
#	jero-web/src/views/projectManagement/components/listOfRegulations.vue
#	jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue
#	jero-web/src/views/projectManagement/projectStatusBoard/index.vue
This commit is contained in:
高嵩
2022-12-30 15:53:39 +08:00
129 changed files with 1418 additions and 765 deletions
@@ -42,6 +42,7 @@
v-model="formInline.paramsName"></a-input>
</div>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('dre')">
@@ -70,10 +71,15 @@
v-model="formInline.sdtName"/>
</div>
</a-col>
</template>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</a-col>
</span>
</a-row>
@@ -87,11 +93,11 @@
{{$t('preservation')}}
</div>
<div @click="ConventionalExport" class="operator-text" v-has="'report:detail:export:normal'">
<a-icon type="download"/>
<a-icon type="export" :rotate="-90"/>
{{$t('ConventionalExport')}}
</div>
<div @click="CustomExport" class="operator-text" v-has="'report:detail:export:custom'">
<a-icon type="download"/>
<a-icon type="export" :rotate="-90"/>
{{$t('CustomExport')}}
</div>
</div>
@@ -163,6 +169,7 @@
},
data() {
return {
toggleSearchStatus: false,
columns: [],
selectedRowKeys: [],
formInline: {},
@@ -236,6 +243,9 @@
document.title = this.$t('ParameterViewPage')
},
methods: {
handleToggleSearch() {
this.toggleSearchStatus = !this.toggleSearchStatus
},
Getlist() {
getAction(this.url.tableHeader, { paramsManifestId: this.$route.query.id, flag: 8 }).then((res) => {
if (res.success) {
@@ -475,7 +485,7 @@
.Virtual-detail-content {
margin-top: 68px;
padding: 0 38px 0 38px;
padding: 0 0 0 38px;
box-sizing: border-box;
font-size: 16px;