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,16 +26,9 @@
   </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" />
 
@@ -56,7 +36,8 @@
   <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">
@@ -323,5 +304,4 @@ 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
     }
   },