Merge remote-tracking branch 'origin/master'

src/api/dms/dmsBillsFaultInstance/index.ts

@@ -92,3 +92,39 @@ export function updateWfDefinitionIdById (repairInstanceId: string | number, wfD
     }
   });
 }
+
+/**
+ * 审批故障报修工单
+ * @param repairInstanceId 工单ID
+ * @param approveStatus 审批状态（2-审批成功，3-审批失败）
+ * @param message 审批意见
+ */
+export function approveWorkOrder(repairInstanceId: string | number, approveStatus: string, message?: string) {
+  return request({
+    url: '/dms/dmsBillsFaultInstance/approve',
+    method: 'post',
+    params: {
+      repairInstanceId,
+      approveStatus,
+      message
+    }
+  });
+}
+
+/**
+ * 主管确认维修结果
+ * @param repairInstanceId 工单ID
+ * @param confirmResult 确认结果（1-确认完成）
+ * @param confirmUser 确认人
+ */
+export function confirmRepairResult(repairInstanceId: string | number, confirmResult: string, confirmUser?: string) {
+  return request({
+    url: '/dms/dmsBillsFaultInstance/confirm',
+    method: 'post',
+    params: {
+      repairInstanceId,
+      confirmResult,
+      confirmUser
+    }
+  });
+}

src/api/workflow/task/types.ts

@@ -52,3 +52,17 @@ export interface TaskOperationBo {
   //意见或备注信息（可选）
   message?: string;
 }
+
+// 工作流任务完成参数
+export interface CompleteTaskBo {
+  //任务ID（必填）
+  taskId: string | number;
+  //处理意见
+  message?: string;
+  //工作流变量
+  variables?: Record<string, any>;
+  //跳转条件（互斥网关需要）
+  approveStatus?: string;
+  //业务实体数据
+  entity?: Record<string, any>;
+}

src/views/dms/dmsBillsFaultInstance/index.vue

@@ -66,9 +66,11 @@
                 <el-option v-for="dict in bills_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
               </el-select>
             </el-form-item>
-            <!--            <el-form-item label="审批状态" prop="approveStatus">
+            <el-form-item label="审批状态" prop="approveStatus">
-                          <el-input v-model="queryParams.approveStatus" placeholder="请输入审批状态" clearable @keyup.enter="handleQuery" />
+              <el-select v-model="queryParams.approveStatus" placeholder="请选择审批状态" clearable >
-                        </el-form-item>-->
+                <el-option v-for="dict in dms_approve_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
             <el-form-item label="确认状态" prop="repairConfirm">
               <el-select v-model="queryParams.repairConfirm" placeholder="请选择确认状态" clearable >
                 <el-option v-for="dict in repair_confirm" :key="dict.value" :label="dict.label" :value="dict.value"/>
@@ -153,7 +155,11 @@
             <dict-tag :options="bills_status" :value="scope.row.billsStatus"/>
           </template>
         </el-table-column>
-        <el-table-column label="审批状态" align="center" prop="approveStatus" v-if="columns[14].visible"/>
+        <el-table-column label="审批状态" align="center" prop="approveStatus" v-if="columns[14].visible">
+          <template #default="scope">
+            <dict-tag :options="dms_approve_status" :value="scope.row.approveStatus"/>
+          </template>
+        </el-table-column>
         <el-table-column label="确认状态" align="center" prop="repairConfirm" v-if="columns[15].visible">
           <template #default="scope">
             <dict-tag :options="repair_confirm" :value="scope.row.repairConfirm"/>
@@ -174,6 +180,16 @@
               </el-button>
             </el-tooltip>
 
+            <!-- 处理工单按钮：根据工单状态跳转到相应的处理页面 -->
+            <el-tooltip content="处理工单" placement="top" v-if="needProcessButton(scope.row)">
+              <el-button link type="primary" icon="Operation" @click="handleProcess(scope.row)"></el-button>
+            </el-tooltip>
+
+            <!-- 查看工单进度按钮 -->
+            <el-tooltip content="查看进度" placement="top" v-if="scope.row.wfDefinitionId">
+              <el-button link type="info" icon="View" @click="handleWorkflowProgress(scope.row)"></el-button>
+            </el-tooltip>
+            
             <el-tooltip content="修改" placement="top">
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['dms:dmsBillsFaultInstance:edit']"></el-button>
             </el-tooltip>
@@ -324,7 +340,7 @@
 </template>
 
 <script setup name="DmsBillsFaultInstance" lang="ts">
-import { listDmsBillsFaultInstance, getDmsBillsFaultInstance, delDmsBillsFaultInstance, addDmsBillsFaultInstance, updateDmsBillsFaultInstance, updateWfDefinitionIdById } from '@/api/dms/dmsBillsFaultInstance';
+import { listDmsBillsFaultInstance, getDmsBillsFaultInstance, delDmsBillsFaultInstance, addDmsBillsFaultInstance, updateDmsBillsFaultInstance, updateWfDefinitionIdById, approveWorkOrder, confirmRepairResult } from '@/api/dms/dmsBillsFaultInstance';
 import { DmsBillsFaultInstanceVO, DmsBillsFaultInstanceQuery, DmsBillsFaultInstanceForm } from '@/api/dms/dmsBillsFaultInstance/types';
 import {getDmsBaseMachineInfoList} from "@/api/dms/dmsBaseMachineInfo";
 import { useRouter } from 'vue-router';
@@ -332,7 +348,7 @@ import { startWorkFlow } from '@/api/workflow/task'
 import SubmitVerify from '@/components/Process/submitVerify.vue'
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { repair_confirm, active_flag, fault_source_type, bills_status, instance_type } = toRefs<any>(proxy?.useDict('repair_confirm', 'active_flag', 'fault_source_type', 'bills_status', 'instance_type'));
+const { repair_confirm, active_flag, fault_source_type, bills_status, instance_type, dms_approve_status } = toRefs<any>(proxy?.useDict('repair_confirm', 'active_flag', 'fault_source_type', 'bills_status', 'instance_type', 'dms_approve_status'));
 
 const dmsBillsFaultInstanceList = ref<DmsBillsFaultInstanceVO[]>([]);
 const buttonLoading = ref(false);
@@ -658,12 +674,48 @@ const submitCallback = async () => {
     // 工作流节点处理完成，刷新列表
     await getList();
     proxy?.$modal.msgSuccess('工单创建节点处理完成，工作流已流转到下一步');
-  } catch (error) {
+  } catch (error: any) {
     console.error('刷新列表失败:', error);
     proxy?.$modal.msgError('刷新列表失败');
   }
 };
 
+// 判断是否需要显示处理按钮
+const needProcessButton = (row: DmsBillsFaultInstanceVO) => {
+  // 需要审批：审批状态为待审批(1)
+  if (row.approveStatus === '1') {
+    return true;
+  }
+  // 需要确认：工单状态为维修完成(2)且确认状态为待确认(0)且审批状态为审批成功(2)
+  if (row.billsStatus === '2' && row.repairConfirm === '0' && row.approveStatus === '2') {
+    return true;
+  }
+  return false;
+};
+
+// 处理工单：跳转到dmsFaultInstanceActivity页面
+const handleProcess = (row: DmsBillsFaultInstanceVO) => {
+  let processType = '';
+  
+  // 判断处理类型
+  if (row.approveStatus === '1') {
+    processType = 'approval'; // 审批
+  } else if (row.billsStatus === '2' && row.repairConfirm === '0' && row.approveStatus === '2') {
+    processType = 'confirm'; // 确认
+  }
+  
+  if (processType) {
+    router.push({
+      path: '/dms/dmsFaultInstanceActivity',
+      query: {
+        type: processType,
+        id: row.repairInstanceId,
+        taskId: row.wfDefinitionId
+      }
+    });
+  }
+};
+
 onMounted(() => {
   getDeviceList();
   getList();

src/views/dms/dmsFaultInstanceActivity/index.vue

@@ -25,6 +25,13 @@
             @click="approvalVerifyOpen">
             {{ currentStepName }}
           </el-button>
+          <el-button 
+            v-if="confirmButtonShow" 
+            :loading="buttonLoading" 
+            type="success" 
+            @click="handleConfirm">
+            主管确认
+          </el-button>
           <el-button 
             v-if="workOrder?.wfDefinitionId" 
             type="primary" 
@@ -107,7 +114,10 @@
             </el-col>
             <el-col :span="8">
         <el-form-item label="维修类型" prop="repairType">
-          <el-select v-model="form.repairType" placeholder="请选择维修类型">
+          <el-select 
+            v-model="form.repairType" 
+            placeholder="请选择维修类型"
+            @change="updateOutsourcingValidation">
             <el-option
                 v-for="dict in fault_repair_type"
                 :key="dict.value"
@@ -224,6 +234,21 @@
             </el-col>
           </template>
           
+                    <!-- 审批状态选择：仅在审批阶段显示 -->
+          <el-col :span="8" v-if="isApprovalStage">
+            <el-form-item label="审批状态" prop="approveStatus">
+              <el-select v-model="form.approveStatus" placeholder="请选择审批状态">
+                <el-option
+                  v-for="dict in dms_approve_status"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                  :disabled="dict.value === '1'">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
           <!-- 处理意见：除第一步外都需要 -->
           <el-col :span="24" v-if="needProcessResolution">
             <el-form-item label="处理意见" prop="processHandleResolution">
@@ -252,17 +277,18 @@
 
 <script setup name="FaultWorkOrderProcess" lang="ts">
 // 导入相关模块
-import { ref, reactive, computed, onMounted, getCurrentInstance, toRefs } from 'vue';
+import { ref, reactive, computed, onMounted, getCurrentInstance, toRefs, watch } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
-import { getDmsBillsFaultInstance } from '@/api/dms/dmsBillsFaultInstance';
+import { getDmsBillsFaultInstance, approveWorkOrder, confirmRepairResult } from '@/api/dms/dmsBillsFaultInstance';
 import { addDmsFaultInstanceActivity } from '@/api/dms/dmsFaultInstanceActivity';
 import { pageByTaskWait } from '@/api/workflow/task';
 import { getCurrentDateTime } from '@/utils/dateUtils';
+import { getDmsBaseOutsourcingInfoList } from '@/api/dms/dmsBaseOutsourcingInfo';
 import SubmitVerify from '@/components/Process/submitVerify.vue';
 import ApprovalRecord from '@/components/Process/approvalRecord.vue';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { fault_repair_type, activity_fault_type, fault_repair_confirm } = toRefs<any>(proxy?.useDict('fault_repair_type', 'activity_fault_type', 'fault_repair_confirm'));
+const { fault_repair_type, activity_fault_type, fault_repair_confirm, dms_approve_status } = toRefs<any>(proxy?.useDict('fault_repair_type', 'activity_fault_type', 'fault_repair_confirm', 'dms_approve_status'));
 const route = useRoute();
 const router = useRouter();
 
@@ -272,6 +298,7 @@ const buttonLoading = ref(false);
 const routeParams = ref<Record<string, any>>({});
 const workOrder = ref<any>({});
 const workOrderStatusText = ref('');
+const outsourceList = ref<any[]>([]);
 
 // 表单相关
 const processFormRef = ref<ElFormInstance>();
@@ -298,7 +325,8 @@ const initFormData = {
   repairConfirm: undefined,
   componentsPartsId: undefined,
   processHandleResolution: undefined,
-  processStepOrder: undefined
+  processStepOrder: undefined,
+  approveStatus: undefined
 };
 
 const form = reactive({ ...initFormData });
@@ -308,12 +336,14 @@ const rules = reactive({
   faultType: [{ required: true, message: '故障类型不能为空', trigger: 'change' }],
   faultDescription: [{ required: true, message: '故障描述不能为空', trigger: 'blur' }],
   repairType: [{ required: true, message: '维修类型不能为空', trigger: 'change' }],
+  outsourcingId: [{ required: false, message: '外协单位不能为空', trigger: 'change' }],
   repairer: [{ required: false, message: '维修人不能为空', trigger: 'blur' }],
   checkedFault: [{ required: false, message: '检查后的故障判断不能为空', trigger: 'blur' }],
   protectedMethod: [{ required: false, message: '维修措施不能为空', trigger: 'blur' }],
   repairContent: [{ required: false, message: '维修内容不能为空', trigger: 'blur' }],
   repairConfirm: [{ required: false, message: '维修结果不能为空', trigger: 'change' }],
-  processHandleResolution: [{ required: false, message: '处理意见不能为空', trigger: 'blur' }]
+  processHandleResolution: [{ required: false, message: '处理意见不能为空', trigger: 'blur' }],
+  approveStatus: [{ required: false, message: '审批状态不能为空', trigger: 'change' }]
 });
 
 // 计算属性
@@ -341,6 +371,22 @@ const approvalButtonShow = computed(() => {
   return routeParams.value.type === 'approval' && currentTask.value;
 });
 
+const confirmButtonShow = computed(() => {
+  // 显示确认按钮的条件：
+  // 1. 页面类型是confirm
+  // 2. 或者工单状态为维修完成(2)且确认状态为待确认(0)
+  // 3. 且审批状态为审批成功(2) - 只有审批通过的工单才能进行确认
+  return routeParams.value.type === 'confirm' ||
+         (workOrder.value.billsStatus === '2' &&
+          workOrder.value.repairConfirm === '0' &&
+          workOrder.value.approveStatus === '2');
+});
+
+// 是否为审批阶段
+const isApprovalStage = computed(() => {
+  return routeParams.value.type === 'approval' && workOrder.value.approveStatus === '1';
+});
+
 // 提交按钮显示控制逻辑
 const submitButtonShow = computed(() => {
   return (
@@ -360,6 +406,9 @@ onMounted(async () => {
     // 获取工单信息
     await loadWorkOrderInfo();
 
+    // 获取外协单位列表
+    await getOutsourceList();
+
     // 获取当前任务信息
     if (routeParams.value.type === 'approval') {
       await loadCurrentTask();
@@ -368,6 +417,14 @@ onMounted(async () => {
       // 初始化表单数据
   initializeFormData();
 
+  // 设置审批阶段的表单验证规则
+  if (routeParams.value.type === 'approval' && workOrder.value.approveStatus === '1') {
+    rules.approveStatus = [{ required: true, message: '审批状态不能为空', trigger: 'change' }];
+  }
+
+  // 设置外协单位验证规则
+  updateOutsourcingValidation();
+
   } catch (error) {
     console.error('初始化失败:', error);
     proxy?.$modal.msgError('加载数据失败');
@@ -376,6 +433,15 @@ onMounted(async () => {
   }
 });
 
+// 监听维修类型变化，动态更新外协单位验证规则
+watch(() => form.repairType, (newValue) => {
+  updateOutsourcingValidation();
+  // 如果从外协类型改为其他类型，清空外协单位选择
+  if (newValue !== '2') {
+    form.outsourcingId = undefined;
+  }
+});
+
 // 加载工单信息
 const loadWorkOrderInfo = async () => {
   // 从query参数获取businessId
@@ -539,8 +605,15 @@ const approvalVerifyOpen = async () => {
   try {
     const valid = await processFormRef.value.validate();
     if (valid) {
-      // 准备任务变量
+      // 检查审批状态
+      if (routeParams.value.type === 'approval' && !form.approveStatus) {
+        proxy?.$modal.msgError('请选择审批状态');
+        return;
+      }
+      
+      // 准备工作流变量 - 确保变量结构符合SubmitVerify和Warm-Flow要求
       taskVariables.value = {
+        // 业务实体数据
         entity: {
           repairInstanceId: form.repairInstanceId,
           faultType: form.faultType,
@@ -559,6 +632,23 @@ const approvalVerifyOpen = async () => {
         }
       };
       
+      // 如果是审批阶段，设置跳转条件变量
+      if (routeParams.value.type === 'approval' && form.approveStatus) {
+        // 直接在taskVariables根级别设置approveStatus - 这是SubmitVerify期望的格式
+        taskVariables.value.approveStatus = form.approveStatus;
+        console.log('设置审批状态变量:', form.approveStatus);
+      }
+      
+      // 如果是确认阶段，设置确认结果变量
+      if (routeParams.value.type === 'confirm' && form.repairConfirm) {
+        // 确认通过传0，确认不通过传1
+        const repairConfirmValue = form.repairConfirm === '1' ? '0' : '1';
+        taskVariables.value.repairConfirm = repairConfirmValue;
+        console.log('设置确认结果变量:', repairConfirmValue);
+      }
+      
+      console.log('完整的工作流变量:', taskVariables.value);
+      
       // 直接使用传入的taskId进行审批
       submitVerifyRef.value?.openDialog(routeParams.value.taskId);
     }
@@ -568,8 +658,23 @@ const approvalVerifyOpen = async () => {
 };
 
 // 提交回调
-const submitCallback = async () => {
+const submitCallback = async (approvalResult?: any) => {
   try {
+    // 如果是审批类型，调用审批接口
+    if (routeParams.value.type === 'approval') {
+      // 使用用户选择的审批状态
+      const approveStatus = form.approveStatus; // 直接使用表单中选择的审批状态
+      const message = approvalResult?.message || form.processHandleResolution || '';
+      
+      await approveWorkOrder(form.repairInstanceId, approveStatus, message);
+      const statusText = approveStatus === '2' ? '通过' : '拒绝';
+      proxy?.$modal.msgSuccess(`审批${statusText}成功`);
+    } else if (routeParams.value.type === 'confirm') {
+      // 主管确认逻辑
+      const confirmResult = form.repairConfirm || '1';  // 默认确认通过
+      await confirmRepairResult(form.repairInstanceId, confirmResult);
+      proxy?.$modal.msgSuccess('确认完成');
+    } else {
     // 保存工单实例活动记录
     await addDmsFaultInstanceActivity({
       repairInstanceId: form.repairInstanceId,
@@ -590,12 +695,29 @@ const submitCallback = async () => {
     });
     
     proxy?.$modal.msgSuccess(`${currentStepName.value}完成`);
+    }
     
     // 关闭页面返回
     goBack();
-  } catch (error) {
+      } catch (error: any) {
-    console.error('保存业务数据失败:', error);
+      console.error('操作失败:', error);
-    proxy?.$modal.msgError('保存业务数据失败');
+      proxy?.$modal.msgError('操作失败：' + (error.message || '未知错误'));
+    }
+};
+
+// 主管确认处理
+const handleConfirm = async () => {
+  try {
+    // 设置确认结果
+    form.repairConfirm = '1'; // 1表示确认通过
+    
+    // 调用审批处理方法（实际上是工作流处理）
+    await approvalVerifyOpen();
+  } catch (error: any) {
+    if (error !== 'cancel' && error !== 'close') {
+      console.error('确认失败:', error);
+      proxy?.$modal.msgError('确认失败：' + (error.message || '未知错误'));
+    }
   }
 };
 
@@ -610,6 +732,27 @@ const goBack = () => {
   router.go(-1);
 };
 
+// 获取外协单位列表
+const getOutsourceList = async () => {
+  try {
+    const res = await getDmsBaseOutsourcingInfoList(null);
+    outsourceList.value = res.data;
+  } catch (error) {
+    console.error('获取外协单位列表失败:', error);
+  }
+};
+
+// 更新外协单位验证规则
+const updateOutsourcingValidation = () => {
+  if (form.repairType === '2') {
+    // 维修类型为外协时，外协单位为必填
+    rules.outsourcingId = [{ required: true, message: '外协单位不能为空', trigger: 'change' }];
+  } else {
+    // 其他情况下，外协单位不是必填
+    rules.outsourcingId = [{ required: false, message: '外协单位不能为空', trigger: 'change' }];
+  }
+};
+
 // 工具函数
 const getStatusText = (status: string) => {
   const statusMap = {