验证工具管理

src/api/storehouse/index.ts

@@ -1,13 +1,9 @@
 import $http from '../index'
 
-
-
-
 export const StockinExcel = (params: any) => $http.post('/storage/StockIn/List_Product_Excel', params)
 
 export const StockOutExcel = (params: any) => $http.post('/storage/StockOut/List_Product_Excel', params)
 
-
 /**
  * 提成项目
  */
@@ -20,7 +16,6 @@ export const VerifyItem_Edit = (params: any) => $http.post('/storage/VerifyItem/
 // // 提成项目删除
 export const VerifyItem_Del = (params: any) => $http.post('/storage/VerifyItem/Del', params)
 
-
 // 双击排序
 export const stockInSort = (params: any) => $http.post('/storage/Stock/Edit_Sort', params)
 
@@ -117,11 +112,13 @@ export const Storehouse_Contract_Out_List = (params: any) => $http.post('/storag
 // 设备列表
 export const Storehouse_Device_List = (params: any) => $http.post('/storage/Device/List', params)
 export const validation_List = (params: any) => $http.post('/storage/vaildationTool/list', params)
-export const validation_add = (params: any) => $http.post('/storage/vaildationTool/add', params,{headers: {'Content-Type': 'application/json'}})  //借出验证工具
+export const validation_add = (params: any) => $http.post('/storage/vaildationTool/add', params, { headers: { 'Content-Type': 'application/json' } })  //借出验证工具
 export const validation_del = (params: any) => $http.post('/storage/vaildationTool/del', params,)
 export const validation_update = (params: any) => $http.post('/storage/vaildationTool/update', params,)  //借出验证工具
 export const readvaildation = (params: any) => $http.post('/storage/vaildationTool/readvaildation', params,)
 export const updatevaildation = (params: any) => $http.post('/storage/vaildationTool/updatevaildation', params,)
+export const uploadFile = (params: any) => $http.post('/storage/vaildationTool/ImportExecl', params,)
+export const exportFile = (params: any) => $http.post('/storage/vaildationTool/exportExecl', params, { responseType: 'blob' })
 
 /**
  * 入库
@@ -141,7 +138,6 @@ export const Storehouse_StockIn_Edit = (params: any) => $http.post('/storage/Sto
 // 删除
 export const Storehouse_StockIn_del = (params: any) => $http.post('/storage/StockIn/Del', params)
 
-
 /**
  * 出库
  */
@@ -197,7 +193,6 @@ export const Storehouse_VerifyContract_Get = (params: any) => $http.post('/stora
 // 删除
 export const Storehouse_VerifyContract_Del = (params: any) => $http.post('/storage/VerifyContract/Del', params)
 
-
 /**
  * 回款管理
  */

src/views/storehouse/ValidationTool/validation.vue

@@ -1,13 +1,16 @@
 <script setup lang="ts">
-import {validation_add, validation_del, validation_List,readvaildation,updatevaildation,validation_update } from '@/api/storehouse'
+import { validation_add, validation_del, validation_List, readvaildation, updatevaildation,exportFile, validation_update, Storehouse_ProductClass_List, uploadFile } from '@/api/storehouse'
 import TableBase from '@/components/TableBase/index.vue'
-import { computed, reactive, ref } from 'vue'
+import { computed, reactive, ref, onMounted } from 'vue'
 import { GlobalStore } from '@/stores'
 import type { ColumnProps } from '@/components/TableBase/interface'
 import { Delete, Edit } from '@element-plus/icons-vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance } from 'element-plus'
-// import { pa } from 'element-plus/es/locale'
+import type { FormInstance, UploadInstance} from 'element-plus'
+import { ElLoading } from 'element-plus'
+
+const uploadRef = ref<UploadInstance>()
+const uploadFiles = ref<File[]>([]) // 新增：用于存储上传的文件
 
 const globalStore = GlobalStore()
 const TableRef = ref<InstanceType<typeof TableBase> | null>(null)
@@ -19,17 +22,18 @@ const initParam = reactive({
   T_sn: '',
   T_imei: '',
   T_iccid: '',
-  LendUser:'',
+  LendUser: '',
   T_project: '',
+  T_class: '',
 })
 const columns: ColumnProps[] = [
   { type: 'index', label: '序号', width: 80 },
   { prop: 'Validationnumber', label: '设备编号', ellipsis: true },
   { prop: 'T_sn', label: '设备SN', ellipsis: true },
-  { prop: 'T_sn', label: '设备SN', ellipsis: true },
   { prop: 'T_imei', label: '模组imei', ellipsis: true },
   { prop: 'T_iccid', label: '物联网卡号', ellipsis: true },
-  { prop: 'T_state', label: '状态', name: 'T_state'  },
+  { prop: 'T_state', label: '状态', name: 'T_state' },
+  { prop: 'T_class', label: '设备类型', name: 'T_class' },
   { prop: 'LendUser', label: '借出人', ellipsis: true },
   { prop: 'T_project', label: '借出项目', ellipsis: true },
   { prop: 'T_remark', label: '备注', name: 'T_remark', ellipsis: true },
@@ -61,23 +65,64 @@ const deleteFun = (row: any) => {
         TableRef.value?.searchTable()
       }
     })
-	  // eslint-disable-next-line @typescript-eslint/no-empty-function
-    .catch(() => {})
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
+    .catch(() => { })
 }
+//导出文件execl
+const exportExecl = async () => {
+  try{
+
+    const response: any = await exportFile({
+      User_tokey: globalStore.GET_User_tokey,
+      Validationnumber: initParam.Validationnumber,
+      T_state: initParam.T_state,
+      T_sn: initParam.T_sn,
+      T_imei: initParam.T_imei,
+      T_iccid: initParam.T_iccid,
+      LendUser: initParam.LendUser,
+      T_project: initParam.T_project,
+      T_class: initParam.T_class
+    });
+    // 处理返回的二进制文件并触发下载
+    const blob = new Blob([response], { type: 'application/vnd.ms-excel;charset=utf8' });
+    const url = window.URL.createObjectURL(blob);
+    const a = document.createElement('a');
+    a.href = url;
+    a.download = 'filename.xlsx'; // 设置下载的文件名
+    document.body.appendChild(a);
+    a.click();
+    a.remove();
+    window.URL.revokeObjectURL(url);
+    ElMessage.success('导出成功');
+  }catch(error){
+    ElMessage.error('导出失败，请检查网络连接');
+  }
+};
 
 const showInStorageForm = ref(false)
+const showrRepaidForm = ref(false)
 
 const inStorageFormRef = ref<FormInstance | null>(null)
 const inStorageForm = reactive({
   T_sn: '',
   Validationnumber: '',
-  T_remark: ''
+  T_remark: '',
+  T_class:'',
 })
 interface InStorageItem {
   T_sn: string;
   Validationnumber: string;
   T_remark: string;
 }
+// 获取产品分类
+const Pruductoptions = ref<any[]>([{
+  Id:'',
+  T_name:''
+}])
+const getProductClassList = async () => {
+  const res: any = await Storehouse_ProductClass_List({ page: 1, page_z: 999 })
+  Pruductoptions.value = res.Data.Data
+}
 
 const pendingItems = ref<InStorageItem[]>([])
 const pageSize = ref(8)
@@ -90,7 +135,11 @@ const paginatedPendingItems = computed(() => {
 })
 const rules = reactive({
   T_sn: [{ required: true, message: '请输入SN', trigger: 'blur' }],
-  Validationnumber: [{ required: true, message: '请输入设备编号', trigger: 'blur' }]
+  Validationnumber: [{ required: true, message: '请输入设备编号', trigger: 'blur' }],
+  T_class: [{ required: true, message: '请选择产品分类', trigger: 'blur' }]
+})
+const rulesrepaid = reactive({
+  T_sn: [{ required: true, message: '请输入SN', trigger: 'blur' }],
 })
 
 const extractSN = (fullSN: string): string => {
@@ -116,6 +165,29 @@ const submitInStorageForm = () => {
     }
   })
 }
+const submitRepaidForm = () => {
+  inStorageFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      const extractedSN = extractSN(inStorageForm.T_sn)
+
+      if (pendingItems.value.some((item: any) => item.T_sn === extractedSN)) {
+        ElMessage.warning('已存在相同的SN，不能添加')
+        return
+      }
+      const result: any = await readvaildation({ sn: extractedSN });
+      if (result.Code !== 200) {
+        ElMessage.warning('当前SN未入库不能归还')
+        return
+      }
+
+      pendingItems.value.push({ ...inStorageForm, T_sn: extractedSN })
+      inStorageForm.T_sn = ''
+      inStorageForm.Validationnumber = ''
+      inStorageForm.T_remark = ''
+      ElMessage.success('已添加到待提交列表')
+    }
+  })
+}
 
 const removePendingItem = (index: number) => {
   pendingItems.value.splice(index, 1)
@@ -128,10 +200,9 @@ const submitInStoragePendingItems = async () => {
     return;
   }
 
-  const rest=JSON.parse(JSON.stringify(pendingItems.value));
-  console.log("待提交的数据:", rest);
+  const rest = JSON.parse(JSON.stringify(pendingItems.value));
   try {
-    const result:any = await validation_add(rest);
+    const result: any = await validation_add(rest);
     if (result.Code === 200) {
       ElMessage.success('提交成功');
       pendingItems.value = [];
@@ -179,19 +250,21 @@ const paginatedPendingLendItems = computed(() => {
 
 const lendRules = reactive({
   T_sn: [{ required: true, message: '请输入SN', trigger: 'blur' }],
-  Validationnumber: [{ required: true, message: '请输入设备编号', trigger: 'blur' }],
-  LendUser: [{ required: true, message: '请输入借出人', trigger: 'blur' }],
-  T_project: [{ required: true, message: '请输入借出项目', trigger: 'blur' }]
 })
 
 const submitLendForm = () => {
-  lendFormRef.value?.validate((valid: boolean): void => {
+  lendFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       const extractedSN = extractSN(lendForm.T_sn)
       if (pendingLendItems.value.some((item: any) => item.T_sn === extractedSN)) {
         ElMessage.warning('已存在相同的SN，不能添加')
         return
       }
+      const result: any = await readvaildation({ sn: extractedSN });
+      if (result.Code !== 200) {
+        ElMessage.warning('当前SN未入库不能借出')
+        return
+      }
       pendingLendItems.value.push({
         T_sn: extractedSN,
         Validationnumber: lendForm.Validationnumber,
@@ -200,10 +273,7 @@ const submitLendForm = () => {
         T_project: lendForm.T_project
       })
       lendForm.T_sn = ''
-      lendForm.Validationnumber = ''
       lendForm.T_remark = ''
-      lendForm.LendUser = ''
-      lendForm.T_project = ''
       ElMessage.success('已添加到待提交列表')
     } else {
     }
@@ -220,13 +290,9 @@ const submitLendPendingItems = async () => {
     ElMessage.warning('暂无数据可提交')
     return
   }
-  // 封装成数组对象以 JSON 的方式提交
-  // const requestData = JSON.stringify(pendingLendItems.value)
-  // 假设有一个API用于提交待借出的数据
-  // console.log(requestData)
-  const rest=JSON.parse(JSON.stringify(pendingLendItems.value));
+  const rest = JSON.parse(JSON.stringify(pendingLendItems.value));
 
-  const result:any = await validation_update(rest)
+  const result: any = await validation_update(rest)
   if (result.Code == 200) {
     ElMessage.success('提交成功')
     pendingLendItems.value = []
@@ -239,20 +305,25 @@ const submitLendPendingItems = async () => {
     ElMessage.error('提交失败')
   }
 }
-
 const handleLendPageChange = (page: number) => {
   lendCurrentPage.value = page
 }
 
 const showEditForm = ref(false)
+const ImportEdit = ref(false)
 const editFormRef = ref<FormInstance | null>(null)
 const editForm = reactive({
   T_sn: '',
   Validationnumber: '',
   T_remark: '',
-	T_state:'',
+  T_state: '',
+  T_class: '',
 })
 
+const Repaid = () => {
+  submitRepaidForm()
+}
+
 const previewEdit = async (row: any) => {
   showEditForm.value = true
   const result: any = await readvaildation({ sn: row.T_sn })
@@ -266,8 +337,7 @@ const previewEdit = async (row: any) => {
 const submitEditForm = () => {
   editFormRef.value?.validate(async (valid: boolean): Promise<void> => {
     if (valid) {
-		console.log("editForm",editForm)
-      const result:any = await updatevaildation(editForm)
+      const result: any = await updatevaildation(editForm)
       if (result.Code === 200) {
         ElMessage.success('编辑成功')
         showEditForm.value = false
@@ -281,106 +351,120 @@ const submitEditForm = () => {
   })
 }
 
+const handleFileChange = (file: any, fileList: any) => {
+  uploadFiles.value = fileList.map((item: any) => item.raw) // 新增：更新上传文件列表
+}
+
+const submitUpload = async () => {
+  if (uploadFiles.value.length === 0) { // 修改：使用 uploadFiles.value
+    ElMessage.warning('请先选择文件')
+    return
+  }
+  const formData = new FormData()
+  uploadFiles.value.forEach((file: File) => { // 修改：遍历 uploadFiles.value
+    formData.append('excelFile', file)
+  })
+  const loading = ElLoading.service({ // 新增：显示加载动画
+    lock: true,
+    text: '正在上传文件...',
+    background: 'rgba(0, 0, 0, 0.7)',
+  })
+  try {
+    const result: any = await uploadFile(formData)
+    if (result.Code === 200) {
+      ElMessage.success('文件上传成功')
+      // 处理上传成功后的逻辑
+      searchHandle()
+      uploadFiles.value = [] // 新增：清除文件上传列表
+    } else {
+      ElMessage.error('文件上传失败')
+    }
+  } catch (error) {
+    ElMessage.error('文件上传失败，请检查网络连接')
+  } finally {
+    loading.close() // 新增：关闭加载动画
+  }
+}
+
+onMounted(() => {
+  getProductClassList()
+})
+
 </script>
 <template>
   <div class="list">
-  <TableBase ref="TableRef" :columns="columns" :requestApi="validation_List" :initParam="initParam" :pagination="true">
-    <template #table-header>
-      <div class="input-suffix">
-        <el-row :gutter="20" style="margin-bottom: 0">
-          <el-col :xl="6" :lg="6" :md="6">
-            <span class="inline-flex items-center">设备编号：</span>
-            <el-input
-              v-model="initParam.Validationnumber"
-              class="w-50 m-2"
-              type="text"
-              placeholder="设备编号搜索"
-              clearable
-              @change="searchHandle"
-            />
-          </el-col>
-          <el-col :xl="6" :lg="6" :md="6">
-            <span class="inline-flex items-center">状态：</span>
-            <el-select v-model="initParam.T_state" class="w-50 m-2" clearable placeholder="请选择状态~">
-              <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-col>
-          <el-col :xl="6" :lg="6" :md="6">
-            <span class="inline-flex items-center">SN：</span>
-            <el-input
-              class="w-50 m-2"
-              v-model="initParam.T_sn"
-              type="text"
-              placeholder="按SN搜索"
-              clearable
-              @change="searchHandle"
-            />
-          </el-col>
-          <el-col :xl="6" :lg="6" :md="6">
-            <span class="inline-flex items-center">模组imei：</span>
-            <el-input
-              class="w-50 m-2"
-              v-model="initParam.T_imei"
-              type="text"
-              placeholder="按模组imei搜索"
-              clearable
-              @change="searchHandle"
-            />
-          </el-col>
-          <el-col :xl="6" :lg="6" :md="6">
-            <span class="inline-flex items-center">借出人</span>
-            <el-input
-              class="w-50 m-2"
-              v-model="initParam.LendUser"
-              type="text"
-              placeholder="按借出人搜索"
-              clearable
-              @change="searchHandle"
-            />
-          </el-col>
-          <el-col :xl="6" :lg="6" :md="6">
-            <span class="inline-flex items-center">借出项目</span>
-            <el-input
-              class="w-50 m-2"
-              v-model="initParam.T_project"
-              type="text"
-              placeholder="按借出项目搜索"
-              clearable
-              @change="searchHandle"
-            />
-          </el-col>
-          <el-col :xl="6" :lg="6" :md="6">
-            <span class="inline-flex items-center">物联网卡号：</span>
-            <el-input
-              class="w-50 m-2"
-              v-model="initParam.T_iccid"
-              type="text"
-              placeholder="按物联网卡号搜索"
-              clearable
-              @change="searchHandle"
-            />   
-          </el-col>
-          <el-col :xl="6" :lg="6" :md="6" style="margin-top: auto;">
-            <el-button type="primary" @click="searchHandle">搜索</el-button>
-            <el-button type="primary" @click="showInStorageForm = true">入库</el-button>
-            <el-button type="primary" @click="showLendForm = true">借出</el-button>
-          </el-col>
-        </el-row>
-      </div>
-    </template>
-    <template #T_state="{ row }">
-      <el-tag v-if="row.T_state == 1" type="success" effect="dark"> 已出库</el-tag>
-      <el-tag v-if="row.T_state == 2" effect="dark">未出库</el-tag>
-      <el-tag v-if="row.T_state == 3" effect="dark" type="danger">已损坏</el-tag>
-    </template>
-    <template #right="{ row }">
-      <el-button link type="success" size="small" :icon="Edit" @click="previewEdit(row)">编辑</el-button>
-      <el-button link type="danger" size="small" :icon="Delete" @click="deleteFun(row.T_sn)">删除</el-button>
-    </template>
-  </TableBase>
-</div>
-  <!-- <InStorageForm ref="InStorageFormRef" :options="options" @onUpdateList="searchHandle" /> -->
-  <!-- <InStorageEdit ref="InStorageRef" :options="options" @onUpdateList="searchHandle" /> -->
+    <TableBase ref="TableRef" :columns="columns" :requestApi="validation_List" :initParam="initParam"
+      :pagination="true">
+      <template #table-header>
+        <div class="input-suffix">
+          <el-row :gutter="20" style="margin-bottom: 0">
+            <el-col :xl="3" :lg="3" :md="3">
+              <span class="inline-flex items-center">设备编号：</span>
+              <el-input v-model="initParam.Validationnumber" class="w-50 m-2" type="text" placeholder="设备编号搜索" clearable
+                @change="searchHandle" />
+            </el-col>
+            <el-col :xl="3" :lg="3" :md="3">
+              <span class="inline-flex items-center">状态：</span>
+              <el-select v-model="initParam.T_state" class="w-50 m-2" clearable placeholder="请选择状态~">
+                <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-col>
+            <el-col :xl="3" :lg="3" :md="3">
+              <span class="inline-flex items-center">SN：</span>
+              <el-input class="w-50 m-2" v-model="initParam.T_sn" type="text" placeholder="按SN搜索" clearable
+                @change="searchHandle" />
+            </el-col>
+            <el-col :xl="3" :lg="3" :md="3">
+              <span class="inline-flex items-center">产品分类：</span>
+              <el-select v-model="initParam.T_class" class="w-50 m-2" clearable placeholder="请选择分类~">
+                <el-option v-for="item in Pruductoptions" :key="item.Id" :label="item.T_name" :value="item.Id" />
+              </el-select>
+            </el-col>
+            <el-col :xl="3" :lg="3" :md="3">
+              <span class="inline-flex items-center">模组imei：</span>
+              <el-input class="w-50 m-2" v-model="initParam.T_imei" type="text" placeholder="按模组imei搜索" clearable
+                @change="searchHandle" />
+            </el-col>
+            <el-col :xl="3" :lg="3" :md="3">
+              <span class="inline-flex items-center">借出人</span>
+              <el-input class="w-50 m-2" v-model="initParam.LendUser" type="text" placeholder="按借出人搜索" clearable
+                @change="searchHandle" />
+            </el-col>
+            <el-col :xl="3" :lg="3" :md="3">
+              <span class="inline-flex items-center">借出项目</span>
+              <el-input class="w-50 m-2" v-model="initParam.T_project" type="text" placeholder="按借出项目搜索" clearable
+                @change="searchHandle" />
+            </el-col>
+            <el-col :xl="3" :lg="3" :md="3">
+              <span class="inline-flex items-center">物联网卡号：</span>
+              <el-input class="w-50 m-2" v-model="initParam.T_iccid" type="text" placeholder="按物联网卡号搜索" clearable
+                @change="searchHandle" />
+            </el-col>
+            <el-col :xl="10" :lg="10" :md="10" style="margin-top: 10px;">
+              <el-button type="primary" @click="searchHandle">搜索</el-button>
+              <el-button type="primary" @click="showInStorageForm = true">入库</el-button>
+              <el-button type="primary" @click="showLendForm = true">借出</el-button>
+              <el-button type="primary" @click="showrRepaidForm = true">归还</el-button>
+              <el-button type="success" @click="ImportEdit = true">模板导入</el-button>
+              <el-button type="success" @click="exportExecl">导出</el-button>
+            </el-col>
+          </el-row>
+        </div>
+      </template>
+      <template #T_state="{ row }">
+        <el-tag v-if="row.T_state == 1" type="success" effect="dark"> 已出库</el-tag>
+        <el-tag v-if="row.T_state == 2" effect="dark">未出库</el-tag>
+        <el-tag v-if="row.T_state == 3" effect="dark" type="danger">已损坏</el-tag>
+      </template>
+      <template #T_class="{ row }">
+        <el-tag>{{ Pruductoptions.find(option => option.Id === row.T_class)?.T_name || '' }}</el-tag>
+      </template>
+      <template #right="{ row }">
+        <el-button link type="success" size="small" :icon="Edit" @click="previewEdit(row)">编辑</el-button>
+        <el-button link type="danger" size="small" :icon="Delete" @click="deleteFun(row.T_sn)">删除</el-button>
+      </template>
+    </TableBase>
+  </div>
   <!-- 新增入库表单 -->
   <el-dialog title="入库" v-model="showInStorageForm" width="50%">
     <el-form :model="inStorageForm" :rules="rules" ref="inStorageFormRef">
@@ -390,6 +474,11 @@ const submitEditForm = () => {
       <el-form-item label="设备编号" prop="Validationnumber">
         <el-input v-model="inStorageForm.Validationnumber" placeholder="请输入设备编号"></el-input>
       </el-form-item>
+      <el-form-item label="产品分类"  prop="T_class">
+        <el-select v-model="inStorageForm.T_class" class="w-50 m-2" clearable placeholder="请选择分类~">
+          <el-option v-for="item in Pruductoptions" :key="item.Id" :label="item.T_name" :value="item.Id" />
+        </el-select>
+      </el-form-item>
       <el-form-item label="备注">
         <el-input v-model="inStorageForm.T_remark" type="textarea" placeholder="请输入备注"></el-input>
       </el-form-item>
@@ -401,8 +490,9 @@ const submitEditForm = () => {
     <el-table :data="paginatedPendingItems" style="width: 100%; margin-top: 20px">
       <el-table-column type="index" label="序号" width="80"></el-table-column>
       <!-- 添加序号列 -->
-      <el-table-column prop="T_sn" label="SN"></el-table-column>
+      <el-table-column prop="T_sn" label="SN" width="300"></el-table-column>
       <el-table-column prop="Validationnumber" label="设备编号"></el-table-column>
+      <el-table-column prop="T_class" label="产品分类"></el-table-column>
       <el-table-column prop="T_remark" label="备注"></el-table-column>
       <el-table-column label="操作" width="180">
         <template #default="scope">
@@ -410,15 +500,8 @@ const submitEditForm = () => {
         </template>
       </el-table-column>
     </el-table>
-    <el-pagination
-      background
-      layout="prev, pager, next"
-      :total="pendingItems.length"
-      :page-size="pageSize"
-      :current-page="currentPage"
-      @current-change="handlePageChange"
-      style="margin-top: 20px; text-align: right"
-    />
+    <el-pagination background layout="prev, pager, next" :total="pendingItems.length" :page-size="pageSize"
+      :current-page="currentPage" @current-change="handlePageChange" style="margin-top: 20px; text-align: right" />
     <template #footer>
       <span class="dialog-footer">
         <el-button @click="showInStorageForm = false">取消</el-button>
@@ -432,16 +515,16 @@ const submitEditForm = () => {
   <el-dialog title="借出" v-model="showLendForm" width="50%">
     <el-form :model="lendForm" :rules="lendRules" ref="lendFormRef">
       <el-form-item label="SN" prop="T_sn">
-        <el-input v-model="lendForm.T_sn" placeholder="请输入SN"></el-input>
+        <el-input v-model="lendForm.T_sn" placeholder="请输入SN"  @keyup.enter="submitLendForm"></el-input>
       </el-form-item>
       <el-form-item label="备注">
         <el-input v-model="lendForm.T_remark" type="textarea" placeholder="请输入备注"></el-input>
       </el-form-item>
       <!-- 新增借出人和借出项目 -->
-      <el-form-item label="借出人" prop="borrower">
+      <el-form-item label="借出人" prop="LendUser">
         <el-input v-model="lendForm.LendUser" placeholder="请输入借出人"></el-input>
       </el-form-item>
-      <el-form-item label="借出项目" prop="project">
+      <el-form-item label="借出项目" prop="T_project">
         <el-input v-model="lendForm.T_project" placeholder="请输入借出项目"></el-input>
       </el-form-item>
     </el-form>
@@ -452,8 +535,9 @@ const submitEditForm = () => {
     <el-table :data="paginatedPendingLendItems" style="width: 100%; margin-top: 20px">
       <el-table-column type="index" label="序号" width="80"></el-table-column>
       <!-- 添加序号列 -->
-      <el-table-column prop="T_sn" label="SN"></el-table-column>
-      <el-table-column prop="Validationnumber" label="设备编号"></el-table-column>
+      <el-table-column prop="T_sn" label="SN" width="300"></el-table-column>
+      <el-table-column prop="LendUser" label="借出人"></el-table-column>
+      <el-table-column prop="T_project" label="借出项目"></el-table-column>
       <el-table-column prop="T_remark" label="备注"></el-table-column>
       <el-table-column label="操作" width="180">
         <template #default="scope">
@@ -461,15 +545,9 @@ const submitEditForm = () => {
         </template>
       </el-table-column>
     </el-table>
-    <el-pagination
-      background
-      layout="prev, pager, next"
-      :total="pendingLendItems.length"
-      :page-size="lendPageSize"
-      :current-page="lendCurrentPage"
-      @current-change="handleLendPageChange"
-      style="margin-top: 20px; text-align: right"
-    />
+    <el-pagination background layout="prev, pager, next" :total="pendingLendItems.length" :page-size="lendPageSize"
+      :current-page="lendCurrentPage" @current-change="handleLendPageChange"
+      style="margin-top: 20px; text-align: right" />
     <template #footer>
       <span class="dialog-footer">
         <el-button @click="showLendForm = false">取消</el-button>
@@ -487,11 +565,16 @@ const submitEditForm = () => {
       <el-form-item label="设备编号" prop="Validationnumber">
         <el-input v-model="editForm.Validationnumber" placeholder="请输入设备编号"></el-input>
       </el-form-item>
-		<el-form-item label="状态">
-			<el-select v-model="editForm.T_state" class="w-50 m-2" clearable placeholder="请选择状态~">
-				<el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id" />
-			</el-select>
-		</el-form-item>
+      <el-form-item label="状态">
+        <el-select v-model="editForm.T_state" class="w-50 m-2" clearable placeholder="请选择状态~">
+          <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="设备类型">
+        <el-select v-model="editForm.T_class" class="w-50 m-2" clearable placeholder="请选择分类~">
+          <el-option v-for="item in Pruductoptions" :key="item.Id" :label="item.T_name" :value="item.Id" />
+        </el-select>
+      </el-form-item>
       <el-form-item label="备注">
         <el-input v-model="editForm.T_remark" type="textarea" placeholder="请输入备注"></el-input>
       </el-form-item>
@@ -503,6 +586,59 @@ const submitEditForm = () => {
       </span>
     </template>
   </el-dialog>
+  <!-- 新增归还表单 -->
+  <el-dialog title="归还" v-model="showrRepaidForm" width="50%">
+    <el-form :model="inStorageForm" :rules="rulesrepaid" ref="inStorageFormRef">
+      <el-form-item label="SN" prop="T_sn">
+        <el-input v-model="inStorageForm.T_sn" placeholder="请输入SN" @keyup.enter="Repaid"></el-input>
+      </el-form-item>
+      <el-form-item label="备注">
+        <el-input v-model="inStorageForm.T_remark" type="textarea" placeholder="请输入备注"></el-input>
+      </el-form-item>
+    </el-form>
+    <!-- 新增数据条数提示 -->
+    <div style="margin: 10px 0">
+      <span>当前待提交数据条数: {{ pendingItems.length }}</span>
+    </div>
+    <el-table :data="paginatedPendingItems" style="width: 100%; margin-top: 20px">
+      <el-table-column type="index" label="序号" width="80"></el-table-column>
+      <!-- 添加序号列 -->
+      <el-table-column prop="T_sn" label="SN"></el-table-column>
+      <el-table-column prop="T_remark" label="备注"></el-table-column>
+      <el-table-column label="操作" width="180">
+        <template #default="scope">
+          <el-button type="danger" size="small" @click="removePendingItem(scope.$index)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination background layout="prev, pager, next" :total="pendingItems.length" :page-size="pageSize"
+      :current-page="currentPage" @current-change="handlePageChange" style="margin-top: 20px; text-align: right" />
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="showInStorageForm = false">取消</el-button>
+        <el-button type="primary" @click="submitInStorageForm">添加到暂存</el-button>
+        <!-- 新增提交按钮 -->
+        <el-button type="primary" @click="submitInStoragePendingItems">提交</el-button>
+      </span>
+    </template>
+  </el-dialog>
+  <el-dialog title="模板导入" v-model="ImportEdit" width="50%">
+    <el-upload
+      ref="uploadRef"
+      class="upload-demo"
+      :auto-upload="false"
+      @change="handleFileChange"
+    >
+      <template #trigger>
+        <el-button type="primary">模板导入</el-button>
+      </template>
+
+      <el-button class="ml-3" type="success" @click="submitUpload">
+        提交文件
+      </el-button>
+      <template #tip></template>
+    </el-upload>
+  </el-dialog>
 </template>
 
 <style scoped lang="scss">
@@ -511,10 +647,11 @@ const submitEditForm = () => {
 .list {
   @include f-direction;
 }
+
 // .input-suffix {
-//   width: 100%;
-//   .w-50 {
-//     width: 33.33%;
-//   }
+//    width: 100%;
+//    .w-50 {
+//      width: 33.33%;
+//    }
 // }
 </style>