From 20ea7056d98024bbbd3b26618a42b449bfc4d60c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 15 Mar 2023 10:14:24 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=99=9A=E6=8B=9F?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=AF=BC=E5=87=BA=E6=96=87=E4=BB=B6=E5=90=8D?= =?UTF-8?q?=E5=B8=A6=E6=9C=89/=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dummy/service/impl/DummyInventoryInfoEOServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 Date: Wed, 15 Mar 2023 10:39:36 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=A4=B4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/virtualListDetails.vue | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) 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'), From 8faba8790863616f19e854d39117012d1c04d3b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 15 Mar 2023 10:50:31 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=88=97=E5=AE=BD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectRegulationTasks/components/SentList.vue | 8 ++++---- .../projectRegulationTasks/components/dealtWith.vue | 6 +++--- .../projectRegulationTasks/components/doneList.vue | 8 ++++---- .../regulatoryAssessmentTasks/components/SentList.vue | 8 ++++---- .../regulatoryAssessmentTasks/components/dealtWith.vue | 6 +++--- .../regulatoryAssessmentTasks/components/doneList.vue | 8 ++++---- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue index 9398cb80a..34ad20f6f 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue @@ -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..3bfb19f25 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -84,14 +84,14 @@ 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' } }, { @@ -99,7 +99,7 @@ align: 'left', dataIndex: 'statusShow', ellipsis: true, - width: 170 + width: 130 }, { title: this.$t('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..b9f133f34 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue @@ -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..95b9daac0 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue @@ -74,28 +74,28 @@ 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..c3809f009 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue @@ -72,14 +72,14 @@ 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..558c55730 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue @@ -71,28 +71,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'), From 0c3d9f86adf05a18628b914b2fb94eab94d270c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 15 Mar 2023 11:04:32 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=88=97=E5=AE=BD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectRegulationTasks/components/SentList.vue | 4 ++-- .../components/dealtWith.vue | 14 +++++++------- .../projectRegulationTasks/components/doneList.vue | 4 ++-- .../components/SentList.vue | 4 ++-- .../components/dealtWith.vue | 4 ++-- .../components/doneList.vue | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue index 34ad20f6f..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'), diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index 3bfb19f25..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: 130 + width: 100 }, { title: this.$t('TaskCutOffTime'), align: 'left', dataIndex: 'endTime', ellipsis: true, - width: 150, + width: 110, scopedSlots: { customRender: 'endTime' } }, { @@ -99,13 +99,13 @@ align: 'left', dataIndex: 'statusShow', ellipsis: true, - width: 130 + 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 b9f133f34..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'), diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue index 95b9daac0..f19f702a1 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue @@ -60,14 +60,14 @@ 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'), diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue index c3809f009..2d54fcac8 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue @@ -58,14 +58,14 @@ 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'), diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue index 558c55730..f421926a9 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue @@ -57,14 +57,14 @@ 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'), From 9de23336533781c670efe8f6ef1d095a6a9aac1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 15 Mar 2023 11:13:26 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E7=89=88=E6=9C=AC=E5=8F=AF=E7=BC=96=E8=BE=91=EF=BC=8C?= =?UTF-8?q?=E9=99=90=E5=88=B6=E4=B8=A4=E4=BD=8D=E6=95=B0=E5=AD=97=EF=BC=8C?= =?UTF-8?q?=E6=AD=A3=E5=BA=8F=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/projectManagement/components/addModel.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/addModel.vue b/jero-web/src/views/projectManagement/components/addModel.vue index 40418ac3a..55ea1a3e5 100644 --- a/jero-web/src/views/projectManagement/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/addModel.vue @@ -76,8 +76,8 @@ {{$t('projectVersion')}} - From d17ae70ca210d51935f95aa5b2f303d864ac48f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 15 Mar 2023 11:27:08 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E9=97=AE=E9=A2=98=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=88=86=E7=B1=BB=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=94=B9=E4=B8=BA=E6=96=B0=E5=A2=9E=E5=88=86?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 4 ++-- jero-web/src/common/lang/zh-cn.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index bba7da106..b29e0dee6 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', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 938c70910..a9f9a9b68 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: '模板维护', From 516fa722b81213a57fd91b74d91dcfc670256695 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 15 Mar 2023 13:40:15 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E5=AF=B9=E5=A4=96=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E7=AE=A1=E7=90=86=20=E5=88=97=E8=A1=A8=E6=8B=96=E6=8B=BD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/externalReports/index.vue | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) 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 From e370d479aa2731ed69e4f0f9e0bcc5fcba5d1ba8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 16 Mar 2023 18:04:30 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9UAT=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20=E6=B6=88=E6=81=AF=E5=86=85=E5=AE=B9=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BussDocumentLibraryEOServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 bbe2428c9..3614ab30c 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 @@ -2775,13 +2775,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fileIdLIstTemp = new ArrayList<>(); From 658f1ded2f88f19446a629684d4fedb33c6aca2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Fri, 17 Mar 2023 15:12:51 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9UAT=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E4=BB=A3=E6=9B=BF=E6=A0=87=E5=87=86?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/BussDocumentLibraryEO.java | 14 ++++++ .../BussDocumentLibraryEOServiceImpl.java | 45 +++++++++++++++++++ .../components/Standardselection/index.vue | 24 +++++----- .../src/components/libraryAddForm/index.vue | 10 +++-- 4 files changed, 79 insertions(+), 14 deletions(-) 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 3614ab30c..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 @@ -1726,6 +1726,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl 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 }