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() { getData() {
return new Promise((resolve, reject) => { // return new Promise((resolve, reject) => {
this.$http.get("lawss/activiti/queryTaskIndex", { // this.$http.get("lawss/activiti/queryTaskIndex", {
prcId: this.$route.query.processInstanceId, // prcId: this.$route.query.processInstanceId,
index: this.$route.query.index // taskIds: this.$route.query.taskIds
}, { // }, {
_this: this // _this: this
}, res => { // }, res => {
this.$nextTick(()=>{ // this.$nextTick(()=>{
let data = JSON.parse(res.mesg) // console.log(res)
let jsonData = JSON.parse(res.mesg) // let data = JSON.parse(res.mesg)
this.jsonData = jsonData.form ? jsonData.form : jsonData // let jsonData = JSON.parse(res.mesg)
this.form.title = data.title || data.form.title // console.log(jsonData)
this.form.processName = data.processName || data.form.processName // this.jsonData = jsonData.form ? jsonData.form : jsonData
this.form.date = data.date || data.form.date // this.form.title = data.title || data.form.title
let arr = data.responUserList || data.form.responUserList // this.form.processName = data.processName || data.form.processName
let newArr = [] // this.form.date = data.date || data.form.date
for (let a = 0; a < arr.length; a++) { // let arr = data.responUserList || data.form.responUserList
arr[a].institutionName = '' // let newArr = []
this.$http.get('sarUser/user/selectDeptByDY', { // for (let a = 0; a < arr.length; a++) {
ids: arr[a].dockUser // arr[a].institutionName = ''
}, { // this.$http.get('sarUser/user/selectDeptByDY', {
_this: this // ids: arr[a].dockUser
}, res => { // }, {
arr[a].institutionName = res.data[0].institutionName // _this: this
}) // }, res => {
newArr.push(arr[a]) // arr[a].institutionName = res.data[0].institutionName
} // })
this.tableData = newArr // newArr.push(arr[a])
this.form.hzfileId = data.fileId // }
this.form.hzfileName = data.fileName // this.tableData = newArr
this.newDocUser = data.form ? data.form.docUser : data.docUser // // this.form.hzfileId = data.fileId
this.json = data || data.form // // this.form.hzfileName = data.fileName
// this.form.hzfileId = data.form ? data.form.hzfileId : (data.hzfileId ? data.hzfileId : '')
this.commentText5 = res.commitText || '' // this.form.hzfileName = data.form ? data.form.hzfileName : (data.hzfileName ? data.hzfileName : '')
}) // this.newDocUser = data.form ? data.form.docUser : data.docUser
}, e => { // this.json = data || data.form
}); //
}) // this.commentText5 = res.commitText || ''
// return new Promise((resolve, reject) => { // })
// inboundLiaisonDetail({ // }, e => {
// taskIds: this.taskIds, // });
// pId: this.pId // })
// }).then(res => { return new Promise((resolve, reject) => {
// let data = JSON.parse(res.mesg) inboundLiaisonDetail({
// let jsonData = JSON.parse(res.mesg) taskIds: this.taskIds,
// this.jsonData = jsonData.form ? jsonData.form : jsonData pId: this.pId
// this.commentText5 = data.commentText5 || '' }).then(res => {
// this.form.title = data.title || data.form.title let data = JSON.parse(res.mesg)
// this.form.processName = data.processName || data.form.processName let jsonData = JSON.parse(res.mesg)
// this.form.date = data.date || data.form.date this.commentText5 = data.commentText || ''
// let arr = data.responUserList || data.form.responUserList this.jsonData = jsonData.form ? jsonData.form : jsonData
// let newArr = [] this.form.title = data.title || data.form.title
// for (let a = 0; a <arr.length; a++) { this.form.processName = data.processName || data.form.processName
// arr[a].institutionName = '' this.form.date = data.date || data.form.date
// this.$http.get('sarUser/user/selectDeptByDY', { let arr = data.responUserList || data.form.responUserList
// ids: arr[a].dockUser let newArr = []
// }, { for (let a = 0; a <arr.length; a++) {
// _this: this arr[a].institutionName = ''
// }, res => { this.$http.get('sarUser/user/selectDeptByDY', {
// arr[a].institutionName = res.data[0].institutionName ids: arr[a].dockUser
// }) }, {
// newArr.push(arr[a]) _this: this
// } }, res => {
// this.tableData = newArr arr[a].institutionName = res.data[0].institutionName
// this.form.hzfileId = data.form ? data.form.hzfileId : (data.hzfileId ? data.hzfileId : '') })
// this.form.hzfileName = data.form ? data.form.hzfileName : (data.hzfileName ? data.hzfileName : '') newArr.push(arr[a])
// this.newDocUser = data.form ? data.form.docUser : data.docUser }
// this.json = data || data.form this.tableData = newArr
// }).catch(e => { 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 () { mounted () {
src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue
+1
View File
@@ -676,6 +676,7 @@ export default {
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg); let data = JSON.parse(res.mesg);
console.log(data)
this.commentText5 = data.commentText || '' this.commentText5 = data.commentText || ''
this.onlyKey = data.form ? data.form.onlyKey :data.onlyKey this.onlyKey = data.form ? data.form.onlyKey :data.onlyKey
this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser 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() { data() {
return { return {
activesNames:'1', activesNames:'1',
disabledXX:this.$route.query.disabledXX, disabledXX:!!this.$route.query.disabledXX,
active: "1", active: "1",
isTransfer: false, isTransfer: false,
isSubmit: false, isSubmit: false,
@@ -360,9 +360,9 @@ export default {
* @description: 动态表单读取 * @description: 动态表单读取
*/ */
getFormFieldList(item) { getFormFieldList(item) {
console.log(item);
this.$nextTick(() => { this.$nextTick(() => {
this.qbfsForm = JSON.parse(JSON.stringify(item)); this.qbfsForm = JSON.parse(JSON.stringify(item));
this.commentText = item.commentText
let res = item.res ? item.res.substring(1, item.res.lastIndexOf("]")) : ""; let res = item.res ? item.res.substring(1, item.res.lastIndexOf("]")) : "";
res = res.split(","); res = res.split(",");
this.dataList = []; this.dataList = [];
src/pages/processCenter/pages/processDetail/index.vue
+4 -1
View File
@@ -205,7 +205,10 @@ export default {
approveHandler(){ approveHandler(){
let index = this.detailData.length - 1 // 当前流程任务最后一步index let index = this.detailData.length - 1 // 当前流程任务最后一步index
let isEnd = true 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.taskIds = row.id
row.taskInfo = row.name row.taskInfo = row.name
row.tabsName = this.$route.query.tabsName row.tabsName = this.$route.query.tabsName