WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature_dev_20221008_TODO' into feature_dev_20221008_TODO

Browse Source
This commit is contained in:
wangzhijiang
2022-10-19 11:21:40 +08:00
parent 8839414fba baed744ebf
commit 5e13b7bb92
4 changed files with 56 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
+26 -15
View File
@@ -324,14 +324,19 @@
putAction(this.url.dreSubmit, query).then((res) => { putAction(this.url.dreSubmit, query).then((res) => {
if (res.success) { if (res.success) {
this.$message.success(this.$t('OperationSuccessful')) this.$message.success(this.$t('OperationSuccessful'))
if (this.$route.query.router) {
this.$router.push({ this.$router.push({
path: '/ProjectDetails', path: '/projectRegulationTasks'
query: { })
type: '103', } else {
...this.$route.query this.$router.push({
} path: '/ProjectDetails',
}) query: {
type: '103',
...this.$route.query
}
})
}
// setTimeout(() => { // setTimeout(() => {
// this.loading = false // this.loading = false
// window.close() // window.close()
@@ -375,13 +380,19 @@
if (res.success) { if (res.success) {
setTimeout(() => { setTimeout(() => {
this.loading = false this.loading = false
this.$router.push({ if (this.$route.query.router) {
path: '/ProjectDetails', this.$router.push({
query: { path: '/projectRegulationTasks'
type: '103', })
...this.$route.query } else {
} this.$router.push({
}) path: '/ProjectDetails',
query: {
type: '103',
...this.$route.query
}
})
}
}, 1000) }, 1000)
} }
}) })
jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
+10 -6
View File
@@ -144,6 +144,7 @@
}, },
viewClick(row) { viewClick(row) {
let query = {} let query = {}
row.router = this.$route.path
if (row.flowType == '1') { if (row.flowType == '1') {
query = { query = {
taskDefinitionKey: row.taskDefinitionKey, taskDefinitionKey: row.taskDefinitionKey,
@@ -176,6 +177,7 @@
row.taskId = '' row.taskId = ''
} }
query = { query = {
router: row.router,
taskIds: row.taskId, taskIds: row.taskId,
actiProcInstId: row.actiProcInstId, actiProcInstId: row.actiProcInstId,
projectTaskInventoryId: row.projectLawsInventoryId, projectTaskInventoryId: row.projectLawsInventoryId,
@@ -195,8 +197,8 @@
projectName: row.projectName, projectName: row.projectName,
targetMarket: row.targetMarket, targetMarket: row.targetMarket,
projectNameId: row.projectNameId, projectNameId: row.projectNameId,
primaryKeyId: row.designTaskDetailId, primaryKeyId: row.primaryKeyId,
PersonChargeFeedback: row.designPersonChargeFeedback PersonChargeFeedback: row.PersonChargeFeedback
} }
let newUrl = this.$router.resolve({ let newUrl = this.$router.resolve({
path: '/taskListProcess', path: '/taskListProcess',
@@ -209,6 +211,7 @@
row.taskId = '' row.taskId = ''
} }
query = { query = {
router: row.router,
taskIds: row.taskId, taskIds: row.taskId,
actiProcInstId: row.actiProcInstId, actiProcInstId: row.actiProcInstId,
projectTaskInventoryId: row.projectLawsInventoryId, projectTaskInventoryId: row.projectLawsInventoryId,
@@ -228,8 +231,8 @@
projectName: row.projectName, projectName: row.projectName,
targetMarket: row.targetMarket, targetMarket: row.targetMarket,
projectNameId: row.projectNameId, projectNameId: row.projectNameId,
primaryKeyId: row.prehomoTaskDetailId, primaryKeyId: row.primaryKeyId,
PersonChargeFeedback: row.prehomoPersonChargeFeedback PersonChargeFeedback: row.PersonChargeFeedback
} }
let newUrl = this.$router.resolve({ let newUrl = this.$router.resolve({
path: '/taskListProcess', path: '/taskListProcess',
@@ -242,6 +245,7 @@
row.taskId = '' row.taskId = ''
} }
query = { query = {
router: row.router,
taskIds: row.taskId, taskIds: row.taskId,
actiProcInstId: row.actiProcInstId, actiProcInstId: row.actiProcInstId,
id: row.projectLibraryId, id: row.projectLibraryId,
@@ -261,8 +265,8 @@
projectName: row.projectName, projectName: row.projectName,
targetMarket: row.targetMarket, targetMarket: row.targetMarket,
projectNameId: row.projectNameId, projectNameId: row.projectNameId,
primaryKeyId: row.verifyTaskDetailId, primaryKeyId: row.primaryKeyId,
PersonChargeFeedback: row.verifyPersonChargeFeedback PersonChargeFeedback: row.PersonChargeFeedback
} }
let newUrl = this.$router.resolve({ let newUrl = this.$router.resolve({
path: '/taskListProcess', path: '/taskListProcess',
jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
+10 -6
View File
@@ -137,6 +137,7 @@
}, },
ProcessingClick(row) { ProcessingClick(row) {
let query = {} let query = {}
row.router = this.$route.path
if (row.flowType == '1') { if (row.flowType == '1') {
query = { query = {
taskDefinitionKey: row.taskDefinitionKey, taskDefinitionKey: row.taskDefinitionKey,
@@ -169,6 +170,7 @@
row.taskId = '' row.taskId = ''
} }
query = { query = {
router: row.router,
taskIds: row.taskId, taskIds: row.taskId,
actiProcInstId: row.actiProcInstId, actiProcInstId: row.actiProcInstId,
projectTaskInventoryId: row.projectLawsInventoryId, projectTaskInventoryId: row.projectLawsInventoryId,
@@ -188,8 +190,8 @@
projectName: row.projectName, projectName: row.projectName,
targetMarket: row.targetMarket, targetMarket: row.targetMarket,
projectNameId: row.projectNameId, projectNameId: row.projectNameId,
primaryKeyId: row.designTaskDetailId, primaryKeyId: row.primaryKeyId,
PersonChargeFeedback: row.designPersonChargeFeedback PersonChargeFeedback: row.PersonChargeFeedback
} }
let newUrl = this.$router.resolve({ let newUrl = this.$router.resolve({
path: '/taskListProcess', path: '/taskListProcess',
@@ -202,6 +204,7 @@
row.taskId = '' row.taskId = ''
} }
query = { query = {
router: row.router,
taskIds: row.taskId, taskIds: row.taskId,
actiProcInstId: row.actiProcInstId, actiProcInstId: row.actiProcInstId,
projectTaskInventoryId: row.projectLawsInventoryId, projectTaskInventoryId: row.projectLawsInventoryId,
@@ -221,8 +224,8 @@
projectName: row.projectName, projectName: row.projectName,
targetMarket: row.targetMarket, targetMarket: row.targetMarket,
projectNameId: row.projectNameId, projectNameId: row.projectNameId,
primaryKeyId: row.prehomoTaskDetailId, primaryKeyId: row.primaryKeyId,
PersonChargeFeedback: row.prehomoPersonChargeFeedback PersonChargeFeedback: row.PersonChargeFeedback
} }
let newUrl = this.$router.resolve({ let newUrl = this.$router.resolve({
path: '/taskListProcess', path: '/taskListProcess',
@@ -235,6 +238,7 @@
row.taskId = '' row.taskId = ''
} }
query = { query = {
router: row.router,
taskIds: row.taskId, taskIds: row.taskId,
actiProcInstId: row.actiProcInstId, actiProcInstId: row.actiProcInstId,
id: row.projectLibraryId, id: row.projectLibraryId,
@@ -254,8 +258,8 @@
projectName: row.projectName, projectName: row.projectName,
targetMarket: row.targetMarket, targetMarket: row.targetMarket,
projectNameId: row.projectNameId, projectNameId: row.projectNameId,
primaryKeyId: row.verifyTaskDetailId, primaryKeyId: row.primaryKeyId,
PersonChargeFeedback: row.verifyPersonChargeFeedback PersonChargeFeedback: row.PersonChargeFeedback
} }
let newUrl = this.$router.resolve({ let newUrl = this.$router.resolve({
path: '/taskListProcess', path: '/taskListProcess',
jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
+10 -6
View File
@@ -144,6 +144,7 @@
}, },
viewClick(row) { viewClick(row) {
let query = {} let query = {}
row.router = this.$route.path
if (row.flowType == '1') { if (row.flowType == '1') {
query = { query = {
taskDefinitionKey:row.taskDefinitionKey, taskDefinitionKey:row.taskDefinitionKey,
@@ -176,6 +177,7 @@
row.taskId = '' row.taskId = ''
} }
query = { query = {
router: row.router,
taskIds:row.taskId, taskIds:row.taskId,
actiProcInstId: row.actiProcInstId, actiProcInstId: row.actiProcInstId,
projectTaskInventoryId: row.projectLawsInventoryId, projectTaskInventoryId: row.projectLawsInventoryId,
@@ -195,8 +197,8 @@
projectName: row.projectName, projectName: row.projectName,
targetMarket: row.targetMarket, targetMarket: row.targetMarket,
projectNameId: row.projectNameId, projectNameId: row.projectNameId,
primaryKeyId: row.designTaskDetailId, primaryKeyId: row.primaryKeyId,
PersonChargeFeedback: row.designPersonChargeFeedback PersonChargeFeedback: row.PersonChargeFeedback
} }
let newUrl = this.$router.resolve({ let newUrl = this.$router.resolve({
path: '/taskListProcess', path: '/taskListProcess',
@@ -209,6 +211,7 @@
row.taskId = '' row.taskId = ''
} }
query = { query = {
router: row.router,
taskIds:row.taskId, taskIds:row.taskId,
actiProcInstId: row.actiProcInstId, actiProcInstId: row.actiProcInstId,
projectTaskInventoryId: row.projectLawsInventoryId, projectTaskInventoryId: row.projectLawsInventoryId,
@@ -228,8 +231,8 @@
projectName: row.projectName, projectName: row.projectName,
targetMarket: row.targetMarket, targetMarket: row.targetMarket,
projectNameId: row.projectNameId, projectNameId: row.projectNameId,
primaryKeyId: row.prehomoTaskDetailId, primaryKeyId: row.primaryKeyId,
PersonChargeFeedback: row.prehomoPersonChargeFeedback PersonChargeFeedback: row.PersonChargeFeedback
} }
let newUrl = this.$router.resolve({ let newUrl = this.$router.resolve({
path: '/taskListProcess', path: '/taskListProcess',
@@ -242,6 +245,7 @@
row.taskId = '' row.taskId = ''
} }
query = { query = {
router: row.router,
taskIds: row.taskId, taskIds: row.taskId,
actiProcInstId: row.actiProcInstId, actiProcInstId: row.actiProcInstId,
id: row.projectLibraryId, id: row.projectLibraryId,
@@ -261,8 +265,8 @@
projectName: row.projectName, projectName: row.projectName,
targetMarket: row.targetMarket, targetMarket: row.targetMarket,
projectNameId: row.projectNameId, projectNameId: row.projectNameId,
primaryKeyId: row.verifyTaskDetailId, primaryKeyId: row.primaryKeyId,
PersonChargeFeedback: row.verifyPersonChargeFeedback PersonChargeFeedback: row.PersonChargeFeedback
} }
let newUrl = this.$router.resolve({ let newUrl = this.$router.resolve({
path: '/taskListProcess', path: '/taskListProcess',