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] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?= =?UTF-8?q?=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()