diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 01d833f72..47cb21884 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1257,4 +1257,6 @@ module.exports = { forward:'Forward', issuedBy:'Issued by', pleaseDecompositionStandardOrder:'Please import or bring in at least one decomposition standard order', + currentlyTheFirstOneThatCannotMovedUp:'Currently the first one that cannot be moved up', + currentlyTheLastOneCannotmovedDown:'Currently the last one cannot be moved down', } \ 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 e5c4705a5..89ac86b7b 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1359,4 +1359,6 @@ module.exports = { forward:'转发', issuedBy:'发布人', pleaseDecompositionStandardOrder:'请导入或带入至少一条分解标准单', + currentlyTheFirstOneThatCannotMovedUp:'当前已是第一个无法进行上移', + currentlyTheLastOneCannotmovedDown:'当前已是最后一个无法进行下移', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue index 173a0f4e2..0a13a4202 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue @@ -255,6 +255,7 @@ pageNo: this.pageNo, pageSize: this.pageSize, serialNumber: this.$route.query.serialNumber ? this.$route.query.serialNumber : '', + gatherResult: this.$route.query.gatherResult ? this.$route.query.gatherResult : '', ...queryParam } this.loading = true 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 55010c29d..3a8d0b8d0 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue @@ -163,7 +163,11 @@ this.sortList.push(this.dataSource[index - 1]) } } - this.move() + if (this.sortList.length > 1) { + this.move() + } else { + this.$message.warning(this.$t('currentlyTheFirstOneThatCannotMovedUp')) + } }, moveDownClick(row, index) { this.sortList = [] @@ -180,7 +184,11 @@ this.sortList.push(this.dataSource[index + 1]) } } - this.move() + if (this.sortList.length > 1) { + this.move() + } else { + this.$message.warning(this.$t('currentlyTheLastOneCannotmovedDown')) + } }, move() { postAction('/report/lawsMonthlyReportTitleTemplateEO/move', { lawsMonthlyReportTitleTemplateEOS: this.sortList }).then((res) => { diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue index c47a86d66..c2c5935ac 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue @@ -324,6 +324,7 @@ pageNo: this.pageNo, pageSize: this.pageSize, serialNumber: this.$route.query.serialNumber ? this.$route.query.serialNumber : '', + flowStatus: this.$route.query.flowStatus ? this.$route.query.flowStatus : '', ...queryParam } this.loading = true diff --git a/jero-web/src/views/dashboard/components/myList.vue b/jero-web/src/views/dashboard/components/myList.vue index 637435a0d..2ee3cfc6c 100644 --- a/jero-web/src/views/dashboard/components/myList.vue +++ b/jero-web/src/views/dashboard/components/myList.vue @@ -88,6 +88,7 @@ prcClick(row) { // let index = row.taskIds.lastIndexOf(',') // row.taskIds = row.taskIds.slice(0, index) + row.router = this.$route.path if (row.prcType == '1') { let newUrl = this.$router.resolve({ path: '/handshakeProcess', @@ -100,7 +101,7 @@ query: row }) window.open(newUrl.href, '_blank') - }else if (row.prcType == '6') { + } else if (row.prcType == '6') { let newUrl = this.$router.resolve({ path: '/evaluationProcess', query: row diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue index abf4e7853..243e26780 100644 --- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue @@ -327,7 +327,7 @@ this.$message.success(this.$t('OperationSuccessful')) this.loading = false this.$router.push({ - path: '/technologyAssessment' + path: this.$route.query.router }) } else { this.loading = false diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue index b7e990823..d00ec8a03 100644 --- a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue @@ -192,7 +192,7 @@ this.$message.success(this.$t('OperationSuccessful')) this.loading = false this.$router.push({ - path: '/collectionOfRegulatoryOpinions' + path: this.$route.query.router }) } else { this.loading = false diff --git a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue index 52c578b8b..e6f9393d3 100644 --- a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue +++ b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue @@ -154,6 +154,7 @@ dealWith(row) { // let index = row.taskIds.lastIndexOf(',') // row.taskIds = row.taskIds.slice(0, index) + row.router = this.$route.path if (row.prcType == '1') { let newUrl = this.$router.resolve({ path: '/handshakeProcess', diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index a19b42892..4aec2ab8d 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -675,7 +675,9 @@ this.handlePreservation() } }, 10000) - this.paramsManifest = JSON.parse(localStorage.getItem('paramsManifest')) + // this.paramsManifest = JSON.parse(localStorage.getItem('paramsManifest')) + this.paramsManifest = this.$route.query + // document.title = `${this.paramsManifest.title}-` + this.$t('ParameteItemCollectionList') document.title = `${this.paramsManifest.title}-` + this.$t('ParameteItemCollectionList') }, methods: { diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index 7b980f74e..97dcd2cda 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -252,12 +252,11 @@ // 先调取接口判断是否有配置信息 getAction(this.url.verifyConfig, { paramsManifestId: item.id }).then((res) => { if (res.result) { - localStorage.setItem('paramsManifest', JSON.stringify(item)) + // localStorage.setItem('paramsManifest', JSON.stringify(item)) let newUrl = _this.$router.resolve({ path: '/ParameterItemCollection', query: item // projectName:this.$route.query.projectName - }) window.open(newUrl.href, '_blank') } else { diff --git a/jero-web/src/views/regulationsKanban/components/addModel.vue b/jero-web/src/views/regulationsKanban/components/addModel.vue index 56b430397..608c4c436 100644 --- a/jero-web/src/views/regulationsKanban/components/addModel.vue +++ b/jero-web/src/views/regulationsKanban/components/addModel.vue @@ -211,7 +211,8 @@ export default { this.$router.push({ path: '/collectionOfRegulatoryOpinions', query:{ - serialNumber:this.item.serialNumber + serialNumber:this.item.serialNumber, + gatherResult:'Completed' } }) }, @@ -228,7 +229,8 @@ export default { this.$router.push({ path: '/technologyAssessment', query:{ - serialNumber:this.item.serialNumber + serialNumber:this.item.serialNumber, + flowStatus:'Completed' } }) }, @@ -257,7 +259,7 @@ export default { id:this.paramsManifestId, ...this.formData } - downloadFile('/project/lawsComplianceBoard/exportComplianceResultDetail', this.$t('complianceResults')+'.xls', query, this.Deselect) + downloadFile('/project/lawsComplianceBoard/exportComplianceResultDetail', this.item.serialNumber +'.xls', query, this.Deselect) }, searchQuery() { this.loadData() diff --git a/jero-web/src/views/regulationsKanban/index.vue b/jero-web/src/views/regulationsKanban/index.vue index 27c048950..3165a3bfd 100644 --- a/jero-web/src/views/regulationsKanban/index.vue +++ b/jero-web/src/views/regulationsKanban/index.vue @@ -72,22 +72,29 @@