From 1dc5f2702369e2f73a635063c198dc3ac23bcf5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Wed, 13 Mar 2024 09:21:49 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"BUG=E4=BF=AE=E6=94=B9"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit e7ee5ce90d3a1f7f1d85333d17a5fc8d2d5091a4. --- .../deviceMaintenance.data.ts | 10 - .../eam/basic/inspection/inspection.data.ts | 10 - src/views/eam/basic/item/item.data.ts | 11 - src/views/eam/basic/location/location.data.ts | 11 - .../basic/locationArea/locationArea.data.ts | 10 - .../moldMaintenance/moldMaintenance.data.ts | 10 - src/views/eam/basic/supplier/supplier.data.ts | 11 - .../item/adjustRecord/adjustRecord.data.ts | 24 - .../applicationRecordMain.data.ts | 76 +-- .../eam/item/countRecord/countRecord.data.ts | 24 - .../countadjustWork/countadjustWork.data.ts | 12 - src/views/eam/item/itemAccounts/index.vue | 504 +++++++++--------- src/views/eam/item/itemApplyMain/index.vue | 6 - .../item/itemApplyMain/itemApplyMain.data.ts | 224 ++++---- 14 files changed, 412 insertions(+), 531 deletions(-) diff --git a/src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts b/src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts index f234cde..d248ef8 100644 --- a/src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts +++ b/src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts @@ -174,16 +174,6 @@ export const DeviceMaintenance = useCrudSchemas(reactive([ } } }, - { - label: '创建时间', - field: 'createTime', - sort: 'custom', - formatter: dateFormatter, - isForm: false, - table: { - width: 170 - }, - }, { label: '操作', field: 'action', diff --git a/src/views/eam/basic/inspection/inspection.data.ts b/src/views/eam/basic/inspection/inspection.data.ts index bc98bd3..6407f86 100644 --- a/src/views/eam/basic/inspection/inspection.data.ts +++ b/src/views/eam/basic/inspection/inspection.data.ts @@ -144,16 +144,6 @@ export const DeviceMoldItems = useCrudSchemas(reactive([ } } }, - { - label: '创建时间', - field: 'createTime', - sort: 'custom', - formatter: dateFormatter, - isForm: false, - table: { - width: 170 - }, - }, { label: '操作', field: 'action', diff --git a/src/views/eam/basic/item/item.data.ts b/src/views/eam/basic/item/item.data.ts index de8f673..ef3723c 100644 --- a/src/views/eam/basic/item/item.data.ts +++ b/src/views/eam/basic/item/item.data.ts @@ -1,5 +1,4 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' // 表单校验 export const ItemRules = reactive({ @@ -244,16 +243,6 @@ export const Item = useCrudSchemas(reactive([ } } }, - { - label: '创建时间', - field: 'createTime', - sort: 'custom', - formatter: dateFormatter, - isForm: false, - table: { - width: 170 - }, - }, { label: '描述', field: 'describes', diff --git a/src/views/eam/basic/location/location.data.ts b/src/views/eam/basic/location/location.data.ts index 2131184..d6259df 100644 --- a/src/views/eam/basic/location/location.data.ts +++ b/src/views/eam/basic/location/location.data.ts @@ -1,5 +1,4 @@ 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' @@ -122,16 +121,6 @@ export const Location = useCrudSchemas(reactive([ } } }, - { - label: '创建时间', - field: 'createTime', - sort: 'custom', - formatter: dateFormatter, - isForm: false, - table: { - width: 170 - }, - }, { label: '描述', field: 'description', diff --git a/src/views/eam/basic/locationArea/locationArea.data.ts b/src/views/eam/basic/locationArea/locationArea.data.ts index bd9f236..043b8aa 100644 --- a/src/views/eam/basic/locationArea/locationArea.data.ts +++ b/src/views/eam/basic/locationArea/locationArea.data.ts @@ -68,16 +68,6 @@ export const LocationArea = useCrudSchemas(reactive([ } } }, - { - label: '创建时间', - field: 'createTime', - sort: 'custom', - formatter: dateFormatter, - isForm: false, - table: { - width: 170 - }, - }, { label: '描述', diff --git a/src/views/eam/basic/moldMaintenance/moldMaintenance.data.ts b/src/views/eam/basic/moldMaintenance/moldMaintenance.data.ts index 89fc56e..007d025 100644 --- a/src/views/eam/basic/moldMaintenance/moldMaintenance.data.ts +++ b/src/views/eam/basic/moldMaintenance/moldMaintenance.data.ts @@ -147,16 +147,6 @@ export const MoldMaintenance = useCrudSchemas(reactive([ } } }, - { - label: '创建时间', - field: 'createTime', - sort: 'custom', - formatter: dateFormatter, - isForm: false, - table: { - width: 170 - }, - }, { label: '操作', field: 'action', diff --git a/src/views/eam/basic/supplier/supplier.data.ts b/src/views/eam/basic/supplier/supplier.data.ts index a59fa8a..d06aec8 100644 --- a/src/views/eam/basic/supplier/supplier.data.ts +++ b/src/views/eam/basic/supplier/supplier.data.ts @@ -1,5 +1,4 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' import {validateHanset,validateFax,validatePostCode,validateYS} from '@/utils/validator' // 表单校验 @@ -78,16 +77,6 @@ export const Supplier = useCrudSchemas(reactive([ } } }, - { - label: '创建时间', - field: 'createTime', - sort: 'custom', - formatter: dateFormatter, - isForm: false, - table: { - width: 170 - }, - }, { label: '备注', field: 'remark', diff --git a/src/views/eam/item/adjustRecord/adjustRecord.data.ts b/src/views/eam/item/adjustRecord/adjustRecord.data.ts index af5e7b2..fff1ebf 100644 --- a/src/views/eam/item/adjustRecord/adjustRecord.data.ts +++ b/src/views/eam/item/adjustRecord/adjustRecord.data.ts @@ -107,18 +107,6 @@ export const AdjustRecordDetail = useCrudSchemas(reactive([ table: { width: 180, }, - form: { - component: 'InputNumber', - componentProps: { - min: 0, - precision: 2 - } - }, - tableForm: { - type: 'InputNumber', - min: 0, - precision: 2 - } }, { label: '盘点数量', @@ -129,18 +117,6 @@ export const AdjustRecordDetail = useCrudSchemas(reactive([ table: { width: 180, }, - form: { - component: 'InputNumber', - componentProps: { - min: 0, - precision: 2 - } - }, - tableForm: { - type: 'InputNumber', - min: 0, - precision: 2 - } }, { label: '操作', diff --git a/src/views/eam/item/applicationRecord/applicationRecordMain.data.ts b/src/views/eam/item/applicationRecord/applicationRecordMain.data.ts index 0160659..c83aa89 100644 --- a/src/views/eam/item/applicationRecord/applicationRecordMain.data.ts +++ b/src/views/eam/item/applicationRecord/applicationRecordMain.data.ts @@ -63,16 +63,16 @@ export const ApplicationRecordMain = useCrudSchemas(reactive([ disabled: true } }, - { - label: '操作', - field: 'action', - isDetail: false, - isForm: false, - table: { - width: 200, - fixed: 'right' - } - } + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 200, + fixed: 'right' + } + } ])) //表单校验 @@ -152,8 +152,8 @@ export const ApplicationRecordDetail = useCrudSchemas(reactive([ disabled: false } }, - - + + { label: '设备/模具编号', field: 'deviceNumber', @@ -164,17 +164,17 @@ export const ApplicationRecordDetail = useCrudSchemas(reactive([ searchListPlaceholder: '请选择单号', searchField: 'number', searchTitle: '单号信息', - searchAllSchemas: DeviceMOLD.allSchemas, // 查询弹窗所需类 - searchPage: DeviceMoldItemsApi.getNumber, // 查询弹窗所需分页方法 + searchAllSchemas: DeviceMOLD.allSchemas, // 查询弹窗所需类 + searchPage: DeviceMoldItemsApi.getNumber, // 查询弹窗所需分页方法 searchCondition: [{ key: 'available', value: "TRUE", isMainValue: false }, { - key: 'type', - value: "type", - isMainValue: true - } + key: 'type', + value: "type", + isMainValue: true + } ] }, }, @@ -188,14 +188,14 @@ export const ApplicationRecordDetail = useCrudSchemas(reactive([ form: { component: 'InputNumber', componentProps: { - min: 0, - precision: 2 + min: 1, + precision: 6 } }, tableForm: { type: 'InputNumber', - min: 0, - precision: 2 + min: 1, + precision: 6 } }, { @@ -205,21 +205,21 @@ export const ApplicationRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, - form: { - component: 'InputNumber', - componentProps: { - min: 0, - precision: 2 - } - }, - tableForm: { - type: 'InputNumber', - min: 0, - precision: 2 - } + form: { + component: 'InputNumber', + componentProps: { + min: 1, + precision: 6 + } + }, + tableForm: { + type: 'InputNumber', + min: 1, + precision: 6 + } }, - - + + { label: '是否可用', field: 'available', @@ -236,8 +236,8 @@ export const ApplicationRecordDetail = useCrudSchemas(reactive([ disabled: true } }, - - + + { label: '是否以旧换新', field: 'isRadeIn', diff --git a/src/views/eam/item/countRecord/countRecord.data.ts b/src/views/eam/item/countRecord/countRecord.data.ts index d534c5e..9b5297a 100644 --- a/src/views/eam/item/countRecord/countRecord.data.ts +++ b/src/views/eam/item/countRecord/countRecord.data.ts @@ -147,18 +147,6 @@ export const CountRecordDetail = useCrudSchemas(reactive([ table: { width: 180, }, - form: { - component: 'InputNumber', - componentProps: { - min: 0, - precision: 2 - } - }, - tableForm: { - type: 'InputNumber', - min: 0, - precision: 2 - } }, { label: '盘点数量', @@ -169,18 +157,6 @@ export const CountRecordDetail = useCrudSchemas(reactive([ table: { width: 180, }, - form: { - component: 'InputNumber', - componentProps: { - min: 0, - precision: 2 - } - }, - tableForm: { - type: 'InputNumber', - min: 0, - precision: 2 - } }, { label: '操作', diff --git a/src/views/eam/item/countadjustWork/countadjustWork.data.ts b/src/views/eam/item/countadjustWork/countadjustWork.data.ts index 2453aa3..89aa3cb 100644 --- a/src/views/eam/item/countadjustWork/countadjustWork.data.ts +++ b/src/views/eam/item/countadjustWork/countadjustWork.data.ts @@ -118,18 +118,6 @@ export const CountJobDetail = useCrudSchemas(reactive([ table: { width: 180, }, - form: { - component: 'InputNumber', - componentProps: { - min: 0, - precision: 2 - } - }, - tableForm: { - type: 'InputNumber', - min: 0, - precision: 2 - } }, { label: '操作', diff --git a/src/views/eam/item/itemAccounts/index.vue b/src/views/eam/item/itemAccounts/index.vue index 6c9ae75..a1669bc 100644 --- a/src/views/eam/item/itemAccounts/index.vue +++ b/src/views/eam/item/itemAccounts/index.vue @@ -4,16 +4,29 @@ - - + + - + }" + v-model:pageSize="tableObject.pageSize" + v-model:currentPage="tableObject.currentPage" + v-model:sort="tableObject.sort" + > diff --git a/src/views/eam/item/itemApplyMain/index.vue b/src/views/eam/item/itemApplyMain/index.vue index 2d7bd1a..28798d6 100644 --- a/src/views/eam/item/itemApplyMain/index.vue +++ b/src/views/eam/item/itemApplyMain/index.vue @@ -261,12 +261,6 @@ 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')) diff --git a/src/views/eam/item/itemApplyMain/itemApplyMain.data.ts b/src/views/eam/item/itemApplyMain/itemApplyMain.data.ts index 848de51..f4cb95b 100644 --- a/src/views/eam/item/itemApplyMain/itemApplyMain.data.ts +++ b/src/views/eam/item/itemApplyMain/itemApplyMain.data.ts @@ -21,7 +21,7 @@ export const ItemApplyMain = useCrudSchemas(reactive([ fixed: 'left' }, }, - { + { label: '申领人', field: 'applyName', sort: 'custom', @@ -111,135 +111,135 @@ export const ItemApplyDetail = useCrudSchemas(reactive([ isInpuFocusShow: true, searchListPlaceholder: '请选择备件编号', searchField: 'number', - searchTitle: '备件信息', + searchTitle: '库区信息', searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类 searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法 searchCondition: [{ key: 'available', value: 'TRUE', isMainValue: false - }, + } ] }, }, - { - label: '类型', - field: 'type', - sort: 'custom', - dictType: DICT_TYPE.DEVICE_MOLD_TYPE, - dictClass: 'string', - isSearch: true, - isTable: true, - table: { - width: 150 - }, - tableForm: { - type: 'Select', - disabled: false - } - }, - - - { - label: '设备/模具编号', - field: 'deviceNumber', - sort: 'custom', - isSearch: true, - tableForm: { - isInpuFocusShow: true, - searchListPlaceholder: '请选择单号', - searchField: 'number', - searchTitle: '单号信息', - searchAllSchemas: DeviceMOLD.allSchemas, // 查询弹窗所需类 - searchPage: DeviceMoldItemsApi.getNumber, // 查询弹窗所需分页方法 - searchCondition: [{ - key: 'available', - value: "TRUE", - isMainValue: false - }, { - key: 'type', - value: "type", - isMainValue: true + { + label: '类型', + field: 'type', + sort: 'custom', + dictType: DICT_TYPE.DEVICE_MOLD_TYPE, + dictClass: 'string', + isSearch: true, + isTable: true, + table: { + width: 150 + }, + tableForm: { + type: 'Select', + disabled: false } - ] }, - }, - { - label: '申领数量', - field: 'qty', - sort: 'custom', - table: { - width: 150 + + + { + label: '设备/模具编号', + field: 'deviceNumber', + sort: 'custom', + isSearch: true, + tableForm: { + isInpuFocusShow: true, + searchListPlaceholder: '请选择单号', + searchField: 'number', + searchTitle: '单号信息', + searchAllSchemas: DeviceMOLD.allSchemas, // 查询弹窗所需类 + searchPage: DeviceMoldItemsApi.getNumber, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: "TRUE", + isMainValue: false + }, { + key: 'type', + value: "type", + isMainValue: true + } + ] + }, }, - form: { - component: 'InputNumber', - componentProps: { - min: 0, - precision: 2 + { + label: '申领数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 1, + precision: 6 + } + }, + tableForm: { + type: 'InputNumber', + min: 1, + precision: 6 } }, - tableForm: { - type: 'InputNumber', - min: 0, - precision: 2 - } - }, - { - label: '库存数量', - field: 'currentQty', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - componentProps: { - min: 0, - precision: 2 + { + label: '库存数量', + field: 'currentQty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 1, + precision: 6 + } + }, + tableForm: { + type: 'InputNumber', + min: 1, + precision: 6 } }, - tableForm: { - type: 'InputNumber', - min: 0, - precision: 2 - } - }, - - - { - label: '是否可用', - field: 'available', - sort: 'custom', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isSearch: true, - isTable: true, - table: { - width: 150 + + + { + label: '是否可用', + field: 'available', + sort: 'custom', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isSearch: true, + isTable: true, + table: { + width: 150 + }, + tableForm: { + type: 'Select', + disabled: true + } }, - tableForm: { - type: 'Select', - disabled: true - } - }, - - - { - label: '是否以旧换新', - field: 'isRadeIn', - sort: 'custom', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isSearch: true, - isTable: true, - table: { - width: 150 + + + { + label: '是否以旧换新', + field: 'isRadeIn', + sort: 'custom', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isSearch: true, + isTable: true, + table: { + width: 150 + }, + tableForm: { + type: 'Select', + disabled: true + } }, - tableForm: { - type: 'Select', - disabled: true - } - }, { label: '备注', field: 'remark',