From 06f6888595310c56825e7ce639d10e85cdf4348b Mon Sep 17 00:00:00 2001
From: zhoulingpo <zhoulingpo>
Date: Fri, 28 Apr 2023 14:29:46 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/process.js                    | 10 +++++++++
 src/components/ProcessMixin.vue               | 14 +++++++++++++
 src/views/Report/reportManager/labelModal.vue | 14 ++++++-------
 src/views/permissionApplication/examine.vue   | 15 ++++++++++---
 src/views/permissionApplication/launch.vue    | 21 ++++++++++++-------
 5 files changed, 56 insertions(+), 18 deletions(-)

diff --git a/src/api/modules/process.js b/src/api/modules/process.js
index 85d4c98..60c1525 100644
--- a/src/api/modules/process.js
+++ b/src/api/modules/process.js
@@ -125,4 +125,14 @@ export default {
 
     })
   },
+  // 判断当前人是不是审批人
+// /selectTask
+  jugeProcess(data) {
+    return request({
+      url: '/api/selectTask',
+      method: 'get',
+      params: data
+
+    })
+  }
 }
diff --git a/src/components/ProcessMixin.vue b/src/components/ProcessMixin.vue
index da270e3..1f52e9a 100644
--- a/src/components/ProcessMixin.vue
+++ b/src/components/ProcessMixin.vue
@@ -148,7 +148,21 @@
               })
             })
           },
+          // 判断当前提交人
+          JuggleSub(taskId) {
+            return new Promise((resolve, reject) => {
+              this.$api.process.jugeProcess({taskId: taskId}).then((res) => {
+                if(res.data.assignee== this.$store.getters.userInfo.usid){
+                  resolve(true)
+                }else{
+                  this.$message.warning("您没有当前流程的操作权限")
+                  resolve(false)
+                }
 
+
+              })
+            })
+          }
         },
         computed: {},
         watch: {},
diff --git a/src/views/Report/reportManager/labelModal.vue b/src/views/Report/reportManager/labelModal.vue
index 3638d73..e2e27e3 100644
--- a/src/views/Report/reportManager/labelModal.vue
+++ b/src/views/Report/reportManager/labelModal.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-dialog title="新增/编辑标签" :visible.sync="dialogVisible" width="30%" :before-close="handleClose">
-      <div class="form">
+      <div class="form showLimit" >
         <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
@@ -10,13 +10,13 @@
           </el-form-item>
 
           <el-form-item label="标签名称" required>
-            <el-input v-model="form.label" maxlength="100" placeholder="请输入标签名称"></el-input>
+            <el-input show-word-limit  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-input v-model="form.orderNum" maxlength="10" placeholder="请输入排序"></el-input>
           </el-form-item>
           <el-form-item label="备注" prop="remark">
-            <el-input v-model="form.remark" maxlength="1000" placeholder="请输入备注"></el-input>
+            <el-input show-word-limit type="textarea" v-model="form.remark" maxlength="1000" placeholder="请输入备注"></el-input>
           </el-form-item>
           <el-form-item>
             <el-button @click="cancel" class="btn">取消</el-button>
@@ -177,11 +177,11 @@ export default {
 }
 
 .form ::v-deep .el-input__inner {
-  width: 90%
+  width: 100%
 }
 
 .form ::v-deep .el-select {
-  width: 90%;
+  width: 100%;
 }
 
 .form ::v-deep .el-select .el-input__inner {
@@ -201,7 +201,7 @@ export default {
 ::v-deep .el-cascader {
   height: 40px !important;
   line-height: 40px !important;
-  width: 90%;
+  width: 100%;
 }
 
 ::v-deep .el-cascader .el-input__inner {
diff --git a/src/views/permissionApplication/examine.vue b/src/views/permissionApplication/examine.vue
index ac98d78..5969d42 100644
--- a/src/views/permissionApplication/examine.vue
+++ b/src/views/permissionApplication/examine.vue
@@ -190,6 +190,10 @@ export default {
     },
     // 选择转办
     handleDblClick(treeNode) {
+      this.JuggleSub(this.taskId).then(res=> {
+
+      })
+      return
       // taskId: this.$store.getters.getHandleInfo.taskId, // 任务id
       //   assignee: treeNode[0].userId, // 转办人
       //   userId: this.$store.getters.userInfo.userId, // dangqian人
@@ -211,12 +215,12 @@ export default {
 
     },
     handleSubmit() {
-        // if (this.$refs.operationRef.submit()) {
-          // 通过了校验  需要整合参数 拿到原来的dataJson 再把新添加的增进去 在拼成dataJson
+      this.JuggleSub(this.taskId).then(res=> {
+        if(res){
           let submit = JSON.parse(this.processOld.submitJson)
           let dataJson = this.processOld.dataJson
           let submitJson = JSON.stringify({...submit, ...this.$refs.operationRef.examineForm})
-           this.completeProcess({
+          this.completeProcess({
             dataJson,
             submitJson,
             taskId: this.taskId,
@@ -224,6 +228,11 @@ export default {
             prcType: this.prcType
           })
         }
+      })
+        // if (this.$refs.operationRef.submit()) {
+          // 通过了校验  需要整合参数 拿到原来的dataJson 再把新添加的增进去 在拼成dataJson
+
+        }
 
   }
 }
diff --git a/src/views/permissionApplication/launch.vue b/src/views/permissionApplication/launch.vue
index c1d6bab..66dcb22 100644
--- a/src/views/permissionApplication/launch.vue
+++ b/src/views/permissionApplication/launch.vue
@@ -403,15 +403,20 @@ export default {
                 this.organizeData()
                 //如果不是第一次
                 if (this.initShow) {
-                  let dataJson = JSON.stringify(this.tableData)
-                  let submitJson = JSON.stringify({...this.assignForm, userId: this.$store.getters.userInfo.usid,approvalOpinion:this.assignForm.remark})
-                  this.completeProcess({
-                    dataJson,
-                    submitJson,
-                    taskId: this.taskId,
-                    userId: this.$store.getters.userInfo.usid,
-                    prcType: this.prcType
+                  this.JuggleSub(this.taskId).then(res=>{
+                    if(res){
+                      let dataJson = JSON.stringify(this.tableData)
+                      let submitJson = JSON.stringify({...this.assignForm, userId: this.$store.getters.userInfo.usid,approvalOpinion:this.assignForm.remark})
+                      this.completeProcess({
+                        dataJson,
+                        submitJson,
+                        taskId: this.taskId,
+                        userId: this.$store.getters.userInfo.usid,
+                        prcType: this.prcType
+                      })
+                    }
                   })
+
                 } else {
                   this.startProcess()
                 }