From d9728769f1039059e09421af3e9bb2d6962a66a6 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Thu, 8 Jan 2026 14:18:47 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=B7=BB=E5=8A=A0=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=BB=B4=E6=8A=A4=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.local                                |   3 +-
 src/api/mes/dvsubject/index.ts            |  95 ++++++------
 src/views/mes/dvsubject/DvSubjectForm.vue |  65 ++++++---
 src/views/mes/dvsubject/index.vue         | 168 ++++++++++++++++------
 4 files changed, 223 insertions(+), 108 deletions(-)

diff --git a/.env.local b/.env.local
index 121499b4..2167ba7a 100644
--- a/.env.local
+++ b/.env.local
@@ -8,7 +8,8 @@ VITE_DEV=true
 # 线上环境
 # VITE_BASE_URL='https://besure.ngsk.tech:7001' 
 # 本地联调
-VITE_BASE_URL='http://192.168.5.113:48081' 
+VITE_BASE_URL='http://192.168.5.107:48081' 
+# VITE_BASE_URL='http://192.168.5.135:48081' 
 
 
 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持 S3 服务
diff --git a/src/api/mes/dvsubject/index.ts b/src/api/mes/dvsubject/index.ts
index f6e4bff8..02b9ac41 100644
--- a/src/api/mes/dvsubject/index.ts
+++ b/src/api/mes/dvsubject/index.ts
@@ -1,45 +1,50 @@
-import request from '@/config/axios'
-
-// 维保项目 VO
-export interface DvSubjectVO {
-  id: number // ID
-  subjectCode: string // 项目编码
-  subjectName: string // 项目名称
-  subjectType: string // 项目类型
-  subjectContent: string // 项目内容
-  subjectStandard: string // 标准
-  isEnable: boolean // 是否启用
-}
-
-// 维保项目 API
-export const DvSubjectApi = {
-  // 查询维保项目分页
-  getDvSubjectPage: async (params: any) => {
-    return await request.get({ url: `/mes/dv-subject/page`, params })
-  },
-
-  // 查询维保项目详情
-  getDvSubject: async (id: number) => {
-    return await request.get({ url: `/mes/dv-subject/get?id=` + id })
-  },
-
-  // 新增维保项目
-  createDvSubject: async (data: DvSubjectVO) => {
-    return await request.post({ url: `/mes/dv-subject/create`, data })
-  },
-
-  // 修改维保项目
-  updateDvSubject: async (data: DvSubjectVO) => {
-    return await request.put({ url: `/mes/dv-subject/update`, data })
-  },
-
-  // 删除维保项目
-  deleteDvSubject: async (id: number) => {
-    return await request.delete({ url: `/mes/dv-subject/delete?id=` + id })
-  },
-
-  // 导出维保项目 Excel
-  exportDvSubject: async (params) => {
-    return await request.download({ url: `/mes/dv-subject/export-excel`, params })
-  },
-}
\ No newline at end of file
+import request from '@/config/axios'
+
+// 维保项目 VO
+export interface DvSubjectVO {
+  id?: number // ID
+  subjectCode: string // 项目编码
+  subjectName: string // 项目名称
+  subjectType?: string // 项目类型
+  subjectContent?: string // 项目内容
+  subjectStandard?: string // 标准
+  isEnable: string // 是否启用
+  inspectionMethod: string // 检验方式
+  valueType: string // 值类型
+  judgmentCriteria: string // 判定基准
+  creator?: string // 创建人
+  createTime?: string | number | Date // 创建时间
+}
+
+// 维保项目 API
+export const DvSubjectApi = {
+  // 查询维保项目分页
+  getDvSubjectPage: async (params: any) => {
+    return await request.get({ url: `/mes/dv-subject/page`, params })
+  },
+
+  // 查询维保项目详情
+  getDvSubject: async (id: number) => {
+    return await request.get({ url: `/mes/dv-subject/get?id=` + id })
+  },
+
+  // 新增维保项目
+  createDvSubject: async (data: DvSubjectVO) => {
+    return await request.post({ url: `/mes/dv-subject/create`, data })
+  },
+
+  // 修改维保项目
+  updateDvSubject: async (data: DvSubjectVO) => {
+    return await request.put({ url: `/mes/dv-subject/update`, data })
+  },
+
+  // 删除维保项目
+  deleteDvSubject: async (ids: string) => {
+    return await request.delete({ url: `/mes/dv-subject/delete?ids=` + ids })
+  },
+
+  // 导出维保项目 Excel
+  exportDvSubject: async (params) => {
+    return await request.download({ url: `/mes/dv-subject/export-excel`, params })
+  },
+}
diff --git a/src/views/mes/dvsubject/DvSubjectForm.vue b/src/views/mes/dvsubject/DvSubjectForm.vue
index e73e12da..aaaf4138 100644
--- a/src/views/mes/dvsubject/DvSubjectForm.vue
+++ b/src/views/mes/dvsubject/DvSubjectForm.vue
@@ -13,26 +13,26 @@
       <el-form-item label="项目名称" prop="subjectName">
         <el-input v-model="formData.subjectName" placeholder="请输入项目名称" />
       </el-form-item>
-      <el-form-item label="项目类型" prop="subjectType">
-        <el-input v-model="formData.subjectType" placeholder="请输入项目类型" />
+      <el-form-item label="检验方式" prop="inspectionMethod">
+        <el-select v-model="formData.inspectionMethod" placeholder="请选择检验方式" clearable filterable class="!w-full">
+          <el-option v-for="dict in inspectionMethodOptions" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
       </el-form-item>
-      <el-form-item label="标准" prop="subjectStandard">
-        <el-input v-model="formData.subjectStandard" placeholder="请输入标准" />
+      <el-form-item label="值类型" prop="valueType">
+        <el-select v-model="formData.valueType" placeholder="请选择值类型" clearable filterable class="!w-full">
+          <el-option v-for="dict in valueTypeOptions" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="判定基准" prop="judgmentCriteria">
+        <el-input v-model="formData.judgmentCriteria" placeholder="请输入判定基准" type="textarea" />
       </el-form-item>
       <el-form-item label="是否启用" prop="isEnable">
         <el-radio-group v-model="formData.isEnable">
-          <el-radio
-            v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
-            :key="dict.value"
-            :label="dict.value"
-          >
+          <el-radio v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)" :key="dict.value" :label="dict.value">
             {{ dict.label }}
           </el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="项目内容" prop="subjectContent">
-        <Editor v-model="formData.subjectContent" height="150px" />
-      </el-form-item>
     </el-form>
     <template #footer>
       <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
@@ -41,8 +41,9 @@
   </Dialog>
 </template>
 <script setup lang="ts">
-import { getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
+import { getBoolDictOptions, getStrDictOptions, DICT_TYPE } from '@/utils/dict'
 import { DvSubjectApi, DvSubjectVO } from '@/api/mes/dvsubject'
+import { useDictStoreWithOut } from '@/store/modules/dict'
 
 /** 维保项目 表单 */
 defineOptions({ name: 'DvSubjectForm' })
@@ -50,6 +51,12 @@ defineOptions({ name: 'DvSubjectForm' })
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
+const dictStore = useDictStoreWithOut()
+const dictReady = ref(false)
+
+const inspectionMethodOptions = computed(() => (dictReady.value ? getStrDictOptions('Inspection_method') : []))
+const valueTypeOptions = computed(() => (dictReady.value ? getStrDictOptions('value_types') : []))
+
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
@@ -58,16 +65,18 @@ const formData = ref({
   id: undefined,
   subjectCode: undefined,
   subjectName: undefined,
-  subjectType: undefined,
-  subjectContent: undefined,
-  subjectStandard: undefined,
   isEnable: undefined,
+  inspectionMethod: undefined,
+  valueType: undefined,
+  judgmentCriteria: undefined,
 })
 const formRules = reactive({
   subjectCode: [{ required: true, message: '项目编码不能为空', trigger: 'blur' }],
   subjectName: [{ required: true, message: '项目名称不能为空', trigger: 'blur' }],
-  subjectContent: [{ required: true, message: '项目内容不能为空', trigger: 'blur' }],
-  isEnable: [{ required: true, message: '是否启用不能为空', trigger: 'blur' }],
+  inspectionMethod: [{ required: true, message: '检验方式不能为空', trigger: 'change' }],
+  valueType: [{ required: true, message: '值类型不能为空', trigger: 'change' }],
+  judgmentCriteria: [{ required: true, message: '判定基准不能为空', trigger: 'blur' }],
+  isEnable: [{ required: true, message: '是否启用不能为空', trigger: 'change' }],
 })
 const formRef = ref() // 表单 Ref
 
@@ -77,6 +86,10 @@ const open = async (type: string, id?: number) => {
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
+  if (!dictReady.value) {
+    await dictStore.setDictMap()
+    dictReady.value = true
+  }
   // 修改时，设置数据
   if (id) {
     formLoading.value = true
@@ -97,7 +110,15 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    const data = formData.value as unknown as DvSubjectVO
+    const data = {
+      id: formType.value === 'update' ? formData.value.id : undefined,
+      subjectCode: formData.value.subjectCode,
+      subjectName: formData.value.subjectName,
+      isEnable: formData.value.isEnable,
+      inspectionMethod: formData.value.inspectionMethod,
+      valueType: formData.value.valueType,
+      judgmentCriteria: formData.value.judgmentCriteria
+    } as unknown as DvSubjectVO
     if (formType.value === 'create') {
       await DvSubjectApi.createDvSubject(data)
       message.success(t('common.createSuccess'))
@@ -119,10 +140,10 @@ const resetForm = () => {
     id: undefined,
     subjectCode: undefined,
     subjectName: undefined,
-    subjectType: undefined,
-    subjectContent: undefined,
-    subjectStandard: undefined,
     isEnable: undefined,
+    inspectionMethod: undefined,
+    valueType: undefined,
+    judgmentCriteria: undefined,
   }
   formRef.value?.resetFields()
 }
diff --git a/src/views/mes/dvsubject/index.vue b/src/views/mes/dvsubject/index.vue
index 512bf67d..4c257bc4 100644
--- a/src/views/mes/dvsubject/index.vue
+++ b/src/views/mes/dvsubject/index.vue
@@ -8,32 +8,30 @@
       :inline="true"
       label-width="68px"
     >
-      <el-form-item label="项目名称" prop="subjectName">
+      <el-form-item label="编码" prop="subjectCode">
         <el-input
-          v-model="queryParams.subjectName"
-          placeholder="请输入项目名称"
+          v-model="queryParams.subjectCode"
+          placeholder="请输入编码"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="项目类型" prop="subjectType">
+      <el-form-item label="名称" prop="subjectName">
         <el-input
-          v-model="queryParams.subjectType"
-          placeholder="请输入项目类型"
+          v-model="queryParams.subjectName"
+          placeholder="请输入名称"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          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')]"
+      <el-form-item label="判定基准" prop="judgmentCriteria">
+        <el-input
+          v-model="queryParams.judgmentCriteria"
+          placeholder="请输入判定基准"
+          clearable
+          @keyup.enter="handleQuery"
           class="!w-240px"
         />
       </el-form-item>
@@ -48,6 +46,9 @@
         >
           <Icon icon="ep:plus" class="mr-5px" /> 新增
         </el-button>
+        <el-button type="danger" plain @click="handleBatchDelete" v-hasPermi="['mes:dv-subject:delete']">
+          <Icon icon="ep:delete" class="mr-5px" /> 批量删除
+        </el-button>
         <el-button
           type="success"
           plain
@@ -63,25 +64,53 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="项目编码" align="center" prop="subjectCode" />
-      <el-table-column label="项目名称" align="center" prop="subjectName" />
-      <el-table-column label="项目类型" align="center" prop="subjectType" />
-      <el-table-column label="项目内容" align="center" prop="subjectContent" />
-      <el-table-column label="标准" align="center" prop="subjectStandard" />
-      <el-table-column label="是否启用" align="center" prop="isEnable">
+    <el-table
+      ref="tableRef"
+      v-loading="loading"
+      :data="list"
+      :stripe="true"
+      :show-overflow-tooltip="true"
+      row-key="id"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" fixed="left" reserve-selection />
+      <el-table-column label="序号" align="center" width="80" fixed="left">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isEnable" />
+          {{ (queryParams.pageNo - 1) * queryParams.pageSize + scope.$index + 1 }}
         </template>
       </el-table-column>
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column label="操作" align="center">
+      <el-table-column label="编码" align="center" prop="subjectCode" />
+      <el-table-column label="名称" align="center" prop="subjectName" />
+      <el-table-column label="检验方式" align="center" prop="inspectionMethod" width="120px">
+        <template #default="scope">
+          <el-tag
+            effect="light"
+            :type="getTagType('Inspection_method', scope.row.inspectionMethod)"
+            :color="getTagColor('Inspection_method', scope.row.inspectionMethod)"
+            :style="getTagStyle('Inspection_method', scope.row.inspectionMethod)"
+            disable-transitions
+          >
+            {{ getTagLabel('Inspection_method', scope.row.inspectionMethod) }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="值类型" align="center" prop="valueType" width="120px">
+        <template #default="scope">
+          <el-tag
+            effect="light"
+            :type="getTagType('value_types', scope.row.valueType)"
+            :color="getTagColor('value_types', scope.row.valueType)"
+            :style="getTagStyle('value_types', scope.row.valueType)"
+            disable-transitions
+          >
+            {{ getTagLabel('value_types', scope.row.valueType) }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="判定基准" align="center" prop="judgmentCriteria" />
+      <el-table-column label="创建人" align="center" prop="creator" />
+      <el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="180px" />
+      <el-table-column label="操作" align="center" fixed="right" width="160px">
         <template #default="scope">
           <el-button
             link
@@ -116,11 +145,13 @@
 </template>
 
 <script setup lang="ts">
-import { getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
+import { getStrDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { DvSubjectApi, DvSubjectVO } from '@/api/mes/dvsubject'
 import DvSubjectForm from './DvSubjectForm.vue'
+import { isHexColor } from '@/utils/color'
+import { useDictStoreWithOut } from '@/store/modules/dict'
 
 /** 维保项目 列表 */
 defineOptions({ name: 'DvSubject' })
@@ -128,23 +159,63 @@ defineOptions({ name: 'DvSubject' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
+const dictStore = useDictStoreWithOut()
+const dictReady = ref(false)
+
 const loading = ref(true) // 列表的加载中
 const list = ref<DvSubjectVO[]>([]) // 列表的数据
 const total = ref(0) // 列表的总页数
+const tableRef = ref()
+const selectedIds = ref<number[]>([])
+
+const handleSelectionChange = (rows: any[]) => {
+  selectedIds.value = rows?.map((row) => row.id).filter((id) => id !== undefined) ?? []
+}
+
+const buildIdsParam = (ids: number | number[]) => {
+  return Array.isArray(ids) ? ids.join(',') : String(ids)
+}
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
   subjectCode: undefined,
   subjectName: undefined,
-  subjectType: undefined,
-  subjectContent: undefined,
-  subjectStandard: undefined,
-  isEnable: undefined,
-  createTime: [],
+  judgmentCriteria: undefined,
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
 
+const getTagDict = (dictType: string, value: any) => {
+  if (!dictReady.value) return undefined
+  const v = value === '' || value === null || value === undefined ? undefined : String(value)
+  if (!v) return undefined
+  return getStrDictOptions(dictType).find((d) => d.value === v)
+}
+
+const getTagLabel = (dictType: string, value: any) => {
+  const found = getTagDict(dictType, value)
+  return found?.label ?? (value ?? '')
+}
+
+const getTagType = (dictType: string, value: any) => {
+  const found = getTagDict(dictType, value)
+  const type = found?.colorType
+  if (type + '' === 'primary' || type + '' === 'default') return '' as any
+  return (type ?? '') as any
+}
+
+const getTagColor = (dictType: string, value: any) => {
+  const found = getTagDict(dictType, value)
+  if (found?.cssClass && isHexColor(found.cssClass)) return found.cssClass
+  return ''
+}
+
+const getTagStyle = (dictType: string, value: any) => {
+  const color = getTagColor(dictType, value)
+  if (!color) return ''
+  return 'color: #fff'
+}
+
 /** 查询列表 */
 const getList = async () => {
   loading.value = true
@@ -176,26 +247,41 @@ const openForm = (type: string, id?: number) => {
 }
 
 /** 删除按钮操作 */
-const handleDelete = async (id: number) => {
+const handleDelete = async (ids: number | number[]) => {
   try {
     // 删除的二次确认
     await message.delConfirm()
     // 发起删除
-    await DvSubjectApi.deleteDvSubject(id)
+    const idsParam = buildIdsParam(ids)
+    await DvSubjectApi.deleteDvSubject(idsParam)
     message.success(t('common.delSuccess'))
+    selectedIds.value = []
+    tableRef.value?.clearSelection?.()
     // 刷新列表
     await getList()
   } catch {}
 }
 
+const handleBatchDelete = async () => {
+  if (!selectedIds.value.length) {
+    message.error('请选择需要删除的数据')
+    return
+  }
+  await handleDelete(selectedIds.value)
+}
+
 /** 导出按钮操作 */
 const handleExport = async () => {
+  if (!selectedIds.value.length) {
+    message.error('请选择需要导出的数据')
+    return
+  }
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await DvSubjectApi.exportDvSubject(queryParams)
+    const data = await DvSubjectApi.exportDvSubject({ ids: selectedIds.value.join(',') })
     download.excel(data, '维保项目.xls')
   } catch {
   } finally {
@@ -204,7 +290,9 @@ const handleExport = async () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
+onMounted(async () => {
+  await dictStore.setDictMap()
+  dictReady.value = true
   getList()
 })
 </script>