From fa9c39394b7ea074c11a56d051f89c7b19032cef Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 22 Jun 2022 14:12:16 +0800 Subject: [PATCH 01/10] =?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 --- .../report/enums/ExportTemplateStateEnum.java | 4 +- .../service/impl/ParamsInfoEOServiceImpl.java | 4 +- .../jero/modules/split/common/FileUnZip.java | 49 +++++++++++++++++++ .../impl/FileSplitItemsEOServiceImpl.java | 4 +- 4 files changed, 55 insertions(+), 6 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/enums/ExportTemplateStateEnum.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/enums/ExportTemplateStateEnum.java index 68821d2fb..cc6cf3221 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/enums/ExportTemplateStateEnum.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/enums/ExportTemplateStateEnum.java @@ -11,8 +11,8 @@ import java.util.Map; * @Date: Created in 11:29 2022/5/18 */ public enum ExportTemplateStateEnum { - ENABLE("启用","0","enable"), - DISABLE("禁用","1","disable"); + ENABLE("启用","0","Enable"), + DISABLE("禁用","1","Disable"); String name; String value; 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 3c7d2b04e..f8623f09c 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 @@ -734,7 +734,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..8fae259fd 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 d58bb131d43ecef38e01f01bb49edc142ba1b38e Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Wed, 22 Jun 2022 14:26:59 +0800 Subject: [PATCH 02/10] =?UTF-8?q?[update]=20=E4=B8=8A=E6=8A=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 3 +- jero-web/src/common/lang/zh-cn.js | 2 +- .../parameterexport/components/addModel.vue | 6 +- .../views/parameter/parameterexport/index.vue | 56 ++++++------------- 4 files changed, 24 insertions(+), 43 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 3c6c1ee00..f3a61598e 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -963,5 +963,6 @@ module.exports = { uploadedBy:'Uploaded by', uploadMonthly:'Upload monthly', // 上报库 - Enable: '启用', + Enable: 'Enable', + Latestupdatetime: 'Latest update time', } \ 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 0d434b1aa..f73c1ffe3 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -969,5 +969,5 @@ module.exports = { uploadMonthly:'上传月报', // 上报库 Enable: '启用', - + Latestupdatetime: '最新更新时间', } \ No newline at end of file diff --git a/jero-web/src/views/parameter/parameterexport/components/addModel.vue b/jero-web/src/views/parameter/parameterexport/components/addModel.vue index 2ba12c0c5..5e56b2185 100644 --- a/jero-web/src/views/parameter/parameterexport/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterexport/components/addModel.vue @@ -33,8 +33,8 @@ * {{$t('status')}} - - + + {{$t('Enable')}} {{$t('disable')}} @@ -137,7 +137,7 @@ export default { this.visible = true this.title = '新增' this.formInline = {} - this.formInline.status = '0' + this.formInline.state = '0' this.formInline = {...this.formInline} this.$nextTick(() => { this.$refs['ruleForm'].clearValidate() diff --git a/jero-web/src/views/parameter/parameterexport/index.vue b/jero-web/src/views/parameter/parameterexport/index.vue index 7feb1988f..bda62d382 100644 --- a/jero-web/src/views/parameter/parameterexport/index.vue +++ b/jero-web/src/views/parameter/parameterexport/index.vue @@ -24,10 +24,6 @@ {{$t('newlyAdded')}} -
- - {{$t('copy')}} -
{{$t('BatchDelete')}} @@ -46,12 +42,7 @@ :columns="columns" > - - {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }} - - - - {{ text && text.length > 30 ? text.slice(0, 29) + '...' : text }} + {{ text && text.length > 100 ? text.slice(0, 99) + '...' : text }} {{$t('edit')}} @@ -138,17 +129,17 @@ export default { pageNo: 1, title: '新增', columns: [ - { - title: this.$t('serialNumber'), - dataIndex: '', - key: 'rowIndex', - width: 50, - ellipsis: true, - align: 'center', - customRender: function(t, r, index) { - return parseInt(index) + 1 - } - }, + // { + // title: this.$t('serialNumber'), + // dataIndex: '', + // key: 'rowIndex', + // width: 50, + // ellipsis: true, + // align: 'center', + // customRender: function(t, r, index) { + // return parseInt(index) + 1 + // } + // }, { title: this.$t('templateName'), align: 'center', @@ -158,22 +149,22 @@ export default { title: this.$t('contentDescription'), align: 'center', dataIndex: 'description', - scopedSlots: { customRender: 'titleName' } + scopedSlots: { customRender: 'projectName' } }, { title: this.$t('status'), align: 'center', width: '5%', - dataIndex: 'createTime' + dataIndex: 'state' }, { - title: this.$t('createTime'), + title: this.$t('creater'), align: 'center', width: '10%', - dataIndex: 'createTime' + dataIndex: 'createBy' }, { - title: this.$t('updateTime'), + title: this.$t('Latestupdatetime'), align: 'center', width: '10%', dataIndex: 'updateTime' @@ -228,17 +219,6 @@ export default { handleAdd() { this.$refs.addModelRef.addModel() }, - // 复制 - handlecody(){ - if (this.selectedRowKeys.length > 1) { - this.$message.warning(this.$t('OnlyOneSelected')) - } else if(this.selectedRowKeys.length == 0){ - this.$message.warning(this.$t('pleaseSelectData')) - } else { - this.areaVisible=true - this.formInline = {} - } - }, hideModal(){ this.visible = false; }, @@ -253,7 +233,7 @@ export default { content: _this.$t('ConfirmBatchDeletion'), onOk() { axios({ - url: '/jero-boot/params/template/deleteBatch', + url: '/jero-boot/report/exportTemplate/deleteBatch', method: 'post', data: param, transformRequest: [function (data) { From a1499306b68ea20d2d190d6b8fbefcabd3f7f4ed Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 22 Jun 2022 14:45:02 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=9C=88=E6=8A=A5=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 11 + jero-web/src/common/lang/zh-cn.js | 33 ++- .../components/RegulationMonthlyFill.vue | 156 ++++++++++---- .../components/modules/fillTable.vue | 155 ++++++++++++++ .../components/modules/fillTableAdd.vue | 198 ++++++++++++++++++ 5 files changed, 505 insertions(+), 48 deletions(-) create mode 100644 jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue create mode 100644 jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index f3a61598e..092305e9a 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -962,6 +962,17 @@ module.exports = { releaseStatus:'Release status', uploadedBy:'Uploaded by', uploadMonthly:'Upload monthly', + chapterContents:'Chapter contents', + chineseTitle:'Chinese title', + englishTitle:'English title', + regulatoryContact:'Regulatory contact', + exportStatus:'Export status', + monthlyTitleTemplate:'Monthly title template', + monthlyIntegrationAndExport:'Monthly integration and export', + addContent:'Add content', + monthSelection:'Month selection', + moveUp:'Move up', + moveDown:'Move down', // 上报库 Enable: 'Enable', Latestupdatetime: 'Latest update time', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index f73c1ffe3..989c47c63 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -727,7 +727,7 @@ module.exports = { // 认证状态 timeoperation: '时，才有权限操作此按钮。', NiOnumberis: 'NIO编号为', - NoOperationPermissionForthisbutton:'没有此按钮的操作权限', + NoOperationPermissionForthisbutton: '没有此按钮的操作权限', Attentionfreeze: '注：冻结后该冻结配置内容不可进行编辑。', Filledperson: '工程接口人没有填写,请填写完工程接口人再进行下发收集。', Datastatusis: '数据状态为', @@ -956,17 +956,28 @@ module.exports = { documentLibraryDetails: '文档库详情', question: '催办', ConfirmQuestion: '确认催办？', - OnlyOrTaskconfirmationOut:'只有清单确认状态或任务确认状态为待确认时才可以进行催办', - disableInput:'禁止输入', + OnlyOrTaskconfirmationOut: '只有清单确认状态或任务确认状态为待确认时才可以进行催办', + disableInput: '禁止输入', or: '或', - warningTime:'预警时间', - RegulationMonthlyManagement:'法规月报管理', - RegulationMonthlyFill:'法规月报填写', - RegulationMonthlyName:'法规月报名称', - monthlyLanguage:'月报语种', - releaseStatus:'发布状态', - uploadedBy:'上传人', - uploadMonthly:'上传月报', + warningTime: '预警时间', + RegulationMonthlyManagement: '法规月报管理', + RegulationMonthlyFill: '法规月报填写', + RegulationMonthlyName: '法规月报名称', + monthlyLanguage: '月报语种', + releaseStatus: '发布状态', + uploadedBy: '上传人', + uploadMonthly: '上传月报', + chapterContents: '章节目录', + chineseTitle: '中文标题', + englishTitle: '英文标题', + regulatoryContact:'法规联系人', + exportStatus:'导出状态', + monthlyTitleTemplate:'月报标题模板', + monthlyIntegrationAndExport:'月报整合导出', + addContent:'新增内容', + monthSelection:'月份选择', + moveUp:'上移', + moveDown:'下移', // 上报库 Enable: '启用', Latestupdatetime: '最新更新时间', diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue index 74f026074..b7a31ca20 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue @@ -5,11 +5,12 @@
-
- {{$t('RegulationMonthlyName')}} +
+ {{$t('monthSelection')}}
- +
@@ -22,9 +23,17 @@
-
- - {{$t('uploadMonthly')}} +
+ + {{$t('monthlyTitleTemplate')}} +
+
+ + {{$t('monthlyIntegrationAndExport')}} +
+
+ + {{$t('addContent')}}
@@ -43,6 +52,11 @@ :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columns" > + + {{$t('view')}} + {{$t('edit')}} + {{$t('deleteLib')}} +
+ + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue new file mode 100644 index 000000000..628453061 --- /dev/null +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue @@ -0,0 +1,198 @@ + + + + + + \ No newline at end of file From 69b689d512ae09ccecb76974d8c8a46e219a42ba Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 22 Jun 2022 14:51:13 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E8=AE=A4=E8=AF=81-bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ParamsCollectManifestEOServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 0b93b1f6d..ff32910b2 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -953,9 +953,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl Date: Wed, 22 Jun 2022 15:08:28 +0800 Subject: [PATCH 05/10] [update] 54751 --- .../src/components/tableCollection/index.vue | 2 +- .../ParameterItemCollectionList.vue | 28 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index a0f50274f..82260a907 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -26,7 +26,7 @@ - + {{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue}} diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 68389ff90..10b9b80a7 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -276,7 +276,7 @@
- {{ currentPersonRole =='homo'? '认证工程师': (currentPersonRole =='sdt'? '工程接口人': '填写人') }}{{$t('Datastatusis')}} + {{ currentPersonRole =='homo'? $t('certifiedEngineer'): (currentPersonRole =='sdt'? $t('engineeringInterfacePerson'): $t('completedBy')) }}{{$t('Datastatusis')}} '{{$t('CollectionInitiated')}}'、'{{$t('ReturnedPerson')}}'{{$t('or')}}'{{$t('alteration')}}' @@ -519,7 +519,7 @@ export default { } else { this.selectedRowKeysValue.forEach((item, index) => { // 状态不符合，不能下发收集 - if(item.state !== '待发起收集' && item.state !== '工程接口人退回' && item.state !== '变更') { + if(item.state !== '待发起收集' && item.state !== '工程接口人退回' && item.state !== '变更' && item.state !== 'Wait Collect' && item.state !== 'Sdt Back' && item.state !== 'Change') { this.NotSelectedRowKeysValue.push(item) flag = 0 } @@ -546,7 +546,7 @@ export default { this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if(item.state !== '已提交') { + if(item.state !== '已提交'&& item.state !== 'Submit') { this.NotSelectedRowKeysValue.push(item) this.jurisdiction = 'homoTH' flag = 0 @@ -564,7 +564,7 @@ export default { this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if(item.state !== '待工程接口人处理' && item.state !== '填写人退回') { + if(item.state !== '待工程接口人处理' && item.state !== '填写人退回' && item.state !== 'Wait Sdt' && item.state !== 'Dre Back') { this.NotSelectedRowKeysValue.push(item) this.jurisdiction = 'sdtTH' flag = 0 @@ -582,7 +582,7 @@ export default { this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if(item.state !== '待填写' && item.state !== '认证工程师退回') { + if(item.state !== '待填写' && item.state !== '认证工程师退回' && item.state !== 'Wait Fill' && item.state !== 'Cert Back') { this.NotSelectedRowKeysValue.push(item) this.jurisdiction = 'dreTH' flag = 0 @@ -603,7 +603,7 @@ export default { this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if(item.state !== '待发起收集' && item.state !== '工程接口人退回' && item.state !== '变更') { + if(item.state !== '待发起收集' && item.state !== '工程接口人退回' && item.state !== '变更' && item.state !== 'Wait Collect' && item.state !== 'Sdt Back' && item.state !== 'Change') { this.NotSelectedRowKeysValue.push(item) flag = 0 } @@ -622,7 +622,7 @@ export default { this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if(item.state !== '已提交' && item.state !== '变更') { + if(item.state !== '已提交' && item.state !== '变更'&& item.state !== 'Submit' && item.state !== 'Change') { this.NotSelectedRowKeysValue.push(item) flag = 0 } @@ -641,7 +641,7 @@ export default { this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if(item.state !== '待发起收集') { + if(item.state !== '待发起收集'&& item.state !== 'Wait Collect') { this.NotSelectedRowKeysValue.push(item) flag = 0 } @@ -662,7 +662,7 @@ export default { this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if(item.state !== '待工程接口人处理' && item.state !== '填写人退回') { + if(item.state !== '待工程接口人处理' && item.state !== '填写人退回'&&item.state !== 'Wait Sdt' && item.state !== 'Dre Back') { this.NotSelectedRowKeysValue.push(item) this.jurisdiction = 'homoQZTH' flag = 0 @@ -681,7 +681,7 @@ export default { this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if(item.state !== '待填写') { + if(item.state !== '待填写'&&item.state !== 'Wait Fill') { this.NotSelectedRowKeysValue.push(item) this.jurisdiction = 'sdtQZTH' flag = 0 @@ -699,7 +699,7 @@ export default { this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if(item.state !== '已提交') { + if(item.state !== '已提交'&&item.state !== 'Submit') { this.NotSelectedRowKeysValue.push(item) this.jurisdiction = 'dreQZTH' flag = 0 @@ -720,7 +720,7 @@ export default { this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if(item.state !== '待工程接口人处理' && item.state !== '填写人退回') { + if(item.state !== '待工程接口人处理' && item.state !== '填写人退回'&&item.state !== 'Wait Sdt' && item.state !== 'Dre Back') { this.NotSelectedRowKeysValue.push(item) flag = 0 } @@ -739,7 +739,7 @@ export default { this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if(item.state !== '待填写' && item.state !== '认证工程师退回') { + if(item.state !== '待填写' && item.state !== '认证工程师退回'&&item.state !== 'Wait Fill' && item.state !== 'Cert Back') { this.NotSelectedRowKeysValue.push(item) flag = 0 } @@ -757,7 +757,7 @@ export default { this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if(item.state !== '待填写' && item.state !== '认证工程师退回') { + if(item.state !== '待填写' && item.state !== '认证工程师退回'&&item.state !== 'Wait Fill' && item.state !== 'Cert Back') { this.NotSelectedRowKeysValue.push(item) flag = 0 } From c72b322cfa2ba953ee9b676dba4f14a6fdcaa2a8 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Wed, 22 Jun 2022 15:19:33 +0800 Subject: [PATCH 06/10] =?UTF-8?q?[update]=20=E4=B8=8A=E6=8A=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../parameterexport/components/addModel.vue | 189 ++++++++++-------- 1 file changed, 108 insertions(+), 81 deletions(-) diff --git a/jero-web/src/views/parameter/parameterexport/components/addModel.vue b/jero-web/src/views/parameter/parameterexport/components/addModel.vue index 5e56b2185..68968feb9 100644 --- a/jero-web/src/views/parameter/parameterexport/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterexport/components/addModel.vue @@ -1,100 +1,105 @@ + + \ No newline at end of file From 002c235932a77f9d23067c899b3b3787bae12366 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 22 Jun 2022 15:27:57 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=9C=88=E6=8A=A5=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml index eeba46cdd..cf284ac6f 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml @@ -143,7 +143,7 @@ spring: # password: 123456 # driver-class-name: com.mysql.cj.jdbc.Driver # url: jdbc:mysql://121.36.69.172:3307/laws_weilai?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false - url: jdbc:mysql://121.36.69.172:3307/laws_weilai_stand?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + url: jdbc:mysql://121.36.69.172:3307/laws_weilai?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root password: hzwlsoft.com driver-class-name: com.mysql.cj.jdbc.Driver From f0d0f31c97581a1180cfd904184074802556e837 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Wed, 22 Jun 2022 15:41:09 +0800 Subject: [PATCH 09/10] [update] --- .../views/parameter/parameterexport/components/addModel.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/parameter/parameterexport/components/addModel.vue b/jero-web/src/views/parameter/parameterexport/components/addModel.vue index 68968feb9..367f428f8 100644 --- a/jero-web/src/views/parameter/parameterexport/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterexport/components/addModel.vue @@ -72,8 +72,8 @@ - {{ (formInline.fileTemplateConnectId === 'null' || formInline.fileTemplateConnectId === '' || - formInline.fileTemplateConnectId == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} + {{ (formInline.fileConnectId === 'null' || formInline.fileConnectId === '' || + formInline.fileConnectId == null) ? $t('clickUpload') : $t('viewUploadedFiles')}}
@@ -138,7 +138,7 @@ export default { } this.$refs.uploadFile.visible = false /** 赋值给当前对应的表单文件 */ - this.formInline.fileTemplateConnectId = attIdList.join(',') + this.formInline.fileConnectId = attIdList.join(',') this.formInline = { ...this.formInline } }, clickButtonToUpload(item) { From 70fd1799890ecb165429441cb6abc67baed015ea Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 22 Jun 2022 15:57:52 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=9C=88=E6=8A=A5=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/modules/defaultTemplate.vue | 121 ++++++++++++++++++ .../components/modules/fillAdd.vue | 2 +- 2 files changed, 122 insertions(+), 1 deletion(-) create mode 100644 jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue new file mode 100644 index 000000000..690562df1 --- /dev/null +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue @@ -0,0 +1,121 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue index 4d1cca795..83c82ca50 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue @@ -3,7 +3,7 @@