Merge remote-tracking branch 'origin/master'

build/vite/optimize.ts

@@ -115,7 +115,7 @@ const include = [
   '@element-plus/icons-vue',
   'element-plus/es/components/footer/style/css',
   'element-plus/es/components/empty/style/css',
-  'element-plus/es/components/mention/style/css'
+  'element-plus/es/components/mention/style/css',
 ]
 
 const exclude = ['@iconify/json']

package.json

@@ -28,6 +28,10 @@
     "@element-plus/icons-vue": "^2.1.0",
     "@form-create/designer": "^3.2.6",
     "@form-create/element-ui": "^3.2.11",
+    "@fullcalendar/core": "6.1.17",
+    "@fullcalendar/daygrid": "^6.1.17",
+    "@fullcalendar/interaction": "^6.1.17",
+    "@fullcalendar/vue3": "^6.1.17",
     "@iconify/iconify": "^3.1.1",
     "@microsoft/fetch-event-source": "^2.0.1",
     "@videojs-player/vue": "^1.0.0",
@@ -38,6 +42,7 @@
     "animate.css": "^4.1.1",
     "axios": "^1.6.8",
     "benz-amr-recorder": "^1.1.5",
+    "bootstrap-icons": "^1.12.1",
     "bpmn-js-token-simulation": "^0.36.0",
     "camunda-bpmn-moddle": "^7.0.1",
     "cropperjs": "^1.6.1",

src/api/pms/iotmaintenancebom/index.ts

@@ -13,10 +13,13 @@ export interface IotMaintenanceBomVO {
   runningTimeRule: number   // 保养规则-运行时间(0启用 1停用)
   lastRunningTime: number // 上次保养运行时长(小时)
   nextRunningTime: number // 下次保养运行时长(小时)
+  timePeriodLead: number  // 运行时长周期提前量 H
   lastRunningKilometers: number // 上次保养运行公里数(千米)
   nextRunningKilometers: number // 下次保养运行公里数(千米)
-  lastNaturalDate: number // 上次保养自然日期(天)
+  kiloCycleLead: number // 公里数周期-提前量 km
+  lastNaturalDate: Date // 上次保养自然日期(天)
   nextNaturalDate: number // 下次保养自然日期(天)
+  naturalDatePeriodLead: number // 自然日周期-提前量(天)
   bomNodeId: number // bom节点id
   name: string // BOM名称
   code: string // BOM编码
@@ -34,6 +37,8 @@ export interface IotMaintenanceBomVO {
   deviceCode: string  // 设备编码
   deviceStatus: string  // 设备状态
   assetProperty: string //资产性质
+  totalMileage: number  // 累计运行公里数
+  totalRunTime: number  // 累计运行时间
 }
 
 // PMS 保养计划明细BOM API

src/api/pms/iotmainworkorderbom/index.ts

@@ -17,7 +17,7 @@ export interface IotMainWorkOrderBomVO {
   delayDuration: number // 推迟运行时长(小时)
   lastRunningKilometers: number // 上次保养运行公里数(千米)
   nextRunningKilometers: number // 下次保养运行公里数(千米)
-  delayKilomaters: number // 推迟运行公里数(千米)
+  delayKilometers: number // 推迟运行公里数(千米)
   lastNaturalDate: number // 上次保养自然日期(天)
   nextNaturalDate: number // 下次保养自然日期(天)
   delayNaturalDate: number // 推迟自然日期(天)
@@ -28,7 +28,7 @@ export interface IotMainWorkOrderBomVO {
   kilometerCycle: number // 公里数周期(千米)
   kiloCycleLead: number // 公里数周期-提前量(千米)
   naturalDatePeriod: number // 自然日周期(天)
-  naturalDatePeroidLead: number // 自然日周期-提前量(天)
+  naturalDatePeriodLead: number // 自然日周期-提前量(天)
   bomNodeId: number // BOM节点id
   name: string // BOM名称
   code: string // BOM编码

src/router/modules/remaining.ts

@@ -265,6 +265,30 @@ const remainingRouter: AppRouteRecordRaw[] = [
     ]
   },
 
+  {
+    path: '/iotpms/maincalendar',
+    component: Layout,
+    name: 'PmsMainCalendarCenter',
+    meta: {
+      hidden: true
+    },
+    children: [
+      {
+        path: 'maintenancecalendar',
+        component: () => import('@/views/pms/iotmaincalendar/index.vue'),
+        name: 'MaintenanceCalendar',
+        meta: {
+          noCache: false,
+          hidden: true,
+          canTo: true,
+          icon: 'ep:menu',
+          title: '保养台历',
+          activeMenu: '/maintenancecalendar/index'
+        }
+      }
+    ]
+  },
+
   {
     path: '/iotpms/iotmaintain',
     component: Layout,

src/utils/dict.ts

@@ -265,4 +265,5 @@ export enum DICT_TYPE {
 
   // ========== PMS模块  ==========
   PMS_BOM_NODE_EXT_ATTR = 'BOM_NODE_EXT_ATTR', // BOM节点扩展属性 维护 or 保养
+  PMS_MAIN_WORK_ORDER_TYPE = 'pms_main_work_order_type', // 保养工单类型
 }

src/views/pms/iotmaincalendar/index.vue

@@ -0,0 +1,196 @@
+<template>
+  <div class="calendar-container">
+    <!-- 加载状态 -->
+    <div v-if="loading" class="loading">加载中...</div>
+
+    <!-- 主体日历 -->
+    <FullCalendar
+      ref="calendar"
+      class="main-calendar"
+      :options="calendarOptions"
+    />
+  </div>
+</template>
+
+<script setup>
+import { ref, onMounted } from 'vue'
+import { useRouter } from 'vue-router'
+import FullCalendar from '@fullcalendar/vue3'
+import dayGridPlugin from '@fullcalendar/daygrid'
+import interactionPlugin from '@fullcalendar/interaction'
+import '@fullcalendar/core/locales-all'
+import 'bootstrap-icons/font/bootstrap-icons.css'
+
+defineOptions({ name: 'MaintenanceCalendar' })
+
+const router = useRouter()
+const loading = ref(false)
+const calendar = ref(null)
+
+// 模拟API返回的数据结构
+const mockData = {
+  '2023-08-01': { plans: 3, orders: 2 },
+  '2023-08-15': { plans: 5, orders: 1 },
+  '2023-08-20': { plans: 2, orders: 4 }
+}
+
+// 日历配置
+const calendarOptions = ref({
+  plugins: [dayGridPlugin, interactionPlugin],
+  // locales: [zhCn],
+  locale: 'zh-cn',
+  initialView: 'dayGridMonth',
+  headerToolbar: {
+    left: 'prev,next today',
+    center: 'title',
+    right: 'dayGridMonth,dayGridWeek'
+  },
+  buttonText: { // ✨ 自定义按钮文本（可选）
+    today: '今天',
+    month: '月视图',
+    week: '周视图'
+  },
+  events: [],
+  datesSet: handleDatesSet, // 月份切换事件
+  eventContent: renderEventContent, // 自定义内容渲染
+  height: '80vh' // 占据80%视口高度
+})
+
+// 获取数据
+async function fetchCalendarData(dateRange) {
+  try {
+    loading.value = true
+    // 实际应替换为API调用，这里用mock数据
+    return mockData
+  } finally {
+    loading.value = false
+  }
+}
+
+// 处理日期范围变化
+async function handleDatesSet(dateInfo) {
+  const data = await fetchCalendarData({
+    start: dateInfo.startStr,
+    end: dateInfo.endStr
+  })
+
+  calendar.value.getApi().removeAllEvents()
+  Object.entries(data).forEach(([date, counts]) => {
+    calendar.value.getApi().addEvent({
+      title: `${counts.plans}|${counts.orders}`,
+      start: date,
+      allDay: true,
+      extendedProps: counts
+    })
+  })
+}
+
+// 自定义内容渲染
+function renderEventContent(eventInfo) {
+  const { plans, orders } = eventInfo.event.extendedProps
+  return {
+    html: `
+      <div class="calendar-day-content">
+        <div class="count-item">
+          <a class="plan-count" data-date="${eventInfo.event.startStr}">
+            <i class="bi bi-clipboard-check"></i> ${plans}
+          </a>
+        </div>
+        <div class="count-item">
+          <a class="order-count" data-date="${eventInfo.event.startStr}">
+            <i class="bi bi-tools"></i> ${orders}
+          </a>
+        </div>
+      </div>
+    `
+  }
+}
+
+// 处理点击事件
+function handleDayClick(event) {
+  if (event.target.classList.contains('plan-count')) {
+    const date = event.target.dataset.date
+    router.push({
+      path: '/maintenance/plans',
+      query: { date }
+    })
+  }
+
+  if (event.target.classList.contains('order-count')) {
+    const date = event.target.dataset.date
+    router.push({
+      path: '/maintenance/orders',
+      query: { date }
+    })
+  }
+}
+
+// 初始化
+onMounted(() => {
+  const calendarApi = calendar.value.getApi()
+  calendarApi.setOption('eventDidMount', (info) => {
+    info.el.addEventListener('click', handleDayClick)
+  })
+})
+</script>
+
+<style scoped>
+.calendar-container {
+  padding: 20px;
+  height: 100vh;
+}
+
+.main-calendar {
+  max-width: 1200px;
+  margin: 0 auto;
+}
+
+.loading {
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  padding: 10px 20px;
+  background: rgba(0,0,0,0.7);
+  color: white;
+  border-radius: 4px;
+}
+
+/* 自定义日历样式 */
+:deep(.fc-daygrid-day-frame) {
+  cursor: pointer;
+  min-height: 100px;
+}
+
+:deep(.calendar-day-content) {
+  padding: 5px;
+  font-size: 0.9em;
+}
+
+:deep(.count-item) {
+  margin: 2px 0;
+  padding: 2px;
+  border-radius: 3px;
+  transition: background 0.3s;
+}
+
+:deep(.plan-count) {
+  color: #1890ff;
+  text-decoration: none;
+  display: block;
+}
+
+:deep(.order-count) {
+  color: #52c41a;
+  text-decoration: none;
+  display: block;
+}
+
+:deep(.count-item:hover) {
+  background: #f5f5f5;
+}
+
+:deep(.bi) {
+  margin-right: 3px;
+}
+</style>

src/views/pms/iotmainworkorder/index.vue

@@ -8,182 +8,28 @@
       :inline="true"
       label-width="68px"
     >
-      <el-form-item label="保养计划id" prop="planId">
-        <el-input
-          v-model="queryParams.planId"
-          placeholder="请输入保养计划id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="保养计划编号" prop="planSerialNumber">
-        <el-input
-          v-model="queryParams.planSerialNumber"
-          placeholder="请输入保养计划编号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="组织id" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入组织id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="工单号" prop="orderNumber">
-        <el-input
-          v-model="queryParams.orderNumber"
-          placeholder="请输入工单号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="工单名称 (吐哈-C14-保养计划)" prop="name">
+      <el-form-item label="工单名称" prop="name">
         <el-input
           v-model="queryParams.name"
-          placeholder="请输入工单名称 (吐哈-C14-保养计划)"
+          placeholder="请输入工单名称"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="工单类型(1计划生成  2临时新建)" prop="type">
-        <el-select
-          v-model="queryParams.type"
-          placeholder="请选择工单类型(1计划生成  2临时新建)"
-          clearable
-          class="!w-240px"
-        >
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="负责人id 多个以逗号分隔" prop="responsiblePerson">
-        <el-input
-          v-model="queryParams.responsiblePerson"
-          placeholder="请输入负责人id 多个以逗号分隔"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="负责人id 多个以逗号分隔" prop="responsiblePersonName">
-        <el-input
-          v-model="queryParams.responsiblePersonName"
-          placeholder="请输入负责人id 多个以逗号分隔"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="保养费用" prop="cost">
-        <el-input
-          v-model="queryParams.cost"
-          placeholder="请输入保养费用"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="保养结果(1待执行 2已执行)" prop="result">
-        <el-input
-          v-model="queryParams.result"
-          placeholder="请输入保养结果(1待执行 2已执行)"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="其他费用" prop="otherCost">
-        <el-input
-          v-model="queryParams.otherCost"
-          placeholder="请输入其他费用"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="人工费用" prop="laborCost">
-        <el-input
-          v-model="queryParams.laborCost"
-          placeholder="请输入人工费用"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="是否委外 0否  1是" prop="outsourcingFlag">
-        <el-input
-          v-model="queryParams.outsourcingFlag"
-          placeholder="请输入是否委外 0否  1是"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="实际保养开始时间" prop="actualStartTime">
-        <el-date-picker
-          v-model="queryParams.actualStartTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-220px"
-        />
-      </el-form-item>
-      <el-form-item label="实际保养结束时间" prop="actualEndTime">
-        <el-date-picker
-          v-model="queryParams.actualEndTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-220px"
-        />
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input
-          v-model="queryParams.remark"
-          placeholder="请输入备注"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="状态 0启用  1停用" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="请选择状态 0启用  1停用"
-          clearable
-          class="!w-240px"
-        >
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="流程实例id" prop="processInstanceId">
-        <el-input
-          v-model="queryParams.processInstanceId"
-          placeholder="请输入流程实例id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="审批状态 未提交、审批中、审批通过、审批不通过、已取消" prop="auditStatus">
+      <el-form-item label="审批状态" prop="auditStatus">
         <el-select
           v-model="queryParams.auditStatus"
-          placeholder="请选择审批状态 未提交、审批中、审批通过、审批不通过、已取消"
+          placeholder="请选择审批状态"
           clearable
           class="!w-240px"
         >
-          <el-option label="请选择字典生成" value="" />
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.CRM_AUDIT_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="创建时间" prop="createTime">
@@ -224,20 +70,14 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="主键id" align="center" prop="id" />
-      <el-table-column label="保养计划id" align="center" prop="planId" />
-      <el-table-column label="保养计划编号" align="center" prop="planSerialNumber" />
-      <el-table-column label="组织id" align="center" prop="deptId" />
       <el-table-column label="工单号" align="center" prop="orderNumber" />
-      <el-table-column label="工单名称 (吐哈-C14-保养计划)" align="center" prop="name" />
-      <el-table-column label="工单类型(1计划生成  2临时新建)" align="center" prop="type" />
-      <el-table-column label="负责人id 多个以逗号分隔" align="center" prop="responsiblePerson" />
-      <el-table-column label="负责人id 多个以逗号分隔" align="center" prop="responsiblePersonName" />
-      <el-table-column label="保养费用" align="center" prop="cost" />
-      <el-table-column label="保养结果(1待执行 2已执行)" align="center" prop="result" />
-      <el-table-column label="其他费用" align="center" prop="otherCost" />
-      <el-table-column label="人工费用" align="center" prop="laborCost" />
-      <el-table-column label="是否委外 0否  1是" align="center" prop="outsourcingFlag" />
+      <el-table-column label="工单名称" align="center" prop="name" />
+      <el-table-column label="工单类型" align="center" prop="type" >
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.PMS_MAIN_WORK_ORDER_TYPE" :value="scope.row.type" />
+        </template>
+      </el-table-column>
+      <el-table-column label="负责人" align="center" prop="responsiblePersonName" />
       <el-table-column
         label="实际保养开始时间"
         align="center"
@@ -252,10 +92,6 @@
         :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="状态 0启用  1停用" align="center" prop="status" />
-      <el-table-column label="流程实例id" align="center" prop="processInstanceId" />
-      <el-table-column label="审批状态 未提交、审批中、审批通过、审批不通过、已取消" align="center" prop="auditStatus" />
       <el-table-column
         label="创建时间"
         align="center"
@@ -302,6 +138,7 @@ import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { IotMainWorkOrderApi, IotMainWorkOrderVO } from '@/api/pms/iotmainworkorder'
 import IotMainWorkOrderForm from './IotMainWorkOrderForm.vue'
+import {DICT_TYPE, getStrDictOptions} from "@/utils/dict";
 
 /** 保养工单 列表 */
 defineOptions({ name: 'IotMainWorkOrder' })
@@ -401,4 +238,4 @@ const handleExport = async () => {
 onMounted(() => {
   getList()
 })
-</script>
+</script>

src/views/pms/iotmainworkorderbom/IotMainWorkOrderBomForm.vue

@@ -51,7 +51,7 @@
         />
       </el-form-item>
       <el-form-item label="推迟运行时长(小时)" prop="delay duration">
-        <el-input v-model="formData.delay duration" placeholder="请输入推迟运行时长(小时)" />
+        <el-input v-model="formData.delayDuration" placeholder="请输入推迟运行时长(小时)" />
       </el-form-item>
       <el-form-item label="上次保养运行公里数(千米)" prop="lastRunningKilometers">
         <el-input v-model="formData.lastRunningKilometers" placeholder="请输入上次保养运行公里数(千米)" />
@@ -60,7 +60,7 @@
         <el-input v-model="formData.nextRunningKilometers" placeholder="请输入下次保养运行公里数(千米)" />
       </el-form-item>
       <el-form-item label="推迟运行公里数(千米)" prop="delayKilomaters">
-        <el-input v-model="formData.delayKilomaters" placeholder="请输入推迟运行公里数(千米)" />
+        <el-input v-model="formData.delayKilometers" placeholder="请输入推迟运行公里数(千米)" />
       </el-form-item>
       <el-form-item label="上次保养自然日期(天)" prop="lastNaturalDate">
         <el-date-picker
@@ -112,8 +112,8 @@
       <el-form-item label="自然日周期(天)" prop="naturalDatePeriod">
         <el-input v-model="formData.naturalDatePeriod" placeholder="请输入自然日周期(天)" />
       </el-form-item>
-      <el-form-item label="自然日周期-提前量(天)" prop="naturalDatePeroidLead">
-        <el-input v-model="formData.naturalDatePeroidLead" placeholder="请输入自然日周期-提前量(天)" />
+      <el-form-item label="自然日周期-提前量(天)" prop="naturalDatePeriodLead">
+        <el-input v-model="formData.naturalDatePeriodLead" placeholder="请输入自然日周期-提前量(天)" />
       </el-form-item>
       <el-form-item label="BOM节点id" prop="bomNodeId">
         <el-input v-model="formData.bomNodeId" placeholder="请输入BOM节点id" />
@@ -193,10 +193,10 @@ const formData = ref({
   runningTimeRule: undefined,
   lastRunningTime: undefined,
   nextRunningTime: undefined,
-  delay duration: undefined,
+  delayDuration: undefined,
   lastRunningKilometers: undefined,
   nextRunningKilometers: undefined,
-  delayKilomaters: undefined,
+  delayKilometers: undefined,
   lastNaturalDate: undefined,
   nextNaturalDate: undefined,
   delayNaturalDate: undefined,
@@ -207,7 +207,7 @@ const formData = ref({
   kilometerCycle: undefined,
   kiloCycleLead: undefined,
   naturalDatePeriod: undefined,
-  naturalDatePeroidLead: undefined,
+  naturalDatePeriodLead: undefined,
   bomNodeId: undefined,
   name: undefined,
   code: undefined,
@@ -283,10 +283,10 @@ const resetForm = () => {
     runningTimeRule: undefined,
     lastRunningTime: undefined,
     nextRunningTime: undefined,
-    delay duration: undefined,
+    delayDuration: undefined,
     lastRunningKilometers: undefined,
     nextRunningKilometers: undefined,
-    delayKilomaters: undefined,
+    delayKilometers: undefined,
     lastNaturalDate: undefined,
     nextNaturalDate: undefined,
     delayNaturalDate: undefined,
@@ -297,7 +297,7 @@ const resetForm = () => {
     kilometerCycle: undefined,
     kiloCycleLead: undefined,
     naturalDatePeriod: undefined,
-    naturalDatePeroidLead: undefined,
+    naturalDatePeriodLead: undefined,
     bomNodeId: undefined,
     name: undefined,
     code: undefined,
@@ -314,4 +314,4 @@ const resetForm = () => {
   }
   formRef.value?.resetFields()
 }
-</script>
+</script>

src/views/pms/iotmainworkorderbom/index.vue

@@ -138,9 +138,9 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="推迟运行公里数(千米)" prop="delayKilomaters">
+      <el-form-item label="推迟运行公里数(千米)" prop="delayKilometers">
         <el-input
-          v-model="queryParams.delayKilomaters"
+          v-model="queryParams.delayKilometers"
           placeholder="请输入推迟运行公里数(千米)"
           clearable
           @keyup.enter="handleQuery"
@@ -245,9 +245,9 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="自然日周期-提前量(天)" prop="naturalDatePeroidLead">
+      <el-form-item label="自然日周期-提前量(天)" prop="naturalDatePeriodLead">
         <el-input
-          v-model="queryParams.naturalDatePeroidLead"
+          v-model="queryParams.naturalDatePeriodLead"
           placeholder="请输入自然日周期-提前量(天)"
           clearable
           @keyup.enter="handleQuery"
@@ -427,7 +427,7 @@
       <el-table-column label="推迟运行时长(小时)" align="center" prop="delayDuration" />
       <el-table-column label="上次保养运行公里数(千米)" align="center" prop="lastRunningKilometers" />
       <el-table-column label="下次保养运行公里数(千米)" align="center" prop="nextRunningKilometers" />
-      <el-table-column label="推迟运行公里数(千米)" align="center" prop="delayKilomaters" />
+      <el-table-column label="推迟运行公里数(千米)" align="center" prop="delayKilometers" />
       <el-table-column label="上次保养自然日期(天)" align="center" prop="lastNaturalDate" />
       <el-table-column label="下次保养自然日期(天)" align="center" prop="nextNaturalDate" />
       <el-table-column label="推迟自然日期(天)" align="center" prop="delayNaturalDate" />
@@ -444,7 +444,7 @@
       <el-table-column label="公里数周期(千米)" align="center" prop="kilometerCycle" />
       <el-table-column label="公里数周期-提前量(千米)" align="center" prop="kiloCycleLead" />
       <el-table-column label="自然日周期(天)" align="center" prop="naturalDatePeriod" />
-      <el-table-column label="自然日周期-提前量(天)" align="center" prop="naturalDatePeroidLead" />
+      <el-table-column label="自然日周期-提前量(天)" align="center" prop="naturalDatePeriodLead" />
       <el-table-column label="BOM节点id" align="center" prop="bomNodeId" />
       <el-table-column label="BOM名称" align="center" prop="name" />
       <el-table-column label="BOM编码" align="center" prop="code" />
@@ -531,7 +531,7 @@ const queryParams = reactive({
   delayDuration: undefined,
   lastRunningKilometers: undefined,
   nextRunningKilometers: undefined,
-  delayKilomaters: undefined,
+  delayKilometers: undefined,
   lastNaturalDate: [],
   nextNaturalDate: [],
   delayNaturalDate: [],
@@ -542,7 +542,7 @@ const queryParams = reactive({
   kilometerCycle: undefined,
   kiloCycleLead: undefined,
   naturalDatePeriod: undefined,
-  naturalDatePeroidLead: undefined,
+  naturalDatePeriodLead: undefined,
   bomNodeId: undefined,
   name: undefined,
   code: undefined,

src/views/pms/iotmainworkorderbommaterial/IotMainWorkOrderBomMaterialForm.vue

@@ -61,8 +61,8 @@
       <el-form-item label="自然日周期(天)" prop="naturalDatePeriod">
         <el-input v-model="formData.naturalDatePeriod" placeholder="请输入自然日周期(天)" />
       </el-form-item>
-      <el-form-item label="自然日周期-提前量(天)" prop="naturalDatePeroidLead">
-        <el-input v-model="formData.naturalDatePeroidLead" placeholder="请输入自然日周期-提前量(天)" />
+      <el-form-item label="自然日周期-提前量(天)" prop="naturalDatePeriodLead">
+        <el-input v-model="formData.naturalDatePeriodLead" placeholder="请输入自然日周期-提前量(天)" />
       </el-form-item>
       <el-form-item label="物料来源 (SAP库存 本地库存...)" prop="materialSource">
         <el-input v-model="formData.materialSource" placeholder="请输入物料来源 (SAP库存 本地库存...)" />
@@ -121,7 +121,7 @@ const formData = ref({
   timePeriod: undefined,
   timePeriodLead: undefined,
   naturalDatePeriod: undefined,
-  naturalDatePeroidLead: undefined,
+  naturalDatePeriodLead: undefined,
   materialSource: undefined,
   inventoryAddress: undefined,
   sort: undefined,
@@ -196,7 +196,7 @@ const resetForm = () => {
     timePeriod: undefined,
     timePeriodLead: undefined,
     naturalDatePeriod: undefined,
-    naturalDatePeroidLead: undefined,
+    naturalDatePeriodLead: undefined,
     materialSource: undefined,
     inventoryAddress: undefined,
     sort: undefined,
@@ -205,4 +205,4 @@ const resetForm = () => {
   }
   formRef.value?.resetFields()
 }
-</script>
+</script>

src/views/pms/iotmainworkorderbommaterial/index.vue

@@ -170,9 +170,9 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="自然日周期-提前量(天)" prop="naturalDatePeroidLead">
+      <el-form-item label="自然日周期-提前量(天)" prop="naturalDatePeriodLead">
         <el-input
-          v-model="queryParams.naturalDatePeroidLead"
+          v-model="queryParams.naturalDatePeriodLead"
           placeholder="请输入自然日周期-提前量(天)"
           clearable
           @keyup.enter="handleQuery"
@@ -282,7 +282,7 @@
       <el-table-column label="时间周期(小时)" align="center" prop="timePeriod" />
       <el-table-column label="时间周期-提前量(小时)" align="center" prop="timePeriodLead" />
       <el-table-column label="自然日周期(天)" align="center" prop="naturalDatePeriod" />
-      <el-table-column label="自然日周期-提前量(天)" align="center" prop="naturalDatePeroidLead" />
+      <el-table-column label="自然日周期-提前量(天)" align="center" prop="naturalDatePeriodLead" />
       <el-table-column label="物料来源 (SAP库存 本地库存...)" align="center" prop="materialSource" />
       <el-table-column label="库存地点" align="center" prop="inventoryAddress" />
       <el-table-column label="排序" align="center" prop="sort" />
@@ -365,7 +365,7 @@ const queryParams = reactive({
   timePeriod: undefined,
   timePeriodLead: undefined,
   naturalDatePeriod: undefined,
-  naturalDatePeroidLead: undefined,
+  naturalDatePeriodLead: undefined,
   materialSource: undefined,
   inventoryAddress: undefined,
   sort: undefined,
@@ -438,4 +438,4 @@ const handleExport = async () => {
 onMounted(() => {
   getList()
 })
-</script>
+</script>

src/views/pms/maintenance/IotMaintenancePlan.vue

@@ -63,10 +63,10 @@
       <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
         <el-table-column label="设备编码" align="center" prop="deviceCode" />
         <el-table-column label="设备名称" align="center" prop="deviceName" />
-        <el-table-column label="运行时间(H)" align="center" prop="runningTime" :formatter="erpPriceTableColumnFormatter"/>
-        <el-table-column label="运行公里数(KM)" align="center" prop="runningKilometers" :formatter="erpPriceTableColumnFormatter"/>
+        <el-table-column label="累计运行时间(H)" align="center" prop="totalRunTime" :formatter="erpPriceTableColumnFormatter"/>
+        <el-table-column label="累计运行公里数(KM)" align="center" prop="totalMileage" :formatter="erpPriceTableColumnFormatter"/>
         <el-table-column label="BOM节点" align="center" prop="name" />
-        <el-table-column label="里程" key="mileageRule">
+        <el-table-column label="运行里程" key="mileageRule" width="80">
           <template #default="scope">
             <el-switch
               v-model="scope.row.mileageRule"
@@ -75,12 +75,14 @@
             />
           </template>
         </el-table-column>
+        <!--
         <el-table-column label="里程周期(H)" align="center" prop="nextRunningKilometers" :formatter="erpPriceTableColumnFormatter">
           <template #default="scope">
             <el-input v-model="scope.row.nextRunningKilometers" />
           </template>
         </el-table-column>
-        <el-table-column label="运行时间" key="runningTimeRule">
+        -->
+        <el-table-column label="运行时间" key="runningTimeRule" width="80">
           <template #default="scope">
             <el-switch
               v-model="scope.row.runningTimeRule"
@@ -89,12 +91,14 @@
             />
           </template>
         </el-table-column>
+        <!--
         <el-table-column label="时间周期(H)" align="center" prop="nextRunningTime" :formatter="erpPriceTableColumnFormatter">
           <template #default="scope">
             <el-input v-model="scope.row.nextRunningTime" />
           </template>
         </el-table-column>
-        <el-table-column label="自然日期" key="naturalDateRule">
+        -->
+        <el-table-column label="自然日期" key="naturalDateRule" width="80">
           <template #default="scope">
             <el-switch
               v-model="scope.row.naturalDateRule"
@@ -103,11 +107,13 @@
             />
           </template>
         </el-table-column>
+        <!--
         <el-table-column label="自然日期(D)" align="center" prop="nextNaturalDate" :formatter="erpPriceTableColumnFormatter">
           <template #default="scope">
             <el-input v-model="scope.row.nextNaturalDate" />
           </template>
         </el-table-column>
+        -->
         <el-table-column label="操作" align="center" min-width="120px">
           <template #default="scope">
             <div style="display: flex; justify-content: center; align-items: center; width: 100%">
@@ -153,7 +159,7 @@
     :title="`设备 ${configDialog.current?.deviceCode+'-'+configDialog.current?.name} 保养配置`"
     width="600px"
   >
-    <el-form :model="configDialog.form" label-width="160px">
+    <el-form :model="configDialog.form" label-width="180px" :rules="configFormRules" ref="configFormRef">
       <!-- 里程配置 -->
       <el-form-item
         v-if="configDialog.current?.mileageRule === 0"
@@ -186,13 +192,85 @@
         label="上次保养自然日期(D)"
         prop="lastNaturalDate"
       >
-        <el-input-number
+        <el-date-picker
           v-model="configDialog.form.lastNaturalDate"
+          type="date"
+          placeholder="选择日期"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+        />
+      </el-form-item>
+      <!-- 保养规则周期值 + 提前量 -->
+      <el-form-item
+        v-if="configDialog.current?.mileageRule === 0"
+        label="里程周期(KM)"
+        prop="nextRunningKilometers"
+      >
+        <el-input-number
+          v-model="configDialog.form.nextRunningKilometers"
+          :precision="2"
+          :min="0"
+          controls-position="right"
+        />
+      </el-form-item>
+      <el-form-item
+        v-if="configDialog.current?.mileageRule === 0"
+        label="公里数周期-提前量(KM)"
+        prop="kiloCycleLead"
+      >
+        <el-input-number
+          v-model="configDialog.form.kiloCycleLead"
+          :precision="2"
+          :min="0"
+          controls-position="right"
+        />
+      </el-form-item>
+      <el-form-item
+        v-if="configDialog.current?.runningTimeRule === 0"
+        label="时间周期(H)"
+        prop="nextRunningTime"
+      >
+        <el-input-number
+          v-model="configDialog.form.nextRunningTime"
+          :precision="1"
+          :min="0"
+          controls-position="right"
+        />
+      </el-form-item>
+      <el-form-item
+        v-if="configDialog.current?.runningTimeRule === 0"
+        label="时间周期-提前量(H)"
+        prop="timePeriodLead"
+      >
+        <el-input-number
+          v-model="configDialog.form.timePeriodLead"
           :precision="1"
           :min="0"
           controls-position="right"
         />
       </el-form-item>
+      <el-form-item
+        v-if="configDialog.current?.naturalDateRule === 0"
+        label="自然日周期(D)"
+        prop="nextNaturalDate"
+      >
+        <el-input-number
+          v-model="configDialog.form.nextNaturalDate"
+          :min="0"
+          controls-position="right"
+        />
+      </el-form-item>
+      <el-form-item
+        v-if="configDialog.current?.naturalDateRule === 0"
+        label="自然日周期-提前量(D)"
+        prop="naturalDatePeriodLead"
+      >
+        <el-input-number
+          v-model="configDialog.form.naturalDatePeriodLead"
+          :min="0"
+          controls-position="right"
+        />
+      </el-form-item>
     </el-form>
     <template #footer>
       <el-button @click="configDialog.visible = false">取消</el-button>
@@ -214,6 +292,7 @@ import {CACHE_KEY, useCache} from "@/hooks/web/useCache";
 import MainPlanDeviceList from "@/views/pms/maintenance/MainPlanDeviceList.vue";
 import * as DeptApi from "@/api/system/dept";
 import {erpPriceTableColumnFormatter} from "@/utils";
+import dayjs from 'dayjs'
 
 /** 保养计划 表单 */
 defineOptions({ name: 'IotAddMainPlan' })
@@ -224,6 +303,7 @@ const { delView } = useTagsViewStore() // 视图操作
 const { currentRoute, push } = useRouter()
 const deptUsers = ref<UserApi.UserVO[]>([]) // 用户列表
 const dept = ref() // 当前登录人所属部门对象
+const configFormRef = ref() // 配置弹出框对象
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
@@ -255,27 +335,102 @@ const configDialog = reactive({
   form: {
     lastRunningKilometers: 0,
     lastRunningTime: 0,
-    lastNaturalDate: 0
+    lastNaturalDate: '',
+    // 保养规则 周期
+    nextRunningKilometers: 0,
+    nextRunningTime: 0,
+    nextNaturalDate: 0,
+    // 提前量
+    kiloCycleLead: 0,
+    timePeriodLead: 0,
+    naturalDatePeriodLead: 0
   }
 })
 
 // 打开配置对话框
 const openConfigDialog = (row: IotMaintenanceBomVO) => {
   configDialog.current = row
+
+  // 处理日期初始化（核心修改）
+  let initialDate = ''
+  if (row.lastNaturalDate) {
+    // 如果已有值：时间戳 -> 日期字符串
+    initialDate = dayjs(row.lastNaturalDate).format('YYYY-MM-DD')
+  } else {
+    // 如果无值：设置默认值避免1970问题
+    initialDate = ''
+  }
+
   configDialog.form = {
     lastRunningKilometers: row.lastRunningKilometers || 0,
     lastRunningTime: row.lastRunningTime || 0,
-    lastNaturalDate: row.lastNaturalDate || 0
+    lastNaturalDate: initialDate,
+    // 保养规则 周期值
+    nextRunningKilometers: row.nextRunningKilometers || 0,
+    nextRunningTime: row.nextRunningTime || 0,
+    nextNaturalDate: row.nextNaturalDate || 0,
+    // 提前量
+    kiloCycleLead: row.kiloCycleLead || 0,
+    timePeriodLead: row.timePeriodLead || 0,
+    naturalDatePeriodLead: row.naturalDatePeriodLead || 0
   }
   configDialog.visible = true
 }
 
 // 保存配置
 const saveConfig = () => {
-  if (!configDialog.current) return
-  // 更新当前行的数据
-  Object.assign(configDialog.current, configDialog.form)
-  configDialog.visible = false
+  (configFormRef.value as any).validate((valid: boolean) => {
+    if (!valid) return
+    if (!configDialog.current) return
+
+    // 动态校验逻辑
+    const requiredFields = []
+    if (configDialog.current.mileageRule === 0) {
+      requiredFields.push('nextRunningKilometers', 'kiloCycleLead')
+    }
+    if (configDialog.current.runningTimeRule === 0) {
+      requiredFields.push('nextRunningTime', 'timePeriodLead')
+    }
+    if (configDialog.current.naturalDateRule === 0) {
+      requiredFields.push('nextNaturalDate', 'naturalDatePeriodLead')
+    }
+
+    const missingFields = requiredFields.filter(field =>
+      !configDialog.form[field as keyof typeof configDialog.form]
+    )
+
+    if (missingFields.length > 0) {
+      message.error('请填写所有必填项')
+      return
+    }
+
+    // 强制校验逻辑
+    if (configDialog.current.naturalDateRule === 0) {
+      if (!configDialog.form.lastNaturalDate) {
+        message.error('必须选择自然日期')
+        return
+      }
+
+      // 验证日期有效性
+      const dateValue = dayjs(configDialog.form.lastNaturalDate)
+      if (!dateValue.isValid()) {
+        message.error('日期格式不正确')
+        return
+      }
+    }
+
+    // 转换逻辑（关键修改）
+    const finalDate = configDialog.form.lastNaturalDate
+      ? dayjs(configDialog.form.lastNaturalDate).valueOf()
+      : null // 改为null而不是0
+
+    // 更新当前行的数据
+    Object.assign(configDialog.current, {
+      ...configDialog.form,
+      lastNaturalDate: finalDate
+    })
+    configDialog.visible = false
+  })
 }
 
 const queryParams = reactive({
@@ -288,7 +443,6 @@ const deviceChoose = async(selectedDevices) => {
   const params = {
     deviceIds: deviceIds.value.join(',') // 明确传递数组参数
   }
-  // console.log('请求参数:', JSON.parse(JSON.stringify(params.deviceIds)))
   queryParams.deviceIds = JSON.parse(JSON.stringify(params.deviceIds))
   // 根据选择的设备筛选出设备关系的分类BOM中与保养相关的节点项
   const res = await IotDeviceApi.deviceAssociateBomList(queryParams)
@@ -313,11 +467,16 @@ const deviceChoose = async(selectedDevices) => {
     remark: null,    // 初始化备注
     deviceId: device.id, // 移除操作需要
     bomNodeId: device.bomNodeId,
-    runningTime: 0,
-    runningKilometers: 0,
+    totalRunTime: device.totalRunTime,
+    totalMileage: device.totalMileage,
     nextRunningKilometers: 0,
     nextRunningTime: 0,
     nextNaturalDate: 0,
+    lastNaturalDate: null, // 初始化为null而不是0
+    // 保养规则 提前量
+    kiloCycleLead: 0,
+    timePeriodLead: 0,
+    naturalDatePeriodLead: 0
   }))
   // 获取选择的设备相关的id数组
   newItems.forEach(item => {
@@ -344,25 +503,6 @@ const close = () => {
   push({ name: 'IotMaintenancePlan', params:{}})
 }
 
-const selectChoose = (formData) => {
-  console.log('接收到的数据:', JSON.stringify(formData))
-  list.value.push(formData)
-}
-const handleChildSubmit = (formData) => {
-  const modified = removeOnesFromKeys(formData)
-  list.value.push(modified)
-}
-
-const removeOnesFromKeys = (obj: Record<string, any>) => {
-  return Object.keys(obj).reduce(
-    (acc, key) => {
-      const newKey = key.replace(/1/g, '') // 替换所有 1
-      acc[newKey] = obj[key]
-      return acc
-    },
-    {} as Record<string, any>
-  )
-}
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
@@ -378,7 +518,6 @@ const submitForm = async () => {
       mainPlan: formData.value,
       mainPlanBom: list.value
     }
-    // console.log('列表数据：'+data.mainPlanBom[0].lastRunningKilometers)
     if (formType.value === 'create') {
       await IotMaintenancePlanApi.createIotMaintenancePlan(data)
       message.success(t('common.createSuccess'))
@@ -395,6 +534,40 @@ const submitForm = async () => {
   }
 }
 
+// 新增表单校验规则
+const configFormRules = reactive({
+  nextRunningKilometers: [{
+    required: true,
+    message: '里程周期必须填写',
+    trigger: 'blur'
+  }],
+  kiloCycleLead: [{
+    required: true,
+    message: '提前量必须填写',
+    trigger: 'blur'
+  }],
+  nextRunningTime: [{
+    required: true,
+    message: '时间周期必须填写',
+    trigger: 'blur'
+  }],
+  timePeriodLead: [{
+    required: true,
+    message: '提前量必须填写',
+    trigger: 'blur'
+  }],
+  nextNaturalDate: [{
+    required: true,
+    message: '自然日周期必须填写',
+    trigger: 'blur'
+  }],
+  naturalDatePeriodLead: [{
+    required: true,
+    message: '提前量必须填写',
+    trigger: 'blur'
+  }]
+})
+
 /** 校验表格数据 */
 const validateTableData = (): boolean => {
   let isValid = true
@@ -403,6 +576,15 @@ const validateTableData = (): boolean => {
   const noRules: string[] = []  // 行记录中设置了保养规则的记录数量
   const configErrors: string[] = []   // 保养规则配置弹出框
   let shouldBreak = false;
+
+  if (list.value.length === 0) {
+    errorMessages.push('请至少添加一条设备保养明细')
+    isValid = false
+    // 直接返回无需后续校验
+    message.error('请至少添加一条设备保养明细')
+    return isValid
+  }
+
   list.value.forEach((row, index) => {
     if (shouldBreak) return;
     const rowNumber = index + 1 // 用户可见的行号从1开始
@@ -439,7 +621,7 @@ const validateTableData = (): boolean => {
     }
     // 自然日期校验逻辑
     if (row.naturalDateRule === 0) {
-      if (!row.nextNaturalDate || row.nextNaturalDate <= 0) {
+      if (!row.nextNaturalDate) {
         errorMessages.push(`第 ${rowNumber} 行：开启自然日期规则必须填写有效的自然日期周期`)
         isValid = false
       }
@@ -494,7 +676,7 @@ onMounted(async () => {
   // 查询当前登录人所属部门名称
   dept.value = await DeptApi.getDept(deptId)
   // 根据当前登录人部门信息生成生成 保养计划 名称
-  formData.value.name = dept.value.name + '-保养计划'
+  formData.value.name = dept.value.name + ' - 保养计划'
   deptUsers.value = await UserApi.getDeptUsersByDeptId(deptId)
   formData.value.deptId = deptId
   if (id){