From 1772504da433bec2f1695d47e5946c1192e876fb Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周二, 20 5月 2025 11:53:40 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Controllers/WmsMaterialStockDrawer.tsx | 37 +++++++++++++++++--------------------
1 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Controllers/WmsMaterialStockDrawer.tsx b/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Controllers/WmsMaterialStockDrawer.tsx
index 9371f4c..6a68ac0 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Controllers/WmsMaterialStockDrawer.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Controllers/WmsMaterialStockDrawer.tsx
@@ -68,35 +68,31 @@
const formItems = reactive([
// 鍩虹淇℃伅
{
- label: '鐗╂枡缂栧彿',
- prop: 'materialNo',
+ label: '鐗╂枡鍨嬪彿',
+ prop: 'materialModel',
el: 'input',
- placeholder: '璇疯緭鍏ョ墿鏂欑紪鍙�',
+ placeholder: '璇疯緭鍏ョ墿鏂欏瀷鍙�',
rules: [
- { required: true, message: '鐗╂枡缂栧彿涓嶈兘涓虹┖', trigger: 'blur' },
+ { required: true, message: '鐗╂枡鍨嬪彿涓嶈兘涓虹┖', trigger: 'blur' },
{ max: 50, message: '闀垮害涓嶈兘瓒呰繃50涓瓧绗�', trigger: 'blur' },
],
},
- {
- label: '鐗╂枡鍚嶇О',
- prop: 'materialName',
- el: 'input',
- placeholder: '璇疯緭鍏ョ墿鏂欏悕绉�',
- rules: [
- { required: true, message: '鐗╂枡鍚嶇О涓嶈兘涓虹┖', trigger: 'blur' },
- { max: 100, message: '闀垮害涓嶈兘瓒呰繃100涓瓧绗�', trigger: 'blur' },
- ],
- },
+ // {
+ // label: '鐗╂枡鍚嶇О',
+ // prop: 'materialName',
+ // el: 'input',
+ // placeholder: '璇疯緭鍏ョ墿鏂欏悕绉�',
+ // },
// 瀹瑰櫒淇℃伅
{
label: '瀹瑰櫒缂栧彿',
prop: 'containerNo',
el: 'input',
placeholder: '璇疯緭鍏ュ鍣ㄧ紪鍙�',
- rules: [
- { required: true, message: '鐗╂枡缂栧彿涓嶈兘涓虹┖', trigger: 'blur' },
- { max: 50, message: '闀垮害涓嶈兘瓒呰繃50涓瓧绗�', trigger: 'blur' },
- ],
+ // rules: [
+ // { required: true, message: '鐗╂枡缂栧彿涓嶈兘涓虹┖', trigger: 'blur' },
+ // { max: 50, message: '闀垮害涓嶈兘瓒呰繃50涓瓧绗�', trigger: 'blur' },
+ // ],
},
// 搴撳瓨淇℃伅
{
@@ -214,7 +210,7 @@
const onConfirm = async () => {
await formRef.value?.validate()
const data = {
- materialNo: formData.value.materialNo,
+ materialModel: formData.value.materialModel,
materialName: formData.value.materialName,
containerNo: formData.value.containerNo,
stockNumber: formData.value.stockNumber,
@@ -306,7 +302,7 @@
)
const res = data?.items[0]
formData.value = {
- materialNo: res.materialNo,
+ materialModel: res.materialModel,
materialName: res.materialName,
containerNo: res.containerNo,
stockNumber: res.stockNumber,
@@ -324,6 +320,7 @@
formData.value = {
isLock: 0,
emptyContainer: 0,
+ checkStatus: 2,
inStockTime: new Date(),
}
updateCheckData()
--
Gitblit v1.9.3