BUG修改

src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts

@@ -174,6 +174,16 @@ export const DeviceMaintenance = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isForm: false,
+      table: {
+        width: 170
+      },
+    },
   {
     label: '操作',
     field: 'action',

src/views/eam/basic/inspection/inspection.data.ts

@@ -144,6 +144,16 @@ export const DeviceMoldItems = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+    table: {
+      width: 170
+    },
+  },
   {
     label: '操作',
     field: 'action',

src/views/eam/basic/item/item.data.ts

@@ -1,4 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
 
 // 表单校验
 export const ItemRules = reactive({
@@ -243,6 +244,16 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isForm: false,
+      table: {
+        width: 170
+      },
+    },
   {
     label: '描述',
     field: 'describes',

src/views/eam/basic/location/location.data.ts

@@ -1,4 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
 
 import * as LocationAreaApi from '@/api/eam/basic/locationArea'
 import { LocationArea } from '../locationArea/locationArea.data'
@@ -121,6 +122,16 @@ export const Location = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+      table: {
+        width: 170
+      },
+  },
   {
     label: '描述',
     field: 'description',

src/views/eam/basic/locationArea/locationArea.data.ts

@@ -68,6 +68,16 @@ export const LocationArea = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+      table: {
+        width: 170
+      },
+  },
 
   {
     label: '描述',

src/views/eam/basic/moldMaintenance/moldMaintenance.data.ts

@@ -147,6 +147,16 @@ export const MoldMaintenance = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isForm: false,
+      table: {
+        width: 170
+      },
+    },
   {
     label: '操作',
     field: 'action',

src/views/eam/basic/supplier/supplier.data.ts

@@ -1,4 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
 import {validateHanset,validateFax,validatePostCode,validateYS} from '@/utils/validator'
 
 // 表单校验
@@ -77,6 +78,16 @@ export const Supplier = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isForm: false,
+      table: {
+        width: 170
+      },
+    },
   {
     label: '备注',
     field: 'remark',

src/views/eam/item/adjustRecord/adjustRecord.data.ts

@@ -107,6 +107,18 @@ export const AdjustRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180,
     },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 2
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 2
+    }
   },
   {
     label: '盘点数量',
@@ -117,6 +129,18 @@ export const AdjustRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180,
     },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 2
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 2
+    }
   },
   {
     label: '操作',

src/views/eam/item/applicationRecord/applicationRecordMain.data.ts

@@ -188,14 +188,14 @@ export const ApplicationRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'InputNumber',
       componentProps: {
-        min: 1,
+        min: 0,
-        precision: 6
+        precision: 2
       }
     },
     tableForm: {
       type: 'InputNumber',
-      min: 1,
+      min: 0,
-      precision: 6
+      precision: 2
     }
   },
   {
@@ -208,14 +208,14 @@ export const ApplicationRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
    form: {
      component: 'InputNumber',
      componentProps: {
-        min: 1,
+       min: 0,
-        precision: 6
+       precision: 2
      }
    },
    tableForm: {
      type: 'InputNumber',
-      min: 1,
+     min: 0,
-      precision: 6
+     precision: 2
    }
   },
 

src/views/eam/item/countRecord/countRecord.data.ts

@@ -147,6 +147,18 @@ export const CountRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180,
     },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 2
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 2
+    }
   },
   {
     label: '盘点数量',
@@ -157,6 +169,18 @@ export const CountRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180,
     },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 2
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 2
+    }
   },
   {
     label: '操作',

src/views/eam/item/countadjustWork/countadjustWork.data.ts

@@ -118,6 +118,18 @@ export const CountJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180,
     },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 2
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 2
+    }
   },
   {
     label: '操作',

src/views/eam/item/itemAccounts/index.vue

@@ -5,28 +5,15 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-    <TableHead
+  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
-      :HeadButttondata="HeadButttondata"
+    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick" :allSchemas="ItemAccounts.allSchemas" />
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="ItemAccounts.allSchemas"
-    />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table
+    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
-      :columns="tableColumns"
-      :data="tableObject.tableList"
-      :loading="tableObject.loading"
-      :pagination="{
         total: tableObject.total
-      }"
+      }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
-      v-model:pageSize="tableObject.pageSize"
+      v-model:sort="tableObject.sort">
-      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,74 +26,68 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm
+  <BasicForm ref="basicFormRef" @success="formsSuccess" :rules="ItemAccountsRules"
-    ref="basicFormRef"
+    :formAllSchemas="ItemAccounts.allSchemas" :apiUpdate="ItemAccountsApi.updateItemAccounts"
-    @success="formsSuccess"
+    :apiCreate="ItemAccountsApi.createItemAccounts" @searchTableSuccess="searchTableSuccess" :isBusiness="false" />
-    :rules="ItemAccountsRules"
-    :formAllSchemas="ItemAccounts.allSchemas"
-    :apiUpdate="ItemAccountsApi.updateItemAccounts"
-    :apiCreate="ItemAccountsApi.createItemAccounts"
-    @searchTableSuccess="searchTableSuccess"
-    :isBusiness="false"
-  />
 
-<SearchTable ref="searchTableRef" @searchTableSuccess="submitItem" />
+  <SearchTable ref="searchTableRef" @searchTableSuccess="submitItem" />
 
   <!-- 详情 -->
   <Detail ref="detailRef" :isBasic="true" :allSchemas="ItemAccounts.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 download from '@/utils/download'
-import { ItemAccounts,ItemAccountsRules } from './itemAccounts.data'
+  import { ItemAccounts, ItemAccountsRules } from './itemAccounts.data'
-import * as ItemAccountsApi from '@/api/eam/item/itemAccounts'
+  import * as ItemAccountsApi from '@/api/eam/item/itemAccounts'
-import { Item } from '@/views/eam/basic/item/item.data'
+  import { Item } from '@/views/eam/basic/item/item.data'
-import * as ItemApi from '@/api/eam/basic/item'
+  import * as ItemApi from '@/api/eam/basic/item'
-import * as defaultButtons from '@/utils/disposition/defaultButtons'
+  import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import TableHead from '@/components/TableHead/src/TableHead.vue'
+  import TableHead from '@/components/TableHead/src/TableHead.vue'
-import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+  import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
+  import Detail from '@/components/Detail/src/Detail.vue'
-
+
-defineOptions({ name: 'ItemAccounts' })
+  defineOptions({ name: 'ItemAccounts' })
-
+
-const message = useMessage() // 消息弹窗
+  const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
+  const { t } = useI18n() // 国际化
-const route = useRoute() // 路由信息
+  const route = useRoute() // 路由信息
-const routeName = ref()
+  const routeName = ref()
-const locationNumber = ref()
+  const locationNumber = ref()
-const wantId1 = ref()
+  const wantId1 = ref()
-routeName.value = route.name
+  routeName.value = route.name
-const tableColumns = ref(ItemAccounts.allSchemas.tableColumns)
+  const tableColumns = ref(ItemAccounts.allSchemas.tableColumns)
-
+
-// 查询页面返回
+  // 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef) => {
+  const searchTableSuccess = (formField, searchField, val, formRef) => {
     nextTick(() => {
       const setV = {}
       setV[formField] = val[0][searchField]
       formRef.setValues(setV)
     })
-}
+  }
 
-// 字段设置 更新主列表字段
+  // 字段设置 更新主列表字段
-const updataTableColumns = (val) => {
+  const updataTableColumns = (val) => {
     tableColumns.value = val
-}
+  }
 
-const { tableObject, tableMethods } = useTable({
+  const { tableObject, tableMethods } = useTable({
     getListApi: ItemAccountsApi.getItemAccountsPage // 分页接口
-})
+  })
 
-// 获得表格的各种操作
+  // 获得表格的各种操作
-const { getList, setSearchParams } = tableMethods
+  const { getList, setSearchParams } = tableMethods
 
-// 列表头部按钮
+  // 列表头部按钮
-const HeadButttondata = [
+  const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'eam:itemAccounts:create'}), // 新增
+    defaultButtons.defaultAddBtn({ hasPermi: 'eam:itemAccounts:create' }), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'eam:itemAccounts:import'}), // 导入
+    defaultButtons.defaultImportBtn({ hasPermi: 'eam:itemAccounts:import' }), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'eam:itemAccounts:export'}), // 导出
+    defaultButtons.defaultExportBtn({ hasPermi: 'eam:itemAccounts:export' }), // 导出
     defaultButtons.defaultFreshBtn(null), // 刷新
     defaultButtons.defaultFilterBtn(null), // 筛选
     defaultButtons.defaultSetBtn(null), // 设置
@@ -118,10 +99,10 @@ const HeadButttondata = [
     //   icon: 'Select',
     //   color: ''
     // },
-]
+  ]
 
-// 头部按钮事件
+  // 头部按钮事件
-const buttonBaseClick = (val, item) => {
+  const buttonBaseClick = (val, item) => {
     if (val == 'add') { // 新增
       openForm('create')
     } else if (val == 'import') { // 导入
@@ -134,31 +115,31 @@ const buttonBaseClick = (val, item) => {
     } else { // 其他按钮
       console.log('其他按钮', item)
     }
-}
+  }
 
-// 列表-操作按钮
+  // 列表-操作按钮
-const butttondata = [
+  const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'eam:itemAccounts:update'}), // 编辑
+    defaultButtons.mainListEditBtn({ hasPermi: 'eam:itemAccounts:update' }), // 编辑
     defaultButtons.replaceLocation(null),  //更换库位
-  defaultButtons.mainListDeleteBtn({hasPermi:'eam:itemAccounts:delete'}), // 删除
+    defaultButtons.mainListDeleteBtn({ hasPermi: 'eam:itemAccounts:delete' }), // 删除
-]
+  ]
 
-// 列表-操作按钮事件
+  // 列表-操作按钮事件
-const buttonTableClick = async (val, row) => {
+  const buttonTableClick = async (val, row) => {
     if (val == 'edit') { // 编辑
       openForm('update', row)
     } else if (val == 'delete') { // 删除
       handleDelete(row.id)
     } else if (val == 'replaceLocation') {
-    openItem(row.locationNumber,row.id)
+      openItem(row.locationNumber, row.id)
+    }
   }
-}
 
-const searchTableRef = ref()
+  const searchTableRef = ref()
-/** 绑定备件操作 */
+  /** 绑定备件操作 */
-const openItem = async (number: String,wantId: number) => {
+  const openItem = async (number : String, wantId : number) => {
     locationNumber.value = number
-  wantId1.value= wantId
+    wantId1.value = wantId
     searchTableRef.value.open(
       '选择备件',
       Item.allSchemas,
@@ -171,9 +152,9 @@ const openItem = async (number: String,wantId: number) => {
       null,
       null
     )
-}
+  }
 
-const submitItem = async (formFieldRef, searchFieldRef, selections, typeRef, rowRef) => {
+  const submitItem = async (formFieldRef, searchFieldRef, selections, typeRef, rowRef) => {
     const deviceItemRelList = selections.map((element) => ({
       id: wantId1.value,
       locationNumber: locationNumber.value,
@@ -185,13 +166,13 @@ const submitItem = async (formFieldRef, searchFieldRef, selections, typeRef, row
       // 刷新列表
       getList()
     })
-}
+  }
 
-const getItemWithOutBind = async () => {
+  const getItemWithOutBind = async () => {
     try {
       const res = await ItemApi.getItemPage({
         ...Item.allSchemas.searchSchema,
-      available:"TRUE"
+        available: "TRUE"
 
       })
       if (res.list?.length > 0) {
@@ -210,10 +191,10 @@ const getItemWithOutBind = async () => {
       console.error(error)
       throw error // 抛出错误
     }
-}
+  }
 
-// 将 getListApi 替换为 getItemWithOutBind
+  // 将 getListApi 替换为 getItemWithOutBind
-const getDeviceItemList = async () => {
+  const getDeviceItemList = async () => {
     tableObject.loading = true
     try {
       const res = await getItemWithOutBind()
@@ -227,27 +208,27 @@ const getDeviceItemList = async () => {
     } finally {
       tableObject.loading = false
     }
-}
+  }
 
-/** 添加/修改操作 */
+  /** 添加/修改操作 */
-const basicFormRef = ref()
+  const basicFormRef = ref()
-const openForm = (type: string, row?: any) => {
+  const openForm = (type : string, row ?: any) => {
     basicFormRef.value.open(type, row)
-}
+  }
 
-// form表单提交
+  // form表单提交
-const formsSuccess = async (formType,data) => {
+  const formsSuccess = async (formType, data) => {
-  var isHave =ItemAccounts.allSchemas.formSchema.some(function (item) {
+    var isHave = ItemAccounts.allSchemas.formSchema.some(function (item) {
       return item.field === 'activeTime' || item.field === 'expireTime';
     });
-  if(isHave){
+    if (isHave) {
-    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      if (data.activeTime && data.expireTime && data.activeTime >= data.expireTime) {
         message.error('失效时间要大于生效时间')
         return;
       }
     }
-  if(data.activeTime==0)data.activeTime = null;
+    if (data.activeTime == 0) data.activeTime = null;
-  if(data.expireTime==0)data.expireTime = null;
+    if (data.expireTime == 0) data.expireTime = null;
     if (formType === 'create') {
       await ItemAccountsApi.createItemAccounts(data)
       message.success(t('common.createSuccess'))
@@ -257,16 +238,16 @@ const formsSuccess = async (formType,data) => {
     }
     basicFormRef.value.dialogVisible = false
     getList()
-}
+  }
 
-/** 详情操作 */
+  /** 详情操作 */
-const detailRef = ref()
+  const detailRef = ref()
-const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const openDetail = (row : any, titleName : any, titleValue : any) => {
     detailRef.value.openDetail(row, titleName, titleValue, 'basicItemAccounts')
-}
+  }
 
-/** 删除按钮操作 */
+  /** 删除按钮操作 */
-const handleDelete = async (id: number) => {
+  const handleDelete = async (id : number) => {
     try {
       // 删除的二次确认
       await message.delConfirm()
@@ -275,12 +256,12 @@ const handleDelete = async (id: number) => {
       message.success(t('common.delSuccess'))
       // 刷新列表
       await getList()
-  } catch {}
+    } catch { }
-}
+  }
 
-/** 导出按钮操作 */
+  /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
+  const exportLoading = ref(false) // 导出的加载中
-const handleExport = async () => {
+  const handleExport = async () => {
     try {
       // 导出的二次确认
       await message.exportConfirm()
@@ -292,36 +273,35 @@ const handleExport = async () => {
     } finally {
       exportLoading.value = false
     }
-}
+  }
 
-/** 导入 */
+  /** 导入 */
-const importFormRef = ref()
+  const importFormRef = ref()
-const handleImport = () => {
+  const handleImport = () => {
     importFormRef.value.open()
-}
+  }
-// 导入附件弹窗所需的参数
+  // 导入附件弹窗所需的参数
-const importTemplateData = reactive({
+  const importTemplateData = reactive({
     templateUrl: '',
     templateTitle: '备件台账导入模版.xlsx'
-})
+  })
-// 导入成功之后
+  // 导入成功之后
-const importSuccess = () => {
+  const importSuccess = () => {
     getList()
-}
+  }
 
-// 筛选提交
+  // 筛选提交
-const searchFormClick = (searchData) => {
+  const searchFormClick = (searchData) => {
     tableObject.params = {
       isSearch: true,
       filters: searchData.filters
     }
     getList() // 刷新当前列表
-}
+  }
 
-/** 初始化 **/
+  /** 初始化 **/
-onMounted(async () => {
+  onMounted(async () => {
     getList()
     importTemplateData.templateUrl = await ItemAccountsApi.importTemplate()
-})
+  })
-
 </script>

src/views/eam/item/itemApplyMain/index.vue

@@ -261,6 +261,12 @@
   const submitForm = async (formType, data) => {
     data.subList = tableData.value // 拼接子表数据参数
     try {
+      for (let item of tableData.value) {
+        if (item.qty > item.currentQty) {
+          message.error('要货计划数量不得大于订单数量-已计划数量')
+          return false;
+        }
+      }
       if (formType === 'create') {
         await ItemApplyMainApi.createItemApplyMain(data)
         message.success(t('common.createSuccess'))

src/views/eam/item/itemApplyMain/itemApplyMain.data.ts

@@ -111,14 +111,14 @@ export const ItemApplyDetail = useCrudSchemas(reactive<CrudSchema[]>([
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择备件编号',
       searchField: 'number',
-      searchTitle: '库区信息',
+      searchTitle: '备件信息',
       searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类
       searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法
       searchCondition: [{
         key: 'available',
         value: 'TRUE',
         isMainValue: false
-      }
+      },
       ]
     },
   },
@@ -174,14 +174,14 @@ export const ItemApplyDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'InputNumber',
       componentProps: {
-          min: 1,
+        min: 0,
-          precision: 6
+        precision: 2
       }
     },
     tableForm: {
       type: 'InputNumber',
-        min: 1,
+      min: 0,
-        precision: 6
+      precision: 2
     }
   },
   {
@@ -194,14 +194,14 @@ export const ItemApplyDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'InputNumber',
       componentProps: {
-          min: 1,
+        min: 0,
-          precision: 6
+        precision: 2
       }
     },
     tableForm: {
       type: 'InputNumber',
-        min: 1,
+      min: 0,
-        precision: 6
+      precision: 2
     }
   },