From a0a4d6e4ab7f10d8a2f5107a09fdf63ddeadb03e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Thu, 4 Jan 2024 13:46:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=87=E6=96=99=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../preparetoissueMain.data.ts | 3 + .../productionMain/productionMain.data.ts | 96 +++++++++---------- 2 files changed, 51 insertions(+), 48 deletions(-) diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts index c984c0959..7dc06c185 100644 --- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts +++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts @@ -691,4 +691,7 @@ export const PreparetoissueDetailRules = reactive({ remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], + dueTime: [ + { required: true, message: '请选择截止时间', trigger: 'change' } + ] }) \ No newline at end of file diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts index e10c5ed24..d7d235a94 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts @@ -162,7 +162,7 @@ export const ProductionMain = useCrudSchemas(reactive([ }, }, { - label: '开始日期', + label: '开始时间', field: 'beginTime', formatter: dateFormatter, detail: { @@ -183,7 +183,7 @@ export const ProductionMain = useCrudSchemas(reactive([ }, }, { - label: '结束日期', + label: '结束时间', field: 'endTime', formatter: dateFormatter, detail: { @@ -276,50 +276,50 @@ export const ProductionMain = useCrudSchemas(reactive([ }, isSearch: true, }, - { - label: '开始时间', - field: 'beginTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - style: {width: '100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - isForm: false, - }, - { - label: '结束时间', - field: 'endTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - style: {width: '100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - isForm: false, - }, + // { + // label: '开始时间', + // field: 'beginTime', + // formatter: dateFormatter, + // detail: { + // dateFormat: 'YYYY-MM-DD HH:mm:ss' + // }, + // sort: 'custom', + // table: { + // width: 180 + // }, + // form: { + // component: 'DatePicker', + // componentProps: { + // style: {width: '100%'}, + // type: 'datetime', + // dateFormat: 'YYYY-MM-DD HH:mm:ss', + // valueFormat: 'x', + // } + // }, + // isForm: false, + // }, + // { + // label: '结束时间', + // field: 'endTime', + // formatter: dateFormatter, + // detail: { + // dateFormat: 'YYYY-MM-DD HH:mm:ss' + // }, + // sort: 'custom', + // table: { + // width: 180 + // }, + // form: { + // component: 'DatePicker', + // componentProps: { + // style: {width: '100%'}, + // type: 'datetime', + // dateFormat: 'YYYY-MM-DD HH:mm:ss', + // valueFormat: 'x', + // } + // }, + // isForm: false, + // }, // { // label: '订单号', // field: 'woNumber', @@ -453,10 +453,10 @@ export const ProductionMainRules = reactive({ { required: true, message: '请选择状态', trigger: 'change' } ], beginTime: [ - { required: true, message: '请输入开始日期', trigger: 'blur' } + { required: true, message: '请输入开始时间', trigger: 'blur' } ], endTime: [ - { required: true, message: '请输入结束日期', trigger: 'blur' } + { required: true, message: '请输入结束时间', trigger: 'blur' } ], remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } From d4a578b263c1f8a74395a8d2048c20350754cb2c Mon Sep 17 00:00:00 2001 From: yejiaxing <591141169@qq.com> Date: Thu, 4 Jan 2024 13:48:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRequestMain.data.ts | 76 +++++++++++-------- 1 file changed, 44 insertions(+), 32 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index dfb44d260..ea651a5ee 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -13,7 +13,7 @@ import * as PurchaseMainApi from '@/api/wms/purchaseMain' import * as PurchaseDetailApi from '@/api/wms/purchaseDetail' import { PurchaseDetail, PurchaseMain } from '../purchaseMain/purchaseMain.data' import { PurchasePlanDetail, PurchasePlanMain } from '../purchasePlanMain/purchasePlanMain.data' -import {validateHanset,validateEmail} from '@/utils/validator' +import { validateHanset, validateEmail } from '@/utils/validator' // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值 const queryParams = { @@ -476,30 +476,30 @@ export const SupplierdeliverRequestMainRules = reactive({ ppNumber: [ { required: true, message: '请输入要货计划单号', trigger: 'blur' } ], - asnNumber: [ + asnNumber: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], - contactName: [ + contactName: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], - contactPhone: [ - { max: 50, message: '不得超过50个字符', trigger: 'blur' }, - { validator:validateHanset, message: '请输入正确的手机号', trigger: 'blur'} + contactPhone: [ + { max: 50, message: '不得超过50个字符', trigger: 'blur' }, + { validator: validateHanset, message: '请输入正确的手机号', trigger: 'blur' } ], - contactEmail: [ - { max: 50, message: '不得超过50个字符', trigger: 'blur' }, - { validator:validateEmail, message: '请输入正确的手机号', trigger: 'blur'} + contactEmail: [ + { max: 50, message: '不得超过50个字符', trigger: 'blur' }, + { validator: validateEmail, message: '请输入正确的手机号', trigger: 'blur' } ], - carrierCode: [ + carrierCode: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], - transferMode: [ + transferMode: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], - vehiclePlateNumber: [ + vehiclePlateNumber: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], - remark: [ + remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], planArriveTime: [ @@ -646,7 +646,14 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive