From f7a6b21f67d6b9fe9a8d675399ad861fc638ff12 Mon Sep 17 00:00:00 2001 From: zs <zhousong@weben-smart.com> Date: 周三, 07 5月 2025 16:10:36 +0800 Subject: [PATCH] 出入库记录 --- HIAWms/web/src/widgets/WmsInOutStockRecord/Controllers/WmsInOutStockRecordQueryDrawer.tsx | 113 +++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 71 insertions(+), 42 deletions(-) diff --git a/HIAWms/web/src/widgets/WmsInOutStockRecord/Controllers/WmsInOutStockRecordQueryDrawer.tsx b/HIAWms/web/src/widgets/WmsInOutStockRecord/Controllers/WmsInOutStockRecordQueryDrawer.tsx index f8e1bb1..55bb4ef 100644 --- a/HIAWms/web/src/widgets/WmsInOutStockRecord/Controllers/WmsInOutStockRecordQueryDrawer.tsx +++ b/HIAWms/web/src/widgets/WmsInOutStockRecord/Controllers/WmsInOutStockRecordQueryDrawer.tsx @@ -44,6 +44,30 @@ ) } + const datePickerRange = (attrs) => { + return ( + <el-date-picker + type="daterange" + value-format="YYYY-MM-DD HH:mm:ss" + start-placeholder="寮�濮嬫棩鏈�" + end-placeholder="缁撴潫鏃ユ湡" + {...attrs} + ></el-date-picker> + ) + } + + const dateTimePickerRange = (attrs) => { + return ( + <el-date-picker + type="datetimerange" + value-format="YYYY-MM-DD HH:mm:ss" + start-placeholder="寮�濮嬫棩鏈�" + end-placeholder="缁撴潫鏃ユ湡" + {...attrs} + ></el-date-picker> + ) + } + const visible = computed({ get() { return props.modelValue @@ -101,8 +125,14 @@ { label: '鎿嶄綔鏃堕棿', prop: 'operateTime', - type: 'datetimerange', - el: 'date-picker', + el: (props: any, { attrs }: SetupContext) => { + return h(dateTimePickerRange, { + ...props, + clearable: true, + ...attrs, + }) + }, + width: '100%', //disabled: disabled, placeholder: '璇疯緭鍏ユ搷浣滄椂闂�', }, @@ -141,6 +171,31 @@ //disabled: disabled, placeholder: '璇疯緭鍏ョ洰鏍囧簱浣�', }, + { + label: '鏄惁绂佺敤', + prop: 'isDisabled', + el: 'select', + //disabled: disabled, + placeholder: '璇疯緭鍏ユ槸鍚︾鐢�', + options: [ + { label: '鏄�', value: 'true' }, + { label: '鍚�', value: 'false' }, + ], + }, + { + label: '鍒涘缓鏃堕棿', + prop: 'creationTime', + el: (props: any, { attrs }: SetupContext) => { + return h(dateTimePickerRange, { + ...props, + clearable: true, + ...attrs, + }) + }, + width: '100%', + //disabled: disabled, + placeholder: '璇疯緭鍏�', + }, ]) /** * 鏍¢獙鏄惁鏈夋暟鎹彉鍖� @@ -154,32 +209,20 @@ } const commonGetFormData = () => { const data = { - OrderNo: formData.value.OrderNo, - MaterialName: formData.value.MaterialName, - MaterialNo: formData.value.MaterialNo, - StockType: formData.value.StockType, - ContainerNo: formData.value.ContainerNo, - MaterialModel: formData.value.MaterialModel, - OperateTime: formData.value.OperateTime, - Remark: formData.value.Remark, - MaterialId: formData.value.MaterialId, - TaskNo: formData.value.TaskNo, - SourcePlace: formData.value.SourcePlace, - ToPlace: formData.value.ToPlace, - materialCode: formData.value.materialCode, - materialName: formData.value.materialName, - purchaseType: formData.value.purchaseType, - materialType: formData.value.materialType, - primaryUnit: formData.value.primaryUnit, - standard: formData.value.standard, - outerDiameter: formData.value.outerDiameter, - wallThickness: formData.value.wallThickness, - materialQuality: formData.value.materialQuality, - length: formData.value.length, - isMainBranch: formData.value.isMainBranch, - factory: formData.value.factory, - certification: formData.value.certification, - remark: formData.value.remark, + orderNo: formData.value.orderNo || '', + materialName: formData.value.materialName || '', + materialNo: formData.value.materialNo || '', + stockType: formData.value.stockType || '', + containerNo: formData.value.containerNo || '', + materialModel: formData.value.materialModel || '', + operateTime: formData.value.operateTime || '', + remark: formData.value.remark || '', + materialId: formData.value.materialId || '', + taskNo: formData.value.taskNo || '', + sourcePlace: formData.value.sourcePlace || '', + toPlace: formData.value.toPlace || '', + isDisabled: formData.value.isDisabled || '', + creationTime: formData.value.creationTime || '', } return data } @@ -214,20 +257,6 @@ formData.value.TaskNo = '' formData.value.SourcePlace = '' formData.value.ToPlace = '' - formData.value.materialCode = '' - formData.value.materialName = '' - formData.value.purchaseType = '' - formData.value.materialType = '' - formData.value.primaryUnit = '' - formData.value.standard = '' - formData.value.outerDiameter = '' - formData.value.wallThickness = '' - formData.value.materialQuality = '' - formData.value.length = '' - formData.value.isMainBranch = '' - formData.value.factory = '' - formData.value.certification = '' - formData.value.remark = '' //鍚戠埗缁勪欢鍙戦�佽嚜瀹氫箟浜嬩欢 ctx.emit('restQuery') } -- Gitblit v1.9.3