From c8416efa70d03f96cfc5d9302e9cf65b4a06ac8e Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 22 Jun 2022 14:19:55 +0800 Subject: [PATCH 01/42] =?UTF-8?q?=E6=8B=86=E5=88=86,=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=AF=BC=E5=85=A5-=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E8=A7=A3=E5=8E=8B=E6=96=87=E4=BB=B6=E4=B8=8B=E6=9C=89=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E6=96=87=E4=BB=B6=E5=A4=B9=E6=97=B6=E8=AF=BB=E4=B8=8D?= =?UTF-8?q?=E5=88=B0orgMkdirs=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ParamsInfoEOServiceImpl.java | 4 +- .../jero/modules/split/common/FileUnZip.java | 49 +++++++++++++++++++ .../impl/FileSplitItemsEOServiceImpl.java | 4 +- 3 files changed, 53 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java index 56f0677fe..08984c368 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java @@ -710,7 +710,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl excelfilelist = FileUnZip.readExcelFile(zipEntryName); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java index 9962c9ba9..6b49c5eca 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java @@ -76,6 +76,55 @@ public class FileUnZip { return orgMkdirs; } + /** + * 解压zip文件 + * 解决解压文件下有多个文件夹时，读不到orgMkdirs问题 + * @param sourceFile,待解压的zip文件; descDir,解压后的存放路径 + * @throws Exception + * @author gaoyan + **/ + public static String unZipFiles2(String sourceFile, String descDir) throws IOException { + File zipFile = new File(sourceFile); + + File pathFile = new File(descDir); + if (!pathFile.exists()) { + pathFile.mkdirs(); + } + ZipFile zip = new ZipFile(zipFile,"gbk"); + String orgMkdirsLast = ""; + for (Enumeration entries = zip.getEntries(); entries.hasMoreElements(); ) { + ZipEntry entry = (ZipEntry) entries.nextElement(); + String zipEntryName = entry.getName(); + String outPath = (descDir + "/" + zipEntryName).replaceAll("\\*", "/"); + orgMkdirsLast = zipEntryName.substring(0, zipEntryName.indexOf('/')); + //判断路径是否存在,不存在则创建文件路径 + File file = new File(outPath.substring(0, outPath.lastIndexOf('/'))); + if (!file.exists()) { + file.mkdirs(); + } + //判断文件全路径是否为文件夹,如果是上面已经上传,不需要解压 + if (new File(outPath).isDirectory()) { + continue; + } + //输出文件路径信息 +// InputStream in = null; +// OutputStream out = null; + try(InputStream in =zip.getInputStream(entry); + OutputStream out =new FileOutputStream(outPath)){ + byte[] buf1 = new byte[1024]; + int len; + while ((len = in.read(buf1)) > 0) { + out.write(buf1, 0, len); + } + }catch(IOException e){ + logger.error(e.getMessage(),e); + } + } + zip.close(); + String orgMkdirs = descDir + "/" + orgMkdirsLast; + return orgMkdirs; + } + /** * 递归删除文件及文件夹 * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index 3a21d9da6..ae71735f7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -1484,7 +1484,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl excelfilelist = FileUnZip.readExcelFile(zipEntryName); From f27c5581f0156b7b03759d85c200e3003e006438 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 14 Feb 2022 16:43:48 +0800 Subject: [PATCH 02/42] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DummyInventoryInfoEOServiceImpl.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 02027ed49..975193c4c 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 @@ -1469,10 +1469,12 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl collect = bussDocumentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList()); List serialNumbers = serialNumberS.stream().filter(e -> !collect.contains(e)).collect(Collectors.toList()); - if(CutEnum.CN.getValue().equals(dataList.get(0).getCut())){ - throw new JeroBootException(StringUtils.join(serialNumbers,",")+"文档库中不存在,不能添加"); - }else{ - throw new JeroBootException(StringUtils.join(serialNumbers,",")+" does not exist in the document library and cannot be added"); + if(serialNumbers.size() != 0){ + if(CutEnum.CN.getValue().equals(dataList.get(0).getCut())){ + throw new JeroBootException(StringUtils.join(serialNumbers,",")+"文档库中不存在,不能添加"); + }else{ + throw new JeroBootException(StringUtils.join(serialNumbers,",")+" does not exist in the document library and cannot be added"); + } } } if(dummyInventoryInfoEOList.size() > 0){ From de3103e298f5c30cd9aa17f75c63f0bdcd159b65 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 22 Jun 2022 16:10:56 +0800 Subject: [PATCH 03/42] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/monthlyReportRegulations.vue | 38 +++++++++++++++++-- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue b/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue index ff35e0620..5f005c4e8 100644 --- a/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue +++ b/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue @@ -8,10 +8,10 @@
-
+
-
文档库中新增了新的标准 GB 7258 机动车文件
-
2022-04-04 12:00:00
+
{{item.name}}
+
{{item.time}}
@@ -19,7 +19,37 @@ From cc246e52ee3cb858195bbe801e2d0a726ea3d8d6 Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 22 Jun 2022 16:21:37 +0800 Subject: [PATCH 04/42] =?UTF-8?q?people=E5=90=8C=E6=AD=A5=E7=94=A8?= =?UTF-8?q?=E6=88=B7bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/system/service/impl/SyncDataServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java index 4dd1f1c3d..bb0397e54 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java @@ -195,8 +195,8 @@ public class SyncDataServiceImpl implements ISyncDataService{ ppEmployeeList.addAll(currentPPEmployeeList); } } - // 处理同步过来的数据id不同，username相同的情况 - ppEmployeeList.sort(Comparator.comparing(PPEmployee::getCreation_time).reversed()); + // 处理同步过来的数据id不同，username相同的情况 creation_time不能为空 +// ppEmployeeList.sort(Comparator.comparing(PPEmployee::getCreation_time).reversed()); //此处获取全部pp用户信息 List sysUserList = sysUserService.getPPEmployeeList(); From 61b137802e54a1a704098e89cf73a3b0850c8919 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 22 Jun 2022 16:25:25 +0800 Subject: [PATCH 05/42] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=AD=A3=E5=BC=8F?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E7=9A=84=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/tools/UserMenu.vue | 6 +++--- jero-web/src/permission.js | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/jero-web/src/components/tools/UserMenu.vue b/jero-web/src/components/tools/UserMenu.vue index a52b3a8c9..d36ba82c2 100644 --- a/jero-web/src/components/tools/UserMenu.vue +++ b/jero-web/src/components/tools/UserMenu.vue @@ -223,13 +223,13 @@ return that.Logout({}).then(() => { // update-begin author:wangshuai date:20200601 for: 退出登录跳转登录页面 // TODO 在部署线上时注掉以下代码 - that.$router.push({ path: '/user/login' }) + // that.$router.push({ path: '/user/login' }) // window.location.href = 'https://signin-test.nio.com/logout?client_id=100679&redirect_uri=' + // encodeURIComponent('http://localhost:3000/dashboard/analysis') + '&response_type=code' //本地 // TODO 在部署线上时解开以下代码 - // window.location.href = 'https://signin.nio.com/logout?client_id=100679&redirect_uri=' + - // encodeURIComponent('http://grp.nioint.com/dashboard/analysis') + '&response_type=code' //线上 + window.location.href = 'https://signin.nio.com/logout?client_id=100679&redirect_uri=' + + encodeURIComponent('http://grp.nioint.com/dashboard/analysis') + '&response_type=code' //线上 localStorage.removeItem('language') // update-end author:wangshuai date:20200601 for: 退出登录跳转登录页面 diff --git a/jero-web/src/permission.js b/jero-web/src/permission.js index cfde5c21f..4067830ea 100644 --- a/jero-web/src/permission.js +++ b/jero-web/src/permission.js @@ -14,10 +14,10 @@ NProgress.configure({ showSpinner: false }) // NProgress Configuration // TODO 线上部署在conmponetns/tools/UserMenu.vue的退出登录时需解开代码以及注释代码 // TODO 在部署线上时注掉以下代码 -const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration'] +// const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration'] // TODO 在部署线上时解开一下代码 -// const whiteList = [] +const whiteList = [] // no redirect whitelist @@ -96,7 +96,7 @@ router.beforeEach((to, from, next) => { // query: { redirect: to.fullPath } store.dispatch('Logout').then(() => { // TODO 在部署线上时注掉此代码 - next({ path: '/user/login', query: { redirect: to.fullPath } }) + // next({ path: '/user/login', query: { redirect: to.fullPath } }) let fullPath = '' if (to.fullPath == '/') { @@ -109,8 +109,8 @@ router.beforeEach((to, from, next) => { // + encodeURIComponent('http://localhost:3000' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //本地 // TODO 在部署线上时解开此代码 - // window.location.href = 'https://signin.nio.com/oauth2/authorize?client_id=100679&redirect_uri=' - // + encodeURIComponent('https://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上 + window.location.href = 'https://signin.nio.com/oauth2/authorize?client_id=100679&redirect_uri=' + + encodeURIComponent('https://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上 }) }) } else { @@ -123,7 +123,7 @@ router.beforeEach((to, from, next) => { next() } else { // TODO 在部署线上时注掉此代码 - next({ path: '/user/login', query: { redirect: to.fullPath } }) + // next({ path: '/user/login', query: { redirect: to.fullPath } }) let fullPath = '' if (to.fullPath == '/') { @@ -135,8 +135,8 @@ router.beforeEach((to, from, next) => { // window.location.href = 'https://signin-test.nio.com/oauth2/authorize?client_id=100679&redirect_uri=' // + encodeURIComponent('http://localhost:3000' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //本地 // TODO 在部署线上时解开此代码 - // window.location.href = 'https://signin.nio.com/oauth2/authorize?client_id=100679&redirect_uri=' - // + encodeURIComponent('https://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上 + window.location.href = 'https://signin.nio.com/oauth2/authorize?client_id=100679&redirect_uri=' + + encodeURIComponent('https://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上 NProgress.done() // if current page is login will not trigger afterEach hook, so manually handle it } From 2236904ff94ac55aa872c2877e59de1a2baca9fb Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 22 Jun 2022 16:27:52 +0800 Subject: [PATCH 06/42] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=AD=A3=E5=BC=8F?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E7=9A=84=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/tools/UserMenu.vue | 6 +++--- jero-web/src/permission.js | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/jero-web/src/components/tools/UserMenu.vue b/jero-web/src/components/tools/UserMenu.vue index d36ba82c2..a52b3a8c9 100644 --- a/jero-web/src/components/tools/UserMenu.vue +++ b/jero-web/src/components/tools/UserMenu.vue @@ -223,13 +223,13 @@ return that.Logout({}).then(() => { // update-begin author:wangshuai date:20200601 for: 退出登录跳转登录页面 // TODO 在部署线上时注掉以下代码 - // that.$router.push({ path: '/user/login' }) + that.$router.push({ path: '/user/login' }) // window.location.href = 'https://signin-test.nio.com/logout?client_id=100679&redirect_uri=' + // encodeURIComponent('http://localhost:3000/dashboard/analysis') + '&response_type=code' //本地 // TODO 在部署线上时解开以下代码 - window.location.href = 'https://signin.nio.com/logout?client_id=100679&redirect_uri=' + - encodeURIComponent('http://grp.nioint.com/dashboard/analysis') + '&response_type=code' //线上 + // window.location.href = 'https://signin.nio.com/logout?client_id=100679&redirect_uri=' + + // encodeURIComponent('http://grp.nioint.com/dashboard/analysis') + '&response_type=code' //线上 localStorage.removeItem('language') // update-end author:wangshuai date:20200601 for: 退出登录跳转登录页面 diff --git a/jero-web/src/permission.js b/jero-web/src/permission.js index 4067830ea..cfde5c21f 100644 --- a/jero-web/src/permission.js +++ b/jero-web/src/permission.js @@ -14,10 +14,10 @@ NProgress.configure({ showSpinner: false }) // NProgress Configuration // TODO 线上部署在conmponetns/tools/UserMenu.vue的退出登录时需解开代码以及注释代码 // TODO 在部署线上时注掉以下代码 -// const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration'] +const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration'] // TODO 在部署线上时解开一下代码 -const whiteList = [] +// const whiteList = [] // no redirect whitelist @@ -96,7 +96,7 @@ router.beforeEach((to, from, next) => { // query: { redirect: to.fullPath } store.dispatch('Logout').then(() => { // TODO 在部署线上时注掉此代码 - // next({ path: '/user/login', query: { redirect: to.fullPath } }) + next({ path: '/user/login', query: { redirect: to.fullPath } }) let fullPath = '' if (to.fullPath == '/') { @@ -109,8 +109,8 @@ router.beforeEach((to, from, next) => { // + encodeURIComponent('http://localhost:3000' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //本地 // TODO 在部署线上时解开此代码 - window.location.href = 'https://signin.nio.com/oauth2/authorize?client_id=100679&redirect_uri=' - + encodeURIComponent('https://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上 + // window.location.href = 'https://signin.nio.com/oauth2/authorize?client_id=100679&redirect_uri=' + // + encodeURIComponent('https://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上 }) }) } else { @@ -123,7 +123,7 @@ router.beforeEach((to, from, next) => { next() } else { // TODO 在部署线上时注掉此代码 - // next({ path: '/user/login', query: { redirect: to.fullPath } }) + next({ path: '/user/login', query: { redirect: to.fullPath } }) let fullPath = '' if (to.fullPath == '/') { @@ -135,8 +135,8 @@ router.beforeEach((to, from, next) => { // window.location.href = 'https://signin-test.nio.com/oauth2/authorize?client_id=100679&redirect_uri=' // + encodeURIComponent('http://localhost:3000' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //本地 // TODO 在部署线上时解开此代码 - window.location.href = 'https://signin.nio.com/oauth2/authorize?client_id=100679&redirect_uri=' - + encodeURIComponent('https://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上 + // window.location.href = 'https://signin.nio.com/oauth2/authorize?client_id=100679&redirect_uri=' + // + encodeURIComponent('https://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上 NProgress.done() // if current page is login will not trigger afterEach hook, so manually handle it } From 0f880a0f5942f7d20f18762f440505c401a61cc1 Mon Sep 17 00:00:00 2001 From: zer0Black Date: Thu, 23 Jun 2022 09:57:03 +0800 Subject: [PATCH 07/42] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E9=95=BF?= =?UTF-8?q?=E5=BA=A6=E6=94=B9=E5=8A=A8=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/first_bug_fix_record.sql | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql b/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql index 5163a0020..59331a737 100644 --- a/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql +++ b/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql @@ -1 +1,5 @@ --- 一阶段的bug修复导致的字段增删、必须数据增删添加到此处 \ No newline at end of file +-- 一阶段的bug修复导致的字段增删、必须数据增删添加到此处 + +ALTER TABLE `sys_role_permission` +MODIFY COLUMN `operate_ip` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '操作ip' AFTER `operate_date`; +-- 6月23日部署上线 From 49ab70fdbd15f22477f8b580cc1d737d46f8aafd Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 23 Jun 2022 15:41:05 +0800 Subject: [PATCH 08/42] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95--?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=A4=E4=BB=98=E7=89=A9=E8=AF=B4=E6=98=8E?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/蔚来标准sql/first_bug_fix_record.sql | 5 ++ .../dummy/entity/DummyInventoryInfoEO.java | 18 ++++ .../dummy/entity/DummyInventoryInfoEOEn.java | 60 +++++++++----- .../mapper/xml/DummyInventoryInfoEOMapper.xml | 4 +- .../impl/DummyInventoryInfoEOServiceImpl.java | 82 +++++++++++-------- 5 files changed, 111 insertions(+), 58 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql b/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql index 59331a737..22b43150c 100644 --- a/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql +++ b/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql @@ -3,3 +3,8 @@ ALTER TABLE `sys_role_permission` MODIFY COLUMN `operate_ip` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '操作ip' AFTER `operate_date`; -- 6月23日部署上线 + +ALTER TABLE `dummy_inventory_info` +ADD COLUMN `verify_remark` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '验证备注' AFTER `applicable_supplement`, +ADD COLUMN `prehomo_remark` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'pre备注' AFTER `verify_remark`, +ADD COLUMN `design_remark` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '设计备注' AFTER `prehomo_remark`; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java index 99073f97a..b9aaa15ad 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java @@ -201,6 +201,10 @@ public class DummyInventoryInfoEO implements Serializable { @Dict(dicCode ="ze2_ren4_ren2") private java.lang.String designDuty; + //交付物说明 + @Excel(name = "设计符合性确认-交付物说明", width = 20) + private String designRemark; + /**prehomo确认-交付物类型*/ @Excel(name = "Prehomo-交付物类型", width = 15,dicCode ="deliverable_template") @ApiModelProperty(value = "prehomo确认-交付物类型") @@ -209,6 +213,7 @@ public class DummyInventoryInfoEO implements Serializable { @TableField(exist = false) private java.lang.String prehomoDeliverableTypeName; + /**prehomo确认-交付物模板*/ @ApiModelProperty(value = "prehomo确认-交付物模板") @@ -230,6 +235,10 @@ public class DummyInventoryInfoEO implements Serializable { @Dict(dicCode ="ze2_ren4_ren2") private java.lang.String prehomoDuty; + //prehomo确认-交付物说明 + @Excel(name = "prehomo确认-交付物说明", width = 20) + private String prehomoRemark; + /**验证符合性确认-交付物类型*/ @Excel(name = "验证-交付物类型", width = 15,dicCode ="deliverable_template") @ApiModelProperty(value = "验证符合性确认-交付物类型") @@ -259,6 +268,10 @@ public class DummyInventoryInfoEO implements Serializable { @Dict(dicCode ="ze2_ren4_ren2") private java.lang.String verifyDuty; + //验证备注 + @Excel(name = "验证符合性确认-交付物说明", width = 20) + private String verifyRemark; + @TableField(exist = false) private String cut; @@ -273,4 +286,9 @@ public class DummyInventoryInfoEO implements Serializable { + + + + + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEOEn.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEOEn.java index e873f2709..d723a4612 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEOEn.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEOEn.java @@ -82,11 +82,11 @@ public class DummyInventoryInfoEOEn implements Serializable { /**适用地区*/ @ApiModelProperty(value = "适用地区") @Dict(dicCode ="region") - @Excel(name = "Area", width = 15, dicCode = "region") + @Excel(name = "Area", width = 15) private String region; /**适用范围*/ - @Excel(name = "Scope of application", width = 15, dicCode = "apply_scope") + @Excel(name = "Scope of application", width = 30, dicCode = "apply_scope") @ApiModelProperty(value = "适用范围") @Dict(dicCode ="apply_scope") private String shi4Yong4Fan4Wei2; @@ -111,7 +111,7 @@ public class DummyInventoryInfoEOEn implements Serializable { private String implementType; /**新车型实施日期*/ - @Excel(name = "New Type Execute Date", width = 15,format = "yyyy-MM-dd") + @Excel(name = "New Type Execute Date", width = 30,format = "yyyy-MM-dd") @ApiModelProperty(value = "新车型实施日期") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @@ -120,7 +120,7 @@ public class DummyInventoryInfoEOEn implements Serializable { private String xin1Che1Xing2Shi2Shi1Ri4Qi1String; /**在产车实施日期*/ - @Excel(name = "New Vehicle Execute Date", width = 15,format = "yyyy-MM-dd") + @Excel(name = "New Vehicle Execute Date", width = 30,format = "yyyy-MM-dd") @ApiModelProperty(value = "在产车实施日期") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @@ -134,25 +134,25 @@ public class DummyInventoryInfoEOEn implements Serializable { private String wvtaId; /**认证类型*/ - @Excel(name = "Certification Type", width = 15,dicCode ="attestation_type") + @Excel(name = "Certification Type", width = 30,dicCode ="attestation_type") @ApiModelProperty(value = "认证类型") @Dict(dicCode ="attestation_type") private String attestationType; /**认证级别*/ - @Excel(name = "Certification Level", width = 15,dicCode ="attestation_rank") + @Excel(name = "Certification Level", width = 30,dicCode ="attestation_rank") @ApiModelProperty(value = "认证级别") @Dict(dicCode ="attestation_rank") private String attestationRank; /**适用增补件*/ @ApiModelProperty(value = "适用增补件") - @Excel(name = "Applicable Supplement", width = 15) + @Excel(name = "Applicable Supplement", width = 30) private String applicableSupplement; /**技术领域*/ - @Excel(name = "Technical Field", width = 15) + @Excel(name = "Technical Field", width = 30) @ApiModelProperty(value = "技术领域") private String technologyTerritory; @@ -160,7 +160,7 @@ public class DummyInventoryInfoEOEn implements Serializable { private String technologyTerritoryName; /**责任领域*/ - @Excel(name = "Responsible Field", width = 15,dicCode ="duty_territory") + @Excel(name = "Responsible Field", width = 30,dicCode ="duty_territory") @ApiModelProperty(value = "责任领域") @Dict(dicCode ="duty_territory") private String dutyTerritory; @@ -171,7 +171,7 @@ public class DummyInventoryInfoEOEn implements Serializable { private String remark; /**设计符合性确认-交付物类型*/ - @Excel(name = "Design-Deliverables", width = 15,dicCode ="deliverable_template") + @Excel(name = "Design Deliverables", width = 30,dicCode ="deliverable_template") @ApiModelProperty(value = "设计符合性确认-交付物类型") @Dict(dicCode ="deliverable_template") private String designDeliverableType; @@ -182,23 +182,28 @@ public class DummyInventoryInfoEOEn implements Serializable { private String designDeliverableTemplate; @TableField(exist = false) - @Excel(name = "Design-Deliverable Template", width = 15) + @Excel(name = "Design Deliverable Template", width = 30) private String designDeliverableTemplateName; + /**设计符合性确认-发起人*/ - @Excel(name = "Design-Initiator", width = 15) + @Excel(name = "Design Initiator", width = 30) @ApiModelProperty(value = "设计符合性确认-发起人") @Dict(dicCode ="fa1_qi3_ren2") private String designInitiator; /**设计符合性确认-责任人*/ - @Excel(name = "Design-Assignee", width = 15) + @Excel(name = "Design Assignee", width = 30) @ApiModelProperty(value = "设计符合性确认-责任人") @Dict(dicCode ="ze2_ren4_ren2") private String designDuty; + //交付物说明 + @Excel(name = "Design Compliance Check Deliverable Description", width = 50) + private String designRemark; + /**prehomo确认-交付物类型*/ - @Excel(name = "Prehomo-Deliverables", width = 15,dicCode ="deliverable_template") + @Excel(name = "Prehomo Deliverables", width = 30,dicCode ="deliverable_template") @ApiModelProperty(value = "prehomo确认-交付物类型") @Dict(dicCode ="deliverable_template") private String prehomoDeliverableType; @@ -209,23 +214,27 @@ public class DummyInventoryInfoEOEn implements Serializable { private String prehomoDeliverableTemplate; @TableField(exist = false) - @Excel(name = "Prehomo-Deliverable Template", width = 15) + @Excel(name = "Prehomo Deliverable Template", width = 30) private String prehomoDeliverableTemplateName; /**prehomo确认-发起人*/ - @Excel(name = "Prehomo-Initiator", width = 15) + @Excel(name = "Prehomo Initiator", width = 30) @ApiModelProperty(value = "prehomo确认-发起人") @Dict(dicCode ="fa1_qi3_ren2") private String prehomoInitiator; /**prehomo确认-责任人*/ - @Excel(name = "Prehomo-Assignee", width = 15) + @Excel(name = "Prehomo Assignee", width = 30) @ApiModelProperty(value = "prehomo确认-责任人") @Dict(dicCode ="ze2_ren4_ren2") private String prehomoDuty; + //prehomo确认-交付物说明 + @Excel(name = "Prehomo Check Deliverable Description", width = 50) + private String prehomoRemark; + /**验证符合性确认-交付物类型*/ - @Excel(name = "Verify-Deliverables", width = 15,dicCode ="deliverable_template") + @Excel(name = "Verify Deliverables", width = 30,dicCode ="deliverable_template") @ApiModelProperty(value = "验证符合性确认-交付物类型") @Dict(dicCode ="deliverable_template") private String verifyDeliverableType; @@ -235,21 +244,25 @@ public class DummyInventoryInfoEOEn implements Serializable { private String verifyDeliverableTemplate; @TableField(exist = false) - @Excel(name = "Verify-Deliverable Template", width = 15) + @Excel(name = "Verify Deliverable Template", width = 30) private String verifyDeliverableTemplateName; /**验证符合性确认-发起人*/ - @Excel(name = "Verify-Initiator", width = 15) + @Excel(name = "Verify Initiator", width = 30) @ApiModelProperty(value = "验证符合性确认-发起人") @Dict(dicCode ="fa1_qi3_ren2") private String verifyInitiator; /**验证符合性确认-责任人*/ - @Excel(name = "Verify-Assignee", width = 15) + @Excel(name = "Verify Assignee", width = 30) @ApiModelProperty(value = "验证符合性确认-责任人") @Dict(dicCode ="ze2_ren4_ren2") private String verifyDuty; + ///验证-交付物说明 + @Excel(name = "Validation Compliance Check Deliverable Description", width = 60) + private String verifyRemark; + @TableField(exist = false) private String cut; @@ -264,4 +277,9 @@ public class DummyInventoryInfoEOEn implements Serializable { + + + + + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyInventoryInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyInventoryInfoEOMapper.xml index 61fcb9840..b6f9d9eb0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyInventoryInfoEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyInventoryInfoEOMapper.xml @@ -30,7 +30,6 @@ - @@ -38,5 +37,8 @@ + + + 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 975193c4c..0b3940a8d 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 @@ -653,16 +653,18 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl 8){ String flag = ""; - if(8 < j && j < 13){ + if(8 < j && j < 14){ if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){ flag ="设计"; }else{ - flag ="design "; + flag ="Design "; } key = flag + headerCell.getStringCellValue(); } - if(12 < j && j < 17){ + if(13 < j && j < 19){ if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){ - flag ="pre"; + flag ="Pre"; }else{ - flag ="pre "; + flag ="Pre "; } key = flag + headerCell.getStringCellValue(); } - if(16 < j && j < 21){ + if(18 < j && j < 24){ if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){ flag ="验证"; }else{ - flag ="verify "; + flag ="Verify "; } key = flag + headerCell.getStringCellValue(); @@ -1720,18 +1724,21 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl Date: Thu, 23 Jun 2022 16:22:30 +0800 Subject: [PATCH 09/42] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/ProjectLawsInventoryEOEn.java | 4 ++-- .../ProjectLawsInventoryEOServiceImpl.java | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEOEn.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEOEn.java index ce27d94d0..3c4dfea55 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEOEn.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEOEn.java @@ -71,7 +71,7 @@ public class ProjectLawsInventoryEOEn implements Serializable { private String serialNumber; /**标题*/ - @Excel(name = "title", width = 20) + @Excel(name = "Title", width = 20) @ApiModelProperty(value = "标题") private String title; @@ -101,7 +101,7 @@ public class ProjectLawsInventoryEOEn implements Serializable { /**适用地区*/ @ApiModelProperty(value = "适用地区") @Dict(dicCode ="Area") - @Excel(name = "Area", width = 15, dicCode = "region") + @Excel(name = "Area", width = 15) private String region; /**对应标准*/ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index ed7f56542..f7d393ae3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -2929,8 +2929,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Thu, 23 Jun 2022 16:55:41 +0800 Subject: [PATCH 10/42] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../documentManage/subscribtion/index.vue | 62 ++++++++++--------- .../documentManage/tags/dialog/DicList.vue | 2 +- .../virtualList/components/batSetting.vue | 28 ++++++--- .../virtualList/components/editModel.vue | 14 ++--- .../components/engineeringConfirmation.vue | 5 +- .../reviewedByThePersonInCharge.vue | 7 +++ .../projectManagement/components/TaskList.vue | 4 +- .../components/TaskListModel.vue | 10 +-- .../components/batSetting.vue | 28 ++++++--- .../components/listEditModel.vue | 15 +++-- .../components/listOfRegulations.vue | 5 +- 13 files changed, 105 insertions(+), 77 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 34507c021..98bb069e4 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -939,5 +939,6 @@ module.exports = { question: 'Question', ConfirmQuestion: 'Confirm Question', disableInput: 'Disable input', + taskConfirmationDeadline:'Task Confirmation Deadline', OnlyOrTaskconfirmationOut: 'Only when the list confirmation status or task confirmation status is to be confirmed can the reminder be carried out' } \ 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 b7d2738aa..0fda8e702 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -945,4 +945,5 @@ module.exports = { ConfirmQuestion: '确认催办？', OnlyOrTaskconfirmationOut:'只有清单确认状态或任务确认状态为待确认时才可以进行催办', disableInput:'禁止输入', + taskConfirmationDeadline:'任务确认截止时间', } \ No newline at end of file diff --git a/jero-web/src/views/documentManage/subscribtion/index.vue b/jero-web/src/views/documentManage/subscribtion/index.vue index 6e3da1e9d..e0df9d449 100644 --- a/jero-web/src/views/documentManage/subscribtion/index.vue +++ b/jero-web/src/views/documentManage/subscribtion/index.vue @@ -5,44 +5,46 @@
- - -
-
- {{$t('standard')}} + + + +
+
+ {{$t('standard')}} +
+
- -
- - -
-
- {{$t('title')}} + + +
+
+ {{$t('title')}} +
+
- -
- - -
-
- {{$t('status')}} + + +
+
+ {{$t('status')}} +
+
- -
- - + + {{$t('query')}} {{$t('reset')}} - + +
diff --git a/jero-web/src/views/documentManage/tags/dialog/DicList.vue b/jero-web/src/views/documentManage/tags/dialog/DicList.vue index f06a6d344..4c4114637 100644 --- a/jero-web/src/views/documentManage/tags/dialog/DicList.vue +++ b/jero-web/src/views/documentManage/tags/dialog/DicList.vue @@ -2,7 +2,7 @@
- + diff --git a/jero-web/src/views/documentTools/virtualList/components/batSetting.vue b/jero-web/src/views/documentTools/virtualList/components/batSetting.vue index 9b653fe05..58c5fe4fb 100644 --- a/jero-web/src/views/documentTools/virtualList/components/batSetting.vue +++ b/jero-web/src/views/documentTools/virtualList/components/batSetting.vue @@ -31,11 +31,15 @@ {{$t('certificationType')}}
- + + + + + +
@@ -47,11 +51,15 @@ {{$t('certificationLevel')}}
- + + + + + +
diff --git a/jero-web/src/views/documentTools/virtualList/components/editModel.vue b/jero-web/src/views/documentTools/virtualList/components/editModel.vue index c01ff108f..2a34e491d 100644 --- a/jero-web/src/views/documentTools/virtualList/components/editModel.vue +++ b/jero-web/src/views/documentTools/virtualList/components/editModel.vue @@ -195,7 +195,7 @@ {{$t('certificationType')}}
- + {{$t('certificationLevel')}} - - + + diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue index 7d0dcd78e..b616e146d 100644 --- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue +++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue @@ -139,11 +139,12 @@
- * + {{$t('Deliverables')}}
- + + {{ (formInline.fileId === 'null' || formInline.fileId === '' || diff --git a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue index 67239e72e..3f55e94af 100644 --- a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue +++ b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue @@ -44,6 +44,7 @@
+ * {{$t('feedbackMessage')}}
@@ -148,6 +149,7 @@
+ * {{$t('feedbackMessage')}}
@@ -197,6 +199,11 @@ } ], approvalOpinion: [ + { + required: true, + message: this.$t('feedbackMessage') + this.$t('cannotEmpty'), + trigger: 'blur' + }, { max: 300, message: this.$t('feedbackMessage') + this.$t('cannotExceed') + 300 + this.$t('Characters'), diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue index a8ec04aa5..c8b61dec7 100644 --- a/jero-web/src/views/projectManagement/components/TaskList.vue +++ b/jero-web/src/views/projectManagement/components/TaskList.vue @@ -197,7 +197,7 @@ scopedSlots: { customRender: 'CertificationProgress' } }, { - title: this.$t('CurrentProjectStatusEvaluation'), + title: this.$t('CurrentStatus'), align: 'center', width: 150, dataIndex: 'CurrentProjectStatusEvaluation', @@ -406,7 +406,7 @@ }, CurrentProjectClick(val) { let item = JSON.parse(JSON.stringify(val)) - this.$refs.TaskListModelRef.getData(item, this.$t('CurrentProjectStatusEvaluation')) + this.$refs.TaskListModelRef.getData(item, this.$t('CurrentStatus')) }, TaskListModelList() { this.getList() diff --git a/jero-web/src/views/projectManagement/components/TaskListModel.vue b/jero-web/src/views/projectManagement/components/TaskListModel.vue index 37c718a23..75489baf1 100644 --- a/jero-web/src/views/projectManagement/components/TaskListModel.vue +++ b/jero-web/src/views/projectManagement/components/TaskListModel.vue @@ -10,7 +10,7 @@ > -
+
{{this.$t('redSchedule')}}
{{this.$t('yellowSchedule')}}
{{this.$t('greenRequirements')}}
@@ -47,7 +47,7 @@
- +
- +
+ v-if="title == $t('CurrentStatus') && formInline.roleCode == '0'">
@@ -196,7 +196,7 @@ getData(val, title) { this.visible = true this.title = title - if (title == this.$t('CurrentProjectStatusEvaluation')) { + if (title == this.$t('CurrentStatus')) { val.remark = val.projectStatusAssessRemark || '' val.conditionAssessment = val.projectStatusAssess || '' if (val.roleCode == '2' || val.roleCode == '4' || val.roleCode == '1') { diff --git a/jero-web/src/views/projectManagement/components/batSetting.vue b/jero-web/src/views/projectManagement/components/batSetting.vue index e5f12d3c9..bea09d067 100644 --- a/jero-web/src/views/projectManagement/components/batSetting.vue +++ b/jero-web/src/views/projectManagement/components/batSetting.vue @@ -31,11 +31,15 @@ {{$t('certificationType')}}
- + + + + + +
@@ -61,11 +65,15 @@ {{$t('certificationLevel')}}
- + + + + + +
diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index 1026690d9..95a4009af 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -142,7 +142,7 @@ {{$t('certificationType')}}
- + {{$t('certificationLevel')}}
- - + +
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 96406028c..46cd0c792 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -220,7 +220,7 @@ 0) { let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) @@ -1298,6 +1300,7 @@ initiateTaskConfirmationClick(name) { this.timeName = name + this.listTitle = this.$t('taskConfirmationDeadline') if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) let isTrue = true From cdbb924989abea834396a6f17d69bb6530ee0756 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 23 Jun 2022 17:02:19 +0800 Subject: [PATCH 11/42] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93=E5=AF=BC?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BussDocumentLibraryEOServiceImpl.java | 43 ++++++++++++++++--- 1 file changed, 36 insertions(+), 7 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 fe6c9e3f8..c13a20acf 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 @@ -4974,9 +4974,20 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl treeNameList = categoryList.stream().map(SysCategory::getName).collect(Collectors.toList()); + List treeNameList = new ArrayList<>(); + if(CutEnum.CN.getValue().equals(cut)){ + treeNameList = categoryList.stream().map(SysCategory::getName).collect(Collectors.toList()); + }else{ + treeNameList = categoryList.stream().map(SysCategory::getEnName).collect(Collectors.toList()); + } //普通数据字典 - List itemNameList = dictItemList.stream().map(SysDictItem::getItemText).collect(Collectors.toList()); + List itemNameList = new ArrayList<>(); + if(CutEnum.CN.getValue().equals(cut)){ + itemNameList = dictItemList.stream().map(SysDictItem::getItemText).collect(Collectors.toList()); + }else{ + itemNameList = dictItemList.stream().map(SysDictItem::getEnName).collect(Collectors.toList()); + } + int i = 2; List msgList = new ArrayList<>(); List> mapList = new ArrayList<>(); @@ -5074,11 +5085,18 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl collect = categoryList.stream().filter(e -> e.getName().equals(valueTemp)).collect(Collectors.toList()); - valueId += collect.get(0).getId(); + List collect = new ArrayList<>(); + if(CutEnum.CN.getValue().equals(cut)){ + collect = categoryList.stream().filter(e -> e.getName().equals(valueTemp)).collect(Collectors.toList()); + }else{ + collect = categoryList.stream().filter(e -> e.getEnName().equals(valueTemp)).collect(Collectors.toList()); + } + valueId += collect.get(0).getId()+","; } } - value = valueId; + if(StringUtils.isNotBlank(valueId)){ + value = valueId.substring(0, valueId.length() - 1); + } } } else if (FieldTypeEnum.TEXT_STRING.getValue().equals(fieldShowType)) { @@ -5150,7 +5168,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl collect = dictItemList.stream().filter(e -> StringUtils.isNotBlank(e.getItemText()) && e.getItemText().equals(finalValue)).collect(Collectors.toList()); + List collect = new ArrayList<>(); + if(CutEnum.CN.getValue().equals(cut)){ + collect = dictItemList.stream().filter(e -> StringUtils.isNotBlank(e.getItemText()) && e.getItemText().equals(finalValue)).collect(Collectors.toList()); + }else{ + collect = dictItemList.stream().filter(e -> StringUtils.isNotBlank(e.getEnName()) && e.getEnName().equals(finalValue)).collect(Collectors.toList()); + } if (collect.size() != 0) { value = collect.get(0).getItemValue(); } @@ -5193,7 +5216,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl collect = dictItemList.stream().filter(e -> StringUtils.isNotBlank(e.getItemText()) && e.getItemText().equals(valueTemp)).collect(Collectors.toList()); + List collect = new ArrayList<>(); + if(CutEnum.CN.getValue().equals(cut)){ + collect = dictItemList.stream().filter(e -> StringUtils.isNotBlank(e.getItemText()) && e.getItemText().equals(valueTemp)).collect(Collectors.toList()); + }else{ + collect = dictItemList.stream().filter(e -> StringUtils.isNotBlank(e.getEnName()) && e.getEnName().equals(valueTemp)).collect(Collectors.toList()); + } + valueId += collect.get(0).getItemValue() + ","; } } From f6fcea086e208a1f56ee2aa0432517f8710bff2c Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 27 Jun 2022 14:15:39 +0800 Subject: [PATCH 12/42] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../virtualList/components/virtualListDetails.vue | 5 ++++- .../views/projectManagement/components/listOfRegulations.vue | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 4360d9c48..b0ddce21f 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -140,7 +140,7 @@
tr > th { + padding: 7px 16px !important; + } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 46cd0c792..ff6a3e1ca 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -148,6 +148,7 @@
tr > th { + padding: 7px 16px !important; + } \ No newline at end of file From 780a572e11edb67ed228a6e97392c8bbbf376c77 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 27 Jun 2022 15:17:18 +0800 Subject: [PATCH 13/42] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../virtualList/components/virtualListDetails.vue | 4 ++-- .../projectManagement/ProjectDetails/index.vue | 15 +++++++++++---- .../components/listOfRegulations.vue | 12 ++++++------ 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index b0ddce21f..59c687e9b 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -84,7 +84,7 @@
-
+
@@ -143,7 +143,7 @@ class="ant-table tableList" :loading="loading" :pagination="false" - :scroll="{x: '100%',y:'calc(100vh - 200px)'}" + :scroll="{x: '100%',y:'calc(100vh - 170px)'}" rowKey="id" :data-source="dataSource" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" diff --git a/jero-web/src/views/projectManagement/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ProjectDetails/index.vue index 3b845cad6..3cbb6655b 100644 --- a/jero-web/src/views/projectManagement/ProjectDetails/index.vue +++ b/jero-web/src/views/projectManagement/ProjectDetails/index.vue @@ -2,9 +2,10 @@
- - - + + + {{this.title}} @@ -100,7 +101,7 @@ }, data() { return { - title: this.$t('projectDetails'), + title: '', isDisplayNum: '', textTitle: '', isTrue: true, @@ -116,6 +117,7 @@ }, created() { document.title = this.$t('projectDetails') + '-' + this.$route.query.projectName + this.title = this.$route.query.projectName + '-' + this.$route.query.targetMarket_dictText }, mounted() { this.getTaskId() @@ -261,6 +263,11 @@ text[i].classList.add('Virtual-detail-left-text-color') } } + }, + backClick() { + this.$router.push({ + path: '/projectLibrary' + }) } } } diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index ff6a3e1ca..8b772aa67 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1,8 +1,8 @@