From 9e6ae42645f41fc68870f3344593c6d964e2c84e Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Fri, 17 May 2024 17:06:22 +0800
Subject: [PATCH] =?UTF-8?q?EAM=20=E2=80=94=E2=80=94>=20=E7=82=B9=E6=A3=80?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=9B=86=20=E4=B8=8E=20=E7=82=B9=E6=A3=80?=
 =?UTF-8?q?=E9=A1=B9=20=E5=85=B3=E8=81=94=20=20=E5=89=8D=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/eam/basicDocumentType/index.ts        |   2 +-
 src/api/eam/basicFaultCause/index.ts          |   2 +-
 src/api/eam/basicFaultType/index.ts           |   2 +-
 src/api/eam/basicInspectionOption/index.ts    |   2 +-
 src/api/eam/basicMaintenanceOption/index.ts   |   2 +-
 src/api/eam/basicSpotCheckSelectSet/index.ts  |  61 ++++
 src/api/eam/inspectionItemSelectSet/index.ts  |   3 +-
 .../basicSpotCheckSelectSet.data.ts           | 147 +++++++++
 .../eam/basicSpotCheckSelectSet/index.vue     | 287 ++++++++++++++++++
 .../itemSelectSetForm.vue                     | 287 ++++++++++++++++++
 .../eam/inspectionItemSelectSet/index.vue     |   4 +-
 .../itemSelectSetForm.vue                     |   9 +-
 12 files changed, 793 insertions(+), 15 deletions(-)
 create mode 100644 src/api/eam/basicSpotCheckSelectSet/index.ts
 create mode 100644 src/views/eam/basicSpotCheckSelectSet/basicSpotCheckSelectSet.data.ts
 create mode 100644 src/views/eam/basicSpotCheckSelectSet/index.vue
 create mode 100644 src/views/eam/basicSpotCheckSelectSet/itemSelectSetForm.vue

diff --git a/src/api/eam/basicDocumentType/index.ts b/src/api/eam/basicDocumentType/index.ts
index ec53a58df..d7809baf4 100644
--- a/src/api/eam/basicDocumentType/index.ts
+++ b/src/api/eam/basicDocumentType/index.ts
@@ -62,6 +62,6 @@ export const importTemplate = () => {
 }
 
 // 启用 / 禁用
-export const updateEnableCode = async (data: EquipmentMainPartVO) => {
+export const updateEnableCode = async (data: DocumentTypeVO) => {
   return await request.post({ url: `/eam/document-type/ables` , data })
 }
diff --git a/src/api/eam/basicFaultCause/index.ts b/src/api/eam/basicFaultCause/index.ts
index ffffb2d80..5c72afd0e 100644
--- a/src/api/eam/basicFaultCause/index.ts
+++ b/src/api/eam/basicFaultCause/index.ts
@@ -63,6 +63,6 @@ export const importTemplate = () => {
 }
 
 // 启用 / 禁用
-export const updateEnableCode = async (data: EquipmentMainPartVO) => {
+export const updateEnableCode = async (data: BasicFaultCauseVO) => {
   return await request.post({ url: `/eam/basic-fault-cause/ables` , data })
 }
diff --git a/src/api/eam/basicFaultType/index.ts b/src/api/eam/basicFaultType/index.ts
index 3af2b44ce..69865950a 100644
--- a/src/api/eam/basicFaultType/index.ts
+++ b/src/api/eam/basicFaultType/index.ts
@@ -62,6 +62,6 @@ export const importTemplate = () => {
 }
 
 // 启用 / 禁用
-export const updateEnableCode = async (data: EquipmentMainPartVO) => {
+export const updateEnableCode = async (data: BasicFaultTypeVO) => {
   return await request.post({ url: `/eam/basic-fault-type/ables` , data })
 }
diff --git a/src/api/eam/basicInspectionOption/index.ts b/src/api/eam/basicInspectionOption/index.ts
index c41812cbe..663c61889 100644
--- a/src/api/eam/basicInspectionOption/index.ts
+++ b/src/api/eam/basicInspectionOption/index.ts
@@ -59,6 +59,6 @@ export const importTemplate = () => {
 }
 
 // 启用 / 禁用
-export const updateEnableCode = async (data: EquipmentMainPartVO) => {
+export const updateEnableCode = async (data: BasicInspectionOptionVO) => {
   return await request.post({ url: `/eam/basic-inspection-option/ables` , data })
 }
diff --git a/src/api/eam/basicMaintenanceOption/index.ts b/src/api/eam/basicMaintenanceOption/index.ts
index 0d95570c6..1fa280e6d 100644
--- a/src/api/eam/basicMaintenanceOption/index.ts
+++ b/src/api/eam/basicMaintenanceOption/index.ts
@@ -59,6 +59,6 @@ export const importTemplate = () => {
 }
 
 // 启用 / 禁用
-export const updateEnableCode = async (data: EquipmentMainPartVO) => {
+export const updateEnableCode = async (data: BasicMaintenanceOptionVO) => {
   return await request.post({ url: `/eam/basic-maintenance-option/ables` , data })
 }
diff --git a/src/api/eam/basicSpotCheckSelectSet/index.ts b/src/api/eam/basicSpotCheckSelectSet/index.ts
new file mode 100644
index 000000000..c48befc48
--- /dev/null
+++ b/src/api/eam/basicSpotCheckSelectSet/index.ts
@@ -0,0 +1,61 @@
+import request from '@/config/axios'
+
+export interface BasicSpotCheckSelectSetVO {
+  id: number
+  name: string
+  describing: string
+  itemCode: string
+  departmentCode: string
+  remark: string
+  siteId: string
+  available: string
+  deletionTime: Date
+  deleterId: byte[]
+  concurrencyStamp: number
+}
+
+// 查询点检选择集维护列表
+export const getBasicSpotCheckSelectSetPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/eam/basic-spot-check-select-set/senior', data })
+  } else {
+    return await request.get({ url: `/eam/basic-spot-check-select-set/page`, params })
+  }
+}
+
+// 查询点检选择集维护详情
+export const getBasicSpotCheckSelectSet = async (id: number) => {
+  return await request.get({ url: `/eam/basic-spot-check-select-set/get?id=` + id })
+}
+
+// 新增点检选择集维护
+export const createBasicSpotCheckSelectSet = async (data: BasicSpotCheckSelectSetVO) => {
+  return await request.post({ url: `/eam/basic-spot-check-select-set/create`, data })
+}
+
+// 修改点检选择集维护
+export const updateBasicSpotCheckSelectSet = async (data: BasicSpotCheckSelectSetVO) => {
+  return await request.put({ url: `/eam/basic-spot-check-select-set/update`, data })
+}
+
+// 删除点检选择集维护
+export const deleteBasicSpotCheckSelectSet = async (id: number) => {
+  return await request.delete({ url: `/eam/basic-spot-check-select-set/delete?id=` + id })
+}
+
+// 导出点检选择集维护 Excel
+export const exportBasicSpotCheckSelectSet = async (params) => {
+  return await request.download({ url: `/eam/basic-spot-check-select-set/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/basic-spot-check-select-set/get-import-template' })
+}
+
+// 启用 / 禁用
+export const updateEnableCode = async (data: BasicSpotCheckSelectSetVO) => {
+  return await request.post({ url: `/eam/basic-spot-check-select-set/ables` , data })
+}
diff --git a/src/api/eam/inspectionItemSelectSet/index.ts b/src/api/eam/inspectionItemSelectSet/index.ts
index af1f6e522..ec0cfe547 100644
--- a/src/api/eam/inspectionItemSelectSet/index.ts
+++ b/src/api/eam/inspectionItemSelectSet/index.ts
@@ -1,5 +1,4 @@
 import request from '@/config/axios'
-import {EquipmentMainPartVO} from "@/api/eam/equipmentMainPart";
 
 export interface InspectionItemSelectSetVO {
   id: number
@@ -56,6 +55,6 @@ export const importTemplate = () => {
 }
 
 // 启用 / 禁用
-export const updateEnableCode = async (data: EquipmentMainPartVO) => {
+export const updateEnableCode = async (data: InspectionItemSelectSetVO) => {
   return await request.post({ url: `/eam/inspection-item-select-set/ables` , data })
 }
diff --git a/src/views/eam/basicSpotCheckSelectSet/basicSpotCheckSelectSet.data.ts b/src/views/eam/basicSpotCheckSelectSet/basicSpotCheckSelectSet.data.ts
new file mode 100644
index 000000000..a676dc588
--- /dev/null
+++ b/src/views/eam/basicSpotCheckSelectSet/basicSpotCheckSelectSet.data.ts
@@ -0,0 +1,147 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const BasicSpotCheckSelectSetRules = reactive({
+  name: [required],
+  describing: [required],
+  concurrencyStamp: [required],
+})
+
+export const BasicSpotCheckSelectSet = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '选择集名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '描述',
+    field: 'describing',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '项编号',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '部门id',
+    field: 'departmentCode',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    isTable: true,
+    isDetail: false,
+    isSearch: true,
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '删除时间',
+    field: 'deletionTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '删除人id',
+    field: 'deleterId',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/eam/basicSpotCheckSelectSet/index.vue b/src/views/eam/basicSpotCheckSelectSet/index.vue
new file mode 100644
index 000000000..ab1beec5a
--- /dev/null
+++ b/src/views/eam/basicSpotCheckSelectSet/index.vue
@@ -0,0 +1,287 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="BasicSpotCheckSelectSet.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="BasicSpotCheckSelectSet.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #name="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.name)">
+          <span>{{ row.name }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <ItemForm ref="basicFormRef" @success="getData"/>
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="BasicSpotCheckSelectSet.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/eam/basic-spot-check-select-set/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { BasicSpotCheckSelectSet,BasicSpotCheckSelectSetRules } from './basicSpotCheckSelectSet.data'
+import * as BasicSpotCheckSelectSetApi from '@/api/eam/basicSpotCheckSelectSet'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+import ItemForm from "@/views/eam/basicSpotCheckSelectSet/itemSelectSetForm.vue";
+
+defineOptions({ name: 'BasicSpotCheckSelectSet' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(BasicSpotCheckSelectSet.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: BasicSpotCheckSelectSetApi.getBasicSpotCheckSelectSetPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'eam:basicSpotCheckSelectSet:create'}), // 新增
+  //defaultButtons.defaultImportBtn({hasPermi:'eam:basicSpotCheckSelectSet:import'}), // 导入
+  //defaultButtons.defaultExportBtn({hasPermi:'eam:basicSpotCheckSelectSet:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.available) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListEditBtn({hasPermi:'eam:basicSpotCheckSelectSet:update'}), // 编辑
+    //defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipmentMainPart:delete'}), // 删除
+    defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'eam:basicSpotCheckSelectSet:update'}),
+    defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'eam:basicSpotCheckSelectSet:update'}),
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  } else if (val == 'enable') {
+    handleEnable(row.id)
+  } else if (val == 'disable') {
+    handleDisable(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =BasicSpotCheckSelectSet.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await BasicSpotCheckSelectSetApi.createBasicSpotCheckSelectSet(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await BasicSpotCheckSelectSetApi.updateBasicSpotCheckSelectSet(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+//刷新页面
+const getData = async() => {
+  getList();
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicBasicSpotCheckSelectSet')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await BasicSpotCheckSelectSetApi.deleteBasicSpotCheckSelectSet(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 启用 */
+const handleEnable = async (id: number) => {
+  try {
+    const params = ref({
+      id: '',
+      available:'',
+    })
+    params.value.id = id
+    params.value.available = 'TRUE'
+    await BasicSpotCheckSelectSetApi.updateEnableCode(params.value)
+    message.success(t('common.updateSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+/** 禁用 */
+const handleDisable = async (id: number) => {
+  try {
+    const params = ref({
+      id: '',
+      available:'',
+    })
+    params.value.id = id
+    params.value.available = 'FALSE'
+    await BasicSpotCheckSelectSetApi.updateEnableCode(params.value)
+    message.success(t('common.updateSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await BasicSpotCheckSelectSetApi.exportBasicSpotCheckSelectSet(tableObject.params)
+    download.excel(data, '点检选择集维护.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '点检选择集维护导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+
+</script>
diff --git a/src/views/eam/basicSpotCheckSelectSet/itemSelectSetForm.vue b/src/views/eam/basicSpotCheckSelectSet/itemSelectSetForm.vue
new file mode 100644
index 000000000..b11ccf52e
--- /dev/null
+++ b/src/views/eam/basicSpotCheckSelectSet/itemSelectSetForm.vue
@@ -0,0 +1,287 @@
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
+    <el-form
+      ref="basicFormRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+    >
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="选择集名称" prop="name">
+            <el-input v-model="formData.name" placeholder="选择集名称" :disabled="isDisabled"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="描述" prop="describing">
+            <el-input v-model="formData.describing" placeholder="描述" :disabled="isDisabled"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="formData.remark" placeholder="请输入备注名称" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="点检项" prop="items">
+            <div class="tag-container flex gap-2">
+              <el-tag v-for="ent in tags" :key="ent.content" closable :disable-transitions="false"  @close="handleClose(ent.id)">
+                {{ ent.content}}
+              </el-tag>
+              <el-input v-if="inputVisible" ref="InputRef" v-model="inputValue" class="w-20" size="small"/>
+              <el-button v-else class="button-new-tag" size="small" @click="addItem">
+                添加点检项 +
+              </el-button>
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+
+<!--添加点检项弹窗-->
+  <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess" />
+
+</template>
+<script lang="ts" setup>
+import * as SelectSetApi from '@/api/eam/basicSpotCheckSelectSet'
+import request from "@/config/axios";
+import { SearchTable } from '@/components/SearchTable'
+import { InspectionItem} from "@/views/eam/inspectionItem/inspectionItem.data";
+import * as spotCheckItemApi from "@/api/eam/spotCheckItem";
+import {ElInput} from "element-plus";
+
+defineOptions({ name: 'TeamForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const tags=ref([])
+
+const inputValue = ref('')
+const inputVisible = ref(false)
+const isDisabled = ref(false)
+const InputRef = ref<InstanceType<typeof ElInput>>()
+
+const itemData = ref({
+  id: '',
+  content: ''
+})
+
+const formData = ref({
+  id: '',
+  name: '',
+  describing: '',
+  itemCode: '',
+  available: 'TRUE',
+  remark: '',
+  createTime: ''
+})
+const formRules = reactive({
+  name: [
+    { required: true, message: '选择集名称不能为空', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+const basicFormRef = ref() // 表单 Ref
+
+/** 删除点检项 */
+const handleClose = (id: string) => {
+  const index = tags.value.findIndex(tag => tag.id === id);
+  if (index !== -1) {
+    tags.value.splice(index, 1);
+  }
+}
+
+/** 弹窗相关参数 */
+const searchTableRef = ref();
+const _searchTableTitle = ref();
+const _searchTableAllSchemas = ref();
+const _searchTablePage = ref();
+const _formField = ref();
+const _searchField = ref();
+const _multiple = ref();
+const _type = ref();
+const _row = ref();
+const _searchCondition = ref({})
+
+
+const addItem = () =>{
+  addItemCommon(true,'dianJianItem')
+}
+
+/** 选择点检项弹窗 */
+const addItemCommon = (multiple,field) => {
+  _searchCondition.value = {}
+  const filters: any[] = []
+  filters.push({
+    action: "==",
+    column: 'available',
+    value: 'TRUE'
+  })
+  // 参数整理
+  _searchCondition.value.isSearch = true
+  _searchCondition.value.filters = filters
+  _searchTableTitle.value = '选择点检项'
+  _multiple.value = multiple
+  _formField.value = field
+  _searchField.value = field
+  _searchTablePage.value = spotCheckItemApi.getSpotCheckItemPage
+  _searchTableAllSchemas.value = InspectionItem.allSchemas
+  openCommon()
+}
+
+/** 弹窗选择之后  回调函数 添加选择集 */
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick?.(() => {
+      if (formField === 'dianJianItem') {
+          val.forEach(item => {
+            const isExist = tags.value.some(tag => tag.content === item.content);
+            if (!isExist){
+              const newItem = {};
+              newItem['content'] = item.content;
+              newItem['id'] = item.id;
+              tags.value.push(newItem);
+            }
+          });
+      }
+  })
+}
+/*打开弹窗*/
+const openCommon = () => {
+  searchTableRef.value.open(
+    _searchTableTitle.value,
+    _searchTableAllSchemas.value,
+    _searchTablePage.value,
+    _formField.value,
+    _searchField.value,
+    _multiple.value,
+    _type.value,
+    _row.value,
+    _searchCondition.value
+  )
+}
+/** 初始化弹窗 */
+const open = async (type: string, row?: object) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  // 修改时，设置数据
+  if (row) {
+    tags.value=[];
+    isDisabled.value = true;
+    formLoading.value = true
+    formData.value = row;
+    let item = (row.itemCode).split(",")
+    try {
+      for (var i = 0; i < item.length; i++) {
+        itemData.value = await request.get({ url: `/eam/basic/inspection-item/get?id=` + item[i] });
+        tags.value.push(itemData.value);
+      }
+    } finally {
+      formLoading.value = false
+    }
+  }
+  // 新增时
+  else {
+    resetForm()
+    isDisabled.value = false;
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!basicFormRef) return
+  const valid = await basicFormRef.value.validate()
+  if (!valid) return
+  if (tags.value.length > 10  ){
+    message.warning('点检项最多10个');
+    return
+  }
+
+  let result = '';
+  for (var i = 0; i < tags.value.length; i++) {
+    result += tags.value[i].id + ',';
+  }
+  if(result.endsWith(',')){
+    result = result.substring(0,result.length -1)
+  }
+  formData.value.itemCode = result
+  // 提交请求
+  formLoading.value = true
+  //formData.value.members = JSON.stringify(tags.value)
+  try {
+    const data = formData.value as unknown as SelectSetApi.BasicSpotCheckSelectSetVO
+    if (formType.value === 'create') {
+      await SelectSetApi.createBasicSpotCheckSelectSet(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await SelectSetApi.updateBasicSpotCheckSelectSet(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: '',
+    name: '',
+    describing: '',
+    itemCode: '',
+    available: 'TRUE',
+    remark: '',
+    createTime: ''
+  }
+  tags.value=[];
+  basicFormRef.value?.resetFields()
+}
+
+</script>
+
+<style scoped>
+.tag-container {
+  margin-top: 10px; /* 可根据需要调整标签容器与表单项之间的间距 */
+  border: 1px solid #ccc; /* 添加边框样式 */
+  padding: 10px; /* 可根据需要调整容器内边距 */
+  width: 950px; /* 设置固定宽度为 950px */
+  overflow-y: auto; /* 当内容溢出容器高度时显示滚动条 */
+  word-wrap: break-word; /* 使用 word-wrap 属性实现超出范围换行 */
+  overflow-wrap: break-word; /* 兼容性更好的写法 */
+  flex-wrap: wrap;
+}
+.input-with-button {
+  display: flex;
+  align-items: center;
+  width: 100%;
+}
+
+.input-with-button > .el-input {
+  flex: 1;
+  /*margin-right: 10px;*/
+}
+
+</style>
diff --git a/src/views/eam/inspectionItemSelectSet/index.vue b/src/views/eam/inspectionItemSelectSet/index.vue
index 7b35c7a3f..7b9ad8bec 100644
--- a/src/views/eam/inspectionItemSelectSet/index.vue
+++ b/src/views/eam/inspectionItemSelectSet/index.vue
@@ -39,7 +39,7 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <teamForm ref="basicFormRef" @success="getData"/>
+  <ItemForm ref="basicFormRef" @success="getData"/>
 
   <!-- 详情 -->
   <Detail ref="detailRef" :isBasic="true" :allSchemas="InspectionItemSelectSet.allSchemas" />
@@ -56,7 +56,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
-import TeamForm from "@/views/eam/inspectionItemSelectSet/itemSelectSetForm.vue";
+import ItemForm from "@/views/eam/inspectionItemSelectSet/itemSelectSetForm.vue";
 
 defineOptions({ name: 'InspectionItemSelectSet' })
 
diff --git a/src/views/eam/inspectionItemSelectSet/itemSelectSetForm.vue b/src/views/eam/inspectionItemSelectSet/itemSelectSetForm.vue
index f7aa42b20..217708e79 100644
--- a/src/views/eam/inspectionItemSelectSet/itemSelectSetForm.vue
+++ b/src/views/eam/inspectionItemSelectSet/itemSelectSetForm.vue
@@ -91,9 +91,6 @@ const formRules = reactive({
   remark: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-  items: [
-    { required: true, message: '巡检项不能为空', trigger: 'blur' },
-  ],
 })
 const basicFormRef = ref() // 表单 Ref
 
@@ -206,9 +203,9 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
   // 校验表单
-  // if (!basicFormRef) return
-  // const valid = await basicFormRef.value.validate()
-  // if (!valid) return
+  if (!basicFormRef) return
+  const valid = await basicFormRef.value.validate()
+  if (!valid) return
   if (tags.value.length > 10  ){
     message.warning('巡检项最多10个');
     return