From aa29534221dcd2e95b1f70c890f60384908c62ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Thu, 6 Apr 2023 16:26:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83=E5=8F=91?=
=?UTF-8?q?=E8=B5=B7=E4=BA=BA=E5=AE=A1=E6=9F=A5=E6=97=B6=E5=BA=94=E8=83=BD?=
=?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=99=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jero-web/src/common/lang/en-us.js | 6 +++--
jero-web/src/common/lang/zh-cn.js | 6 +++--
.../components/virtualListDetails.vue | 10 ++++----
.../views/documentTools/virtualList/index.vue | 9 ++++----
.../components/certificationList/index.vue | 23 +++++++++++++++++--
5 files changed, 38 insertions(+), 16 deletions(-)
diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index d8b4ef82b..f5db35940 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1730,8 +1730,8 @@ module.exports = {
notethree:'Provide supporting materials',
verifyComplianceConfirmReturnReason:'Verify compliance Confirm return reason',
theDeliverablesCannotReferencedPleaseReselect:'The deliverables of this project cannot be referenced, please reselect',
- regulationListTemplateMaintenance:'Regulation list template maintenance',
- regulatoryListTemplate:'Regulatory list template',
+ regulationListTemplateMaintenance:'Market Regulation List Template Maintenance',
+ regulatoryListTemplate:'Market Regulation List Template',
gnxtwh:'Functional system maintenance',
gnxt:'Functional system',
dykzq:'Corresponding controller',
@@ -1759,4 +1759,6 @@ module.exports = {
electroniccontrollerparameter:'Electronic controller parameter',
reviewAndPass:'Review and pass',
reviewAndReturn:'Review and return',
+ marketRegulationListDetails:'Market Regulation List Details',
+ marketRegulationList:'Market Regulation List',
}
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 07d07ac47..e16d3e20b 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1832,8 +1832,8 @@ module.exports = {
notethree:'\n提供证明材料\n',
verifyComplianceConfirmReturnReason:'验证符合性确认退回原因',
theDeliverablesCannotReferencedPleaseReselect:'不能引用本项目的交付物，请重新选择',
- regulationListTemplateMaintenance:'法规清单模板维护',
- regulatoryListTemplate:'法规清单模板',
+ regulationListTemplateMaintenance:'市场法规清单模板维护',
+ regulatoryListTemplate:'市场法规清单模板',
gnxtwh:'功能系统维护',
gnxt:'功能系统',
dykzq:'对应控制器',
@@ -1861,4 +1861,6 @@ module.exports = {
reviewAndPass:'审查通过',
reviewAndReturn:'审查退回',
electroniccontrollerparameter:'电子控制器参数',
+ marketRegulationListDetails:'市场法规清单详情',
+ marketRegulationList:'市场法规清单',
}
\ No newline at end of file
diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
index 66e3f3afd..88826cfab 100644
--- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
@@ -6,7 +6,7 @@
- {{isTrue ? $t('regulationListTemplateMaintenance'):$t('regulationListTemplateMaintenance')}}
+ {{isTrue ? $t('regulationListTemplateMaintenance'):$t('marketRegulationListDetails')}}
@@ -980,9 +980,9 @@
},
created() {
if (this.$route.query.title == '市场清单详情') {
- document.title = this.$t('virtualListDetails')
+ document.title = this.$t('marketRegulationListDetails')
} else {
- document.title = this.$t('maintainVirtualList')
+ document.title = this.$t('regulationListTemplateMaintenance')
}
},
mounted() {
@@ -1041,7 +1041,7 @@
},
//模板下载
handleModule() {
- downloadFile(this.url.exportTemplate, this.$t('VirtualList') + this.$t('importTemplate') + '.xls', {})
+ downloadFile(this.url.exportTemplate, this.$t('marketRegulationList') + this.$t('importTemplate') + '.xls', {})
},
//调取
transferClick() {
@@ -1062,7 +1062,7 @@
ids: selectedRowKeys.join(','),
dummyInventoryBaseId: this.$route.query.id
}
- downloadFile(this.url.exportData, this.$route.query.name + this.$t('VirtualList') + '.zip', query, this.Deselect)
+ downloadFile(this.url.exportData, this.$route.query.name + this.$t('marketRegulationList') + '.zip', query, this.Deselect)
},
Deselect() {
this.selectedRowKeys = []
diff --git a/jero-web/src/views/documentTools/virtualList/index.vue b/jero-web/src/views/documentTools/virtualList/index.vue
index e9d09badb..f98a6610c 100644
--- a/jero-web/src/views/documentTools/virtualList/index.vue
+++ b/jero-web/src/views/documentTools/virtualList/index.vue
@@ -526,8 +526,7 @@
}
.title-text {
- width: 20%;
- min-width: 110px;
+ width: 120px;
color: #000F16;
display: inline-block;
font-weight: 500;
@@ -542,7 +541,7 @@
.box-input {
display: inline-block;
- width: 70%;
+ width: calc(100% - 136px);
height: 38px;
margin-top: 2px;
}
@@ -567,7 +566,7 @@
}
.title-text-add {
- width: 114px;
+ width: 129px;
text-align: right;
display: inline-block;
font-weight: 500;
@@ -588,7 +587,7 @@
}
.itemModel {
- width: calc(100% - 130px);
+ width: calc(100% - 136px);
display: inline-block;
margin-top: 2px;
}
diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index 62ed110c7..4d29599b1 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -263,6 +263,7 @@
:scroll="{x: '100%',y:'calc(100vh - 300px)'}"
rowKey="id"
:data-source="dataSource"
+ @change="tableOnChange"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
:columns="columns"
>
@@ -370,7 +371,7 @@
:class="CertificationColor[result.certificationProgress]"
@click="CertificationProgressClick(result)"
>
- {{result.certificationProgress_dictText ? result.certificationProgress_dictText : $t('maintainProgress')}}
+ {{result.certificationProgress_dictText ? result.certificationProgress_dictText : $t('toBeStarted')}}
@@ -624,7 +625,8 @@
dataIndex: 'category',
width: 180,
ellipsis: true,
- fixed: 'left'
+ fixed: 'left',
+ sorter: true,
},
{
title: this.$t('inspectionItems'),
@@ -632,6 +634,7 @@
dataIndex: 'inspectionItem',
width: 180,
ellipsis: true,
+ sorter: true,
fixed: 'left'
},
{
@@ -654,6 +657,7 @@
dataIndex: 'serialNumber',
width: 180,
ellipsis: true,
+ sorter: true,
scopedSlots: { customRender: 'serialNumber' }
},
{
@@ -690,6 +694,7 @@
align: 'left',
dataIndex: 'deliverableTypeName',
width: 180,
+ sorter: true,
ellipsis: true
},
{
@@ -705,6 +710,7 @@
align: 'left',
dataIndex: 'endTime',
width: 180,
+ sorter: true,
ellipsis: true
},
{
@@ -887,6 +893,17 @@
handleToggleSearch() {
this.toggleSearchStatus = !this.toggleSearchStatus
},
+ tableOnChange(pagination, filters, sorter) {
+ this.orderBy = sorter.order == 'ascend' ? '1' : '2'
+ if (sorter.columnKey == 'flowTypeShow') {
+ this.orderByField = 'flowType'
+ } else if (sorter.columnKey == 'taskDefinitionKeyName') {
+ this.orderByField = 'taskDefinitionKey'
+ } else {
+ this.orderByField = sorter.columnKey
+ }
+ this.getList()
+ },
getList() {
let queryParam = JSON.parse(JSON.stringify(this.queryParam))
Object.keys(queryParam).forEach(val => {
@@ -897,6 +914,8 @@
let query = {
pageNo: this.pageNo,
pageSize: this.pageSize,
+ orderBy: this.orderBy,
+ orderByField: this.orderByField,
...this.queryParamQuery,
...queryParam,
projectLibraryId: this.$route.query.id,