检测记录

package.json

@@ -53,6 +53,7 @@
     "vue-i18n": "^9.4.1",
     "vue-router": "^4.2.5",
     "vue-types": "^5.1.1",
+    "vue-video-player": "^5.0.1",
     "vuedraggable": "^4.1.0",
     "web-storage-cache": "^1.1.1",
     "xml-js": "^1.6.11"

src/api/detection/records/index.ts

@@ -7,6 +7,11 @@ export interface RecordsVO {
   remark: string
   version: string
   saveStatus: string
+  projectName?:string
+  itemName?:string
+  itemType?:string
+  itemCode?:string
+  projectCode?:string
 }
 
 // 查询检测记录数据主列表
@@ -40,6 +45,11 @@ export const deleteRecords = async (id: number) => {
   return await request.delete({ url: `/detection/records/delete?id=` + id })
 }
 
+// 批量删除检测记录数据主
+export const batchDeleteRecords = async (ids: Array<number>) => {
+  return await request.delete({ url: `/detection/records/batchDelete?ids=` + ids })
+}
+
 // 导出检测记录数据主 Excel
 export const exportRecords = async (params) => {
   return await request.download({ url: `/detection/records/export-excel`, params })

src/api/detection/recordsDetails/index.ts

@@ -0,0 +1,63 @@
+import request from '@/config/axios'
+
+export interface RecordsDetailsVO {
+  id: number
+  templateItemId: number
+  templateId: number
+  detectValue: number
+  result: string
+  saveStatus: string
+  remark: string
+  version: string
+  contents?:string
+  methods?:string
+  upLimit?:string
+  downLimit?:string
+
+}
+
+// 查询检测记录详细列表
+export const getRecordsDetailsPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/detection/recordsdetails/senior', data })
+  } else {
+    return await request.get({ url: `/detection/recordsdetails/page`, params })
+  }
+}
+
+// 查询检测记录详细详情
+export const getRecordsDetails = async (id: number) => {
+  return await request.get({ url: `/detection/recordsdetails/get?id=` + id })
+}
+
+// 新增检测记录详细
+export const createRecordsDetails = async (data: RecordsDetailsVO) => {
+  return await request.post({ url: `/detection/recordsdetails/create`, data })
+}
+
+// 修改检测记录详细
+export const updateRecordsDetails = async (data: RecordsDetailsVO) => {
+  return await request.put({ url: `/detection/recordsdetails/update`, data })
+}
+
+// 删除检测记录详细
+export const deleteRecordsDetails = async (id: number) => {
+  return await request.delete({ url: `/detection/recordsdetails/delete?id=` + id })
+}
+
+// 删除检测记录详细
+export const batchDeleteRecordDetails = async (ids: Array<number>) => {
+  return await request.delete({ url: `/detection/recordsdetails/batchDelete?ids=` + ids})
+}
+
+// 导出检测记录详细 Excel
+export const exportRecordsDetails = async (params) => {
+  return await request.download({ url: `/detection/recordsdetails/export-excel`, params })
+}
+
+// 下载导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/detection/recordsdetails/get-import-template' })
+}

src/api/spc/itembasic/index.ts

@@ -89,3 +89,8 @@ export const selectItems = async () => {
 export const selectItemsByProjectCode = async (code:String) => {
   return await request.get({ url: `/spc/itembasic/selectItemsByProjectCode?code=` + code})
 }
+
+// 查询物品基本信息列表不分页用于下拉数据
+export const getList = async (params) => {
+    return await request.get({ url: `/spc/itembasic/getList`, params })
+}

src/api/spc/project/index.ts

@@ -58,3 +58,8 @@ export const importTemplate = () => {
 export const selectAllPros = async () => {//查询所有的项目
   return await request.get({ url: `/spc/project/selectAllPros`})
 }
+
+// 查询项目基本信息列表不分页用于下拉数据
+export const getList = async (params) => {
+  return await request.get({ url: `/spc/project/getList`, params })
+}

src/api/spc/templateItemDetails/index.ts

@@ -1,4 +1,5 @@
 import request from '@/config/axios'
+import { pa } from 'element-plus/es/locale'
 
 export interface TemplateItemDetailsVO {
   templateId: number
@@ -20,7 +21,6 @@ export interface TemplateItemDetailsVO {
   concurrencyStamp: string
   siteId: string
 }
-
 // 查询检测记录明细列表
 export const getTemplateItemDetailsPage = async (params) => {
   if (params.isSearch) {
@@ -65,3 +65,17 @@ export const importTemplate = () => {
 export const selectDetectionItems = async (itemCode: String , detectionType: String) => {
   return await request.get({ url: `/spc/template-item-details/selectDetectionItems?itemCode=` + itemCode + `&detectionType=` + detectionType })
 }
+let templateId=0
+
+// 查询检测项列表用于下拉选择
+export const getTemplateItemDetailsList = async (params) => {   
+     params = {templateId:templateId};
+    return await request.get({ url: `/spc/template-item-details/getList`,params})
+}
+
+export const acceptParam = async (params) => {
+  templateId =params.templateId
+  console.info("templateId",templateId)
+  return 
+  //return await request.get({ url: `/spc/template-item-details/getList`,params})
+}

src/components/Detail/src/RecordDetails.vue

@@ -0,0 +1,305 @@
+<template>
+  <div>
+    <el-drawer v-model="isShowDrawer" title="检测记录明细" direction="rtl" size="80%" v-loading="detailLoading">
+    <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="RecordsDetails.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="RecordsDetails.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+       ref="tableid"
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :selection="true"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+    </el-drawer>
+</div>
+</template>
+
+<script lang="ts" setup>
+defineOptions({ name: 'RecordDetails' })
+import download from '@/utils/download'
+import { RecordsDetails,RecordsDetailsRules } from '@/views/detection/recordsDetails/recordsDetails.data'
+import * as RecordDetailsApi from '@/api/detection/recordsDetails/index'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as ContentAPI from '@/api/spc/templateItemDetails'
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const route = useRoute() // 路由信息
+const routeName = ref()
+const isShowDrawer = ref(false)
+const decRecId = ref("")
+// routeName.value = route.name
+// routeName.value = routeName.value.substring(0,routeName.value.length - 4) + 'Detail'
+const props = defineProps({
+  // 标签参数
+  tabs: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 是否是基础数据 展现详情顶部表单
+  isBasic: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  // 表单，列表 相关信息
+  allSchemas: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  
+  // 回显字段
+  Echo: {
+    type: Array,
+    required: false,
+    default: null
+  },
+})
+
+
+const openDetail = async (row: any, titleName: any, titleValue: any, tableName: any) => {
+  if(row){
+    isShowDrawer.value = true
+    decRecId.value = row.id;
+    ContentAPI.acceptParam({templateId:row.id});
+    let param = {
+      decRecId:decRecId.value
+    }
+    setSearchParams(param);
+  }
+  
+}
+defineExpose({ openDetail }) // 提供 open 方法，用于打开弹窗
+const formsSuccess = async (formType,data) => {
+      data.templateId = decRecId.value;
+      if(data.type=='NUMBER'&& data.upLimit<data.downLimit){
+          message.error('数值型上限值要大于下限')
+          return;
+      }
+      if(data.activeTime==0)data.activeTime = null;
+      if(data.expireTime==0)data.expireTime = null;
+      if (formType === 'create') {
+        await RecordDetailsApi.createRecordsDetails(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await RecordDetailsApi.updateRecordsDetails(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+//主表所需的参数
+const masterParmas=ref({
+  masterId:'',//主表id
+  number: '',//主表单据号
+  status: '',//主表状态 用于控制子表新增编辑按钮显示情况
+})
+routeName.value = route.name
+const tableColumns = ref(RecordsDetails.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: RecordDetailsApi.getRecordsDetailsPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  //defaultButtons.defaultAddBtn(null), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:templateItemDetails:import'}), // 导入
+  // defaultButtons.defaultExportBtn({hasPermi:'wms:templateItemDetails:export'}), // 导出
+  defaultButtons.defaultBatchDeletionBtn(null), // 批量删除
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  // defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+const tableid=ref();
+// 头部按钮事件
+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 if(val == 'batch'){//批量删除
+      let params = [];
+      let ids = tableid.value.selections;
+      if(ids.length > 0){
+        for(let i = 0; i　< ids.length; i++){
+          params[i] = ids[i].id;
+        }
+        console.info(params);
+        handleBatchDelete(params);
+      }
+      
+
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  //defaultButtons.mainListEditBtn(null), // 编辑
+  defaultButtons.mainListDeleteBtn(null), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+
+/*批量删除操作*/
+const handleBatchDelete = async (ids:any) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await RecordDetailsApi.batchDeleteRecordDetails(ids)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await RecordDetailsApi.deleteRecordsDetails(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await RecordDetailsApi.exportRecordsDetails(setSearchParams)
+    download.excel(data, '检测记录明细.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '检测记录明细导入模版.xls'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  
+  // importTemplateData.templateUrl = await TemplateItemDetailsApi.importTemplate()
+})
+
+</script>
+

src/utils/disposition/defaultButtons.ts

@@ -4,6 +4,18 @@
  * @param {*} option 
  * @returns 
  */
+//批量删除
+export function defaultBatchDeletionBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '批量删除',
+    name: 'batch',
+    hide: false,
+    type: 'warning',
+    icon: 'ep:upload',
+    color: '',
+    hasPermi: ''
+  })
+}
 
 // 新增按钮
 export function defaultAddBtn(option:any) {

src/views/detection/records/index.vue

@@ -1,8 +1,8 @@
 <template>
    <!-- 搜索工作栏 -->
-  <!-- <ContentWrap>
+  <ContentWrap>
     <Search :schema="Records.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
-  </ContentWrap> -->
+  </ContentWrap>
 
   <!-- 列表头部 -->
   <TableHead
@@ -17,8 +17,10 @@
   <!-- 列表 -->
   <ContentWrap>
     <Table
+      ref="tableid"
       :columns="tableColumns"
       :data="tableObject.tableList"
+      :selection="true"
       :loading="tableObject.loading"
       :pagination="{
         total: tableObject.total
@@ -27,9 +29,9 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
+      <template #templateId="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+        <el-button type="primary" link @click="openDetail(row, '检测记录明细', row.code)">
-          <span>{{ row.code }}</span>
+          <span>{{ row.templateId }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
@@ -51,6 +53,15 @@
     :isBusiness="false"
   />
 
+
+  <!-- 详情 -->
+  <record-details 
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="Records.allSchemas"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+  />
+
   <!-- 导入 -->
   <DetecImportForm ref="importFormRef" url="/detection/records/import" :importTemplateData="importTemplateData" @success="importSuccess" />
 
@@ -61,6 +72,7 @@ import download from '@/utils/download'
 import { Records,RecordsRules } from './records.data'
 import * as RecordsApi from '@/api/detection/records'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { any } from 'vue-types'
 
 defineOptions({ name: 'DetectionRecords' })
 
@@ -98,7 +110,8 @@ const { getList, setSearchParams } = tableMethods
 const HeadButttondata = [
   // defaultButtons.defaultAddBtn(null), // 新增
   defaultButtons.defaultImportBtn(null), // 导入
-  // defaultButtons.defaultExportBtn({hasPermi:'wms:records:export'}), // 导出
+  defaultButtons.defaultBatchDeletionBtn(null), // 批量删除
+  defaultButtons.defaultExportBtn(null), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   // defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -111,7 +124,7 @@ const HeadButttondata = [
   //   color: ''
   // },
 ]
-
+const tableid=ref();
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
   if (val == 'add') { // 新增
@@ -123,6 +136,18 @@ const buttonBaseClick = (val, item) => {
   } else if (val == 'refresh') { // 刷新
     getList()
   } else if (val == 'filtrate') { // 筛选
+  } else if(val == 'batch'){//批量删除
+      let params = [];
+      let ids = tableid.value.selections;
+      if(ids.length > 0){
+        for(let i = 0; i　< ids.length; i++){
+          params[i] = ids[i].id;
+        }
+        console.info(params);
+        handleBatchDelete(params);
+      }
+      
+
   }else { // 其他按钮
     console.log('其他按钮', item)
   }
@@ -130,12 +155,13 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn(null), // 编辑
+  //defaultButtons.mainListEditBtn(null), // 编辑
   defaultButtons.mainListDeleteBtn(null), // 删除
 ]
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
+  console.log("row",row)
   if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
@@ -161,7 +187,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue, 'basicRecords')
+  detailRef.value.openDetail(row, titleName, titleValue)
 }
 
 /** 删除按钮操作 */
@@ -176,6 +202,18 @@ const handleDelete = async (id: number) => {
     await getList()
   } catch {}
 }
+/*批量删除操作*/
+const handleBatchDelete = async (ids:any) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await RecordsApi.batchDeleteRecords(ids)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
 
 /** 导出按钮操作 */
 const exportLoading = ref(false) // 导出的加载中

src/views/detection/records/records.data.ts

@@ -1,29 +1,87 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 import { stubFalse } from 'lodash-es'
-
+import * as itembasicApi from '@/api/spc/itembasic/index'
+import * as ProjectApi from '@/api/spc/project/index'
+const itembasicList = await itembasicApi.getList({});
+const projectList = await  ProjectApi.getList({});
 // 表单校验
 export const RecordsRules = reactive({
   result: [required],
 })
 
 export const Records = useCrudSchemas(reactive<CrudSchema[]>([
-  // {
-  //   label: 'id',
-  //   field: 'id',
-  //   sort: 'custom',
-  //   isForm: false,
-  // },
   {
     label: '模版id',
     field: 'templateId',
-    sort: 'custom',
     isSearch: false,
     form: {
       component: 'InputNumber',
       value: 0
     },
   },
+  {
+    label: '项目编码',
+    field: 'projectCode',
+    isSearch: true,
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => projectList,
+      componentProps: {
+        filterable:true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'code'
+        }
+      }
+    },
+  },
+  {
+    label: '物料编码',
+    field: 'itemCode',
+    isSearch: true,
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => itembasicList,
+      componentProps: {
+        filterable:true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'code'
+        }
+      }
+    },
+  },
+  {
+    label: '物料类型',
+    field: 'itemType',
+    dictType: DICT_TYPE.ITEMBASIC_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    isSearch:true,
+    search:{
+      componentProps: {
+        filterable:true
+
+        // inactiveValue: 'DISABLE',
+        // activeValue: 'ENABLE',
+      }
+    },
+    // table: {
+    //   width: 100
+    // } ,
+    form: {
+      component: 'Select',
+      componentProps: {
+        filterable:true
+
+        // inactiveValue: 'DISABLE',
+        // activeValue: 'ENABLE',
+      }
+    },
+  },
   {
     label: '检测结果',
     field: 'result',

src/views/detection/recordsDetails/index.vue

@@ -0,0 +1,231 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="RecordsDetails.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="RecordsDetails.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 #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="getList"
+    :rules="RecordsDetailsRules"
+    :formAllSchemas="RecordsDetails.allSchemas"
+    :searchTableParams="searchTableParams"
+    :apiUpdate="RecordsDetailsApi.updateRecordsDetails"
+    :apiCreate="RecordsDetailsApi.createRecordsDetails"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="RecordsDetails.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/detection/records-details/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { RecordsDetails,RecordsDetailsRules } from './recordsDetails.data'
+import * as RecordsDetailsApi from '@/api/detection/recordsDetails'
+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'
+
+defineOptions({ name: 'RecordsDetails' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(RecordsDetails.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: RecordsDetailsApi.getRecordsDetailsPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:recordsDetails:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:recordsDetails:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:recordsDetails: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 butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:recordsDetails:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:recordsDetails:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicRecordsDetails')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await RecordsDetailsApi.deleteRecordsDetails(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await RecordsDetailsApi.exportRecordsDetails(setSearchParams)
+    download.excel(data, '检测记录详细.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '检测记录详细导入模版.xls'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await RecordsDetailsApi.importTemplate()
+})
+
+</script>

src/views/detection/recordsDetails/recordsDetails.data.ts

@@ -0,0 +1,130 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as ContentAPI from '@/api/spc/templateItemDetails'
+
+
+// 表单校验
+export const RecordsDetailsRules = reactive({
+  result: [required]
+})
+// 表单校验
+const getlsit = await  ContentAPI.getTemplateItemDetailsList({
+});
+
+export const RecordsDetails = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isSearch: false,
+    isTable:false,
+  },
+  {
+    label: '检测项主键',
+    field: 'templateItemId',
+    sort: 'custom',
+    isSearch: false,
+    isTable:false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    }
+  },
+  {
+    label: '模版id',
+    field: 'templateId',
+    sort: 'custom',
+    isSearch: false,
+    isTable:false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    }
+  },
+  {
+    label: '检测内容',
+    field: 'contents',
+    isSearch: true,
+    isTable:true,
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => getlsit(),
+      componentProps: {
+        filterable:true,
+        optionsAlias: {
+          labelField: 'contents',
+          valueField: 'contents'
+        }
+      }
+    },
+  },
+  {
+    label: '检测方法',
+    field: 'methods',
+    isSearch: false,
+    isTable:true,
+  },
+  {
+    label: '检测值',
+    field: 'detectValue',
+    isSearch: false,
+    isTable:true,
+  },
+  {
+    label: '检测结果',
+    field: 'result',
+    isSearch: false,
+    isTable:true,
+  },
+  {
+    label: '保存状态0保存1草稿',
+    field: 'saveStatus',
+    sort: 'custom',
+    isSearch: false,
+    isTable:false,
+    form: {
+      component: 'Radio'
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: false,
+    isTable:false,
+  },
+  {
+    label: '版本号',
+    field: 'version',
+    sort: 'custom',
+    isSearch: false,
+    isTable:false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    isTable: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: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))

src/views/spc/detectiontemplate/detectionTemplate.data.ts

@@ -3,6 +3,10 @@ import { dateFormatter } from '@/utils/formatTime'
 import * as ItembasicApi from '@/api/spc/itembasic/index'
 import {Itembasic} from '@/views/spc/itembasic/itembasic.data'
 import { checkboxProps } from 'element-plus'
+import * as itembasicApi from '@/api/spc/itembasic/index'
+import * as ProjectApi from '@/api/spc/project/index'
+const itembasicList = await itembasicApi.getList({});
+const projectList = await  ProjectApi.getList({});
 
 // 表单校验
 // export const DetectionTemplateRules = reactive({
@@ -13,7 +17,6 @@ export const DetectionTemplate = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '物料编码',
     field: 'itemCode',//传第给后端字段名称
-    sort: 'custom',
     table: {
       width: 150,
       fixed: 'left'
@@ -30,13 +33,24 @@ export const DetectionTemplate = useCrudSchemas(reactive<CrudSchema[]>([
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
         searchPage: ItembasicApi.getItembasicPage // 查询弹窗所需分页方法
       }
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => itembasicList,
+      componentProps: {
+        filterable:true,
+        optionsAlias: {
+          labelField: 'code',
+          valueField: 'code'
+        }
       }
     },
+  },
   
   {
     label: '物料名称',
     field: 'itemName',
-    sort: 'custom',
     isSearch: false,
     isTable:true,
     form: {
@@ -50,7 +64,6 @@ export const DetectionTemplate = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '项目名称',
     field: 'projectName',
-    sort: 'custom',
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -62,7 +75,6 @@ export const DetectionTemplate = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '模版名称',
     field: 'name',
-    sort: 'custom',
   },
   {
     label: '色差行数',
@@ -80,14 +92,12 @@ export const DetectionTemplate = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '备注',
     field: 'remark',
-    sort: 'custom',
     isSearch: false,
     isTable:false,
   },
   {
     label: '创建时间',
     field: 'createTime',
-    sort: 'custom',
     formatter: dateFormatter,
     isSearch: false,
     search: {
@@ -135,13 +145,21 @@ export const DetectionTemplate = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '物料类型',
     field: 'itemType',
-    sort: 'custom',
     dictType: DICT_TYPE.ITEMBASIC_TYPE,
     dictClass: 'string',
     isTable: true,
+    isSearch:true,
     // table: {
     //   width: 100
     // } ,
+    search:{
+      componentProps: {
+        // inactiveValue: 'DISABLE',
+        // activeValue: 'ENABLE',
+        filterable:true
+      }
+      
+    },
     form: {
       component: 'Select',
       componentProps: {

src/views/spc/itembasic/itembasic.data.ts

@@ -2,6 +2,9 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 import {Project } from '@/views/spc/project/project.data'
 import * as ProjectApi from '@/api/spc/project/index'
+import * as itembasicApi from '@/api/spc/itembasic/index'
+const itembasicList = await itembasicApi.getList({});
+const projectList = await  ProjectApi.getList({});
 const { t } = useI18n() // 国际化
 
 /**
@@ -52,6 +55,18 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
       width: 'auto',
 
     },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => itembasicList,
+      componentProps: {
+        filterable:true,
+        optionsAlias: {
+          labelField: 'code',
+          valueField: 'code'
+        }
+      }
+    },
   },
   { 
     label: '物料名称', 

src/views/spc/project/project.data.ts

@@ -1,5 +1,7 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+import * as ProjectApi from '@/api/spc/project/index'
+const projectList = await  ProjectApi.getList({});
 
 // 表单校验
 export const ProjectRules = reactive({
@@ -11,7 +13,19 @@ export const Project = useCrudSchemas(reactive<CrudSchema[]>([
     label: '项目编号',
     field: 'code',
     sort: 'custom',
-    isSearch: true
+    isSearch: true,
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => projectList,
+      componentProps: {
+        filterable:true,
+        optionsAlias: {
+          labelField: 'code',
+          valueField: 'code'
+        }
+      }
+    }
   },
   {
     label: '项目名称',