feat(mes): 新增生产相关报表接口与页面功能

- wipTrackingReport在制品跟踪报表
- reportWorkHour报工工时数据表
- reportTeamWork报工数据表

src/api/mes/prodReport/index.ts

@@ -3,8 +3,6 @@ import { AxiosPromise } from 'axios';
 
 /**
  * 生产计划完成率报表
- * @param query
- * @returns {*}
  */
 export const listPlanCompletionRateReport = (query): AxiosPromise<[]> => {
   return request({
@@ -16,8 +14,6 @@ export const listPlanCompletionRateReport = (query): AxiosPromise<[]> => {
 
 /**
  * 生产计划完成率对比报表
- * @param query
- * @returns {*}
  */
 export const listPlanCompletionContrastReport = (query): AxiosPromise<[]> => {
   return request({
@@ -26,3 +22,113 @@ export const listPlanCompletionContrastReport = (query): AxiosPromise<[]> => {
     params: query
   });
 };
+
+// 大屏设计-生产计划完成率
+export const designPlanCompletionRate = (query): AxiosPromise<[]> => {
+  return request({
+    url: '/mes/prodReport/designPlanCompletionRate',
+    method: 'get',
+    params: query
+  });
+};
+
+// 大屏设计-日产量信息
+export const designDailyOutputInformation = (query): AxiosPromise<[]> => {
+  return request({
+    url: '/mes/prodReport/designDailyOutputInformation',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 报工工时数据报表（分页）
+ */
+export const listWorkHourReport = (query): AxiosPromise<[]> => {
+  return request({
+    url: '/mes/prodReport/workHourReport',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 报工工时数据报表（导出）
+ */
+export const exportWorkHourReport = (query) => {
+  return request({
+    url: '/mes/prodReport/workHourReport/export',
+    method: 'post',
+    params: query,
+    responseType: 'blob'
+  });
+};
+
+/**
+ * 班组作业情况报表（分页）
+ */
+export const listTeamWorkReport = (query): AxiosPromise<[]> => {
+  return request({
+    url: '/mes/prodReport/teamWorkReport',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 班组作业情况报表（导出）
+ */
+export const exportTeamWorkReport = (query) => {
+  return request({
+    url: '/mes/prodReport/teamWorkReport/export',
+    method: 'post',
+    params: query,
+    responseType: 'blob'
+  });
+};
+
+/**
+ * 在制品跟踪报表（分页）
+ */
+export const listWipTrackingReport = (query): AxiosPromise<[]> => {
+  return request({
+    url: '/mes/prodReport/wipTrackingReport',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 在制品跟踪报表（导出）
+ */
+export const exportWipTrackingReport = (query) => {
+  return request({
+    url: '/mes/prodReport/wipTrackingReport/export',
+    method: 'post',
+    params: query,
+    responseType: 'blob'
+  });
+};
+
+/**
+ * 设备产量统计报表
+ */
+export const yieldSummaryByMachine = (query): AxiosPromise<[]> => {
+  return request({
+    url: '/mes/prodReport/yieldSummaryByMachine',
+    method: 'get',
+    params: query
+  });
+};
+
+
+/**
+ * 设备产量统计报表
+ */
+export const yieldTrendByDate = (query): AxiosPromise<[]> => {
+  return request({
+    url: '/mes/prodReport/yieldTrendByDate',
+    method: 'get',
+    params: query
+  });
+};

src/api/mes/wipTrackingReport/index.ts

@@ -0,0 +1,26 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { WipTrackingReportVO, WipTrackingReportQuery } from './types';
+
+/**
+ * 在制品跟踪报表（分页）
+ */
+export const listWipTrackingReport = (query: WipTrackingReportQuery): AxiosPromise<WipTrackingReportVO[]> => {
+  return request({
+    url: '/mes/prodReport/wipTrackingReport',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 在制品跟踪报表（导出）
+ */
+export const exportWipTrackingReport = (query: WipTrackingReportQuery) => {
+  return request({
+    url: '/mes/prodReport/wipTrackingReport/export',
+    method: 'post',
+    params: query,
+    responseType: 'blob'
+  });
+};

src/api/mes/wipTrackingReport/types.ts

@@ -0,0 +1,175 @@
+export interface ProcessProgressVO {
+  /**
+   * 工序ID
+   */
+  processId?: number;
+
+  /**
+   * 工序名称
+   */
+  processName?: string;
+
+  /**
+   * 工序顺序
+   */
+  processOrder?: number;
+
+  /**
+   * 工序状态
+   */
+  planStatus?: string;
+
+  /**
+   * 工序状态描述
+   */
+  statusDesc?: string;
+
+  /**
+   * 是否已完成
+   */
+  isCompleted?: boolean;
+}
+
+export interface WipTrackingReportVO {
+  /**
+   * 产品订单ID
+   */
+  productOrderId?: number;
+
+  /**
+   * 生产订单号
+   */
+  orderCode?: string;
+
+  /**
+   * 物料编号
+   */
+  materialCode?: string;
+
+  /**
+   * 物料名称
+   */
+  materialName?: string;
+
+  /**
+   * 规格型号
+   */
+  materialSpec?: string;
+
+  /**
+   * 计划总数量
+   */
+  planAmount?: number;
+
+  /**
+   * 在制数量
+   */
+  wipAmount?: number;
+
+  /**
+   * 已完成数量
+   */
+  completeAmount?: number;
+
+  /**
+   * 计划开工时间
+   */
+  planBeginTime?: string;
+
+  /**
+   * 实际开工时间
+   */
+  realBeginTime?: string;
+
+  /**
+   * 计划完工时间
+   */
+  planEndTime?: string;
+
+  /**
+   * 当前时间
+   */
+  currentTime?: string;
+
+  /**
+   * 总工序数
+   */
+  totalProcessCount?: string;
+
+  /**
+   * 在制工序
+   */
+  wipProcesses?: string;
+
+  /**
+   * 剩余工序
+   */
+  remainingProcesses?: string;
+
+  /**
+   * 整体进度（%）
+   */
+  overallProgress?: string;
+
+  /**
+   * 进度状态
+   */
+  progressStatus?: string;
+
+  /**
+   * 总工序数（数值）
+   */
+  totalProcessCountNum?: number;
+
+  /**
+   * 在制工序加权和
+   */
+  wipWeightedSum?: number;
+
+  /**
+   * 整体进度（数值）
+   */
+  overallProgressNum?: number;
+
+  /**
+   * 工序进度列表
+   */
+  processProgressList?: ProcessProgressVO[];
+}
+
+export interface WipTrackingReportQuery extends PageQuery {
+  /**
+   * 开始日期
+   */
+  beginDate?: string;
+
+  /**
+   * 结束日期
+   */
+  endDate?: string;
+
+  /**
+   * 生产订单号
+   */
+  orderCode?: string;
+
+  /**
+   * 物料名称
+   */
+  materialName?: string;
+
+  /**
+   * 物料编号
+   */
+  materialCode?: string;
+
+  /**
+   * 进度状态
+   */
+  progressStatus?: string;
+}
+
+export interface PageQuery {
+  pageNum?: number;
+  pageSize?: number;
+}

src/api/wms/report/index.ts

@@ -0,0 +1,167 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import {
+  ReportQuery,
+  ReturnReasonAnalysisVO,
+  InventoryTrendAnalysisVO,
+  SafetyStockAlertVO,
+  StagnantInventoryVO,
+  InventoryDifferenceVO,
+  InventoryTurnoverVO
+} from '@/api/wms/report/types';
+
+/**
+ * 查询退库原因分析报表
+ * @param query
+ * @returns {*}
+ */
+export const getReturnReasonAnalysis = (query?: ReportQuery): AxiosPromise<ReturnReasonAnalysisVO[]> => {
+  return request({
+    url: '/wms/report/returnReasonAnalysis',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 导出退库原因分析报表
+ * @param query
+ */
+export const exportReturnReasonAnalysis = (query?: ReportQuery) => {
+  return request({
+    url: '/wms/report/returnReasonAnalysis/export',
+    method: 'post',
+    params: query,
+    responseType: 'blob'
+  });
+};
+
+/**
+ * 查询库存变动趋势分析报表
+ * @param query
+ * @returns {*}
+ */
+export const getInventoryTrendAnalysis = (query?: ReportQuery): AxiosPromise<InventoryTrendAnalysisVO[]> => {
+  return request({
+    url: '/wms/report/inventoryTrendAnalysis',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 导出库存变动趋势分析报表
+ * @param query
+ */
+export const exportInventoryTrendAnalysis = (query?: ReportQuery) => {
+  return request({
+    url: '/wms/report/inventoryTrendAnalysis/export',
+    method: 'post',
+    params: query,
+    responseType: 'blob'
+  });
+};
+
+/**
+ * 查询安全库存预警报表
+ * @param query
+ * @returns {*}
+ */
+export const getSafetyStockAlert = (query?: ReportQuery): AxiosPromise<SafetyStockAlertVO[]> => {
+  return request({
+    url: '/wms/report/safetyStockAlert',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 导出安全库存预警报表
+ * @param query
+ */
+export const exportSafetyStockAlert = (query?: ReportQuery) => {
+  return request({
+    url: '/wms/report/safetyStockAlert/export',
+    method: 'post',
+    params: query,
+    responseType: 'blob'
+  });
+};
+
+/**
+ * 查询呆滞料库存报表
+ * @param query
+ * @returns {*}
+ */
+export const getStagnantInventory = (query?: ReportQuery): AxiosPromise<StagnantInventoryVO[]> => {
+  return request({
+    url: '/wms/report/stagnantInventory',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 导出呆滞料库存报表
+ * @param query
+ */
+export const exportStagnantInventory = (query?: ReportQuery) => {
+  return request({
+    url: '/wms/report/stagnantInventory/export',
+    method: 'post',
+    params: query,
+    responseType: 'blob'
+  });
+};
+
+/**
+ * 查询库存差异报表
+ * @param query
+ * @returns {*}
+ */
+export const getInventoryDifference = (query?: ReportQuery): AxiosPromise<InventoryDifferenceVO[]> => {
+  return request({
+    url: '/wms/report/inventoryDifference',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 导出库存差异报表
+ * @param query
+ */
+export const exportInventoryDifference = (query?: ReportQuery) => {
+  return request({
+    url: '/wms/report/inventoryDifference/export',
+    method: 'post',
+    params: query,
+    responseType: 'blob'
+  });
+};
+
+/**
+ * 查询库存周转报表
+ * @param query
+ * @returns {*}
+ */
+export const getInventoryTurnover = (query?: ReportQuery): AxiosPromise<InventoryTurnoverVO[]> => {
+  return request({
+    url: '/wms/report/inventoryTurnover',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 导出库存周转报表
+ * @param query
+ */
+export const exportInventoryTurnover = (query?: ReportQuery) => {
+  return request({
+    url: '/wms/report/inventoryTurnover/export',
+    method: 'post',
+    params: query,
+    responseType: 'blob'
+  });
+};

src/views/mes/report/index.vue

@@ -0,0 +1,473 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+<!--            <el-form-item label="主键标识" prop="classTeamId">
+              <el-input v-model="queryParams.classTeamId" placeholder="请输入主键标识" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+<!--            <el-form-item label="租户编号" prop="tenantId">
+              <el-input v-model="queryParams.tenantId" placeholder="请输入租户编号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+            <el-form-item label="班组编号" prop="teamCode">
+              <el-input v-model="queryParams.teamCode" placeholder="请输入班组编号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+<!--            <el-form-item label="班组名称" prop="teamName">
+              <el-input v-model="queryParams.teamName" placeholder="请输入班组名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="班组负责人" prop="teamHead">
+              <el-input v-model="queryParams.teamHead" placeholder="请输入班组负责人" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="班次ID" prop="shiftId">
+              <el-input v-model="queryParams.shiftId" placeholder="请输入班次ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="工序ID" prop="processId">
+              <el-input v-model="queryParams.processId" placeholder="请输入工序ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="工位ID" prop="stationId">
+              <el-input v-model="queryParams.stationId" placeholder="请输入工位ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="设备ID" prop="deviceId">
+              <el-input v-model="queryParams.deviceId" placeholder="请输入设备ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+            <el-form-item label="激活标识" prop="activeFlag">
+              <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable >
+                <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+<!--            <el-form-item label="创建部门" prop="createDept">
+              <el-input v-model="queryParams.createDept" placeholder="请输入创建部门" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="创建人" prop="createBy">
+              <el-input v-model="queryParams.createBy" placeholder="请输入创建人" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="创建时间" prop="createTime">
+              <el-date-picker clearable
+                v-model="queryParams.createTime"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="请选择创建时间"
+              />
+            </el-form-item>
+            <el-form-item label="更新人" prop="updateBy">
+              <el-input v-model="queryParams.updateBy" placeholder="请输入更新人" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="更新时间" prop="updateTime">
+              <el-date-picker clearable
+                v-model="queryParams.updateTime"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="请选择更新时间"
+              />
+            </el-form-item>-->
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['mes:baseClassTeamInfo:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['mes:baseClassTeamInfo:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['mes:baseClassTeamInfo:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['mes:baseClassTeamInfo:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="baseClassTeamInfoList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+<!--        <el-table-column label="主键标识" align="center" prop="classTeamId" v-if="columns[0].visible"/>-->
+<!--        <el-table-column label="租户编号" align="center" prop="tenantId" v-if="columns[0].visible"/>-->
+        <el-table-column label="班组编号" align="center" prop="teamCode" v-if="columns[0].visible"/>
+        <el-table-column label="班组名称" align="center" prop="teamName" v-if="columns[1].visible"/>
+        <el-table-column label="班组负责人" align="center" prop="teamHead" v-if="columns[2].visible"/>
+        <el-table-column label="班次" align="center" prop="shiftName" v-if="columns[3].visible"/>
+        <el-table-column label="工序" align="center" prop="processName" v-if="columns[4].visible"/>
+        <el-table-column label="工位" align="center" prop="stationName" v-if="columns[5].visible"/>
+        <el-table-column label="设备" align="center" prop="deviceName" v-if="columns[6].visible"/>
+        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[7].visible">
+          <template #default="scope">
+            <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
+          </template>
+        </el-table-column>
+<!--        <el-table-column label="创建部门" align="center" prop="createDept" v-if="columns[10].visible"/>
+        <el-table-column label="创建人" align="center" prop="createBy" v-if="columns[11].visible"/>
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[12].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="更新人" align="center" prop="updateBy" v-if="columns[13].visible"/>
+        <el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[14].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>-->
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['mes:baseClassTeamInfo:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['mes:baseClassTeamInfo:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改班组信息对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="baseClassTeamInfoFormRef" :model="form" :rules="rules" label-width="100px">
+<!--        <el-form-item label="主键标识" prop="classTeamId">
+          <el-input v-model="form.classTeamId" placeholder="请输入主键标识" />
+        </el-form-item>-->
+<!--        <el-form-item label="租户编号" prop="tenantId">
+          <el-input v-model="form.tenantId" placeholder="请输入租户编号" />
+        </el-form-item>-->
+        <el-form-item label="班组编号" prop="teamCode">
+          <el-input v-model="form.teamCode" placeholder="请输入班组编号" />
+        </el-form-item>
+        <el-form-item label="班组名称" prop="teamName">
+          <el-input v-model="form.teamName" placeholder="请输入班组名称" />
+        </el-form-item>
+        <el-form-item label="班组负责人" prop="teamHead">
+          <el-input v-model="form.teamHead" placeholder="请输入班组负责人" />
+        </el-form-item>
+<!--        <el-form-item label="班次ID" prop="shiftId">
+          <el-input v-model="form.shiftId" placeholder="请输入班次ID" />
+        </el-form-item>-->
+        <el-form-item label="班次" prop="shiftId">
+          <el-select v-model="form.shiftId" placeholder="请选择班次">
+            <el-option
+              v-for="item in shiftList"
+              :key="item.shiftId"
+              :label="item.shiftName"
+              :value="item.shiftId"
+            />
+          </el-select>
+        </el-form-item>
+<!--        <el-form-item label="工序ID" prop="processId">
+          <el-input v-model="form.processId" placeholder="请输入工序ID" />
+        </el-form-item>-->
+        <el-form-item label="工序" prop="processId">
+          <el-select v-model="form.processId" placeholder="请选择工序">
+            <el-option
+              v-for="item in processList"
+              :key="item.processId"
+              :label="item.processName"
+              :value="item.processId"
+            />
+          </el-select>
+        </el-form-item>
+<!--        <el-form-item label="工位ID" prop="stationId">
+          <el-input v-model="form.stationId" placeholder="请输入工位ID" />
+        </el-form-item>-->
+        <el-form-item label="工位" prop="stationId">
+          <el-select v-model="form.stationId" placeholder="请选择工位">
+            <el-option
+              v-for="item in stationList"
+              :key="item.stationId"
+              :label="item.stationName"
+              :value="item.stationId"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="设备ID" prop="deviceId">
+          <el-input v-model="form.deviceId" placeholder="请输入设备ID" />
+        </el-form-item>
+
+        <el-form-item label="激活标识" prop="activeFlag">
+          <el-radio-group v-model="form.activeFlag">
+            <el-radio
+              v-for="dict in active_flag"
+              :key="dict.value"
+              :value="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+<!--        <el-form-item label="创建部门" prop="createDept">
+          <el-input v-model="form.createDept" placeholder="请输入创建部门" />
+        </el-form-item>
+        <el-form-item label="创建人" prop="createBy">
+          <el-input v-model="form.createBy" placeholder="请输入创建人" />
+        </el-form-item>
+        <el-form-item label="创建时间" prop="createTime">
+          <el-date-picker clearable
+            v-model="form.createTime"
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="请选择创建时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="更新人" prop="updateBy">
+          <el-input v-model="form.updateBy" placeholder="请输入更新人" />
+        </el-form-item>
+        <el-form-item label="更新时间" prop="updateTime">
+          <el-date-picker clearable
+            v-model="form.updateTime"
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="请选择更新时间">
+          </el-date-picker>
+        </el-form-item>-->
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="BaseClassTeamInfo" lang="ts">
+import { listBaseClassTeamInfo, getBaseClassTeamInfo, delBaseClassTeamInfo, addBaseClassTeamInfo, updateBaseClassTeamInfo } from '@/api/mes/baseClassTeamInfo';
+import { BaseClassTeamInfoVO, BaseClassTeamInfoQuery, BaseClassTeamInfoForm } from '@/api/mes/baseClassTeamInfo/types';
+import {getBaseShiftInfoList} from "@/api/mes/baseShiftInfo";
+import { getProcessInfoList } from '@/api/mes/baseProcessInfo';
+import { getStationInfoList } from '@/api/mes/baseStationInfo';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
+
+const baseClassTeamInfoList = ref<BaseClassTeamInfoVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const baseClassTeamInfoFormRef = ref<ElFormInstance>();
+
+let shiftList = ref([]);
+let processList = ref([]);
+let stationList = ref([]);
+
+/*获取班次下拉框*/
+const getShifSelect = async () => {
+  let res = await getBaseShiftInfoList(null);
+  shiftList.value = res.data;
+};
+/*获取工序下拉框*/
+const getProcessSelect = async () => {
+  let res = await getProcessInfoList(null);
+  processList.value = res.data;
+};
+/*获取工位下拉框*/
+const getStationSelect = async () => {
+  let res = await getStationInfoList(null);
+  stationList.value = res.data;
+};
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+/*        { key: 0, label: `主键标识`, visible: true },*/
+/*        { key: 1, label: `租户编号`, visible: true },*/
+        { key: 0, label: `班组编号`, visible: true },
+        { key: 1, label: `班组名称`, visible: true },
+        { key: 2, label: `班组负责人`, visible: true },
+        { key: 3, label: `班次`, visible: false },
+        { key: 4, label: `工序`, visible: false },
+        { key: 5, label: `工位`, visible: false },
+        { key: 6, label: `设备`, visible: false },
+        { key: 7, label: `激活标识`, visible: true },
+/*        { key: 10, label: `创建部门`, visible: true },
+        { key: 11, label: `创建人`, visible: true },
+        { key: 12, label: `创建时间`, visible: true },
+        { key: 13, label: `更新人`, visible: true },
+        { key: 14, label: `更新时间`, visible: true },*/
+]);
+
+const initFormData: BaseClassTeamInfoForm = {
+  classTeamId: undefined,
+  tenantId: undefined,
+  teamCode: undefined,
+  teamName: undefined,
+  teamHead: undefined,
+  shiftId: undefined,
+  processId: undefined,
+  stationId: undefined,
+  deviceId: undefined,
+  activeFlag: '1',
+  createDept: undefined,
+  createBy: undefined,
+  createTime: undefined,
+  updateBy: undefined,
+  updateTime: undefined
+}
+const data = reactive<PageData<BaseClassTeamInfoForm, BaseClassTeamInfoQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    classTeamId: undefined,
+    tenantId: undefined,
+    teamCode: undefined,
+    teamName: undefined,
+    teamHead: undefined,
+    shiftId: undefined,
+    processId: undefined,
+    stationId: undefined,
+    deviceId: undefined,
+    activeFlag: undefined,
+    createDept: undefined,
+    createBy: undefined,
+    createTime: undefined,
+    updateBy: undefined,
+    updateTime: undefined,
+    params: {
+    }
+  },
+  rules: {
+    teamCode: [
+      { required: true, message: "班组编号不能为空", trigger: "blur" }
+    ],
+    teamName: [
+      { required: true, message: "班组名称不能为空", trigger: "blur" }
+    ],
+    /*teamHead: [
+      { required: true, message: "班组负责人不能为空", trigger: "blur" }
+    ],
+    shiftId: [
+      { required: true, message: "班次ID不能为空", trigger: "blur" }
+    ],
+    processId: [
+      { required: true, message: "工序ID不能为空", trigger: "blur" }
+    ],
+    stationId: [
+      { required: true, message: "工位ID不能为空", trigger: "blur" }
+    ],
+    deviceId: [
+      { required: true, message: "设备ID不能为空", trigger: "blur" }
+    ],*/
+    activeFlag: [
+      { required: true, message: "激活标识不能为空", trigger: "change" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询班组信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listBaseClassTeamInfo(queryParams.value);
+  baseClassTeamInfoList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  baseClassTeamInfoFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: BaseClassTeamInfoVO[]) => {
+  ids.value = selection.map(item => item.classTeamId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加班组信息";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: BaseClassTeamInfoVO) => {
+  reset();
+  const _classTeamId = row?.classTeamId || ids.value[0]
+  const res = await getBaseClassTeamInfo(_classTeamId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改班组信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  baseClassTeamInfoFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.classTeamId) {
+        await updateBaseClassTeamInfo(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addBaseClassTeamInfo(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: BaseClassTeamInfoVO) => {
+  const _classTeamIds = row?.classTeamId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除班组信息编号为"' + _classTeamIds + '"的数据项？').finally(() => loading.value = false);
+  await delBaseClassTeamInfo(_classTeamIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('mes/baseClassTeamInfo/export', {
+    ...queryParams.value
+  }, `baseClassTeamInfo_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getShifSelect();
+  getProcessSelect();
+  getStationSelect();
+  getList();
+});
+</script>

src/views/mes/reportDailyOutput/index.vue

@@ -5,9 +5,9 @@
         <el-date-picker v-model="dateRange" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYY-MM-DD" />
       </el-form-item>
       <!-- 工序输入已移除，固定为常量2 -->
-      <el-form-item label="机台" prop="machineId">
+<!--      <el-form-item label="机台" prop="machineId">
         <el-input v-model="queryParams.machineId" placeholder="可选：机台ID" clearable style="width: 180px" />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>

src/views/mes/reportWorkHour/index.vue

@@ -0,0 +1,220 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <el-form-item label="日期" style="width: 300px">
+              <el-date-picker
+                v-model="dateRange"
+                value-format="YYYY-MM-DD"
+                type="daterange"
+                range-separator="-"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              />
+            </el-form-item>
+<!--
+            <el-form-item label="工序名称" prop="processId">
+              <el-select v-model="queryParams.processId" placeholder="请选择所属工序" @keyup.enter="handleQuery">
+                <el-option v-for="item in processInfoList" :key="item.processId" :label="item.processName" :value="item.processId" />
+              </el-select>
+            </el-form-item>
+
+            <el-form-item label="机台名称" prop="machineId">
+              <el-select v-model="queryParams.machineId" placeholder="请选择机台名称" clearable @keyup.enter="handleQuery">
+                <el-option v-for="item in machineInfoList" :key="item.machineId" :label="item.machineName" :value="item.machineId" />
+              </el-select>
+            </el-form-item>
+
+            <el-form-item label="班次名称" prop="shiftId">
+              <el-select v-model="queryParams.shiftId" placeholder="请选择班次名称" clearable @keyup.enter="handleQuery">
+                <el-option v-for="item in shiftList" :key="item.shiftId" :label="item.shiftName" :value="item.shiftId" />
+              </el-select>
+            </el-form-item>
+
+            <el-form-item label="班组名称" prop="classTeamId">
+              <el-select v-model="queryParams.classTeamId" placeholder="请选择班组名称" clearable @keyup.enter="handleQuery">
+                <el-option v-for="item in classTeamList" :key="item.classTeamId" :label="item.teamName" :value="item.classTeamId" />
+              </el-select>
+            </el-form-item>
+
+            <el-form-item label="计划编号" prop="planCode">
+              <el-input v-model="queryParams.planCode" placeholder="请输入计划编号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+
+            <el-form-item label="物料名称" prop="materialName">
+              <el-input v-model="queryParams.materialName" placeholder="请输入物料名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['mes:baseWorkshopInfo:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList" />
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="reportList">
+        <el-table-column label="派工单" align="center" prop="dispatchCode" v-if="columns[0].visible" />
+        <el-table-column label="班组" align="center" prop="teamName" v-if="columns[1].visible" />
+        <el-table-column label="工位" align="center" prop="stationName" v-if="columns[2].visible" />
+        <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[3].visible" width="260" />
+        <el-table-column label="工序名称" align="center" prop="processName" v-if="columns[4].visible" />
+        <el-table-column label="报工数量" align="center" prop="completeAmount" v-if="columns[5].visible" />
+        <el-table-column label="标准工时(h)" align="center" prop="standardWorkHour" v-if="columns[6].visible" />
+        <el-table-column label="报工工时(h)" align="center" prop="reportWorkHour" v-if="columns[7].visible" />
+        <el-table-column label="生产效率" align="center" prop="productionEfficiency" v-if="columns[8].visible" />
+        <el-table-column label="派工单状态" align="center" prop="planStatus" v-if="columns[9].visible" />
+        <el-table-column label="备注" align="center" prop="remark" v-if="columns[10].visible" show-overflow-tooltip />
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+  </div>
+</template>
+
+<script setup name="ReportWorkHour" lang="ts">
+import { getCurrentInstance, ref, watch, onMounted } from 'vue';
+import type { ComponentInternalInstance } from 'vue';
+import type { ElFormInstance } from 'element-plus';
+import { listWorkHourReport } from '@/api/mes/prodReport';
+import { getProcessInfoList } from '@/api/mes/baseProcessInfo';
+import { getProdBaseMachineInfoList } from '@/api/mes/prodBaseMachineInfo';
+import { getBaseShiftInfoList } from '@/api/mes/baseShiftInfo';
+import { getBaseClassTeamInfoList } from '@/api/mes/baseClassTeamInfo';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const reportList = ref<[]>([]);
+const loading = ref(true);
+const showSearch = ref(true);
+const total = ref(0);
+const queryFormRef = ref<ElFormInstance>();
+const dateRange = ref<string[]>(['', '']);
+
+// 下拉数据
+const processInfoList = ref([]);
+const machineInfoList = ref([]);
+const shiftList = ref([]);
+const classTeamList = ref([]);
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+  { key: 0, label: '派工单', visible: true },
+  { key: 1, label: '班组', visible: true },
+  { key: 2, label: '工位', visible: true },
+  { key: 3, label: '物料名称', visible: true },
+  { key: 4, label: '工序名称', visible: true },
+  { key: 5, label: '报工数量', visible: true },
+  { key: 6, label: '标准工时(h)', visible: true },
+  { key: 7, label: '报工工时(h)', visible: true },
+  { key: 8, label: '生产效率', visible: true },
+  { key: 9, label: '派工单状态', visible: true },
+  { key: 10, label: '备注', visible: true }
+]);
+
+const queryParams = ref({
+  pageNum: 1,
+  pageSize: 10,
+  processId: 18,
+  machineId: undefined,
+  shiftId: undefined,
+  classTeamId: undefined,
+  planCode: '',
+  materialName: '',
+  beginDate: '',
+  endDate: '',
+  params: {}
+});
+
+// 下拉获取
+const getProcessInfoListSelect = async () => {
+  const res = await getProcessInfoList(null);
+  processInfoList.value = res.data;
+};
+
+const getProdBaseMachineInfoListSelect = async () => {
+  const res = await getProdBaseMachineInfoList({ processId: queryParams.value.processId });
+  machineInfoList.value = res.data;
+};
+
+const getShiftSelect = async () => {
+  const res = await getBaseShiftInfoList(null);
+  shiftList.value = res.data;
+};
+
+const getClassTeamSelect = async () => {
+  const res = await getBaseClassTeamInfoList(null);
+  classTeamList.value = res.data;
+};
+
+// 列表
+const getList = async () => {
+  loading.value = true;
+  queryParams.value.beginDate = dateRange.value?.[0];
+  queryParams.value.endDate = dateRange.value?.[1];
+  const res = await listWorkHourReport(queryParams.value);
+  reportList.value = res.rows || [];
+  total.value = res.total || 0;
+  loading.value = false;
+};
+
+// 搜索
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+// 重置
+const resetQuery = () => {
+  queryFormRef.value?.resetFields?.();
+  const nowDate = proxy?.parseTime(new Date(), '{y}-{m}-{d}');
+  dateRange.value = [nowDate, nowDate];
+  queryParams.value.processId = 18;
+  queryParams.value.machineId = undefined;
+  queryParams.value.shiftId = undefined;
+  queryParams.value.classTeamId = undefined;
+  queryParams.value.planCode = '';
+  queryParams.value.materialName = '';
+  handleQuery();
+};
+
+// 导出
+const handleExport = () => {
+  queryParams.value.beginDate = dateRange.value?.[0];
+  queryParams.value.endDate = dateRange.value?.[1];
+  proxy?.download('mes/prodReport/workHourReport/export', { ...queryParams.value }, `工时报表_${new Date().getTime()}.xlsx`);
+};
+
+// 监听工序变化联动机台
+watch(
+  () => queryParams.value.processId,
+  async () => {
+    loading.value = true;
+    await getProdBaseMachineInfoListSelect();
+    await getList();
+    loading.value = false;
+  }
+);
+
+onMounted(async () => {
+  resetQuery();
+  await getProcessInfoListSelect();
+  await getProdBaseMachineInfoListSelect();
+  await getShiftSelect();
+  await getClassTeamSelect();
+  await getList();
+});
+</script>

src/views/mes/wipTrackingReport/index.vue

@@ -0,0 +1,516 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+<!--            <el-form-item label="日期" style="width: 300px">
+              <el-date-picker
+                v-model="dateRange"
+                value-format="YYYY-MM-DD"
+                type="daterange"
+                range-separator="-"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              />
+            </el-form-item>
+
+            <el-form-item label="生产订单号" prop="orderCode">
+              <el-input
+                v-model="queryParams.orderCode"
+                placeholder="请输入生产订单号"
+                clearable
+                @keyup.enter="handleQuery"
+              />
+            </el-form-item>
+
+            <el-form-item label="物料编号" prop="materialCode">
+              <el-input
+                v-model="queryParams.materialCode"
+                placeholder="请输入物料编号"
+                clearable
+                @keyup.enter="handleQuery"
+              />
+            </el-form-item>-->
+
+            <el-form-item label="物料名称" prop="materialName">
+              <el-input
+                v-model="queryParams.materialName"
+                placeholder="请输入物料名称"
+                clearable
+                @keyup.enter="handleQuery"
+              />
+            </el-form-item>
+
+<!--            <el-form-item label="进度状态" prop="progressStatus">
+              <el-select v-model="queryParams.progressStatus" placeholder="请选择进度状态" clearable @keyup.enter="handleQuery">
+                <el-option label="正常" value="正常" />
+                <el-option label="延期" value="延期" />
+              </el-select>
+            </el-form-item>-->
+
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <!-- 统计图表卡片 -->
+    <el-row :gutter="10" class="mb-[10px]">
+      <el-col :span="12">
+        <el-card shadow="never">
+          <template #header>
+            <span class="font-bold">进度状态分布</span>
+          </template>
+          <div ref="statusChartRef" style="width: 100%; height: 300px"></div>
+        </el-card>
+      </el-col>
+      <el-col :span="12">
+        <el-card shadow="never">
+          <template #header>
+            <span class="font-bold">整体进度分布</span>
+          </template>
+          <div ref="progressChartRef" style="width: 100%; height: 300px"></div>
+        </el-card>
+      </el-col>
+    </el-row>
+
+    <!-- 工序进度可视化 -->
+    <el-card shadow="never" class="mb-[10px]">
+      <template #header>
+        <span class="font-bold">工序进度可视化</span>
+      </template>
+      <div ref="processChartRef" style="width: 100%; height: 400px"></div>
+    </el-card>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['mes:prodReport:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList" />
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="reportList" border>
+        <el-table-column label="生产订单号" align="center" prop="orderCode" v-if="columns[0].visible" width="140" />
+        <el-table-column label="物料编号" align="center" prop="materialCode" v-if="columns[1].visible" width="120" />
+        <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[2].visible" width="180" show-overflow-tooltip />
+        <el-table-column label="规格型号" align="center" prop="materialSpec" v-if="columns[3].visible" width="120" show-overflow-tooltip />
+        <el-table-column label="计划总数量" align="center" prop="planAmount" v-if="columns[4].visible" width="100" />
+        <el-table-column label="在制数量" align="center" prop="wipAmount" v-if="columns[5].visible" width="100" />
+        <el-table-column label="已完成数量" align="center" prop="completeAmount" v-if="columns[6].visible" width="100" />
+        <el-table-column label="计划开工时间" align="center" prop="planBeginTime" v-if="columns[7].visible" width="150" />
+        <el-table-column label="实际开工时间" align="center" prop="realBeginTime" v-if="columns[8].visible" width="150" />
+        <el-table-column label="计划完工时间" align="center" prop="planEndTime" v-if="columns[9].visible" width="150" />
+        <el-table-column label="整体进度" align="center" prop="overallProgress" v-if="columns[10].visible" width="100">
+          <template #default="scope">
+            <el-progress
+              :percentage="parseFloat(scope.row.overallProgress)"
+              :color="getProgressColor(parseFloat(scope.row.overallProgress))"
+              :stroke-width="8"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="进度状态" align="center" prop="progressStatus" v-if="columns[11].visible" width="100">
+          <template #default="scope">
+            <el-tag :type="scope.row.progressStatus === '正常' ? 'success' : 'danger'">
+              {{ scope.row.progressStatus }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="工序进度" align="center" v-if="columns[12].visible" width="300">
+          <template #default="scope">
+            <div class="process-progress-container">
+              <div
+                v-for="process in scope.row.processProgressList"
+                :key="process.processId"
+                class="process-step"
+                :class="{ 'completed': process.isCompleted, 'pending': !process.isCompleted }"
+              >
+                {{ process.processName }}
+              </div>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+  </div>
+</template>
+
+<script setup name="WipTrackingReport" lang="ts">
+import { getCurrentInstance, ref, watch, onMounted, nextTick, onBeforeUnmount } from 'vue';
+import type { ComponentInternalInstance } from 'vue';
+import type { ElFormInstance } from 'element-plus';
+import * as echarts from 'echarts';
+import { listWipTrackingReport, exportWipTrackingReport } from '@/api/mes/wipTrackingReport';
+import { WipTrackingReportVO, WipTrackingReportQuery, ProcessProgressVO } from '@/api/mes/wipTrackingReport/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const reportList = ref<WipTrackingReportVO[]>([]);
+const loading = ref(true);
+const showSearch = ref(true);
+const total = ref(0);
+const queryFormRef = ref<ElFormInstance>();
+const dateRange = ref<string[]>(['', '']);
+
+// 图表引用
+const statusChartRef = ref<HTMLDivElement | null>(null);
+const progressChartRef = ref<HTMLDivElement | null>(null);
+const processChartRef = ref<HTMLDivElement | null>(null);
+let statusChart: echarts.ECharts | null = null;
+let progressChart: echarts.ECharts | null = null;
+let processChart: echarts.ECharts | null = null;
+
+// 列显隐信息
+const columns = ref([
+  { key: 0, label: '生产订单号', visible: true },
+  { key: 1, label: '物料编号', visible: true },
+  { key: 2, label: '物料名称', visible: true },
+  { key: 3, label: '规格型号', visible: true },
+  { key: 4, label: '计划总数量', visible: true },
+  { key: 5, label: '在制数量', visible: true },
+  { key: 6, label: '已完成数量', visible: true },
+  { key: 7, label: '计划开工时间', visible: true },
+  { key: 8, label: '实际开工时间', visible: true },
+  { key: 9, label: '计划完工时间', visible: true },
+  { key: 10, label: '整体进度', visible: true },
+  { key: 11, label: '进度状态', visible: true },
+  { key: 12, label: '工序进度', visible: true }
+]);
+
+const queryParams = ref<WipTrackingReportQuery>({
+  pageNum: 1,
+  pageSize: 10,
+  orderCode: '',
+  materialCode: '',
+  materialName: '',
+  progressStatus: '',
+  beginDate: '',
+  endDate: ''
+});
+
+// 监听日期范围变化
+watch(dateRange, (newVal) => {
+  if (newVal && newVal.length === 2) {
+    queryParams.value.beginDate = newVal[0];
+    queryParams.value.endDate = newVal[1];
+  } else {
+    queryParams.value.beginDate = '';
+    queryParams.value.endDate = '';
+  }
+});
+
+/** 查询在制品跟踪报表列表 */
+function getList() {
+  loading.value = true;
+  listWipTrackingReport(queryParams.value).then((response: any) => {
+    reportList.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+
+    // 更新图表
+    nextTick(() => {
+      updateCharts();
+    });
+  });
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  dateRange.value = ['', ''];
+  queryFormRef.value?.resetFields();
+  queryParams.value = {
+    pageNum: 1,
+    pageSize: 10,
+    orderCode: '',
+    materialCode: '',
+    materialName: '',
+    progressStatus: '',
+    beginDate: '',
+    endDate: ''
+  };
+  handleQuery();
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy?.$modal.confirm('是否确认导出所有在制品跟踪报表数据项？').then(() => {
+    proxy?.$modal.loading('正在导出数据，请稍候...');
+    return exportWipTrackingReport(queryParams.value);
+  }).then((response: any) => {
+    proxy?.$download.blob(response, '在制品跟踪报表.xlsx');
+    proxy?.$modal.closeLoading();
+  }).catch(() => {
+    proxy?.$modal.closeLoading();
+  });
+}
+
+/** 获取进度颜色 */
+function getProgressColor(percentage: number) {
+  if (percentage < 30) return '#f56c6c';
+  if (percentage < 70) return '#e6a23c';
+  return '#67c23a';
+}
+
+/** 初始化图表 */
+function initCharts() {
+  if (statusChartRef.value) {
+    statusChart = echarts.init(statusChartRef.value);
+  }
+  if (progressChartRef.value) {
+    progressChart = echarts.init(progressChartRef.value);
+  }
+  if (processChartRef.value) {
+    processChart = echarts.init(processChartRef.value);
+  }
+}
+
+/** 更新图表数据 */
+function updateCharts() {
+  updateStatusChart();
+  updateProgressChart();
+  updateProcessChart();
+}
+
+/** 更新进度状态分布图 */
+function updateStatusChart() {
+  if (!statusChart || !reportList.value.length) return;
+
+  const statusData = reportList.value.reduce((acc: any, item) => {
+    const status = item.progressStatus || '未知';
+    acc[status] = (acc[status] || 0) + 1;
+    return acc;
+  }, {});
+
+  const option = {
+    title: {
+      text: '进度状态分布',
+      left: 'center'
+    },
+    tooltip: {
+      trigger: 'item',
+      formatter: '{a} <br/>{b}: {c} ({d}%)'
+    },
+    series: [
+      {
+        name: '进度状态',
+        type: 'pie',
+        radius: '60%',
+        data: Object.entries(statusData).map(([name, value]) => ({ name, value })),
+        emphasis: {
+          itemStyle: {
+            shadowBlur: 10,
+            shadowOffsetX: 0,
+            shadowColor: 'rgba(0, 0, 0, 0.5)'
+          }
+        }
+      }
+    ]
+  };
+
+  statusChart.setOption(option);
+}
+
+/** 更新整体进度分布图 */
+function updateProgressChart() {
+  if (!progressChart || !reportList.value.length) return;
+
+  const progressRanges = {
+    '0-30%': 0,
+    '30-60%': 0,
+    '60-90%': 0,
+    '90-100%': 0
+  };
+
+  reportList.value.forEach(item => {
+    const progress = item.overallProgressNum || 0;
+    if (progress < 30) progressRanges['0-30%']++;
+    else if (progress < 60) progressRanges['30-60%']++;
+    else if (progress < 90) progressRanges['60-90%']++;
+    else progressRanges['90-100%']++;
+  });
+
+  const option = {
+    title: {
+      text: '整体进度分布',
+      left: 'center'
+    },
+    tooltip: {
+      trigger: 'axis',
+      axisPointer: {
+        type: 'shadow'
+      }
+    },
+    xAxis: {
+      type: 'category',
+      data: Object.keys(progressRanges)
+    },
+    yAxis: {
+      type: 'value'
+    },
+    series: [
+      {
+        name: '订单数量',
+        type: 'bar',
+        data: Object.values(progressRanges),
+        itemStyle: {
+          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+            { offset: 0, color: '#83bff6' },
+            { offset: 0.5, color: '#188df0' },
+            { offset: 1, color: '#188df0' }
+          ])
+        }
+      }
+    ]
+  };
+
+  progressChart.setOption(option);
+}
+
+/** 更新工序进度可视化图 */
+function updateProcessChart() {
+  if (!processChart || !reportList.value.length) return;
+
+  const processData = reportList.value.slice(0, 10).map(item => ({
+    name: item.orderCode,
+    value: [
+      item.orderCode,
+      item.overallProgressNum || 0,
+      item.progressStatus,
+      item.wipProcesses || '',
+      item.remainingProcesses || ''
+    ]
+  }));
+
+  const option = {
+    title: {
+      text: '工序进度可视化（前10个订单）',
+      left: 'center'
+    },
+    tooltip: {
+      trigger: 'axis',
+      formatter: function(params: any) {
+        const data = params[0].data.value;
+        return `订单号: ${data[0]}<br/>
+                进度: ${data[1]}%<br/>
+                状态: ${data[2]}<br/>
+                在制工序: ${data[3]}<br/>
+                剩余工序: ${data[4]}`;
+      }
+    },
+    xAxis: {
+      type: 'category',
+      data: processData.map(item => item.name),
+      axisLabel: {
+        rotate: 45
+      }
+    },
+    yAxis: {
+      type: 'value',
+      name: '进度(%)',
+      max: 100
+    },
+    series: [
+      {
+        name: '整体进度',
+        type: 'bar',
+        data: processData.map(item => ({
+          value: item.value[1],
+          itemStyle: {
+            color: item.value[2] === '延期' ? '#f56c6c' : '#67c23a'
+          }
+        })),
+        markLine: {
+          data: [
+            { yAxis: 100, name: '完成线' }
+          ]
+        }
+      }
+    ]
+  };
+
+  processChart.setOption(option);
+}
+
+/** 窗口大小改变时重新调整图表 */
+function handleResize() {
+  statusChart?.resize();
+  progressChart?.resize();
+  processChart?.resize();
+}
+
+onMounted(() => {
+  getList();
+  nextTick(() => {
+    initCharts();
+    window.addEventListener('resize', handleResize);
+  });
+});
+
+onBeforeUnmount(() => {
+  window.removeEventListener('resize', handleResize);
+  statusChart?.dispose();
+  progressChart?.dispose();
+  processChart?.dispose();
+});
+</script>
+
+<style scoped>
+.el-card {
+  margin-bottom: 10px;
+}
+
+.el-progress {
+  width: 100%;
+}
+
+/* 工序进度样式 */
+.process-progress-container {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 4px;
+  justify-content: center;
+  align-items: center;
+}
+
+.process-step {
+  padding: 4px 8px;
+  border-radius: 4px;
+  font-size: 12px;
+  font-weight: 500;
+  white-space: nowrap;
+  border: 1px solid;
+  transition: all 0.3s ease;
+}
+
+.process-step.completed {
+  background-color: #722ed1;
+  color: white;
+  border-color: #722ed1;
+}
+
+.process-step.pending {
+  background-color: #f5f5f5;
+  color: #666;
+  border-color: #d9d9d9;
+}
+
+.process-step:hover {
+  transform: scale(1.05);
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+}
+</style>