product-inventory-management.git

提交次数
对比

2025-09-02

spring

测试库部署信息

ff7ae0

对比 | 目录

2025-09-02

spring

合并冲突

4ca2ae

对比 | 目录

2025-09-02

spring

合并冲突掉的代码

6e15ba

对比 | 目录

已修改10个文件

	.env.development	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	.env.production	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	.env.staging	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	index.html	388 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	package.json	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/router/index.js	23 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/collaborativeApproval/noticeManagement/index.vue	518 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/inventoryManagement/dispatchLog/index.vue	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/procurementManagement/procurementInvoiceLedger/index.vue	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	vite.config.js	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 .env.development

@@ -1,8 +1,8 @@
# 页面标题

VITE_APP_TITLE = 中强恒兴管理系统

VITE_APP_TITLE = 测试进销存管理系统



# 开发环境配置

VITE_APP_ENV = 'development'



# 中强恒兴管理系统/开发环境

# 测试进销存管理系统/开发环境

VITE_APP_BASE_API = '/dev-api'


 .env.production

@@ -1,10 +1,10 @@
# 页面标题

VITE_APP_TITLE = 中强恒兴管理系统

VITE_APP_TITLE = 测试进销存管理系统



# 生产环境配置

VITE_APP_ENV = 'production'



# 中强恒兴管理系统/生产环境

# 测试进销存管理系统/生产环境

VITE_APP_BASE_API = '/prod-api'



# 是否在打包时开启压缩，支持 gzip 和 brotli


 .env.staging

@@ -1,10 +1,10 @@
# 页面标题

VITE_APP_TITLE = 中强恒兴管理系统

VITE_APP_TITLE = 测试进销存管理系统



# 生产环境配置

VITE_APP_ENV = 'staging'



# 中强恒兴管理系统/生产环境

# 测试进销存管理系统/生产环境

VITE_APP_BASE_API = '/stage-api'



# 是否在打包时开启压缩，支持 gzip 和 brotli


 index.html

@@ -1,215 +1,217 @@
<!DOCTYPE html>

<html>



<head>

  <meta charset="utf-8">

  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">

  <meta name="renderer" content="webkit">

  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">

  <link rel="icon" href="/ZQHXico.ico">

  <title>中强恒兴管理系统</title>

  <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->

  <style>

    html,

    body,

    #app {

      height: 100%;

      margin: 0px;

      padding: 0px;

    }



    .chromeframe {

      margin: 0.2em 0;

      background: #ccc;

      color: #000;

      padding: 0.2em 0;

    }



    #loader-wrapper {

      position: fixed;

      top: 0;

      left: 0;

      width: 100%;

      height: 100%;

      z-index: 999999;

    }



    #loader {

      display: block;

      position: relative;

      left: 50%;

      top: 50%;

      width: 150px;

      height: 150px;

      margin: -75px 0 0 -75px;

      border-radius: 50%;

      border: 3px solid transparent;

      border-top-color: #FFF;

      -webkit-animation: spin 2s linear infinite;

      -ms-animation: spin 2s linear infinite;

      -moz-animation: spin 2s linear infinite;

      -o-animation: spin 2s linear infinite;

      animation: spin 2s linear infinite;

      z-index: 1001;

    }



    #loader:before {

      content: "";

      position: absolute;

      top: 5px;

      left: 5px;

      right: 5px;

      bottom: 5px;

      border-radius: 50%;

      border: 3px solid transparent;

      border-top-color: #FFF;

      -webkit-animation: spin 3s linear infinite;

      -moz-animation: spin 3s linear infinite;

      -o-animation: spin 3s linear infinite;

      -ms-animation: spin 3s linear infinite;

      animation: spin 3s linear infinite;

    }



    #loader:after {

      content: "";

      position: absolute;

      top: 15px;

      left: 15px;

      right: 15px;

      bottom: 15px;

      border-radius: 50%;

      border: 3px solid transparent;

      border-top-color: #FFF;

      -moz-animation: spin 1.5s linear infinite;

      -o-animation: spin 1.5s linear infinite;

      -ms-animation: spin 1.5s linear infinite;

      -webkit-animation: spin 1.5s linear infinite;

      animation: spin 1.5s linear infinite;

    }





    @-webkit-keyframes spin {

      0% {

        -webkit-transform: rotate(0deg);

        -ms-transform: rotate(0deg);

        transform: rotate(0deg);

  <head>

    <meta charset="utf-8" />

    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />

    <meta name="renderer" content="webkit" />

    <meta

      name="viewport"

      content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"

    />

    <link rel="icon" href="/ZQHXico.ico" />

    <title>测试进销存管理系统</title>

    <!--[if lt IE 11

      ]><script>

        window.location.href = "/html/ie.html";

      </script><!

    [endif]-->

    <style>

      html,

      body,

      #app {

        height: 100%;

        margin: 0px;

        padding: 0px;

      }



      100% {

        -webkit-transform: rotate(360deg);

        -ms-transform: rotate(360deg);

        transform: rotate(360deg);

      }

    }



    @keyframes spin {

      0% {

        -webkit-transform: rotate(0deg);

        -ms-transform: rotate(0deg);

        transform: rotate(0deg);

      .chromeframe {

        margin: 0.2em 0;

        background: #ccc;

        color: #000;

        padding: 0.2em 0;

      }



      100% {

        -webkit-transform: rotate(360deg);

        -ms-transform: rotate(360deg);

        transform: rotate(360deg);

      #loader-wrapper {

        position: fixed;

        top: 0;

        left: 0;

        width: 100%;

        height: 100%;

        z-index: 999999;

      }

    }



      #loader {

        display: block;

        position: relative;

        left: 50%;

        top: 50%;

        width: 150px;

        height: 150px;

        margin: -75px 0 0 -75px;

        border-radius: 50%;

        border: 3px solid transparent;

        border-top-color: #fff;

        -webkit-animation: spin 2s linear infinite;

        -ms-animation: spin 2s linear infinite;

        -moz-animation: spin 2s linear infinite;

        -o-animation: spin 2s linear infinite;

        animation: spin 2s linear infinite;

        z-index: 1001;

      }



    #loader-wrapper .loader-section {

      position: fixed;

      top: 0;

      width: 51%;

      height: 100%;

      background: #7171C6;

      z-index: 1000;

      -webkit-transform: translateX(0);

      -ms-transform: translateX(0);

      transform: translateX(0);

    }

      #loader:before {

        content: "";

        position: absolute;

        top: 5px;

        left: 5px;

        right: 5px;

        bottom: 5px;

        border-radius: 50%;

        border: 3px solid transparent;

        border-top-color: #fff;

        -webkit-animation: spin 3s linear infinite;

        -moz-animation: spin 3s linear infinite;

        -o-animation: spin 3s linear infinite;

        -ms-animation: spin 3s linear infinite;

        animation: spin 3s linear infinite;

      }



    #loader-wrapper .loader-section.section-left {

      left: 0;

    }

      #loader:after {

        content: "";

        position: absolute;

        top: 15px;

        left: 15px;

        right: 15px;

        bottom: 15px;

        border-radius: 50%;

        border: 3px solid transparent;

        border-top-color: #fff;

        -moz-animation: spin 1.5s linear infinite;

        -o-animation: spin 1.5s linear infinite;

        -ms-animation: spin 1.5s linear infinite;

        -webkit-animation: spin 1.5s linear infinite;

        animation: spin 1.5s linear infinite;

      }



    #loader-wrapper .loader-section.section-right {

      right: 0;

    }

      @-webkit-keyframes spin {

        0% {

          -webkit-transform: rotate(0deg);

          -ms-transform: rotate(0deg);

          transform: rotate(0deg);

        }



        100% {

          -webkit-transform: rotate(360deg);

          -ms-transform: rotate(360deg);

          transform: rotate(360deg);

        }

      }



    .loaded #loader-wrapper .loader-section.section-left {

      -webkit-transform: translateX(-100%);

      -ms-transform: translateX(-100%);

      transform: translateX(-100%);

      -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);

      transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);

    }

      @keyframes spin {

        0% {

          -webkit-transform: rotate(0deg);

          -ms-transform: rotate(0deg);

          transform: rotate(0deg);

        }



    .loaded #loader-wrapper .loader-section.section-right {

      -webkit-transform: translateX(100%);

      -ms-transform: translateX(100%);

      transform: translateX(100%);

      -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);

      transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);

    }

        100% {

          -webkit-transform: rotate(360deg);

          -ms-transform: rotate(360deg);

          transform: rotate(360deg);

        }

      }



    .loaded #loader {

      opacity: 0;

      -webkit-transition: all 0.3s ease-out;

      transition: all 0.3s ease-out;

    }

      #loader-wrapper .loader-section {

        position: fixed;

        top: 0;

        width: 51%;

        height: 100%;

        background: #7171c6;

        z-index: 1000;

        -webkit-transform: translateX(0);

        -ms-transform: translateX(0);

        transform: translateX(0);

      }



    .loaded #loader-wrapper {

      visibility: hidden;

      -webkit-transform: translateY(-100%);

      -ms-transform: translateY(-100%);

      transform: translateY(-100%);

      -webkit-transition: all 0.3s 1s ease-out;

      transition: all 0.3s 1s ease-out;

    }

      #loader-wrapper .loader-section.section-left {

        left: 0;

      }



    .no-js #loader-wrapper {

      display: none;

    }

      #loader-wrapper .loader-section.section-right {

        right: 0;

      }



    .no-js h1 {

      color: #222222;

    }

      .loaded #loader-wrapper .loader-section.section-left {

        -webkit-transform: translateX(-100%);

        -ms-transform: translateX(-100%);

        transform: translateX(-100%);

        -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);

        transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);

      }



    #loader-wrapper .load_title {

      font-family: 'Open Sans';

      color: #FFF;

      font-size: 19px;

      width: 100%;

      text-align: center;

      z-index: 9999999999999;

      position: absolute;

      top: 60%;

      opacity: 1;

      line-height: 30px;

    }

      .loaded #loader-wrapper .loader-section.section-right {

        -webkit-transform: translateX(100%);

        -ms-transform: translateX(100%);

        transform: translateX(100%);

        -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);

        transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);

      }



    #loader-wrapper .load_title span {

      font-weight: normal;

      font-style: italic;

      font-size: 13px;

      color: #FFF;

      opacity: 0.5;

    }

  </style>

</head>

      .loaded #loader {

        opacity: 0;

        -webkit-transition: all 0.3s ease-out;

        transition: all 0.3s ease-out;

      }



<body>

  <div id="app">

    <div id="loader-wrapper">

      <div id="loader"></div>

      <div class="loader-section section-left"></div>

      <div class="loader-section section-right"></div>

      <div class="load_title">正在加载系统资源，请耐心等待</div>

      .loaded #loader-wrapper {

        visibility: hidden;

        -webkit-transform: translateY(-100%);

        -ms-transform: translateY(-100%);

        transform: translateY(-100%);

        -webkit-transition: all 0.3s 1s ease-out;

        transition: all 0.3s 1s ease-out;

      }



      .no-js #loader-wrapper {

        display: none;

      }



      .no-js h1 {

        color: #222222;

      }



      #loader-wrapper .load_title {

        font-family: "Open Sans";

        color: #fff;

        font-size: 19px;

        width: 100%;

        text-align: center;

        z-index: 9999999999999;

        position: absolute;

        top: 60%;

        opacity: 1;

        line-height: 30px;

      }



      #loader-wrapper .load_title span {

        font-weight: normal;

        font-style: italic;

        font-size: 13px;

        color: #fff;

        opacity: 0.5;

      }

    </style>

  </head>



  <body>

    <div id="app">

      <div id="loader-wrapper">

        <div id="loader"></div>

        <div class="loader-section section-left"></div>

        <div class="loader-section section-right"></div>

        <div class="load_title">正在加载系统资源，请耐心等待</div>

      </div>

    </div>

  </div>

  <script type="module" src="/src/main.js"></script>

</body>



</html>
    <script type="module" src="/src/main.js"></script>

  </body>

</html>


 package.json

@@ -1,7 +1,7 @@
{
  "name": "ruoyi",
  "version": "3.8.9",
  "description": "中强恒兴管理系统",
  "description": "测试进销存管理系统",
  "author": "若依",
  "license": "MIT",
  "type": "module",

 src/router/index.js

@@ -97,14 +97,21 @@
    redirect: 'noredirect',
    children: [
      {
        path: 'profile',
        component: () => import('@/views/system/user/profile/index'),
        name: 'Profile',
        meta: { title: '个人中心', icon: 'user' }
      }
    ]
  }
]
        path: "profile",
        component: () => import("@/views/system/user/profile/index"),
        name: "Profile",
        meta: { title: "个人中心", icon: "user" },
      },
    ],
  },
  {
    path: "/device-info",
    component: () => import("@/views/equipmentManagement/deviceInfo/index.vue"),
    hidden: true,
    name: "DeviceInfo",
    meta: { title: "设备信息", icon: "monitor" },
  },
];

// 动态路由，基于用户权限动态去加载
export const dynamicRoutes = [

 src/views/collaborativeApproval/noticeManagement/index.vue

@@ -2,30 +2,30 @@
  <div class="app-container">
    <!-- 搜索表单 -->
    <div class="search_form">
      <div>
        <span class="search_title">公告标题：</span>
        <el-input
          v-model="searchForm.noticeTitle"
          style="width: 240px"
          placeholder="请输入公告标题搜索"
          @change="handleQuery"
          clearable
          :prefix-icon="Search"
        />
        <span class="search_title ml10">公告类型：</span>
        <el-select v-model="searchForm.noticeType" clearable @change="handleQuery" style="width: 240px">
          <el-option label="放假通知" value="1" />
          <el-option label="设备维修通知" value="2" />
        </el-select>
        <span class="search_title ml10">状态：</span>
        <el-select v-model="searchForm.status" clearable @change="handleQuery" style="width: 240px">
          <el-option label="草稿" value="0" />
          <el-option label="已发布" value="1" />
          <el-option label="已下线" value="2" />
        </el-select>
        <el-button type="primary" @click="handleQuery" style="margin-left: 10px">搜索</el-button>
        <el-button @click="resetQuery" style="margin-left: 10px">重置</el-button>
      </div>
      <!--      <div>-->
      <!--        <span class="search_title">公告标题：</span>-->
      <!--        <el-input-->
      <!--            v-model="searchForm.title"-->
      <!--            style="width: 240px"-->
      <!--            placeholder="请输入公告标题搜索"-->
      <!--            @change="handleQuery"-->
      <!--            clearable-->
      <!--            :prefix-icon="Search"-->
      <!--        />-->
      <!--        <span class="search_title ml10">公告类型：</span>-->
      <!--        <el-select v-model="searchForm.type" clearable @change="handleQuery" style="width: 240px">-->
      <!--          <el-option label="放假通知" :value="1"/>-->
      <!--          <el-option label="设备维修通知" :value="2"/>-->
      <!--        </el-select>-->
      <!--        <span class="search_title ml10">状态：</span>-->
      <!--        <el-select v-model="searchForm.status" clearable @change="handleQuery" style="width: 240px">-->
      <!--          <el-option label="草稿" :value="0"/>-->
      <!--          <el-option label="已发布" :value="1"/>-->
      <!--          <el-option label="已下线" :value="2"/>-->
      <!--        </el-select>-->
      <!--        <el-button type="primary" @click="handleQuery" style="margin-left: 10px">搜索</el-button>-->
      <!--        <el-button @click="resetQuery" style="margin-left: 10px">重置</el-button>-->
      <!--      </div>-->
      <div>
        <el-button type="primary" @click="openForm('add')">新增公告</el-button>
        <el-button type="danger" plain @click="handleDelete" :disabled="!selectedIds.length">删除</el-button>
@@ -35,22 +35,24 @@
    <!-- 通知公告板 -->
    <div class="notice-board">
      <!-- 放假通知区域 -->
      <div class="notice-section" v-if="holidayNotices.length > 0">
      <div class="notice-section" v-if="holidayNoticeCount > 0">
        <div class="section-header">
          <h3>📅 放假通知</h3>
          <span class="section-count">{{ holidayNotices.length }}条</span>
          <span class="section-count">{{ holidayNoticeCount }}条</span>
        </div>
        <div class="notice-cards">
          <div 
            v-for="notice in holidayNotices" 
            :key="notice.id"
            class="notice-card holiday-card"
            :class="{ 'urgent': notice.priority === '3' }"
          <div
              v-for="notice in holidayNotices"
              :key="notice.id"
              class="notice-card holiday-card"
              :class="{ 'urgent': notice.priority === '3' }"
          >
            <div class="card-header">
              <div class="card-title">
                <el-icon class="holiday-icon"><Calendar /></el-icon>
                {{ notice.noticeTitle }}
                <el-icon class="holiday-icon">
                  <Calendar/>
                </el-icon>
                {{ notice.title }}
              </div>
              <div class="card-actions">
                <el-button link type="primary" @click="handleEdit(notice)">编辑</el-button>
@@ -58,7 +60,7 @@
              </div>
            </div>
            <div class="card-content">
              <p>{{ notice.noticeContent }}</p>
              <p>{{ notice.content }}</p>
            </div>
            <div class="card-footer">
              <div class="card-meta">
@@ -70,35 +72,47 @@
                </span>
              </div>
              <div class="card-info">
                <span class="creator">{{ notice.createBy }}</span>
                <span class="creator">{{ notice.createUserName }}</span>
                <span class="time">{{ notice.createTime }}</span>
              </div>
            </div>
            <div class="card-remark" v-if="notice.remark">
              <el-icon><InfoFilled /></el-icon>
              <el-icon>
                <InfoFilled/>
              </el-icon>
              <span>{{ notice.remark }}</span>
            </div>
          </div>
        </div>
      </div>

      <pagination
          v-if="holidayNoticePage.total > 0"
          :total="holidayNoticePage.total"
          :page="holidayNoticePage.current"
          :limit="holidayNoticePage.size"
          @pagination="handleHolidayNoticeCurrentChange"
      />

      <!-- 设备维修通知区域 -->
      <div class="notice-section" v-if="maintenanceNotices.length > 0">
      <div class="notice-section" v-if="maintenanceNoticeCount > 0">
        <div class="section-header">
          <h3>🔧 设备维修通知</h3>
          <span class="section-count">{{ maintenanceNotices.length }}条</span>
          <span class="section-count">{{ maintenanceNoticeCount }}条</span>
        </div>
        <div class="notice-cards">
          <div 
            v-for="notice in maintenanceNotices" 
            :key="notice.id"
            class="notice-card maintenance-card"
            :class="{ 'urgent': notice.priority === '3' }"
          <div
              v-for="notice in maintenanceNotices"
              :key="notice.id"
              class="notice-card maintenance-card"
              :class="{ 'urgent': notice.priority === '3' }"
          >
            <div class="card-header">
              <div class="card-title">
                <el-icon class="maintenance-icon"><Tools /></el-icon>
                {{ notice.noticeTitle }}
                <el-icon class="maintenance-icon">
                  <Tools/>
                </el-icon>
                {{ notice.title }}
              </div>
              <div class="card-actions">
                <el-button link type="primary" @click="handleEdit(notice)">编辑</el-button>
@@ -106,7 +120,7 @@
              </div>
            </div>
            <div class="card-content">
              <p>{{ notice.noticeContent }}</p>
              <p>{{ notice.content }}</p>
            </div>
            <div class="card-footer">
              <div class="card-meta">
@@ -118,44 +132,54 @@
                </span>
              </div>
              <div class="card-info">
                <span class="creator">{{ notice.createBy }}</span>
                <span class="creator">{{ notice.createUserName }}</span>
                <span class="time">{{ notice.createTime }}</span>
              </div>
            </div>
            <div class="card-remark" v-if="notice.remark">
              <el-icon><InfoFilled /></el-icon>
              <el-icon>
                <InfoFilled/>
              </el-icon>
              <span>{{ notice.remark }}</span>
            </div>
          </div>
        </div>
      </div>

      <pagination
          v-if="maintenanceNoticePage.total > 0"
          :total="maintenanceNoticePage.total"
          :page="maintenanceNoticePage.current"
          :limit="maintenanceNoticePage.size"
          @pagination="handleMaintenanceNoticeCurrentChange"
      />

      <!-- 空状态 -->
      <div class="empty-state" v-if="filteredNotices.length === 0">
        <el-empty description="暂无通知公告" />
      <div class="empty-state" v-if="holidayNotices.length === 0 && maintenanceNotices.length === 0">
        <el-empty description="暂无通知公告"/>
      </div>
    </div>

    <!-- 新增/编辑对话框 -->
    <el-dialog 
      :title="dialogTitle" 
      v-model="dialogVisible" 
      width="800px" 
      append-to-body
      @close="resetForm"
    <el-dialog
        :title="dialogTitle"
        v-model="dialogVisible"
        width="800px"
        append-to-body
        @close="resetForm"
    >
      <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
        <el-row>
          <el-col :span="12">
            <el-form-item label="公告标题" prop="noticeTitle">
              <el-input v-model="form.noticeTitle" placeholder="请输入公告标题" />
            <el-form-item label="公告标题" prop="title">
              <el-input v-model="form.title" placeholder="请输入公告标题"/>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="公告类型" prop="noticeType">
              <el-select v-model="form.noticeType" placeholder="请选择公告类型" style="width: 100%">
                <el-option label="放假通知" value="1" />
                <el-option label="设备维修通知" value="2" />
            <el-form-item label="公告类型" prop="type">
              <el-select v-model="form.type" placeholder="请选择公告类型" style="width: 100%">
                <el-option label="放假通知" :value="1"/>
                <el-option label="设备维修通知" :value="2"/>
              </el-select>
            </el-form-item>
          </el-col>
@@ -164,18 +188,18 @@
          <el-col :span="12">
            <el-form-item label="状态">
              <el-radio-group v-model="form.status">
                <el-radio value="0">草稿</el-radio>
                <el-radio value="1">已发布</el-radio>
                <el-radio value="2">已下线</el-radio>
                <el-radio :value="0">草稿</el-radio>
                <el-radio :value="1">已发布</el-radio>
                <el-radio :value="2">已下线</el-radio>
              </el-radio-group>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="优先级">
              <el-select v-model="form.priority" placeholder="请选择优先级" style="width: 100%">
                <el-option label="普通" value="1" />
                <el-option label="重要" value="2" />
                <el-option label="紧急" value="3" />
                <el-option label="普通" :value="1"/>
                <el-option label="重要" :value="2"/>
                <el-option label="紧急" :value="3"/>
              </el-select>
            </el-form-item>
          </el-col>
@@ -184,12 +208,12 @@
          <el-col :span="24">
            <el-form-item label="公告内容" prop="noticeContent">
              <el-input
                v-model="form.noticeContent"
                type="textarea"
                :rows="6"
                placeholder="请输入公告内容"
                maxlength="500"
                show-word-limit
                  v-model="form.content"
                  type="textarea"
                  :rows="6"
                  placeholder="请输入公告内容"
                  maxlength="500"
                  show-word-limit
              />
            </el-form-item>
          </el-col>
@@ -198,12 +222,12 @@
          <el-col :span="24">
            <el-form-item label="备注">
              <el-input
                v-model="form.remark"
                type="textarea"
                :rows="3"
                placeholder="请输入备注信息"
                maxlength="200"
                show-word-limit
                  v-model="form.remark"
                  type="textarea"
                  :rows="3"
                  placeholder="请输入备注信息"
                  maxlength="200"
                  show-word-limit
              />
            </el-form-item>
          </el-col>
@@ -220,45 +244,51 @@
</template>

<script setup>
import { Search, Calendar, Tools, InfoFilled } from "@element-plus/icons-vue";
import { onMounted, ref, reactive, toRefs, computed } from "vue";
import { ElMessage, ElMessageBox } from "element-plus";
import {Search, Calendar, Tools, InfoFilled} from "@element-plus/icons-vue";
import {onMounted, ref, reactive, toRefs, computed} from "vue";
import {ElMessage, ElMessageBox} from "element-plus";
import useUserStore from "@/store/modules/user";
import {
  addNotice,
  delNotice,
  getCount,
  listNotice,
  updateNotice
} from "../../../api/collaborativeApproval/noticeManagement.js";
import pagination from "../../../components/PIMTable/Pagination.vue";

const userStore = useUserStore();

// 响应式数据
const data = reactive({
  searchForm: {
    noticeTitle: "",
    noticeType: "",
    status: "",
    title: "",
    type: undefined,
    status: undefined,
  },
  form: {
    id: undefined,
    noticeTitle: "",
    noticeType: "",
    noticeContent: "",
    status: "0",
    priority: "1",
    title: "",
    type: null,
    content: "",
    status: 0,
    priority: 1,
    remark: "",
    createBy: "",
    createTime: "",
  },
  rules: {
    noticeTitle: [
      { required: true, message: "公告标题不能为空", trigger: "blur" }
    title: [
      {required: true, message: "公告标题不能为空", trigger: "blur"}
    ],
    noticeType: [
      { required: true, message: "请选择公告类型", trigger: "change" }
    type: [
      {required: true, message: "请选择公告类型", trigger: "change"}
    ],
    noticeContent: [
      { required: true, message: "公告内容不能为空", trigger: "blur" }
    content: [
      {required: true, message: "公告内容不能为空", trigger: "blur"}
    ]
  }
});

const { searchForm, form, rules } = toRefs(data);
const {searchForm, form, rules} = toRefs(data);

// 页面状态
const dialogVisible = ref(false);
@@ -266,127 +296,28 @@
const selectedIds = ref([]);
const formRef = ref();

// 模拟数据 - 根据法定节假日设计
const mockData = [
  {
    id: 1,
    noticeTitle: "2024年春节放假通知",
    noticeType: "1",
    priority: "2",
    status: "1",
    noticeContent: "根据国务院办公厅通知，2024年春节放假安排如下：2月10日（初一）至2月17日（初八）放假调休，共8天。2月4日（星期日）、2月18日（星期日）上班。请各部门提前做好工作安排。",
    remark: "放假期间请保持手机畅通，如有紧急事务及时联系",
    createBy: "人事部",
    createTime: "2025-01-15 10:30:00"
  },
  {
    id: 2,
    noticeTitle: "2024年清明节放假通知",
    noticeType: "1",
    priority: "1",
    status: "1",
    noticeContent: "根据国务院办公厅通知，2024年清明节放假安排如下：4月4日（星期四）至4月6日（星期六）放假调休，共3天。4月7日（星期日）上班。",
    remark: "请各部门做好值班安排，确保节日期间各项工作正常运转",
    createBy: "行政部",
    createTime: "2025-01-14 14:20:00"
  },
  {
    id: 3,
    noticeTitle: "2024年劳动节放假通知",
    noticeType: "1",
    priority: "1",
    status: "1",
    noticeContent: "根据国务院办公厅通知，2024年劳动节放假安排如下：5月1日（星期三）至5月5日（星期日）放假调休，共5天。4月28日（星期日）、5月11日（星期六）上班。",
    remark: "放假前请关闭电源，锁好门窗，注意安全",
    createBy: "行政部",
    createTime: "2025-01-13 09:15:00"
  },
  {
    id: 4,
    noticeTitle: "2024年端午节放假通知",
    noticeType: "1",
    priority: "1",
    status: "1",
    noticeContent: "根据国务院办公厅通知，2024年端午节放假安排如下：6月8日（星期六）至6月10日（星期一）放假调休，共3天。6月11日（星期二）上班。",
    remark: "祝大家端午节快乐，阖家幸福！",
    createBy: "行政部",
    createTime: "2025-01-12 16:30:00"
  },
  {
    id: 5,
    noticeTitle: "2024年中秋节放假通知",
    noticeType: "1",
    priority: "1",
    status: "1",
    noticeContent: "根据国务院办公厅通知，2024年中秋节放假安排如下：9月15日（星期日）至9月17日（星期二）放假调休，共3天。9月14日（星期六）上班。",
    remark: "中秋佳节，祝大家团圆美满，幸福安康！",
    createBy: "行政部",
    createTime: "2025-01-11 11:20:00"
  },
  {
    id: 6,
    noticeTitle: "2024年国庆节放假通知",
    noticeType: "1",
    priority: "2",
    status: "1",
    noticeContent: "根据国务院办公厅通知，2024年国庆节放假安排如下：10月1日（星期二）至10月7日（星期一）放假调休，共7天。9月29日（星期日）、10月12日（星期六）上班。",
    remark: "国庆期间请各部门做好值班安排，确保安全稳定",
    createBy: "行政部",
    createTime: "2025-01-10 15:45:00"
  },
  {
    id: 7,
    noticeTitle: "A车间生产线年度检修通知",
    noticeType: "2",
    priority: "2",
    status: "1",
    noticeContent: "A车间生产线将于2024年1月20日（周六）进行年度检修维护，预计停工8小时。检修内容包括：设备清洁、润滑保养、安全装置检查等。请生产部门提前调整生产计划。",
    remark: "维修期间请相关人员配合，确保检修工作安全顺利进行",
    createBy: "设备部",
    createTime: "2025-01-14 14:20:00"
  },
  {
    id: 8,
    noticeTitle: "B车间设备预防性维护通知",
    noticeType: "2",
    priority: "1",
    status: "1",
    noticeContent: "B车间关键设备将于2024年1月25日进行预防性维护，预计停工4小时。维护内容包括：设备检查、零件更换、性能测试等。请相关部门配合。",
    remark: "维护完成后将进行试运行，确保设备正常运行",
    createBy: "设备部",
    createTime: "2025-01-13 09:15:00"
  }
];

// 计算属性
const filteredNotices = computed(() => {
  let filtered = [...mockData];
  

  if (searchForm.value.noticeTitle) {
    filtered = filtered.filter(item => 
      item.noticeTitle.includes(searchForm.value.noticeTitle)
    filtered = filtered.filter(item =>
        item.noticeTitle.includes(searchForm.value.noticeTitle)
    );
  }
  if (searchForm.value.noticeType) {
    filtered = filtered.filter(item => 
      item.noticeType === searchForm.value.noticeType
    filtered = filtered.filter(item =>
        item.noticeType === searchForm.value.noticeType
    );
  }
  if (searchForm.value.status !== "") {
    filtered = filtered.filter(item => 
      item.status === searchForm.value.status
    filtered = filtered.filter(item =>
        item.status === searchForm.value.status
    );
  }
  

  return filtered;
});

const holidayNotices = computed(() => {
  return filteredNotices.value.filter(notice => notice.noticeType === "1");
});

const maintenanceNotices = computed(() => {
  return filteredNotices.value.filter(notice => notice.noticeType === "2");
});

// 方法定义
@@ -396,19 +327,19 @@

const resetQuery = () => {
  searchForm.value = {
    noticeTitle: "",
    noticeType: "",
    title: "",
    type: "",
    status: ""
  };
};

const getPriorityText = (priority) => {
  const priorityMap = { "1": "普通", "2": "重要", "3": "紧急" };
  const priorityMap = {"1": "普通", "2": "重要", "3": "紧急"};
  return priorityMap[priority] || "普通";
};

const getStatusText = (status) => {
  const statusMap = { "0": "草稿", "1": "已发布", "2": "已下线" };
  const statusMap = {"0": "草稿", "1": "已发布", "2": "已下线"};
  return statusMap[status] || "未知";
};

@@ -417,14 +348,12 @@
    dialogTitle.value = "新增公告";
    form.value = {
      id: undefined,
      noticeTitle: "",
      noticeType: "",
      noticeContent: "",
      status: "0",
      priority: "1",
      title: "",
      type: undefined,
      content: "",
      status: 0,
      priority: 1,
      remark: "",
      createBy: userStore.name || "当前用户",
      createTime: new Date().toLocaleString()
    };
  }
  dialogVisible.value = true;
@@ -432,29 +361,24 @@

const handleEdit = (row) => {
  dialogTitle.value = "编辑公告";
  form.value = { ...row };
  form.value = {...row};
  dialogVisible.value = true;
};

const handleSelectionChange = (selection) => {
  selectedIds.value = selection.map(item => item.id);
};

const handleDelete = (id) => {
  ElMessageBox.confirm(
    "确认删除这条公告吗？",
    "提示",
    {
      confirmButtonText: "确定",
      cancelButtonText: "取消",
      type: "warning"
    }
      "确认删除这条公告吗？",
      "提示",
      {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        type: "warning"
      }
  ).then(() => {
    const index = mockData.findIndex(item => item.id === id);
    if (index > -1) {
      mockData.splice(index, 1);
    delNotice(id).then(res => {
      ElMessage.success("删除成功");
    }
      resetTable()
    })
  });
};

@@ -463,25 +387,83 @@
    if (valid) {
      if (form.value.id) {
        // 编辑模式
        const index = mockData.findIndex(item => item.id === form.value.id);
        if (index > -1) {
          mockData[index] = { ...form.value };
        }
        ElMessage.success("修改成功");
        updateNotice(form.value).then(res => {
          ElMessage.success("修改成功");
          resetTable()
        })
      } else {
        // 新增模式
        const newId = Math.max(...mockData.map(item => item.id)) + 1;
        const newNotice = {
          ...form.value,
          id: newId,
          createTime: new Date().toLocaleString()
        };
        mockData.unshift(newNotice);
        ElMessage.success("新增成功");
        addNotice(form.value).then(res => {
          ElMessage.success("新增成功");
          resetTable()
        })
      }
      dialogVisible.value = false;
    }
  });
};

const holidayNoticeCount = ref()
const maintenanceNoticeCount = ref()
const fetchCount = () => {
  getCount().then(res => {
    holidayNoticeCount.value = res.data.filter(item => {
      return item.type === 1
    })[0].count;
    maintenanceNoticeCount.value = res.data.filter(item => {
      return item.type === 2
    })[0].count;
  });
}

const holidayNotices = ref([])
const maintenanceNotices = ref([])
const holidayNoticePage = ref({
  total: 0,
  current: 1,
  size: 6
})

const maintenanceNoticePage = ref({
  total: 0,
  current: 1,
  size: 6
})

const fetchHolidayNotices = () => {
  listNotice({...holidayNoticePage.value, type: 1}).then(res => {
    holidayNotices.value = res.data.records
    holidayNoticePage.value.total = res.data.total
  });
};

const fetchMaintenanceNotices = () => {
  listNotice({...holidayNoticePage.value, type: 2}).then(res => {
    maintenanceNotices.value = res.data.records
    maintenanceNoticePage.value.total = res.data.total
  });
};

const handleHolidayNoticeCurrentChange = (val) => {
  holidayNoticePage.value.size = val.limit
  holidayNoticePage.value.current = val.page
  fetchHolidayNotices()
};

const handleMaintenanceNoticeCurrentChange = (val) => {
  maintenanceNoticePage.value.size = val.limit
  maintenanceNoticePage.value.current = val.page
  fetchMaintenanceNotices()
};

const resetTable = () => {
  holidayNoticePage.value.current = 1
  holidayNoticePage.value.size = 6
  maintenanceNoticePage.value.current = 1
  maintenanceNoticePage.value.size = 6
  fetchHolidayNotices()
  fetchMaintenanceNotices()
  fetchCount()
};

const resetForm = () => {
@@ -490,7 +472,9 @@

// 生命周期
onMounted(() => {
  // 页面加载完成
  fetchCount()
  fetchHolidayNotices()
  fetchMaintenanceNotices()
});
</script>

@@ -645,13 +629,35 @@
  font-weight: 500;
}

.priority-1 { background: #f0f9ff; color: #0369a1; }
.priority-2 { background: #fef3c7; color: #d97706; }
.priority-3 { background: #fef2f2; color: #dc2626; }
.priority-1 {
  background: #f0f9ff;
  color: #0369a1;
}

.status-0 { background: #f3f4f6; color: #6b7280; }
.status-1 { background: #d1fae5; color: #059669; }
.status-2 { background: #fef3c7; color: #d97706; }
.priority-2 {
  background: #fef3c7;
  color: #d97706;
}

.priority-3 {
  background: #fef2f2;
  color: #dc2626;
}

.status-0 {
  background: #f3f4f6;
  color: #6b7280;
}

.status-1 {
  background: #d1fae5;
  color: #059669;
}

.status-2 {
  background: #fef3c7;
  color: #d97706;
}

.card-info {
  display: flex;
@@ -692,12 +698,12 @@
  .notice-cards {
    grid-template-columns: 1fr;
  }
  

  .search_form {
    flex-direction: column;
    gap: 15px;
  }
  

  .search_form > div {
    width: 100%;
  }

 src/views/inventoryManagement/dispatchLog/index.vue

@@ -19,7 +19,6 @@
        <!-- <el-button type="primary" @click="openForm('add')">新增</el-button> -->
        <el-button @click="handleOut">导出</el-button>
        <el-button type="danger" plain @click="handleDelete">删除</el-button>
        <el-button type="primary" plain @click="handlePrint">打印</el-button>
      </div>
    </div>
    <div class="table_list">
@@ -37,12 +36,6 @@
      >
        <el-table-column align="center" type="selection" width="55" />
        <el-table-column align="center" label="序号" type="index" width="60" />
        <el-table-column
            label="出库编号"
            prop="code"
            min-width="250"
            show-overflow-tooltip
        />
        <el-table-column
          label="出库日期"
          prop="createTime"

 src/views/procurementManagement/procurementInvoiceLedger/index.vue

@@ -172,11 +172,6 @@
      width: 240,
    },
    {
      label: "产品大类",
      prop: "productCategory",
      width: 150,
    },
    {
      label: "规格型号",
      prop: "specificationModel",
      width: 150,
@@ -195,17 +190,12 @@
      },
    },
    {
      label: "本次来票数",
      prop: "ticketsNum",
      width: 110,
    },
    {
      label: "来票日期",
      label: "开票日期",
      prop: "createdAt",
      width: 110,
    },
    {
      label: "来票金额(元)",
      label: "开票金额",
      prop: "ticketsAmount",
      width: 200,
      formatData: (cell) => {

 vite.config.js

@@ -9,7 +9,7 @@
  const baseUrl =

    VITE_APP_ENV == "development"

      ? "http://114.132.189.42:8089" // 开发环境后端接口

      : "http://114.132.189.42:1234"; // 生产环境后端接口

      : "http://114.132.189.42:8089"; // 生产环境后端接口



  return {

    // 部署生产环境和开发环境下的URL。

			@@ -1,8 +1,8 @@
			# 页面标题
			VITE_APP_TITLE = 中强恒兴管理系统
			VITE_APP_TITLE = 测试进销存管理系统

			# 开发环境配置
			VITE_APP_ENV = 'development'

			# 中强恒兴管理系统/开发环境
			# 测试进销存管理系统/开发环境
			VITE_APP_BASE_API = '/dev-api'

			@@ -1,10 +1,10 @@
			# 页面标题
			VITE_APP_TITLE = 中强恒兴管理系统
			VITE_APP_TITLE = 测试进销存管理系统

			# 生产环境配置
			VITE_APP_ENV = 'production'

			# 中强恒兴管理系统/生产环境
			# 测试进销存管理系统/生产环境
			VITE_APP_BASE_API = '/prod-api'

			# 是否在打包时开启压缩，支持 gzip 和 brotli

			@@ -1,215 +1,217 @@
			<!DOCTYPE html>
			<html>

			<head>
			<meta charset="utf-8">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			<meta name="renderer" content="webkit">
			<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
			<link rel="icon" href="/ZQHXico.ico">
			<title>中强恒兴管理系统</title>
			<!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
			<style>
			html,
			body,
			#app {
			height: 100%;
			margin: 0px;
			padding: 0px;
			}

			.chromeframe {
			margin: 0.2em 0;
			background: #ccc;
			color: #000;
			padding: 0.2em 0;
			}

			#loader-wrapper {
			position: fixed;
			top: 0;
			left: 0;
			width: 100%;
			height: 100%;
			z-index: 999999;
			}

			#loader {
			display: block;
			position: relative;
			left: 50%;
			top: 50%;
			width: 150px;
			height: 150px;
			margin: -75px 0 0 -75px;
			border-radius: 50%;
			border: 3px solid transparent;
			border-top-color: #FFF;
			-webkit-animation: spin 2s linear infinite;
			-ms-animation: spin 2s linear infinite;
			-moz-animation: spin 2s linear infinite;
			-o-animation: spin 2s linear infinite;
			animation: spin 2s linear infinite;
			z-index: 1001;
			}

			#loader:before {
			content: "";
			position: absolute;
			top: 5px;
			left: 5px;
			right: 5px;
			bottom: 5px;
			border-radius: 50%;
			border: 3px solid transparent;
			border-top-color: #FFF;
			-webkit-animation: spin 3s linear infinite;
			-moz-animation: spin 3s linear infinite;
			-o-animation: spin 3s linear infinite;
			-ms-animation: spin 3s linear infinite;
			animation: spin 3s linear infinite;
			}

			#loader:after {
			content: "";
			position: absolute;
			top: 15px;
			left: 15px;
			right: 15px;
			bottom: 15px;
			border-radius: 50%;
			border: 3px solid transparent;
			border-top-color: #FFF;
			-moz-animation: spin 1.5s linear infinite;
			-o-animation: spin 1.5s linear infinite;
			-ms-animation: spin 1.5s linear infinite;
			-webkit-animation: spin 1.5s linear infinite;
			animation: spin 1.5s linear infinite;
			}


			@-webkit-keyframes spin {
			0% {
			-webkit-transform: rotate(0deg);
			-ms-transform: rotate(0deg);
			transform: rotate(0deg);
			<head>
			<meta charset="utf-8" />
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
			<meta name="renderer" content="webkit" />
			<meta
			name="viewport"
			content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"
			/>
			<link rel="icon" href="/ZQHXico.ico" />
			<title>测试进销存管理系统</title>
			<!--[if lt IE 11
			]><script>
			window.location.href = "/html/ie.html";
			</script><!
			[endif]-->
			<style>
			html,
			body,
			#app {
			height: 100%;
			margin: 0px;
			padding: 0px;
			}

			100% {
			-webkit-transform: rotate(360deg);
			-ms-transform: rotate(360deg);
			transform: rotate(360deg);
			}
			}

			@keyframes spin {
			0% {
			-webkit-transform: rotate(0deg);
			-ms-transform: rotate(0deg);
			transform: rotate(0deg);
			.chromeframe {
			margin: 0.2em 0;
			background: #ccc;
			color: #000;
			padding: 0.2em 0;
			}

			100% {
			-webkit-transform: rotate(360deg);
			-ms-transform: rotate(360deg);
			transform: rotate(360deg);
			#loader-wrapper {
			position: fixed;
			top: 0;
			left: 0;
			width: 100%;
			height: 100%;
			z-index: 999999;
			}
			}

			#loader {
			display: block;
			position: relative;
			left: 50%;
			top: 50%;
			width: 150px;
			height: 150px;
			margin: -75px 0 0 -75px;
			border-radius: 50%;
			border: 3px solid transparent;
			border-top-color: #fff;
			-webkit-animation: spin 2s linear infinite;
			-ms-animation: spin 2s linear infinite;
			-moz-animation: spin 2s linear infinite;
			-o-animation: spin 2s linear infinite;
			animation: spin 2s linear infinite;
			z-index: 1001;
			}

			#loader-wrapper .loader-section {
			position: fixed;
			top: 0;
			width: 51%;
			height: 100%;
			background: #7171C6;
			z-index: 1000;
			-webkit-transform: translateX(0);
			-ms-transform: translateX(0);
			transform: translateX(0);
			}
			#loader:before {
			content: "";
			position: absolute;
			top: 5px;
			left: 5px;
			right: 5px;
			bottom: 5px;
			border-radius: 50%;
			border: 3px solid transparent;
			border-top-color: #fff;
			-webkit-animation: spin 3s linear infinite;
			-moz-animation: spin 3s linear infinite;
			-o-animation: spin 3s linear infinite;
			-ms-animation: spin 3s linear infinite;
			animation: spin 3s linear infinite;
			}

			#loader-wrapper .loader-section.section-left {
			left: 0;
			}
			#loader:after {
			content: "";
			position: absolute;
			top: 15px;
			left: 15px;
			right: 15px;
			bottom: 15px;
			border-radius: 50%;
			border: 3px solid transparent;
			border-top-color: #fff;
			-moz-animation: spin 1.5s linear infinite;
			-o-animation: spin 1.5s linear infinite;
			-ms-animation: spin 1.5s linear infinite;
			-webkit-animation: spin 1.5s linear infinite;
			animation: spin 1.5s linear infinite;
			}

			#loader-wrapper .loader-section.section-right {
			right: 0;
			}
			@-webkit-keyframes spin {
			0% {
			-webkit-transform: rotate(0deg);
			-ms-transform: rotate(0deg);
			transform: rotate(0deg);
			}

			100% {
			-webkit-transform: rotate(360deg);
			-ms-transform: rotate(360deg);
			transform: rotate(360deg);
			}
			}

			.loaded #loader-wrapper .loader-section.section-left {
			-webkit-transform: translateX(-100%);
			-ms-transform: translateX(-100%);
			transform: translateX(-100%);
			-webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
			transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
			}
			@keyframes spin {
			0% {
			-webkit-transform: rotate(0deg);
			-ms-transform: rotate(0deg);
			transform: rotate(0deg);
			}

			.loaded #loader-wrapper .loader-section.section-right {
			-webkit-transform: translateX(100%);
			-ms-transform: translateX(100%);
			transform: translateX(100%);
			-webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
			transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
			}
			100% {
			-webkit-transform: rotate(360deg);
			-ms-transform: rotate(360deg);
			transform: rotate(360deg);
			}
			}

			.loaded #loader {
			opacity: 0;
			-webkit-transition: all 0.3s ease-out;
			transition: all 0.3s ease-out;
			}
			#loader-wrapper .loader-section {
			position: fixed;
			top: 0;
			width: 51%;
			height: 100%;
			background: #7171c6;
			z-index: 1000;
			-webkit-transform: translateX(0);
			-ms-transform: translateX(0);
			transform: translateX(0);
			}

			.loaded #loader-wrapper {
			visibility: hidden;
			-webkit-transform: translateY(-100%);
			-ms-transform: translateY(-100%);
			transform: translateY(-100%);
			-webkit-transition: all 0.3s 1s ease-out;
			transition: all 0.3s 1s ease-out;
			}
			#loader-wrapper .loader-section.section-left {
			left: 0;
			}

			.no-js #loader-wrapper {
			display: none;
			}
			#loader-wrapper .loader-section.section-right {
			right: 0;
			}

			.no-js h1 {
			color: #222222;
			}
			.loaded #loader-wrapper .loader-section.section-left {
			-webkit-transform: translateX(-100%);
			-ms-transform: translateX(-100%);
			transform: translateX(-100%);
			-webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
			transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
			}

			#loader-wrapper .load_title {
			font-family: 'Open Sans';
			color: #FFF;
			font-size: 19px;
			width: 100%;
			text-align: center;
			z-index: 9999999999999;
			position: absolute;
			top: 60%;
			opacity: 1;
			line-height: 30px;
			}
			.loaded #loader-wrapper .loader-section.section-right {
			-webkit-transform: translateX(100%);
			-ms-transform: translateX(100%);
			transform: translateX(100%);
			-webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
			transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
			}

			#loader-wrapper .load_title span {
			font-weight: normal;
			font-style: italic;
			font-size: 13px;
			color: #FFF;
			opacity: 0.5;
			}
			</style>
			</head>
			.loaded #loader {
			opacity: 0;
			-webkit-transition: all 0.3s ease-out;
			transition: all 0.3s ease-out;
			}

			<body>
			<div id="app">
			<div id="loader-wrapper">
			<div id="loader"></div>
			<div class="loader-section section-left"></div>
			<div class="loader-section section-right"></div>
			<div class="load_title">正在加载系统资源，请耐心等待</div>
			.loaded #loader-wrapper {
			visibility: hidden;
			-webkit-transform: translateY(-100%);
			-ms-transform: translateY(-100%);
			transform: translateY(-100%);
			-webkit-transition: all 0.3s 1s ease-out;
			transition: all 0.3s 1s ease-out;
			}

			.no-js #loader-wrapper {
			display: none;
			}

			.no-js h1 {
			color: #222222;
			}

			#loader-wrapper .load_title {
			font-family: "Open Sans";
			color: #fff;
			font-size: 19px;
			width: 100%;
			text-align: center;
			z-index: 9999999999999;
			position: absolute;
			top: 60%;
			opacity: 1;
			line-height: 30px;
			}

			#loader-wrapper .load_title span {
			font-weight: normal;
			font-style: italic;
			font-size: 13px;
			color: #fff;
			opacity: 0.5;
			}
			</style>
			</head>

			<body>
			<div id="app">
			<div id="loader-wrapper">
			<div id="loader"></div>
			<div class="loader-section section-left"></div>
			<div class="loader-section section-right"></div>
			<div class="load_title">正在加载系统资源，请耐心等待</div>
			</div>
			</div>
			</div>
			<script type="module" src="/src/main.js"></script>
			</body>

			</html>
			<script type="module" src="/src/main.js"></script>
			</body>
			</html>

			@@ -1,7 +1,7 @@
			{
			"name": "ruoyi",
			"version": "3.8.9",
			"description": "中强恒兴管理系统",
			"description": "测试进销存管理系统",
			"author": "若依",
			"license": "MIT",
			"type": "module",

			@@ -97,14 +97,21 @@
			redirect: 'noredirect',
			children: [
			{
			path: 'profile',
			component: () => import('@/views/system/user/profile/index'),
			name: 'Profile',
			meta: { title: '个人中心', icon: 'user' }
			}
			]
			}
			]
			path: "profile",
			component: () => import("@/views/system/user/profile/index"),
			name: "Profile",
			meta: { title: "个人中心", icon: "user" },
			},
			],
			},
			{
			path: "/device-info",
			component: () => import("@/views/equipmentManagement/deviceInfo/index.vue"),
			hidden: true,
			name: "DeviceInfo",
			meta: { title: "设备信息", icon: "monitor" },
			},
			];

			// 动态路由，基于用户权限动态去加载
			export const dynamicRoutes = [

			@@ -2,30 +2,30 @@
			<div class="app-container">
			<!-- 搜索表单 -->
			<div class="search_form">
			<div>
			<span class="search_title">公告标题：</span>
			<el-input
			v-model="searchForm.noticeTitle"
			style="width: 240px"
			placeholder="请输入公告标题搜索"
			@change="handleQuery"
			clearable
			:prefix-icon="Search"
			/>
			<span class="search_title ml10">公告类型：</span>
			<el-select v-model="searchForm.noticeType" clearable @change="handleQuery" style="width: 240px">
			<el-option label="放假通知" value="1" />
			<el-option label="设备维修通知" value="2" />
			</el-select>
			<span class="search_title ml10">状态：</span>
			<el-select v-model="searchForm.status" clearable @change="handleQuery" style="width: 240px">
			<el-option label="草稿" value="0" />
			<el-option label="已发布" value="1" />
			<el-option label="已下线" value="2" />
			</el-select>
			<el-button type="primary" @click="handleQuery" style="margin-left: 10px">搜索</el-button>
			<el-button @click="resetQuery" style="margin-left: 10px">重置</el-button>
			</div>
			<!-- <div>-->
			<!-- <span class="search_title">公告标题：</span>-->
			<!-- <el-input-->
			<!-- v-model="searchForm.title"-->
			<!-- style="width: 240px"-->
			<!-- placeholder="请输入公告标题搜索"-->
			<!-- @change="handleQuery"-->
			<!-- clearable-->
			<!-- :prefix-icon="Search"-->
			<!-- />-->
			<!-- <span class="search_title ml10">公告类型：</span>-->
			<!-- <el-select v-model="searchForm.type" clearable @change="handleQuery" style="width: 240px">-->
			<!-- <el-option label="放假通知" :value="1"/>-->
			<!-- <el-option label="设备维修通知" :value="2"/>-->
			<!-- </el-select>-->
			<!-- <span class="search_title ml10">状态：</span>-->
			<!-- <el-select v-model="searchForm.status" clearable @change="handleQuery" style="width: 240px">-->
			<!-- <el-option label="草稿" :value="0"/>-->
			<!-- <el-option label="已发布" :value="1"/>-->
			<!-- <el-option label="已下线" :value="2"/>-->
			<!-- </el-select>-->
			<!-- <el-button type="primary" @click="handleQuery" style="margin-left: 10px">搜索</el-button>-->
			<!-- <el-button @click="resetQuery" style="margin-left: 10px">重置</el-button>-->
			<!-- </div>-->
			<div>
			<el-button type="primary" @click="openForm('add')">新增公告</el-button>
			<el-button type="danger" plain @click="handleDelete" :disabled="!selectedIds.length">删除</el-button>
			@@ -35,22 +35,24 @@
			<!-- 通知公告板 -->
			<div class="notice-board">
			<!-- 放假通知区域 -->
			<div class="notice-section" v-if="holidayNotices.length > 0">
			<div class="notice-section" v-if="holidayNoticeCount > 0">
			<div class="section-header">
			<h3>📅 放假通知</h3>
			<span class="section-count">{{ holidayNotices.length }}条</span>
			<span class="section-count">{{ holidayNoticeCount }}条</span>
			</div>
			<div class="notice-cards">
			<div
			v-for="notice in holidayNotices"
			:key="notice.id"
			class="notice-card holiday-card"
			:class="{ 'urgent': notice.priority === '3' }"
			<div
			v-for="notice in holidayNotices"
			:key="notice.id"
			class="notice-card holiday-card"
			:class="{ 'urgent': notice.priority === '3' }"
			>
			<div class="card-header">
			<div class="card-title">
			<el-icon class="holiday-icon"><Calendar /></el-icon>
			{{ notice.noticeTitle }}
			<el-icon class="holiday-icon">
			<Calendar/>
			</el-icon>
			{{ notice.title }}
			</div>
			<div class="card-actions">
			<el-button link type="primary" @click="handleEdit(notice)">编辑</el-button>
			@@ -58,7 +60,7 @@
			</div>
			</div>
			<div class="card-content">
			<p>{{ notice.noticeContent }}</p>
			<p>{{ notice.content }}</p>
			</div>
			<div class="card-footer">
			<div class="card-meta">
			@@ -70,35 +72,47 @@
			</span>
			</div>
			<div class="card-info">
			<span class="creator">{{ notice.createBy }}</span>
			<span class="creator">{{ notice.createUserName }}</span>
			<span class="time">{{ notice.createTime }}</span>
			</div>
			</div>
			<div class="card-remark" v-if="notice.remark">
			<el-icon><InfoFilled /></el-icon>
			<el-icon>
			<InfoFilled/>
			</el-icon>
			<span>{{ notice.remark }}</span>
			</div>
			</div>
			</div>
			</div>

			<pagination
			v-if="holidayNoticePage.total > 0"
			:total="holidayNoticePage.total"
			:page="holidayNoticePage.current"
			:limit="holidayNoticePage.size"
			@pagination="handleHolidayNoticeCurrentChange"
			/>

			<!-- 设备维修通知区域 -->
			<div class="notice-section" v-if="maintenanceNotices.length > 0">
			<div class="notice-section" v-if="maintenanceNoticeCount > 0">
			<div class="section-header">
			<h3>🔧 设备维修通知</h3>
			<span class="section-count">{{ maintenanceNotices.length }}条</span>
			<span class="section-count">{{ maintenanceNoticeCount }}条</span>
			</div>
			<div class="notice-cards">
			<div
			v-for="notice in maintenanceNotices"
			:key="notice.id"
			class="notice-card maintenance-card"
			:class="{ 'urgent': notice.priority === '3' }"
			<div
			v-for="notice in maintenanceNotices"
			:key="notice.id"
			class="notice-card maintenance-card"
			:class="{ 'urgent': notice.priority === '3' }"
			>
			<div class="card-header">
			<div class="card-title">
			<el-icon class="maintenance-icon"><Tools /></el-icon>
			{{ notice.noticeTitle }}
			<el-icon class="maintenance-icon">
			<Tools/>
			</el-icon>
			{{ notice.title }}
			</div>
			<div class="card-actions">
			<el-button link type="primary" @click="handleEdit(notice)">编辑</el-button>
			@@ -106,7 +120,7 @@
			</div>
			</div>
			<div class="card-content">
			<p>{{ notice.noticeContent }}</p>
			<p>{{ notice.content }}</p>
			</div>
			<div class="card-footer">
			<div class="card-meta">
			@@ -118,44 +132,54 @@
			</span>
			</div>
			<div class="card-info">
			<span class="creator">{{ notice.createBy }}</span>
			<span class="creator">{{ notice.createUserName }}</span>
			<span class="time">{{ notice.createTime }}</span>
			</div>
			</div>
			<div class="card-remark" v-if="notice.remark">
			<el-icon><InfoFilled /></el-icon>
			<el-icon>
			<InfoFilled/>
			</el-icon>
			<span>{{ notice.remark }}</span>
			</div>
			</div>
			</div>
			</div>

			<pagination
			v-if="maintenanceNoticePage.total > 0"
			:total="maintenanceNoticePage.total"
			:page="maintenanceNoticePage.current"
			:limit="maintenanceNoticePage.size"
			@pagination="handleMaintenanceNoticeCurrentChange"
			/>

			<!-- 空状态 -->
			<div class="empty-state" v-if="filteredNotices.length === 0">
			<el-empty description="暂无通知公告" />
			<div class="empty-state" v-if="holidayNotices.length === 0 && maintenanceNotices.length === 0">
			<el-empty description="暂无通知公告"/>
			</div>
			</div>

			<!-- 新增/编辑对话框 -->
			<el-dialog
			:title="dialogTitle"
			v-model="dialogVisible"
			width="800px"
			append-to-body
			@close="resetForm"
			<el-dialog
			:title="dialogTitle"
			v-model="dialogVisible"
			width="800px"
			append-to-body
			@close="resetForm"
			>
			<el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
			<el-row>
			<el-col :span="12">
			<el-form-item label="公告标题" prop="noticeTitle">
			<el-input v-model="form.noticeTitle" placeholder="请输入公告标题" />
			<el-form-item label="公告标题" prop="title">
			<el-input v-model="form.title" placeholder="请输入公告标题"/>
			</el-form-item>
			</el-col>
			<el-col :span="12">
			<el-form-item label="公告类型" prop="noticeType">
			<el-select v-model="form.noticeType" placeholder="请选择公告类型" style="width: 100%">
			<el-option label="放假通知" value="1" />
			<el-option label="设备维修通知" value="2" />
			<el-form-item label="公告类型" prop="type">
			<el-select v-model="form.type" placeholder="请选择公告类型" style="width: 100%">
			<el-option label="放假通知" :value="1"/>
			<el-option label="设备维修通知" :value="2"/>
			</el-select>
			</el-form-item>
			</el-col>
			@@ -164,18 +188,18 @@
			<el-col :span="12">
			<el-form-item label="状态">
			<el-radio-group v-model="form.status">
			<el-radio value="0">草稿</el-radio>
			<el-radio value="1">已发布</el-radio>
			<el-radio value="2">已下线</el-radio>
			<el-radio :value="0">草稿</el-radio>
			<el-radio :value="1">已发布</el-radio>
			<el-radio :value="2">已下线</el-radio>
			</el-radio-group>
			</el-form-item>
			</el-col>
			<el-col :span="12">
			<el-form-item label="优先级">
			<el-select v-model="form.priority" placeholder="请选择优先级" style="width: 100%">
			<el-option label="普通" value="1" />
			<el-option label="重要" value="2" />
			<el-option label="紧急" value="3" />
			<el-option label="普通" :value="1"/>
			<el-option label="重要" :value="2"/>
			<el-option label="紧急" :value="3"/>
			</el-select>
			</el-form-item>
			</el-col>
			@@ -184,12 +208,12 @@
			<el-col :span="24">
			<el-form-item label="公告内容" prop="noticeContent">
			<el-input
			v-model="form.noticeContent"
			type="textarea"
			:rows="6"
			placeholder="请输入公告内容"
			maxlength="500"
			show-word-limit
			v-model="form.content"
			type="textarea"
			:rows="6"
			placeholder="请输入公告内容"
			maxlength="500"
			show-word-limit
			/>
			</el-form-item>
			</el-col>
			@@ -198,12 +222,12 @@
			<el-col :span="24">
			<el-form-item label="备注">
			<el-input
			v-model="form.remark"
			type="textarea"
			:rows="3"
			placeholder="请输入备注信息"
			maxlength="200"
			show-word-limit
			v-model="form.remark"
			type="textarea"
			:rows="3"
			placeholder="请输入备注信息"
			maxlength="200"
			show-word-limit
			/>
			</el-form-item>
			</el-col>
			@@ -220,45 +244,51 @@
			</template>

			<script setup>
			import { Search, Calendar, Tools, InfoFilled } from "@element-plus/icons-vue";
			import { onMounted, ref, reactive, toRefs, computed } from "vue";
			import { ElMessage, ElMessageBox } from "element-plus";
			import {Search, Calendar, Tools, InfoFilled} from "@element-plus/icons-vue";
			import {onMounted, ref, reactive, toRefs, computed} from "vue";
			import {ElMessage, ElMessageBox} from "element-plus";
			import useUserStore from "@/store/modules/user";
			import {
			addNotice,
			delNotice,
			getCount,
			listNotice,
			updateNotice
			} from "../../../api/collaborativeApproval/noticeManagement.js";
			import pagination from "../../../components/PIMTable/Pagination.vue";

			const userStore = useUserStore();

			// 响应式数据
			const data = reactive({
			searchForm: {
			noticeTitle: "",
			noticeType: "",
			status: "",
			title: "",
			type: undefined,
			status: undefined,
			},
			form: {
			id: undefined,
			noticeTitle: "",
			noticeType: "",
			noticeContent: "",
			status: "0",
			priority: "1",
			title: "",
			type: null,
			content: "",
			status: 0,
			priority: 1,
			remark: "",
			createBy: "",
			createTime: "",
			},
			rules: {
			noticeTitle: [
			{ required: true, message: "公告标题不能为空", trigger: "blur" }
			title: [
			{required: true, message: "公告标题不能为空", trigger: "blur"}
			],
			noticeType: [
			{ required: true, message: "请选择公告类型", trigger: "change" }
			type: [
			{required: true, message: "请选择公告类型", trigger: "change"}
			],
			noticeContent: [
			{ required: true, message: "公告内容不能为空", trigger: "blur" }
			content: [
			{required: true, message: "公告内容不能为空", trigger: "blur"}
			]
			}
			});

			const { searchForm, form, rules } = toRefs(data);
			const {searchForm, form, rules} = toRefs(data);

			// 页面状态
			const dialogVisible = ref(false);
			@@ -266,127 +296,28 @@
			const selectedIds = ref([]);
			const formRef = ref();

			// 模拟数据 - 根据法定节假日设计
			const mockData = [
			{
			id: 1,
			noticeTitle: "2024年春节放假通知",
			noticeType: "1",
			priority: "2",
			status: "1",
			noticeContent: "根据国务院办公厅通知，2024年春节放假安排如下：2月10日（初一）至2月17日（初八）放假调休，共8天。2月4日（星期日）、2月18日（星期日）上班。请各部门提前做好工作安排。",
			remark: "放假期间请保持手机畅通，如有紧急事务及时联系",
			createBy: "人事部",
			createTime: "2025-01-15 10:30:00"
			},
			{
			id: 2,
			noticeTitle: "2024年清明节放假通知",
			noticeType: "1",
			priority: "1",
			status: "1",
			noticeContent: "根据国务院办公厅通知，2024年清明节放假安排如下：4月4日（星期四）至4月6日（星期六）放假调休，共3天。4月7日（星期日）上班。",
			remark: "请各部门做好值班安排，确保节日期间各项工作正常运转",
			createBy: "行政部",
			createTime: "2025-01-14 14:20:00"
			},
			{
			id: 3,
			noticeTitle: "2024年劳动节放假通知",
			noticeType: "1",
			priority: "1",
			status: "1",
			noticeContent: "根据国务院办公厅通知，2024年劳动节放假安排如下：5月1日（星期三）至5月5日（星期日）放假调休，共5天。4月28日（星期日）、5月11日（星期六）上班。",
			remark: "放假前请关闭电源，锁好门窗，注意安全",
			createBy: "行政部",
			createTime: "2025-01-13 09:15:00"
			},
			{
			id: 4,
			noticeTitle: "2024年端午节放假通知",
			noticeType: "1",
			priority: "1",
			status: "1",
			noticeContent: "根据国务院办公厅通知，2024年端午节放假安排如下：6月8日（星期六）至6月10日（星期一）放假调休，共3天。6月11日（星期二）上班。",
			remark: "祝大家端午节快乐，阖家幸福！",
			createBy: "行政部",
			createTime: "2025-01-12 16:30:00"
			},
			{
			id: 5,
			noticeTitle: "2024年中秋节放假通知",
			noticeType: "1",
			priority: "1",
			status: "1",
			noticeContent: "根据国务院办公厅通知，2024年中秋节放假安排如下：9月15日（星期日）至9月17日（星期二）放假调休，共3天。9月14日（星期六）上班。",
			remark: "中秋佳节，祝大家团圆美满，幸福安康！",
			createBy: "行政部",
			createTime: "2025-01-11 11:20:00"
			},
			{
			id: 6,
			noticeTitle: "2024年国庆节放假通知",
			noticeType: "1",
			priority: "2",
			status: "1",
			noticeContent: "根据国务院办公厅通知，2024年国庆节放假安排如下：10月1日（星期二）至10月7日（星期一）放假调休，共7天。9月29日（星期日）、10月12日（星期六）上班。",
			remark: "国庆期间请各部门做好值班安排，确保安全稳定",
			createBy: "行政部",
			createTime: "2025-01-10 15:45:00"
			},
			{
			id: 7,
			noticeTitle: "A车间生产线年度检修通知",
			noticeType: "2",
			priority: "2",
			status: "1",
			noticeContent: "A车间生产线将于2024年1月20日（周六）进行年度检修维护，预计停工8小时。检修内容包括：设备清洁、润滑保养、安全装置检查等。请生产部门提前调整生产计划。",
			remark: "维修期间请相关人员配合，确保检修工作安全顺利进行",
			createBy: "设备部",
			createTime: "2025-01-14 14:20:00"
			},
			{
			id: 8,
			noticeTitle: "B车间设备预防性维护通知",
			noticeType: "2",
			priority: "1",
			status: "1",
			noticeContent: "B车间关键设备将于2024年1月25日进行预防性维护，预计停工4小时。维护内容包括：设备检查、零件更换、性能测试等。请相关部门配合。",
			remark: "维护完成后将进行试运行，确保设备正常运行",
			createBy: "设备部",
			createTime: "2025-01-13 09:15:00"
			}
			];

			// 计算属性
			const filteredNotices = computed(() => {
			let filtered = [...mockData];


			if (searchForm.value.noticeTitle) {
			filtered = filtered.filter(item =>
			item.noticeTitle.includes(searchForm.value.noticeTitle)
			filtered = filtered.filter(item =>
			item.noticeTitle.includes(searchForm.value.noticeTitle)
			);
			}
			if (searchForm.value.noticeType) {
			filtered = filtered.filter(item =>
			item.noticeType === searchForm.value.noticeType
			filtered = filtered.filter(item =>
			item.noticeType === searchForm.value.noticeType
			);
			}
			if (searchForm.value.status !== "") {
			filtered = filtered.filter(item =>
			item.status === searchForm.value.status
			filtered = filtered.filter(item =>
			item.status === searchForm.value.status
			);
			}


			return filtered;
			});

			const holidayNotices = computed(() => {
			return filteredNotices.value.filter(notice => notice.noticeType === "1");
			});

			const maintenanceNotices = computed(() => {
			return filteredNotices.value.filter(notice => notice.noticeType === "2");
			});

			// 方法定义
			@@ -396,19 +327,19 @@

			const resetQuery = () => {
			searchForm.value = {
			noticeTitle: "",
			noticeType: "",
			title: "",
			type: "",
			status: ""
			};
			};

			const getPriorityText = (priority) => {
			const priorityMap = { "1": "普通", "2": "重要", "3": "紧急" };
			const priorityMap = {"1": "普通", "2": "重要", "3": "紧急"};
			return priorityMap[priority] \|\| "普通";
			};

			const getStatusText = (status) => {
			const statusMap = { "0": "草稿", "1": "已发布", "2": "已下线" };
			const statusMap = {"0": "草稿", "1": "已发布", "2": "已下线"};
			return statusMap[status] \|\| "未知";
			};

			@@ -417,14 +348,12 @@
			dialogTitle.value = "新增公告";
			form.value = {
			id: undefined,
			noticeTitle: "",
			noticeType: "",
			noticeContent: "",
			status: "0",
			priority: "1",
			title: "",
			type: undefined,
			content: "",
			status: 0,
			priority: 1,
			remark: "",
			createBy: userStore.name \|\| "当前用户",
			createTime: new Date().toLocaleString()
			};
			}
			dialogVisible.value = true;
			@@ -432,29 +361,24 @@

			const handleEdit = (row) => {
			dialogTitle.value = "编辑公告";
			form.value = { ...row };
			form.value = {...row};
			dialogVisible.value = true;
			};

			const handleSelectionChange = (selection) => {
			selectedIds.value = selection.map(item => item.id);
			};

			const handleDelete = (id) => {
			ElMessageBox.confirm(
			"确认删除这条公告吗？",
			"提示",
			{
			confirmButtonText: "确定",
			cancelButtonText: "取消",
			type: "warning"
			}
			"确认删除这条公告吗？",
			"提示",
			{
			confirmButtonText: "确定",
			cancelButtonText: "取消",
			type: "warning"
			}
			).then(() => {
			const index = mockData.findIndex(item => item.id === id);
			if (index > -1) {
			mockData.splice(index, 1);
			delNotice(id).then(res => {
			ElMessage.success("删除成功");
			}
			resetTable()
			})
			});
			};

			@@ -463,25 +387,83 @@
			if (valid) {
			if (form.value.id) {
			// 编辑模式
			const index = mockData.findIndex(item => item.id === form.value.id);
			if (index > -1) {
			mockData[index] = { ...form.value };
			}
			ElMessage.success("修改成功");
			updateNotice(form.value).then(res => {
			ElMessage.success("修改成功");
			resetTable()
			})
			} else {
			// 新增模式
			const newId = Math.max(...mockData.map(item => item.id)) + 1;
			const newNotice = {
			...form.value,
			id: newId,
			createTime: new Date().toLocaleString()
			};
			mockData.unshift(newNotice);
			ElMessage.success("新增成功");
			addNotice(form.value).then(res => {
			ElMessage.success("新增成功");
			resetTable()
			})
			}
			dialogVisible.value = false;
			}
			});
			};

			const holidayNoticeCount = ref()
			const maintenanceNoticeCount = ref()
			const fetchCount = () => {
			getCount().then(res => {
			holidayNoticeCount.value = res.data.filter(item => {
			return item.type === 1
			})[0].count;
			maintenanceNoticeCount.value = res.data.filter(item => {
			return item.type === 2
			})[0].count;
			});
			}

			const holidayNotices = ref([])
			const maintenanceNotices = ref([])
			const holidayNoticePage = ref({
			total: 0,
			current: 1,
			size: 6
			})

			const maintenanceNoticePage = ref({
			total: 0,
			current: 1,
			size: 6
			})

			const fetchHolidayNotices = () => {
			listNotice({...holidayNoticePage.value, type: 1}).then(res => {
			holidayNotices.value = res.data.records
			holidayNoticePage.value.total = res.data.total
			});
			};

			const fetchMaintenanceNotices = () => {
			listNotice({...holidayNoticePage.value, type: 2}).then(res => {
			maintenanceNotices.value = res.data.records
			maintenanceNoticePage.value.total = res.data.total
			});
			};

			const handleHolidayNoticeCurrentChange = (val) => {
			holidayNoticePage.value.size = val.limit
			holidayNoticePage.value.current = val.page
			fetchHolidayNotices()
			};

			const handleMaintenanceNoticeCurrentChange = (val) => {
			maintenanceNoticePage.value.size = val.limit
			maintenanceNoticePage.value.current = val.page
			fetchMaintenanceNotices()
			};

			const resetTable = () => {
			holidayNoticePage.value.current = 1
			holidayNoticePage.value.size = 6
			maintenanceNoticePage.value.current = 1
			maintenanceNoticePage.value.size = 6
			fetchHolidayNotices()
			fetchMaintenanceNotices()
			fetchCount()
			};

			const resetForm = () => {
			@@ -490,7 +472,9 @@

			// 生命周期
			onMounted(() => {
			// 页面加载完成
			fetchCount()
			fetchHolidayNotices()
			fetchMaintenanceNotices()
			});
			</script>

			@@ -645,13 +629,35 @@
			font-weight: 500;
			}

			.priority-1 { background: #f0f9ff; color: #0369a1; }
			.priority-2 { background: #fef3c7; color: #d97706; }
			.priority-3 { background: #fef2f2; color: #dc2626; }
			.priority-1 {
			background: #f0f9ff;
			color: #0369a1;
			}

			.status-0 { background: #f3f4f6; color: #6b7280; }
			.status-1 { background: #d1fae5; color: #059669; }
			.status-2 { background: #fef3c7; color: #d97706; }
			.priority-2 {
			background: #fef3c7;
			color: #d97706;
			}

			.priority-3 {
			background: #fef2f2;
			color: #dc2626;
			}

			.status-0 {
			background: #f3f4f6;
			color: #6b7280;
			}

			.status-1 {
			background: #d1fae5;
			color: #059669;
			}

			.status-2 {
			background: #fef3c7;
			color: #d97706;
			}

			.card-info {
			display: flex;
			@@ -692,12 +698,12 @@
			.notice-cards {
			grid-template-columns: 1fr;
			}


			.search_form {
			flex-direction: column;
			gap: 15px;
			}


			.search_form > div {
			width: 100%;
			}

			@@ -19,7 +19,6 @@
			<!-- <el-button type="primary" @click="openForm('add')">新增</el-button> -->
			<el-button @click="handleOut">导出</el-button>
			<el-button type="danger" plain @click="handleDelete">删除</el-button>
			<el-button type="primary" plain @click="handlePrint">打印</el-button>
			</div>
			</div>
			<div class="table_list">
			@@ -37,12 +36,6 @@
			>
			<el-table-column align="center" type="selection" width="55" />
			<el-table-column align="center" label="序号" type="index" width="60" />
			<el-table-column
			label="出库编号"
			prop="code"
			min-width="250"
			show-overflow-tooltip
			/>
			<el-table-column
			label="出库日期"
			prop="createTime"

			@@ -172,11 +172,6 @@
			width: 240,
			},
			{
			label: "产品大类",
			prop: "productCategory",
			width: 150,
			},
			{
			label: "规格型号",
			prop: "specificationModel",
			width: 150,
			@@ -195,17 +190,12 @@
			},
			},
			{
			label: "本次来票数",
			prop: "ticketsNum",
			width: 110,
			},
			{
			label: "来票日期",
			label: "开票日期",
			prop: "createdAt",
			width: 110,
			},
			{
			label: "来票金额(元)",
			label: "开票金额",
			prop: "ticketsAmount",
			width: 200,
			formatData: (cell) => {

			@@ -9,7 +9,7 @@
			const baseUrl =
			VITE_APP_ENV == "development"
			? "http://114.132.189.42:8089" // 开发环境后端接口
			: "http://114.132.189.42:1234"; // 生产环境后端接口
			: "http://114.132.189.42:8089"; // 生产环境后端接口

			return {
			// 部署生产环境和开发环境下的URL。