From 16692634303a8f57f44f2d774944dcc154b4205a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Sat, 17 Jan 2026 14:50:32 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=96=B0=E5=A2=9E=E9=A4=90?=
 =?UTF-8?q?=E5=88=AB=E6=8A=A5=E9=A4=90=E5=92=8C=E8=AF=B7=E5=81=87=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

新增餐别报餐管理页面，包含报餐查询、新增、修改、删除功能，并添加用餐人数统计展示
新增员工请假申请管理页面，包含请假查询、新增、修改、删除功能，支持自动计算请假天数
---
 klp-ui/src/views/wms/hrm/leaveRequest.vue | 370 ++++++++++++++++++++++
 klp-ui/src/views/wms/hrm/mealReport.vue   | 364 +++++++++++++++++++++
 2 files changed, 734 insertions(+)
 create mode 100644 klp-ui/src/views/wms/hrm/leaveRequest.vue
 create mode 100644 klp-ui/src/views/wms/hrm/mealReport.vue

diff --git a/klp-ui/src/views/wms/hrm/leaveRequest.vue b/klp-ui/src/views/wms/hrm/leaveRequest.vue
new file mode 100644
index 00000000..23fa7f19
--- /dev/null
+++ b/klp-ui/src/views/wms/hrm/leaveRequest.vue
@@ -0,0 +1,370 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="60px">
+      <el-form-item label="请假类型" prop="leaveType">
+        <el-select v-model="queryParams.leaveType" placeholder="请选择请假类型" clearable>
+          <el-option v-for="dict in dict.type.hrm_leave_type" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="请假人" prop="applicantName">
+        <dict-select v-model="queryParams.applicantName" dict-type="hrm_leave_employee"
+          placeholder="请选择请假人姓名"></dict-select>
+      </el-form-item>
+      <el-form-item label="部门名称" prop="applicantDeptName">
+        <dict-select v-model="queryParams.applicantDeptName" dict-type="hrm_department"
+          placeholder="请选择请假人部门名称"></dict-select>
+      </el-form-item>
+      <el-form-item label="请假班次" prop="leaveShift">
+        <el-select v-model="queryParams.leaveShift" placeholder="请选择请假班次" clearable>
+          <el-option v-for="dict in dict.type.hrm_leave_shift" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single"
+          @click="handleUpdate">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+          @click="handleDelete">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="leaveRequestList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="主键ID" align="center" prop="leaveId" v-if="false" />
+      <el-table-column label="请假原因" align="center" prop="leaveTitle" />
+      <el-table-column label="请假类型" align="center" prop="leaveType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.hrm_leave_type" :value="scope.row.leaveType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="请假人姓名" align="center" prop="applicantName">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.hrm_leave_employee" :value="scope.row.applicantName" />
+        </template>
+      </el-table-column>
+      <el-table-column label="部门名称" align="center" prop="applicantDeptName">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.hrm_department" :value="scope.row.applicantDeptName" />
+        </template>
+      </el-table-column>
+      <el-table-column label="开始时间" align="center" prop="startTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="结束时间" align="center" prop="endTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="请假班次" align="center" prop="leaveShift">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.hrm_leave_shift" :value="scope.row.leaveShift" />
+        </template>
+      </el-table-column>
+      <el-table-column label="请假天数" align="center" prop="leaveDays" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
+
+    <!-- 添加或修改员工请假申请对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="请假原因" prop="leaveTitle">
+          <el-input v-model="form.leaveTitle" placeholder="请输入请假标题" />
+        </el-form-item>
+        <el-form-item label="请假类型" prop="leaveType">
+          <el-select v-model="form.leaveType" placeholder="请选择请假类型">
+            <el-option v-for="dict in dict.type.hrm_leave_type" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="请假人姓名" prop="applicantName">
+          <dict-select v-model="form.applicantName" dict-type="hrm_leave_employee" placeholder="请选择请假人姓名"></dict-select>
+        </el-form-item>
+        <el-form-item label="部门名称" prop="applicantDeptName">
+          <dict-select v-model="form.applicantDeptName" dict-type="hrm_department" placeholder="请选择部门名称"></dict-select>
+        </el-form-item>
+        <el-form-item label="开始时间" prop="startTime">
+          <el-date-picker clearable v-model="form.startTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择请假开始时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束时间" prop="endTime">
+          <el-date-picker clearable v-model="form.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择请假结束时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="请假班次" prop="leaveShift">
+          <el-select v-model="form.leaveShift" placeholder="请选择请假班次">
+            <el-option v-for="dict in dict.type.hrm_leave_shift" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="请假天数" prop="leaveDays">
+          <el-input v-model="form.leaveDays" placeholder="选择时间后自动计算，也可手动修改" />
+        </el-form-item>
+        <el-form-item label="具体原因" prop="leaveReason">
+          <el-input v-model="form.leaveReason" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="附件" prop="attachmentUrls">
+          <FileUpload v-model="form.attachmentUrls" :max-count="1" :show-file-list="true" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listLeaveRequest, getLeaveRequest, delLeaveRequest, addLeaveRequest, updateLeaveRequest } from "@/api/wms/leaveRequest";
+import FileUpload from '@/components/FileUpload'
+import DictSelect from '@/components/DictSelect'
+
+export default {
+  name: "LeaveRequest",
+  dicts: ['hrm_leave_shift', 'hrm_leave_type', 'hrm_department', 'hrm_leave_employee'],
+  components: {
+    FileUpload,
+    DictSelect
+  },
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 员工请假申请表格数据
+      leaveRequestList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        leaveType: undefined,
+        applicantName: undefined,
+        applicantDeptName: undefined,
+        leaveShift: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验规则【核心新增：完整必填校验】
+      rules: {
+        leaveTitle: [ { required: true, message: '请假原因不能为空', trigger: ['blur', 'change'] } ],
+        leaveType: [ { required: true, message: '请假类型不能为空', trigger: 'change' } ],
+        applicantName: [ { required: true, message: '请假人姓名不能为空', trigger: 'change' } ],
+        startTime: [ { required: true, message: '开始时间不能为空', trigger: 'change' } ],
+        endTime: [ { required: true, message: '结束时间不能为空', trigger: 'change' } ],
+        leaveShift: [ { required: true, message: '请假班次不能为空', trigger: 'change' } ],
+        leaveDays: [ 
+          { required: true, message: '请假天数不能为空', trigger: ['blur', 'change'] },
+        ],
+        leaveReason: [ 
+          { required: true, message: '具体原因不能为空', trigger: ['blur', 'change'] },
+        ]
+      }
+    };
+  },
+  // 核心新增：监听开始/结束时间变化，自动计算天数
+  watch: {
+    'form.startTime': {
+      handler() {
+        this.calculateLeaveDays()
+      },
+      immediate: false
+    },
+    'form.endTime': {
+      handler() {
+        this.calculateLeaveDays()
+      },
+      immediate: false
+    }
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询员工请假申请列表 */
+    getList() {
+      this.loading = true;
+      listLeaveRequest(this.queryParams).then(response => {
+        this.leaveRequestList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        leaveId: undefined,
+        leaveTitle: undefined,
+        leaveType: undefined,
+        applicantName: undefined,
+        applicantDeptName: undefined,
+        startTime: undefined,
+        endTime: undefined,
+        leaveShift: undefined,
+        leaveDays: undefined,
+        leaveReason: undefined,
+        attachmentUrls: undefined,
+        createBy: undefined,
+        createTime: undefined,
+        updateBy: undefined,
+        updateTime: undefined,
+        delFlag: undefined,
+        remark: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.leaveId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加员工请假申请";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const leaveId = row.leaveId || this.ids
+      getLeaveRequest(leaveId).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改员工请假申请";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.leaveId != null) {
+            updateLeaveRequest(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addLeaveRequest(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const leaveIds = row.leaveId || this.ids;
+      this.$modal.confirm('是否确认删除员工请假申请编号为"' + leaveIds + '"的数据项？').then(() => {
+        this.loading = true;
+        return delLeaveRequest(leaveIds);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('wms/leaveRequest/export', {
+        ...this.queryParams
+      }, `leaveRequest_${new Date().getTime()}.xlsx`)
+    },
+    // 核心新增：自动计算请假天数的方法
+    calculateLeaveDays() {
+      const { startTime, endTime } = this.form;
+      // 两个时间都选择后才计算
+      if (startTime && endTime) {
+        // 转成时间戳
+        const start = new Date(startTime).getTime();
+        const end = new Date(endTime).getTime();
+        // 判断结束时间不能小于开始时间
+        if (end < start) {
+          this.$modal.msgWarning('结束时间不能早于开始时间，请重新选择！');
+          this.form.leaveDays = undefined;
+          return;
+        }
+        // 计算时间差(毫秒) → 转天 → 保留2位小数
+        const diffTime = end - start;
+        const diffDays = (diffTime / (1000 * 60 * 60 * 24)).toFixed(2);
+        // 赋值到天数输入框
+        this.form.leaveDays = diffDays;
+      }
+    }
+  }
+};
+</script>
\ No newline at end of file
diff --git a/klp-ui/src/views/wms/hrm/mealReport.vue b/klp-ui/src/views/wms/hrm/mealReport.vue
new file mode 100644
index 00000000..7f291acb
--- /dev/null
+++ b/klp-ui/src/views/wms/hrm/mealReport.vue
@@ -0,0 +1,364 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="60px">
+      <el-form-item label="餐别" prop="mealType">
+        <el-select v-model="queryParams.mealType" placeholder="请选择餐别" clearable>
+          <el-option
+            v-for="dict in dict.type.hrm_meal_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="用餐日期" prop="reportDate">
+        <el-date-picker
+          v-model="queryParams.reportDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择用餐日期"
+          clearable
+        />
+      </el-form-item>
+      <el-form-item label="部门名称" prop="deptName">
+        <DictSelect dictType="hrm_department" v-model="queryParams.deptName" placeholder="请选择部门名称"></DictSelect>
+      </el-form-item>
+      <el-form-item label="报餐人" prop="reportUserName">
+        <DictSelect dictType="hrm_leave_employee" v-model="queryParams.reportUserName" placeholder="请选择报餐人姓名"></DictSelect>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- ✅ 新增：表格上方的人数合计统计组件 el-description -->
+    <el-descriptions size="small" border class="mb8" :column="3">
+      <el-descriptions-item label="堂食人数合计">{{ totalDineIn }}</el-descriptions-item>
+      <el-descriptions-item label="打包人数合计">{{ totalTakeout }}</el-descriptions-item>
+      <el-descriptions-item label="用餐总人数合计">{{ totalAll }}</el-descriptions-item>
+    </el-descriptions>
+
+    <el-table v-loading="loading" :data="mealReportList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="主键ID" align="center" prop="reportId" v-if="false"/>
+      <el-table-column label="用餐日期" align="center" prop="reportDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.reportDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="餐别" align="center" prop="mealType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.hrm_meal_type" :value="scope.row.mealType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="部门名称" align="center" prop="deptName">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.hrm_department" :value="scope.row.deptName"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="用餐总人数" align="center" prop="totalPeople" />
+      <el-table-column label="堂食人数" align="center" prop="dineInPeople" />
+      <el-table-column label="打包人数" align="center" prop="takeoutPeople" />
+      <el-table-column label="报餐人姓名" align="center" prop="reportUserName">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.hrm_leave_employee" :value="scope.row.reportUserName"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+
+    <!-- 添加或修改部门报餐主对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="用餐日期" prop="reportDate">
+          <el-date-picker clearable
+            v-model="form.reportDate"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择用餐日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="餐别" prop="mealType">
+          <el-select v-model="form.mealType" placeholder="请选择餐别">
+            <el-option
+              v-for="dict in dict.type.hrm_meal_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="部门名称" prop="deptName">
+          <DictSelect dictType="hrm_department" v-model="form.deptName" placeholder="请选择部门名称"></DictSelect>
+        </el-form-item>
+        <!-- 优化：增加number类型，禁止输入非数字，限制最小值0 -->
+        <el-form-item label="堂食人数" prop="dineInPeople">
+          <el-input v-model="form.dineInPeople" placeholder="请输入堂食人数" type="number" min="0" />
+        </el-form-item>
+        <el-form-item label="打包人数" prop="takeoutPeople">
+          <el-input v-model="form.takeoutPeople" placeholder="请输入打包人数" type="number" min="0" />
+        </el-form-item>
+        <el-form-item label="用餐总人数" prop="totalPeople">
+          <el-input v-model="form.totalPeople" placeholder="请输入用餐总人数" disabled />
+        </el-form-item>
+        <el-form-item label="报餐人姓名" prop="reportUserName">
+          <DictSelect dictType="hrm_leave_employee" v-model="form.reportUserName" placeholder="请选择报餐人姓名"></DictSelect>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listMealReport, getMealReport, delMealReport, addMealReport, updateMealReport } from "@/api/wms/mealReport";
+import DictSelect from "@/components/DictSelect";
+
+export default {
+  name: "MealReport",
+  dicts: ['hrm_meal_type', 'hrm_leave_employee', 'hrm_department'],
+  components: { DictSelect },
+  data() {
+    // 用餐日期默认选中今天
+    // 格式化日期为yyyy-MM-dd
+    function addZero(num) {
+      return num < 10 ? '0' + num : num;
+    }
+    const now = new Date()
+    const nowYear = now.getFullYear()
+    const nowMonth = addZero(now.getMonth() + 1)
+    const nowDay = addZero(now.getDate())
+    const nowTime = `${nowYear}-${nowMonth}-${nowDay}`
+    return {
+      buttonLoading: false,
+      loading: true,
+      ids: [],
+      single: true,
+      multiple: true,
+      showSearch: true,
+      total: 0,
+      mealReportList: [],
+      title: "",
+      open: false,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        reportDate: nowTime,
+        mealType: undefined,
+        deptName: undefined,
+        reportUserName: undefined,
+        status: undefined,
+      },
+      form: {},
+      // 合计统计的三个变量 ✅新增
+      totalDineIn: 0,  // 堂食合计
+      totalTakeout: 0, // 打包合计
+      totalAll: 0,     // 总人数合计
+      // 表单校验规则
+      rules: {
+        reportDate: [{ required: true, message: '用餐日期不能为空', trigger: 'change' }],
+        mealType: [{ required: true, message: '餐别不能为空', trigger: 'change' }],
+        deptName: [{ required: true, message: '部门名称不能为空', trigger: 'change' }],
+        dineInPeople: [{ required: true, message: '堂食人数不能为空', trigger: 'blur' }],
+        takeoutPeople: [{ required: true, message: '打包人数不能为空', trigger: 'blur' }],
+        totalPeople: [{ required: true, message: '用餐总人数不能为空', trigger: 'blur' }],
+        reportUserName: [{ required: true, message: '报餐人姓名不能为空', trigger: 'change' }]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  watch: {
+    'form.dineInPeople': {
+      handler(val) {
+        this.calcTotalPeople();
+      },
+      immediate: true
+    },
+    'form.takeoutPeople': {
+      handler(val) {
+        this.calcTotalPeople();
+      },
+      immediate: true
+    }
+  },
+  methods: {
+    /** 查询部门报餐主列表 */
+    getList() {
+      this.loading = true;
+      listMealReport(this.queryParams).then(response => {
+        this.mealReportList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+        this.calcTableSum(); // ✅新增：获取表格数据后，立即计算合计
+      });
+    },
+    // ✅ 核心新增：计算表格中堂食、打包、总人数的合计方法
+    calcTableSum(){
+        let dineIn = 0;
+        let takeout = 0;
+        let all = 0;
+        // 遍历表格数据累加，处理空值/非数字，避免NaN
+        this.mealReportList.forEach(item => {
+            dineIn += item.dineInPeople ? Number(item.dineInPeople) : 0;
+            takeout += item.takeoutPeople ? Number(item.takeoutPeople) : 0;
+            all += item.totalPeople ? Number(item.totalPeople) : 0;
+        });
+        // 赋值到统计变量
+        this.totalDineIn = dineIn;
+        this.totalTakeout = takeout;
+        this.totalAll = all;
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        reportId: undefined,
+        reportDate: undefined,
+        mealType: undefined,
+        deptName: undefined,
+        totalPeople: undefined,
+        dineInPeople: undefined,
+        takeoutPeople: undefined,
+        reportUserName: undefined,
+        status: undefined,
+        createBy: undefined,
+        createTime: undefined,
+        updateBy: undefined,
+        updateTime: undefined,
+        delFlag: undefined,
+        remark: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.reportId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加部门报餐主";
+      const now = new Date();
+      const year = now.getFullYear();
+      const month = (now.getMonth() + 1).toString().padStart(2, '0');
+      const day = now.getDate().toString().padStart(2, '0');
+      const hour = now.getHours().toString().padStart(2, '0');
+      const minute = now.getMinutes().toString().padStart(2, '0');
+      const second = now.getSeconds().toString().padStart(2, '0');
+      this.form.reportDate = `${year}-${month}-${day} ${hour}:${minute}:${second}`;
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const reportId = row.reportId || this.ids
+      getMealReport(reportId).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改部门报餐主";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.reportId != null) {
+            updateMealReport(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addMealReport(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const reportIds = row.reportId || this.ids;
+      this.$modal.confirm('是否确认删除部门报餐主编号为"' + reportIds + '"的数据项？').then(() => {
+        this.loading = true;
+        return delMealReport(reportIds);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('wms/mealReport/export', { ...this.queryParams }, `mealReport_${new Date().getTime()}.xlsx`)
+    },
+    // 计算单行总人数
+    calcTotalPeople() {
+      const dine = this.form.dineInPeople ? Number(this.form.dineInPeople) : 0;
+      const take = this.form.takeoutPeople ? Number(this.form.takeoutPeople) : 0;
+      this.form.totalPeople = dine + take;
+    }
+  }
+};
+</script>
\ No newline at end of file