【修改】修改bug
This commit is contained in:
zhoulingpo
@@ -62,4 +62,16 @@
|
||||
color: #1890FF ;
|
||||
cursor: pointer;
|
||||
}
|
||||
.reportName{
|
||||
max-height: 500px;
|
||||
}
|
||||
.reportName el-message-box__content .el-message-box__message{
|
||||
overflow: scroll;
|
||||
}
|
||||
.reportName .el-message-box__message p{
|
||||
word-break: break-word;
|
||||
max-height: 300px;
|
||||
overflow: auto;
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -113,7 +113,7 @@
|
||||
let data=res.data
|
||||
this.processOld=data
|
||||
console.log( this.processOld,"processOld")
|
||||
resolve()
|
||||
resolve(this)
|
||||
}).catch(err=>{
|
||||
reject()
|
||||
})
|
||||
|
||||
@@ -461,9 +461,22 @@ export default {
|
||||
getTreeLabel(){
|
||||
this.$api.report.labelList().then(res => {
|
||||
this.treeData=res.data
|
||||
this.cascaderOptions=res.data
|
||||
this.cascaderOptions=this.getTreeData(res.data)
|
||||
})
|
||||
},
|
||||
//用递归方式去除children
|
||||
getTreeData(data) {
|
||||
for (var i = 0; i < data.length; i++) {
|
||||
if (data[i].children.length < 1) {
|
||||
// children若为空数组，则将children设为undefined
|
||||
data[i].children = undefined;
|
||||
} else {
|
||||
// children若不为空数组，则继续 递归调用 本方法
|
||||
this.getTreeData(data[i].children);
|
||||
}
|
||||
}
|
||||
return data;
|
||||
},
|
||||
//标签搜索
|
||||
filterNode(value, data) {
|
||||
if (!value) return true;
|
||||
@@ -1244,7 +1257,7 @@ export default {
|
||||
|
||||
.el-input__inner,
|
||||
.el-textarea__inner {
|
||||
font-size: 14px;
|
||||
font-size: 15px;
|
||||
font-weight: 400;
|
||||
color: #434343;
|
||||
}
|
||||
|
||||
@@ -126,8 +126,8 @@ export default {
|
||||
})
|
||||
if (name.length > 0) {
|
||||
this.$alert(`报告${name.toString()}已经存在`, '提示', {
|
||||
confirmButtonText: '确定'
|
||||
|
||||
confirmButtonText: '确定',
|
||||
customClass: 'reportName'
|
||||
})
|
||||
}
|
||||
// 找出已经存在的数据 用弹窗提示
|
||||
@@ -309,5 +309,6 @@ export default {
|
||||
.tag-btns {
|
||||
padding-right: 15px;
|
||||
}
|
||||
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -230,15 +230,17 @@ export default {
|
||||
this.prcNum = this.$store.getters.handleProcess.prcNum
|
||||
this.prcId = this.$store.getters.handleProcess.prcId
|
||||
this.prcName = this.$store.getters.handleProcess.prcName
|
||||
this.prcName = JSON.stringify(this.prcName)
|
||||
this.initShow = true
|
||||
this.formControlname = true
|
||||
|
||||
this.processForm.prcName = this.$route.query.prcName
|
||||
console.log("122")
|
||||
this.getProcessDetail().then(res => {
|
||||
//基础信息
|
||||
this.tableData = JSON.parse(this.processOld.dataJson)
|
||||
this.applicationForm.power = this.tableData[0].power
|
||||
this.applicationForm.applyReason = this.tableData[0].applyReason
|
||||
this.processForm.prcName = this.prcName
|
||||
|
||||
//指派信息
|
||||
({oneApprove:this.assignForm.oneApprove,oneApproveName:this.assignForm.oneApproveName,twoApprove:this.assignForm.twoApprove,twoApproveName:this.assignForm.twoApproveName,remark:this.assignForm.remark}= JSON.parse(this.processOld.submitJson))
|
||||
})
|
||||
@@ -430,7 +432,7 @@ export default {
|
||||
userId: this.$store.getters.userInfo.usid
|
||||
}, dataMsg: this.tableData
|
||||
}
|
||||
|
||||
form.approvalOpinion = this.assignForm.remark
|
||||
form.prcType = this.prcType
|
||||
form.prcName = this.processForm.prcName
|
||||
form.userId = this.$store.getters.userInfo.usid
|
||||
@@ -448,6 +450,6 @@ export default {
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
<style scoped>
|
||||
|
||||
</style>
|
||||
|
||||
@@ -108,12 +108,14 @@ export default {
|
||||
this.$store.commit('setHandleProcess',params)
|
||||
switch (row.prcType) {
|
||||
case '1' :
|
||||
debugger
|
||||
if (row.taskDefinitionKey == 'aid4') {
|
||||
this.$router.push({
|
||||
path: '/permission/launch',
|
||||
query: {
|
||||
id: this.$route.query.id,
|
||||
taskDefinitionKey:row.taskDefinitionKey
|
||||
taskDefinitionKey:row.taskDefinitionKey,
|
||||
prcName: row.prcName
|
||||
}
|
||||
})
|
||||
}else{
|
||||
@@ -121,7 +123,8 @@ export default {
|
||||
path: '/permission/examine',
|
||||
query: {
|
||||
id: this.$route.query.id,
|
||||
taskDefinitionKey:row.taskDefinitionKey
|
||||
taskDefinitionKey:row.taskDefinitionKey,
|
||||
prcName: row.prcName
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@@ -72,7 +72,7 @@
|
||||
</vxe-column>
|
||||
</vxe-table>
|
||||
</div>
|
||||
<monitorModal ref="monitorModal" :prcId="prcId"></monitorModal>
|
||||
<monitorModal ref="monitorModal" :prcId="prcId" @uploadTable="processTable"></monitorModal>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -236,7 +236,7 @@ export default {
|
||||
if(check.length > 0){
|
||||
this.$message.warning("请选择状态为未完成并且任务步骤不为重新发起的数据")
|
||||
}else{
|
||||
this.$refs.monitorModal.open(this.checkList[0].id,this.prcId,this.checkList[0].assigneeId)
|
||||
this.$refs.monitorModal.open(this.checkList[0].id,this.prcId,this.checkList[0].assigneeId,this.checkList[0].taskDefinitionKey,this.checkList[0].prcType)
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@@ -59,7 +59,9 @@ export default {
|
||||
]
|
||||
},
|
||||
taskId: '',
|
||||
pId: ''
|
||||
pId: '' ,
|
||||
aid: '',
|
||||
prcType: ''
|
||||
};
|
||||
},
|
||||
|
||||
@@ -93,13 +95,15 @@ export default {
|
||||
this.userList = data.records;
|
||||
})
|
||||
},
|
||||
open(taskId, pId,assigneeId) {
|
||||
open(taskId, pId,assigneeId,aid,prcType) {
|
||||
this.taskId = taskId
|
||||
this.pId = pId
|
||||
this.prcType = prcType
|
||||
this.form.name = {
|
||||
assignee: ''
|
||||
}
|
||||
this.assigneeId=assigneeId
|
||||
this.assigneeId = assigneeId
|
||||
this.aid = aid
|
||||
this.dialogVisible = true
|
||||
},
|
||||
submit() {
|
||||
@@ -110,18 +114,26 @@ export default {
|
||||
if (userId == assignee) {
|
||||
this.$message.warning("当前任务受理人就是您选择的人员")
|
||||
} else {
|
||||
this.$api.process.changeAssignee({
|
||||
let params={
|
||||
taskId: this.taskId,
|
||||
assignee: assignee,
|
||||
userId: userId,
|
||||
assignee: userId ,
|
||||
userId: assignee ,
|
||||
pId: this.pId
|
||||
})
|
||||
}
|
||||
if(this.prcType == '1'){
|
||||
if(this.aid=='aid2'){
|
||||
params.replaceMap="oneApprove:"+ this.form.assignee+','+"oneApproveName:"+ this.form.assigneeName
|
||||
}else{
|
||||
params.replaceMap="twoApprove:"+ this.form.assignee+','+"twoApproveName:"+ this.form.assigneeName
|
||||
}
|
||||
}
|
||||
this.$api.process.changeAssignee(params)
|
||||
.then(res => {
|
||||
//转办完应该跳到哪个页面？
|
||||
//转办完这个人还能看到这个监控流程吗
|
||||
this.dialogVisible = false
|
||||
this.$message.success(res.data.message)
|
||||
this.sysUserList()
|
||||
this.$emit('uploadTable')
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user