From 0088d05b69bea0f7877a8ca1f1a0d850b20ee097 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 25 十二月 2024 11:15:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/flowable/task/myProcess/send/index.vue |  161 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 157 insertions(+), 4 deletions(-)

diff --git a/src/views/flowable/task/myProcess/send/index.vue b/src/views/flowable/task/myProcess/send/index.vue
index b235359..8049573 100644
--- a/src/views/flowable/task/myProcess/send/index.vue
+++ b/src/views/flowable/task/myProcess/send/index.vue
@@ -12,7 +12,7 @@
           <el-col :span="16" :offset="4" v-if="formDataList && formDataList.length > 0">
             <div v-for="(formDataObj, index) in formDataList" :key="index" class="form-warp" style="position: relative">
               <div v-if="!formDataObj.current" style="position: absolute; top: 2px; right: 2px">
-                <el-button type="danger" disabled>椹冲洖(鍔熻兘寮�鍙戜腑)</el-button>
+                <el-button type="danger" @click="openRejectTask(formDataObj.beforeNodeDefId)">椹冲洖</el-button>
               </div>
               <div v-if="formDataObj.current" style="margin-bottom: 15px;color: #409eff">褰撳墠闃舵锛�<span style="color: red">{{formDataObj.beforeNodeName}}</span></div>
               <div v-else style="margin-bottom: 15px;color: #409eff">鍓嶇疆闃舵锛�<span style="color: #d5904b">{{formDataObj.beforeNodeName}}</span></div>
@@ -23,7 +23,7 @@
             <div style="display: flex;justify-content: center; align-items: center; margin: 20px 0">
               <el-button type="primary" @click="submitForm">纭骞舵彁浜�</el-button>
               <el-button type="primary" disabled @click="submitForm">鍗忓悓鍔炵悊(鍔熻兘寮�鍙戜腑)</el-button>
-              <el-button type="primary" disabled @click="submitForm">杞氦浠栦汉鍔炵悊(鍔熻兘寮�鍙戜腑)</el-button>
+              <el-button type="primary" @click="openDelegation(formDataList[0].beforeNodeName)">杞姙</el-button>
 <!--              <el-button type="primary" @click="resetForm">閲� 缃�</el-button>-->
             </div>
           </el-col>
@@ -43,17 +43,80 @@
         </span>
       </el-dialog>
     </el-card>
+
+
+    <el-dialog
+      :title="`椹冲洖锛歚 + rejectForm.projectName"
+      :visible.sync="rejectShow"
+      width="950px"
+      :destroy-on-close="true"
+      :close-on-click-modal="false"
+      >
+      <div>
+        <el-input
+          type="textarea"
+          :rows="3"
+          placeholder="瀹℃牳寤鸿"
+          v-model="rejectForm.comment">
+        </el-input>
+      </div>
+      <div class="opBut">
+        <el-button type="danger" size="small" @click="rejectTask">椹冲洖</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog
+      :title="`杞姙锛歚 + delegationForm.taskName"
+      :visible.sync="delegationShow"
+      width="950px"
+      :destroy-on-close="true"
+      :close-on-click-modal="false"
+    >
+      <div>
+        <el-form :model="delegationForm" :rules="delegationFormRules" ref="delegationForm" label-width="100px" class="demo-ruleForm">
+          <el-alert
+            title="璇烽�夋嫨瑕佽浆鍔炵殑鐢ㄦ埛瀵硅薄锛岀敤鎴风被鍨嬩笉鍚屽鐞嗕汉涓嶅悓"
+            type="info"
+            :closable="false"
+            style="margin-bottom: 8px"
+            show-icon>
+          </el-alert>
+          <el-form-item label="鐢ㄦ埛绫诲瀷" prop="peopleType">
+            <el-select v-model="delegationForm.peopleType" @change="peopleTypeChange" placeholder="璇烽�夋嫨鐢ㄦ埛绫诲瀷">
+              <el-option label="鎸囧畾浜哄憳" value="FIX_USER"></el-option>
+              <el-option label="鍊欓�夌敤鎴�" value="USER"></el-option>
+              <el-option label="鍊欓�夐儴闂�" value="DEPT"></el-option>
+              <el-option label="鍊欓�夎鑹�" value="ROLE"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="delegationForm.peopleType === 'DEPT'" label="鍊欓�夐儴闂�" prop="targetId">
+            <Dept ref="dept" :checkeds="delegationDeptSelect" :show="deptShow" @close="closeDept" @submit="getDeptSelect"/>
+            <div style="display: flex;align-items: center">
+              <div>{{deptNames}}</div>
+              <el-button style="margin-left: 8px" type="text" @click="editDept">缂栬緫</el-button>
+            </div>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="opBut">
+        <el-button type="danger" size="small" @click="delegation">杞姙</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
 import {definitionStart, flowXmlAndNode} from "@/api/flowable/definition";
 import BpmnViewer from '@/components/Process/viewer';
+import Dept from '@/components/flow/Dept'
 import {completeSubmitFormTask} from "@/api/flowable/process";
 import { flowTaskForm } from "@/api/flowable/todo";
 import {getNextFlowNodeByStart} from "@/api/flowable/todo";
 import FlowUser from '@/components/flow/User'
 import FlowRole from '@/components/flow/Role'
+import {rejectTask} from "@/api/flowable/process";
+import {taskDelegation} from "@/api/projectProcess/projectProcess";
 
 export default {
   name: "Record",
@@ -61,10 +124,30 @@
     BpmnViewer,
     FlowUser,
     FlowRole,
+    Dept,
   },
   props: {},
   data() {
     return {
+      deptShow: false, // 閮ㄩ棬鏄剧ず
+      deptNames: '', // 閫変腑鐨勯儴闂ㄥ悕绉�
+      delegationDeptSelect: [], // 閫変腑閮ㄩ棬
+      delegationFormRules: {
+        peopleType: [
+          { required: true, message: '璇烽�夋嫨鐢ㄦ埛绫诲瀷', trigger: 'change' }
+        ],
+        targetId: [
+          { required: true, message: '璇烽�夋嫨杞姙瀵硅薄', trigger: 'blur' }
+        ],
+      },
+      delegationForm: { // 杞姙琛ㄥ崟
+        taskId: '',
+        peopleType: '',
+        targetId: '',
+        taskName: ''
+      },
+      delegationShow: false, // 杞姙鏄剧ず
+      rejectShow: false, // 椹冲洖鏄剧ず
       goBackParams: {},
       formDataList: [],  // 琛ㄥ崟鍒楄〃
       taskId: '',
@@ -91,7 +174,12 @@
       checkValues: null, // 閫変腑浠诲姟鎺ユ敹浜哄憳鏁版嵁
       formData: {}, // 濉啓鐨勮〃鍗曟暟鎹�,
       multiInstanceVars: '', // 浼氱鑺傜偣
-      formJson: {} // 琛ㄥ崟json
+      formJson: {}, // 琛ㄥ崟json
+      rejectForm: {
+        comment: '', // 瀹℃牳鎰忚
+        taskId: '',
+        // rejectedTaskDefKey: ''  // 琚┏鍥炵殑浠诲姟key
+      }
     };
   },
   mounted() {
@@ -105,6 +193,65 @@
     this.getFlowFormData(this.taskId);
   },
   methods: {
+    delegation() {
+      this.$confirm(`纭畾瑕佸皢姝や换鍔′氦鐢便��${this.deptNames}銆戝鐞嗗悧?`, '鎻愮ず', {
+        confirmButtonText: '纭畾',
+        cancelButtonText: '鍙栨秷',
+        type: 'warning'
+      }).then(() => {
+        taskDelegation(this.delegationForm).then(res => {
+          this.$message.success("宸插彂璧疯浆鍔炵敵璇�")
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '宸插彇娑堣浆鍔炴搷浣�'
+        });
+      });
+    },
+    peopleTypeChange(val) {
+      if (val === 'DEPT') {
+        this.$nextTick(() => {
+          this.$refs.dept.setCheckList(this.delegationDeptSelect)
+        })
+        this.deptShow = true
+      }
+    },
+    editDept() {
+      this.$nextTick(() => {
+        this.$refs.dept.setCheckList(this.delegationDeptSelect)
+      })
+      this.deptShow = true
+    },
+    getDeptSelect(list, names) {
+      console.log(list, names)
+      if (list) {
+        this.delegationForm.targetId = list
+        this.delegationDeptSelect = list.split(",")
+        this.deptNames = names
+      }
+      this.deptShow = false
+    },
+    closeDept() {
+      console.log(this.deptNames)
+      this.deptShow = false
+    },
+    openDelegation(taskName) {
+      this.delegationForm.taskName = taskName
+      this.delegationForm.taskId = this.taskId
+      this.delegationShow = true
+    },
+    rejectTask() {
+      rejectTask(this.rejectForm).then(res => {
+        this.rejectShow = false
+        this.$message.success("椹冲洖鎴愬姛")
+      })
+    },
+    openRejectTask(rejectedTaskDefKey) {
+      // this.rejectForm.rejectedTaskDefKey = rejectedTaskDefKey;
+      this.rejectForm.taskId = this.taskId;
+      this.rejectShow = true
+    },
     handleClick(tab, event) {
       if (tab.name === '2'){
         flowXmlAndNode({deployId:this.deployId}).then(res => {
@@ -159,7 +306,10 @@
     goBack() {
       this.$router.push({
         path: '/projectFlow/detail',
-        query: this.goBackParams
+        query: {
+          projectId: this.goBackParams.projectId,
+          processDefId: this.goBackParams.processDefId
+        }
       })
     },
     /** 鐢宠娴佺▼琛ㄥ崟鏁版嵁鎻愪氦 */
@@ -280,6 +430,9 @@
 };
 </script>
 <style lang="scss" scoped>
+.opBut {
+  display: flex;justify-content: center;align-items: center;width: 100%; margin-top: 8px
+}
 .test-form {
   margin: 15px auto;
   width: 800px;

--
Gitblit v1.8.0