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

汇总(标准调研流程 标准征求意见流程 企标废止流程)修改请求

Browse Source
This commit is contained in:
zyn
2022-12-15 16:12:13 +08:00
parent d17e99e4b4
commit ccc79fb9ff
4 changed files with 82 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue
+75 -71
View File
@@ -436,77 +436,81 @@
})
},
getData() {
return new Promise((resolve, reject) => {
this.$http.get("lawss/activiti/queryTaskIndex", {
prcId: this.$route.query.processInstanceId,
index: this.$route.query.index
}, {
_this: this
}, res => {
this.$nextTick(()=>{
let data = JSON.parse(res.mesg)
let jsonData = JSON.parse(res.mesg)
this.jsonData = jsonData.form ? jsonData.form : jsonData
this.form.title = data.title || data.form.title
this.form.processName = data.processName || data.form.processName
this.form.date = data.date || data.form.date
let arr = data.responUserList || data.form.responUserList
let newArr = []
for (let a = 0; a < arr.length; a++) {
arr[a].institutionName = ''
this.$http.get('sarUser/user/selectDeptByDY', {
ids: arr[a].dockUser
}, {
_this: this
}, res => {
arr[a].institutionName = res.data[0].institutionName
})
newArr.push(arr[a])
}
this.tableData = newArr
this.form.hzfileId = data.fileId
this.form.hzfileName = data.fileName
this.newDocUser = data.form ? data.form.docUser : data.docUser
this.json = data || data.form
this.commentText5 = res.commitText || ''
})
}, e => {
});
})
// return new Promise((resolve, reject) => {
// inboundLiaisonDetail({
// taskIds: this.taskIds,
// pId: this.pId
// }).then(res => {
// let data = JSON.parse(res.mesg)
// let jsonData = JSON.parse(res.mesg)
// this.jsonData = jsonData.form ? jsonData.form : jsonData
// this.commentText5 = data.commentText5 || ''
// this.form.title = data.title || data.form.title
// this.form.processName = data.processName || data.form.processName
// this.form.date = data.date || data.form.date
// let arr = data.responUserList || data.form.responUserList
// let newArr = []
// for (let a = 0; a <arr.length; a++) {
// arr[a].institutionName = ''
// this.$http.get('sarUser/user/selectDeptByDY', {
// ids: arr[a].dockUser
// }, {
// _this: this
// }, res => {
// arr[a].institutionName = res.data[0].institutionName
// })
// newArr.push(arr[a])
// }
// this.tableData = newArr
// this.form.hzfileId = data.form ? data.form.hzfileId : (data.hzfileId ? data.hzfileId : '')
// this.form.hzfileName = data.form ? data.form.hzfileName : (data.hzfileName ? data.hzfileName : '')
// this.newDocUser = data.form ? data.form.docUser : data.docUser
// this.json = data || data.form
// }).catch(e => {
// })
// })
// return new Promise((resolve, reject) => {
// this.$http.get("lawss/activiti/queryTaskIndex", {
// prcId: this.$route.query.processInstanceId,
// taskIds: this.$route.query.taskIds
// }, {
// _this: this
// }, res => {
// this.$nextTick(()=>{
// console.log(res)
// let data = JSON.parse(res.mesg)
// let jsonData = JSON.parse(res.mesg)
// console.log(jsonData)
// this.jsonData = jsonData.form ? jsonData.form : jsonData
// this.form.title = data.title || data.form.title
// this.form.processName = data.processName || data.form.processName
// this.form.date = data.date || data.form.date
// let arr = data.responUserList || data.form.responUserList
// let newArr = []
// for (let a = 0; a < arr.length; a++) {
// arr[a].institutionName = ''
// this.$http.get('sarUser/user/selectDeptByDY', {
// ids: arr[a].dockUser
// }, {
// _this: this
// }, res => {
// arr[a].institutionName = res.data[0].institutionName
// })
// newArr.push(arr[a])
// }
// this.tableData = newArr
// // this.form.hzfileId = data.fileId
// // this.form.hzfileName = data.fileName
// this.form.hzfileId = data.form ? data.form.hzfileId : (data.hzfileId ? data.hzfileId : '')
// this.form.hzfileName = data.form ? data.form.hzfileName : (data.hzfileName ? data.hzfileName : '')
// this.newDocUser = data.form ? data.form.docUser : data.docUser
// this.json = data || data.form
//
// this.commentText5 = res.commitText || ''
// })
// }, e => {
// });
// })
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
let jsonData = JSON.parse(res.mesg)
this.commentText5 = data.commentText || ''
this.jsonData = jsonData.form ? jsonData.form : jsonData
this.form.title = data.title || data.form.title
this.form.processName = data.processName || data.form.processName
this.form.date = data.date || data.form.date
let arr = data.responUserList || data.form.responUserList
let newArr = []
for (let a = 0; a <arr.length; a++) {
arr[a].institutionName = ''
this.$http.get('sarUser/user/selectDeptByDY', {
ids: arr[a].dockUser
}, {
_this: this
}, res => {
arr[a].institutionName = res.data[0].institutionName
})
newArr.push(arr[a])
}
this.tableData = newArr
this.form.hzfileId = data.form ? data.form.hzfileId : (data.hzfileId ? data.hzfileId : '')
this.form.hzfileName = data.form ? data.form.hzfileName : (data.hzfileName ? data.hzfileName : '')
this.newDocUser = data.form ? data.form.docUser : data.docUser
this.json = data || data.form
}).catch(e => {
})
})
},
},
mounted () {
src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue
+1
View File
@@ -676,6 +676,7 @@ export default {
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg);
console.log(data)
this.commentText5 = data.commentText || ''
this.onlyKey = data.form ? data.form.onlyKey :data.onlyKey
this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
src/pages/processCenter/pages/creatProcess/qbfz/step4-1.vue
+2 -2
View File
@@ -278,7 +278,7 @@ export default {
data() {
return {
activesNames:'1',
disabledXX:this.$route.query.disabledXX,
disabledXX:!!this.$route.query.disabledXX,
active: "1",
isTransfer: false,
isSubmit: false,
@@ -360,9 +360,9 @@ export default {
* @description: 动态表单读取
*/
getFormFieldList(item) {
console.log(item);
this.$nextTick(() => {
this.qbfsForm = JSON.parse(JSON.stringify(item));
this.commentText = item.commentText
let res = item.res ? item.res.substring(1, item.res.lastIndexOf("]")) : "";
res = res.split(",");
this.dataList = [];
src/pages/processCenter/pages/processDetail/index.vue
+4 -1
View File
@@ -205,7 +205,10 @@ export default {
approveHandler(){
let index = this.detailData.length - 1 // 当前流程任务最后一步index
let isEnd = true
let row = {...this.detailData[this.approveRowIndex]}//汇总页数据
let row = {...this.detailData[this.approveRowIndex+1]}//汇总页数据
if(this.approveRowIndex ===this.detailData.length-1){ //最后一步
row = {...this.detailData[this.approveRowIndex]}
}
row.taskIds = row.id
row.taskInfo = row.name
row.tabsName = this.$route.query.tabsName