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

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

Browse Source 
# 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
parent 07c02abef6 2154e4edfe
commit b0b8f36e92
129 changed files with 1418 additions and 765 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
+11 -9
View File
@@ -57,12 +57,14 @@
<span class="text">{{$t('filingExternalOpinions')}}:</span>
<div @click="clickButtonToUpload('opinionArchiveId')" style="color: #21c9cc"
v-if="formInline.createBy == this.userInfoQuery.username" class="operator-text">
<a-icon type="cloud-upload"/>
<a-button type="primary"style="margin-right: 8px;height: 32px">
{{$t('clickUpload')}}
</a-button>
</div>
<div @click="seeFileClick(formInline.opinionArchiveId)" style="color: #21c9cc" class="operator-text">
<a-icon type="eye"/>
<a-button type="primary"style="margin-right: 8px;height: 32px">
{{$t('viewFile')}}
</a-button>
</div>
</div>
</div>
@@ -100,35 +102,35 @@
columns: [
{
title: this.$t('relevantSections'),
align: 'center',
align: 'left',
dataIndex: 'relatedSection',
ellipsis: true,
width: 180
},
{
title: this.$t('questionsSuggestions'),
align: 'center',
align: 'left',
width: 180,
ellipsis: true,
dataIndex: 'issueOrSuggest'
},
{
title: this.$t('reason'),
align: 'center',
align: 'left',
width: 180,
ellipsis: true,
dataIndex: 'reason'
},
{
title: this.$t('clauseContent'),
align: 'center',
align: 'left',
width: 180,
ellipsis: true,
dataIndex: 'clauseContent'
},
{
title: this.$t('enclosure'),
align: 'center',
align: 'left',
width: 180,
ellipsis: true,
dataIndex: 'accessoryFile',
@@ -136,14 +138,14 @@
},
{
title: this.$t('Assessor'),
align: 'center',
align: 'left',
width: 100,
ellipsis: true,
dataIndex: 'createBy'
},
{
title: this.$t('proposedTime'),
align: 'center',
align: 'left',
width: 150,
ellipsis: true,
dataIndex: 'submitTime'
jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
+7 -6
View File
@@ -198,7 +198,7 @@
columns: [
{
title: this.$t('standard'),
align: 'center',
align: 'left',
dataIndex: 'serial_number',
width: 170,
ellipsis: true,
@@ -206,7 +206,7 @@
},
{
title: this.$t('title'),
align: 'center',
align: 'left',
dataIndex: 'title',
ellipsis: true,
width: 170,
@@ -214,28 +214,28 @@
},
{
title: this.$t('status'),
align: 'center',
align: 'left',
width: 140,
ellipsis: true,
dataIndex: 'state'
},
{
title: this.$t('zoneOfApplication'),
align: 'center',
align: 'left',
width: 170,
ellipsis: true,
dataIndex: 'region'
},
{
title: this.$t('technicalField'),
align: 'center',
align: 'left',
ellipsis: true,
width: 170,
dataIndex: 'technology_territory'
},
{
title: this.$t('correspondingStandard'),
align: 'center',
align: 'left',
ellipsis: true,
width: 170,
dataIndex: 'corresponding_standard'
@@ -424,6 +424,7 @@
</script>
<style scoped>
@import '~@assets/less/common.less';
/deep/.propbox .ant-form-explain{
margin-top: -17px !important;
}
jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
+9 -9
View File
@@ -86,7 +86,7 @@
</div>
<div class="table-operator">
<div @click="initiatingProcessClick" v-has="'regulatoryComments:initiationProcess'" class="operator-text">
<a-icon type="apartment"/>
<a-icon type="solution"/>
{{$t('initiatingProcess')}}
</div>
<div @click="BatchDelete"
@@ -177,7 +177,7 @@
columns: [
{
title: this.$t('standard'),
align: 'center',
align: 'left',
dataIndex: 'serialNumber',
ellipsis: true,
width: 170,
@@ -185,28 +185,28 @@
},
{
title: this.$t('title'),
align: 'center',
align: 'left',
dataIndex: 'title',
ellipsis: true,
width: 280
},
{
title: this.$t('technicalField'),
align: 'center',
align: 'left',
width: 170,
ellipsis: true,
dataIndex: 'technologyTerritoryName'
},
{
title: this.$t('ProcessStatus'),
align: 'center',
align: 'left',
width: 140,
ellipsis: true,
dataIndex: 'gatherResultShow'
},
{
title: this.$t('Sponsor'),
align: 'center',
align: 'left',
width: 140,
ellipsis: true,
dataIndex: 'createBy'
@@ -220,21 +220,21 @@
},
{
title: this.$t('dateOfInitiation'),
align: 'center',
align: 'left',
ellipsis: true,
width: 140,
dataIndex: 'startTime'
},
{
title: this.$t('closingDate'),
align: 'center',
align: 'left',
ellipsis: true,
width: 140,
dataIndex: 'endTime'
},
{
title: this.$t('operation'),
align: 'center',
align: 'left',
fixed: 'right',
width: 210,
scopedSlots: { customRender: 'operation' }
jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue
+4 -4
View File
@@ -76,7 +76,7 @@
columns: [
{
title: this.$t('number'),
align: 'center',
align: 'left',
width: 70,
customRender: function(t, r, index) {
return parseInt(index) + 1
@@ -85,20 +85,20 @@
{
title: this.$t('problemLabel'),
dataIndex: 'problemLabel',
align: 'center',
align: 'left',
width: 240,
ellipsis: true
},
{
title: this.$t('personCharge'),
dataIndex: 'chargePersonIdName',
align: 'center',
align: 'left',
width: 240,
ellipsis: true
},
{
title: this.$t('operation'),
align: 'center',
align: 'left',
fixed: 'right',
width: 180,
scopedSlots: { customRender: 'operation' }
jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue
+19 -6
View File
@@ -21,6 +21,7 @@
v-model="queryParam.serial_number"></a-input>
</div>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :md="12" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('title')">
@@ -41,6 +42,7 @@
:triggerChange="false" :dictCode="'state'"/>
</div>
</a-col>
</template>
<span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
<a-col :md="12" :sm="24">
<globalAdvancedQuery ref="globalAdvancedQueryRef"
@@ -48,6 +50,10 @@
:fieldList="fieldList"/>
<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>
@@ -96,6 +102,7 @@
props: ['url'],
data() {
return {
toggleSearchStatus: false,
visible: false,
queryParam: {},
confirmLoading: false,
@@ -105,31 +112,31 @@
{
title: this.$t('standard'),
dataIndex: 'serial_number',
align: 'center',
align: 'left',
ellipsis: true
},
{
title: this.$t('title'),
dataIndex: 'title',
align: 'center',
align: 'left',
ellipsis: true
},
{
title: this.$t('zoneOfApplication'),
dataIndex: 'region',
align: 'center',
align: 'left',
ellipsis: true
},
{
title: this.$t('ImplementationDate'),
dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1',
align: 'center',
align: 'left',
ellipsis: true
},
{
title: this.$t('vehicleInProductionDate'),
dataIndex: 'implement_time',
align: 'center',
align: 'left',
ellipsis: true
}
],
@@ -148,6 +155,9 @@
},
methods: {
handleToggleSearch() {
this.toggleSearchStatus = !this.toggleSearchStatus
},
addModel(value) {
this.pageNo = 1
this.visible = true
@@ -290,7 +300,7 @@
}
.title-text {
width: 33px;
width: 110px;
color: #000F16;
display: inline-block;
font-weight: 500;
@@ -312,4 +322,7 @@
.box-button {
height: 38px;
}
/deep/.ant-table-column-title{
font-weight: bold!important;
}
</style>
jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
+3 -3
View File
@@ -114,8 +114,8 @@
{{$t('contactTheFounder')}}
</div>
<div class="content-box-button-text" @click="forwardClick(item)">
<a-icon type="logout"/>
{{$t('forward')}}
<a-icon type="share-alt"/>
{{$t('share')}}
</div>
<div class="content-box-button-text">
<a-icon type="eye"/>
@@ -178,7 +178,7 @@
<JLoading :loading="loading">{{$t('dataLoading')}}</JLoading>
<classificationMaintenanceModel @classificationMaintenanceModelForm="classificationMaintenanceModelForm"
ref="classificationMaintenanceModelRef"/>
<SelectedBy ref="SelectedByRef" :title="$t('forward')" @SelectedByForm="SelectedByForm"></SelectedBy>
<SelectedBy ref="SelectedByRef" :title="$t('share')" @SelectedByForm="SelectedByForm"></SelectedBy>
</div>
</template>
jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue
+3 -3
View File
@@ -58,8 +58,8 @@
{{$t('contactTheFounder')}}
</div>
<div class="content-box-button-text" @click="forwardClick(queryForm)">
<a-icon type="logout"/>
{{$t('forward')}}
<a-icon type="share-alt"/>
{{$t('share')}}
</div>
<div class="content-box-button-text">
<a-icon type="eye"/>
@@ -144,7 +144,7 @@
</div>
</div>
</div>
<SelectedBy ref="SelectedByRef" :title="$t('forward')" @SelectedByForm="SelectedByForm"></SelectedBy>
<SelectedBy ref="SelectedByRef" :title="$t('share')" @SelectedByForm="SelectedByForm"></SelectedBy>
</div>
<a-modal
:title="$t('replyToComments')"
jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
+1 -1
View File
@@ -252,7 +252,7 @@
</script>
<style scoped lang="less">
@import '~@assets/less/common.less';
@import'~@assets/less/common.less';
.doc-detail {
background: #fff;
jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue
+10 -10
View File
@@ -47,13 +47,13 @@
<div @click="monthlyTitleTemplateClick"
v-has="'monthlyReportFilling:titleTemplate'"
class="operator-text">
<a-icon type="apartment"/>
<a-icon type="calendar"/>
{{$t('monthlyTitleTemplate')}}
</div>
<div @click="monthlyIntegrationAndExportClick"
v-has="'monthlyReportFilling:integratedExport'"
class="operator-text">
<a-icon type="import"/>
<a-icon type="export" :rotate="-90"/>
{{$t('monthlyIntegrationAndExport')}}
</div>
<div @click="addContentClick"
@@ -165,56 +165,56 @@
columns: [
{
title: this.$t('firstLevelDirectory'),
align: 'center',
align: 'left',
dataIndex: 'memoriesChapterOneName',
ellipsis: true,
width: 170
},
{
title: this.$t('secondaryDirectory'),
align: 'center',
align: 'left',
dataIndex: 'memoriesChapterName',
ellipsis: true,
width: 170
},
{
title: this.$t('chineseTitle'),
align: 'center',
align: 'left',
dataIndex: 'titleCn',
ellipsis: true,
width: 170
},
{
title: this.$t('englishTitle'),
align: 'center',
align: 'left',
width: 170,
ellipsis: true,
dataIndex: 'titleEn'
},
{
title: this.$t('regulatoryContact'),
align: 'center',
align: 'left',
width: 170,
ellipsis: true,
dataIndex: 'lawsContactName'
},
{
title: this.$t('completedBy'),
align: 'center',
align: 'left',
ellipsis: true,
width: 170,
dataIndex: 'createBy'
},
{
title: this.$t('exportStatus'),
align: 'center',
align: 'left',
ellipsis: true,
width: 170,
dataIndex: 'exportStateName'
},
{
title: this.$t('operation'),
align: 'center',
align: 'left',
fixed: 'right',
width: 190,
scopedSlots: { customRender: 'operation' }
jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue
+6 -6
View File
@@ -116,7 +116,7 @@
columns: [
{
title: this.$t('RegulationMonthlyName'),
align: 'center',
align: 'left',
dataIndex: 'name',
width: 190,
ellipsis: true,
@@ -124,7 +124,7 @@
},
{
title: this.$t('monthlyLanguage'),
align: 'center',
align: 'left',
dataIndex: 'language',
width: 170,
ellipsis: true,
@@ -132,28 +132,28 @@
},
{
title: this.$t('releaseStatus'),
align: 'center',
align: 'left',
width: 140,
ellipsis: true,
dataIndex: 'issueStatus_dictText'
},
{
title: this.$t('uploadTime'),
align: 'center',
align: 'left',
width: 170,
ellipsis: true,
dataIndex: 'createTime'
},
{
title: this.$t('uploadedBy'),
align: 'center',
align: 'left',
ellipsis: true,
width: 170,
dataIndex: 'createBy'
},
{
title: this.$t('operation'),
align: 'center',
align: 'left',
fixed: 'right',
width: 240,
scopedSlots: { customRender: 'operation' }
jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue
+16 -6
View File
@@ -21,6 +21,7 @@
v-model="queryParam.serial_number"></a-input>
</div>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :md="12" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('title')">
@@ -41,6 +42,7 @@
:triggerChange="false" :dictCode="'state'"/>
</div>
</a-col>
</template>
<span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
<a-col :md="12" :sm="24">
<globalAdvancedQuery ref="globalAdvancedQueryRef"
@@ -48,6 +50,10 @@
:fieldList="fieldList"/>
<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>
@@ -100,6 +106,7 @@
},
data() {
return {
toggleSearchStatus: false,
visible: false,
confirmLoading: false,
selectedRowKeys: [],
@@ -108,19 +115,19 @@
{
title: this.$t('standard'),
dataIndex: 'serial_number',
align: 'center',
align: 'left',
ellipsis: true
},
{
title: this.$t('title'),
dataIndex: 'title',
align: 'center',
align: 'left',
ellipsis: true
},
{
title: this.$t('zoneOfApplication'),
dataIndex: 'region',
align: 'center',
align: 'left',
ellipsis: true
},
// {
@@ -138,13 +145,13 @@
{
title: this.$t('ImplementationDate'),
dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1',
align: 'center',
align: 'left',
ellipsis: true
},
{
title: this.$t('vehicleInProductionDate'),
dataIndex: 'implement_time',
align: 'center',
align: 'left',
ellipsis: true
}
// {
@@ -170,6 +177,9 @@
},
methods: {
handleToggleSearch() {
this.toggleSearchStatus = !this.toggleSearchStatus
},
addModel() {
this.visible = true
this.queryParam = {}
@@ -295,7 +305,7 @@
}
.title-text {
width: 69px;
width: 110px;
color: #000F16;
display: inline-block;
font-weight: 500;
jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
+5 -5
View File
@@ -48,7 +48,7 @@
<span class="title-text-text"
:title="$t('technicalField')">{{$t('technicalField')}}</span>
</div>
<a-form-model-item class="itemModel" prop="technologyTerritory">
<a-form-model-item class="itemModel" prop="technologyTerritory" style="height: 40px">
<a-tree-select
tree-node-filter-prop="title"
v-model="formInline.technologyTerritory"
@@ -133,7 +133,7 @@
<span class="title-text-text"
:title="$t('scopeOfApplication')">{{$t('scopeOfApplication')}}</span>
</div>
<a-form-model-item class="itemModel-multi itemModel-multi-one">
<a-form-model-item class="itemModel-multi itemModel-multi-one" style="border: none">
<j-multi-select-tag class="box-input" v-model="formInline.applyScope"
:placeholder="$t('PleaseSelect')+$t('scopeOfApplication')"
:type="'checkbox'"
@@ -150,7 +150,7 @@
<span class="title-text-text"
:title="$t('status')">{{$t('status')}}</span>
</div>
<a-form-model-item class="itemModel-multi itemModel-multi-one">
<a-form-model-item class="itemModel-multi itemModel-multi-one" style="border: none">
<j-dict-select-tag class="box-input" v-model="formInline.state"
:disabled="disabled"
:placeholder="$t('PleaseSelect')+$t('status')"
@@ -167,7 +167,7 @@
<span class="title-text-text"
:title="$t('usage')">{{$t('usage')}}</span>
</div>
<a-form-model-item class="itemModel-multi itemModel-multi-one">
<a-form-model-item class="itemModel-multi itemModel-multi-one" style="border: none">
<j-dict-select-tag class="box-input" v-model="formInline.useMethod"
:placeholder="$t('PleaseSelect')+$t('usage')"
:type="'radio'"
@@ -615,7 +615,7 @@
.itemModel-multi-one {
border: 1px solid #d9d9d9;
border-radius: 4px;
padding: 0 8px;
padding: 0 0px;
box-sizing: border-box;
}
</style>
jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue
+4 -4
View File
@@ -74,7 +74,7 @@
columns: [
{
title: this.$t('number'),
align: 'center',
align: 'left',
width: 70,
customRender: function(t, r, index) {
return parseInt(index) + 1
@@ -82,21 +82,21 @@
},
{
title: this.$t('chineseTitle'),
align: 'center',
align: 'left',
dataIndex: 'titleCn',
ellipsis: true,
width: 320
},
{
title: this.$t('englishTitle'),
align: 'center',
align: 'left',
width: 320,
ellipsis: true,
dataIndex: 'titleEn'
},
{
title: this.$t('operation'),
align: 'center',
align: 'left',
fixed: 'right',
width: 280,
scopedSlots: { customRender: 'operation' }
jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
+17 -7
View File
@@ -92,7 +92,7 @@
:pagination="false"
:loading="loading">
<div slot="clauseContent" slot-scope="text,result">
<a-tooltip placement="topLeft">
<a-tooltip overlayClassName="tooltipColor" placement="topLeft" overlayStyle>
<template slot="title">
<span v-html="text"></span>
</template>
@@ -150,37 +150,37 @@
{
title: this.$t('clauseNo'),
dataIndex: 'itemNum',
align: 'center',
align: 'left',
ellipsis: true,
width: 120
},
{
title: this.$t('clauseName'),
dataIndex: 'itemName',
align: 'center',
align: 'left',
ellipsis: true
},
{
title: this.$t('clauseContent'),
dataIndex: 'itemContent',
align: 'center',
align: 'left',
scopedSlots: { customRender: 'clauseContent' }
},
{
title: this.$t('evaluationMethod'),
dataIndex: 'evaluationMethods',
align: 'center',
align: 'left',
scopedSlots: { customRender: 'evaluationMethod' }
},
{
title: this.$t('Assessor'),
dataIndex: 'Assessor',
align: 'center',
align: 'left',
scopedSlots: { customRender: 'Assessor' }
},
{
title: this.$t('operation'),
align: 'center',
align: 'left',
width: 120,
scopedSlots: { customRender: 'operation' }
}
@@ -322,6 +322,16 @@
}
</script>
<style>
.tooltipColor .ant-tooltip-inner {
color: #333;
background-color: #fff !important;
}
.tooltipColor .ant-tooltip-arrow::before {
background-color: #fff !important;
}
</style>
<style scoped>
.box-input {
display: inline-block;
jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue
+10 -6
View File
@@ -10,7 +10,7 @@
</div>
<div class="doc-detail-right" v-if='flag'>
<div @click="CurrentStandard" class="operator-text-text" :title="$t('initiateSupplementaryProcess')">
<a-icon type="profile"/>
<a-icon type="solution"/>
{{$t('initiateSupplementaryProcess')}}
</div>
<div @click="endProcessClick"
@@ -110,7 +110,7 @@
{
title: this.$t('engineer'),
dataIndex: 'createBy',
align: 'center',
align: 'left',
width: 160,
ellipsis: true,
customRender: (value, row, index) => {
@@ -129,7 +129,7 @@
{
title: this.$t('complianceResults'),
dataIndex: 'complianceResultName',
align: 'center',
align: 'left',
width: 160,
ellipsis: true,
customRender: (value, row, index) => {
@@ -148,20 +148,20 @@
{
title: this.$t('relevantSections'),
dataIndex: 'relatedSection',
align: 'center',
align: 'left',
width: 160,
ellipsis: true
},
{
title: this.$t('problemDescription'),
dataIndex: 'issueOrSuggest',
align: 'center',
align: 'left',
ellipsis: true
},
{
title: this.$t('enclosure'),
dataIndex: 'accessoryFile',
align: 'center',
align: 'left',
width: 160,
ellipsis: true,
scopedSlots: { customRender: 'accessoryFile' }
@@ -429,6 +429,10 @@
.operator-text-feed {
margin-top: 27px;
}
/deep/.ant-table-column-title{
font-weight: bold!important;
}
</style>
<style>
.box-clause .ant-card-body {
jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
+8 -8
View File
@@ -129,7 +129,7 @@
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('uploadRelevantMaterials')">{{$t('uploadRelevantMaterials')}}</span>
:title="$t('RelevantMaterials')">{{$t('RelevantMaterials')}}</span>
</div>
<a-form-model-item class="itemModel" prop="accessory_id">
<a-button type="primary" class="button-text"
@@ -327,7 +327,7 @@
columns: [
{
title: this.$t('standard'),
align: 'center',
align: 'left',
dataIndex: 'serial_number',
width: 170,
ellipsis: true,
@@ -335,7 +335,7 @@
},
{
title: this.$t('title'),
align: 'center',
align: 'left',
dataIndex: 'title',
ellipsis: true,
width: 170,
@@ -343,34 +343,34 @@
},
{
title: this.$t('status'),
align: 'center',
align: 'left',
width: 140,
ellipsis: true,
dataIndex: 'state'
},
{
title: this.$t('zoneOfApplication'),
align: 'center',
align: 'left',
width: 170,
ellipsis: true,
dataIndex: 'region'
},
{
title: this.$t('technicalField'),
align: 'center',
align: 'left',
ellipsis: true,
width: 170,
dataIndex: 'technology_territory'
},
{
title: this.$t('correspondingStandard'),
align: 'center',
align: 'left',
ellipsis: true,
width: 170,
dataIndex: 'corresponding_standard'
},
{
align: 'center',
align: 'left',
ellipsis: true,
width: 170,
scopedSlots: {
jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue
+5 -5
View File
@@ -144,34 +144,34 @@
{
title: this.$t('clauseNo'),
dataIndex: 'items_num',
align: 'center',
align: 'left',
width: 180,
ellipsis: true
},
{
title: this.$t('clauseName'),
dataIndex: 'items_name',
align: 'center',
align: 'left',
width: 180,
ellipsis: true
},
{
title: this.$t('clauseContent'),
dataIndex: 'iterms_conditions',
align: 'center',
align: 'left',
scopedSlots: { customRender: 'clauseContent' }
},
{
title: this.$t('technicalField'),
dataIndex: 'technology_territory',
align: 'center',
align: 'left',
width: 180,
ellipsis: true
},
{
title: this.$t('informationCategory'),
dataIndex: 'information_category',
align: 'center',
align: 'left',
width: 180,
ellipsis: true
}
jero-web/src/views/businessSupport/technologyAssessment/index.vue
+11 -11
View File
@@ -89,7 +89,7 @@
<div @click="initiatingProcessClick"
v-has="'regulatoryAndTechnicalAssessment:initiationProcess'"
class="operator-text">
<a-icon type="apartment"/>
<a-icon type="solution"/>
{{$t('initiatingProcess')}}
</div>
<div @click="BatchDelete"
@@ -240,42 +240,42 @@
columns: [
{
title: this.$t('standard'),
align: 'center',
align: 'left',
dataIndex: 'serialNumber',
ellipsis: true,
width: 170
},
{
title: this.$t('title'),
align: 'center',
align: 'left',
dataIndex: 'title',
ellipsis: true,
width: 170
},
{
title: this.$t('technicalField'),
align: 'center',
align: 'left',
width: 170,
ellipsis: true,
dataIndex: 'technologyTerritoryName'
},
{
title: this.$t('evaluationMethod'),
align: 'center',
align: 'left',
width: 170,
ellipsis: true,
dataIndex: 'evaluationMethodsName'
},
{
title: this.$t('ProcessStatus'),
align: 'center',
align: 'left',
width: 170,
ellipsis: true,
dataIndex: 'flowStatusName'
},
{
title: this.$t('Sponsor'),
align: 'center',
align: 'left',
width: 140,
ellipsis: true,
dataIndex: 'createBy'
@@ -289,28 +289,28 @@
},
{
title: this.$t('dateOfInitiation'),
align: 'center',
align: 'left',
ellipsis: true,
width: 170,
dataIndex: 'startTime'
},
{
title: this.$t('closingDate'),
align: 'center',
align: 'left',
ellipsis: true,
width: 170,
dataIndex: 'endTime'
},
{
title: this.$t('remarks'),
align: 'center',
align: 'left',
ellipsis: true,
width: 170,
dataIndex: 'remark'
},
{
title: this.$t('operation'),
align: 'center',
align: 'left',
fixed: 'right',
width: 220,
scopedSlots: { customRender: 'operation' }