From 1b2d472b62db805e7eaba2a69fcef3790361438c Mon Sep 17 00:00:00 2001
From: zhoulingpo <zhoulingpo>
Date: Thu, 27 Apr 2023 14:55:37 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9bug=E3=80=91?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BA=A7=E8=81=94=E6=98=BE=E7=A4=BA=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=20=20=E4=BF=AE=E6=94=B9=E5=BC=B9=E7=AA=97=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=20=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B=E5=B7=B2?=
 =?UTF-8?q?=E5=8A=9E=E5=BE=85=E5=8A=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Report/ReportManager.vue            |   4 +-
 src/views/Report/reportManager/labelModal.vue | 345 +++++++++---------
 .../processCenter/finishProcess.vue           |   2 +
 .../userCenter/processCenter/gencyProcess.vue |   6 +-
 4 files changed, 182 insertions(+), 175 deletions(-)

diff --git a/src/views/Report/ReportManager.vue b/src/views/Report/ReportManager.vue
index 14c0b37..8eed7ba 100644
--- a/src/views/Report/ReportManager.vue
+++ b/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 {
diff --git a/src/views/Report/reportManager/labelModal.vue b/src/views/Report/reportManager/labelModal.vue
index d68a925..3638d73 100644
--- a/src/views/Report/reportManager/labelModal.vue
+++ b/src/views/Report/reportManager/labelModal.vue
@@ -1,213 +1,216 @@
 <template>
-    <div>
-        <el-dialog title="新增/编辑标签" :visible.sync="dialogVisible" width="30%" :before-close="handleClose">
-            <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>
-                    </el-form-item>
+  <div>
+    <el-dialog title="新增/编辑标签" :visible.sync="dialogVisible" width="30%" :before-close="handleClose">
+      <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>
+          </el-form-item>
 
-                    <el-form-item label="标签名称"  required>
-                        <el-input v-model="form.label" maxlength="100"  placeholder="请输入标签名称"></el-input>
-                    </el-form-item>
-                    <el-form-item label="排序"  required>
-                        <el-input v-model="form.orderNum" max="100" placeholder="请输入排序"></el-input>
-                    </el-form-item>
-                    <el-form-item label="备注" prop="remark">
-                        <el-input v-model="form.remark" maxlength="1000" placeholder="请输入备注"></el-input>
-                    </el-form-item>
-                    <el-form-item>
-                        <el-button @click="cancel" class="btn">取消</el-button>
-                        <el-button type="primary" @click="submitForm" class="btn">确定</el-button>
-                    </el-form-item>
-                </el-form>
-            </div>
+          <el-form-item label="标签名称" required>
+            <el-input v-model="form.label" maxlength="100" placeholder="请输入标签名称"></el-input>
+          </el-form-item>
+          <el-form-item label="排序" required>
+            <el-input v-model="form.orderNum" max="100" placeholder="请输入排序"></el-input>
+          </el-form-item>
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="form.remark" maxlength="1000" placeholder="请输入备注"></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button @click="cancel" class="btn">取消</el-button>
+            <el-button type="primary" @click="submitForm" class="btn">确定</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
 
-            <!-- <span slot="footer" class="dialog-footer">
-                <el-button @click="dialogVisible = false">取 消</el-button>
-                <el-button type="primary" @click=" submit">确 定</el-button>
-            </span> -->
-        </el-dialog>
-    </div>
+      <!-- <span slot="footer" class="dialog-footer">
+          <el-button @click="dialogVisible = false">取 消</el-button>
+          <el-button type="primary" @click=" submit">确 定</el-button>
+      </span> -->
+    </el-dialog>
+  </div>
 </template>
 
 <script>
 export default {
-    name: 'labelModal',
-    data() {
+  name: 'labelModal',
+  data() {
 
-        return {
-            dialogVisible: false,
-            form: {
-                label:'',
-                name:'',
-                sort:'',
-                orderNum:'',
-                remark:''
-            },
-            cascaderOptions:[
-
-                ],
-            // rule: {
-            //     label: [
-            //         { required: true, trigger: '' }
-            //     ],
-            //     nodeLabel: [
-            //         { required: true, trigger: '' }
-            //     ],
-            //     orderNum: [
-            //          { required: true, trigger: '' },
-            //
-            //     ],
-            //
-            // },
-        };
-    },
-    methods: {
-      // 必填项
-      checkReportF() {
-        let test=/^[1-9]\d*$/
-        if (!this.form.label) {
-          return this.$message.warning('请检查标签名称') && false;
-        }
-        if (!this.form.nodeLabel) {
-          return this.$message.warning('请检查上级标签') && false;
-        }
-        if (!this.form.orderNum) {
-          return this.$message.warning('请检查排序') && false;
-        }
-        if (!this.form.orderNum) {
-          return this.$message.warning('请检查排序') && false;
-        }
-        if(!test.test(this.form.orderNum)){
-          return this.$message.warning('排序只能输入数字！') && false;
-        }
-        return true;
+    return {
+      dialogVisible: false,
+      form: {
+        label: '',
+        name: '',
+        sort: '',
+        orderNum: '',
+        remark: ''
       },
-        handleClose(done) {
-            // this.$confirm('确认关闭？')
-            //   .then(_ => {
-            //     done();
-            //   })
-            //   .catch(_ => {});
-            done();
-        },
-        open(node, data) {
-            this.$api.report.labelList().then(res => {
-            console.log('666',res);
-            this.cascaderOptions=res.data
-            if (node && data) {
-                let id =data.id
-                this.$api.report.labelNodeList(id).then(res=>{
-                    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={...this.form}
-                // this.$refs.form.clearValidate('name')
-                this.$forceUpdate()
-            } else {
-                this.form = {
-                  label:'',
-                  name:'',
-                  sort:'',
-                  orderNum:'',
-                  remark:''
-                }
-                // this.$refs.form.clearValidate()
-                this.$forceUpdate()
-            }
-
-              this.dialogVisible = true
-              this.$nextTick(()=>{
-                this.$refs.form.clearValidate()
-              })
+      cascaderOptions: [],
+    };
+  },
+  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*$/
+      if (!this.form.label) {
+        return this.$message.warning('请检查标签名称') && false;
+      }
+      if (!this.form.nodeLabel) {
+        return this.$message.warning('请检查上级标签') && false;
+      }
+      if (!this.form.orderNum) {
+        return this.$message.warning('请检查排序') && false;
+      }
+      if (!this.form.orderNum) {
+        return this.$message.warning('请检查排序') && false;
+      }
+      if (!test.test(this.form.orderNum)) {
+        return this.$message.warning('排序只能输入数字！') && false;
+      }
+      return true;
+    },
+    handleClose(done) {
+      // this.$confirm('确认关闭？')
+      //   .then(_ => {
+      //     done();
+      //   })
+      //   .catch(_ => {});
+      done();
+    },
+    open(node, data) {
+      this.cascaderOptions = []
+      this.$api.report.labelList().then(res => {
+        console.log('666', res);
+        this.cascaderOptions = this.getTreeData(res.data)
+        if (node && data) {
+          let id = data.id
+          this.$api.report.labelNodeList(id).then(res => {
+            this.form.nodeLabel = res.data
+            this.$forceUpdate()
           })
-        },
-        cancel() {
-            this.dialogVisible = false
-        },
-        submitForm() {
-          if (this.checkReportF()) {
-            this.form.parentId=this.form.nodeLabel[this.form.nodeLabel.length - 1]
-            delete this.form.nodeLabel
-            if(!this.form.id){
-                this.$api.report.labelAdd(this.form).then(res => {
-                   if(res.ok){
-                      this.$message({
-                          type:'success',
-                          message:'添加成功'
-                      })
-                      this.$emit('updateList')
-                  }
-            })
-            }else{
-              this.$api.report.labelUpdate(this.form).then(res=>{
-                if(res.ok){
-                    this.$message({
-                        type:'success',
-                        message:'更新成功'
-                    })
-                    this.$emit('updateList')
-                }
+          this.form.label = data.label
+          this.form.orderNum = data.orderNum
+          this.form.remark = data.remark
+          this.form.id = data.id
+          this.form = {...this.form}
+          // this.$refs.form.clearValidate('name')
+          this.$forceUpdate()
+        } else {
+          this.form = {
+            label: '',
+            name: '',
+            sort: '',
+            orderNum: '',
+            remark: ''
+          }
+          // this.$refs.form.clearValidate()
+          this.$forceUpdate()
+        }
+
+        this.dialogVisible = true
+        this.$nextTick(() => {
+          this.$refs.form.clearValidate()
+        })
+      })
+    },
+    cancel() {
+      this.dialogVisible = false
+    },
+    submitForm() {
+      if (this.checkReportF()) {
+        this.form.parentId = this.form.nodeLabel[this.form.nodeLabel.length - 1]
+        delete this.form.nodeLabel
+        if (!this.form.id) {
+          this.$api.report.labelAdd(this.form).then(res => {
+            if (res.ok) {
+              this.$message({
+                type: 'success',
+                message: '添加成功'
               })
+              this.$emit('updateList')
             }
-            this.dialogVisible = false
-        }
+          })
+        } else {
+          this.$api.report.labelUpdate(this.form).then(res => {
+            if (res.ok) {
+              this.$message({
+                type: 'success',
+                message: '更新成功'
+              })
+              this.$emit('updateList')
+            }
+          })
         }
+        this.dialogVisible = false
+      }
     }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 .form {
-    padding: 50px;
+  padding: 50px;
 
-    .btn {
-        margin-left: 40px;
-        width: 90px;
-        height: 40px;
-        border-radius: 30px;
-        margin-right: 30px;
-    }
+  .btn {
+    margin-left: 40px;
+    width: 90px;
+    height: 40px;
+    border-radius: 30px;
+    margin-right: 30px;
+  }
 }
 
 .form ::v-deep .el-input__inner {
-    width: 90%
+  width: 90%
 }
 
 .form ::v-deep .el-select {
-    width: 90%;
+  width: 90%;
 }
 
 .form ::v-deep .el-select .el-input__inner {
-    width: 100%;
+  width: 100%;
 }
 
 ::v-deep .el-form-item--mini .el-form-item__label {
-    line-height: 40px !important;
+  line-height: 40px !important;
 }
 
 ::v-deep .el-input__inner {
-    height: 40px;
-    line-height: 40px;
-    width: 80%;
+  height: 40px;
+  line-height: 40px;
+  width: 80%;
 }
-::v-deep .el-cascader{
-    height: 40px !important;
-    line-height: 40px !important;
-    width: 90%;
+
+::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%;
+  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;
 }
diff --git a/src/views/userCenter/processCenter/finishProcess.vue b/src/views/userCenter/processCenter/finishProcess.vue
index 095ceeb..dec8084 100644
--- a/src/views/userCenter/processCenter/finishProcess.vue
+++ b/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
                 }
               })
             }
diff --git a/src/views/userCenter/processCenter/gencyProcess.vue b/src/views/userCenter/processCenter/gencyProcess.vue
index 14f56ca..4aacb3c 100644
--- a/src/views/userCenter/processCenter/gencyProcess.vue
+++ b/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
                 }
               })
             }