BUG修改

6 months ago · 0b3e7890c1
6 changed files with 500 additions and 3 deletions
--- a/src/api/eam/report/inventoryWarning/index.ts
+++ b/src/api/eam/report/inventoryWarning/index.ts
@ -0,0 +1,67 @@
+import request from '@/config/axios'
+
+export interface InventoryWarningVO {
+  id: number
+  number: string
+  name: string
+  specifications: string
+  uom: string
+  supplierName: string
+  brand: string
+  maxInventory: number
+  minInventory: number
+  nowInventory: number
+  procurementCycle: number
+  classification: string
+  usePlace: string
+  project: string
+  price: number
+  procureStatus: string
+  describes: string
+  deletionTime: Date
+  deleterId: string
+  extraProperties: string
+  concurrencyStamp: number
+  siteId: string
+}
+
+// 查询库存预警记录列表
+export const getInventoryWarningPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/record/inventory-warning/senior', data })
+  } else {
+    return await request.get({ url: `/record/inventory-warning/page`, params })
+  }
+}
+
+// 查询库存预警记录详情
+export const getInventoryWarning = async (id: number) => {
+  return await request.get({ url: `/record/inventory-warning/get?id=` + id })
+}
+
+// 新增库存预警记录
+export const createInventoryWarning = async (data: InventoryWarningVO) => {
+  return await request.post({ url: `/record/inventory-warning/create`, data })
+}
+
+// 修改库存预警记录
+export const updateInventoryWarning = async (data: InventoryWarningVO) => {
+  return await request.put({ url: `/record/inventory-warning/update`, data })
+}
+
+// 删除库存预警记录
+export const deleteInventoryWarning = async (id: number) => {
+  return await request.delete({ url: `/record/inventory-warning/delete?id=` + id })
+}
+
+// 导出库存预警记录 Excel
+export const exportInventoryWarning = async (params) => {
+  return await request.download({ url: `/record/inventory-warning/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/record/inventory-warning/get-import-template' })
+}
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@ -308,5 +308,7 @@ export enum DICT_TYPE {
  EQUIPMENT_INDEX_NAME = 'equipment_index_name',//设备年度目标指标名称分类字段
  SPECIAL_DEPT_ROLE = 'special_dept_role',
  ITEM_ACCOUNT_LOCATION_TYPE = "item_account_location_type",
+  PROCURE_STATUS = "procure_status",
+  
  
 }
--- a/src/views/eam/basic/location/index.vue
+++ b/src/views/eam/basic/location/index.vue
@ -59,7 +59,7 @@
  const tableColumns = ref(Location.allSchemas.tableColumns)
  const importFormRef = ref()
  const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
-  const src = ref(BASE_URL + '/jmreport/view/948743576290918400?token=' + getAccessToken())
+  const src = ref(BASE_URL + '/jmreport/view/952737529008816128?token=' + getAccessToken())

  // 查询页面返回
  const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
--- a/src/views/eam/report/inventoryWarning/index.vue
+++ b/src/views/eam/report/inventoryWarning/index.vue
@ -0,0 +1,242 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="InventoryWarning.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
+    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
+    :allSchemas="InventoryWarning.allSchemas" />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table :columns="tableColumns" :stripe="false" :row-style="tableRowClassName" :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="InventoryWarningRules"
+    :formAllSchemas="InventoryWarning.allSchemas" :apiUpdate="InventoryWarningApi.updateInventoryWarning"
+    :apiCreate="InventoryWarningApi.createInventoryWarning" @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false" />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="InventoryWarning.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/record/inventory-warning/import" :importTemplateData="importTemplateData"
+    @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+  import download from '@/utils/download'
+  import { InventoryWarning, InventoryWarningRules } from './inventoryWarning.data'
+  import * as InventoryWarningApi from '@/api/eam/report/inventoryWarning'
+  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: 'InventoryWarning' })
+
+  const message = useMessage() // 消息弹窗
+  const { t } = useI18n() // 国际化
+
+  const route = useRoute() // 路由信息
+  const routeName = ref()
+  routeName.value = route.name
+  const tableColumns = ref(InventoryWarning.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: InventoryWarningApi.getInventoryWarningPage // 分页接口
+  })
+
+  // 获得表格的各种操作
+  const { getList, setSearchParams } = tableMethods
+
+  // 列表头部按钮
+  const HeadButttondata = [
+    defaultButtons.defaultAddBtn({ hasPermi: 'eam:inventoryWarning:create' }), // 新增
+    defaultButtons.defaultImportBtn({ hasPermi: 'eam:inventoryWarning:import' }), // 导入
+    defaultButtons.defaultExportBtn({ hasPermi: 'eam:inventoryWarning:export' }), // 导出
+    defaultButtons.defaultFreshBtn(null), // 刷新
+    defaultButtons.defaultFilterBtn(null), // 筛选
+    defaultButtons.defaultSetBtn(null), // 设置
+    // {
+    //   label: '自定义扩展按钮',
+    //   name: 'zdy',
+    //   hide: false,
+    //   type: 'primary',
+    //   icon: 'Select',
+    //   color: ''
+    // },
+  ]
+
+  // 头部按钮事件
+  const buttonBaseClick = (val, item) => {
+    if (val == 'add') { // 新增
+      openForm('create')
+    } else if (val == 'import') { // 导入
+      handleImport()
+    } else if (val == 'export') { // 导出
+      handleExport()
+    } else if (val == 'refresh') { // 刷新
+      getList()
+    } else if (val == 'filtrate') { // 筛选
+    } else { // 其他按钮
+      console.log('其他按钮', item)
+    }
+  }
+
+  // 列表-操作按钮
+  const butttondata = [
+    defaultButtons.mainListEditBtn(null), // 编辑
+    defaultButtons.mainListDeleteBtn({ hasPermi: 'eam:inventoryWarning: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)
+  }
+
+  // form表单提交
+  const formsSuccess = async (formType, data) => {
+    var isHave = InventoryWarning.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 InventoryWarningApi.createInventoryWarning(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await InventoryWarningApi.updateInventoryWarning(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, 'basicInventoryWarning')
+  }
+
+  /** 删除按钮操作 */
+  const handleDelete = async (id : number) => {
+    try {
+      // 删除的二次确认
+      await message.delConfirm()
+      // 发起删除
+      await InventoryWarningApi.deleteInventoryWarning(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 InventoryWarningApi.exportInventoryWarning(tableObject.params)
+      download.excel(data, '库存预警记录.xlsx')
+    } catch {
+    } finally {
+      exportLoading.value = false
+    }
+  }
+
+  function tableRowClassName({ row, rowIndex }) {
+    console.log(row.classification);
+    if (row.classification == 'A') {
+      return {
+        background: 'red !important'
+      };
+    }
+    if (row.classification == 'B') {
+      return {
+        background: 'yellow !important'
+      };
+    }
+    return '';
+  }
+
+  /** 导入 */
+  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 InventoryWarningApi.importTemplate()
+  })
+</script>
--- a/src/views/eam/report/inventoryWarning/inventoryWarning.data.ts
+++ b/src/views/eam/report/inventoryWarning/inventoryWarning.data.ts
@ -0,0 +1,186 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const InventoryWarningRules = reactive({
+  number: [required],
+  procureStatus: [required],
+  concurrencyStamp: [required],
+})
+
+export const InventoryWarning = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '备件编码',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false,
+    table: {
+      width: 180,
+    },
+  },
+  {
+    label: '备件名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false,
+    table: {
+      width: 110,
+    },
+  },
+  {
+    label: '规格型号',
+    field: 'specifications',
+    sort: 'custom',
+    isSearch: false,
+    isForm: false,
+    table: {
+      width: 110,
+    },
+  },
+  {
+    label: '单位',
+    field: 'uom',
+    sort: 'custom',
+    isSearch: false,
+    isForm: false,
+    table: {
+      width: 110,
+    },
+  },
+  {
+    label: '供应商名称',
+    field: 'supplierName',
+    sort: 'custom',
+    isSearch: false,
+    isForm: false,
+    table: {
+      width: 110,
+    },
+  },
+  {
+    label: '生产厂家',
+    field: 'brand',
+    sort: 'custom',
+    isSearch: false,
+    isForm: false,
+    table: {
+      width: 110,
+    },
+  },
+  {
+    label: '最高库存',
+    field: 'maxInventory',
+    sort: 'custom',
+    isSearch: false,
+    isForm: false,
+    table: {
+      width: 110,
+    },
+  },
+  {
+    label: '最低库存',
+    field: 'minInventory',
+    sort: 'custom',
+    isSearch: false,
+    isForm: false,
+    table: {
+      width: 110,
+    },
+  },
+  {
+    label: '最低库存',
+    field: 'nowInventory',
+    sort: 'custom',
+    isSearch: false,
+    isForm: false,
+    table: {
+      width: 110,
+    },
+  },
+  {
+    label: '采购周期（周）',
+    field: 'procurementCycle',
+    sort: 'custom',
+    isSearch: false,
+    isForm: false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: 'ABC分类',
+    field: 'classification',
+    sort: 'custom',
+    isSearch: false,
+    isForm: false,
+  },
+  {
+    label: '使用地点',
+    field: 'usePlace',
+    sort: 'custom',
+    isSearch: false,
+    isForm: false,
+  },
+  {
+    label: '项目',
+    field: 'project',
+    sort: 'custom',
+    isSearch: false,
+    isForm: false,
+  },
+  {
+    label: '价格',
+    field: 'price',
+    sort: 'custom',
+    isSearch: false,
+    isForm: false,
+  },
+  {
+    label: '采购状态分类',
+    field: 'procureStatus',
+    sort: 'custom',
+    dictType: DICT_TYPE.PROCURE_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    table: {
+      width: 100
+    },
+  },
+  {
+    label: '备注',
+    field: 'describes',
+    sort: 'custom',
+    isSearch: false,
+    isForm: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    isForm: false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
--- a/src/views/eam/report/itemWarning/itemWarning.data.ts
+++ b/src/views/eam/report/itemWarning/itemWarning.data.ts
@ -21,7 +21,7 @@ export const ItemRules = reactive({

 export const Item = useCrudSchemas(reactive<CrudSchema[]>([
  {
-    label: '零件编码',
+    label: '备件编码',
    field: 'number',
    sort: 'custom',
    isSearch: true,
@ -30,7 +30,7 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
    },
  },
  {
-    label: '零件名称',
+    label: '备件名称',
    field: 'name',
    sort: 'custom',
    isSearch: true,