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

UI界面变更-对外报告管理-法规技术评估

Browse Source
This commit is contained in:
刘彦泽
2022-12-29 10:10:52 +08:00
parent 5713158153
commit 6d2a598342
6 changed files with 73 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
+6 -6
View File
@@ -150,37 +150,37 @@
{ {
title: this.$t('clauseNo'), title: this.$t('clauseNo'),
dataIndex: 'itemNum', dataIndex: 'itemNum',
align: 'center', align: 'left',
ellipsis: true, ellipsis: true,
width: 120 width: 120
}, },
{ {
title: this.$t('clauseName'), title: this.$t('clauseName'),
dataIndex: 'itemName', dataIndex: 'itemName',
align: 'center', align: 'left',
ellipsis: true ellipsis: true
}, },
{ {
title: this.$t('clauseContent'), title: this.$t('clauseContent'),
dataIndex: 'itemContent', dataIndex: 'itemContent',
align: 'center', align: 'left',
scopedSlots: { customRender: 'clauseContent' } scopedSlots: { customRender: 'clauseContent' }
}, },
{ {
title: this.$t('evaluationMethod'), title: this.$t('evaluationMethod'),
dataIndex: 'evaluationMethods', dataIndex: 'evaluationMethods',
align: 'center', align: 'left',
scopedSlots: { customRender: 'evaluationMethod' } scopedSlots: { customRender: 'evaluationMethod' }
}, },
{ {
title: this.$t('Assessor'), title: this.$t('Assessor'),
dataIndex: 'Assessor', dataIndex: 'Assessor',
align: 'center', align: 'left',
scopedSlots: { customRender: 'Assessor' } scopedSlots: { customRender: 'Assessor' }
}, },
{ {
title: this.$t('operation'), title: this.$t('operation'),
align: 'center', align: 'left',
width: 120, width: 120,
scopedSlots: { customRender: 'operation' } scopedSlots: { customRender: 'operation' }
} }
jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue
+9 -5
View File
@@ -109,7 +109,7 @@
{ {
title: this.$t('engineer'), title: this.$t('engineer'),
dataIndex: 'createBy', dataIndex: 'createBy',
align: 'center', align: 'left',
width: 160, width: 160,
ellipsis: true, ellipsis: true,
customRender: (value, row, index) => { customRender: (value, row, index) => {
@@ -128,7 +128,7 @@
{ {
title: this.$t('complianceResults'), title: this.$t('complianceResults'),
dataIndex: 'complianceResultName', dataIndex: 'complianceResultName',
align: 'center', align: 'left',
width: 160, width: 160,
ellipsis: true, ellipsis: true,
customRender: (value, row, index) => { customRender: (value, row, index) => {
@@ -147,20 +147,20 @@
{ {
title: this.$t('relevantSections'), title: this.$t('relevantSections'),
dataIndex: 'relatedSection', dataIndex: 'relatedSection',
align: 'center', align: 'left',
width: 160, width: 160,
ellipsis: true ellipsis: true
}, },
{ {
title: this.$t('problemDescription'), title: this.$t('problemDescription'),
dataIndex: 'issueOrSuggest', dataIndex: 'issueOrSuggest',
align: 'center', align: 'left',
ellipsis: true ellipsis: true
}, },
{ {
title: this.$t('enclosure'), title: this.$t('enclosure'),
dataIndex: 'accessoryFile', dataIndex: 'accessoryFile',
align: 'center', align: 'left',
width: 160, width: 160,
ellipsis: true, ellipsis: true,
scopedSlots: { customRender: 'accessoryFile' } scopedSlots: { customRender: 'accessoryFile' }
@@ -425,6 +425,10 @@
.operator-text-feed { .operator-text-feed {
margin-top: 27px; margin-top: 27px;
} }
/deep/.ant-table-column-title{
font-weight: bold!important;
}
</style> </style>
<style> <style>
.box-clause .ant-card-body { .box-clause .ant-card-body {
jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
+7 -7
View File
@@ -303,7 +303,7 @@
columns: [ columns: [
{ {
title: this.$t('standard'), title: this.$t('standard'),
align: 'center', align: 'left',
dataIndex: 'serial_number', dataIndex: 'serial_number',
width: 170, width: 170,
ellipsis: true, ellipsis: true,
@@ -311,7 +311,7 @@
}, },
{ {
title: this.$t('title'), title: this.$t('title'),
align: 'center', align: 'left',
dataIndex: 'title', dataIndex: 'title',
ellipsis: true, ellipsis: true,
width: 170, width: 170,
@@ -319,34 +319,34 @@
}, },
{ {
title: this.$t('status'), title: this.$t('status'),
align: 'center', align: 'left',
width: 140, width: 140,
ellipsis: true, ellipsis: true,
dataIndex: 'state' dataIndex: 'state'
}, },
{ {
title: this.$t('zoneOfApplication'), title: this.$t('zoneOfApplication'),
align: 'center', align: 'left',
width: 170, width: 170,
ellipsis: true, ellipsis: true,
dataIndex: 'region' dataIndex: 'region'
}, },
{ {
title: this.$t('technicalField'), title: this.$t('technicalField'),
align: 'center', align: 'left',
ellipsis: true, ellipsis: true,
width: 170, width: 170,
dataIndex: 'technology_territory' dataIndex: 'technology_territory'
}, },
{ {
title: this.$t('correspondingStandard'), title: this.$t('correspondingStandard'),
align: 'center', align: 'left',
ellipsis: true, ellipsis: true,
width: 170, width: 170,
dataIndex: 'corresponding_standard' dataIndex: 'corresponding_standard'
}, },
{ {
align: 'center', align: 'left',
ellipsis: true, ellipsis: true,
width: 170, width: 170,
scopedSlots: { scopedSlots: {
jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue
+5 -5
View File
@@ -144,34 +144,34 @@
{ {
title: this.$t('clauseNo'), title: this.$t('clauseNo'),
dataIndex: 'items_num', dataIndex: 'items_num',
align: 'center', align: 'left',
width: 180, width: 180,
ellipsis: true ellipsis: true
}, },
{ {
title: this.$t('clauseName'), title: this.$t('clauseName'),
dataIndex: 'items_name', dataIndex: 'items_name',
align: 'center', align: 'left',
width: 180, width: 180,
ellipsis: true ellipsis: true
}, },
{ {
title: this.$t('clauseContent'), title: this.$t('clauseContent'),
dataIndex: 'iterms_conditions', dataIndex: 'iterms_conditions',
align: 'center', align: 'left',
scopedSlots: { customRender: 'clauseContent' } scopedSlots: { customRender: 'clauseContent' }
}, },
{ {
title: this.$t('technicalField'), title: this.$t('technicalField'),
dataIndex: 'technology_territory', dataIndex: 'technology_territory',
align: 'center', align: 'left',
width: 180, width: 180,
ellipsis: true ellipsis: true
}, },
{ {
title: this.$t('informationCategory'), title: this.$t('informationCategory'),
dataIndex: 'information_category', dataIndex: 'information_category',
align: 'center', align: 'left',
width: 180, width: 180,
ellipsis: true ellipsis: true
} }
jero-web/src/views/businessSupport/technologyAssessment/index.vue
+10 -10
View File
@@ -229,70 +229,70 @@
columns: [ columns: [
{ {
title: this.$t('standard'), title: this.$t('standard'),
align: 'center', align: 'left',
dataIndex: 'serialNumber', dataIndex: 'serialNumber',
ellipsis: true, ellipsis: true,
width: 170 width: 170
}, },
{ {
title: this.$t('title'), title: this.$t('title'),
align: 'center', align: 'left',
dataIndex: 'title', dataIndex: 'title',
ellipsis: true, ellipsis: true,
width: 170 width: 170
}, },
{ {
title: this.$t('technicalField'), title: this.$t('technicalField'),
align: 'center', align: 'left',
width: 170, width: 170,
ellipsis: true, ellipsis: true,
dataIndex: 'technologyTerritoryName' dataIndex: 'technologyTerritoryName'
}, },
{ {
title: this.$t('evaluationMethod'), title: this.$t('evaluationMethod'),
align: 'center', align: 'left',
width: 170, width: 170,
ellipsis: true, ellipsis: true,
dataIndex: 'evaluationMethodsName' dataIndex: 'evaluationMethodsName'
}, },
{ {
title: this.$t('ProcessStatus'), title: this.$t('ProcessStatus'),
align: 'center', align: 'left',
width: 170, width: 170,
ellipsis: true, ellipsis: true,
dataIndex: 'flowStatusName' dataIndex: 'flowStatusName'
}, },
{ {
title: this.$t('Sponsor'), title: this.$t('Sponsor'),
align: 'center', align: 'left',
width: 140, width: 140,
ellipsis: true, ellipsis: true,
dataIndex: 'createBy' dataIndex: 'createBy'
}, },
{ {
title: this.$t('dateOfInitiation'), title: this.$t('dateOfInitiation'),
align: 'center', align: 'left',
ellipsis: true, ellipsis: true,
width: 170, width: 170,
dataIndex: 'startTime' dataIndex: 'startTime'
}, },
{ {
title: this.$t('closingDate'), title: this.$t('closingDate'),
align: 'center', align: 'left',
ellipsis: true, ellipsis: true,
width: 170, width: 170,
dataIndex: 'endTime' dataIndex: 'endTime'
}, },
{ {
title: this.$t('remarks'), title: this.$t('remarks'),
align: 'center', align: 'left',
ellipsis: true, ellipsis: true,
width: 170, width: 170,
dataIndex: 'remark' dataIndex: 'remark'
}, },
{ {
title: this.$t('operation'), title: this.$t('operation'),
align: 'center', align: 'left',
fixed: 'right', fixed: 'right',
width: 220, width: 220,
scopedSlots: { customRender: 'operation' } scopedSlots: { customRender: 'operation' }
jero-web/src/views/externalReports/index.vue
+36 -12
View File
@@ -59,7 +59,7 @@
<div class="split-detail-search-header"> <div class="split-detail-search-header">
<a-form layout="inline" @keyup.enter.native="searchQuery"> <a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="6" :sm="8"> <a-col :md="8" :sm="8">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text" :title="$t('fileName')"> <div class="title-text" :title="$t('fileName')">
<span>{{ $t('fileName') }}</span> <span>{{ $t('fileName') }}</span>
@@ -68,7 +68,7 @@
v-model="queryParams.fileName"></a-input> v-model="queryParams.fileName"></a-input>
</div> </div>
</a-col> </a-col>
<a-col :md="6" :sm="8"> <a-col :md="8" :sm="8">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text" :title="$t('uploadedBy')"> <div class="title-text" :title="$t('uploadedBy')">
<span>{{$t('uploadedBy')}}</span> <span>{{$t('uploadedBy')}}</span>
@@ -77,7 +77,8 @@
v-model="queryParams.createBy"></a-input> v-model="queryParams.createBy"></a-input>
</div> </div>
</a-col> </a-col>
<a-col :md="6" :sm="8"> <template v-if="toggleSearchStatus">
<a-col :md="8" :sm="8">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text" :title="$t('uploadTime')"> <div class="title-text" :title="$t('uploadTime')">
<span>{{ $t('uploadTime') }}</span> <span>{{ $t('uploadTime') }}</span>
@@ -91,6 +92,7 @@
:disabled="false"/> :disabled="false"/>
</div> </div>
</a-col> </a-col>
</template>
<span style="float: right;overflow: hidden;margin-right: 11px" <span style="float: right;overflow: hidden;margin-right: 11px"
class="table-page-search-submitButtons"> class="table-page-search-submitButtons">
<a-col :md="6" :sm="24"> <a-col :md="6" :sm="24">
@@ -100,6 +102,10 @@
<a-button class="box-button" type="primary" @click="searchQuery">{{ $t('query') }}</a-button> <a-button class="box-button" type="primary" @click="searchQuery">{{ $t('query') }}</a-button>
<a-button class="box-button" style="margin-left: 8px" <a-button class="box-button" style="margin-left: 8px"
@click="searchReset">{{ $t('reset') }}</a-button> @click="searchReset">{{ $t('reset') }}</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
<span class="icon-open">{{ !toggleSearchStatus ? $t('open') : $t('away') }}</span>
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</a-col> </a-col>
</span> </span>
</a-row> </a-row>
@@ -302,6 +308,7 @@
}, },
data() { data() {
return { return {
toggleSearchStatus: false,
labelCol: { span: 6 }, labelCol: { span: 6 },
userData: {}, userData: {},
wrapperCol: { span: 16 }, wrapperCol: { span: 16 },
@@ -371,21 +378,21 @@
columns: [ columns: [
{ {
title: this.$t('fileName'), title: this.$t('fileName'),
align: 'center', align: 'left',
dataIndex: 'fileName', dataIndex: 'fileName',
scopedSlots: { customRender: 'fileName' }, scopedSlots: { customRender: 'fileName' },
width: 200 width: 200
}, },
{ {
title: this.$t('fileDeclaration'), title: this.$t('fileDeclaration'),
align: 'center', align: 'left',
dataIndex: 'fileDescription', dataIndex: 'fileDescription',
scopedSlots: { customRender: 'projectName' }, scopedSlots: { customRender: 'projectName' },
width: 300 width: 300
}, },
{ {
title: this.$t('uploadedBy'), title: this.$t('uploadedBy'),
align: 'center', align: 'left',
dataIndex: 'createBy', dataIndex: 'createBy',
width: 150 width: 150
}, },
@@ -396,13 +403,13 @@
// }, // },
{ {
title: this.$t('uploadTime'), title: this.$t('uploadTime'),
align: 'center', align: 'left',
dataIndex: 'createTime', dataIndex: 'createTime',
width: 250 width: 250
}, },
{ {
title: this.$t('operation'), title: this.$t('operation'),
align: 'center', align: 'left',
fixed: 'right', fixed: 'right',
width: 250, width: 250,
scopedSlots: { customRender: 'operation' } scopedSlots: { customRender: 'operation' }
@@ -449,6 +456,9 @@
}, },
methods: { methods: {
...mapGetters(['userInfo']), ...mapGetters(['userInfo']),
handleToggleSearch() {
this.toggleSearchStatus = !this.toggleSearchStatus
},
//显示条款内容弹框 //显示条款内容弹框
showContent(val) { showContent(val) {
this.contentVisible = true this.contentVisible = true
@@ -1124,7 +1134,8 @@
.box-title-text { .box-title-text {
line-height: 1.4; line-height: 1.4;
display: flex; display: flex;
/*align-items: center;*/ align-items: center;
margin-bottom: 10px;
} }
/deep/ .ant-table td { /deep/ .ant-table td {
@@ -1136,7 +1147,7 @@
} }
.title-text { .title-text {
width: 114px; width: 110px;
text-align: right; text-align: right;
display: inline-block; display: inline-block;
font-weight: 400; font-weight: 400;
@@ -1220,7 +1231,7 @@
.split-detail-left { .split-detail-left {
/*height: 100%;*/ /*height: 100%;*/
width: 300px; width: 230px;
float: left; float: left;
padding-right: 20px; padding-right: 20px;
/*border-right: 1px solid #E6E7EC;*/ /*border-right: 1px solid #E6E7EC;*/
@@ -1249,7 +1260,7 @@
.split-detail-right { .split-detail-right {
padding-left: 20px; padding-left: 20px;
width: calc(100% - 300px); width: calc(100% - 230px);
float: right; float: right;
border-left: 1px solid #E6E7EC; border-left: 1px solid #E6E7EC;
/*flex: 1;*/ /*flex: 1;*/
@@ -1302,6 +1313,7 @@
///deep/ .ant-table-body { ///deep/ .ant-table-body {
// overflow: hidden !important; ????? // overflow: hidden !important; ?????
//} //}
</style> </style>
<style lang="less"> <style lang="less">
@@ -1322,9 +1334,21 @@
.split-detail-right-wraper { .split-detail-right-wraper {
.table-page-search-submitButtons { .table-page-search-submitButtons {
a{
display: flex;
justify-content: start;
line-height: 38px;
}
.ant-col-md-6 { .ant-col-md-6 {
display: flex; display: flex;
} }
.icon-open{
display: inline-block;
min-width: 30px;
}
i{
line-height: 38px;
}
} }
.split-detail-search-header { .split-detail-search-header {