From 9eec798af5c509bb27446371c59327afba86da8a Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Fri, 1 Dec 2023 14:29:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=95=B0=E6=8D=AE=E6=A8=A1?=
 =?UTF-8?q?=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/detection/records/index.ts            |  14 +-
 src/api/spc/templateItemDetails/index.ts      |   4 +-
 src/components/ImportForm/src/DetForm.vue     | 548 ++++++++++++++++++
 .../ImportForm/src/DetecImportForm.vue        | 243 +++++---
 src/views/detection/records/index.vue         |   6 +-
 src/views/detection/records/records.data.ts   |  12 +-
 .../importRecordsDetails.data.ts              |  65 +++
 src/views/detection/recordsDetails/index.vue  | 395 +++++++++++--
 .../detectionTemplate.data.ts                 |   2 +-
 src/views/spc/itembasic/itembasic.data.ts     |   1 -
 10 files changed, 1146 insertions(+), 144 deletions(-)
 create mode 100644 src/components/ImportForm/src/DetForm.vue
 create mode 100644 src/views/detection/recordsDetails/importRecordsDetails.data.ts

diff --git a/src/api/detection/records/index.ts b/src/api/detection/records/index.ts
index fa0de3a..f903aca 100644
--- a/src/api/detection/records/index.ts
+++ b/src/api/detection/records/index.ts
@@ -56,6 +56,16 @@ export const exportRecords = async (params) => {
 }
 
 // 下载导入模板
-export const importTemplate = () => {
-  return request.download({ url: '/detection/records/get-import-template' })
+export const importTemplate = (itemType:string) => {
+  return request.download({ url: '/detection/records/get-import-template?itemType='+itemType })
+}
+
+// 提交导入记录
+export const saveRecords = async (id: number) => {
+  return await request.get({ url: `/detection/records/saveRecords?id=` + id })
+}
+
+//每次导入前会传模版id后端会根据模版id和用户id把草稿状态的数据逻辑删除
+export const deleteStatus = async (templateId: number) => {
+  return await request.delete({ url: `/detection/records/deleteStatus?id=` + templateId })
 }
\ No newline at end of file
diff --git a/src/api/spc/templateItemDetails/index.ts b/src/api/spc/templateItemDetails/index.ts
index ff1d75c..cdc594e 100644
--- a/src/api/spc/templateItemDetails/index.ts
+++ b/src/api/spc/templateItemDetails/index.ts
@@ -19,7 +19,9 @@ export interface TemplateItemDetailsVO {
   deleterId: string
   extraProperties: string
   concurrencyStamp: string
-  siteId: string
+  siteId: string,
+  recodeColumns?:number,
+  recodeLines?:number,
 }
 // 查询检测记录明细列表
 export const getTemplateItemDetailsPage = async (params) => {
diff --git a/src/components/ImportForm/src/DetForm.vue b/src/components/ImportForm/src/DetForm.vue
new file mode 100644
index 0000000..ac672a3
--- /dev/null
+++ b/src/components/ImportForm/src/DetForm.vue
@@ -0,0 +1,548 @@
+<template>
+<Dialog v-model="dialogVisible" title="导入" width="1200">
+    <el-form
+        :inline="true"
+        :model="queryParams"
+        class="demo-form-inline"
+        style="margin-bottom: 10px"
+        label-width="100px"
+      >
+        <el-form-item label="项目" style="width: calc(22%)">
+          <el-select
+            v-model="queryParams.proCode"
+            placeholder="请选择项目"
+            clearable
+            style="width: 100%"
+            @change="detectionProjectChange"
+          >
+            <el-option v-for=" (item) in projectList" :key="item" :label="item.name" :value="item.code" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="物料" style="width: calc(22%)">
+          <el-select
+            v-model="queryParams.itemCode"
+            placeholder="请选择物料"
+            clearable
+            style="width: 100%"
+            @change="detectionItemChange"
+          >
+            <el-option v-for=" (item) in itemList" :key="item" :label="item.name" :value="item.code" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="检测类型" style="width: calc(22%)">
+          <el-select
+            v-model="queryParams.detectionType"
+            placeholder="请选择检测类型"
+            clearable
+            style="width: 100%"
+            @change="detectionTypeChange"
+          >
+            <el-option v-for="dict in dictTypeList" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item style="width: calc(22%)">
+          <el-button :disabled="formLoading" type="primary" @click="submitForm">解析校验</el-button>
+        <el-button @click="dialogVisible = false">提 交</el-button>
+        </el-form-item>
+      </el-form>
+      <el-upload v-if="false" ref="uploadRef"  v-model:file-list="fileList" :action="importUrl + '?mode=' + mode + '&file=' + file + '&updatePart=' + updatePart + '&outFile=' + outFile"
+      :auto-upload="false" :disabled="formLoading" :headers="uploadHeaders" :limit="1" :on-error="submitFormError"
+      :on-exceed="handleExceed" :on-success="submitFormSuccess" :accept="accept" drag
+      style="width:300px;margin:0 auto">
+      <Icon icon="ep:upload-filled" color="#c0c4cc" size="60" />
+      <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+
+         <!-- 列表头部 -->
+    <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>
+
+    </el-upload>
+    <template #footer>
+      <div class="flex items-center">
+        <div class="flex-1 text-left">
+          <el-button type="primary" plain @click="importTemplate">
+          <Icon icon="ep:download" />
+          下载模板
+        </el-button>
+        </div>
+        <!-- <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="dialogVisible = false">取 消</el-button> -->
+      </div>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import download from '@/utils/download'
+import { RecordsDetails,RecordsDetailsRules } from '@/views/detection/recordsDetails/importRecordsDetails.data'
+import * as RecordsDetailsApi from '@/api/detection/recordsDetails'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as ProjecAPI from '@/api/spc/project'
+import * as ItembasicApi from '@/api/spc/itembasic'
+import * as TemplateItemDetailsApi from '@/api/spc/templateItemDetails'
+import {formatDate} from '@/utils/formatTime'
+
+defineOptions({ name: 'RecordsDetails' })
+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 message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中
+const uploadRef = ref()
+const uploadHeaders = ref() // 上传 Header 头
+const fileList = ref([]) // 文件列表
+const file = ref('')
+
+// 列表头部按钮
+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), // 设置
+]
+
+// 头部按钮事件
+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()
+  
+})
+
+const queryParams = reactive({
+  proCode: '',
+  itemCode: '',
+  detectionType: '',
+  detectionItemContentId: null,
+  ecTab: '1'
+})
+const uploadOpen=ref(false)
+
+ const props = defineProps({
+  importTemplateData: {
+    type: Object,
+    required: true
+  },
+  // 可以导入的文件类型
+  accept: {
+    type: String,
+    required: false,
+    default:'.xlsx,.xls'
+  },
+  // 是否更新已经存在的用户数据.默认值是1
+  mode: {
+    type: Number,
+    required: false,
+    default: 1
+  },
+  // 更新是否禁用,默认值不禁用
+  updateIsDisable: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  // 追加是否禁用,默认值不禁用
+  appendIsDisable: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  // 覆盖是否禁用,默认值不禁用
+  coverIsDisable: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  // 是否部门保存,默认是
+  updatePart: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  url:{
+    type: String,
+    required: false,
+  },
+  // 显示是否外部资源
+  isShowOut: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  outFile: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+})
+const importTemplateData= ref(props.importTemplateData)
+const  accept= ref(props.accept)
+const  mode = ref(props.mode)//是否更新已经存在的用户数据.默认值是1
+const updateIsDisable = ref(props.updateIsDisable)//更新是否禁用,默认值不禁用
+const appendIsDisable = ref(props.appendIsDisable)//追加是否禁用,默认值不禁用
+const coverIsDisable = ref(props.coverIsDisable)//覆盖是否禁用,默认值不禁用
+const updatePart = ref(props.updatePart)//是否部门保存
+const outFile = ref(props.outFile)//是否引入外部资源
+
+
+
+// 项目列表
+const projectList = ref()
+// 物料列表
+const itemList = ref()
+
+// 类型列表
+const dictTypeList = ref()
+
+
+
+const getProject = async () => {//获取所有项目数据列表
+  const _projectList = await ProjecAPI.selectAllPros()
+  if (_projectList != null && _projectList.length != 0) {
+    projectList.value = _projectList
+    let  code = projectList.value[0].code;
+    queryParams.proCode = code;
+    await _itemList(code);
+  }
+} 
+
+
+//根据项目code获取物料列表
+const _itemList =async (projectCode)=>{
+  itemList.value = []
+  const _itemList = await ItembasicApi.selectItemsByProjectCode(projectCode);
+  if (_itemList != null && _itemList.length != 0) {
+    itemList.value = _itemList
+    queryParams.itemCode = itemList.value[0].code
+    dictOptions();
+  }
+
+} 
+
+const dictOptions = async () => {//获取物料类型
+    dictTypeList.value = []
+    const dictOptions =  await getIntDictOptions(DICT_TYPE.ITEMBASIC_TYPE);
+    if (dictOptions != null && dictOptions.length != 0) {
+      dictTypeList.value = dictOptions;
+      queryParams.detectionType = dictOptions[0].value + ''
+      uploadOpen.value = true;
+    }
+  }
+
+
+ const detectionProjectChange =async ()=>{//项目修改
+    if(queryParams.proCode==''){
+      queryParams.itemCode=''
+      queryParams.detectionType=''
+      itemList.value = [];
+      dictTypeList.value = [];
+      uploadOpen.value = false;
+    }else{
+      _itemList(queryParams.proCode);
+    }
+ }
+
+ const detectionTypeChange=async()=>{
+    if(queryParams.detectionType==''){
+      uploadOpen.value = false;
+    }else{
+      uploadOpen.value = true;
+    }
+ }
+
+ const detectionItemChange = async ()=>{//物料修改
+    if(queryParams.itemCode==''){
+      queryParams.detectionType=''
+      dictTypeList.value = [];
+      uploadOpen.value = false;
+    }else{
+      dictOptions();
+      uploadOpen.value =true;
+    }
+ }
+onMounted(()=>{
+  getProject()
+})
+
+const importUrl =
+  import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + props.url
+
+/** 打开弹窗 */
+const open = () => {
+  dialogVisible.value = true
+  getList() // 刷新当前列表
+  setSearchParams({
+    decRecId:55,
+    saveStatus:1,
+    result:"Warning",
+  });
+  resetForm()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const submitForm = async () => {
+  
+  if (fileList.value.length == 0) {
+    message.error('请上传文件')
+    return
+  }
+  file.value = fileList.value[0].name
+  // 提交请求
+  uploadHeaders.value = {
+    Authorization: 'Bearer ' + getAccessToken(),
+    'tenant-id': getTenantId(),
+  }
+  formLoading.value = true
+  uploadRef.value!.submit()
+}
+
+/** 文件上传成功 */
+const emits = defineEmits(['success'])
+const submitFormSuccess = (response: any) => {
+  formLoading.value = true
+  if(response){
+    if(response.code == 500){
+      message.error('导入失败')
+      return;
+    } else if (response.data.errorCount > 0) {
+      message.confirm('文件中有部分数据导入失败，是否下载失败数据？').then(() => {
+        // download.excel(file, 'file_' + new Date().getTime())
+        // 通过url下载文件
+        // const downloadElement = document.createElement('a')
+        // console.log(172, import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + '/' + response.data.errorFile)
+        // console.log(172, import.meta.env.VITE_BASE_URL + '/admin-api/opt/profile/' + response.data.errorFile)
+        window.open(import.meta.env.VITE_BASE_URL + '/admin-api/profile/' + response.data.errorFile ,'222')
+        // downloadElement.setAttribute('href', import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + response.data.errorFile )
+        // 点击下载
+        // downloadElement.click()
+      })
+    }
+  }else{
+    console.info("response",response);
+    message.success('导入成功')
+    
+  }
+  // 发送操作成功的事件
+  formLoading.value = false
+  emits('success')
+  const decRecId = response.data.decRecId;//主记录id
+  const role = response.data.decRecId;//是否为admin
+  const waring = response.data.decRecId;//是否有超出公差范围数据
+  //dialogVisible.value = false
+  //文件导入成功之后隐藏导入框展示告警信息列表
+  setSearchParams({
+    decRecId:decRecId,
+    saveStatus:1,
+    result:"Warning",
+  });
+  uploadOpen.value = false;
+}
+/** 上传错误提示 */
+const submitFormError = (): void => {
+  message.error('上传失败，请您重新上传！')
+  formLoading.value = false
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  // 重置上传状态和文件
+  formLoading.value = false
+  uploadRef.value?.clearFiles()
+  fileList.value = []
+}
+
+/** 文件数超出提示 */
+const handleExceed = (): void => {
+  message.error('最多只能上传一个文件！')
+}
+
+/** 下载模板操作 */
+const importTemplate = () => {
+  const res = importTemplateData.value.templateUrl
+  download.excel(res, importTemplateData.value.templateTitle)
+}
+
+</script>
+
+<style scoped lang="scss">
+.tips {
+  div {
+    position: relative;
+    padding-left: 22px;
+
+    &::before {
+      width: 4px;
+      height: 4px;
+      border-radius: 50%;
+      content: '';
+      background: #c2c2c2;
+      position: absolute;
+      top: 50%;
+      margin-top: -2px;
+      left: 4px;
+    }
+  }
+}
+</style>
diff --git a/src/components/ImportForm/src/DetecImportForm.vue b/src/components/ImportForm/src/DetecImportForm.vue
index 6ef2ff9..96bf3fa 100644
--- a/src/components/ImportForm/src/DetecImportForm.vue
+++ b/src/components/ImportForm/src/DetecImportForm.vue
@@ -1,6 +1,6 @@
 <!-- 导入组件 -->
 <template>
-  <Dialog v-model="dialogVisible" title="导入" width="800">
+  <Dialog v-model="dialogVisible" title="导入" width="1200">
     <el-form
         :inline="true"
         :model="queryParams"
@@ -8,7 +8,7 @@
         style="margin-bottom: 10px"
         label-width="100px"
       >
-        <el-form-item label="项目" style="width: calc(26%)">
+        <el-form-item label="项目" style="width: calc(22%)">
           <el-select
             v-model="queryParams.proCode"
             placeholder="请选择项目"
@@ -16,10 +16,10 @@
             style="width: 100%"
             @change="detectionProjectChange"
           >
-            <el-option v-for=" (item) in projectList" :key="item" :label="item.name" :value="item.code" />
+            <el-option v-for=" (item) in projectList" :key="item" :label="item.code" :value="item.code" />
           </el-select>
         </el-form-item>
-        <el-form-item label="物料" style="width: calc(26%)">
+        <el-form-item label="物料" style="width: calc(22%)">
           <el-select
             v-model="queryParams.itemCode"
             placeholder="请选择物料"
@@ -27,10 +27,10 @@
             style="width: 100%"
             @change="detectionItemChange"
           >
-            <el-option v-for=" (item) in itemList" :key="item" :label="item.name" :value="item.code" />
+            <el-option v-for=" (item) in itemList" :key="item" :label="item.code" :value="item.code" />
           </el-select>
         </el-form-item>
-        <el-form-item label="检测类型" style="width: calc(26%)">
+        <el-form-item label="检测类型" style="width: calc(22%)">
           <el-select
             v-model="queryParams.detectionType"
             placeholder="请选择检测类型"
@@ -41,56 +41,51 @@
             <el-option v-for="dict in dictTypeList" :key="dict.value" :label="dict.label" :value="dict.value" />
           </el-select>
         </el-form-item>
+
+        <el-form-item style="width: calc(22%)">
+          <el-button :disabled="formLoading"  type="primary" @click="submitForm">解析校验</el-button>
+        <el-button v-if="!uploadOpen&&isButton" type="primary" @click="saveSubmit">提 交</el-button>
+        </el-form-item>
       </el-form>
-      <el-upload v-if="uploadOpen" ref="uploadRef"  v-model:file-list="fileList" :action="importUrl + '?mode=' + mode + '&file=' + file + '&updatePart=' + updatePart + '&outFile=' + outFile"
+      <el-upload v-if="uploadOpen" ref="uploadRef"  v-model:file-list="fileList" :action="importUrl + '?mode=' + mode + '&file=' + file + '&itemCode=' + queryParams.itemCode + '&itemType=' + queryParams.detectionType"
       :auto-upload="false" :disabled="formLoading" :headers="uploadHeaders" :limit="1" :on-error="submitFormError"
       :on-exceed="handleExceed" :on-success="submitFormSuccess" :accept="accept" drag
       style="width:300px;margin:0 auto">
       <Icon icon="ep:upload-filled" color="#c0c4cc" size="60" />
       <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-      <template #tip>
-        <div class="el-upload__tip ml--126px mr--80px">
-          <div class="flex">
-            <div class="label h-32px mr-26px color-#acaeb3 font-size-14px  w-100px text-right" style="line-height:32px">导入模式</div>
-            <div class="">
-              <div class="radio">
-                <el-radio-group v-model="mode">
-                  <el-radio :label="1" :disabled="updateIsDisable">更新</el-radio>
-                  <el-radio :label="2" :disabled="appendIsDisable">追加</el-radio>
-                  <el-radio :label="3" :disabled="coverIsDisable">覆盖</el-radio>
-                </el-radio-group>
-              </div>
-
-              <div class="tips color-#acaeb3 font-size-14px">
-                <div class="mt-2">更新：新增并修改</div>
-                <div class="mt-2">追加：只新增，不修改</div>
-                <div class="mt-2">覆盖：只修改不新增</div>
-              </div>
-            </div>
-          </div>
-          <div class="flex mt-16px">
-            <div class="label h-32px mr-26px color-#acaeb3 font-size-14px w-100px text-right" style="line-height:32px">部分保存</div>
-            <div class="">
-              <div class="switch">
-                <el-switch v-model="updatePart" />
-              </div>
-              <div class="tips color-#acaeb3 font-size-14px">
-                <div class="mt-2">部分保存：如存在错误数据，正确数据正常导入</div>
-                <div class="mt-2">全部保存：全部数据正确，才能导入</div>
-              </div>
-            </div>
-          </div>
-          <div class="flex mt-16px" v-if="isShowOut">
-            <div class="label h-32px mr-26px color-#acaeb3 font-size-14px w-100px text-right" style="line-height:32px">是否外部资源</div>
-            <div class="">
-              <div class="switch">
-                <el-switch v-model="outFile" />
-              </div>
-            </div>
-          </div>
-        </div>
+</el-upload>
+<template v-if="!uploadOpen">
+       <!-- 列表头部 -->
+    <TableHead
+      @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>
-    </el-upload>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+</template>
+    
     <template #footer>
       <div class="flex items-center">
         <div class="flex-1 text-left">
@@ -99,8 +94,8 @@
           下载模板
         </el-button>
         </div>
-        <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="dialogVisible = false">取 消</el-button>
+        <!-- <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="dialogVisible = false">取 消</el-button> -->
       </div>
     </template>
   </Dialog>
@@ -108,7 +103,6 @@
 <script lang="ts" setup>
 import { getAccessToken, getTenantId } from '@/utils/auth'
 import download from '@/utils/download'
-
 defineOptions({ name: 'ImportForm' })
 import * as ZlnalysisAPI from '@/api/tjanalysis/zlanalysis'
 import * as ProjecAPI from '@/api/spc/project'
@@ -116,7 +110,32 @@ import * as ItembasicApi from '@/api/spc/itembasic'
 import * as TemplateItemDetailsApi from '@/api/spc/templateItemDetails'
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import {formatDate} from '@/utils/formatTime'
+import { RecordsDetails } from '@/views/detection/recordsDetails/importRecordsDetails.data'
+import * as RecordsDetailsApi from '@/api/detection/recordsDetails'
+import * as RecordsApi from '@/api/detection/records'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+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 message = useMessage() // 消息弹窗
 
 const dialogVisible = ref(false) // 弹窗的是否展示
@@ -242,7 +261,6 @@ const dictOptions = async () => {//获取物料类型
     if (dictOptions != null && dictOptions.length != 0) {
       dictTypeList.value = dictOptions;
       queryParams.detectionType = dictOptions[0].value + ''
-      uploadOpen.value = true;
     }
   }
 
@@ -252,8 +270,9 @@ const dictOptions = async () => {//获取物料类型
       queryParams.itemCode=''
       queryParams.detectionType=''
       itemList.value = [];
+      _itemList("");
       dictTypeList.value = [];
-      uploadOpen.value = false;
+      //uploadOpen.value = false;
     }else{
       _itemList(queryParams.proCode);
     }
@@ -261,9 +280,18 @@ const dictOptions = async () => {//获取物料类型
 
  const detectionTypeChange=async()=>{
     if(queryParams.detectionType==''){
-      uploadOpen.value = false;
+      //uploadOpen.value = false;
     }else{
-      uploadOpen.value = true;
+      if(queryParams.detectionType=='GLOSS'){//光泽桔皮
+        importUrl.value = import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + "/detection/records/importGZAndXN"
+      }else if(queryParams.detectionType=='PROPERTY'){//性能
+        importUrl.value = import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + "/detection/records/importGZAndXN"
+      }else if(queryParams.detectionType=='DIMENSION'){//尺寸
+        importUrl.value = import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + "/detection/records/importCC"
+      }else{
+          importUrl.value=import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + "/detection/records/importColor"
+      }
+      
     }
  }
 
@@ -274,27 +302,56 @@ const dictOptions = async () => {//获取物料类型
       uploadOpen.value = false;
     }else{
       dictOptions();
-      uploadOpen.value =true;
+     
     }
  }
 onMounted(()=>{
   getProject()
 })
 
-const importUrl =
-  import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + props.url
+//默认色差导入
+const importUrl = ref(import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + "/detection/records/importColor");
+
+  
+
 
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
 /** 打开弹窗 */
 const open = () => {
-  console.log(111)
+  uploadOpen.value = true;
   dialogVisible.value = true
+  //getList() // 刷新当前列表
+  // setSearchParams({
+  //   decRecId:55,
+  //   saveStatus:1,
+  //   result:"Warning",
+  // });
   resetForm()
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+const decRecId = ref();//主记录id
+const isButton = ref(true);//是否显示提交按钮
+const problem = ref(false);//是否抛出问题
 
 /** 提交表单 */
 const submitForm = async () => {
-  
+  console.info("queryParams",queryParams);
+  if(queryParams.itemCode==''){
+    message.warning("请选择物料编码");
+    return;
+  }
+  if(queryParams.detectionType==''){
+    message.warning("请选择物料类型");
+    return;
+  }
+  //await RecordsApi.deleteRecords(1221);
   if (fileList.value.length == 0) {
     message.error('请上传文件')
     return
@@ -313,7 +370,7 @@ const submitForm = async () => {
 const emits = defineEmits(['success'])
 const submitFormSuccess = (response: any) => {
   formLoading.value = true
-  if(response){
+  if(response){ 
     if(response.code == 500){
       message.error('导入失败')
       return;
@@ -331,44 +388,45 @@ const submitFormSuccess = (response: any) => {
       })
     }
   }else{
+    console.info("response",response);
     message.success('导入成功')
+    
   }
-
-  // if (response.code !== 0) {
-  //   message.error(response.msg)
-  //   formLoading.value = false
-  //   return
-  // }
-  // // 拼接提示语
-  // const data = response.data
-  // const create = response.data.importResult[0]
-  // const update = response.data.importResult[1]
-  // const failure = response.data.importResult[2]
-  // let text = '上传成功数量：' + data[create].length + ';'
-  // for (let name of data[create]) {
-  //   text += '< ' + name + ' >'
-  // }
-  // text += '更新成功数量：' + data[update].length + ';'
-  // for (const name of data[update]) {
-  //   text += '< ' + name + ' >'
-  // }
-  // text += '更新失败数量：' + Object.keys(data[failure]).length + ';'
-  // for (const name in data[failure]) {
-  //   text += '< ' + name + ': ' + data[failure][name] + ' >'
-  // }
-  // message.alert(text)
-  
+  resetForm();
   // 发送操作成功的事件
-  
   formLoading.value = false
   emits('success')
-  dialogVisible.value = false
+  problem.value = response.data.problem
+  let messages = response.data.message
+  if(problem.value){//色差行数取余不为0不能导入
+      message.warning(messages);
+      return;
+  }
+   decRecId.value= response.data.decRecId;//主记录id
+   isButton.value = response.data.button;//是否显示提交按钮
+   isButton.value=true;
+  //dialogVisible.value = false
+  //文件导入成功之后隐藏导入框展示告警信息列表
+  setSearchParams({
+    decRecId:decRecId,
+    saveStatus:1,
+    result:"NG",
+  });
+  uploadOpen.value = false;
 }
 /** 上传错误提示 */
 const submitFormError = (): void => {
   message.error('上传失败，请您重新上传！')
   formLoading.value = false
 }
+//提交数据
+const saveSubmit = async () => {
+
+  await RecordsApi.saveRecords(decRecId.value);
+  dialogVisible.value =false
+  emits('success')
+
+}
 
 /** 重置表单 */
 const resetForm = () => {
@@ -384,10 +442,11 @@ const handleExceed = (): void => {
 }
 
 /** 下载模板操作 */
-const importTemplate = () => {
-  const res = importTemplateData.value.templateUrl
-  download.excel(res, importTemplateData.value.templateTitle)
+const importTemplate =async() => {
+  const res =  await RecordsApi.importTemplate(queryParams.detectionType);
+  download.excel(res,"模版下载")
 }
+
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/detection/records/index.vue b/src/views/detection/records/index.vue
index c721d5b..d5289d2 100644
--- a/src/views/detection/records/index.vue
+++ b/src/views/detection/records/index.vue
@@ -63,7 +63,7 @@
   />
 
   <!-- 导入 -->
-  <DetecImportForm ref="importFormRef" url="/detection/records/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <detec-import-form ref="importFormRef" url="/detection/records/import" :importTemplateData="importTemplateData" @success="importSuccess" />
 
 </template>
 
@@ -257,8 +257,8 @@ const searchFormClick = (searchData) => {
 
 /** 初始化 **/
 onMounted(async () => {
-  getList()
-  importTemplateData.templateUrl = await RecordsApi.importTemplate()
+  getList();
+  //importTemplateData.templateUrl = await RecordsApi.importTemplate()
 })
 
 </script>
diff --git a/src/views/detection/records/records.data.ts b/src/views/detection/records/records.data.ts
index 551f15f..28cab44 100644
--- a/src/views/detection/records/records.data.ts
+++ b/src/views/detection/records/records.data.ts
@@ -82,12 +82,12 @@ export const Records = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '检测结果',
-    field: 'result',
-    sort: 'custom',
-    isSearch: false,
-  },
+  // {
+  //   label: '检测结果',
+  //   field: 'result',
+  //   sort: 'custom',
+  //   isSearch: false,
+  // },
   // {
   //   label: '备注',
   //   field: 'remark',
diff --git a/src/views/detection/recordsDetails/importRecordsDetails.data.ts b/src/views/detection/recordsDetails/importRecordsDetails.data.ts
new file mode 100644
index 0000000..cd8d6b2
--- /dev/null
+++ b/src/views/detection/recordsDetails/importRecordsDetails.data.ts
@@ -0,0 +1,65 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+
+export const RecordsDetails = useCrudSchemas(reactive<CrudSchema[]>([
+  
+  {
+    label: '检测内容',
+    field: 'contents',
+    isSearch: true,
+    isTable:true,
+  },
+  {
+    label: '检测值',
+    field: 'detectValue',
+    isSearch: false,
+    isTable:true,
+  },
+  {
+    label: '检测结果',
+    field: 'result',
+    isSearch: false,
+    isTable:true,
+  },
+  {
+    label: '上限',
+    field: 'upLimit',
+    isSearch: false,
+    isTable:false,
+  },
+  {
+    label: '下限',
+    field: 'downLimit',
+    isSearch: false,
+    isTable:false,
+  },
+  {
+    label: '行号',
+    field: 'recodeLines',
+    isSearch: false,
+    isTable:true,
+  },
+  {
+    label: '列号',
+    field: 'recodeColumns',
+    isSearch: false,
+    isTable:true,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    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
+  }
+]))
diff --git a/src/views/detection/recordsDetails/index.vue b/src/views/detection/recordsDetails/index.vue
index 6eb753f..bcec2e8 100644
--- a/src/views/detection/recordsDetails/index.vue
+++ b/src/views/detection/recordsDetails/index.vue
@@ -1,10 +1,59 @@
 <template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <Search :schema="RecordsDetails.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
-  </ContentWrap>
+<Dialog v-model="dialogVisible" title="导入" width="1200">
+    <el-form
+        :inline="true"
+        :model="queryParams"
+        class="demo-form-inline"
+        style="margin-bottom: 10px"
+        label-width="100px"
+      >
+        <el-form-item label="项目" style="width: calc(22%)">
+          <el-select
+            v-model="queryParams.proCode"
+            placeholder="请选择项目"
+            clearable
+            style="width: 100%"
+            @change="detectionProjectChange"
+          >
+            <el-option v-for=" (item) in projectList" :key="item" :label="item.name" :value="item.code" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="物料" style="width: calc(22%)">
+          <el-select
+            v-model="queryParams.itemCode"
+            placeholder="请选择物料"
+            clearable
+            style="width: 100%"
+            @change="detectionItemChange"
+          >
+            <el-option v-for=" (item) in itemList" :key="item" :label="item.name" :value="item.code" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="检测类型" style="width: calc(22%)">
+          <el-select
+            v-model="queryParams.detectionType"
+            placeholder="请选择检测类型"
+            clearable
+            style="width: 100%"
+            @change="detectionTypeChange"
+          >
+            <el-option v-for="dict in dictTypeList" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
 
-    <!-- 列表头部 -->
+        <el-form-item style="width: calc(22%)">
+          <el-button :disabled="formLoading" type="primary" @click="submitForm">解析校验</el-button>
+        <el-button @click="dialogVisible = false">提 交</el-button>
+        </el-form-item>
+      </el-form>
+      <el-upload v-if="false" ref="uploadRef"  v-model:file-list="fileList" :action="importUrl + '?mode=' + mode + '&file=' + file + '&updatePart=' + updatePart + '&outFile=' + outFile"
+      :auto-upload="false" :disabled="formLoading" :headers="uploadHeaders" :limit="1" :on-error="submitFormError"
+      :on-exceed="handleExceed" :on-success="submitFormSuccess" :accept="accept" drag
+      style="width:300px;margin:0 auto">
+      <Icon icon="ep:upload-filled" color="#c0c4cc" size="60" />
+      <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+
+         <!-- 列表头部 -->
     <TableHead
       :HeadButttondata="HeadButttondata"
       @button-base-click="buttonBaseClick"
@@ -13,8 +62,7 @@
       @searchFormClick="searchFormClick"
       :allSchemas="RecordsDetails.allSchemas"
     />
-
-  <!-- 列表 -->
+        <!-- 列表 -->
   <ContentWrap>
     <Table
       :columns="tableColumns"
@@ -38,34 +86,30 @@
     </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" />
+    </el-upload>
+    <template #footer>
+      <div class="flex items-center">
+        <div class="flex-1 text-left">
+          <el-button type="primary" plain @click="importTemplate">
+          <Icon icon="ep:download" />
+          下载模板
+        </el-button>
+        </div>
+        <!-- <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="dialogVisible = false">取 消</el-button> -->
+      </div>
+    </template>
+  </Dialog>
 </template>
-
 <script setup lang="ts">
 import download from '@/utils/download'
-import { RecordsDetails,RecordsDetailsRules } from './recordsDetails.data'
+import { RecordsDetails,RecordsDetailsRules } from '@/views/detection/recordsDetails/importRecordsDetails.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'
+import * as ProjecAPI from '@/api/spc/project'
+import * as ItembasicApi from '@/api/spc/itembasic'
+import * as TemplateItemDetailsApi from '@/api/spc/templateItemDetails'
+import {formatDate} from '@/utils/formatTime'
 
 defineOptions({ name: 'RecordsDetails' })
 
@@ -98,6 +142,14 @@ const { tableObject, tableMethods } = useTable({
 
 // 获得表格的各种操作
 const { getList, setSearchParams } = tableMethods
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中
+const uploadRef = ref()
+const uploadHeaders = ref() // 上传 Header 头
+const fileList = ref([]) // 文件列表
+const file = ref('')
 
 // 列表头部按钮
 const HeadButttondata = [
@@ -107,14 +159,6 @@ const HeadButttondata = [
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
-  // {
-  //   label: '自定义扩展按钮',
-  //   name: 'zdy',
-  //   hide: false,
-  //   type: 'primary',
-  //   icon: 'Select',
-  //   color: ''
-  // },
 ]
 
 // 头部按钮事件
@@ -228,4 +272,279 @@ onMounted(async () => {
   importTemplateData.templateUrl = await RecordsDetailsApi.importTemplate()
 })
 
+const queryParams = reactive({
+  proCode: '',
+  itemCode: '',
+  detectionType: '',
+  detectionItemContentId: null,
+  ecTab: '1'
+})
+const uploadOpen=ref(false)
+
+ const props = defineProps({
+  importTemplateData: {
+    type: Object,
+    required: true
+  },
+  // 可以导入的文件类型
+  accept: {
+    type: String,
+    required: false,
+    default:'.xlsx,.xls'
+  },
+  // 是否更新已经存在的用户数据.默认值是1
+  mode: {
+    type: Number,
+    required: false,
+    default: 1
+  },
+  // 更新是否禁用,默认值不禁用
+  updateIsDisable: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  // 追加是否禁用,默认值不禁用
+  appendIsDisable: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  // 覆盖是否禁用,默认值不禁用
+  coverIsDisable: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  // 是否部门保存,默认是
+  updatePart: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  url:{
+    type: String,
+    required: false,
+  },
+  // 显示是否外部资源
+  isShowOut: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  outFile: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+})
+const importTemplateData= ref(props.importTemplateData)
+const  accept= ref(props.accept)
+const  mode = ref(props.mode)//是否更新已经存在的用户数据.默认值是1
+const updateIsDisable = ref(props.updateIsDisable)//更新是否禁用,默认值不禁用
+const appendIsDisable = ref(props.appendIsDisable)//追加是否禁用,默认值不禁用
+const coverIsDisable = ref(props.coverIsDisable)//覆盖是否禁用,默认值不禁用
+const updatePart = ref(props.updatePart)//是否部门保存
+const outFile = ref(props.outFile)//是否引入外部资源
+
+
+
+// 项目列表
+const projectList = ref()
+// 物料列表
+const itemList = ref()
+
+// 类型列表
+const dictTypeList = ref()
+
+
+
+const getProject = async () => {//获取所有项目数据列表
+  const _projectList = await ProjecAPI.selectAllPros()
+  if (_projectList != null && _projectList.length != 0) {
+    projectList.value = _projectList
+    let  code = projectList.value[0].code;
+    queryParams.proCode = code;
+    await _itemList(code);
+  }
+} 
+
+
+//根据项目code获取物料列表
+const _itemList =async (projectCode)=>{
+  itemList.value = []
+  const _itemList = await ItembasicApi.selectItemsByProjectCode(projectCode);
+  if (_itemList != null && _itemList.length != 0) {
+    itemList.value = _itemList
+    queryParams.itemCode = itemList.value[0].code
+    dictOptions();
+  }
+
+} 
+
+const dictOptions = async () => {//获取物料类型
+    dictTypeList.value = []
+    const dictOptions =  await getIntDictOptions(DICT_TYPE.ITEMBASIC_TYPE);
+    if (dictOptions != null && dictOptions.length != 0) {
+      dictTypeList.value = dictOptions;
+      queryParams.detectionType = dictOptions[0].value + ''
+      uploadOpen.value = true;
+    }
+  }
+
+
+ const detectionProjectChange =async ()=>{//项目修改
+    if(queryParams.proCode==''){
+      queryParams.itemCode=''
+      queryParams.detectionType=''
+      itemList.value = [];
+      dictTypeList.value = [];
+      uploadOpen.value = false;
+    }else{
+      _itemList(queryParams.proCode);
+    }
+ }
+
+ const detectionTypeChange=async()=>{
+    if(queryParams.detectionType==''){
+      uploadOpen.value = false;
+    }else{
+      uploadOpen.value = true;
+    }
+ }
+
+ const detectionItemChange = async ()=>{//物料修改
+    if(queryParams.itemCode==''){
+      queryParams.detectionType=''
+      dictTypeList.value = [];
+      uploadOpen.value = false;
+    }else{
+      dictOptions();
+      uploadOpen.value =true;
+    }
+ }
+onMounted(()=>{
+  getProject()
+})
+
+const importUrl =
+  import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + props.url
+
+/** 打开弹窗 */
+const open = () => {
+  dialogVisible.value = true
+  getList() // 刷新当前列表
+  setSearchParams({
+    decRecId:55,
+    saveStatus:1,
+    result:"Warning",
+  });
+  resetForm()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const submitForm = async () => {
+  
+  if (fileList.value.length == 0) {
+    message.error('请上传文件')
+    return
+  }
+  file.value = fileList.value[0].name
+  // 提交请求
+  uploadHeaders.value = {
+    Authorization: 'Bearer ' + getAccessToken(),
+    'tenant-id': getTenantId(),
+  }
+  formLoading.value = true
+  uploadRef.value!.submit()
+}
+
+/** 文件上传成功 */
+const emits = defineEmits(['success'])
+const submitFormSuccess = (response: any) => {
+  formLoading.value = true
+  if(response){
+    if(response.code == 500){
+      message.error('导入失败')
+      return;
+    } else if (response.data.errorCount > 0) {
+      message.confirm('文件中有部分数据导入失败，是否下载失败数据？').then(() => {
+        // download.excel(file, 'file_' + new Date().getTime())
+        // 通过url下载文件
+        // const downloadElement = document.createElement('a')
+        // console.log(172, import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + '/' + response.data.errorFile)
+        // console.log(172, import.meta.env.VITE_BASE_URL + '/admin-api/opt/profile/' + response.data.errorFile)
+        window.open(import.meta.env.VITE_BASE_URL + '/admin-api/profile/' + response.data.errorFile ,'222')
+        // downloadElement.setAttribute('href', import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + response.data.errorFile )
+        // 点击下载
+        // downloadElement.click()
+      })
+    }
+  }else{
+    console.info("response",response);
+    message.success('导入成功')
+    
+  }
+  // 发送操作成功的事件
+  formLoading.value = false
+  emits('success')
+  const decRecId = response.data.decRecId;//主记录id
+  const role = response.data.decRecId;//是否为admin
+  const waring = response.data.decRecId;//是否有超出公差范围数据
+  //dialogVisible.value = false
+  //文件导入成功之后隐藏导入框展示告警信息列表
+  setSearchParams({
+    decRecId:decRecId,
+    saveStatus:1,
+    result:"Warning",
+  });
+  uploadOpen.value = false;
+}
+/** 上传错误提示 */
+const submitFormError = (): void => {
+  message.error('上传失败，请您重新上传！')
+  formLoading.value = false
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  // 重置上传状态和文件
+  formLoading.value = false
+  uploadRef.value?.clearFiles()
+  fileList.value = []
+}
+
+/** 文件数超出提示 */
+const handleExceed = (): void => {
+  message.error('最多只能上传一个文件！')
+}
+
+/** 下载模板操作 */
+const importTemplate = () => {
+  const res = importTemplateData.value.templateUrl
+  download.excel(res, importTemplateData.value.templateTitle)
+}
+
 </script>
+
+<style scoped lang="scss">
+.tips {
+  div {
+    position: relative;
+    padding-left: 22px;
+
+    &::before {
+      width: 4px;
+      height: 4px;
+      border-radius: 50%;
+      content: '';
+      background: #c2c2c2;
+      position: absolute;
+      top: 50%;
+      margin-top: -2px;
+      left: 4px;
+    }
+  }
+}
+</style>
diff --git a/src/views/spc/detectiontemplate/detectionTemplate.data.ts b/src/views/spc/detectiontemplate/detectionTemplate.data.ts
index 83702dd..90b46b2 100644
--- a/src/views/spc/detectiontemplate/detectionTemplate.data.ts
+++ b/src/views/spc/detectiontemplate/detectionTemplate.data.ts
@@ -85,7 +85,7 @@ export const DetectionTemplate = useCrudSchemas(reactive<CrudSchema[]>([
     form:{
       component: 'InputNumber',
       componentProps: {
-        min: 1,
+        min: 3,
       }
     }
   },
diff --git a/src/views/spc/itembasic/itembasic.data.ts b/src/views/spc/itembasic/itembasic.data.ts
index 68155e3..c6acc5a 100644
--- a/src/views/spc/itembasic/itembasic.data.ts
+++ b/src/views/spc/itembasic/itembasic.data.ts
@@ -36,7 +36,6 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
   { 
     label: '项目名称', 
     field: 'projectName',
-    sort: 'custom',
     isSearch: false,
     isForm:false,
     isTable:true,