diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
index f485910d0..902c8a6e5 100644
--- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
+++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
@@ -7,19 +7,19 @@
@@ -205,6 +209,7 @@
}
},
mounted() {
+ this.$route.query.isDisplay = JSON.parse(this.$route.query.isDisplay)
if (this.queryBy) {
this.formInline.reviewResult = this.queryBy.reviewResult || undefined
this.formInline.approvalOpinion = ''
@@ -214,7 +219,6 @@
this.formInline.deliveryRequirements = this.queryPersonInCharge.deliveryRequirements
this.formInline.engineerFeedbackContent = this.queryPersonInCharge.engineerFeedbackContent
this.formInline.fileId = this.queryPersonInCharge.fileId
- console.log(this.formInline)
this.formInline = { ...this.formInline }
}
},
diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
index 3465650e1..7c565020e 100644
--- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
@@ -147,19 +147,19 @@
},
computed: {
isSendBack() {
- if (this.$route.query.TaskKey == 'fqrsh') {
+ if (this.$route.query.TaskKey == 'fqrsh' && this.$route.query.isDisplay) {
return true
}
return false
},
isTerminationProcess() {
- if (this.$route.query.TaskKey == 'fqrsh') {
+ if (this.$route.query.TaskKey == 'fqrsh' && this.$route.query.isDisplay) {
return true
}
return false
},
isAdopt() {
- if (this.$route.query.TaskKey == 'fqrsh') {
+ if (this.$route.query.TaskKey == 'fqrsh' && this.$route.query.isDisplay) {
if (this.queryBy.reviewResult == 'Compliance' || this.queryBy.reviewResult == 'NA') {
return true
}
@@ -167,9 +167,9 @@
return false
},
isSubmit() {
- if (this.$route.query.TaskKey == 'zrrclrw') {
+ if (this.$route.query.TaskKey == 'zrrclrw' && this.$route.query.isDisplay) {
return true
- } else if (this.$route.query.TaskKey == 'dreDispose') {
+ } else if (this.$route.query.TaskKey == 'dreDispose' && this.$route.query.isDisplay) {
if (!this.queryPersonInCharge.engineerFeedbackContent && this.queryPersonInCharge.status != 'haveDone') {
return true
}
@@ -177,7 +177,7 @@
return false
},
isResubmit() {
- if (this.$route.query.TaskKey == 'dreDispose') {
+ if (this.$route.query.TaskKey == 'dreDispose' && this.$route.query.isDisplay) {
if (this.queryPersonInCharge.engineerFeedbackContent && this.queryPersonInCharge.status != 'haveDone') {
return true
}
@@ -187,6 +187,7 @@
},
mounted() {
let _this = this
+ this.$route.query.isDisplay = JSON.parse(this.$route.query.isDisplay)
let query = {
actiProcInstId: this.$route.query.actiProcInstId,
createBy: this.userInfo().username
@@ -272,7 +273,7 @@
projectTaskInventoryId: this.$route.query.projectTaskInventoryId,
deliveryRequirements: val.deliveryRequirements
}
- postAction(this.url.dreSubmit, query).then((res) => {
+ putAction(this.url.dreSubmit, query).then((res) => {
})
},
diff --git a/jero-web/src/views/projectManagement/ParameterItemCollection/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ParameterItemCollection/ProjectDetails/index.vue
index 7d8efe6c1..dc15a49ad 100644
--- a/jero-web/src/views/projectManagement/ParameterItemCollection/ProjectDetails/index.vue
+++ b/jero-web/src/views/projectManagement/ParameterItemCollection/ProjectDetails/index.vue
@@ -1,6 +1,6 @@
-
+