+
+
+
{{ node.label }}
-
+
@@ -163,7 +163,10 @@
- {{ node.label }}
+
+
+ {{ node.label }}
+
+
+ {{ data.label }}
+
diff --git a/src/views/Report/reportManager/labelModal.vue b/src/views/Report/reportManager/labelModal.vue
index faed21d..d05f24b 100644
--- a/src/views/Report/reportManager/labelModal.vue
+++ b/src/views/Report/reportManager/labelModal.vue
@@ -6,6 +6,9 @@
+
+ {{ data.label }}
+
@@ -209,7 +212,6 @@ export default {
line-height: 40px !important;
width: 100%;
}
-
::v-deep .el-popper .el-cascader-menu .el-cascader-node__label {
width: 160px !important;
overflow: hidden;
diff --git a/src/views/permissionApplication/examine.vue b/src/views/permissionApplication/examine.vue
index 5969d42..585872f 100644
--- a/src/views/permissionApplication/examine.vue
+++ b/src/views/permissionApplication/examine.vue
@@ -191,27 +191,28 @@ export default {
// 选择转办
handleDblClick(treeNode) {
this.JuggleSub(this.taskId).then(res=> {
-
+ if(res){
+ if( treeNode[0].USID == this.$store.getters.userInfo.usid){
+ this.$message.warning("您不能转办给自己")
+ }else{
+ this.$api.process.changeAssignee({
+ taskId: this.taskId,
+ assignee: treeNode[0].USID,
+ userId: this.$store.getters.userInfo.usid,
+ pId: this.prcId
+ }).then(() => {
+ this.$message.success('转办成功')
+ this.$router.push({path: '/userCenter/processCenter', query: {id: this.$route.query.id}})
+ this.visibleTree = false
+ })
+ }
+ }
})
- return
// taskId: this.$store.getters.getHandleInfo.taskId, // 任务id
// assignee: treeNode[0].userId, // 转办人
// userId: this.$store.getters.userInfo.userId, // dangqian人
// pId: this.$store.getters.getHandleInfo.prcId // 流程实例
- if( treeNode[0].USID == this.$store.getters.userInfo.usid){
- this.$message.warning("您不能转办给自己")
- }else{
- this.$api.process.changeAssignee({
- taskId: this.taskId,
- assignee: treeNode[0].USID,
- userId: this.$store.getters.userInfo.usid,
- pId: this.prcId
- }).then(() => {
- this.$message.success('转办成功')
- this.$router.push({path: '/userCenter/processCenter', query: {id: this.$route.query.id}})
- this.visibleTree = false
- })
- }
+
},
handleSubmit() {
diff --git a/src/views/permissionApplication/launch.vue b/src/views/permissionApplication/launch.vue
index 66dcb22..f256032 100644
--- a/src/views/permissionApplication/launch.vue
+++ b/src/views/permissionApplication/launch.vue
@@ -194,7 +194,7 @@ export default {
prcName:''
}
},
- created() {
+ async created() {
// 第一次进入此页面 需要清楚校验
if (this.$route.query.isBegin) {
// if (this.$route.query.ids.split(',').length > 0) {
@@ -240,16 +240,26 @@ export default {
this.formControlname = true
this.processForm.prcName = this.$route.query.prcName
console.log("122")
- this.getProcessDetail().then(res => {
- //基础信息
- console.log(res.prcName)
- this.tableData = JSON.parse(res.processOld.dataJson)
- this.applicationForm.power = res.tableData[0].power
- this.applicationForm.applyReason = this.tableData[0].applyReason
+ await this.getProcessDetail()
+ let applyReason = JSON.parse(this.processOld.dataJson)
+ this.tableData = JSON.parse(this.processOld.dataJson)
+ this.applicationForm.power = this.tableData[0].power
+ debugger
+ this.applicationForm.applyReason = applyReason[0].applyReason
- //指派信息
- ({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))
- })
+ //指派信息
+ ({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))
+ // this.getProcessDetail().then(res => {
+ // //基础信息
+ // let applyReason = JSON.parse(res.processOld.dataJson)
+ // res.tableData = JSON.parse(res.processOld.dataJson)
+ // res.applicationForm.power = res.tableData[0].power
+ // debugger
+ // res.applicationForm.applyReason = applyReason[0]?.applyReason
+ //
+ // //指派信息
+ // ({oneApprove:res.assignForm.oneApprove,oneApproveName:res.assignForm.oneApproveName,twoApprove:res.assignForm.twoApprove,twoApproveName:res.assignForm.twoApproveName,remark:res.assignForm.remark}= JSON.parse(res.processOld.submitJson))
+ // })
}
if (this.$route.query.type == 'yiban') {
this.taskId = this.$store.getters.handleProcess.taskId