【修改bug】修改级联显示数据 修改弹窗样式 修改流程已办待办

src/views/Report/ReportManager.vue

@@ -1169,14 +1169,14 @@ export default {
 .head {
     display: flex;
     align-items: center;
-
+    margin-bottom: 20px;
     .btn {
         cursor: pointer;
     }
 }
 
 .tree {
-    margin-top: 30px;
+    margin-top: 10px;
     padding: 0px 50px 50px 50px;
     height: 500px;
     .custom-tree-node {

src/views/Report/reportManager/labelModal.vue

@@ -4,7 +4,8 @@
       <div class="form">
         <el-form ref="form" :model="form" label-width="80px" :show-message="false">
           <el-form-item label="上级标签" required>
-                        <el-cascader v-model="form.nodeLabel" placeholder="请选择上级标签" :options="cascaderOptions" filterable :props="{ checkStrictly: true }" clearable >
+            <el-cascader v-model="form.nodeLabel" placeholder="请选择上级标签" :options="cascaderOptions" filterable
+                         :props="{ checkStrictly: true }" clearable >
             </el-cascader>
           </el-form-item>
 
@@ -40,34 +41,32 @@ export default {
     return {
       dialogVisible: false,
       form: {
-                label:'',
+        label: '',
-                name:'',
+        name: '',
-                sort:'',
+        sort: '',
-                orderNum:'',
+        orderNum: '',
-                remark:''
+        remark: ''
       },
-            cascaderOptions:[
+      cascaderOptions: [],
-
-                ],
-            // rule: {
-            //     label: [
-            //         { required: true, trigger: '' }
-            //     ],
-            //     nodeLabel: [
-            //         { required: true, trigger: '' }
-            //     ],
-            //     orderNum: [
-            //          { required: true, trigger: '' },
-            //
-            //     ],
-            //
-            // },
     };
   },
   methods: {
+    //用递归方式去除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;
+    },
     // 必填项
     checkReportF() {
-        let test=/^[1-9]\d*$/
+      let test = /^[1-9]\d*$/
       if (!this.form.label) {
         return this.$message.warning('请检查标签名称') && false;
       }
@@ -80,7 +79,7 @@ export default {
       if (!this.form.orderNum) {
         return this.$message.warning('请检查排序') && false;
       }
-        if(!test.test(this.form.orderNum)){
+      if (!test.test(this.form.orderNum)) {
         return this.$message.warning('排序只能输入数字！') && false;
       }
       return true;
@@ -94,36 +93,37 @@ export default {
       done();
     },
     open(node, data) {
+      this.cascaderOptions = []
       this.$api.report.labelList().then(res => {
-            console.log('666',res);
+        console.log('666', res);
-            this.cascaderOptions=res.data
+        this.cascaderOptions = this.getTreeData(res.data)
         if (node && data) {
-                let id =data.id
+          let id = data.id
-                this.$api.report.labelNodeList(id).then(res=>{
+          this.$api.report.labelNodeList(id).then(res => {
-                    this.form.nodeLabel=res.data
+            this.form.nodeLabel = res.data
             this.$forceUpdate()
           })
           this.form.label = data.label
           this.form.orderNum = data.orderNum
           this.form.remark = data.remark
-                this.form.id=data.id
+          this.form.id = data.id
-                this.form={...this.form}
+          this.form = {...this.form}
           // this.$refs.form.clearValidate('name')
           this.$forceUpdate()
         } else {
           this.form = {
-                  label:'',
+            label: '',
-                  name:'',
+            name: '',
-                  sort:'',
+            sort: '',
-                  orderNum:'',
+            orderNum: '',
-                  remark:''
+            remark: ''
           }
           // this.$refs.form.clearValidate()
           this.$forceUpdate()
         }
 
         this.dialogVisible = true
-              this.$nextTick(()=>{
+        this.$nextTick(() => {
           this.$refs.form.clearValidate()
         })
       })
@@ -133,24 +133,24 @@ export default {
     },
     submitForm() {
       if (this.checkReportF()) {
-            this.form.parentId=this.form.nodeLabel[this.form.nodeLabel.length - 1]
+        this.form.parentId = this.form.nodeLabel[this.form.nodeLabel.length - 1]
         delete this.form.nodeLabel
-            if(!this.form.id){
+        if (!this.form.id) {
           this.$api.report.labelAdd(this.form).then(res => {
-                   if(res.ok){
+            if (res.ok) {
               this.$message({
-                          type:'success',
+                type: 'success',
-                          message:'添加成功'
+                message: '添加成功'
               })
               this.$emit('updateList')
             }
           })
-            }else{
+        } else {
-              this.$api.report.labelUpdate(this.form).then(res=>{
+          this.$api.report.labelUpdate(this.form).then(res => {
-                if(res.ok){
+            if (res.ok) {
               this.$message({
-                        type:'success',
+                type: 'success',
-                        message:'更新成功'
+                message: '更新成功'
               })
               this.$emit('updateList')
             }
@@ -197,17 +197,20 @@ export default {
   line-height: 40px;
   width: 80%;
 }
-::v-deep .el-cascader{
+
+::v-deep .el-cascader {
   height: 40px !important;
   line-height: 40px !important;
   width: 90%;
 }
+
 ::v-deep .el-cascader .el-input__inner {
   height: 40px !important;
   line-height: 40px !important;
   width: 100%;
 }
-::v-deep .el-popper  .el-cascader-menu  .el-cascader-node__label{
+
+::v-deep .el-popper .el-cascader-menu .el-cascader-node__label {
   width: 160px !important;
   overflow: hidden;
 }

src/views/userCenter/processCenter/finishProcess.vue

@@ -124,6 +124,7 @@ export default {
                 query: {
                   id: this.$route.query.id,
                   type:'yiban',
+                  taskDefinitionKey:row.taskDefinitionKey
                 }
               })
             }else{
@@ -132,6 +133,7 @@ export default {
                 query: {
                   id: this.$route.query.id,
                   type:'yiban',
+                  taskDefinitionKey:row.taskDefinitionKey
                 }
               })
             }

src/views/userCenter/processCenter/gencyProcess.vue

@@ -112,14 +112,16 @@ export default {
               this.$router.push({
                 path: '/permission/launch',
                 query: {
-                  id: this.$route.query.id
+                  id: this.$route.query.id,
+                  taskDefinitionKey:row.taskDefinitionKey
                 }
               })
             }else{
               this.$router.push({
                 path: '/permission/examine',
                 query: {
-                  id: this.$route.query.id
+                  id: this.$route.query.id,
+                  taskDefinitionKey:row.taskDefinitionKey
                 }
               })
             }