From 277609ae33b198900e926fe5246e778e0ce7fef2 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 08 5月 2025 18:44:39 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
HIAWms/hiawms_web/src/widgets/WmsInOutStockOrder/Controllers/WmsInOutStockOrderDrawer.tsx | 222 +++++++++++++++++++++++++++----------------------------
1 files changed, 108 insertions(+), 114 deletions(-)
diff --git a/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrder/Controllers/WmsInOutStockOrderDrawer.tsx b/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrder/Controllers/WmsInOutStockOrderDrawer.tsx
index a7e8f75..4ea7863 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrder/Controllers/WmsInOutStockOrderDrawer.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrder/Controllers/WmsInOutStockOrderDrawer.tsx
@@ -77,21 +77,52 @@
* 娣诲姞鐨刦orm瀛楁
*/
const formItems = reactive([
+ // {
+ // label: '鍗曟嵁缂栧彿',
+ // prop: 'orderNo',
+ // el: 'input',
+ // disabled: disabled,
+ // placeholder: '璇疯緭鍏ュ崟鎹紪鍙�',
+ // rules: [{ required: true, message: '鍗曟嵁缂栧彿涓嶈兘涓虹┖', trigger: 'blur' }],
+ // },
+ // {
+ // label: '鍗曟嵁鐘舵��',
+ // prop: 'orderStatus',
+ // el: 'select',
+ // disabled: disabled,
+ // placeholder: '璇疯緭鍏ュ崟鎹姸鎬�',
+ // rules: [{ required: true, message: '鍗曟嵁鐘舵�佷笉鑳戒负绌�', trigger: 'blur' }],
+ // },
+
{
- label: '鍗曟嵁缂栧彿',
- prop: 'orderNo',
- el: 'input',
- disabled: disabled,
- placeholder: '璇疯緭鍏ュ崟鎹紪鍙�',
- rules: [{ required: true, message: '鍗曟嵁缂栧彿涓嶈兘涓虹┖', trigger: 'blur' }],
- },
- {
- label: '鍗曟嵁鐘舵��',
- prop: 'orderStatus',
+ label: '鍗曟嵁绫诲瀷',
+ prop: 'orderType',
el: 'select',
disabled: disabled,
- placeholder: '璇疯緭鍏ュ崟鎹姸鎬�',
- rules: [{ required: true, message: '鍗曟嵁鐘舵�佷笉鑳戒负绌�', trigger: 'blur' }],
+ placeholder: '璇疯緭鍏ュ崟鎹被鍨�',
+ rules: [{ required: true, message: '鍗曟嵁绫诲瀷涓嶈兘涓虹┖', trigger: 'blur' }],
+ },
+ // {
+ // label: '鎿嶄綔绫诲瀷',
+ // prop: 'stockType',
+ // el: 'select',
+ // disabled: disabled,
+ // placeholder: '璇疯緭鍏ユ搷浣滅被鍨�',
+ // rules: [
+ // {
+ // required: true,
+ // message: '鎿嶄綔绫诲瀷涓嶈兘涓虹┖',
+ // trigger: 'blur',
+ // },
+ // ],
+ // },
+ {
+ label: '鐗╂枡缂栧彿',
+ prop: 'materialNo',
+ el: 'input',
+ disabled: disabled,
+ placeholder: '璇疯緭鍏ョ墿鏂欑紪鍙�',
+ rules: [{ required: true, message: '鐗╂枡缂栧彿涓嶈兘涓虹┖', trigger: 'blur' }],
},
{
label: '鐗╂枡鍚嶇О',
@@ -101,49 +132,12 @@
placeholder: '璇疯緭鍏ョ墿鏂欏悕绉�',
},
{
- label: '鐗╂枡浠跺彿',
- prop: 'materialNo',
- el: 'input',
- disabled: disabled,
- placeholder: '璇疯緭鍏ョ墿鏂欎欢鍙�',
- rules: [{ required: true, message: '鐗╂枡浠跺彿涓嶈兘涓虹┖', trigger: 'blur' }],
- },
- {
- label: '鍨嬪彿',
- prop: 'materialModel',
- el: 'input',
- disabled: disabled,
- placeholder: '璇疯緭鍏ュ瀷鍙�',
- },
- {
label: '鎵规鍙�',
prop: 'materialBatch',
el: 'input',
disabled: disabled,
placeholder: '璇疯緭鍏ユ壒娆″彿',
rules: [{ required: true, message: '鎵规鍙蜂笉鑳戒负绌�', trigger: 'blur' }],
- },
- {
- label: '鍗曟嵁绫诲瀷',
- prop: 'orderType',
- el: 'select',
- disabled: disabled,
- placeholder: '璇疯緭鍏ュ崟鎹被鍨�',
- rules: [{ required: true, message: '鍗曟嵁绫诲瀷涓嶈兘涓虹┖', trigger: 'blur' }],
- },
- {
- label: '鎿嶄綔绫诲瀷',
- prop: 'stockType',
- el: 'select',
- disabled: disabled,
- placeholder: '璇疯緭鍏ユ搷浣滅被鍨�',
- rules: [
- {
- required: true,
- message: '鎿嶄綔绫诲瀷涓嶈兘涓虹┖',
- trigger: 'blur',
- },
- ],
},
{
label: '鍗曟嵁鏁伴噺',
@@ -162,57 +156,57 @@
placeholder: '璇疯緭鍏ュ崟鎹暟閲�',
rules: [{ required: true, message: '鍗曟嵁鏁伴噺涓嶈兘涓虹┖', trigger: 'blur' }],
},
- {
- label: '涓嬪彂鏁伴噺',
- prop: 'distributeNumber',
- el: (props: any, { attrs }: SetupContext) => {
- return h(inputNumber, {
- ...props,
- clearable: true,
- ...attrs,
- })
- },
- width: '100%',
- step: 1,
- precision: 0,
- disabled: disabled,
- placeholder: '璇疯緭鍏ヤ笅鍙戞暟閲�',
- rules: [{ required: true, message: '涓嬪彂鏁伴噺涓嶈兘涓虹┖', trigger: 'blur' }],
- },
- {
- label: '瀹屾垚鏁伴噺',
- prop: 'completeNumber',
- el: (props: any, { attrs }: SetupContext) => {
- return h(inputNumber, {
- ...props,
- clearable: true,
- ...attrs,
- })
- },
- width: '100%',
- step: 1,
- precision: 0,
- disabled: disabled,
- placeholder: '璇疯緭鍏ュ畬鎴愭暟閲�',
- rules: [{ required: true, message: '瀹屾垚鏁伴噺涓嶈兘涓虹┖', trigger: 'blur' }],
- },
- {
- label: '浼樺厛绾�',
- prop: 'priority',
- el: (props: any, { attrs }: SetupContext) => {
- return h(inputNumber, {
- ...props,
- clearable: true,
- ...attrs,
- })
- },
- width: '100%',
- step: 1,
- precision: 0,
- //disabled: disabled,
- placeholder: '璇疯緭鍏ヤ紭鍏堢骇',
- rules: [{ required: true, message: '浼樺厛绾т笉鑳戒负绌�', trigger: 'blur' }],
- },
+ // {
+ // label: '涓嬪彂鏁伴噺',
+ // prop: 'distributeNumber',
+ // el: (props: any, { attrs }: SetupContext) => {
+ // return h(inputNumber, {
+ // ...props,
+ // clearable: true,
+ // ...attrs,
+ // })
+ // },
+ // width: '100%',
+ // step: 1,
+ // precision: 0,
+ // disabled: disabled,
+ // placeholder: '璇疯緭鍏ヤ笅鍙戞暟閲�',
+ // rules: [{ required: true, message: '涓嬪彂鏁伴噺涓嶈兘涓虹┖', trigger: 'blur' }],
+ // },
+ // {
+ // label: '瀹屾垚鏁伴噺',
+ // prop: 'completeNumber',
+ // el: (props: any, { attrs }: SetupContext) => {
+ // return h(inputNumber, {
+ // ...props,
+ // clearable: true,
+ // ...attrs,
+ // })
+ // },
+ // width: '100%',
+ // step: 1,
+ // precision: 0,
+ // disabled: disabled,
+ // placeholder: '璇疯緭鍏ュ畬鎴愭暟閲�',
+ // rules: [{ required: true, message: '瀹屾垚鏁伴噺涓嶈兘涓虹┖', trigger: 'blur' }],
+ // },
+ // {
+ // label: '浼樺厛绾�',
+ // prop: 'priority',
+ // el: (props: any, { attrs }: SetupContext) => {
+ // return h(inputNumber, {
+ // ...props,
+ // clearable: true,
+ // ...attrs,
+ // })
+ // },
+ // width: '100%',
+ // step: 1,
+ // precision: 0,
+ // //disabled: disabled,
+ // placeholder: '璇疯緭鍏ヤ紭鍏堢骇',
+ // rules: [{ required: true, message: '浼樺厛绾т笉鑳戒负绌�', trigger: 'blur' }],
+ // },
{
label: '鍏宠仈璁″垝缂栧彿',
prop: 'planNo',
@@ -220,20 +214,20 @@
disabled: disabled,
placeholder: '璇疯緭鍏ュ叧鑱旇鍒掔紪鍙�',
},
- {
- label: '鎿嶄綔鏃堕棿',
- prop: 'operateTime',
- el: (props: any, { attrs }: SetupContext) => {
- return h(dateTimePicker, {
- ...props,
- clearable: true,
- ...attrs,
- })
- },
- width: '100%',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ユ搷浣滄椂闂�',
- },
+ // {
+ // label: '鎿嶄綔鏃堕棿',
+ // prop: 'operateTime',
+ // el: (props: any, { attrs }: SetupContext) => {
+ // return h(dateTimePicker, {
+ // ...props,
+ // clearable: true,
+ // ...attrs,
+ // })
+ // },
+ // width: '100%',
+ // //disabled: disabled,
+ // placeholder: '璇疯緭鍏ユ搷浣滄椂闂�',
+ // },
{
label: '澶囨敞',
prop: 'remark',
--
Gitblit v1.9.3