From 04c789700ce58f904a31db36063e2b12bfd29ef6 Mon Sep 17 00:00:00 2001 From: chenfang Date: Wed, 31 Jan 2024 11:26:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=BF=90=E7=BB=93=E7=AE=97=E4=B8=8E?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BF=AE=E6=94=B9/=E7=A7=BB=E5=8A=A8tablefor?= =?UTF-8?q?m=E7=9A=84=E6=95=B0=E6=8D=AE=E5=94=AF=E4=B8=80=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturnRequestMain.data.ts | 11 ++++++++++- .../deliver/deliverRequestMain/index.vue | 9 +++++++++ .../inventorychangeRequestMain/index.vue | 9 +++++++++ .../inventorymove/inventorymoveRequestMain/index.vue | 9 +++++++++ 4 files changed, 37 insertions(+), 1 deletion(-) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index c54b29e97..d135c96e8 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter, formatDate } from '@/utils/formatTime' import * as getRequestsettingApi from '@/api/wms/requestsetting/index' import * as DeliverRecordMainApi from '@/api/wms/deliverRecordMain' @@ -21,6 +21,8 @@ import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' import * as CustomerreturnRequestApi from '@/api/wms/customerreturnRequestMain' const { t } = useI18n() // 国际化 +const dateTime = new Date().getTime() +console.log(dateTime); // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值 const queryParams = { @@ -84,6 +86,13 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false + }, + { + key: 'createTime', // 查询列表中字段 + value: dateTime - 30 * 24 * 60 * 60 * 1000 + "," + dateTime, // 指查询具体值 + action: 'betweeen', // 查询拼接条件 + isSearch: true, // 使用自定义拼接条件 + isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用 }] } } diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue index a825db894..d812509ca 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue @@ -470,6 +470,15 @@ const flag = ref(false) // 主子数据 提交 const submitForm = async (formType, data) => { data.subList = tableData.value // 拼接子表数据参数 + let isExist = false + tableData.value.forEach(item => { + let rs = tableData.value.filter(filterItem => (filterItem.itemCode == item.itemCode)) + if(rs.length > 1) isExist = true + }) + if (isExist) { + formRef.value.formLoading = false + return message.warning('物料代码重复') + } data.subList.forEach(obj => { if(obj.qty == 0){ message.warning(`数量不能为0!`) diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue index 5bb2a7ce4..517013206 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue @@ -392,6 +392,15 @@ const flag = ref() // 主子数据 提交 const submitForm = async (formType, data) => { data.subList = tableData.value // 拼接子表数据参数 + let isExist = false + tableData.value.forEach(item => { + let rs = tableData.value.filter(filterItem => (filterItem.packingNumber == item.packingNumber)) + if(rs.length > 1) isExist = true + }) + if (isExist) { + formRef.value.formLoading = false + return message.warning('包装号重复') + } data.subList.forEach(obj => { if(obj.toQty == 0){ message.error(`到数量不能为0!`) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index a90e3043b..b69e86e70 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -561,6 +561,15 @@ const flag = ref() // 主子数据 提交 const submitForm = async (formType, data) => { data.subList = tableData.value // 拼接子表数据参数 + let isExist = false + tableData.value.forEach(item => { + let rs = tableData.value.filter(filterItem => (filterItem.packingNumber == item.packingNumber)) + if(rs.length > 1) isExist = true + }) + if (isExist) { + formRef.value.formLoading = false + return message.warning('包装号重复') + } data.subList.forEach(item => { console.log(556565,item); if(fromInventoryStatus.value){