修改 汇总(未符合项整改)
This commit is contained in:
@@ -15,6 +15,7 @@
|
|||||||
</ProcessTitle>
|
</ProcessTitle>
|
||||||
<div class="content-center">
|
<div class="content-center">
|
||||||
<el-button
|
<el-button
|
||||||
|
disabled
|
||||||
style="text-align: end"
|
style="text-align: end"
|
||||||
class="common-button-default"
|
class="common-button-default"
|
||||||
size="small"
|
size="small"
|
||||||
@@ -56,7 +57,7 @@
|
|||||||
<el-table-column label="选择责任人" prop="dutyPeople" width="200" align="center">
|
<el-table-column label="选择责任人" prop="dutyPeople" width="200" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<div style="display: inline;">
|
<div style="display: inline;">
|
||||||
<el-input
|
<el-input disabled
|
||||||
class="input-button"
|
class="input-button"
|
||||||
style="width: 60%"
|
style="width: 60%"
|
||||||
@click.native="selectPeople(scope.row)"
|
@click.native="selectPeople(scope.row)"
|
||||||
@@ -69,10 +70,10 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
</div>
|
</div>
|
||||||
<el-collapse accordion>
|
<el-collapse accordion value="1">
|
||||||
<el-collapse-item title="审批意见">
|
<el-collapse-item title="审批意见" name="1">
|
||||||
<div style="margin: 10px 0;">
|
<div style="margin: 10px 0;">
|
||||||
<el-input
|
<el-input disabled
|
||||||
type="textarea"
|
type="textarea"
|
||||||
:rows="3"
|
:rows="3"
|
||||||
resize="none"
|
resize="none"
|
||||||
@@ -148,7 +149,7 @@
|
|||||||
<loading :loading="loading">流程列表加载中</loading>
|
<loading :loading="loading">流程列表加载中</loading>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<ProcessFooter
|
<ProcessFooter v-show="false"
|
||||||
show-save
|
show-save
|
||||||
show-submit
|
show-submit
|
||||||
show-transfer
|
show-transfer
|
||||||
@@ -161,7 +162,7 @@
|
|||||||
@submit="handleSubmit"
|
@submit="handleSubmit"
|
||||||
>
|
>
|
||||||
</ProcessFooter>
|
</ProcessFooter>
|
||||||
<Role-tree
|
<Role-tree v-if="false"
|
||||||
check-box
|
check-box
|
||||||
:is-title="drawerTitle"
|
:is-title="drawerTitle"
|
||||||
:is-visible.sync="modalshowflag"
|
:is-visible.sync="modalshowflag"
|
||||||
@@ -259,45 +260,65 @@ export default {
|
|||||||
},
|
},
|
||||||
getFormFieldList (item) {
|
getFormFieldList (item) {
|
||||||
console.log(item)
|
console.log(item)
|
||||||
|
// this.$nextTick(() => {
|
||||||
|
// if (item.passInfo !== 0) {
|
||||||
|
// this.passInfo = JSON.parse(JSON.stringify(item)).passInfo
|
||||||
|
// let fileData = JSON.parse(JSON.stringify(item)).dockUserList
|
||||||
|
// this.dataList = fileData[0].standardInfoList
|
||||||
|
// fileData.forEach( filedata => {
|
||||||
|
// // console.log(filedata)
|
||||||
|
// if (filedata.id === this.userId){
|
||||||
|
// this.dataList = filedata.standardInfoList
|
||||||
|
// }
|
||||||
|
// })
|
||||||
|
// this.standardInfoList = this.dataList
|
||||||
|
// this.textarea = JSON.parse(JSON.stringify(item)).textarea
|
||||||
|
// /* 注释掉的代码 是因为后端已经分配过数据 前端不需要再做处理*/
|
||||||
|
// // for (let i = 0; i<fileData.length; i++) {
|
||||||
|
// // if (fileData[i].name.slice(0,fileData[i].name.indexOf('(')) === this.$store.getters.userInfo.userName) {
|
||||||
|
// // this.dataList = fileData[0].standardInfoList
|
||||||
|
// // this.standardInfoList = this.dataList
|
||||||
|
// // this.textarea = JSON.parse(JSON.stringify(item)).textarea
|
||||||
|
// // }
|
||||||
|
// // }
|
||||||
|
// } else {
|
||||||
|
// let fileData = JSON.parse(JSON.stringify(item)).dockUserList
|
||||||
|
// this.dataList = fileData[0].standardInfoList
|
||||||
|
// fileData.forEach( filedata => {
|
||||||
|
// // console.log(filedata)
|
||||||
|
// if (filedata.id === this.userId){
|
||||||
|
// this.dataList = filedata.standardInfoList
|
||||||
|
// }
|
||||||
|
// })
|
||||||
|
// this.standardInfoList = this.dataList
|
||||||
|
// // for (let i = 0; i<fileData.length; i++) {
|
||||||
|
// // if (fileData[i].name.slice(0,fileData[i].name.indexOf('(')) === this.$store.getters.userInfo.userName) {
|
||||||
|
// // this.dataList = fileData[0].standardInfoList
|
||||||
|
// // this.standardInfoList = this.dataList
|
||||||
|
// // // this.textarea = JSON.parse(JSON.stringify(item)).commentText
|
||||||
|
// // }
|
||||||
|
// // }
|
||||||
|
// }
|
||||||
|
// })
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
if (item.passInfo !== 0) {
|
if (item.responUserList !== undefined) {
|
||||||
this.passInfo = JSON.parse(JSON.stringify(item)).passInfo
|
let listJSON = JSON.parse(JSON.stringify(item.responUserList))
|
||||||
let fileData = JSON.parse(JSON.stringify(item)).dockUserList
|
this.dataList = listJSON
|
||||||
this.dataList = fileData[0].standardInfoList
|
this.commentInput = JSON.parse(JSON.stringify(item)).commentInput
|
||||||
fileData.forEach( filedata => {
|
|
||||||
// console.log(filedata)
|
|
||||||
if (filedata.id === this.userId){
|
|
||||||
this.dataList = filedata.standardInfoList
|
|
||||||
}
|
|
||||||
})
|
|
||||||
this.standardInfoList = this.dataList
|
|
||||||
this.textarea = JSON.parse(JSON.stringify(item)).textarea
|
|
||||||
/* 注释掉的代码 是因为后端已经分配过数据 前端不需要再做处理*/
|
|
||||||
// for (let i = 0; i<fileData.length; i++) {
|
|
||||||
// if (fileData[i].name.slice(0,fileData[i].name.indexOf('(')) === this.$store.getters.userInfo.userName) {
|
|
||||||
// this.dataList = fileData[0].standardInfoList
|
|
||||||
// this.standardInfoList = this.dataList
|
|
||||||
// this.textarea = JSON.parse(JSON.stringify(item)).textarea
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
} else {
|
} else {
|
||||||
let fileData = JSON.parse(JSON.stringify(item)).dockUserList
|
if (item.dockUserList !== undefined) {
|
||||||
this.dataList = fileData[0].standardInfoList
|
let listJSON = JSON.parse(JSON.stringify(item.dockUserList))
|
||||||
fileData.forEach( filedata => {
|
this.dataList = listJSON[0].standardInfoList
|
||||||
// console.log(filedata)
|
}else {
|
||||||
if (filedata.id === this.userId){
|
let listJSONInfo = item.info
|
||||||
this.dataList = filedata.standardInfoList
|
this.dataList = [listJSONInfo]
|
||||||
}
|
}
|
||||||
})
|
|
||||||
this.standardInfoList = this.dataList
|
|
||||||
// for (let i = 0; i<fileData.length; i++) {
|
|
||||||
// if (fileData[i].name.slice(0,fileData[i].name.indexOf('(')) === this.$store.getters.userInfo.userName) {
|
|
||||||
// this.dataList = fileData[0].standardInfoList
|
|
||||||
// this.standardInfoList = this.dataList
|
|
||||||
// // this.textarea = JSON.parse(JSON.stringify(item)).commentText
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
|
this.dataList.forEach(item => {
|
||||||
|
if (item.fileText.length !== 0) {
|
||||||
|
this.fileTextList = item.fileText
|
||||||
|
}
|
||||||
|
})
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
// 选择责任人的按钮操作
|
// 选择责任人的按钮操作
|
||||||
|
|||||||
Reference in New Issue
Block a user