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

Merge branch 'master' into dev_2nd_LCYH

Browse Source 
# Conflicts:
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
#	jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
#	jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
#	jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
#	jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
#	jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
This commit is contained in:
高嵩
2023-03-24 16:56:38 +08:00
parent 1daf1dcad0 eddac9197c
commit e115fc742e
30 changed files with 2081 additions and 1600 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
+5 -5
View File
@@ -65,7 +65,7 @@
dataIndex: 'projectName',
scopedSlots: { customRender: 'RelatedItems' },
ellipsis: true,
width: 170
width: 130
},
{
title: this.$t('standardInformation'),
@@ -73,7 +73,7 @@
dataIndex: 'standardInfo',
scopedSlots: { customRender: 'standardInformation' },
ellipsis: true,
width: 170
width: 330
},
{
title: this.$t('taskType'),
@@ -87,14 +87,14 @@
align: 'left',
dataIndex: 'taskDefinitionKeyName',
ellipsis: true,
width: 170
width: 150
},
{
title: this.$t('Sponsor'),
align: 'left',
dataIndex: 'createBy',
ellipsis: true,
width: 170
width: 130
},
// {
// title: this.$t('LastProcessor'),
@@ -115,7 +115,7 @@
align: 'left',
dataIndex: 'endTime',
ellipsis: true,
width: 170
width: 150
},
// {
// title: this.$t('taskStatus'),
jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
+5 -5
View File
@@ -78,7 +78,7 @@
dataIndex: 'projectName',
ellipsis: true,
scopedSlots: { customRender: 'RelatedItems' },
width: 170
width: 110
},
{
title: this.$t('standardInformation'),
@@ -86,7 +86,7 @@
dataIndex: 'standardInfo',
ellipsis: true,
scopedSlots: { customRender: 'standardInformation' },
width: 170
width: 260
},
{
title: this.$t('taskType'),
@@ -114,14 +114,14 @@
align: 'left',
dataIndex: 'createBy',
ellipsis: true,
width: 170
width: 100
},
{
title: this.$t('TaskCutOffTime'),
align: 'left',
dataIndex: 'endTime',
ellipsis: true,
width: 170,
width: 110,
scopedSlots: { customRender: 'endTime' }
},
// {
@@ -136,7 +136,7 @@
title: this.$t('operation'),
align: 'left',
fixed: 'right',
width: 120,
width: 80,
scopedSlots: { customRender: 'operation' }
}
],
jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
+5 -5
View File
@@ -71,7 +71,7 @@
dataIndex: 'projectName',
ellipsis: true,
scopedSlots: { customRender: 'RelatedItems' },
width: 170
width: 130
},
{
title: this.$t('standardInformation'),
@@ -79,7 +79,7 @@
dataIndex: 'standardInfo',
ellipsis: true,
scopedSlots: { customRender: 'standardInformation' },
width: 170
width: 330
},
{
title: this.$t('taskType'),
@@ -93,14 +93,14 @@
align: 'left',
dataIndex: 'taskDefinitionKeyName',
ellipsis: true,
width: 170
width: 130
},
{
title: this.$t('Sponsor'),
align: 'left',
dataIndex: 'createBy',
ellipsis: true,
width: 170
width: 130
},
// {
// title: this.$t('CurrentProcessor'),
@@ -114,7 +114,7 @@
align: 'left',
dataIndex: 'endTime',
ellipsis: true,
width: 170
width: 150
},
// {
// title: this.$t('taskStatus'),
jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue
+6 -6
View File
@@ -60,42 +60,42 @@
dataIndex: 'standardInfo',
scopedSlots: { customRender: 'standardInformation' },
ellipsis: true,
width: 170
width: 330
},
{
title: this.$t('taskType'),
align: 'left',
dataIndex: 'flowTypeShow',
ellipsis: true,
width: 170
width: 130
},
{
title: this.$t('LastProcessor'),
align: 'left',
dataIndex: 'lastAssigneeName',
ellipsis: true,
width: 170
width: 130
},
{
title: this.$t('CurrentProcessor'),
align: 'left',
dataIndex: 'assigneeName',
ellipsis: true,
width: 170
width: 130
},
{
title: this.$t('TaskCutOffTime'),
align: 'left',
dataIndex: 'endTime',
ellipsis: true,
width: 170
width: 150
},
{
title: this.$t('taskStatus'),
align: 'left',
dataIndex: 'statusShow',
ellipsis: true,
width: 170
width: 130
},
{
title: this.$t('operation'),
jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue
+5 -5
View File
@@ -58,28 +58,28 @@
dataIndex: 'standardInfo',
scopedSlots: { customRender: 'standardInformation' },
ellipsis: true,
width: 170
width: 330
},
{
title: this.$t('taskType'),
align: 'left',
dataIndex: 'flowTypeShow',
ellipsis: true,
width: 170
width: 130
},
{
title: this.$t('Sponsor'),
align: 'left',
dataIndex: 'createBy',
ellipsis: true,
width: 170
width: 130
},
{
title: this.$t('TaskCutOffTime'),
align: 'left',
dataIndex: 'endTime',
ellipsis: true,
width: 170,
width: 150,
scopedSlots: { customRender: 'endTime' }
},
{
@@ -87,7 +87,7 @@
align: 'left',
dataIndex: 'statusShow',
ellipsis: true,
width: 170
width: 130
},
{
title: this.$t('operation'),
jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue
+6 -6
View File
@@ -57,42 +57,42 @@
dataIndex: 'standardInfo',
ellipsis: true,
scopedSlots: { customRender: 'standardInformation' },
width: 170
width: 330
},
{
title: this.$t('taskType'),
align: 'left',
dataIndex: 'flowTypeShow',
ellipsis: true,
width: 170
width: 130
},
{
title: this.$t('Sponsor'),
align: 'left',
dataIndex: 'createBy',
ellipsis: true,
width: 170
width: 130
},
{
title: this.$t('CurrentProcessor'),
align: 'left',
dataIndex: 'assigneeName',
ellipsis: true,
width: 170
width: 130
},
{
title: this.$t('TaskCutOffTime'),
align: 'left',
dataIndex: 'endTime',
ellipsis: true,
width: 170
width: 150
},
{
title: this.$t('taskStatus'),
align: 'left',
dataIndex: 'statusShow',
ellipsis: true,
width: 170
width: 130
},
{
title: this.$t('operation'),