From ca96595db551e4bf60d04a4060a1aebff46441f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Tue, 27 Feb 2024 17:29:52 +0800
Subject: [PATCH 1/3] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/eam/item/replaceItemDes/index.ts      |  52 ++++
 src/views/eam/item/replaceItemDes/index.vue   | 239 ++++++++++++++++++
 .../replaceItemDes/replaceItemDes.data.ts     |  60 +++++
 3 files changed, 351 insertions(+)
 create mode 100644 src/api/eam/item/replaceItemDes/index.ts
 create mode 100644 src/views/eam/item/replaceItemDes/index.vue
 create mode 100644 src/views/eam/item/replaceItemDes/replaceItemDes.data.ts

diff --git a/src/api/eam/item/replaceItemDes/index.ts b/src/api/eam/item/replaceItemDes/index.ts
new file mode 100644
index 0000000..502c819
--- /dev/null
+++ b/src/api/eam/item/replaceItemDes/index.ts
@@ -0,0 +1,52 @@
+import request from '@/config/axios'
+
+export interface AttachmentFileVO {
+  itemNumber: string
+  qty: number
+  areaNumber: string
+  isInAccount: string
+  siteId: string
+  available: string
+  concurrencyStamp: number
+}
+
+// 查询备件台账列表
+export const getReplaceItemDesPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/eam/attachment-file/senior', data })
+  } else {
+    return await request.get({ url: `/eam/attachment-file/page`, params })
+  }
+}
+
+// 查询备件台账详情
+export const getReplaceItemDes = async (id: number) => {
+  return await request.get({ url: `/eam/attachment-file/get?id=` + id })
+}
+
+// 新增备件台账
+export const createReplaceItemDes = async (data: AttachmentFileVO) => {
+  return await request.post({ url: `/eam/attachment-file/create`, data })
+}
+
+// 修改备件台账
+export const updateReplaceItemDes = async (data: AttachmentFileVO) => {
+  return await request.put({ url: `/eam/attachment-file/update`, data })
+}
+
+// 删除备件台账
+export const deleteReplaceItemDes = async (id: number) => {
+  return await request.delete({ url: `/eam/attachment-file/delete?id=` + id })
+}
+
+// 导出备件台账 Excel
+export const exportReplaceItemDes = async (params) => {
+  return await request.download({ url: `/eam/attachment-file/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/attachment-file/get-import-template' })
+}
diff --git a/src/views/eam/item/replaceItemDes/index.vue b/src/views/eam/item/replaceItemDes/index.vue
new file mode 100644
index 0000000..9a74584
--- /dev/null
+++ b/src/views/eam/item/replaceItemDes/index.vue
@@ -0,0 +1,239 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ReplaceItemDes.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ReplaceItemDes.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="formsSuccess"
+    :rules="ReplaceItemDesRules"
+    :formAllSchemas="ReplaceItemDes.allSchemas"
+    :apiUpdate="ReplaceItemDesApi.updateReplaceItemDes"
+    :apiCreate="ReplaceItemDesApi.createReplaceItemDes"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="ReplaceItemDes.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/eam/item-accounts/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ReplaceItemDes,ReplaceItemDesRules } from './replaceItemDes.data'
+import * as ReplaceItemDesApi from '@/api/eam/item/replaceItemDes'
+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: 'ReplaceItemDes' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ReplaceItemDes.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ReplaceItemDesApi.getReplaceItemDesPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(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(null), // 编辑
+  defaultButtons.mainListDeleteBtn(null), // 删除
+]
+
+// 列表-操作按钮事件
+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)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =ReplaceItemDes.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await ReplaceItemDesApi.createReplaceItemDes(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await ReplaceItemDesApi.updateReplaceItemDes(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicReplaceItemDes')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ReplaceItemDesApi.deleteReplaceItemDes(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 ReplaceItemDesApi.exportReplaceItemDes(tableObject.params)
+    download.excel(data, '备件台账.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '备件台账导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ReplaceItemDesApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/eam/item/replaceItemDes/replaceItemDes.data.ts b/src/views/eam/item/replaceItemDes/replaceItemDes.data.ts
new file mode 100644
index 0000000..b4c4c8a
--- /dev/null
+++ b/src/views/eam/item/replaceItemDes/replaceItemDes.data.ts
@@ -0,0 +1,60 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+import { Item } from '@/views/eam/basic/item/item.data'
+import * as ItemApi from '@/api/eam/basic/item'
+
+// 表单校验
+export const ReplaceItemDesRules = reactive({
+  itemNumber: [required],
+  areaNumber: [required],
+  concurrencyStamp: [required],
+})
+
+export const ReplaceItemDes = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '备件编号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择备件编号', // 输入框占位文本
+        searchField: 'number', // 查询弹窗赋值字段
+        searchTitle: '备件信息', // 查询弹窗标题
+        searchAllSchemas: Item.allSchemas, // 查询弹窗所需类
+        searchPage: ItemApi.getItemPage, // 查询弹窗所需分页方法
+        searchCondition: [
+          {
+            key: 'available',
+            value: "TRUE",
+            isMainValue: false
+          }]
+      }
+    }
+  },
+  {
+    label: '文件',
+    field: 'filePathList',
+    sort: 'custom',
+    table: {
+    },
+    form: {
+      component: 'UploadFile',
+      componentProps: {
+
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+
+      fixed: 'right'
+    }
+  }
+]))

From e950e419f1899e84011375f8a9597003ab816b06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Wed, 28 Feb 2024 14:07:07 +0800
Subject: [PATCH 2/3] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/eam/item/replaceItemDes/index.ts      |   1 +
 src/views/eam/item/replaceItemDes/index.vue   | 381 +++++++++---------
 .../replaceItemDes/replaceItemDes.data.ts     |  25 +-
 3 files changed, 208 insertions(+), 199 deletions(-)

diff --git a/src/api/eam/item/replaceItemDes/index.ts b/src/api/eam/item/replaceItemDes/index.ts
index 502c819..4c7daf4 100644
--- a/src/api/eam/item/replaceItemDes/index.ts
+++ b/src/api/eam/item/replaceItemDes/index.ts
@@ -12,6 +12,7 @@ export interface AttachmentFileVO {
 
 // 查询备件台账列表
 export const getReplaceItemDesPage = async (params) => {
+  params.funcCode="Replace_Item_Des"
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
diff --git a/src/views/eam/item/replaceItemDes/index.vue b/src/views/eam/item/replaceItemDes/index.vue
index 9a74584..a20890e 100644
--- a/src/views/eam/item/replaceItemDes/index.vue
+++ b/src/views/eam/item/replaceItemDes/index.vue
@@ -4,29 +4,17 @@
     <Search :schema="ReplaceItemDes.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="ReplaceItemDes.allSchemas"
-    />
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
+    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
+    :allSchemas="ReplaceItemDes.allSchemas" />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table
-      :columns="tableColumns"
-      :data="tableObject.tableList"
-      :loading="tableObject.loading"
-      :pagination="{
+    <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"
-    >
+      }" 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>
@@ -39,201 +27,198 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm
-    ref="basicFormRef"
-    @success="formsSuccess"
-    :rules="ReplaceItemDesRules"
-    :formAllSchemas="ReplaceItemDes.allSchemas"
-    :apiUpdate="ReplaceItemDesApi.updateReplaceItemDes"
-    :apiCreate="ReplaceItemDesApi.createReplaceItemDes"
-    @searchTableSuccess="searchTableSuccess"
-    :isBusiness="false"
-  />
+  <BasicForm ref="basicFormRef" @success="formsSuccess" :rules="ReplaceItemDesRules"
+    :formAllSchemas="ReplaceItemDes.allSchemas" :apiUpdate="ReplaceItemDesApi.updateReplaceItemDes"
+    :apiCreate="ReplaceItemDesApi.createReplaceItemDes" @searchTableSuccess="searchTableSuccess" :isBusiness="false" />
 
   <!-- 详情 -->
   <Detail ref="detailRef" :isBasic="true" :allSchemas="ReplaceItemDes.allSchemas" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/eam/item-accounts/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm ref="importFormRef" url="/eam/item-accounts/import" :importTemplateData="importTemplateData"
+    @success="importSuccess" />
 </template>
 
 <script setup lang="ts">
-import download from '@/utils/download'
-import { ReplaceItemDes,ReplaceItemDesRules } from './replaceItemDes.data'
-import * as ReplaceItemDesApi from '@/api/eam/item/replaceItemDes'
-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: 'ReplaceItemDes' })
-
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-
-const route = useRoute() // 路由信息
-const routeName = ref()
-routeName.value = route.name
-const tableColumns = ref(ReplaceItemDes.allSchemas.tableColumns)
-
-// 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef) => {
-  nextTick(() => {
-    const setV = {}
-    setV[formField] = val[0][searchField]
-    formRef.setValues(setV)
+  import download from '@/utils/download'
+  import { ReplaceItemDes, ReplaceItemDesRules } from './replaceItemDes.data'
+  import * as ReplaceItemDesApi from '@/api/eam/item/replaceItemDes'
+  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: 'ReplaceItemDes' })
+
+  const message = useMessage() // 消息弹窗
+  const { t } = useI18n() // 国际化
+
+  const route = useRoute() // 路由信息
+  const routeName = ref()
+  routeName.value = route.name
+  const tableColumns = ref(ReplaceItemDes.allSchemas.tableColumns)
+
+  // 查询页面返回
+  const searchTableSuccess = (formField, searchField, val, formRef) => {
+    nextTick(() => {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    })
+  }
+
+  // 字段设置 更新主列表字段
+  const updataTableColumns = (val) => {
+    tableColumns.value = val
+  }
+
+  const { tableObject, tableMethods } = useTable({
+    getListApi: ReplaceItemDesApi.getReplaceItemDesPage // 分页接口
   })
-}
-
-// 字段设置 更新主列表字段
-const updataTableColumns = (val) => {
-  tableColumns.value = val
-}
-
-const { tableObject, tableMethods } = useTable({
-  getListApi: ReplaceItemDesApi.getReplaceItemDesPage // 分页接口
-})
-
-// 获得表格的各种操作
-const { getList, setSearchParams } = tableMethods
-
-// 列表头部按钮
-const HeadButttondata = [
-  defaultButtons.defaultAddBtn(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 { getList, setSearchParams } = tableMethods
+
+  // 列表头部按钮
+  const HeadButttondata = [
+    defaultButtons.defaultAddBtn(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(null), // 编辑
-  defaultButtons.mainListDeleteBtn(null), // 删除
-]
-
-// 列表-操作按钮事件
-const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
-    openForm('update', row)
-  } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+
+  // 列表-操作按钮
+  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 basicFormRef = ref()
+  const openForm = (type : string, row ?: any) => {
+    basicFormRef.value.open(type, row)
   }
-}
-
-/** 添加/修改操作 */
-const basicFormRef = ref()
-const openForm = (type: string, row?: any) => {
-  basicFormRef.value.open(type, row)
-}
-
-// form表单提交
-const formsSuccess = async (formType,data) => {
-  var isHave =ReplaceItemDes.allSchemas.formSchema.some(function (item) {
-    return item.field === 'activeTime' || item.field === 'expireTime';
-  });
-  if(isHave){
-    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
-      message.error('失效时间要大于生效时间')
-      return;
+
+  // form表单提交
+  const formsSuccess = async (formType, data) => {
+    var isHave = ReplaceItemDes.allSchemas.formSchema.some(function (item) {
+      return item.field === 'activeTime' || item.field === 'expireTime';
+    });
+    if (isHave) {
+      if (data.activeTime && data.expireTime && data.activeTime >= data.expireTime) {
+        message.error('失效时间要大于生效时间')
+        return;
+      }
+    }
+    if (data.activeTime == 0) data.activeTime = null;
+    if (data.expireTime == 0) data.expireTime = null;
+    data.filePathList=[];
+    for (let i = 0; i < data.filePathListView.length; i++) {
+      data.filePathList.push(data.filePathListView[i].url);
+    }
+    if (formType === 'create') {
+      await ReplaceItemDesApi.createReplaceItemDes(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ReplaceItemDesApi.createReplaceItemDes(data)
+      message.success(t('common.updateSuccess'))
     }
+    basicFormRef.value.dialogVisible = false
+    getList()
+  }
+
+  /** 详情操作 */
+  const detailRef = ref()
+  const openDetail = (row : any, titleName : any, titleValue : any) => {
+    detailRef.value.openDetail(row, titleName, titleValue, 'basicReplaceItemDes')
   }
-  if(data.activeTime==0)data.activeTime = null;
-  if(data.expireTime==0)data.expireTime = null;
-  if (formType === 'create') {
-    await ReplaceItemDesApi.createReplaceItemDes(data)
-    message.success(t('common.createSuccess'))
-  } else {
-    await ReplaceItemDesApi.updateReplaceItemDes(data)
-    message.success(t('common.updateSuccess'))
+
+  /** 删除按钮操作 */
+  const handleDelete = async (id : number) => {
+    try {
+      // 删除的二次确认
+      await message.delConfirm()
+      // 发起删除
+      await ReplaceItemDesApi.deleteReplaceItemDes(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 ReplaceItemDesApi.exportReplaceItemDes(tableObject.params)
+      download.excel(data, '备件台账.xlsx')
+    } catch {
+    } finally {
+      exportLoading.value = false
+    }
   }
-  basicFormRef.value.dialogVisible = false
-  getList()
-}
-
-/** 详情操作 */
-const detailRef = ref()
-const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue, 'basicReplaceItemDes')
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await ReplaceItemDesApi.deleteReplaceItemDes(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 ReplaceItemDesApi.exportReplaceItemDes(tableObject.params)
-    download.excel(data, '备件台账.xlsx')
-  } catch {
-  } finally {
-    exportLoading.value = false
+
+  /** 导入 */
+  const importFormRef = ref()
+  const handleImport = () => {
+    importFormRef.value.open()
   }
-}
-
-/** 导入 */
-const importFormRef = ref()
-const handleImport = () => {
-  importFormRef.value.open()
-}
-// 导入附件弹窗所需的参数
-const importTemplateData = reactive({
-  templateUrl: '',
-  templateTitle: '备件台账导入模版.xlsx'
-})
-// 导入成功之后
-const importSuccess = () => {
-  getList()
-}
-
-// 筛选提交
-const searchFormClick = (searchData) => {
-  tableObject.params = {
-    isSearch: true,
-    filters: searchData.filters
+  // 导入附件弹窗所需的参数
+  const importTemplateData = reactive({
+    templateUrl: '',
+    templateTitle: '备件台账导入模版.xlsx'
+  })
+  // 导入成功之后
+  const importSuccess = () => {
+    getList()
   }
-  getList() // 刷新当前列表
-}
 
-/** 初始化 **/
-onMounted(async () => {
-  getList()
-  importTemplateData.templateUrl = await ReplaceItemDesApi.importTemplate()
-})
+  // 筛选提交
+  const searchFormClick = (searchData) => {
+    tableObject.params = {
+      isSearch: true,
+      filters: searchData.filters
+    }
+    getList() // 刷新当前列表
+  }
 
+  /** 初始化 **/
+  onMounted(async () => {
+    getList()
+    importTemplateData.templateUrl = await ReplaceItemDesApi.importTemplate()
+  })
 </script>
diff --git a/src/views/eam/item/replaceItemDes/replaceItemDes.data.ts b/src/views/eam/item/replaceItemDes/replaceItemDes.data.ts
index b4c4c8a..77def59 100644
--- a/src/views/eam/item/replaceItemDes/replaceItemDes.data.ts
+++ b/src/views/eam/item/replaceItemDes/replaceItemDes.data.ts
@@ -37,8 +37,9 @@ export const ReplaceItemDes = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '文件',
-    field: 'filePathList',
+    field: 'filePathListView',
     sort: 'custom',
+    isTable: false,
     table: {
     },
     form: {
@@ -48,6 +49,28 @@ export const ReplaceItemDes = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '文件',
+    field: 'filePathList',
+    sort: 'custom',
+    isTable: false,
+    isForm: false,
+    table: {
+    },
+    form: {
+      component: 'UploadFile',
+      componentProps: {
+  
+      }
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false
+  },
   {
     label: '操作',
     field: 'action',

From 5a6bad275dd752f788c07215589f3a76926e043b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Wed, 28 Feb 2024 15:37:32 +0800
Subject: [PATCH 3/3] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/eam/device/problemSolving/index.ts    |  55 +++++
 src/api/eam/item/replaceItemDes/index.ts      |   2 +
 src/views/eam/device/problemSolving/index.vue | 224 ++++++++++++++++++
 .../problemSolving/problemSolving.data.ts     |  83 +++++++
 src/views/eam/item/replaceItemDes/index.vue   |   4 +-
 .../replaceItemDes/replaceItemDes.data.ts     |  16 --
 6 files changed, 366 insertions(+), 18 deletions(-)
 create mode 100644 src/api/eam/device/problemSolving/index.ts
 create mode 100644 src/views/eam/device/problemSolving/index.vue
 create mode 100644 src/views/eam/device/problemSolving/problemSolving.data.ts

diff --git a/src/api/eam/device/problemSolving/index.ts b/src/api/eam/device/problemSolving/index.ts
new file mode 100644
index 0000000..9c97bc3
--- /dev/null
+++ b/src/api/eam/device/problemSolving/index.ts
@@ -0,0 +1,55 @@
+import request from '@/config/axios'
+
+export interface AttachmentFileVO {
+  itemNumber: string
+  qty: number
+  areaNumber: string
+  isInAccount: string
+  siteId: string
+  available: string
+  funcCode: string
+  concurrencyStamp: number
+}
+
+// 查询备件台账列表
+export const getProblemSolvingPage = async (params) => {
+  params.funcCode="problem_solving"
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/eam/attachment-file/senior', data })
+  } else {
+    return await request.get({ url: `/eam/attachment-file/page`, params })
+  }
+}
+
+// 查询备件台账详情
+export const getProblemSolving = async (id: number) => {
+  return await request.get({ url: `/eam/attachment-file/get?id=` + id })
+}
+
+// 新增备件台账
+export const createProblemSolving = async (data: AttachmentFileVO) => {
+  data.funcCode="problem_solving"
+  return await request.post({ url: `/eam/attachment-file/create`, data })
+}
+
+// 修改备件台账
+export const updateProblemSolving = async (data: AttachmentFileVO) => {
+  return await request.put({ url: `/eam/attachment-file/update`, data })
+}
+
+// 删除备件台账
+export const deleteProblemSolving = async (id: number) => {
+  return await request.delete({ url: `/eam/attachment-file/delete?id=` + id })
+}
+
+// 导出备件台账 Excel
+export const exportProblemSolving = async (params) => {
+  return await request.download({ url: `/eam/attachment-file/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/attachment-file/get-import-template' })
+}
diff --git a/src/api/eam/item/replaceItemDes/index.ts b/src/api/eam/item/replaceItemDes/index.ts
index 4c7daf4..92cd7f2 100644
--- a/src/api/eam/item/replaceItemDes/index.ts
+++ b/src/api/eam/item/replaceItemDes/index.ts
@@ -6,6 +6,7 @@ export interface AttachmentFileVO {
   areaNumber: string
   isInAccount: string
   siteId: string
+  funcCode: string
   available: string
   concurrencyStamp: number
 }
@@ -29,6 +30,7 @@ export const getReplaceItemDes = async (id: number) => {
 
 // 新增备件台账
 export const createReplaceItemDes = async (data: AttachmentFileVO) => {
+  data.funcCode="Replace_Item_Des"
   return await request.post({ url: `/eam/attachment-file/create`, data })
 }
 
diff --git a/src/views/eam/device/problemSolving/index.vue b/src/views/eam/device/problemSolving/index.vue
new file mode 100644
index 0000000..b603df2
--- /dev/null
+++ b/src/views/eam/device/problemSolving/index.vue
@@ -0,0 +1,224 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ProblemSolving.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
+    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
+    :allSchemas="ProblemSolving.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="formsSuccess" :rules="ProblemSolvingRules"
+    :formAllSchemas="ProblemSolving.allSchemas" :apiUpdate="ProblemSolvingApi.updateProblemSolving"
+    :apiCreate="ProblemSolvingApi.createProblemSolving" @searchTableSuccess="searchTableSuccess" :isBusiness="false" />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="ProblemSolving.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/eam/item-accounts/import" :importTemplateData="importTemplateData"
+    @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+  import download from '@/utils/download'
+  import { ProblemSolving, ProblemSolvingRules } from './problemSolving.data'
+  import * as ProblemSolvingApi from '@/api/eam/device/problemSolving'
+  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: 'ProblemSolving' })
+
+  const message = useMessage() // 消息弹窗
+  const { t } = useI18n() // 国际化
+
+  const route = useRoute() // 路由信息
+  const routeName = ref()
+  routeName.value = route.name
+  const tableColumns = ref(ProblemSolving.allSchemas.tableColumns)
+
+  // 查询页面返回
+  const searchTableSuccess = (formField, searchField, val, formRef) => {
+    nextTick(() => {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    })
+  }
+
+  // 字段设置 更新主列表字段
+  const updataTableColumns = (val) => {
+    tableColumns.value = val
+  }
+
+  const { tableObject, tableMethods } = useTable({
+    getListApi: ProblemSolvingApi.getProblemSolvingPage // 分页接口
+  })
+
+  // 获得表格的各种操作
+  const { getList, setSearchParams } = tableMethods
+
+  // 列表头部按钮
+  const HeadButttondata = [
+    defaultButtons.defaultAddBtn(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(null), // 编辑
+    defaultButtons.mainListDeleteBtn(null), // 删除
+  ]
+
+  // 列表-操作按钮事件
+  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)
+  }
+
+  // form表单提交
+  const formsSuccess = async (formType, data) => {
+    var isHave = ProblemSolving.allSchemas.formSchema.some(function (item) {
+      return item.field === 'activeTime' || item.field === 'expireTime';
+    });
+    if (isHave) {
+      if (data.activeTime && data.expireTime && data.activeTime >= data.expireTime) {
+        message.error('失效时间要大于生效时间')
+        return;
+      }
+    }
+    if (data.activeTime == 0) data.activeTime = null;
+    if (data.expireTime == 0) data.expireTime = null;
+    data.filePathList=[];
+    for (let i = 0; i < data.filePathListView.length; i++) {
+      data.filePathList.push(data.filePathListView[i].url);
+    }
+    if (formType === 'create') {
+      await ProblemSolvingApi.createProblemSolving(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ProblemSolvingApi.createProblemSolving(data)
+      message.success(t('common.updateSuccess'))
+    }
+    basicFormRef.value.dialogVisible = false
+    getList()
+  }
+
+  /** 详情操作 */
+  const detailRef = ref()
+  const openDetail = (row : any, titleName : any, titleValue : any) => {
+    detailRef.value.openDetail(row, titleName, titleValue, 'basicProblemSolving')
+  }
+
+  /** 删除按钮操作 */
+  const handleDelete = async (id : number) => {
+    try {
+      // 删除的二次确认
+      await message.delConfirm()
+      // 发起删除
+      await ProblemSolvingApi.deleteProblemSolving(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 ProblemSolvingApi.exportProblemSolving(tableObject.params)
+      download.excel(data, '备件台账.xlsx')
+    } catch {
+    } finally {
+      exportLoading.value = false
+    }
+  }
+
+  /** 导入 */
+  const importFormRef = ref()
+  const handleImport = () => {
+    importFormRef.value.open()
+  }
+  // 导入附件弹窗所需的参数
+  const importTemplateData = reactive({
+    templateUrl: '',
+    templateTitle: '备件台账导入模版.xlsx'
+  })
+  // 导入成功之后
+  const importSuccess = () => {
+    getList()
+  }
+
+  // 筛选提交
+  const searchFormClick = (searchData) => {
+    tableObject.params = {
+      isSearch: true,
+      filters: searchData.filters
+    }
+    getList() // 刷新当前列表
+  }
+
+  /** 初始化 **/
+  onMounted(async () => {
+    getList()
+    importTemplateData.templateUrl = await ProblemSolvingApi.importTemplate()
+  })
+</script>
diff --git a/src/views/eam/device/problemSolving/problemSolving.data.ts b/src/views/eam/device/problemSolving/problemSolving.data.ts
new file mode 100644
index 0000000..1302a63
--- /dev/null
+++ b/src/views/eam/device/problemSolving/problemSolving.data.ts
@@ -0,0 +1,83 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+  import { DeviceAccounts } from '@/views/eam/device/deviceAccounts/deviceAccounts.data'
+  import * as DeviceAccountsApi from '@/api/eam/device/deviceAccounts'
+
+// 表单校验
+export const ProblemSolvingRules = reactive({
+  itemNumber: [required],
+  areaNumber: [required],
+  concurrencyStamp: [required],
+})
+
+export const ProblemSolving = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '设备编号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择设备编号', // 输入框占位文本
+        searchField: 'number', // 查询弹窗赋值字段
+        searchTitle: '设备信息', // 查询弹窗标题
+        searchAllSchemas: DeviceAccounts.allSchemas, // 查询弹窗所需类
+        searchPage: DeviceAccountsApi.getDeviceAccountsPage, // 查询弹窗所需分页方法
+        searchCondition: [
+          {
+            key: 'available',
+            value: "TRUE",
+            isMainValue: false
+          }]
+      }
+    }
+  },
+  {
+    label: '文件',
+    field: 'filePathListView',
+    sort: 'custom',
+    isTable: false,
+    table: {
+    },
+    form: {
+      component: 'UploadFile',
+      componentProps: {
+
+      }
+    }
+  },
+  {
+    label: '文件',
+    field: 'filePathList',
+    sort: 'custom',
+    isTable: false,
+    isForm: false,
+    table: {
+    },
+    form: {
+      component: 'UploadFile',
+      componentProps: {
+  
+      }
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/eam/item/replaceItemDes/index.vue b/src/views/eam/item/replaceItemDes/index.vue
index a20890e..a949072 100644
--- a/src/views/eam/item/replaceItemDes/index.vue
+++ b/src/views/eam/item/replaceItemDes/index.vue
@@ -143,8 +143,8 @@
     if (data.activeTime == 0) data.activeTime = null;
     if (data.expireTime == 0) data.expireTime = null;
     data.filePathList=[];
-    for (let i = 0; i < data.filePathListView.length; i++) {
-      data.filePathList.push(data.filePathListView[i].url);
+    for (let i = 0; i < data.filePathList.length; i++) {
+      data.filePathList.push(data.filePathList[i].url);
     }
     if (formType === 'create') {
       await ReplaceItemDesApi.createReplaceItemDes(data)
diff --git a/src/views/eam/item/replaceItemDes/replaceItemDes.data.ts b/src/views/eam/item/replaceItemDes/replaceItemDes.data.ts
index 77def59..a3417af 100644
--- a/src/views/eam/item/replaceItemDes/replaceItemDes.data.ts
+++ b/src/views/eam/item/replaceItemDes/replaceItemDes.data.ts
@@ -35,32 +35,16 @@ export const ReplaceItemDes = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '文件',
-    field: 'filePathListView',
-    sort: 'custom',
-    isTable: false,
-    table: {
-    },
-    form: {
-      component: 'UploadFile',
-      componentProps: {
-
-      }
-    }
-  },
   {
     label: '文件',
     field: 'filePathList',
     sort: 'custom',
     isTable: false,
-    isForm: false,
     table: {
     },
     form: {
       component: 'UploadFile',
       componentProps: {
-  
       }
     }
   },