diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java index 8ad2c2c07..5a8aa9b66 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java @@ -83,6 +83,20 @@ public class BussDocumentLibraryEO implements Serializable { @ApiModelProperty(value = "对应标准") private java.lang.String correspondingStandard; + + /**代替标准*/ + @ApiModelProperty(value = "代替标准") + @Dict(dicCode ="replace_standard") + private java.lang.String replaceStandard; + + + /**被代替标准*/ + @ApiModelProperty(value = "被代替标准") + @Dict(dicCode ="replaced_standard") + private java.lang.String replacedStandard; + + + @TableField(exist = false) private java.lang.String cut; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 58ce204a7..30304c593 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -534,8 +534,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl !"serial_number".equals(e.getDbFieldName()) && !"title".equals(e.getDbFieldName()) - && !"title_en".equals(e.getDbFieldName()) - && !"state".equals(e.getDbFieldName())) + && !"title_en".equals(e.getDbFieldName())) .collect(Collectors.toList()); if (fieldList.size() != 0) { @@ -1727,6 +1726,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fileIdLIstTemp = new ArrayList<>(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index 4ce6816a3..12e4e7161 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -2315,7 +2315,8 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl { @Override public int compareTo(ProjectLibraryBase o) { - return Integer.valueOf(this.projectVersion)-Integer.valueOf(o.projectVersion);//升序 -// return o.id-this.id;//降序 + if (!this.getProjectName().equals(o.getProjectName())) { + return this.getProjectName().compareTo(o.getProjectName());//升序 + } + if (!this.getYearName().equals(o.getYearName())) { + if (this.getYearName().length() != o.getYearName().length()) { + return this.getYearName().length() - o.getYearName().length(); + } else { + return this.getYearName().compareTo(o.getYearName());//升序 + } + } + if (!this.getTargetMarket().equals(o.getTargetMarket())) { + return this.getTargetMarket().compareTo(o.getTargetMarket());//升序 + } + if (!this.getProjectVersion().equals(o.getProjectVersion())) { + return Integer.valueOf(this.projectVersion) - Integer.valueOf(o.projectVersion);//升序 + } + return 0; } - public String getShowName(){ - return projectName+yearName+targetMarket+projectVersion; + public String getShowName() { + return projectName + " " + yearName + "-" + targetMarket + "-" + projectVersion; } @Override diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java index a63cbbc76..898f2ebfc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java @@ -117,7 +117,6 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService } } - List projectLibraryBaseLinkedList = new LinkedList<>(); for (ProjectLibraryBase libraryBase : projectLibraryBaseList) { if(StringUtils.isBlank(libraryBase.getParentId())){ @@ -131,13 +130,13 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService projectLibraryBaseLinkedList.addAll(projectLibraryBaseListTemp); } } - projectLibraryBaseList.sort(Comparator.comparing(ProjectLibraryBase::getShowName)); + Collections.sort(projectLibraryBaseList); List dictItemList = sysDictItemServiceImpl.selectItemsByDictCode("region"); for (ProjectLibraryBase libraryBase : projectLibraryBaseList) { targetMarket(projectLibraryBase, dictItemList, libraryBase); Map mapList = new HashMap<>(); - List> collect = new ArrayList<>(); + List> collect; if(ObjectUtils.isNotEmpty(startTime) && ObjectUtils.isNotEmpty(endTime)){ collect = listNew.stream().filter(e -> libraryBase.getId().equals(e.get(0).getProjectId())).collect(Collectors.toList()); }else{ @@ -147,8 +146,9 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService if(collect.size() != 0){ index ++; mapList.put("index",index); - mapList.put("projectName",libraryBase.getProjectName()+" "+libraryBase.getYearName()+"-"+libraryBase.getTargetMarket()+"-"+libraryBase.getProjectVersion()); + mapList.put("projectName",libraryBase.getShowName()); mapList.put("data",collect); + mapList.put("projectInfo",libraryBase); result.add(mapList); } } @@ -215,9 +215,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService lambdaQueryWrapper.in(ProjectTaskInventoryEO::getProjectLawsInventoryId,projectLawsInventoryEOIdAll); projectTaskInventoryEOList = projectTaskInventoryEOService.list(lambdaQueryWrapper); } - - - projectLibraryBaseList.sort(Comparator.comparing(ProjectLibraryBase::getShowName)); + Collections.sort(projectLibraryBaseList); for (ProjectLibraryBase libraryBase : projectLibraryBaseList) { //处理目标市场 targetMarket(projectLibraryBase, dictItemList, libraryBase); @@ -234,7 +232,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService projectVersion = "00"; } Map map = new HashMap<>(); - map.put("projectName",libraryBase.getProjectName()+" "+libraryBase.getYearName()+"-"+libraryBase.getTargetMarket()+"-"+projectVersion);//项目名称 + map.put("projectName",libraryBase.getShowName());//项目名称 map.put("targetMarket",libraryBase.getTargetMarket());//目标市场 //1. 项目当前状态--projectState(蓝/红/黄/绿)-->studio视角下的数据 diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index bba7da106..e2e1d742e 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1240,9 +1240,9 @@ module.exports = { dre: 'Dre', applicableInstructionsMarketList: 'Applicable instructions of market list', pleaseSelectTheDataCompared: 'Please select the data to be compared', - problemLabel: 'Topic Tag', + problemLabel: 'classification', personCharge: 'Person in charge', - addLabel: 'Add Tag', + addLabel: 'New Classification', editLabel: 'Edit Label', applicableMarket: 'Applicable Market', templateMaintenance: 'Template Maintenance', @@ -1384,4 +1384,5 @@ module.exports = { beforedatein:'In... Before date (inclusive)', inRecentMonthsin6:'Within 6 months (implemented)', batchUpdateDeadline:'Batch update deadline', + timeInterval:'Time Interval', } \ 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 938c70910..43af8d4db 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1342,9 +1342,9 @@ module.exports = { dre: '填写人', applicableInstructionsMarketList: '市场清单适用说明', pleaseSelectTheDataCompared: '请选择需要对比的数据', - problemLabel: '问题标签', + problemLabel: '分类', personCharge: '负责人', - addLabel: '新增标签', + addLabel: '新增分类', editLabel: '编辑标签', applicableMarket: '适用市场', templateMaintenance: '模板维护', @@ -1485,4 +1485,5 @@ module.exports = { beforedatein:'在...日期之前(包含)', inRecentMonthsin6:'近6个月内(已实施)', batchUpdateDeadline:'批量更新截止时间', + timeInterval:'时间区间', } \ No newline at end of file diff --git a/jero-web/src/components/Standardselection/index.vue b/jero-web/src/components/Standardselection/index.vue index b658c56a2..d7edda414 100644 --- a/jero-web/src/components/Standardselection/index.vue +++ b/jero-web/src/components/Standardselection/index.vue @@ -83,6 +83,7 @@ visible: false, confirmLoading: false, selectedRowKeys: [], + selectedRowList: [], content: [], loading: false, queryParam: {}, @@ -149,16 +150,17 @@ this.visible = false }, handleSubmit() { - let content = [] - // let replace_standard_id = [] + let serial_number = [] + let replace_standard_id = [] if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { - let content = JSON.parse(JSON.stringify(this.selectedRowKeys)) - // this.content.forEach(res => { - // content.push(res.serial_number) - // replace_standard_id.push(res.id) - // }) - this.$emit('input', content.join(',')) - // this.$emit('change', this.query.db_field_name, replace_standard_id.join(',')) + // let content = JSON.parse(JSON.stringify(this.selectedRowList)) + this.selectedRowList.forEach(res => { + serial_number.push(res.serial_number) + replace_standard_id.push(res.id) + }) + this.$emit('input', serial_number.join(',')) + console.log(replace_standard_id) + this.$emit('change', this.query.db_field_name, replace_standard_id.join(',')) // this.$emit('changecontent', this.content) this.visible = false } else { @@ -168,9 +170,11 @@ indexclick(event) { this.$emit('input', event.target.value) }, - onSelectChange(value) { + onSelectChange(value,row) { console.log(value) + console.log(row) this.selectedRowKeys = value + this.selectedRowList = row // this.content = [] // value.forEach(val => { // this.dataList.forEach((res) => { diff --git a/jero-web/src/components/libraryAddForm/index.vue b/jero-web/src/components/libraryAddForm/index.vue index 86cd81291..c99abc593 100644 --- a/jero-web/src/components/libraryAddForm/index.vue +++ b/jero-web/src/components/libraryAddForm/index.vue @@ -169,6 +169,7 @@ @@ -494,10 +495,11 @@ this.type = 'add' this.getForm() }, - // StandardselectionChange(value, id) { - // this.formInline[value + '_id'] = id - // this.formInline = { ...this.formInline } - // }, + StandardselectionChange(value, id) { + console.log(id) + this.formInline[value + '_id'] = id + this.formInline = { ...this.formInline } + }, PersonnelSelectionChange(value, id) { this.formInline[value + '_id'] = id this.formInline = { ...this.formInline } diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue index bd3307777..6eb8a71be 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue @@ -31,17 +31,17 @@ v-model="queryParam.title"> - -
-
- {{$t('status')}} -
- -
-
+ + + + + + + + + + + diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 507e800ba..dadfbaa12 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -931,24 +931,24 @@ key: 3, moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', }, - { - sort: '', - name: this.$t('listConfirmationStatus'), - headFieldCn:'清单确认状态', - headFieldEn:'List Confirmation Status', - field: 'inventoryAffirmStatusName', - key: 4, - moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', - }, - { - sort: '', - name: this.$t('taskAffirmStatus'), - headFieldCn:'任务确认状态', - headFieldEn:'Task Confirmation Status', - field: 'taskAffirmStatusName', - key: 5, - moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', - }, + // { + // sort: '', + // name: this.$t('listConfirmationStatus'), + // headFieldCn:'清单确认状态', + // headFieldEn:'List Confirmation Status', + // field: 'inventoryAffirmStatusName', + // key: 4, + // moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', + // }, + // { + // sort: '', + // name: this.$t('taskAffirmStatus'), + // headFieldCn:'任务确认状态', + // headFieldEn:'Task Confirmation Status', + // field: 'taskAffirmStatusName', + // key: 5, + // moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', + // }, { sort: '', name: this.$t('zoneOfApplication'), diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue index 81a329dbf..920677cbc 100644 --- a/jero-web/src/views/externalReports/index.vue +++ b/jero-web/src/views/externalReports/index.vue @@ -143,10 +143,10 @@ :columns="columns" > - {{ text && text.length > 20 ? text.slice(0, 18) + '...' : text }} + {{ text }} - {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }} + {{ text }} @@ -382,6 +382,7 @@ { title: this.$t('fileName'), align: 'left', + ellipsis: true, dataIndex: 'fileName', scopedSlots: { customRender: 'fileName' }, width: 200 @@ -389,6 +390,7 @@ { title: this.$t('fileDeclaration'), align: 'left', + ellipsis: true, dataIndex: 'fileDescription', scopedSlots: { customRender: 'projectName' }, width: 300 @@ -396,6 +398,7 @@ { title: this.$t('uploadedBy'), align: 'left', + ellipsis: true, dataIndex: 'createBy', width: 150 }, @@ -407,6 +410,7 @@ { title: this.$t('uploadTime'), align: 'left', + ellipsis: true, dataIndex: 'createTime', width: 250 }, @@ -414,6 +418,7 @@ title: this.$t('operation'), align: 'left', fixed: 'right', + ellipsis: true, width: 250, scopedSlots: { customRender: 'operation' } } @@ -1123,7 +1128,7 @@ \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue index 41b6745b5..fe8ef3d12 100644 --- a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue +++ b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue @@ -6,7 +6,7 @@
- {{$t('entryName')}} + {{ $t('entryName') }}
@@ -15,37 +15,38 @@
- {{$t('targetMarket')}} + {{ $t('targetMarket') }}
+ :triggerChange="false" :dictCode="'region'" />
- {{$t('brand')}} + {{ $t('brand') }}
+ :triggerChange="false" :dictCode="'brand'" />
- {{$t('query')}} - {{$t('reset')}} + {{ $t('query') }} + {{ $t('reset') }}
- {{$t('regulatoryCertificationTaskPlan')}} - {{$t('fullScreenView')}} + {{ $t('regulatoryCertificationTaskPlan') }} + {{ $t('fullScreenView') }}
- {{$t('determine')}} + {{ $t('determine') }}
@@ -68,13 +69,21 @@
-
{{item}}
+
{{ item }}
-
- {{item.projectName}} + + + {{ item.projectName }} +
@@ -83,12 +92,12 @@
-
{{val.name}}
-
{{val.name}} +
{{ val.name }}
+
{{ val.name }}
@@ -104,17 +113,17 @@
- {{handlingTime}} + {{ handlingTime }}
- {{this.$t('dataLoading')}} + {{ this.$t('dataLoading') }}
- {{$t('projectStatusAndProgress')}} - {{$t('fullScreenView')}} + {{ $t('projectStatusAndProgress') }} + {{ $t('fullScreenView') }}
- {{this.$t('CurrentStatusOfTheProject')}}
- {{'('+$t('red')+'/'+$t('yellow')+'/'+$t('green')+'/'+$t('blue')+')'}} + {{ this.$t('CurrentStatusOfTheProject') }}
+ {{ '(' + $t('red') + '/' + $t('yellow') + '/' + $t('green') + '/' + $t('blue') + ')' }}
- {{this.$t('CertificationProgress')}}
- {{'('+$t('notInvolved')+'/'+$t('toBeStarted')+'/'+$t('inProgress')+'/'+$t('experimentFailed')+'/'+$t('experimentPassed')+')'}} + {{ this.$t('CertificationProgress') }}
+ {{ '(' + $t('notInvolved') + '/' + $t('toBeStarted') + '/' + $t('inProgress') + '/' + $t('experimentFailed') + '/' + $t('experimentPassed') + ')' + }}
- {{this.$t('listConfirmation')}}
- {{'('+$t('notLaunch')+'/'+$t('toBeConfirmed')+'/'+$t('accept')+'/'+$t('refuse')+')'}} + {{ this.$t('listConfirmation') }}
+ {{ '(' + $t('notLaunch') + '/' + $t('toBeConfirmed') + '/' + $t('accept') + '/' + $t('refuse') + ')' + }}
- {{this.$t('taskAffirm')}}
- {{'('+$t('notLaunch')+'/'+$t('toBeConfirmed')+'/'+$t('accept')+'/'+$t('refuse')+')'}} + {{ this.$t('taskAffirm') }}
+ {{ '(' + $t('notLaunch') + '/' + $t('toBeConfirmed') + '/' + $t('accept') + '/' + $t('refuse') + ')' + }}
- {{this.$t('designComplianceReview')}}
- {{'('+$t('toBeConfirmed')+'/'+$t('accord')+'/'+$t('nonConformity')+'/'+$t('Tracked')+'/'+$t('notInvolved')+'/'+$t('taskTermination')+')'}} + {{ this.$t('designComplianceReview') }}
+ {{ '(' + $t('toBeConfirmed') + '/' + $t('accord') + '/' + $t('nonConformity') + '/' + $t('Tracked') + '/' + $t('notInvolved') + '/' + $t('taskTermination') + ')' + }}
- {{this.$t('preHomeConfirmation')}}
- {{'('+$t('toBeConfirmed')+'/'+$t('accord')+'/'+$t('nonConformity')+'/'+$t('Tracked')+'/'+$t('notInvolved')+'/'+$t('taskTermination')+')'}} + {{ this.$t('preHomeConfirmation') }}
+ {{ '(' + $t('toBeConfirmed') + '/' + $t('accord') + '/' + $t('nonConformity') + '/' + $t('Tracked') + '/' + $t('notInvolved') + '/' + $t('taskTermination') + ')' + }}
- {{this.$t('verificationComplianceReview')}}
- {{'('+$t('toBeConfirmed')+'/'+$t('accord')+'/'+$t('nonConformity')+'/'+$t('Tracked')+'/'+$t('notInvolved')+'/'+$t('taskTermination')+')'}} + {{ this.$t('verificationComplianceReview') }}
+ {{ '(' + $t('toBeConfirmed') + '/' + $t('accord') + '/' + $t('nonConformity') + '/' + $t('Tracked') + '/' + $t('notInvolved') + '/' + $t('taskTermination') + ')' + }}
@@ -161,589 +176,609 @@ \ No newline at end of file diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue index 9398cb80a..59c4e4bbb 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue @@ -61,7 +61,7 @@ dataIndex: 'projectName', scopedSlots: { customRender: 'RelatedItems' }, ellipsis: true, - width: 170 + width: 130 }, { title: this.$t('standardInformation'), @@ -69,7 +69,7 @@ dataIndex: 'standardInfo', scopedSlots: { customRender: 'standardInformation' }, ellipsis: true, - width: 170 + width: 330 }, { title: this.$t('taskType'), @@ -83,28 +83,28 @@ align: 'left', dataIndex: 'lastAssigneeName', ellipsis: true, - width: 170 + width: 150 }, { 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'), diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index 189f86557..0a27f290b 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -62,7 +62,7 @@ dataIndex: 'projectName', ellipsis: true, scopedSlots: { customRender: 'RelatedItems' }, - width: 170 + width: 110 }, { title: this.$t('standardInformation'), @@ -70,28 +70,28 @@ dataIndex: 'standardInfo', ellipsis: true, scopedSlots: { customRender: 'standardInformation' }, - width: 170 + width: 260 }, { title: this.$t('taskType'), align: 'left', dataIndex: 'flowTypeShow', ellipsis: true, - width: 170 + width: 120 }, { title: this.$t('Sponsor'), 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' } }, { @@ -99,13 +99,13 @@ align: 'left', dataIndex: 'statusShow', ellipsis: true, - width: 170 + width: 80 }, { title: this.$t('operation'), align: 'left', fixed: 'right', - width: 120, + width: 80, scopedSlots: { customRender: 'operation' } } ], diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue index 26d9d7611..3ac60c76d 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue @@ -67,7 +67,7 @@ dataIndex: 'projectName', ellipsis: true, scopedSlots: { customRender: 'RelatedItems' }, - width: 170 + width: 130 }, { title: this.$t('standardInformation'), @@ -75,7 +75,7 @@ dataIndex: 'standardInfo', ellipsis: true, scopedSlots: { customRender: 'standardInformation' }, - width: 170 + width: 330 }, { title: this.$t('taskType'), @@ -89,28 +89,28 @@ 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'), diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue index bef67c63d..f19f702a1 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue @@ -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'), diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue index a52e15bc7..2d54fcac8 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue @@ -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'), diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue index b47816e1e..f421926a9 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue @@ -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'),