From 4456f43c6c73185a9f7ce46cdcdf94ab2053f02e Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 07 5月 2025 14:19:43 +0800
Subject: [PATCH] 修改生成器及出入库记录页面
---
HIAWms/web/src/widgets/WmsInOutStockRecord/Controllers/WmsInOutStockRecordQueryDrawer.tsx | 111 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 69 insertions(+), 42 deletions(-)
diff --git a/HIAWms/web/src/widgets/WmsInOutStockRecord/Controllers/WmsInOutStockRecordQueryDrawer.tsx b/HIAWms/web/src/widgets/WmsInOutStockRecord/Controllers/WmsInOutStockRecordQueryDrawer.tsx
index 9407036..5c2295b 100644
--- a/HIAWms/web/src/widgets/WmsInOutStockRecord/Controllers/WmsInOutStockRecordQueryDrawer.tsx
+++ b/HIAWms/web/src/widgets/WmsInOutStockRecord/Controllers/WmsInOutStockRecordQueryDrawer.tsx
@@ -42,6 +42,29 @@
)
}
+ 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() {
@@ -100,8 +123,15 @@
{
label: '鎿嶄綔鏃堕棿',
prop: 'operateTime',
- type: 'datetimerange',
- el: 'date-picker',
+ el: (props: any, { attrs }: SetupContext) => {
+ return h(dateTimePickerRange, {
+ ...props,
+ clearable: true,
+ ...attrs,
+ })
+ },
+ width: '100%',
+ el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ユ搷浣滄椂闂�',
},
@@ -139,6 +169,29 @@
el: 'input',
//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%',
+ el: 'input',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏�',
},
])
/**
@@ -153,32 +206,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;
}
@@ -213,20 +254,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