FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix_foton_20240619' into 'master'

Browse Source 
Fix foton 20240619

See merge request laws-foton-slrs/foton-laws-system-front!201
This commit is contained in:
王晓勇
2024-06-25 04:44:25 +00:00
parent 5d542663f9 158aa1a8ef
commit df25140067
6 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
+3
View File
@@ -3017,6 +3017,9 @@
}
this.getPlanStandDraftCompleteTime(processForm)
}else {
this.$message.warning('数据获取失败，请重试')
this.dataLoading = true
}
}).catch(e => {
})
src/pages/processCenter/pages/phone/qbrk-product/step10.vue
+4 -1
View File
@@ -1920,7 +1920,8 @@ export default {
this.saveLoading = true
this.form.commentText = this.formTongGuo.commentText
this.form.approvalOpinion = this.formTongGuo.approvalOpinion
const json = JSON.stringify({ form: this.form, roleForm: this.roleForm })
const json = JSON.stringify(this.form);
// const json = JSON.stringify({ form: this.form, roleForm: this.roleForm })
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId : this.userId,
@@ -2018,7 +2019,9 @@ export default {
}).then(res => {
if (res) {
let processForm = JSON.parse(res.mesg)
let roleForm = processForm.roleForm ? processForm.roleForm : {}
processForm = processForm.form ? processForm.form : processForm
processForm = Object.assign(processForm,roleForm)
const dateArr = []
if(processForm.commentCycleStart && processForm.commentCycleEnd){
dateArr[0] = processForm.commentCycleStart
src/pages/processCenter/pages/phone/qbrk-product/step12.vue
+4 -1
View File
@@ -1920,7 +1920,8 @@ export default {
this.saveLoading = true
this.form.commentText = this.formTongGuo.commentText
this.form.approvalOpinion = this.formTongGuo.approvalOpinion
const json = JSON.stringify({ form: this.form, roleForm: this.roleForm })
const json = JSON.stringify(this.form);
// const json = JSON.stringify({ form: this.form, roleForm: this.roleForm })
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId : this.userId,
@@ -2018,7 +2019,9 @@ export default {
}).then(res => {
if (res) {
let processForm = JSON.parse(res.mesg)
let roleForm = processForm.roleForm ? processForm.roleForm : {}
processForm = processForm.form ? processForm.form : processForm
processForm = Object.assign(processForm,roleForm)
const dateArr = []
if(processForm.commentCycleStart && processForm.commentCycleEnd){
dateArr[0] = processForm.commentCycleStart
src/pages/processCenter/pages/phone/qbrk-product/step4.vue
+4 -1
View File
@@ -1918,7 +1918,8 @@ export default {
this.saveLoading = true
this.form.commentText = this.formTongGuo.commentText
this.form.approvalOpinion = this.formTongGuo.approvalOpinion
const json = JSON.stringify({ form: this.form, roleForm: this.roleForm })
const json = JSON.stringify(this.form);
// const json = JSON.stringify({ form: this.form, roleForm: this.roleForm })
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId : this.userId,
@@ -2016,7 +2017,9 @@ export default {
}).then(res => {
if (res) {
let processForm = JSON.parse(res.mesg)
let roleForm = processForm.roleForm ? processForm.roleForm : {}
processForm = processForm.form ? processForm.form : processForm
processForm = Object.assign(processForm,roleForm)
const dateArr = []
if(processForm.commentCycleStart && processForm.commentCycleEnd){
dateArr[0] = processForm.commentCycleStart
src/pages/processCenter/pages/phone/qbrk-product/step7.vue
+4 -1
View File
@@ -2014,7 +2014,8 @@ export default {
this.saveLoading = true
this.form.commentText = this.formTongGuo.commentText
this.form.approvalOpinion = this.formTongGuo.approvalOpinion
const json = JSON.stringify({ form: this.form, roleForm: this.roleForm })
const json = JSON.stringify(this.form);
// const json = JSON.stringify({ form: this.form, roleForm: this.roleForm })
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId : this.userId,
@@ -2130,7 +2131,9 @@ export default {
}).then(res => {
if (res) {
let processForm = JSON.parse(res.mesg)
let roleForm = processForm.roleForm ? processForm.roleForm : {}
processForm = processForm.form ? processForm.form : processForm
processForm = Object.assign(processForm,roleForm)
const dateArr = []
if(processForm.commentCycleStart && processForm.commentCycleEnd){
dateArr[0] = processForm.commentCycleStart
src/pages/processCenter/pages/phone/qbrk-product/step8.vue
+4 -1
View File
@@ -1920,7 +1920,8 @@ export default {
this.saveLoading = true
this.form.commentText = this.formTongGuo.commentText
this.form.approvalOpinion = this.formTongGuo.approvalOpinion
const json = JSON.stringify({ form: this.form, roleForm: this.roleForm })
const json = JSON.stringify(this.form);
// const json = JSON.stringify({ form: this.form, roleForm: this.roleForm })
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId : this.userId,
@@ -2017,7 +2018,9 @@ export default {
}).then(res => {
if (res) {
let processForm = JSON.parse(res.mesg)
let roleForm = processForm.roleForm ? processForm.roleForm : {}
processForm = processForm.form ? processForm.form : processForm
processForm = Object.assign(processForm,roleForm)
const dateArr = []
if(processForm.commentCycleStart && processForm.commentCycleEnd){
dateArr[0] = processForm.commentCycleStart