From ed66231d19ec5b0614b05c0ab8953e5d767dd9f1 Mon Sep 17 00:00:00 2001
From: dap <dap@qq.com>
Date: 星期三, 15 五月 2024 11:35:02 +0800
Subject: [PATCH] Merge branch 'dev' of https://gitee.com/JavaLionLi/plus-ui into dev
---
src/bpmn/panel/TaskPanel.vue | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/bpmn/panel/TaskPanel.vue b/src/bpmn/panel/TaskPanel.vue
index dee94eb..bc037ee 100644
--- a/src/bpmn/panel/TaskPanel.vue
+++ b/src/bpmn/panel/TaskPanel.vue
@@ -47,13 +47,13 @@
<el-switch v-model="formData.async" inline-prompt active-text="鏄�" inactive-text="鍚�" @change="syncChange" />
</el-form-item>
- <el-tabs tab-position="left" class="demo-tabs" @tab-click="taskTabClick">
+ <el-tabs tab-position="left" class="demo-tabs">
<el-tab-pane label="韬唤瀛樺偍">
<el-form-item label="鍒嗛厤浜哄憳">
- <el-input v-model="formData.fixedAssignee" @change="fixedAssigneeChange">
- <!-- <template #append>-->
- <!-- <el-button icon="Search" type="primary" @click="openSingleUserSelect" />-->
- <!-- </template>-->
+ <el-input v-model="formData.assignee" @blur="blurAssignee(formData.assignee)">
+ <template #append>
+ <el-button icon="Search" type="primary" @click="openSingleUserSelect" />
+ </template>
</el-input>
</el-form-item>
<el-form-item label="鍊欓�変汉鍛�">
@@ -68,16 +68,16 @@
</el-form-item>
</el-tab-pane>
- <el-tab-pane label="鍥哄畾鍊�">
+ <!-- <el-tab-pane label="鍥哄畾鍊�">
<el-form-item prop="auditUserType" label="鍒嗛厤绫诲瀷">
<el-select v-model="formData.allocationType">
<el-option v-for="item in AllocationTypeSelect" :key="item.id" :value="item.value" :label="item.label"> </el-option>
</el-select>
</el-form-item>
<el-form-item v-if="formData.allocationType === AllocationTypeEnum.USER" label="鍒嗛厤浜哄憳">
- <el-input v-model="formData.fixedAssignee" @change="fixedAssigneeChange">
+ <el-input v-model="formData.assignee">
<template #append>
- <!-- <el-button icon="Search" size="small" type="primary" @click="proxy.$modal.msgWarning('寮�鍙戜腑銆傘�傘�傘�傘�傘��')" /> -->
+ <el-button icon="Search" type="primary" @click="openSingleUserSelect" />
</template>
</el-input>
</el-form-item>
@@ -95,10 +95,10 @@
</div>
<el-form-item v-if="formData.allocationType === AllocationTypeEnum.SPECIFY && showConfig.specifyDesc" style="">
<el-radio-group v-model="formData.specifyDesc" class="ml-4">
- <el-radio v-for="item in SpecifyDesc" :key="item.id" :label="item.value" size="large">{{ item.label }}</el-radio>
+ <el-radio v-for="item in SpecifyDesc" :key="item.id" :value="item.value" size="large">{{ item.label }}</el-radio>
</el-radio-group>
</el-form-item>
- </el-tab-pane>
+ </el-tab-pane> -->
</el-tabs>
<el-form-item v-if="showConfig.dueDate" prop="dueDate" label="鍒版湡鏃堕棿">
@@ -286,6 +286,9 @@
userSelectRef.value.open();
};
const openSingleUserSelect = () => {
+ if (formData.value.assignee.includes('$')) {
+ formData.value.assignee = '';
+ }
singleUserSelectRef.value.open();
};
const openRoleSelect = () => {
@@ -294,7 +297,9 @@
const openDueDate = (e) => {
dueDateRef.value.openDialog();
};
-
+const blurAssignee = (assignee) => {
+ updateProperties({ 'flowable:assignee': assignee ? assignee : undefined });
+};
const singleUserSelectCallBack = (data: UserVO[]) => {
const user: UserVO = data.length !== 0 ? data[0] : undefined;
updateProperties({ 'flowable:assignee': user?.userId });
--
Gitblit v1.9.3