From ecb3896ed4e76701c2247520e456c2f8cb29e908 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期四, 26 十二月 2024 16:22:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/flowable/task/myProcess/send/index.vue | 126 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 118 insertions(+), 8 deletions(-)
diff --git a/src/views/flowable/task/myProcess/send/index.vue b/src/views/flowable/task/myProcess/send/index.vue
index bf6e5f4..8049573 100644
--- a/src/views/flowable/task/myProcess/send/index.vue
+++ b/src/views/flowable/task/myProcess/send/index.vue
@@ -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>
@@ -57,11 +57,49 @@
type="textarea"
:rows="3"
placeholder="瀹℃牳寤鸿"
- v-model="rejectForm.auditOpinion">
+ v-model="rejectForm.comment">
</el-input>
</div>
- <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>
@@ -71,12 +109,14 @@
<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/projectProcess/projectProcess";
+import {rejectTask} from "@/api/flowable/process";
+import {taskDelegation} from "@/api/projectProcess/projectProcess";
export default {
name: "Record",
@@ -84,11 +124,30 @@
BpmnViewer,
FlowUser,
FlowRole,
+ Dept,
},
props: {},
data() {
return {
- rejectShow: false,
+ 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: '',
@@ -117,9 +176,9 @@
multiInstanceVars: '', // 浼氱鑺傜偣
formJson: {}, // 琛ㄥ崟json
rejectForm: {
- auditOpinion: '', // 瀹℃牳鎰忚
+ comment: '', // 瀹℃牳鎰忚
taskId: '',
- rejectedTaskDefKey: '' // 琚┏鍥炵殑浠诲姟key
+ // rejectedTaskDefKey: '' // 琚┏鍥炵殑浠诲姟key
}
};
},
@@ -134,6 +193,54 @@
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
@@ -141,7 +248,7 @@
})
},
openRejectTask(rejectedTaskDefKey) {
- this.rejectForm.rejectedTaskDefKey = rejectedTaskDefKey;
+ // this.rejectForm.rejectedTaskDefKey = rejectedTaskDefKey;
this.rejectForm.taskId = this.taskId;
this.rejectShow = true
},
@@ -323,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