From 3aeb34bacf09ed7377fb90c7c322be47716d0bc0 Mon Sep 17 00:00:00 2001
From: "maxw@mesnac.com" <maxw0809##>
Date: Mon, 24 Feb 2025 16:13:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=EF=BC=8C=E4=BB=93=E5=82=A8?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B5=E9=9D=A2=E5=8A=9F=E8=83=BD=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/instockOrderCopy/index.vue      |   6 +-
 src/views/wms/inventoryCheck/index.vue        |   2 +-
 src/views/wms/moveOrder/index.vue             |   3 +-
 .../wms/wmsPurchaseOrderDetail/index.vue      |   4 +-
 .../workflow/processDefinition/index.vue      |   1 +
 src/views/workflow/processInfo/index.vue      | 151 ++++++++++++++++++
 src/views/workflow/task/allTaskWaiting.vue    |  25 ++-
 7 files changed, 184 insertions(+), 8 deletions(-)
 create mode 100644 src/views/workflow/processInfo/index.vue

diff --git a/src/views/wms/instockOrderCopy/index.vue b/src/views/wms/instockOrderCopy/index.vue
index 1a0db13..0be399b 100644
--- a/src/views/wms/instockOrderCopy/index.vue
+++ b/src/views/wms/instockOrderCopy/index.vue
@@ -318,7 +318,7 @@
     <el-dialog v-model="parentTableInfoVisible" title="修改父表格" width="40%">
       <el-form :model="parentTableInfoForm" label-width="120px">
         <el-form-item label="物料大类" prop="materialCategories">
-          <el-select v-model="parentTableInfoForm.materialCategories" placeholder="请选择物料大类">
+          <el-select v-model="parentTableInfoForm.materialCategories" placeholder="请选择物料大类" :disabled="true">
             <el-option
                 v-for="dict in material_mategories"
                 :key="dict.value"
@@ -341,7 +341,7 @@
           <el-input v-model="form.orderNo" placeholder="请输入订单编号" />
         </el-form-item> -->
         <el-form-item label="审核人" prop="auditBy">
-          <el-select v-model="parentTableInfoForm.auditBy" placeholder="请选择审核人">
+          <el-select v-model="parentTableInfoForm.auditBy" placeholder="请选择审核人" :disabled="true">
             <el-option
               v-for="item in userList"
               :key="item.userId"
@@ -351,7 +351,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="仓库ID" prop="warehouseId">
-          <el-select v-model="parentTableInfoForm.warehouseCode" placeholder="请选择所属仓库">
+          <el-select v-model="parentTableInfoForm.warehouseCode" placeholder="请选择所属仓库" :disabled="true">
             <el-option
               v-for="item in baseStoreList"
               :key="item.warehouseId"
diff --git a/src/views/wms/inventoryCheck/index.vue b/src/views/wms/inventoryCheck/index.vue
index 2d02cdd..0d497f3 100644
--- a/src/views/wms/inventoryCheck/index.vue
+++ b/src/views/wms/inventoryCheck/index.vue
@@ -171,7 +171,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="计划仓库ID" prop="planWarehouseId">
+        <el-form-item label="计划仓库" prop="planWarehouseId">
           <el-select v-model="form.planWarehouseId" placeholder="请选择所属仓库">
             <el-option
               v-for="item in baseStoreList"
diff --git a/src/views/wms/moveOrder/index.vue b/src/views/wms/moveOrder/index.vue
index 02a16b1..e783f6b 100644
--- a/src/views/wms/moveOrder/index.vue
+++ b/src/views/wms/moveOrder/index.vue
@@ -408,8 +408,9 @@ const getUserList = async () => {
 };
 const getMaterialList = async () => {
   const locationCode = form.value.planLocationCode;
+  const materialCategories = form.value.materialCategories;
   console.log(locationCode)
-  let res = await getMaterialInfoList({'locationCode':locationCode});
+  let res = await getMaterialInfoList({'locationCode':locationCode,'materialCategories':materialCategories});
   materialList.value = res.data;
   console.log(materialList.value)
 };
diff --git a/src/views/wms/wmsPurchaseOrderDetail/index.vue b/src/views/wms/wmsPurchaseOrderDetail/index.vue
index fa3849b..660cc7c 100644
--- a/src/views/wms/wmsPurchaseOrderDetail/index.vue
+++ b/src/views/wms/wmsPurchaseOrderDetail/index.vue
@@ -40,7 +40,7 @@
     <el-card shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
+          <!-- <el-col :span="1.5">
             <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['wms:wmsPurchaseOrderDetail:add']">新增</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -48,7 +48,7 @@
           </el-col>
           <el-col :span="1.5">
             <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['wms:wmsPurchaseOrderDetail:remove']">删除</el-button>
-          </el-col>
+          </el-col> -->
           <el-col :span="1.5">
             <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['wms:wmsPurchaseOrderDetail:export']">导出</el-button>
           </el-col>
diff --git a/src/views/workflow/processDefinition/index.vue b/src/views/workflow/processDefinition/index.vue
index 1dacb80..9b8bad5 100644
--- a/src/views/workflow/processDefinition/index.vue
+++ b/src/views/workflow/processDefinition/index.vue
@@ -404,6 +404,7 @@ type PreviewType = 'xml' | 'bpmn';
 const clickPreview = async (id: string, type: PreviewType) => {
   loading.value = true;
   const resp = await definitionXml(id);
+  console.log(resp)
   if (previewRef.value) {
     const xmlStr = resp.data.xmlStr;
     loading.value = false;
diff --git a/src/views/workflow/processInfo/index.vue b/src/views/workflow/processInfo/index.vue
new file mode 100644
index 0000000..b059a26
--- /dev/null
+++ b/src/views/workflow/processInfo/index.vue
@@ -0,0 +1,151 @@
+<template>
+    <div ref="bpmnContainer" class="bpmn-container"></div>
+  </template>
+  
+  <script lang="ts" setup name="processInfo">
+        import { definitionXml
+} from '@/api/workflow/processDefinition';
+import { getHistoryList } from '@/api/workflow/processInstance';
+import { ref, onMounted, watch } from 'vue';
+import BpmnViewer from 'bpmn-js/lib/Viewer'; // 引入 BpmnViewer
+import BpmnModeler from 'bpmn-js/lib/Modeler';
+    let diagramXML = null;
+    let bpmnViewer = null;
+    const bpmnContainer = ref(null);
+    // 定义 props
+const props = ref([]);
+const initializeBpmnViewer = async () => {
+  const resp = await definitionXml('ceshi:1:1888121144965664769');
+  diagramXML = resp.data.xmlStr;
+  bpmnViewer = new BpmnModeler({
+        container: bpmnContainer.value,
+        // 禁用编辑功能
+        additionalModules: [
+    // {
+    //   // 禁用工具栏
+    //   paletteProvider: ['value', null], // 将 paletteProvider 设置为 null
+    // },
+    // {
+    //   // 禁用右键菜单
+    //   contextPadProvider: ['value', null], // 将 contextPadProvider 设置为 null
+    // },
+    // {
+    //   // 禁用拖拽和连线
+    //   modeling: ['value', {}], // 禁用 modeling 模块的部分功能
+    // },
+  ],
+      });
+      const resp1 = await getHistoryList('1889223417401753602');
+    console.log(resp1.data)
+    props.value = resp1.data.historyList;
+       await bpmnViewer.importXML(diagramXML,null, (err) => {
+        if (err) {
+
+          console.error('Failed to render BPMN diagram', err);
+        } else {
+          console.log('BPMN diagram rendered successfully');
+          highlightApprovalNodes();
+        }
+      })
+    //   highlightApprovalNodes();
+    applyNodeStyles();
+  };
+//   获取流程各节点状态
+  const getNodeStatus = async () => {
+    
+    // console.log(props.value)
+  };
+
+    // 高亮审批节点
+const highlightApprovalNodes = () => {
+  const elementRegistry = bpmnViewer.get('elementRegistry');
+  const modeling = bpmnViewer.get('modeling');
+  // 假设审批节点的类型是 'bpmn:UserTask'
+  const approvalNodes = elementRegistry.filter((element) => element.type === 'bpmn:UserTask');
+  approvalNodes.forEach((node) => {
+    modeling.setColor(node, {
+      fill: '#f8f8f8', // 设置填充颜色
+      stroke: '#ff0000', // 设置边框颜色
+    });
+  });
+};
+
+// 根据节点状态设置样式
+const applyNodeStyles = () => {
+  const elementRegistry = bpmnViewer.get('elementRegistry');
+  const modeling = bpmnViewer.get('modeling');
+
+  // 遍历节点状态
+  console.log(modeling)
+  props.value.forEach((e) => {
+    console.log(e.taskDefinitionKey)
+    console.log(e.status)
+    const element = elementRegistry.get(e.taskDefinitionKey); 
+    console.log(element)  
+    if (element) {
+      let fill, stroke, color;
+      switch (e.status) {
+        case '已处理':
+          fill = '#d4f7d4'; // 完成状态：绿色背景
+          stroke = '#28a745'; // 绿色边框
+          break;
+        case 'in-progress':
+          fill = '#fff3cd'; // 进行中状态：黄色背景
+          stroke = '#ffc107'; // 黄色边框
+          break;
+        case '已驳回':
+          fill = '#f8d7da'; // 错误状态：红色背景
+          stroke = '#dc3545'; // 红色边框
+          break;
+        default:
+          fill = '#f8f9fa'; // 默认状态：灰色背景
+          stroke = '#6c757d'; // 灰色边框
+      }
+
+      // modeler模式设置节点样式
+      modeling.setColor(element, {
+        fill,
+        stroke,
+      });
+    }
+  });
+};
+// 监听 diagramXML 的变化，动态更新流程图
+watch(
+  () => diagramXML,
+  (newXML) => {
+    if (bpmnViewer) {
+      bpmnViewer.importXML(newXML, (err) => {
+        if (err) {
+          console.error('Failed to update BPMN diagram', err);
+        } else {
+          console.log('BPMN diagram updated successfully');
+          highlightApprovalNodes(); // 高亮审批节点
+        }
+      });
+    }
+  },
+);
+
+// 组件挂载时初始化 BpmnViewer
+onMounted(() => {
+  initializeBpmnViewer();
+  getNodeStatus();
+});
+
+// 组件卸载时销毁 BpmnViewer
+onUnmounted(() => {
+  if (bpmnViewer) {
+    bpmnViewer.destroy();
+  }
+});
+  </script>
+  
+  <style scoped>
+  .bpmn-container {
+    width: 100%;
+    height: 600px;
+    border: 1px solid #ccc;
+    pointer-events: none;
+  }
+  </style>
\ No newline at end of file
diff --git a/src/views/workflow/task/allTaskWaiting.vue b/src/views/workflow/task/allTaskWaiting.vue
index fe530b8..dad26ae 100644
--- a/src/views/workflow/task/allTaskWaiting.vue
+++ b/src/views/workflow/task/allTaskWaiting.vue
@@ -74,6 +74,7 @@
             <el-tag v-else type="success">已完成</el-tag>
           </template>
         </el-table-column>
+        <!-- <el-table-column v-if="tab === 'finish'" align="center" prop="businessStatusName" label="状态" width="160"></el-table-column> -->
         <el-table-column v-if="tab === 'waiting'" align="center" prop="createTime" label="创建时间" width="160"></el-table-column>
         <el-table-column v-if="tab === 'finish'" align="center" prop="startTime" label="创建时间" width="160"></el-table-column>
         <el-table-column label="操作" align="center" :width="tab === 'finish' ? '80' : '151'">
@@ -85,6 +86,12 @@
               <el-col v-if="tab === 'waiting'" :span="1.5">
                 <el-button link type="primary" size="small" icon="Document" @click="handleInstanceVariable(scope.row)">流程变量</el-button>
               </el-col>
+              <el-col v-if="tab === 'waiting'" :span="1.5">
+                <el-button link type="primary" size="small" icon="Document" @click="approvePass(scope.row)">审批</el-button>
+              </el-col>
+              <el-col v-if="tab === 'waiting'" :span="1.5">
+                <el-button link type="primary" size="small" icon="Document" @click="approveReject(scope.row)">驳回</el-button>
+              </el-col>
             </el-row>
             <el-row v-if="scope.row.multiInstance" :gutter="10" class="mb8">
               <el-col :span="1.5">
@@ -133,7 +140,7 @@
 </template>
 
 <script lang="ts" setup>
-import { getPageByAllTaskWait, getPageByAllTaskFinish, updateAssignee, getInstanceVariable } from '@/api/workflow/task';
+import { getPageByAllTaskWait, getPageByAllTaskFinish, updateAssignee, getInstanceVariable, completeTask, backProcess } from '@/api/workflow/task';
 import MultiInstanceUser from '@/components/Process/multiInstanceUser.vue';
 import UserSelect from '@/components/UserSelect';
 import { TaskQuery, TaskVO, VariableVo } from '@/api/workflow/task/types';
@@ -269,6 +276,22 @@ const handleInstanceVariable = async (row: TaskVO) => {
   variableList.value = data.data;
   variableLoading.value = false;
 };
+//审批通过
+const approvePass = async (row: TaskVO) => {
+  
+  row.taskId = row.id;
+  console.log(row)
+  let data = await completeTask(row);
+  
+};
+//审批拒绝
+const approveReject = async (row: TaskVO) => {
+  
+  row.taskId = row.id;
+  console.log(row)
+  let data = await backProcess(row);
+  
+};
 /** 查看按钮操作 */
 const handleView = (row) => {
   const routerJumpVo = reactive<RouterJumpVo>({