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

fix:征求意见流程BUG修改

Browse Source
This commit is contained in:
zyd
2022-08-10 08:12:21 +08:00
parent ae2591e8b8
commit f4a1bdfdf2
4 changed files with 37 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
+1
View File
@@ -381,6 +381,7 @@ export default {
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
console.log(data)
this.onlyKey = data.form ? data.form.onlyKey : data.onlyKey
this.commentText2 = data.commentText2 || ''
this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+1
View File
@@ -614,6 +614,7 @@
json.info = []
json.form = this.form
json.department = this.$store.getters.userInfo.orgName
console.log(json)
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+22 -5
View File
@@ -627,13 +627,15 @@ export default {
json.onlyKey = this.onlyKey
json.spId = this.form.spId
json.spName = this.form.spName
json.form.info = this.data
json.form.onlyKey = this.onlyKey
json.form.spId = this.form.spId
json.form.spName = this.form.spName
json.commentText4 = this.commentText4
_formData.append("id", this.bpnId || "");
_formData.append("prcType", "3");
_formData.append("taskIds", this.taskIds);
_formData.append("json", JSON.stringify({
form: json,
commentText4: this.commentText4
}));
_formData.append("json", JSON.stringify(json));
console.log(json);
saveTaskForPub(_formData).then(res => {
this.saveLoading = false;
@@ -654,6 +656,7 @@ export default {
json.info = this.data
json.onlyKey = this.onlyKey
json.spName = this.form.spName
console.log(json)
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
@@ -718,7 +721,21 @@ export default {
this.form.endTime = data.endTime || data.form.endTime
this.form.textType = data.textType || data.form.textType
this.form.modelList = data.modelList || data.form.modelList
this.json = data.form ? data.form : data
if(data.form){
data.modelList = data.form.modelList?data.form.modelList: data.modelList
data.startUserName = data.form.startUserName? data.form.startUserName: data.startUserName
data.presidentUser = data.form.presidentUser ? data.form.presidentUser :data.presidentUser
data.presidentUserName = data.form.presidentUserName ? data.form.presidentUserName : data.presidentUserName
data.fjList = data.form.fjList ? data.form.fjList:data.fjList
data.spId = data.form.spId ? data.form.spId : ''
data.spName = data.form.spName ? data.form.spName : ''
data.startUser = data.form.startUser ? data.form.startUser : data.startUser
data.cid = data.form.cid?data.form.cid:data.cid
data.endTime = data.form.endTime? data.form.endTime:data.endTime
data.textType =data.form.textType? data.form.textType:data.textType
}
this.json = data
console.log(this.json)
this.standId = data.standId
this.getItemList(data.standId,data.textType)
this.data = data.info || data.form.info
src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+13 -2
View File
@@ -541,8 +541,19 @@
this.form.endTime = data.endTime || data.form.endTime;
this.form.textType = data.textType || data.form.textType
this.form.modelList = data.modelList || data.form.modelList
this.form.user7 = data.form ? data.form.user7 : (data.user7 ? data.user7 : '')
this.form.user7Name = data.form ? data.form.user7Name : (data.user7Name ? data.user7Name : '')
if(data.form){
let user7Id = data.form.user7
if(user7Id){
this.form.user7 =user7Id
this.form.user7Name =data.form.user7Name
}else{
this.form.user7 = data.user7 ? data.user7 : data.spId
this.form.user7Name = data.user7Name ? data.user7Name : data.spName
}
}else{
this.form.user7 = data.user7 ? data.user7 : data.spId
this.form.user7Name = data.user7Name ? data.user7Name : data.spName
}
let newArr = data.info ? data.info : data.form.data
this.oldData = JSON.parse(JSON.stringify(newArr))
let arr = []