pms 保养计划 代码初始化

src/api/pms/device/index.ts

@@ -4,10 +4,11 @@ import request from '@/config/axios'
 export interface IotDeviceVO {
   id: number // 主键id
   deviceCode: string // 资产编码
-  deivceName: string // 设备名称
+  deviceName: string // 设备名称
   brand: number // 品牌
   model: number // 规格型号
-  deptId: number // 所在部门
+  deptId: number    // 所在部门id
+  deptName: string  // 所在部门名称
   deviceStatus: string // 设备状态
   assetProperty: string // 资产性质
   picUrl: string // 图片

src/router/modules/remaining.ts

@@ -216,102 +216,104 @@ const remainingRouter: AppRouteRecordRaw[] = [
   },
 
   {
-    path: '/iotpms/iotmaintain',
+    path: '/iotpms/iotmaintenanceplan',
     component: Layout,
-    name: 'PmsMaintainCenter',
+    name: 'PmsMaintenanceCenter',
     meta: {
       hidden: true
     },
     children: [
       {
-        path: 'maintain/add',
-        component: () => import('@/views/pms/maintain/IotMaintain.vue'),
-        name: 'MaintainAdd',
+        path: 'maintenanceplan',
+        component: () => import('@/views/pms/maintenance/index.vue'),
+        name: 'IotMaintenancePlan',
         meta: {
           noCache: false,
           hidden: true,
           canTo: true,
-          icon: 'ep:add',
-          title: '维修工单添加',
-          activeMenu: '/maintain/add'
+          icon: 'ep:menu',
+          title: '保养计划',
+          activeMenu: '/maintenanceplan/index'
         }
       },
       {
-        path: 'maintain/edit/:id(\\d+)',
-        component: () => import('@/views/pms/maintain/IotMaintain.vue'),
-        name: 'MaintainEdit',
+        path: 'maintenanceplan/add',
+        component: () => import('@/views/pms/maintenance/IotMaintenancePlan.vue'),
+        name: 'IotAddMainPlan',
         meta: {
-          noCache: true,
+          noCache: false,
           hidden: true,
           canTo: true,
-          icon: 'ep:edit',
-          title: '维修工单编辑',
-          activeMenu: '/maintain/edit'
+          icon: 'ep:add',
+          title: '新增保养计划',
+          activeMenu: '/maintenanceplan/add'
         }
-      },{
-        path: 'maintain/detail/:id(\\d+)',
-        component: () => import('@/views/pms/maintain/IotMaintainDetail.vue'),
-        name: 'MaintainDetail',
+      },
+      {
+        path: 'maintenanceplan/edit/:id(\\d+)',
+        component: () => import('@/views/pms/maintenance/IotMaintenancePlan.vue'),
+        name: 'IotEditMainPlan',
         meta: {
-          noCache: false,
+          noCache: true,
           hidden: true,
           canTo: true,
-          icon: 'ep:add',
-          title: '维修工单详情',
-          activeMenu: '/maintain/detail'
+          icon: 'ep:edit',
+          title: '修改保养计划',
+          activeMenu: '/maintenanceplan/edit'
         }
-      },
+      }
     ]
   },
+
   {
-    path: '/iotpms/iotmaintenance',
+    path: '/iotpms/iotmaintain',
     component: Layout,
-    name: 'PmsMaintenanceCenter',
+    name: 'PmsMaintainCenter',
     meta: {
       hidden: true
     },
     children: [
       {
-        path: 'maintenance/add',
-        component: () => import('@/views/pms/maintenance/IotMaintenance.vue'),
-        name: 'MaintenanceAdd',
+        path: 'maintain/add',
+        component: () => import('@/views/pms/maintain/IotMaintain.vue'),
+        name: 'MaintainAdd',
         meta: {
           noCache: false,
           hidden: true,
           canTo: true,
           icon: 'ep:add',
-          title: '保养计划添加',
-          activeMenu: '/maintenance/add'
+          title: '维修工单添加',
+          activeMenu: '/maintain/add'
         }
       },
       {
-        path: 'maintenance/edit/:id(\\d+)',
-        component: () => import('@/views/pms/maintenance/IotMaintenance.vue'),
-        name: 'MaintenanceEdit',
+        path: 'maintain/edit/:id(\\d+)',
+        component: () => import('@/views/pms/maintain/IotMaintain.vue'),
+        name: 'MaintainEdit',
         meta: {
           noCache: true,
           hidden: true,
           canTo: true,
           icon: 'ep:edit',
-          title: '保养计划编辑',
-          activeMenu: '/maintenance/edit'
+          title: '维修工单编辑',
+          activeMenu: '/maintain/edit'
+        }
+      },{
+        path: 'maintain/detail/:id(\\d+)',
+        component: () => import('@/views/pms/maintain/IotMaintainDetail.vue'),
+        name: 'MaintainDetail',
+        meta: {
+          noCache: false,
+          hidden: true,
+          canTo: true,
+          icon: 'ep:add',
+          title: '维修工单详情',
+          activeMenu: '/maintain/detail'
         }
       },
-      // {
-      //   path: 'maintenance/detail/:id(\\d+)',
-      //   component: () => import('@/views/pms/maintenance/IotMaintenanceDetail.vue'),
-      //   name: 'MaintenanceDetail',
-      //   meta: {
-      //     noCache: false,
-      //     hidden: true,
-      //     canTo: true,
-      //     icon: 'ep:add',
-      //     title: '保养计划详情',
-      //     activeMenu: '/maintenance/detail'
-      //   }
-      // },
     ]
   },
+
   {
     path: '/failure',
     component: Layout,

src/views/pms/bom/BomForm.vue

@@ -13,9 +13,9 @@
           :data="deviceCategoryTree"
           :props="defaultProps"
           check-strictly
-          default-expand-all
+          :default-expanded-keys="firstLevelKeys"
           placeholder="请选择设备分类"
-          value-key="deviceCategoryId"
+          value-key="id"
           @node-click="handleDeviceCategoryTreeNodeClick"
         />
       </el-form-item>
@@ -106,6 +106,7 @@ const formRules = reactive<FormRules>({
 const formRef = ref() // 表单 Ref
 const bomTree = ref() // BOM 树形结构
 const deviceCategoryTree = ref()  // 设备分类树
+const firstLevelKeys = ref([])
 
 const queryParams = reactive({
   pageNo: 1,
@@ -211,6 +212,7 @@ const getTree = async () => {
   let bom: Tree = { id: 0, name: '顶级Bom', children: [] }
   bom.children = handleTree(data)
   bomTree.value.push(bom)
+  firstLevelKeys.value = bomTree.value.map(node => node.id);
 }
 
 /** 初始化 **/

src/views/pms/bom/DeviceCategoryTree.vue

@@ -13,7 +13,7 @@
       :expand-on-click-node="false"
       :filter-node-method="filterNode"
       :props="defaultProps"
-      default-expand-all
+      :default-expand-all="false"
       highlight-current
       node-key="id"
       @node-click="handleNodeClick"

src/views/pms/devicetemplate/detail/dataSpecs/DeviceAttrModelNumberDataSpecs.vue

@@ -53,7 +53,7 @@
       <el-option
         v-for="(item, index) in getStrDictOptions(DICT_TYPE.IOT_THING_MODEL_UNIT)"
         :key="index"
-        :label="item.label + '-' + item.value"
+        :label="item.label"
         :value="item.label + '-' + item.value"
       />
     </el-select>

src/views/pms/iotlockstock/IotAddToStock.vue

@@ -57,14 +57,6 @@
       </el-table>
     </ContentWrap>
 
-    <!-- 表单弹窗：添加/修改 -->
-    <StockMaterialDrawer
-      ref="showDrawer"
-      :model-value="drawerVisible"
-      @update:model-value="(val) => (drawerVisible = val)"
-      @add="handleChildSubmit"
-    />
-
     <MaterialSelect ref="materialFormRef" @choose="materialChoose" />
   </ContentWrap>
   <ContentWrap>
@@ -81,7 +73,6 @@
 import { IotLockStockApi, IotLockStockVO } from '@/api/pms/iotlockstock'
 import * as UserApi from '@/api/system/user'
 import { useUserStore } from '@/store/modules/user'
-import StockMaterialDrawer from '@/views/pms/iotlockstock/StockMaterialDrawer.vue'
 import { ref } from 'vue'
 import { toRaw } from "vue";
 import { useTagsViewStore } from '@/store/modules/tagsView'
@@ -96,50 +87,31 @@ const message = useMessage() // 消息弹窗
 const { delView } = useTagsViewStore() // 视图操作
 const { currentRoute, push } = useRouter()
 const deptUsers = ref<UserApi.UserVO[]>([]) // 用户列表
-const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const drawerVisible = ref<boolean>(false)
-const showDrawer = ref()
 const list = ref<IotLockStockVO[]>([]) // 入库物料的数据
 const { params, name } = useRoute() // 查询参数
-const id = params.id
 
 const materialFormRef = ref()
 const openForm = () => {
   materialFormRef.value.open()
 }
 
-const formData = ref({
-})
-
-const formRules = reactive({
-})
-
 const formRef = ref() // 表单 Ref
 
 const close = () => {
   delView(unref(currentRoute))
   push({ name: 'IotLockStock', params:{}})
 }
-const handleView = () => {
-  drawerVisible.value = true
-  showDrawer.value.openDrawer()
-}
-const selectChoose = (formData) => {
-  console.log('接收到的数据:', JSON.stringify(formData))
-  list.value.push(formData)
-}
 
 // 多选 物料
 const materialChoose = (selectedMaterials) => {
-  console.log('返回了数据：' + selectedMaterials)
   // 转换数据结构（根据你的接口定义调整）
   const newItems = selectedMaterials.map(material => ({
     materialCode: material.code,
     materialName: material.name,
     unit: material.unit,
-    quantity: null, // 初始化数量
+    quantity: null,  // 初始化数量
+    unitPrice: null, // 初始化单价
     remark: null,    // 初始化备注
     code: material.code // 移除操作需要
   }))
@@ -155,21 +127,6 @@ const materialChoose = (selectedMaterials) => {
   })
 }
 
-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 () => {
@@ -177,7 +134,7 @@ const submitForm = async () => {
     message.error('请选择物料')
     return
   }
-  // 校验表单
+  // 校验表单 校验 单价 数量
   if (list.value.length > 0) {
     const nullList = list.value.filter((item) => item.quantity===null)
     if (nullList.length > 0) {
@@ -185,6 +142,13 @@ const submitForm = async () => {
       return
     }
   }
+  if (list.value.length > 0) {
+    const nullList = list.value.filter((item) => item.unitPrice===null)
+    if (nullList.length > 0) {
+      message.error('请填写单价')
+      return
+    }
+  }
   // 提交请求
   formLoading.value = true
   try {
@@ -200,27 +164,6 @@ const submitForm = async () => {
 
 /** 重置表单 */
 const resetForm = () => {
-  formData.value = {
-    id: undefined,
-    failureCode: undefined,
-    failureName: undefined,
-    deviceId: undefined,
-    status: undefined,
-    ifStop: undefined,
-    failureTime: undefined,
-    failureInfluence: undefined,
-    failureSystem: undefined,
-    description: undefined,
-    pic: undefined,
-    solution: undefined,
-    maintainStartTime: undefined,
-    maintainEndTime: undefined,
-    remark: undefined,
-    deviceName: undefined,
-    processInstanceId: undefined,
-    auditStatus: undefined,
-    deptId: undefined
-  }
   formRef.value?.resetFields()
 }
 onMounted(async () => {

src/views/pms/iotlockstock/SelectMaterial.vue

@@ -100,7 +100,6 @@ import * as MaterialApi from '@/api/pms/material'
 import {DICT_TYPE} from "@/utils/dict";
 import {ContentWrap} from "@/components/ContentWrap";
 
-// const emit = defineEmits(['choose', 'close']) // 定义 success 事件，用于操作成功后的回调
 // 调整 emit 类型
 const emit = defineEmits<{
   (e: 'choose', value: MaterialApi.MaterialVO[]): void

src/views/pms/maintenance/IotMaintenance.vue

@@ -1,438 +0,0 @@
-<template>
-  <ContentWrap v-loading="formLoading">
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      v-loading="formLoading"
-      style="margin-right: 4em; margin-left: 0.5em; margin-top: 1em"
-      label-width="130px"
-    >
-      <div class="base-expandable-content">
-        <el-row>
-          <el-col :span="6">
-            <el-form-item label="设备" prop="deviceName">
-              <el-select
-                v-model="formData.deviceName"
-                :model-value="deviceLabel"
-                placeholder="请选择设备"
-                @click="openForm"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="状态" prop="status">
-              <el-select v-model="formData.status" placeholder="请选择状态" clearable>
-                <el-option
-                  v-for="dict in getStrDictOptions(DICT_TYPE.PMS_MAIN_STATUS_NO)"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="维修类型" prop="type">
-              <el-select disabled v-model="formData.type" placeholder="请选择维修类型" clearable>
-                <el-option
-                  v-for="dict in getStrDictOptions(DICT_TYPE.PMS_MAIN_TYPE)"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="是否停机" prop="ifStop">
-              <el-select v-model="formData.ifStop" placeholder="请选择是否停机" clearable>
-                <el-option
-                  v-for="dict in getStrDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="故障时间" prop="failureTime">
-              <el-date-picker
-                style="width: 150%"
-                v-model="formData.failureTime"
-                type="datetime"
-                value-format="x"
-                placeholder="选择故障时间"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="维修开始时间" prop="maintainStartTime">
-              <el-date-picker
-                style="width: 150%"
-                v-model="formData.maintainStartTime"
-                type="datetime"
-                value-format="x"
-                placeholder="选择维修开始时间"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="维修负责人" prop="maintainPerson">
-              <el-select v-model="formData.maintainPerson" filterable clearable style="width: 100%">
-                <el-option
-                  v-for="item in deptUsers"
-                  :key="item.id"
-                  :label="item.nickname"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="故障影响" prop="failureInfluence">
-              <el-input v-model="formData.failureInfluence" placeholder="请输入故障影响" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="故障系统" prop="failureSystem">
-              <el-input v-model="formData.failureSystem" placeholder="请输入故障系统" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="维修结束时间" prop="maintainEndTime">
-              <el-date-picker
-                style="width: 150%"
-                v-model="formData.maintainEndTime"
-                type="datetime"
-                value-format="x"
-                placeholder="选择维修结束时间"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="图片" prop="pic">
-              <!--        <el-input v-model="formData.pic" placeholder="请输入图片" />-->
-              <UploadImg v-model="formData.pic" height="55px" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="故障描述" prop="description">
-              <el-input type="textarea" v-model="formData.description" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="维修描述" prop="maintainDescription">
-              <el-input type="textarea" v-model="formData.maintainDescription" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="解决办法" prop="solution">
-              <el-input type="textarea" v-model="formData.solution" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="备注" prop="remark">
-              <el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </div>
-    </el-form>
-  </ContentWrap>
-  <ContentWrap>
-    <ContentWrap>
-      <!-- 搜索工作栏 -->
-      <el-form
-        class="-mb-15px"
-        :model="queryParams"
-        ref="queryFormRef"
-        :inline="true"
-        label-width="68px"
-      >
-        <el-form-item>
-          <el-button @click="openMaterialForm" type="primary"
-          ><Icon icon="ep:plus" class="mr-5px" /> 选择物料</el-button
-          >
-          <el-button @click="handleView" type="warning"
-          ><Icon icon="ep:plus" class="mr-5px" /> 新增物料</el-button
-          >
-        </el-form-item>
-      </el-form>
-    </ContentWrap>
-
-    <!-- 列表 -->
-    <ContentWrap>
-      <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-        <el-table-column label="物料编码" align="center" prop="code" />
-        <el-table-column label="物料名称" align="center" prop="name" />
-        <el-table-column label="单位" align="center" prop="unit" />
-        <el-table-column label="单价" align="center" prop="price" />
-        <el-table-column label="消耗数量" align="center" prop="depleteCount">
-          <template #default="scope">
-            <el-input v-model="scope.row.depleteCount" />
-          </template>
-        </el-table-column>
-        <el-table-column label="总库存数量" align="center" prop="totalCount" />
-        <el-table-column label="备注" align="center" prop="remark">
-          <template #default="scope">
-            <el-input v-model="scope.row.remark" />
-          </template>
-        </el-table-column>
-        <el-table-column label="物料来源" align="center" prop="sourceType" />
-        <el-table-column label="操作" align="center" min-width="120px">
-          <template #default="scope">
-            <div style="display: flex; justify-content: center; align-items: center; width: 100%">
-              <div>
-                <Icon style="vertical-align: middle; color: #ea3434" icon="ep:zoom-out" />
-                <el-button
-                  style="vertical-align: middle"
-                  link
-                  type="danger"
-                  @click="handleDelete(scope.row.code)"
-                >
-                  移除
-                </el-button>
-              </div>
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
-    </ContentWrap>
-
-    <!-- 表单弹窗：添加/修改 -->
-    <ChooseMaterial ref="materialFormRef" :deptId="formData.deptId" @choose="selectChoose" />
-    <MaintainMaterialDrawer
-      ref="showDrawer"
-      :model-value="drawerVisible"
-      @update:model-value="(val) => (drawerVisible = val)"
-      @add="handleChildSubmit"
-    />
-  </ContentWrap>
-  <ContentWrap>
-    <el-form>
-      <el-form-item style="float: right">
-        <el-button @click="submitForm" type="primary" :disabled="formLoading">保 存</el-button>
-        <el-button @click="close">取 消</el-button>
-      </el-form-item>
-    </el-form>
-  </ContentWrap>
-  <DeviceList ref="deviceFormRef" @choose="deviceChoose" />
-</template>
-<script setup lang="ts">
-import { IotMaintainApi, IotMaintainVO } from '@/api/pms/maintain'
-import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
-import DeviceList from '@/views/pms/failure/DeviceList.vue'
-import * as UserApi from '@/api/system/user'
-import { useUserStore } from '@/store/modules/user'
-import ChooseMaterial from '@/views/pms/maintain/material/ChooseMaterial.vue'
-import MaintainMaterialDrawer from '@/views/pms/maintain/material/MaintainMaterialDrawer.vue'
-import { ref } from 'vue'
-import { IotMaintainMaterialVO } from '@/api/pms/maintain/material'
-import { useTagsViewStore } from '@/store/modules/tagsView'
-import {IotDeviceApi} from "@/api/pms/device";
-import {CACHE_KEY, useCache} from "@/hooks/web/useCache";
-
-/** 维修工单 表单 */
-defineOptions({ name: 'IotMaintain' })
-
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-const { delView } = useTagsViewStore() // 视图操作
-const { currentRoute, push } = useRouter()
-const deptUsers = ref<UserApi.UserVO[]>([]) // 用户列表
-const dialogTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const deviceLabel = ref('') // 表单的类型：create - 新增；update - 修改
-const drawerVisible = ref<boolean>(false)
-const showDrawer = ref()
-const list = ref<IotMaintainMaterialVO[]>([]) // 列表的数据
-const { params, name } = useRoute() // 查询参数
-const id = params.id
-const formData = ref({
-  id: undefined,
-  failureCode: undefined,
-  failureName: undefined,
-  deviceId: undefined,
-  status: undefined,
-  type: undefined,
-  ifStop: undefined,
-  failureTime: undefined,
-  failureInfluence: undefined,
-  failureSystem: undefined,
-  description: undefined,
-  pic: undefined,
-  solution: undefined,
-  maintainStartTime: undefined,
-  maintainEndTime: undefined,
-  remark: undefined,
-  deviceName: undefined,
-  processInstanceId: undefined,
-  auditStatus: undefined,
-  deptId: undefined,
-  maintainPerson: undefined,
-  maintainDescription: undefined,
-})
-const formRules = reactive({
-  deviceName: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
-  failureCode: [{ required: true, message: '故障编码不能为空', trigger: 'blur' }],
-  type: [{ required: true, message: '维修类型不能为空', trigger: 'blur' }],
-  ifStop: [{ required: true, message: '是否停机不能为空', trigger: 'blur' }],
-  failureName: [{ required: true, message: '故障名称不能为空', trigger: 'blur' }],
-  failureTime: [{ required: true, message: '故障时间不能为空', trigger: 'blur' }],
-  maintainStartTime: [{ required: true, message: '维修开始时间不能为空', trigger: 'blur' }],
-  maintainDescription: [{ required: true, message: '维修描述不能为空', trigger: 'blur' }],
-  maintainPerson: [{ required: true, message: '维修负责人不能为空', trigger: 'blur' }],
-  deviceId: [{ required: true, message: '设备id不能为空', trigger: 'blur' }],
-  status: [{ required: true, message: '状态不能为空', trigger: 'blur' }]
-})
-const formRef = ref() // 表单 Ref
-const deviceChoose = (row) => {
-  formData.value.deviceId = row.id
-  formData.value.deviceName = row.deviceName
-  formData.value.deptId = row.deptId
-  deviceLabel.value = row.deviceName
-}
-const deviceFormRef = ref()
-const openForm = () => {
-  deviceFormRef.value.open()
-}
-
-const materialFormRef = ref()
-const openMaterialForm = (type: string, id?: number) => {
-  if (!formData.value.deptId) {
-    message.error('请选择设备')
-    return
-  }
-  materialFormRef.value.open(type, id)
-}
-const close = () => {
-  delView(unref(currentRoute))
-  push({
-    name: 'IotMaintain',
-    query: {
-      date: new Date().getTime()
-    }
-  })
-}
-const handleView = () => {
-  drawerVisible.value = true
-  showDrawer.value.openDrawer()
-}
-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 () => {
-  // 校验表单
-  await formRef.value.validate()
-  if (list.value.length > 0) {
-    const nullList = list.value.filter((item) => item.depleteCount===null)
-    debugger
-    if (nullList.length > 0) {
-      message.error('请填写消耗数量')
-      return
-    }
-  }
-
-  // 提交请求
-  formLoading.value = true
-  try {
-    const data = {
-      maintain: formData.value,
-      maintainMaterials: list.value
-    }
-    if (formType.value === 'create') {
-      await IotMaintainApi.createIotMaintain(data)
-      message.success(t('common.createSuccess'))
-      close()
-    } else {
-      await IotMaintainApi.updateIotMaintain(data)
-      message.success(t('common.updateSuccess'))
-      close()
-    }
-    // 发送操作成功的事件
-    emit('success')
-  } finally {
-    formLoading.value = false
-  }
-}
-
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
-    id: undefined,
-    failureCode: undefined,
-    failureName: undefined,
-    deviceId: undefined,
-    status: undefined,
-    ifStop: undefined,
-    failureTime: undefined,
-    failureInfluence: undefined,
-    failureSystem: undefined,
-    description: undefined,
-    pic: undefined,
-    solution: undefined,
-    maintainStartTime: undefined,
-    maintainEndTime: undefined,
-    remark: undefined,
-    deviceName: undefined,
-    processInstanceId: undefined,
-    auditStatus: undefined,
-    deptId: undefined
-  }
-  formRef.value?.resetFields()
-}
-onMounted(async () => {
-  const deptId = useUserStore().getUser.deptId
-  deptUsers.value = await UserApi.getDeptUsersByDeptId(deptId)
-  if (id){
-    formType.value = 'update'
-    const iotMaintain = await IotMaintainApi.getIotMaintain(id);
-    debugger
-    deviceLabel.value = iotMaintain.deviceName
-    formData.value = iotMaintain
-  } else {
-    formData.value.type = 'in'
-    formType.value = 'create';
-    const { wsCache } = useCache()
-    const userInfo = wsCache.get(CACHE_KEY.USER)
-    formData.value.maintainPerson = userInfo.user.id;
-  }
-})
-const handleDelete = async (id: number) => {
-  try {
-    const index = list.value.findIndex((item) => item.code === id)
-    debugger
-    if (index !== -1) {
-      // 通过 splice 删除元素
-      list.value.splice(index, 1)
-    }
-  } catch {}
-}
-</script>
-<style scoped>
-.base-expandable-content {
-  overflow: hidden; /* 隐藏溢出的内容 */
-  transition: max-height 0.3s ease; /* 平滑过渡效果 */
-}
-</style>

src/views/pms/maintenance/IotMaintenancePlan.vue

@@ -0,0 +1,311 @@
+<template>
+  <ContentWrap v-loading="formLoading">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      v-loading="formLoading"
+      style="margin-right: 4em; margin-left: 0.5em; margin-top: 1em"
+      label-width="130px"
+    >
+      <div class="base-expandable-content">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="计划名称" prop="name">
+              <el-input type="text" v-model="formData.name" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="计划编号" prop="serialNumber">
+              <el-input type="text" v-model="formData.serialNumber" disabled/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="责任人" prop="responsiblePerson">
+              <el-select v-model="formData.responsiblePerson" filterable clearable style="width: 100%">
+                <el-option
+                  v-for="item in deptUsers"
+                  :key="item.id"
+                  :label="item.nickname"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </div>
+    </el-form>
+  </ContentWrap>
+  <ContentWrap>
+    <ContentWrap>
+      <!-- 搜索工作栏 -->
+      <el-form
+        class="-mb-15px"
+        :model="queryParams"
+        ref="queryFormRef"
+        :inline="true"
+        label-width="68px"
+      >
+        <el-form-item>
+          <el-button @click="openForm" type="warning">
+            <Icon icon="ep:plus" class="mr-5px" /> 新增设备</el-button>
+        </el-form-item>
+      </el-form>
+    </ContentWrap>
+
+    <!-- 列表 -->
+    <ContentWrap>
+      <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="所属部门" align="center" prop="deptName" />
+        <el-table-column label="设备状态" align="center" prop="deviceStatus" >
+          <template #default="scope">
+            <dict-tag :type="DICT_TYPE.PMS_DEVICE_STATUS" :value="scope.row.deviceStatus" />
+          </template>
+        </el-table-column>
+        <el-table-column label="资产性质" align="center" prop="assetProperty" >
+          <template #default="scope">
+            <dict-tag :type="DICT_TYPE.PMS_ASSET_PROPERTY" :value="scope.row.assetProperty" />
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="操作" align="center" min-width="120px">
+          <template #default="scope">
+            <div style="display: flex; justify-content: center; align-items: center; width: 100%">
+              <div>
+                <Icon style="vertical-align: middle; color: #ea3434" icon="ep:zoom-out" />
+                <el-button
+                  style="vertical-align: middle"
+                  link
+                  type="danger"
+                  @click="handleDelete(scope.row.id)"
+                >
+                  移除
+                </el-button>
+              </div>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </ContentWrap>
+  </ContentWrap>
+  <ContentWrap>
+    <el-form>
+      <el-form-item style="float: right">
+        <el-button @click="submitForm" type="primary" :disabled="formLoading">保 存</el-button>
+        <el-button @click="close">取 消</el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+  <MainPlanDeviceList ref="deviceFormRef" @choose="deviceChoose" />
+</template>
+<script setup lang="ts">
+import { IotMaintainApi, IotMaintainVO } from '@/api/pms/maintain'
+import * as UserApi from '@/api/system/user'
+import { useUserStore } from '@/store/modules/user'
+import { ref } from 'vue'
+import { IotMaintainMaterialVO } from '@/api/pms/maintain/material'
+import { useTagsViewStore } from '@/store/modules/tagsView'
+import {CACHE_KEY, useCache} from "@/hooks/web/useCache";
+import {DICT_TYPE} from "@/utils/dict";
+import MainPlanDeviceList from "@/views/pms/maintenance/MainPlanDeviceList.vue";
+
+/** 保养计划 表单 */
+defineOptions({ name: 'IotAddMainPlan' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+const { delView } = useTagsViewStore() // 视图操作
+const { currentRoute, push } = useRouter()
+const deptUsers = ref<UserApi.UserVO[]>([]) // 用户列表
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const deviceLabel = ref('') // 表单的类型：create - 新增；update - 修改
+const list = ref<IotMaintainMaterialVO[]>([]) // 列表的数据
+const { params, name } = useRoute() // 查询参数
+const id = params.id
+const formData = ref({
+  id: undefined,
+  name: undefined,
+  serialNumber: undefined,
+  failureName: undefined,
+  deviceId: undefined,
+  status: undefined,
+  type: undefined,
+  ifStop: undefined,
+  failureTime: undefined,
+  failureInfluence: undefined,
+  failureSystem: undefined,
+  description: undefined,
+  pic: undefined,
+  solution: undefined,
+  maintainStartTime: undefined,
+  maintainEndTime: undefined,
+  remark: undefined,
+  deviceName: undefined,
+  processInstanceId: undefined,
+  auditStatus: undefined,
+  deptId: undefined,
+  responsiblePerson: undefined,
+  maintainDescription: undefined,
+})
+const formRules = reactive({
+  name: [{ required: true, message: '计划名称不能为空', trigger: 'blur' }],
+  responsiblePerson: [{ required: true, message: '责任人不能为空', trigger: 'blur' }],
+})
+const formRef = ref() // 表单 Ref
+
+const deviceChoose = (selectedDevices) => {
+  // formData.value.deviceId = row.id
+  // formData.value.deviceName = row.deviceName
+  // formData.value.deptId = row.deptId
+  // deviceLabel.value = row.deviceName
+  // 转换数据结构（根据你的接口定义调整）
+  const newItems = selectedDevices.map(device => ({
+    deviceCode: device.deviceCode,
+    deviceName: device.deviceName,
+    deviceStatus: device.deviceStatus,
+    deptName: device.deptName,
+    assetProperty: device.assetProperty,
+    remark: null,    // 初始化备注
+    id: device.id // 移除操作需要
+  }))
+
+  // 合并到现有列表（去重）
+  newItems.forEach(item => {
+    const exists = list.value.some(
+      existing => existing.id === item.id
+    )
+    if (!exists) {
+      list.value.push(item)
+    }
+  })
+}
+
+const deviceFormRef = ref<InstanceType<typeof MainPlanDeviceList>>()
+const openForm = () => {
+  deviceFormRef.value?.open();
+}
+
+const close = () => {
+  delView(unref(currentRoute))
+  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 () => {
+  // 校验表单
+  await formRef.value.validate()
+  if (list.value.length > 0) {
+    const nullList = list.value.filter((item) => item.depleteCount===null)
+    if (nullList.length > 0) {
+      message.error('请填写消耗数量')
+      return
+    }
+  }
+
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = {
+      maintain: formData.value,
+      maintainMaterials: list.value
+    }
+    if (formType.value === 'create') {
+      await IotMaintainApi.createIotMaintain(data)
+      message.success(t('common.createSuccess'))
+      close()
+    } else {
+      await IotMaintainApi.updateIotMaintain(data)
+      message.success(t('common.updateSuccess'))
+      close()
+    }
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    failureName: undefined,
+    deviceId: undefined,
+    status: undefined,
+    ifStop: undefined,
+    failureTime: undefined,
+    failureInfluence: undefined,
+    failureSystem: undefined,
+    description: undefined,
+    pic: undefined,
+    solution: undefined,
+    maintainStartTime: undefined,
+    maintainEndTime: undefined,
+    remark: undefined,
+    deviceName: undefined,
+    processInstanceId: undefined,
+    auditStatus: undefined,
+    deptId: undefined
+  }
+  formRef.value?.resetFields()
+}
+onMounted(async () => {
+  const deptId = useUserStore().getUser.deptId
+  deptUsers.value = await UserApi.getDeptUsersByDeptId(deptId)
+  if (id){
+    formType.value = 'update'
+    const iotMaintain = await IotMaintainApi.getIotMaintain(id);
+    deviceLabel.value = iotMaintain.deviceName
+    formData.value = iotMaintain
+  } else {
+    formType.value = 'create';
+    const { wsCache } = useCache()
+    const userInfo = wsCache.get(CACHE_KEY.USER)
+    formData.value.responsiblePerson = userInfo.user.id;
+  }
+})
+const handleDelete = async (id: number) => {
+  try {
+    const index = list.value.findIndex((item) => item.code === id)
+    if (index !== -1) {
+      // 通过 splice 删除元素
+      list.value.splice(index, 1)
+    }
+  } catch {}
+}
+</script>
+<style scoped>
+.base-expandable-content {
+  overflow: hidden; /* 隐藏溢出的内容 */
+  transition: max-height 0.3s ease; /* 平滑过渡效果 */
+}
+</style>

src/views/pms/maintenance/MainPlanDeviceList.vue

@@ -0,0 +1,207 @@
+<template>
+  <Dialog v-model="dialogVisible" title="选择设备"
+          style="width: 1100px; max-height: 800px"  @close="handleClose">
+    <ContentWrap>
+      <el-form
+        class="-mb-15px"
+        :model="queryParams"
+        ref="queryFormRef"
+        :inline="true"
+        label-width="68px"
+      >
+        <el-form-item label="设备名称" prop="deviceName">
+          <el-input
+            v-model="queryParams.deviceName"
+            placeholder="请输入设备名称"
+            clearable
+            @keyup.enter="handleQuery"
+            class="!w-240px"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+          <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+          <el-button @click="handleConfirm" class="custom-green-button"><Icon icon="ep:check" class="mr-5px" /> 确认选择</el-button>
+        </el-form-item>
+      </el-form>
+    </ContentWrap>
+    <ContentWrap>
+      <el-table
+        v-loading="loading"
+        :data="list"
+        :stripe="true"
+        ref="tableRef"
+        :show-overflow-tooltip="true"
+        @row-click="handleRowClick"
+      >
+        <el-table-column width="60" label="选择">
+          <template #default="{ row }">
+            <el-checkbox
+              :model-value="selectedRows.some(item => item.id === row.id)"
+              @click.stop="toggleRow(row)"
+              class="no-label-radio"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="资产编码" align="center" prop="deviceCode" />
+        <el-table-column label="设备名称" align="center" prop="deviceName" />
+        <el-table-column label="所在部门id" align="center" prop="deptId" v-if="false"/>
+        <el-table-column label="所在部门" align="center" prop="deptName" />
+        <el-table-column label="设备状态" align="center" prop="deviceStatus">
+          <template #default="scope">
+            <dict-tag :type="DICT_TYPE.PMS_DEVICE_STATUS" :value="scope.row.status" />
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="创建时间"
+          align="center"
+          prop="createTime"
+          width="180"
+          :formatter="dateFormatter"
+        />
+      </el-table>
+      <!-- 分页 -->
+      <Pagination
+        :total="total"
+        v-model:page="queryParams.pageNo"
+        v-model:limit="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </ContentWrap>
+  </Dialog>
+</template>
+
+<script setup lang="ts">
+import { IotDeviceApi, IotDeviceVO } from '@/api/pms/device'
+import { DICT_TYPE } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const loading = ref(true) // 列表的加载中
+const queryFormRef = ref() // 搜索的表单
+const list = ref<IotDeviceVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const tableRef = ref();
+const selectedRows = ref<IotDeviceVO[]>([]); // 多选数据（存储所有选中行的数组）
+
+// 调整 emit 类型
+const emit = defineEmits<{
+  (e: 'choose', value: IotDeviceVO[]): void
+  (e: 'close'): void
+}>()
+
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  label: '',
+  status: undefined,
+  deptId: undefined,
+  assetClass: undefined,
+  deviceName: undefined
+})
+
+// 点击整行选中
+const handleRowClick = (row) => {
+  toggleRow(row)
+}
+const open = async () => {
+  dialogVisible.value = true
+  // queryParams.assetClass = classify
+  await getList()
+}
+defineExpose({ open })
+const { wsCache } = useCache()
+const getList = async () => {
+  loading.value = true
+  try {
+    const user = wsCache.get(CACHE_KEY.USER)
+    queryParams.deptId = user.user.deptId
+    const data = await IotDeviceApi.getIotDevicePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+// 多选 切换行选中状态
+const toggleRow = (row) => {
+  const index = selectedRows.value.findIndex(item => item.id === row.id);
+  if (index > -1) {
+    selectedRows.value.splice(index, 1); // 取消选中
+  } else {
+    selectedRows.value.push(row); // 选中
+  }
+};
+
+// 关闭时清空选择
+const handleClose = () => {
+  tableRef.value?.clearSelection();
+  selectedRows.value = []
+  emit('close')
+};
+
+// 确认选择
+const handleConfirm = () => {
+  if (selectedRows.value.length === 0) {
+    ElMessage.warning('请至少选择一个物料')
+    return
+  }
+  emit('choose', selectedRows.value.map(row => ({
+    ...row,
+    // 确保返回必要字段
+    id: row.id,
+    deviceCode: row.deviceCode,
+    deviceName: row.deviceName,
+    deviceStatus: row.deviceStatus,
+    deptName: row.deptName,
+    assetProperty: row.assetProperty
+  })))
+  dialogVisible.value = false;
+  handleClose()
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+const choose = (row: DictDataVO) => {
+  emit('choose', row)
+  dialogVisible.value = false
+}
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+</script>
+<style lang="scss" scoped>
+.no-label-radio .el-radio__label {
+  display: none;
+}
+.no-label-radio .el-radio__inner {
+  margin-right: 0;
+}
+
+/* 自定义淡绿色按钮 */
+:deep(.custom-green-button) {
+  background-color: #e1f3d8;
+  border-color: #e1f3d8;
+  color: #67c23a;
+}
+
+/* 悬停效果 */
+:deep(.custom-green-button:hover) {
+  background-color: #d1e8c0;
+  border-color: #d1e8c0;
+  color: #5daf34;
+}
+
+/* 点击效果 */
+:deep(.custom-green-button:active) {
+  background-color: #c2dca8;
+  border-color: #c2dca8;
+}
+</style>

src/views/pms/maintenance/index.vue

@@ -15,7 +15,6 @@
           :inline="true"
           label-width="68px"
         >
-
           <el-form-item label="计划编号" prop="serialNumber">
             <el-input
               v-model="queryParams.serialNumber"
@@ -85,9 +84,12 @@
         <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
           <el-table-column label="计划编号" align="center" prop="serialNumber" />
           <el-table-column label="计划名称" align="center" prop="name" />
-    <!--      <el-table-column label="负责人id 多个以逗号分隔" align="center" prop="responsiblePerson" />-->
           <el-table-column label="负责人" align="center" prop="responsiblePersonName" />
-          <el-table-column label="状态" align="center" prop="status" />
+          <el-table-column label="状态" align="center" prop="status" >
+            <template #default="scope">
+              <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+            </template>
+          </el-table-column>
           <el-table-column
             label="创建时间"
             align="center"
@@ -134,8 +136,8 @@
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { IotMaintenancePlanApi, IotMaintenancePlanVO } from '@/api/pms/maintenance'
-import IotMaintenancePlanForm from './IotMaintenancePlanForm.vue'
 import DeptTree from "@/views/system/user/DeptTree.vue";
+import {DICT_TYPE} from "@/utils/dict";
 const { push } = useRouter() // 路由跳转
 
 /** 保养计划 列表 */
@@ -194,11 +196,11 @@ const resetQuery = () => {
 const openForm = (type: string, id?: number) => {
   //修改
   if (typeof id === 'number') {
-    push({ name: 'MaintainEdit', params: {id } })
+    push({ name: 'IotEditMainPlan', params: {id } })
     return
   }
   // 新增
-  push({ name: 'MaintainAdd', params:{} })
+  push({ name: 'IotAddMainPlan', params:{} })
 }
 
 /** 删除按钮操作 */