From af38e769be4084c51e5bf5c30337d1b314a9a23e Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 4 Aug 2022 15:59:28 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=A1=AB=E5=86=99--?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsMonthlyReportWriteEOServiceImpl.java | 7 +- .../jero/modules/report/util/WordUtil.java | 94 +++++++++++++++++++ 2 files changed, 100 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index 8a2229740..6a484cceb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -261,6 +261,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl queryWrapper = QueryGenerator.initQueryWrapper(lawsMonthlyReportWriteEOTemp, req.getParameterMap()); + queryWrapper.orderByDesc("create_time"); Page page = new Page(pageNo, pageSize); Page pageInfo = this.page(page, queryWrapper); //法规月报id @@ -522,6 +523,8 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl Date: Thu, 4 Aug 2022 16:00:08 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E4=B8=8B=E5=8F=91=E6=94=B6=E9=9B=86?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0loding?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/TaskCutOffTime/index.vue | 4 ++++ jero-web/src/components/TaskCutOffTime/indexonekey.vue | 3 +++ 2 files changed, 7 insertions(+) diff --git a/jero-web/src/components/TaskCutOffTime/index.vue b/jero-web/src/components/TaskCutOffTime/index.vue index c8f892d6d..30a85b887 100644 --- a/jero-web/src/components/TaskCutOffTime/index.vue +++ b/jero-web/src/components/TaskCutOffTime/index.vue @@ -68,6 +68,7 @@ + {{this.$t('pleaseWaitWhileRunning')}} @@ -91,6 +92,7 @@ export default { editId: '', visibleoperationFailed:false, newVisible: false, + textLoading:false, NotSelectedRowKeysValue:[], labelCol: { xs: { span: 24 }, @@ -220,6 +222,7 @@ export default { // _this.$message.success(this.$t('OperationSuccessful')) if(res.data.result.length == 0){ this.visibleoperationFailed = false + this.textLoading = false _this.$message.success(this.$t('OperationSuccessful')) this.$emit('areaVisibleTaskCutOffTimeflag', false) this.$emit('GetgetTableList') @@ -227,6 +230,7 @@ export default { }else{ this.NotSelectedRowKeysValue = res.data.result this.visibleoperationFailed = true + this.textLoading = false } // this.$emit('areaVisibleTaskCutOffTimeflag', false) diff --git a/jero-web/src/components/TaskCutOffTime/indexonekey.vue b/jero-web/src/components/TaskCutOffTime/indexonekey.vue index 4a2538ec0..57802326e 100644 --- a/jero-web/src/components/TaskCutOffTime/indexonekey.vue +++ b/jero-web/src/components/TaskCutOffTime/indexonekey.vue @@ -69,6 +69,7 @@ + {{this.$t('pleaseWaitWhileRunning')}} @@ -223,10 +224,12 @@ export default { _this.$message.success(this.$t('OperationSuccessful')) this.$emit('areaVisibleTaskCutOffTimeAll', false) this.$emit('GetgetTableList') + this.textLoading = false }else{ this.NotSelectedRowKeysValue = res.data.result this.visibleoperationFailed = true + this.textLoading = false } // this.$emit('areaVisibleTaskCutOffTime', false) From 7eb15d9a27e9330ac1336afaa48644b572c90aca Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 4 Aug 2022 16:26:28 +0800 Subject: [PATCH 03/13] =?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 | 327 +++++++++--------- jero-web/src/common/lang/zh-cn.js | 1 + .../components/evaluationResultsList.vue | 2 +- .../components/initiatingProcess.vue | 2 +- .../collectionOfRegulatoryOpinions/index.vue | 26 +- .../components/countryCardView.vue | 191 +++++----- .../components/RegulationMonthlyFill.vue | 2 +- .../RegulationMonthlyManagement.vue | 2 +- .../components/initiatingProcess.vue | 2 +- .../components/processInformation.vue | 2 +- .../technologyAssessment/index.vue | 2 +- .../documentComparison/index.vue | 2 +- .../documentTranslation/index.vue | 2 +- .../views/regulatoryEarlyWarning/index.vue | 2 +- 14 files changed, 271 insertions(+), 294 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 5f6504752..7e92066b7 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -40,7 +40,7 @@ module.exports = { userName: 'User Name', department: 'Department', status: 'Status', - Operation: 'Operation', + operation: 'Operation', aRcord: 'A Rcord', OperationAllowedAccount: 'This Operation is not Allowed for administrator account, please select again!', confirm: 'Confirm', @@ -176,9 +176,9 @@ module.exports = { MenuType: 'Menu Type', menu: 'Menu', ButtonsPermissions: 'Buttons / Permissions', - ConventionalExport:'Conventional Export', - CustomExport:'Custom Export', - CustomTemplateName:'Custom template name', + ConventionalExport: 'Conventional Export', + CustomExport: 'Custom Export', + CustomTemplateName: 'Custom template name', assembly: 'Component', route: 'Route', AddSubmenu: 'Add Submenu', @@ -388,8 +388,8 @@ module.exports = { StandardDetails: 'Standard Details', whole: 'Whole', DocumentLibrary: 'Document Library', - GeneralExportInformation:'General export information', - CustomizeExportInformation:'Customize export information', + GeneralExportInformation: 'General export information', + CustomizeExportInformation: 'Customize export information', DocumentComparisonLibrary: 'Document Comparison Library', weekly: 'Weekly', SyncLibrary: 'Sync To doc. Library', @@ -714,7 +714,7 @@ module.exports = { confirmationOfRegulationsList: 'Regulation List Confirmation', regulatoryTaskConfirmation: 'Regulation Task Confirmation', certificationStart: 'Homo Test Completion', - preHomoCompletion:'Pre-Homo Completion', + preHomoCompletion: 'Pre-Homo Completion', certificationEnd: 'Type Approval', directoryName: 'Catalogue Name', batch: 'Batch', @@ -735,7 +735,7 @@ module.exports = { // 参数收集开始 MaintainConfigureInfo: 'Maintain Configuration Information', ParameteItemCollectionList: 'Parameter item collection list', - ParameterViewPage:'Parameter View Page', + ParameterViewPage: 'Parameter View Page', Areyousureparameteritems: 'Are you sure to submit the selected parameter items?', Theselectedconfiguration: 'The configuration can only be added when the parameter items in the parameter list are to be collected or changed', NoConfigurationNotStart: 'No configuration added, unable to start collection, please check', @@ -802,10 +802,10 @@ module.exports = { releaseVersion: 'Release Version', parameterTemplate: 'Parameter Template', contentDescription: 'Content Description', - WhetherMergeParameters:'Whether to merge parameters', - merge:'Merge', - nonjoinder:'Nonjoinder', - MergeSeparator:'Merge separator', + WhetherMergeParameters: 'Whether to merge parameters', + merge: 'Merge', + nonjoinder: 'Nonjoinder', + MergeSeparator: 'Merge separator', parameterTemplateExportName: 'Parameter List', parameterDataExport: 'Parameter Export Data', // 参数收集结束 @@ -860,6 +860,7 @@ module.exports = { experimentFailed: 'Test Failed', toBeStarted: 'Not Start', inProgress: 'In Progress', + Underway: 'Underway', green: 'Green', red: 'Red', blue: 'Blue', @@ -977,7 +978,7 @@ module.exports = { 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', - taskConfirmationResponsiblePerson:'Task confirmation of responsible person', + taskConfirmationResponsiblePerson: 'Task confirmation of responsible person', or: 'or', warningTime: 'Warning Time', RegulationMonthlyManagement: 'Regulation Monthly Management', @@ -1023,7 +1024,7 @@ module.exports = { relevantSections: 'Relevant Sections', questionsSuggestions: 'Questions Or Suggestions', reason: 'Reason', - proposedTime:'Proposed Time', + proposedTime: 'Proposed Time', feedbackPoint: 'Feedback Point', link: 'Link', planNoChinese: 'Plan No.', @@ -1085,154 +1086,154 @@ module.exports = { Templatenamelist: 'Template name - parameter item collection list', newNiONumber: 'Number', English: 'English', - requiredParametersEmpty:'Required parameters cannot be empty', - PleaseTaskConfirmationRejected:'Please select the data whose list confirmation status is accepted and task confirmation status is not initiated or rejected', - theProjectContactEmpty:'The project contact person of cannot be empty', - pleaseSelectinitiatedOrRejected:'Please select the data whose list confirmation status is not initiated or rejected', - TheEngineerAndCertification:'The regulatory engineer and Certification Engineer of cannot be empty', - theResponsiblePersonAndDeadlineClank:'The responsible person and deadline of cannot be blank', - bringInTheProjectInterface:'Bring in the project interface', - theCurrentListSaved:'The current list data has been submitted and cannot be temporarily saved', - defaultTemplate:'Default Template', - newRequestCommentListTemplate:'New request for comment list template', - NewReleasedStandardTemplate:'New released standard template', - pleaseSelectStandard:'Please select a standard', - theResponsiblePersonEmpty:'The responsible person of cannot be empty', - theDeadlineEmpty:'The deadline of cannot be empty', - theDeliveryTypeCannotBeEmpty:'The delivery type of cannot be empty', - For:'For', - markedRejection:'Marked Rejection', - RegulationListConfirmationTask:'Regulation List Confirmation Task', - RegulationListConfirmationNotification:'Regulation List Confirmation Notification', - RegulationTaskConfirmation:'Regulation Task Confirmation', - DesignComplianceTask:'Design Compliance Task', - PreHomoTask:'Pre-Homo Task', - ValidationTask:'Validation Task', - DesignComplianceNotification:'Design Compliance Notification', - PreHomoNotification:'Pre-Homo Notification', - ValidationComplianceNotification:'Validation Compliance Notification', - RegulationTaskConfirmationNotification:'Regulation Task Confirmation Notification', - evaluationMethod:'Evaluation method', - uploadRelevantMaterials:'Upload relevant materials', - processBackground:'Process background', - selectedStandard:'Selected standard', - standardDecompositionDocument:'Standard decomposition document', - pleaseSelectStandardFirst:'Please select a standard first', - RelevantMaterials:'RelevantMaterials', - evaluatorFeedback:'Evaluator feedback', - nameTechnicalDocument:'Name of technical document', - chapter:'chapter', - problemDescription:'Problem description', - filingExternalOpinions:'Filing of external opinions', - regulatoryTechnicalEvaluationResults:'Regulatory technical evaluation results', - initiateProcessForCurrentStandard:'Initiate process for current standard', - engineerFeedbackResults:'Engineer feedback results', - fileExport:'File export', - feedbackTime:'Feedback time', - regulatoryTechnologyAssessmentProcess:'Regulatory technology assessment process', - feedbackEvaluation:'Feedback evaluation', - clauseEvaluation:'Clause evaluation', - standardDocuments:'Standard documents', - pleaseCompleteTheEvaluationMethodorEvaluator:'Please complete the evaluation method or evaluator in the list', - reviewComments:'Review comments', - PleaseCompleteList:'Please complete the compliance results in the list', - sponsorFeedback:'Sponsor feedback', - processNumber:'Process number', - processName:'Process Name', - feedbackResults:'Feedback results', - theDoesNotSupportPreview:'The current file format does not support Preview', - releaseSituation:'Release situation', - comparisonResults:'Comparison results', - Published:'Published', - initiateComparison:'Initiate comparison', - translationLanguage:'Translation language', - translationResults:'Translation results', - conversionTime:'Conversion time', - category:'Category', - RegulatoryProcessEvaluationResults :'Regulatory Process Evaluation Results', - ViewConformanceResults:'View Conformance Results', - CommentsCollectionResultsForReference:'Comments Collection Results For Reference', - TechnicalEvaluationResultsForReference:'Technical Evaluation Results For Reference', - ComplianceConfirmationRecord:'Compliance Confirmation Record', - complianceConfirmation:'Compliance Confirmation', - noComparisonDocumentSelected:'No comparison document selected', - RemarkInfo:'Remarks Info', - initiateDocumentComparison:'Initiate Document Comparison', - comparativeComments:'Comparative Comments', - viewTheComparisonResults:'View The Comparison Results', - addFullTextComment:'Add Full Text Comment', - turnOffAutomaticMatching:'Turn Off Automatic Matching', - Deriveconformanceresults:'Derive Conformance Results', - Regulatorycompliancekanban:'Regulatory Compliance Kanban', - exportComparisonReport:'Export Comparison Report', - comparisonDifferenceComment:'Comparison Difference Comment', - fullTextComments:'Full text comments', - fileDeclaration:'file Declaration', - FileForDetails:'File For Details', - Converting:'Converting', - convertNetwork:'Convert Network', - convertFailed:'Convert Failed', - standardData:'Standard Data', - Theorganization:'The Organization', - Addingfolder:'Adding a folder', - Addingsubfolders:'Adding Subfolders', - Editfolder:'Edit Folder', - Deletefolders:'Delete Folders', - Foldername:'Folder Name', - Folderpermissions:'Folder Permissions', - Folderorder:'Folder Order', - Downloadprivileges:'Download Privileges', - Openpersonnel:'Open Personnel', - originalText:'Original Text', - translatedText:'Translated Text', - Administrativeprivileges:'Administrativ Pprivileges', - Checkthepermissions:'Check The Permissions', - onlyFilesUploaded:'Only.Docx,.Doc files can be uploaded', + requiredParametersEmpty: 'Required parameters cannot be empty', + PleaseTaskConfirmationRejected: 'Please select the data whose list confirmation status is accepted and task confirmation status is not initiated or rejected', + theProjectContactEmpty: 'The project contact person of cannot be empty', + pleaseSelectinitiatedOrRejected: 'Please select the data whose list confirmation status is not initiated or rejected', + TheEngineerAndCertification: 'The regulatory engineer and Certification Engineer of cannot be empty', + theResponsiblePersonAndDeadlineClank: 'The responsible person and deadline of cannot be blank', + bringInTheProjectInterface: 'Bring in the project interface', + theCurrentListSaved: 'The current list data has been submitted and cannot be temporarily saved', + defaultTemplate: 'Default Template', + newRequestCommentListTemplate: 'New request for comment list template', + NewReleasedStandardTemplate: 'New released standard template', + pleaseSelectStandard: 'Please select a standard', + theResponsiblePersonEmpty: 'The responsible person of cannot be empty', + theDeadlineEmpty: 'The deadline of cannot be empty', + theDeliveryTypeCannotBeEmpty: 'The delivery type of cannot be empty', + For: 'For', + markedRejection: 'Marked Rejection', + RegulationListConfirmationTask: 'Regulation List Confirmation Task', + RegulationListConfirmationNotification: 'Regulation List Confirmation Notification', + RegulationTaskConfirmation: 'Regulation Task Confirmation', + DesignComplianceTask: 'Design Compliance Task', + PreHomoTask: 'Pre-Homo Task', + ValidationTask: 'Validation Task', + DesignComplianceNotification: 'Design Compliance Notification', + PreHomoNotification: 'Pre-Homo Notification', + ValidationComplianceNotification: 'Validation Compliance Notification', + RegulationTaskConfirmationNotification: 'Regulation Task Confirmation Notification', + evaluationMethod: 'Evaluation method', + uploadRelevantMaterials: 'Upload relevant materials', + processBackground: 'Process background', + selectedStandard: 'Selected standard', + standardDecompositionDocument: 'Standard decomposition document', + pleaseSelectStandardFirst: 'Please select a standard first', + RelevantMaterials: 'RelevantMaterials', + evaluatorFeedback: 'Evaluator feedback', + nameTechnicalDocument: 'Name of technical document', + chapter: 'chapter', + problemDescription: 'Problem description', + filingExternalOpinions: 'Filing of external opinions', + regulatoryTechnicalEvaluationResults: 'Regulatory technical evaluation results', + initiateProcessForCurrentStandard: 'Initiate process for current standard', + engineerFeedbackResults: 'Engineer feedback results', + fileExport: 'File export', + feedbackTime: 'Feedback time', + regulatoryTechnologyAssessmentProcess: 'Regulatory technology assessment process', + feedbackEvaluation: 'Feedback evaluation', + clauseEvaluation: 'Clause evaluation', + standardDocuments: 'Standard documents', + pleaseCompleteTheEvaluationMethodorEvaluator: 'Please complete the evaluation method or evaluator in the list', + reviewComments: 'Review comments', + PleaseCompleteList: 'Please complete the compliance results in the list', + sponsorFeedback: 'Sponsor feedback', + processNumber: 'Process number', + processName: 'Process Name', + feedbackResults: 'Feedback results', + theDoesNotSupportPreview: 'The current file format does not support Preview', + releaseSituation: 'Release situation', + comparisonResults: 'Comparison results', + Published: 'Published', + initiateComparison: 'Initiate comparison', + translationLanguage: 'Translation language', + translationResults: 'Translation results', + conversionTime: 'Conversion time', + category: 'Category', + RegulatoryProcessEvaluationResults: 'Regulatory Process Evaluation Results', + ViewConformanceResults: 'View Conformance Results', + CommentsCollectionResultsForReference: 'Comments Collection Results For Reference', + TechnicalEvaluationResultsForReference: 'Technical Evaluation Results For Reference', + ComplianceConfirmationRecord: 'Compliance Confirmation Record', + complianceConfirmation: 'Compliance Confirmation', + noComparisonDocumentSelected: 'No comparison document selected', + RemarkInfo: 'Remarks Info', + initiateDocumentComparison: 'Initiate Document Comparison', + comparativeComments: 'Comparative Comments', + viewTheComparisonResults: 'View The Comparison Results', + addFullTextComment: 'Add Full Text Comment', + turnOffAutomaticMatching: 'Turn Off Automatic Matching', + Deriveconformanceresults: 'Derive Conformance Results', + Regulatorycompliancekanban: 'Regulatory Compliance Kanban', + exportComparisonReport: 'Export Comparison Report', + comparisonDifferenceComment: 'Comparison Difference Comment', + fullTextComments: 'Full text comments', + fileDeclaration: 'file Declaration', + FileForDetails: 'File For Details', + Converting: 'Converting', + convertNetwork: 'Convert Network', + convertFailed: 'Convert Failed', + standardData: 'Standard Data', + Theorganization: 'The Organization', + Addingfolder: 'Adding a folder', + Addingsubfolders: 'Adding Subfolders', + Editfolder: 'Edit Folder', + Deletefolders: 'Delete Folders', + Foldername: 'Folder Name', + Folderpermissions: 'Folder Permissions', + Folderorder: 'Folder Order', + Downloadprivileges: 'Download Privileges', + Openpersonnel: 'Open Personnel', + originalText: 'Original Text', + translatedText: 'Translated Text', + Administrativeprivileges: 'Administrativ Pprivileges', + Checkthepermissions: 'Check The Permissions', + onlyFilesUploaded: 'Only.Docx,.Doc files can be uploaded', selectDirectorylocation: 'Please select the directory location to add the folder', - Fileuploaded:'File uploaded, please wait', - uploadedbyyourself:'You can only delete files and data uploaded by yourself', - Fileuploaded:'File uploading, please wait', - doNotHavePermissionDeleteData:'Do not have permission to delete this data,', - Parametercollection:'Parameter Collection', - Collectlist:'Colle Ctlist', - Statisticalmodels:'Statisti Calmodels', - Inthecollection:'In the collection', - Notatthe:'Not at the', - Thepercentage:'The Percentage', - problemKnowledgeBase:'Problem Knowledge Base', - recentHotSpots:'Recent Hot Spots', - disseminationMaterials:'Dissemination Materials', - informationSafety:'Information Safety', - blueBook:'Blue Book', - invoiceCollection:'Invoice Collection', - productHighlights:'Product Highlights', - financialReimbursement:'Financial Reimbursement', - classificationMaintenance:'Classification Maintenance', - managePublishing:'Manage Publishing', - displayPermission:'Display permission', - authorizedUser:'Authorized user', - problemClassification:'Problem classification', - market:'market', - documentNumber:'Document Number', - documentTitle:'Document Title', - bringInDocumentInformation:'Bring in document information', - thereWhichCannotDeleted:'There are sub headings under this title, which cannot be deleted', - sdt:'sdt', - dre:'dre', - applicableInstructionsMarketList:'Applicable instructions of market list', - pleaseSelectTheDataCompared:'Please select the data to be compared', - problemLabel:'Problem label', - personCharge:'Person in charge', - addLabel:'Add Label', - editLabel:'Edit Label', - applicableMarket:'Applicable market', - templateMaintenance:'Template maintenance', - associatedWebsite:'Associated website', - dropDownOptions:'Drop down options', - dropDownOptionMaintenance:'Drop down option maintenance', - displayInformation:'Display information', - addComparison:'Add comparison', - showOrNot:'Show or not', - comparisonMarket:'Comparison Market', - share:'share', + Fileuploaded: 'File uploaded, please wait', + uploadedbyyourself: 'You can only delete files and data uploaded by yourself', + Fileuploaded: 'File uploading, please wait', + doNotHavePermissionDeleteData: 'Do not have permission to delete this data,', + Parametercollection: 'Parameter Collection', + Collectlist: 'Colle Ctlist', + Statisticalmodels: 'Statisti Calmodels', + Inthecollection: 'In the collection', + Notatthe: 'Not at the', + Thepercentage: 'The Percentage', + problemKnowledgeBase: 'Problem Knowledge Base', + recentHotSpots: 'Recent Hot Spots', + disseminationMaterials: 'Dissemination Materials', + informationSafety: 'Information Safety', + blueBook: 'Blue Book', + invoiceCollection: 'Invoice Collection', + productHighlights: 'Product Highlights', + financialReimbursement: 'Financial Reimbursement', + classificationMaintenance: 'Classification Maintenance', + managePublishing: 'Manage Publishing', + displayPermission: 'Display permission', + authorizedUser: 'Authorized user', + problemClassification: 'Problem classification', + market: 'market', + documentNumber: 'Document Number', + documentTitle: 'Document Title', + bringInDocumentInformation: 'Bring in document information', + thereWhichCannotDeleted: 'There are sub headings under this title, which cannot be deleted', + sdt: 'sdt', + dre: 'dre', + applicableInstructionsMarketList: 'Applicable instructions of market list', + pleaseSelectTheDataCompared: 'Please select the data to be compared', + problemLabel: 'Problem label', + personCharge: 'Person in charge', + addLabel: 'Add Label', + editLabel: 'Edit Label', + applicableMarket: 'Applicable market', + templateMaintenance: 'Template maintenance', + associatedWebsite: 'Associated website', + dropDownOptions: 'Drop down options', + dropDownOptionMaintenance: 'Drop down option maintenance', + displayInformation: 'Display information', + addComparison: 'Add comparison', + showOrNot: 'Show or not', + comparisonMarket: 'Comparison Market', + share: 'share' } \ 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 42bcd2ad4..52078ad02 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -874,6 +874,7 @@ module.exports = { experimentFailed: '实验失败', toBeStarted: '待开始', inProgress: '进行中', + Underway:'进行中', green: '绿', red: '红', blue: '蓝', diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue index 60fa6094d..961166e0f 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue @@ -201,7 +201,7 @@ this.pageNo = page this.getList() }, - SizeChange(pageSize) { + SizeChange(page,pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue index c7e910665..232ff83e1 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue @@ -232,7 +232,7 @@ this.pageNo = page this.getList() }, - SizeChange(pageSize) { + SizeChange(page,pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue index b5c89571c..0f0d418b3 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue @@ -129,7 +129,7 @@ //url传参严格按照当前命名 url: { list: '/lawsOpinionGather/lawsOpinionGatherEO/page', - getSysCategoryTree: '/sys/category/getSysCategoryTree', + getSysCategoryTree: '/sys/category/getSysCategoryTree' }, loading: false, toggleSearchStatus: false, @@ -138,17 +138,17 @@ total: 0, pageSize: 10, pageNo: 1, - CategoryTreeList:[], - serialNumber:'', + CategoryTreeList: [], + serialNumber: '', queryParam: {}, - gatherResultList:[ + gatherResultList: [ { - value:'Underway', - name:this.$t('inProgress'), + value: 'Underway', + name: this.$t('Underway') }, { - value:'Completed', - name:this.$t('Finished'), + value: 'Completed', + name: this.$t('Finished') } ], columns: [ @@ -156,12 +156,14 @@ title: this.$t('standard'), align: 'center', dataIndex: 'serialNumber', + ellipsis: true, width: 170 }, { title: this.$t('title'), align: 'center', dataIndex: 'title', + ellipsis: true, width: 170 }, { @@ -233,7 +235,7 @@ this.pageNo = page this.getList() }, - SizeChange(pageSize) { + SizeChange(page,pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() @@ -248,7 +250,7 @@ let query = { pageNo: this.pageNo, pageSize: this.pageSize, - serialNumber: this.$route.query.serialNumber?this.$route.query.serialNumber:'', + serialNumber: this.$route.query.serialNumber ? this.$route.query.serialNumber : '', ...queryParam } this.loading = true @@ -292,8 +294,8 @@ } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue index ca1b2926e..04c9f615a 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue @@ -185,7 +185,7 @@ this.pageNo = page this.getList() }, - SizeChange(pageSize) { + SizeChange(page,pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue index b10d4c466..77c7b5dd3 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue @@ -179,7 +179,7 @@ this.pageNo = page this.getList() }, - SizeChange(pageSize) { + SizeChange(page,pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue index 63c70236c..168270ba7 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue @@ -335,7 +335,7 @@ this.pageNo = page this.getList() }, - SizeChange(pageSize) { + SizeChange(page,pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/processInformation.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/processInformation.vue index e5eb0a45a..5b98162df 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/processInformation.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/processInformation.vue @@ -101,7 +101,7 @@ this.pageNo = page this.getList() }, - SizeChange(pageSize) { + SizeChange(page,pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue index 3c1a9f42c..f9b4e5c45 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue @@ -306,7 +306,7 @@ this.pageNo = page this.getList() }, - SizeChange(pageSize) { + SizeChange(page,pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() diff --git a/jero-web/src/views/documentTools/documentComparison/index.vue b/jero-web/src/views/documentTools/documentComparison/index.vue index 392dad7b4..934c99acc 100644 --- a/jero-web/src/views/documentTools/documentComparison/index.vue +++ b/jero-web/src/views/documentTools/documentComparison/index.vue @@ -210,7 +210,7 @@ this.pageNo = page this.getList() }, - SizeChange(pageSize) { + SizeChange(page,pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() diff --git a/jero-web/src/views/documentTools/documentTranslation/index.vue b/jero-web/src/views/documentTools/documentTranslation/index.vue index 2a35ee4cc..f1882ee91 100644 --- a/jero-web/src/views/documentTools/documentTranslation/index.vue +++ b/jero-web/src/views/documentTools/documentTranslation/index.vue @@ -249,7 +249,7 @@ this.pageNo = page this.getList() }, - SizeChange(pageSize) { + SizeChange(page,pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() diff --git a/jero-web/src/views/regulatoryEarlyWarning/index.vue b/jero-web/src/views/regulatoryEarlyWarning/index.vue index 81e4ef587..ecb9a4e6c 100644 --- a/jero-web/src/views/regulatoryEarlyWarning/index.vue +++ b/jero-web/src/views/regulatoryEarlyWarning/index.vue @@ -298,7 +298,7 @@ this.pageNo = page this.getList() }, - SizeChange(pageSize) { + SizeChange(page,pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() From e1c09276f56dc996a5ef3ddf382557be5ea81525 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 4 Aug 2022 16:26:43 +0800 Subject: [PATCH 04/13] =?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 --- .../problemKnowledgeBase/components/countryCardRelease.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue index e39f8816f..837eb9a93 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue @@ -164,7 +164,7 @@ this.pageNo = page this.getList() }, - SizeChange(pageSize) { + SizeChange(page,pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() From 2dc8dd71a89600ea0d760238fb43891363974909 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 4 Aug 2022 16:37:51 +0800 Subject: [PATCH 05/13] =?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 --- .../components/evaluationResultsList.vue | 20 ++++++++-------- .../components/initiatingProcess.vue | 24 ++++++++++--------- .../collectionOfRegulatoryOpinions/index.vue | 10 +++++--- .../components/initiatingProcess.vue | 4 +++- 4 files changed, 33 insertions(+), 25 deletions(-) diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue index 961166e0f..bdaa64268 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue @@ -10,7 +10,7 @@ :visible="visible" style="height: 100%;overflow: auto;padding-bottom: 53px;">
-
+
{{$t('export')}}
@@ -47,11 +47,11 @@ {{$t('filingExternalOpinions')}}:
- + {{$t('clickUpload')}}
- + {{$t('viewFile')}}
@@ -86,7 +86,7 @@ pageNo: 1, dataSource: [], formInline: {}, - userInfoQuery:{}, + userInfoQuery: {}, columns: [ { title: this.$t('relevantSections'), @@ -135,7 +135,7 @@ } }, mounted() { - this.userInfoQuery = this.userInfo() + this.userInfoQuery = this.userInfo() }, methods: { ...mapGetters(['userInfo']), @@ -178,8 +178,8 @@ //导出 handleExport() { let query = { - pageSize:this.pageSize, - pageNo:this.pageNo, + pageSize: this.pageSize, + pageNo: this.pageNo, lawsOpinionGatherId: this.lawsOpinionGatherId, actiProcInstId: this.actiProcInstId } @@ -201,7 +201,7 @@ this.pageNo = page this.getList() }, - SizeChange(page,pageSize) { + SizeChange(page, pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() @@ -210,8 +210,8 @@ let query = { lawsOpinionGatherId: this.lawsOpinionGatherId, actiProcInstId: this.actiProcInstId, - pageSize:this.pageSize, - pageNo:this.pageNo + pageSize: this.pageSize, + pageNo: this.pageNo } this.loading = true getAction('/lawsOpinionGather/lawsOpinionAssessmentResultEO/page', query).then((res) => { diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue index 232ff83e1..6fdb2362f 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue @@ -141,7 +141,7 @@ addModelList: '/dummy/dummyInventoryInfoEO/queryPageDummy' }, loading: false, - JLoading:false, + JLoading: false, dataSource: [], selectedRowKeys: [], total: 0, @@ -172,12 +172,14 @@ align: 'center', dataIndex: 'serial_number', width: 170, + ellipsis: true, scopedSlots: { customRender: 'serial_number' } }, { title: this.$t('title'), align: 'center', dataIndex: 'title', + ellipsis: true, width: 170, scopedSlots: { customRender: 'titleName' } }, @@ -232,7 +234,7 @@ this.pageNo = page this.getList() }, - SizeChange(page,pageSize) { + SizeChange(page, pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() @@ -261,7 +263,7 @@ if (this.selectedRowKeys.length > 1) { this.selectedRowKeys.shift() } - this.selectedRowKeysRecord = record.filter(res=>{ + this.selectedRowKeysRecord = record.filter(res => { return res.id == this.selectedRowKeys[0] }) this.selectedRowKeysRecord = [...this.selectedRowKeysRecord] @@ -297,14 +299,14 @@ dateChange(item) { this.formInline[item] = this.formInline[item] ? moment(this.formInline[item]).format('YYYY-MM-DD') : '' }, - getUUID(){ - var str=[]; - var Chars='0123456789abcdefghijklmnopqrstuvwxyz'; - for(var i=0;i<36;i++){ - str[i]=Chars.substr(Math.floor(Math.random()*16),1) + getUUID() { + var str = [] + var Chars = '0123456789abcdefghijklmnopqrstuvwxyz' + for (var i = 0; i < 36; i++) { + str[i] = Chars.substr(Math.floor(Math.random() * 16), 1) } - str[0]=str[8]=str[13]=str[18]=str[23]='-'; - return str.join("") + str[0] = str[8] = str[13] = str[18] = str[23] = '-' + return str.join('') }, submit() { this.$refs.ruleForm.validate(valid => { @@ -338,7 +340,7 @@ postAction('/workFlow/startProcess', query).then((res) => { if (res.success) { this.completeTask(value, res.result) - }else{ + } else { this.JLoading = false } }) diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue index 0f0d418b3..173a0f4e2 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue @@ -92,7 +92,10 @@ :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columns" > - + + {{text}} + + {{$t('viewProcess')}} {{$t('evaluationResults')}} @@ -157,7 +160,8 @@ align: 'center', dataIndex: 'serialNumber', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'serialNumber' } }, { title: this.$t('title'), @@ -235,7 +239,7 @@ this.pageNo = page this.getList() }, - SizeChange(page,pageSize) { + SizeChange(page, pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue index 168270ba7..08db600d4 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue @@ -250,12 +250,14 @@ align: 'center', dataIndex: 'serial_number', width: 170, + ellipsis: true, scopedSlots: { customRender: 'serial_number' } }, { title: this.$t('title'), align: 'center', dataIndex: 'title', + ellipsis: true, width: 170, scopedSlots: { customRender: 'titleName' } }, @@ -335,7 +337,7 @@ this.pageNo = page this.getList() }, - SizeChange(page,pageSize) { + SizeChange(page, pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() From bae86a49a305f7c9f68581dee0ef04d5180da3b1 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 4 Aug 2022 16:41:26 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=A1=AB=E5=86=99?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/LawsMonthlyReportWriteEOServiceImpl.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index 6a484cceb..78fe59813 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.enums.CutEnum; import com.jero.common.constant.enums.ModuleEnum; import com.jero.common.system.query.QueryGenerator; +import com.jero.common.system.vo.LoginUser; import com.jero.generater.modules.online.cgform.entity.OnlCgformField; import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; import com.jero.modules.document.enums.FieldTypeEnum; @@ -29,11 +30,14 @@ import com.jero.modules.report.service.INewStandardTemplateEOService; import com.jero.modules.report.util.WordUtil; import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.entity.SysDictItem; +import com.jero.modules.system.enums.ProjectRoleEnum; +import com.jero.modules.system.service.impl.SysBaseApiImpl; import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.system.util.StringUtils; import org.apache.poi.xwpf.usermodel.ParagraphAlignment; import org.apache.poi.xwpf.usermodel.XWPFDocument; +import org.apache.shiro.SecurityUtils; import org.aspectj.util.FileUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -81,6 +85,8 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl queryWrapper = QueryGenerator.initQueryWrapper(lawsMonthlyReportWriteEOTemp, req.getParameterMap()); queryWrapper.orderByDesc("create_time"); + //管理员查看全部数据,其余人只能查看自己的数据 + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + List rolesList = sysBaseApi.getRolesByUsername(currentUser.getUsername()); + if(!rolesList.contains(ProjectRoleEnum.ADMIN.getCode())){ + queryWrapper.in("create_by",currentUser.getUsername()); + } Page page = new Page(pageNo, pageSize); Page pageInfo = this.page(page, queryWrapper); //法规月报id From cd8fce4ed368f7074fdfdf51175c8ab0c03e8583 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 4 Aug 2022 16:45:21 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E7=AE=A1=E7=90=86--?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=80=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsMonthlyReportManageEOServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java index 2dd8d1757..339832758 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java @@ -103,6 +103,7 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl pageInfo = this.page(page, queryWrapper); return pageInfo; } From e25d1a6af3700d14d6f2cf4434ecd9052065803a Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 4 Aug 2022 17:04:25 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=A1=AB=E5=86=99?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=9C=AA=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index 78fe59813..4401d668d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -98,6 +98,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl Date: Thu, 4 Aug 2022 17:15:13 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LawsMonthlyReportTitleTemplateEOController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java index 4ccc7a42f..a4ec13edc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java @@ -100,7 +100,7 @@ public class LawsMonthlyReportTitleTemplateEOController extends JeroController edit(@Validated @RequestBody LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEO) { lawsMonthlyReportTitleTemplateEOService.editById(lawsMonthlyReportTitleTemplateEO); return Result.OK("编辑成功!"); From ed5ed2923340a2de080b3a78b3f8cf0aadbd6284 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 4 Aug 2022 17:17:15 +0800 Subject: [PATCH 10/13] =?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 --- .../components/PersonnelSelection/index.vue | 1 + .../components/initiatingProcess.vue | 11 ++++ .../components/feedbackInformation.vue | 7 ++- .../components/standardContent.vue | 54 +++++++++++++++---- .../processForm/regulatoryProcess/index.vue | 3 +- 5 files changed, 64 insertions(+), 12 deletions(-) diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue index 59a15eb92..476db1404 100644 --- a/jero-web/src/components/PersonnelSelection/index.vue +++ b/jero-web/src/components/PersonnelSelection/index.vue @@ -15,6 +15,7 @@
diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue index 6fdb2362f..8201e8ed5 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue @@ -43,6 +43,7 @@
-
+
@@ -63,7 +63,10 @@
{{$t('reason')}}
- +
-
+
{{item.title}} {{ $t('viewFile') }} - {{queryForm[item.value]}} @@ -58,14 +58,14 @@ type: Object, default: {} }, - title:{ - type:String, - default:'', - }, - isConfirmationDeadline:{ - type:Boolean, - default:false, + title: { + type: String, + default: '' }, + isConfirmationDeadline: { + type: Boolean, + default: false + } }, components: { viewFileModel @@ -77,6 +77,7 @@ }, mounted() { this.queryForm = this.standardContentQuery + this.queryForm.taskExplain = 'sdf dsjf;l sdf;ldsf ;lsdfkj d;lsfkds;lfdksf第三方是德国搞定过分乐观看待给对方；公开地方领导反馈给东丽的反馈给管库给的给' }, methods: { urlClick(val) { @@ -147,5 +148,40 @@ cursor: pointer; } } + + .text-content-button-one { + width: 100%; + + .text-field-left { + width: 124px; + display: inline-block; + font-size: 14px; + font-weight: 400; + color: #6F7385; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + margin-right: 24px; + float: left; + margin-top: 3px; + } + + .text-field-right { + width: calc(100% - 200px); + display: inline-block; + font-size: 16px; + text-overflow: ellipsis; + white-space: pre-wrap; + overflow: visible; + float: left; + color: #040B29; + font-weight: 400; + } + + .text-field-right-url { + color: #00B3BE !important; + cursor: pointer; + } + } } \ No newline at end of file diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue index 29935870b..503b8409d 100644 --- a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue @@ -88,7 +88,8 @@ {}, { title: this.$t('taskDescription'), - value: 'taskExplain' + value: 'taskExplain', + type:4, } // { // title: this.$t('remarks'), From e43ff1cb3f64b55c91638ea8f808df14154b91dc Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 4 Aug 2022 17:40:18 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=A0=87=E9=A2=98--?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...nthlyReportTitleTemplateEOServiceImpl.java | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java index 151bfe9d2..c2c35988f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java @@ -5,12 +5,15 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.enums.CutEnum; +import com.jero.common.exception.JeroBootException; import com.jero.common.system.query.QueryGenerator; import com.jero.modules.report.entity.LawsMonthlyReportTitleTemplateEO; +import com.jero.modules.report.entity.LawsMonthlyReportWriteEO; import com.jero.modules.report.mapper.LawsMonthlyReportTitleTemplateEOMapper; import com.jero.modules.report.service.ILawsMonthlyReportTitleTemplateEOService; import com.jero.modules.report.vo.LawsMonthlyReportTitleTemplateVO; import com.jero.modules.system.util.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; @@ -30,6 +33,8 @@ import java.util.stream.Collectors; @Service public class LawsMonthlyReportTitleTemplateEOServiceImpl extends ServiceImpl implements ILawsMonthlyReportTitleTemplateEOService { + @Autowired + private LawsMonthlyReportWriteEOServiceImpl lawsMonthlyReportWriteEOService; /** * 保存 * @@ -98,7 +103,22 @@ public class LawsMonthlyReportTitleTemplateEOServiceImpl extends ServiceImpl ids) { - removeByIds(ids); + //标题下存在内容或子标题时不能删除 + //1. 判断是否存在子标题 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(LawsMonthlyReportTitleTemplateEO::getParentId,ids); + List list = this.list(wrapper); + if(list.size() != 0){ + throw new JeroBootException("该标题下存在子标题,不能删除"); + } + //2. 判断是否存在内容 memories_chapter + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(LawsMonthlyReportWriteEO::getMemoriesChapter,ids); + List lawsMonthlyReportWriteEOS = lawsMonthlyReportWriteEOService.list(lambdaQueryWrapper); + if(lawsMonthlyReportWriteEOS.size() != 0){ + throw new JeroBootException("该标题下存在新增内容,不能删除"); + } + removeByIds(ids); } /** From fccf1cbf6acc02fd5582be482e0760bf4cdd0626 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 4 Aug 2022 17:50:00 +0800 Subject: [PATCH 12/13] =?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 | 4 +- jero-web/src/common/lang/zh-cn.js | 2 + jero-web/src/components/uploadFile/file.vue | 8 ++-- .../RegulationMonthlyManagement.vue | 10 ++--- .../components/modules/fillTable.vue | 2 +- .../components/modules/fillTableAdd.vue | 10 ++++- .../components/modules/managementAdd.vue | 8 ++-- .../components/addModel.vue | 2 +- .../components/feedbackInformation.vue | 44 +++++++++---------- 9 files changed, 50 insertions(+), 40 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 7e92066b7..b1946fe76 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1235,5 +1235,7 @@ module.exports = { addComparison: 'Add comparison', showOrNot: 'Show or not', comparisonMarket: 'Comparison Market', - share: 'share' + share: 'share', + simplifiedChinese:'Simplified Chinese', + uploadOnly:'Upload only', } \ 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 52078ad02..85ff24ea2 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1339,4 +1339,6 @@ module.exports = { showOrNot:'是否展示', comparisonMarket:'对比市场', share:'分享', + simplifiedChinese:'简体中文', + uploadOnly:'只能上传', } \ No newline at end of file diff --git a/jero-web/src/components/uploadFile/file.vue b/jero-web/src/components/uploadFile/file.vue index b27182372..510dc1a4c 100644 --- a/jero-web/src/components/uploadFile/file.vue +++ b/jero-web/src/components/uploadFile/file.vue @@ -34,7 +34,7 @@ export default { name: 'file', - props: ['disableds', 'disabled', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads'], + props: ['disableds', 'disabled', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads', 'Uploadable'], data() { return { visible: false, @@ -68,7 +68,7 @@ if (this.isMultiple) { this.multiple = false } - this.accept = this.restrictUploads ? '.docx,.doc' : '*.*' + this.accept = this.restrictUploads ? this.Uploadable : '*.*' // console.log(this.thisFileType,this.thisFileSize,this.thisFileUploadUrl); }, methods: { @@ -99,10 +99,10 @@ let index1 = fileName.lastIndexOf('.') let index2 = fileName.length let fileSuffix = fileName.substring(index1, index2) - if (fileSuffix == '.docx' || fileSuffix == '.doc') { + if (this.Uploadable.includes(fileSuffix)) { } else { - this.$message.warning(this.$t('onlyFilesUploaded')) + this.$message.warning(this.$t('uploadOnly') + this.Uploadable + this.$t('file')) return false } } diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue index 77c7b5dd3..a6b3cc5e1 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue @@ -44,7 +44,7 @@ :columns="columns" > - {{text == 1?$t('chinese'):$t('English')}} + {{text == 1?$t('simplifiedChinese'):$t('English')}} {{text}} @@ -151,7 +151,7 @@ title: this.$t('operation'), align: 'center', fixed: 'right', - width: 180, + width: 240, scopedSlots: { customRender: 'operation' } } ] @@ -179,7 +179,7 @@ this.pageNo = page this.getList() }, - SizeChange(page,pageSize) { + SizeChange(page, pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() @@ -220,9 +220,9 @@ let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.fileId + fileSuffix) window.open(url, '_blank') } else { - if (item.createBy == this.userInfo().username){ + if (item.createBy == this.userInfo().username) { downloadFile('/sys/common/downLoadFile', item.name, { id: item.fileId, userName: this.userInfo().username }) - }else{ + } else { this.$message.warning(this.$t('theDoesNotSupportPreview')) } } diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue index a93e3f426..df745bf88 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue @@ -97,7 +97,7 @@ title: this.$t('operation'), align: 'center', fixed: 'right', - width: 180, + width: 280, scopedSlots: { customRender: 'operation' } } ] diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue index 15940fc5e..51b79e4d2 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue @@ -51,6 +51,7 @@ class="box-input" :getPopupContainer="triggerNode=> triggerNode.parentNode" allowClear + :disabled="isParentId" v-model="formInline.parentId"> { + this.isParentId = false this.formInline = {} this.$refs.ruleForm.clearValidate() }) @@ -139,8 +142,13 @@ this.title = this.$t('edit') this.visible = true this.getParent() + this.isParentId = false this.$nextTick(() => { this.formInline = row + if (!row.parentId) { + this.formInline.parentId = undefined + this.isParentId = true + } this.$refs.ruleForm.clearValidate() }) }, diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/managementAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/managementAdd.vue index 9fb30c097..2fdbfc14e 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/managementAdd.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/managementAdd.vue @@ -38,7 +38,6 @@ @@ -61,7 +60,8 @@ {{$t('submit')}}
- +
@@ -95,7 +95,7 @@ visible: false, languageList: [ { - text: this.$t('chinese'), + text: this.$t('simplifiedChinese'), value: 1 }, { @@ -275,7 +275,7 @@ .button-text { height: 38px; - width: calc(100% - 100px); + width: 100%; line-height: 38px; background: #fff; border: 1px #00B3BE solid; diff --git a/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue b/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue index c13dbc0ca..4298fc61f 100644 --- a/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue +++ b/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue @@ -94,7 +94,7 @@ - +
diff --git a/jero-web/src/views/processCenter/components/feedbackInformation.vue b/jero-web/src/views/processCenter/components/feedbackInformation.vue index c8e8a146f..b237e6c53 100644 --- a/jero-web/src/views/processCenter/components/feedbackInformation.vue +++ b/jero-web/src/views/processCenter/components/feedbackInformation.vue @@ -41,18 +41,15 @@
- * - {{$t('questionsSuggestions')}} + {{$t('enclosure')}}
- - + + + {{ (item.accessoryFile === 'null' || item.accessoryFile === '' || + item.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles') + }} +
@@ -67,25 +64,26 @@ :prop="'dataList.'+index+'.reason'" :rules="[{max: 300,message: $t('reason') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur' }]"> - +
- {{$t('enclosure')}} + * + {{$t('questionsSuggestions')}}
- - - {{ (item.accessoryFile === 'null' || item.accessoryFile === '' || - item.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles') - }} - + +
From 71e5a697f67ec1c42f1ba6993ce48224eab53176 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 4 Aug 2022 18:01:19 +0800 Subject: [PATCH 13/13] =?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 --- .../components/modules/defaultTemplate.vue | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue index 23ffd3f15..3ccb0896f 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue @@ -249,11 +249,11 @@
+ v-model="formInline.lawsContactName"/>
@@ -382,6 +382,12 @@ } else { this.formInline.technologyTerritory = [] } + if (!this.formInline.useMethod) { + this.formInline.useMethod = undefined + } + if (!this.formInline.state) { + this.formInline.state = undefined + } this.formInline = { ...this.formInline } } else { this.formInline = {} @@ -443,6 +449,12 @@ formInline[res] = formInline[res].join(',') } }) + if (!formInline.state || formInline.state == '' || formInline.state == 'null') { + formInline.state = '' + } + if (!formInline.useMethod || formInline.useMethod == '' || formInline.useMethod == 'null') { + formInline.useMethod = '' + } callback && callback(formInline) } })