From 9202f8f737dc37a133a61f2cbb1e7b01dbb90310 Mon Sep 17 00:00:00 2001
From: xaol <3182401657@qq.com>
Date: Mon, 17 Feb 2025 15:29:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E7=BD=B2=E5=90=8E=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Home/Index.vue                      |   4 +-
 src/views/Home/homeimg/index.vue              |   4 +-
 src/views/bpm/model/form/ProcessDesign.vue    |  24 +-
 .../bpm/processInstance/detail/index1.vue     | 497 ------------------
 4 files changed, 16 insertions(+), 513 deletions(-)
 delete mode 100644 src/views/bpm/processInstance/detail/index1.vue

diff --git a/src/views/Home/Index.vue b/src/views/Home/Index.vue
index 73302d9..9fb571f 100644
--- a/src/views/Home/Index.vue
+++ b/src/views/Home/Index.vue
@@ -21,7 +21,7 @@
           <el-card shadow="never" style="margin-bottom: 5px;height: 280px">
             <el-carousel :interval="4000" height="240px" motion-blur @change="handleCarouselChange">
               <el-carousel-item v-for="item in filteredList"  :key="item.id">
-                <el-image  style="width: 100%; height: 100%" :src="imgUrl+item.newsImg" alt="无图片" :title="item.newsName"/>
+                <el-image  style="width: 100%; height: 100%" :src="item.newsImg" alt="无图片" :title="item.newsName"/>
               </el-carousel-item>
             </el-carousel>
           </el-card>
@@ -546,7 +546,7 @@ const queryParamsImg = reactive({
   userId: undefined,
   createTime: [],
 })
-const imgUrl = "//images.weserv.nl/?url="
+// const imgUrl = "//images.weserv.nl/?url="
 
 const TodoList = ref([]) // 列表的数据
 const queryParamsTodo = reactive({
diff --git a/src/views/Home/homeimg/index.vue b/src/views/Home/homeimg/index.vue
index 7edde98..a9b3ba3 100644
--- a/src/views/Home/homeimg/index.vue
+++ b/src/views/Home/homeimg/index.vue
@@ -148,7 +148,7 @@
       <el-table-column label="图片预览" align="center" prop="newsImg" >
         <template #default="scope">
           <el-image
-            :src="imgUrl+scope.row.newsImg"
+            :src="scope.row.newsImg"
             style="width: 60px;height: 20px"
             alt="无图片"/>
         </template>
@@ -208,7 +208,7 @@ defineOptions({ name: 'Homeimg' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
-const imgUrl = "//images.weserv.nl/?url="
+// const imgUrl = "//images.weserv.nl/?url="
 const loading = ref(true) // 列表的加载中
 const list = ref<imgVO[]>([]) // 列表的数据
 const total = ref(0) // 列表的总页数
diff --git a/src/views/bpm/model/form/ProcessDesign.vue b/src/views/bpm/model/form/ProcessDesign.vue
index c6d787b..26e5c0f 100644
--- a/src/views/bpm/model/form/ProcessDesign.vue
+++ b/src/views/bpm/model/form/ProcessDesign.vue
@@ -13,23 +13,23 @@
   </template>
 
   <!-- Simple设计器 -->
-  <template v-else>
-    <SimpleModelDesign
-      v-if="showDesigner"
-      :model-id="modelData.id"
-      :model-key="modelData.key"
-      :model-name="modelData.name"
-      :value="modelData.bpmnXml"
-      ref="simpleEditorRef"
-      @success="handleDesignSuccess"
-    />
-  </template>
+<!--  <template v-else>-->
+<!--    <SimpleModelDesign-->
+<!--      v-if="showDesigner"-->
+<!--      :model-id="modelData.id"-->
+<!--      :model-key="modelData.key"-->
+<!--      :model-name="modelData.name"-->
+<!--      :value="modelData.bpmnXml"-->
+<!--      ref="simpleEditorRef"-->
+<!--      @success="handleDesignSuccess"-->
+<!--    />-->
+<!--  </template>-->
 </template>
 
 <script lang="ts" setup>
 import { BpmModelType } from '@/utils/constants'
 import BpmModelEditor from '../editor/index.vue'
-import SimpleModelDesign from '../../simple/SimpleModelDesign.vue'
+// import SimpleModelDesign from '../../simple/SimpleModelDesign.vue'
 
 const props = defineProps({
   modelValue: {
diff --git a/src/views/bpm/processInstance/detail/index1.vue b/src/views/bpm/processInstance/detail/index1.vue
deleted file mode 100644
index 2279b93..0000000
--- a/src/views/bpm/processInstance/detail/index1.vue
+++ /dev/null
@@ -1,497 +0,0 @@
-<template>
-  <ContentWrap>
-    <el-tabs @tab-click="handleClick" type="card" style="margin-bottom: 20px">
-      <el-tab-pane label="申请信息">
-        <!-- 申请信息 -->
-        <el-card v-loading="processInstanceLoading" class="box-card">
-          <template #header>
-            <span class="el-icon-document">申请信息【{{ processInstance.name }}】</span>
-          </template>
-          <!-- 情况一：流程表单 -->
-          <el-col v-if="processInstance?.processDefinition?.formType === 10" :offset="6" :span="16">
-            <form-create
-              v-model="detailForm.value"
-              v-model:api="fApi"
-              :option="detailForm.option"
-              :rule="detailForm.rule"
-            />
-          </el-col>
-          <!-- 情况二：业务表单 -->
-          <div v-if="processInstance?.processDefinition?.formType === 20">
-            <BusinessFormComponent ref="businessForm" :id="processInstance.businessKey" />
-          </div>
-        </el-card>
-      </el-tab-pane>
-      <el-tab-pane label="流程图" name="flowChart">
-        <!-- 高亮流程图 -->
-        <ProcessInstanceBpmnViewerNoHeader
-          :id="`${id}`"
-          :bpmn-xml="bpmnXml"
-          :loading="processInstanceLoading"
-          :process-instance="processInstance"
-          :tasks="tasks"
-        />
-      </el-tab-pane>
-      <el-tab-pane label="审批记录">
-        <!-- 审批记录 -->
-        <ProcessInstanceTaskList
-          :loading="tasksLoad"
-          :process-instance="processInstance"
-          :tasks="tasks"
-          @refresh="getTaskList"
-        />
-      </el-tab-pane>
-      <el-tab-pane
-        v-for="(item, index) in runningTasks"
-        :key="index1"
-        label="审批内容"
-      >
-        <!-- 审批信息 -->
-        <el-card
-          :key="index1"
-          v-loading="processInstanceLoading"
-          class="box-card"
-        >
-          <template #header>
-            <span class="el-icon-picture-outline">审批任务【{{ item.name }}】</span>
-          </template>
-          <el-col :offset="6" :span="16">
-            <el-form
-              :ref="'form' + index1"
-              :model="auditForms[index1]"
-              :rules="auditRule"
-              label-width="100px"
-            >
-              <el-form-item v-if="processInstance && processInstance.name" label="流程名">
-                {{ processInstance.name }}
-              </el-form-item>
-              <el-form-item v-if="processInstance && processInstance.startUser" label="流程发起人">
-                {{ processInstance?.startUser.nickname }}
-                <el-tag size="small" type="info">{{ processInstance?.startUser.deptName }}</el-tag>
-              </el-form-item>
-              <el-card v-if="runningTasks[index1].formId > 0" class="mb-15px !-mt-10px">
-                <template #header>
-              <span class="el-icon-picture-outline">
-                填写表单【{{ runningTasks[index1]?.formName }}】
-              </span>
-                </template>
-                <form-create
-                  v-model="approveForms[index1].value"
-                  v-model:api="approveFormFApis[index1]"
-                  :option="approveForms[index1].option"
-                  :rule="approveForms[index1].rule"
-                />
-              </el-card>
-              <el-form-item label="审批建议" prop="reason">
-                <el-input
-                  v-model="auditForms[index1].reason"
-                  placeholder="请输入审批建议"
-                  type="textarea"
-                />
-              </el-form-item>
-              <el-form-item label="抄送人" prop="copyUserIds">
-                <el-row style="width: 100%;">
-                  <el-col :span="24">
-<!--                    <el-select v-model="auditForms[index].copyUserIds" multiple placeholder="请选择抄送人"-->
-<!--                               disabled>-->
-<!--                      <el-option-->
-<!--                        v-for="item in userOptions"-->
-<!--                        :key="item.id"-->
-<!--                        :label="item.nickname"-->
-<!--                        :value="item.id"-->
-<!--                        disabled-->
-<!--                      />-->
-<!--                    </el-select>-->
-                    <el-input
-                      v-model="selectedNames"
-                      placeholder="请选择抄送人"
-                      disabled
-                    >
-                      <template #suffix >
-                        <el-button @click="openForm(index1)" style="width: 50px" size="default" type="text">
-                          <el-icon style="margin-left: 45px" :size="20">
-                            <Edit />
-                          </el-icon>
-                        </el-button>
-                      </template>
-                    </el-input>
-                  </el-col>
-                </el-row>
-              </el-form-item>
-            </el-form>
-            <div style="margin-bottom: 20px; margin-left: 10%; font-size: 14px">
-              <el-button type="success" @click="handleAudit(item, true)">
-                <Icon icon="ep:select" />
-                通过
-              </el-button>
-              <el-button type="danger" @click="handleAudit(item, false)">
-                <Icon icon="ep:close" />
-                不通过
-              </el-button>
-              <el-button type="primary" @click="openTaskUpdateAssigneeForm(item.id)">
-                <Icon icon="ep:edit" />
-                转办
-              </el-button>
-              <el-button type="primary" @click="handleDelegate(item)">
-                <Icon icon="ep:position" />
-                委派
-              </el-button>
-              <el-button type="primary" @click="handleSign(item)">
-                <Icon icon="ep:plus" />
-                加签
-              </el-button>
-              <el-button type="warning" @click="handleBack(item)">
-                <Icon icon="ep:back" />
-                回退
-              </el-button>
-            </div>
-          </el-col>
-        </el-card>
-      </el-tab-pane>
-    </el-tabs>
-    <!-- 弹窗：转派审批人 -->
-    <TaskTransferForm ref="taskTransferFormRef" @success="getDetail" @back-view="backView" />
-    <!-- 弹窗：回退节点 -->
-    <TaskReturnForm ref="taskReturnFormRef" @success="getDetail" @back-view="backView" />
-    <!-- 弹窗：委派，将任务委派给别人处理，处理完成后，会重新回到原审批人手中-->
-    <TaskDelegateForm ref="taskDelegateForm" @success="getDetail" @back-view="backView" />
-    <!-- 弹窗：加签，当前任务审批人为A，向前加签选了一个C，则需要C先审批，然后再是A审批，向后加签B，A审批完，需要B再审批完，才算完成这个任务节点 -->
-    <TaskSignCreateForm ref="taskSignCreateFormRef" @success="getDetail" @back-view="backView" />
-    <!-- 弹窗: 更方便的选择用户单选或多选 -->
-    <UserSelector
-      ref="userSelectorForm"
-      v-model:single-user="singleUser"
-      v-model:multi-user="multiUser"
-      v-model:index="Index"
-      :single-select="sSelect"
-      @change="changeUserId"
-    />
-  </ContentWrap>
-</template>
-<script lang="ts" setup>
-import { useUserStore } from '@/store/modules/user'
-import { setConfAndFields2 } from '@/utils/formCreate'
-import type { ApiAttrs } from '@form-create/element-ui/types/config'
-import * as DefinitionApi from '@/api/bpm/definition'
-import * as ProcessInstanceApi from '@/api/bpm/processInstance'
-import * as TaskApi from '@/api/bpm/task'
-import ProcessInstanceBpmnViewerNoHeader from './ProcessInstanceBpmnViewerNoHeader1.vue'
-import ProcessInstanceTaskList from './ProcessInstanceTaskList1.vue'
-import TaskReturnForm from './dialog/TaskReturnForm.vue'
-import TaskDelegateForm from './dialog/TaskDelegateForm.vue'
-import TaskTransferForm from './dialog/TaskTransferForm.vue'
-import TaskSignCreateForm from './dialog/TaskSignCreateForm.vue'
-import { registerComponent } from '@/utils/routerHelper'
-import { isEmpty } from '@/utils/is'
-import * as UserApi from '@/api/system/user'
-import {TabsPaneContext} from "element-plus";
-import { FormProcessMappingApi} from '@/api/bpm/formprocessmapping'
-import {useTagsViewStore} from "@/store/modules/tagsView";
-import UserSelector from "@/components/UserSelector/UserSelector.vue";
-import { ProcessInstanceTodoApi, ProcessInstanceTodoVO } from '@/api/bpm/processinstancetodo'
-import {Edit} from "@element-plus/icons-vue";
-
-defineOptions({ name: 'BpmProcessInstanceDetail' })
-
-const { query } = useRoute() // 查询参数
-const message = useMessage() // 消息弹窗
-const { proxy } = getCurrentInstance() as any
-
-const { delView } = useTagsViewStore()//视图操作
-const { currentRoute, back } = useRouter()
-const userId = useUserStore().getUser.id // 当前登录的编号
-const id = query.id as unknown as string // 流程实例的编号
-const processInstanceLoading = ref(false) // 流程实例的加载中
-const processInstance = ref<any>({}) // 流程实例
-const bpmnXml = ref('') // BPMN XML
-const tasksLoad = ref(true) // 任务的加载中
-const tasks = ref<any[]>([]) // 任务列表
-// ========== 审批信息 ==========
-const runningTasks = ref<any[]>([]) // 运行中的任务
-const auditForms = ref<any[]>([]) // 审批任务的表单
-
-const sSelect = ref(false)//是否开启单选true单选false多选
-const Index = ref()//接受索引
-const singleUser = ref()//接受单选值
-const multiUser = ref([])//接受多选值
-
-/** 添加/修改操作 */
-const userSelectorForm = ref()
-const openForm = (index:any) => {
-  userSelectorForm.value.open(index1)
-}
-/** 数据变化后的处理 */
-const changeUserId = ()=>{
-  if (sSelect.value){
-    auditForms.value[Index.value].copyUserIds = [singleUser.value]
-  }else if (!sSelect.value){
-    auditForms.value[Index.value].copyUserIds = multiUser.value
-    //multiUser.value.map(user => user.id);
-  }
-}
-
-// 计算属性，返回选中的用户名称
-const selectedNames = computed(() => {
-  const selectedUsers = auditForms.value[0].copyUserIds.map((id) => {
-    const user = userOptions.value.find((item) => item.id === id);
-    return user ? user.nickname : '';
-  });
-  return selectedUsers.join(', '); // 用逗号连接名称
-});
-
-const handleClick = (tab: TabsPaneContext) => {
-  if (tab.props.name==="flowChart"){
-    getProcessInstance()
-  }
-}
-const auditRule = reactive({
-  reason: [{ required: true, message: '审批建议不能为空', trigger: 'blur' }]
-})
-const approveForms = ref<any[]>([]) // 审批通过时，额外的补充信息
-const approveFormFApis = ref<ApiAttrs[]>([]) // approveForms 的 fAPi
-
-// ========== 申请信息 ==========
-const fApi = ref<ApiAttrs>() //
-const detailForm = ref({
-  rule: [],
-  option: {},
-  value: {}
-}) // 流程实例的表单详情
-
-/** 监听 approveFormFApis，实现它对应的 form-create 初始化后，隐藏掉对应的表单提交按钮 */
-watch(
-  () => approveFormFApis.value,
-  (value) => {
-    value?.forEach((api) => {
-      api.btn.show(false)
-      api.resetBtn.show(false)
-    })
-  },
-  {
-    deep: true
-  }
-)
-const  businessForm = ref()
-/** 处理审批通过和不通过的操作 */
-const handleAudit = async (task, pass) => {
-  // 1.1 获得对应表单
-  const index = runningTasks.value.indexOf(task)
-  const auditFormRef = proxy.$refs['form' + index1][0]
-
-  // 1.2 校验表单
-  const elForm = unref(auditFormRef)
-  if (!elForm) return
-  const valid = await elForm.validate()
-  if (!valid) return
-
-  // 2.1 提交审批
-  const data = {
-    id: task.id,
-    reason: auditForms.value[index1].reason,
-    copyUserIds: auditForms.value[index1].copyUserIds
-  }
-
-  if (pass) {
-    // 审批通过，并且有额外的 approveForm 表单，需要校验 + 拼接到 data 表单里提交
-    const formCreateApi = approveFormFApis.value[index1]
-    if (formCreateApi) {
-      await formCreateApi.validate()
-      data.variables = approveForms.value[index1].value
-    }
-
-    if (businessForm.value && businessForm.value.updateForm) {
-       await businessForm.value.updateForm() // 调用异步组件的提交方法
-    }
-
-    await TaskApi.approveTask(data)
-    message.success('审批通过成功')
-  } else {
-    await TaskApi.rejectTask(data)
-    message.success('审批不通过成功')
-  }
-  // 2.2 加载最新数据
-  //getDetail()
-  delView(unref(currentRoute))
-  back()
-}
-//关闭当前标签回到上个标签
-const backView = ()=>{
-  delView(unref(currentRoute))
-  back()
-}
-
-/** 转派审批人 */
-const taskTransferFormRef = ref()
-const openTaskUpdateAssigneeForm = (id: string) => {
-  taskTransferFormRef.value.open(id)
-}
-
-/** 处理审批退回的操作 */
-const taskDelegateForm = ref()
-const handleDelegate = async (task) => {
-  taskDelegateForm.value.open(task.id)
-}
-
-/** 处理审批退回的操作 */
-const taskReturnFormRef = ref()
-const handleBack = async (task: any) => {
-  taskReturnFormRef.value.open(task.id)
-}
-
-/** 处理审批加签的操作 */
-const taskSignCreateFormRef = ref()
-const handleSign = async (task: any) => {
-  taskSignCreateFormRef.value.open(task.id)
-}
-
-/** 获得详情 */
-const getDetail = () => {
-  // 1. 获得流程实例相关
-  getProcessInstance()
-  // 2. 获得流程任务列表（审批记录）
-  getTaskList()
-}
-
-/** 加载流程实例 */
-const BusinessFormComponent = ref(null) // 异步组件
-const getProcessInstance = async () => {
-  try {
-    processInstanceLoading.value = true
-    //console.log(id,"getProcessInstance_id")
-    const data = await ProcessInstanceApi.getProcessInstance(id)
-    if (!data) {
-      message.error('查询不到流程信息！')
-      return
-    }
-    processInstance.value = data
-    //console.log(data,"processInstance_data")
-    // 设置表单信息
-    const processDefinition = data.processDefinition
-    //console.log(processDefinition.formType,"processDefinition.formType")
-    if (processDefinition.formType === 10) {
-      setConfAndFields2(
-        detailForm,
-        processDefinition.formConf,
-        processDefinition.formFields,
-        data.formVariables
-      )
-      nextTick().then(() => {
-        fApi.value?.btn.show(false)
-        fApi.value?.resetBtn.show(false)
-        fApi.value?.disabled(true)
-      })
-    } else {
-      // 注意：data.processDefinition.formCustomViewPath 是组件的全路径，例如说：/crm/contract/detail/index1.vue
-      //console.log(data.processDefinition.formCustomViewPath,"data.processDefinition.formCustomViewPath")
-      if ( data.processDefinition.formCustomViewPath == "" || data.processDefinition.formCustomViewPath == null) {
-        const process_key = data.processDefinition.key
-        const formCustomViewPath = await FormProcessMappingApi.getFormViewPath(process_key)
-        //console.log(formCustomViewPath.length,"formCustomViewPath.length")
-
-        if ( formCustomViewPath.length == 1) {
-           BusinessFormComponent.value = registerComponent(formCustomViewPath[0])
-        } else{
-          const formCreatePath = await ProcessInstanceTodoApi.getProcessInstanceFormCreatePath( id )
-          if ( formCreatePath ) {
-            const   formCustomViewPaht = await FormProcessMappingApi.getFormCustomViewPath( formCreatePath )
-            if ( formCustomViewPaht ) {
-              BusinessFormComponent.value = registerComponent(formCustomViewPaht)
-            }
-          }
-        }
-      } else {
-        BusinessFormComponent.value = registerComponent(data.processDefinition.formCustomViewPath)
-      }
-    }
-
-    // 加载流程图
-    bpmnXml.value = (
-      await DefinitionApi.getProcessDefinition(processDefinition.id as number)
-    )?.bpmnXml
-  } finally {
-    processInstanceLoading.value = false
-  }
-}
-
-/** 加载任务列表 */
-const getTaskList = async () => {
-  runningTasks.value = []
-  auditForms.value = []
-  approveForms.value = []
-  approveFormFApis.value = []
-  try {
-    // 获得未取消的任务
-    tasksLoad.value = true
-    const data = await TaskApi.getTaskListByProcessInstanceId(id)
-    tasks.value = []
-    // 1.1 移除已取消的审批
-    data.forEach((task) => {
-      if (task.status !== 4) {
-        tasks.value.push(task)
-      }
-    })
-    // 1.2 排序，将未完成的排在前面，已完成的排在后面；
-    tasks.value.sort((a, b) => {
-      // 有已完成的情况，按照完成时间倒序
-      if (a.endTime && b.endTime) {
-        return b.endTime - a.endTime
-      } else if (a.endTime) {
-        return 1
-      } else if (b.endTime) {
-        return -1
-        // 都是未完成，按照创建时间倒序
-      } else {
-        return b.createTime - a.createTime
-      }
-    })
-
-    // 获得需要自己审批的任务
-    loadRunningTask(tasks.value)
-  } finally {
-    tasksLoad.value = false
-  }
-}
-
-/**
- * 设置 runningTasks 中的任务
- */
-const loadRunningTask = (tasks) => {
-  tasks.forEach((task) => {
-    if (!isEmpty(task.children)) {
-      loadRunningTask(task.children)
-    }
-    // 2.1 只有待处理才需要
-    if (task.status !== 1 && task.status !== 6) {
-      return
-    }
-    // 2.2 自己不是处理人
-    if (!task.assigneeUser || task.assigneeUser.id !== userId) {
-      return
-    }
-    // 2.3 添加到处理任务
-    runningTasks.value.push({ ...task })
-    auditForms.value.push({
-      reason: '',
-      copyUserIds: []
-    })
-
-    // 2.4 处理 approve 表单
-    if (task.formId && task.formConf) {
-      const approveForm = {}
-      setConfAndFields2(approveForm, task.formConf, task.formFields, task.formVariables)
-      approveForms.value.push(approveForm)
-    } else {
-      approveForms.value.push({}) // 占位，避免为空
-    }
-  })
-  console.log(runningTasks,"runningTasks")
-}
-
-/** 初始化 */
-const userOptions = ref<UserApi.UserVO[]>([]) // 用户列表
-onMounted(async () => {
-    getDetail()
-  // 获得用户列表
-  userOptions.value = await UserApi.getSimpleUserList()
-})
-</script>