From 4b554204a7f8fdbe0e15b37991ef264fa04a0906 Mon Sep 17 00:00:00 2001
From: smallNorthLee <18210040298@163.com>
Date: Thu, 20 Mar 2025 22:50:58 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20oa=E4=B8=9A=E5=8A=A1=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E6=B7=BB=E5=8A=A0=E5=AE=A1=E6=89=B9=E4=BA=BA=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bpm/oa/leave/create.vue | 219 ++++++++++++++++++------------
 1 file changed, 132 insertions(+), 87 deletions(-)

diff --git a/src/views/bpm/oa/leave/create.vue b/src/views/bpm/oa/leave/create.vue
index 28a15af73..4160fb038 100644
--- a/src/views/bpm/oa/leave/create.vue
+++ b/src/views/bpm/oa/leave/create.vue
@@ -1,83 +1,69 @@
 <template>
-  <el-form
-    ref="formRef"
-    v-loading="formLoading"
-    :model="formData"
-    :rules="formRules"
-    label-width="80px"
-  >
-    <el-form-item label="请假类型" prop="type">
-      <el-select v-model="formData.type" clearable placeholder="请选择请假类型">
-        <el-option
-          v-for="dict in getIntDictOptions(DICT_TYPE.BPM_OA_LEAVE_TYPE)"
-          :key="dict.value"
-          :label="dict.label"
-          :value="dict.value"
-        />
-      </el-select>
-    </el-form-item>
-    <el-form-item label="开始时间" prop="startTime">
-      <el-date-picker
-        v-model="formData.startTime"
-        clearable
-        placeholder="请选择开始时间"
-        type="datetime"
-        value-format="x"
+  <el-row :gutter="20">
+    <el-col :span="16"
+      ><el-form
+        ref="formRef"
+        v-loading="formLoading"
+        :model="formData"
+        :rules="formRules"
+        label-width="80px"
+      >
+        <el-form-item label="请假类型" prop="type">
+          <el-select v-model="formData.type" clearable placeholder="请选择请假类型">
+            <el-option
+              v-for="dict in getIntDictOptions(DICT_TYPE.BPM_OA_LEAVE_TYPE)"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="开始时间" prop="startTime">
+          <el-date-picker
+            v-model="formData.startTime"
+            clearable
+            placeholder="请选择开始时间"
+            type="datetime"
+            value-format="x"
+          />
+        </el-form-item>
+        <el-form-item label="结束时间" prop="endTime">
+          <el-date-picker
+            v-model="formData.endTime"
+            clearable
+            placeholder="请选择结束时间"
+            type="datetime"
+            value-format="x"
+          />
+        </el-form-item>
+        <el-form-item label="原因" prop="reason">
+          <el-input v-model="formData.reason" placeholder="请输入请假原因" type="textarea" />
+        </el-form-item>
+        <el-form-item>
+          <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+        </el-form-item>
+      </el-form></el-col
+    >
+    <el-col :span="8"
+      ><!-- 流程时间线 -->
+      <ProcessInstanceTimeline
+        ref="timelineRef"
+        :activity-nodes="activityNodes"
+        :show-status-icon="false"
+        @select-user-confirm="selectUserConfirm"
       />
-    </el-form-item>
-    <el-form-item label="结束时间" prop="endTime">
-      <el-date-picker
-        v-model="formData.endTime"
-        clearable
-        placeholder="请选择结束时间"
-        type="datetime"
-        value-format="x"
-      />
-    </el-form-item>
-    <el-form-item label="原因" prop="reason">
-      <el-input v-model="formData.reason" placeholder="请输请假原因" type="textarea" />
-    </el-form-item>
-    <el-col v-if="startUserSelectTasks.length > 0">
-      <el-card class="mb-10px">
-        <template #header>指定审批人</template>
-        <el-form
-          :model="startUserSelectAssignees"
-          :rules="startUserSelectAssigneesFormRules"
-          ref="startUserSelectAssigneesFormRef"
-        >
-          <el-form-item
-            v-for="userTask in startUserSelectTasks"
-            :key="userTask.id"
-            :label="`任务【${userTask.name}】`"
-            :prop="userTask.id"
-          >
-            <el-select
-              v-model="startUserSelectAssignees[userTask.id]"
-              multiple
-              placeholder="请选择审批人"
-            >
-              <el-option
-                v-for="user in userList"
-                :key="user.id"
-                :label="user.nickname"
-                :value="user.id"
-              />
-            </el-select>
-          </el-form-item>
-        </el-form>
-      </el-card>
     </el-col>
-    <el-form-item>
-      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
-    </el-form-item>
-  </el-form>
+  </el-row>
 </template>
 <script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import * as LeaveApi from '@/api/bpm/leave'
 import { useTagsViewStore } from '@/store/modules/tagsView'
 import * as DefinitionApi from '@/api/bpm/definition'
-import * as UserApi from '@/api/system/user'
+import ProcessInstanceTimeline from '../../processInstance/detail/ProcessInstanceTimeline.vue'
+import * as ProcessInstanceApi from '@/api/bpm/processInstance'
+import { CandidateStrategy, NodeId } from '@/components/SimpleProcessDesignerV2/src/consts'
+import { ApprovalNodeInfo } from '@/api/bpm/processInstance'
 
 defineOptions({ name: 'BpmOALeaveCreate' })
 
@@ -104,9 +90,9 @@ const formRef = ref() // 表单 Ref
 const processDefineKey = 'oa_leave' // 流程定义 Key
 const startUserSelectTasks = ref([]) // 发起人需要选择审批人的用户任务列表
 const startUserSelectAssignees = ref({}) // 发起人选择审批人的数据
-const startUserSelectAssigneesFormRef = ref() // 发起人选择审批人的表单 Ref
-const startUserSelectAssigneesFormRules = ref({}) // 发起人选择审批人的表单 Rules
-const userList = ref<any[]>([]) // 用户列表
+const tempStartUserSelectAssignees = ref({}) // 历史发起人选择审批人的数据，用于每次表单变更时，临时保存
+const activityNodes = ref<ProcessInstanceApi.ApprovalNodeInfo[]>([]) // 审批节点信息
+const processDefinitionId = ref('')
 
 /** 提交表单 */
 const submitForm = async () => {
@@ -116,7 +102,14 @@ const submitForm = async () => {
   if (!valid) return
   // 校验指定审批人
   if (startUserSelectTasks.value?.length > 0) {
-    await startUserSelectAssigneesFormRef.value.validate()
+    for (const userTask of startUserSelectTasks.value) {
+      if (
+        Array.isArray(startUserSelectAssignees.value[userTask.id]) &&
+        startUserSelectAssignees.value[userTask.id].length === 0
+      ) {
+        return message.warning(`请选择${userTask.name}的审批人`)
+      }
+    }
   }
 
   // 提交请求
@@ -137,28 +130,80 @@ const submitForm = async () => {
   }
 }
 
+/** 预测流程节点会因为输入的参数值而产生新的预测结果值，所以需重新预测一次 */
+watch(
+  formData.value,
+  (newValue) => {
+    // if (newValue && Object.keys(newValue.value).length > 0) {
+    //   // 记录之前的节点审批人
+    //   tempStartUserSelectAssignees.value = startUserSelectAssignees.value
+    //   startUserSelectAssignees.value = {}
+    //   // 加载最新的审批详情
+    //   getApprovalDetail({
+    //     id: processDefinitionId,
+    //     processVariablesStr: JSON.stringify(newValue.value) // 解决 GET 无法传递对象的问题，后端 String 再转 JSON
+    //   })
+    // }
+  },
+  {
+    immediate: true
+  }
+)
+
+/** 获取审批详情 */
+const getApprovalDetail = async (row: any) => {
+  try {
+    const data = await ProcessInstanceApi.getApprovalDetail({
+      processDefinitionId: row.id,
+      activityId: NodeId.START_USER_NODE_ID
+    })
+
+    if (!data) {
+      message.error('查询不到审批详情信息！')
+      return
+    }
+    // 获取审批节点，显示 Timeline 的数据
+    activityNodes.value = data.activityNodes
+
+    // 获取发起人自选的任务
+    startUserSelectTasks.value = data.activityNodes?.filter(
+      (node: ApprovalNodeInfo) => CandidateStrategy.START_USER_SELECT === node.candidateStrategy
+    )
+    // 恢复之前的选择审批人
+    if (startUserSelectTasks.value?.length > 0) {
+      for (const node of startUserSelectTasks.value) {
+        if (
+          tempStartUserSelectAssignees.value[node.id] &&
+          tempStartUserSelectAssignees.value[node.id].length > 0
+        ) {
+          startUserSelectAssignees.value[node.id] = tempStartUserSelectAssignees.value[node.id]
+        } else {
+          startUserSelectAssignees.value[node.id] = []
+        }
+      }
+    }
+  } finally {
+  }
+}
+
+/** 选择发起人 */
+const selectUserConfirm = (id: string, userList: any[]) => {
+  startUserSelectAssignees.value[id] = userList?.map((item: any) => item.id)
+}
+
 /** 初始化 */
 onMounted(async () => {
   const processDefinitionDetail = await DefinitionApi.getProcessDefinition(
     undefined,
     processDefineKey
   )
+
   if (!processDefinitionDetail) {
     message.error('OA 请假的流程模型未配置，请检查！')
     return
   }
+  processDefinitionId.value = processDefinitionDetail.id
   startUserSelectTasks.value = processDefinitionDetail.startUserSelectTasks
-  // 设置指定审批人
-  if (startUserSelectTasks.value?.length > 0) {
-    // 设置校验规则
-    for (const userTask of startUserSelectTasks.value) {
-      startUserSelectAssignees.value[userTask.id] = []
-      startUserSelectAssigneesFormRules.value[userTask.id] = [
-        { required: true, message: '请选择审批人', trigger: 'blur' }
-      ]
-    }
-    // 加载用户列表
-    userList.value = await UserApi.getSimpleUserList()
-  }
+  getApprovalDetail({ id: processDefinitionId.value, processVariablesStr:  JSON.stringify(formData.value)  })
 })
 </script>
-- 
Gitee


From a5c533bff034ffd4e7b87ea9b33dcdb0ef6e4828 Mon Sep 17 00:00:00 2001
From: lizhixian <18210040298@163.com>
Date: Fri, 21 Mar 2025 10:24:16 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat=EF=BC=9A=20=E5=A2=9E=E5=8A=A0=E6=A1=88?=
 =?UTF-8?q?=E4=BE=8B=E6=B5=81=E7=A8=8B=EF=BC=8C=E4=B8=9A=E5=8A=A1=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E5=8F=91=E8=B5=B7=E6=97=B6=E9=80=89=E6=8B=A9=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bpm/oa/leave/create.vue | 175 +++++++++++++++++-------------
 1 file changed, 97 insertions(+), 78 deletions(-)

diff --git a/src/views/bpm/oa/leave/create.vue b/src/views/bpm/oa/leave/create.vue
index 4160fb038..b0d66f4a2 100644
--- a/src/views/bpm/oa/leave/create.vue
+++ b/src/views/bpm/oa/leave/create.vue
@@ -1,70 +1,75 @@
 <template>
-  <el-row :gutter="20">
-    <el-col :span="16"
-      ><el-form
-        ref="formRef"
-        v-loading="formLoading"
-        :model="formData"
-        :rules="formRules"
-        label-width="80px"
-      >
-        <el-form-item label="请假类型" prop="type">
-          <el-select v-model="formData.type" clearable placeholder="请选择请假类型">
-            <el-option
-              v-for="dict in getIntDictOptions(DICT_TYPE.BPM_OA_LEAVE_TYPE)"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
+  <ContentWrap :bodyStyle="{ padding: '10px 20px 0' }">
+    <el-row :gutter="20">
+      <el-col :span="16"
+        ><el-form
+          ref="formRef"
+          v-loading="formLoading"
+          :model="formData"
+          :rules="formRules"
+          label-width="80px"
+        >
+          <el-form-item label="请假类型" prop="type">
+            <el-select v-model="formData.type" clearable placeholder="请选择请假类型">
+              <el-option
+                v-for="dict in getIntDictOptions(DICT_TYPE.BPM_OA_LEAVE_TYPE)"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="开始时间" prop="startTime">
+            <el-date-picker
+              v-model="formData.startTime"
+              clearable
+              placeholder="请选择开始时间"
+              type="datetime"
+              value-format="x"
+            />
+          </el-form-item>
+          <el-form-item label="结束时间" prop="endTime">
+            <el-date-picker
+              v-model="formData.endTime"
+              clearable
+              placeholder="请选择结束时间"
+              type="datetime"
+              value-format="x"
             />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始时间" prop="startTime">
-          <el-date-picker
-            v-model="formData.startTime"
-            clearable
-            placeholder="请选择开始时间"
-            type="datetime"
-            value-format="x"
-          />
-        </el-form-item>
-        <el-form-item label="结束时间" prop="endTime">
-          <el-date-picker
-            v-model="formData.endTime"
-            clearable
-            placeholder="请选择结束时间"
-            type="datetime"
-            value-format="x"
-          />
-        </el-form-item>
-        <el-form-item label="原因" prop="reason">
-          <el-input v-model="formData.reason" placeholder="请输入请假原因" type="textarea" />
-        </el-form-item>
-        <el-form-item>
-          <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
-        </el-form-item>
-      </el-form></el-col
-    >
-    <el-col :span="8"
-      ><!-- 流程时间线 -->
-      <ProcessInstanceTimeline
-        ref="timelineRef"
-        :activity-nodes="activityNodes"
-        :show-status-icon="false"
-        @select-user-confirm="selectUserConfirm"
-      />
-    </el-col>
-  </el-row>
+          </el-form-item>
+          <el-form-item label="原因" prop="reason">
+            <el-input v-model="formData.reason" placeholder="请输入请假原因" type="textarea" />
+          </el-form-item>
+          <el-form-item>
+            <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+          </el-form-item>
+        </el-form></el-col
+      >
+      <!-- 新增    ====== begin ======== -->
+      <el-col :span="8"
+        ><!-- 流程时间线 -->
+        <ProcessInstanceTimeline
+          ref="timelineRef"
+          :activity-nodes="activityNodes"
+          :show-status-icon="false"
+          @select-user-confirm="selectUserConfirm"
+        />
+      </el-col>
+      <!-- 新增    ====== end ======== -->
+    </el-row>
+  </ContentWrap>
 </template>
 <script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import * as LeaveApi from '@/api/bpm/leave'
 import { useTagsViewStore } from '@/store/modules/tagsView'
 import * as DefinitionApi from '@/api/bpm/definition'
+//  新增    ====== begin ========
 import ProcessInstanceTimeline from '../../processInstance/detail/ProcessInstanceTimeline.vue'
 import * as ProcessInstanceApi from '@/api/bpm/processInstance'
 import { CandidateStrategy, NodeId } from '@/components/SimpleProcessDesignerV2/src/consts'
 import { ApprovalNodeInfo } from '@/api/bpm/processInstance'
-
+//  新增    ====== end ========
 defineOptions({ name: 'BpmOALeaveCreate' })
 
 const message = useMessage() // 消息弹窗
@@ -90,10 +95,11 @@ const formRef = ref() // 表单 Ref
 const processDefineKey = 'oa_leave' // 流程定义 Key
 const startUserSelectTasks = ref([]) // 发起人需要选择审批人的用户任务列表
 const startUserSelectAssignees = ref({}) // 发起人选择审批人的数据
+//  新增    ====== begin ========
 const tempStartUserSelectAssignees = ref({}) // 历史发起人选择审批人的数据，用于每次表单变更时，临时保存
 const activityNodes = ref<ProcessInstanceApi.ApprovalNodeInfo[]>([]) // 审批节点信息
 const processDefinitionId = ref('')
-
+//  新增    ====== end ========
 /** 提交表单 */
 const submitForm = async () => {
   // 校验表单
@@ -130,32 +136,14 @@ const submitForm = async () => {
   }
 }
 
-/** 预测流程节点会因为输入的参数值而产生新的预测结果值，所以需重新预测一次 */
-watch(
-  formData.value,
-  (newValue) => {
-    // if (newValue && Object.keys(newValue.value).length > 0) {
-    //   // 记录之前的节点审批人
-    //   tempStartUserSelectAssignees.value = startUserSelectAssignees.value
-    //   startUserSelectAssignees.value = {}
-    //   // 加载最新的审批详情
-    //   getApprovalDetail({
-    //     id: processDefinitionId,
-    //     processVariablesStr: JSON.stringify(newValue.value) // 解决 GET 无法传递对象的问题，后端 String 再转 JSON
-    //   })
-    // }
-  },
-  {
-    immediate: true
-  }
-)
-
+//  新增    ====== begin ========
 /** 获取审批详情 */
 const getApprovalDetail = async (row: any) => {
   try {
     const data = await ProcessInstanceApi.getApprovalDetail({
       processDefinitionId: row.id,
-      activityId: NodeId.START_USER_NODE_ID
+      activityId: NodeId.START_USER_NODE_ID,
+      processVariablesStr: row.processVariablesStr // 解决 GET 无法传递对象的问题，后端 String 再转 JSON
     })
 
     if (!data) {
@@ -190,6 +178,7 @@ const getApprovalDetail = async (row: any) => {
 const selectUserConfirm = (id: string, userList: any[]) => {
   startUserSelectAssignees.value[id] = userList?.map((item: any) => item.id)
 }
+//  新增    ====== end ========
 
 /** 初始化 */
 onMounted(async () => {
@@ -204,6 +193,36 @@ onMounted(async () => {
   }
   processDefinitionId.value = processDefinitionDetail.id
   startUserSelectTasks.value = processDefinitionDetail.startUserSelectTasks
-  getApprovalDetail({ id: processDefinitionId.value, processVariablesStr:  JSON.stringify(formData.value)  })
+  //  新增    ====== begin ========
+  // 查询流程预测节点
+  getApprovalDetail({
+    id: processDefinitionId.value,
+    processVariablesStr: JSON.stringify(formData.value)
+  })
+  //  新增    ====== end ========
 })
+//  新增    ====== begin ========
+/** 预测流程节点会因为输入的参数值而产生新的预测结果值，所以需重新预测一次 */
+watch(
+  formData.value,
+  (newValue, oldValue) => {
+    if (!oldValue) {
+      return
+    }
+    if (newValue && Object.keys(newValue).length > 0) {
+      // 记录之前的节点审批人
+      tempStartUserSelectAssignees.value = startUserSelectAssignees.value
+      startUserSelectAssignees.value = {}
+      // 加载最新的审批详情
+      getApprovalDetail({
+        id: processDefinitionId.value,
+        processVariablesStr: JSON.stringify(newValue) // 解决 GET 无法传递对象的问题，后端 String 再转 JSON
+      })
+    }
+  },
+  {
+    immediate: true
+  }
+  //  新增    ====== end ========
+)
 </script>
-- 
Gitee


From 913c995562ecbb826d0db2f0041b888d5795fa11 Mon Sep 17 00:00:00 2001
From: lizhixian <18210040298@163.com>
Date: Fri, 21 Mar 2025 11:48:13 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat=EF=BC=9A=E5=A2=9E=E5=8A=A0=E6=A1=88?=
 =?UTF-8?q?=E4=BE=8B=E6=B5=81=E7=A8=8B=EF=BC=8C=E4=B8=9A=E5=8A=A1=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E5=8F=91=E8=B5=B7=E6=97=B6=E9=80=89=E6=8B=A9=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bpm/oa/leave/create.vue | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/views/bpm/oa/leave/create.vue b/src/views/bpm/oa/leave/create.vue
index b0d66f4a2..2bd2aa741 100644
--- a/src/views/bpm/oa/leave/create.vue
+++ b/src/views/bpm/oa/leave/create.vue
@@ -138,12 +138,12 @@ const submitForm = async () => {
 
 //  新增    ====== begin ========
 /** 获取审批详情 */
-const getApprovalDetail = async (row: any) => {
+const getApprovalDetail = async () => {
   try {
     const data = await ProcessInstanceApi.getApprovalDetail({
-      processDefinitionId: row.id,
+      processDefinitionId: processDefinitionId.value,
       activityId: NodeId.START_USER_NODE_ID,
-      processVariablesStr: row.processVariablesStr // 解决 GET 无法传递对象的问题，后端 String 再转 JSON
+      processVariablesStr: JSON.stringify({ day: daysDifference() }) // 解决 GET 无法传递对象的问题，后端 String 再转 JSON
     })
 
     if (!data) {
@@ -178,6 +178,13 @@ const getApprovalDetail = async (row: any) => {
 const selectUserConfirm = (id: string, userList: any[]) => {
   startUserSelectAssignees.value[id] = userList?.map((item: any) => item.id)
 }
+
+// 计算天数差
+const daysDifference = () => {
+  const oneDay = 24 * 60 * 60 * 1000 // 一天的毫秒数
+  const diffTime = Math.abs(Number(formData.value.endTime) - Number(formData.value.startTime))
+  return Math.floor(diffTime / oneDay)
+}
 //  新增    ====== end ========
 
 /** 初始化 */
@@ -194,15 +201,12 @@ onMounted(async () => {
   processDefinitionId.value = processDefinitionDetail.id
   startUserSelectTasks.value = processDefinitionDetail.startUserSelectTasks
   //  新增    ====== begin ========
-  // 查询流程预测节点
-  getApprovalDetail({
-    id: processDefinitionId.value,
-    processVariablesStr: JSON.stringify(formData.value)
-  })
+  // 加载最新的审批详情,主要用于节点预测
+  getApprovalDetail()
   //  新增    ====== end ========
 })
 //  新增    ====== begin ========
-/** 预测流程节点会因为输入的参数值而产生新的预测结果值，所以需重新预测一次 */
+/** 预测流程节点会因为输入的参数值而产生新的预测结果值，所以需重新预测一次, formData.value可改成实际业务中的特定字段 */
 watch(
   formData.value,
   (newValue, oldValue) => {
@@ -213,11 +217,8 @@ watch(
       // 记录之前的节点审批人
       tempStartUserSelectAssignees.value = startUserSelectAssignees.value
       startUserSelectAssignees.value = {}
-      // 加载最新的审批详情
-      getApprovalDetail({
-        id: processDefinitionId.value,
-        processVariablesStr: JSON.stringify(newValue) // 解决 GET 无法传递对象的问题，后端 String 再转 JSON
-      })
+      // 加载最新的审批详情,主要用于节点预测
+      getApprovalDetail()
     }
   },
   {
-- 
Gitee