From 5ac45f8506a9f96d0224aae9fce95d9b3654b584 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Fri, 24 Nov 2023 14:14:38 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=B8=9C=E9=98=B3=E4=B8=BB=E5=AD=90?=
 =?UTF-8?q?=E8=A1=A8=E3=80=91=E4=B8=BB=E5=AD=90=E8=A1=A8=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/addEditFromApiPop/index.vue    | 26 ++++++++++++-------
 .../src/components/currenButton/index.vue     |  1 -
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/WinIn.FasterZ.Wms.Fe/src/components/addEditFromApiPop/index.vue b/WinIn.FasterZ.Wms.Fe/src/components/addEditFromApiPop/index.vue
index 77381f44a..87911f2f4 100644
--- a/WinIn.FasterZ.Wms.Fe/src/components/addEditFromApiPop/index.vue
+++ b/WinIn.FasterZ.Wms.Fe/src/components/addEditFromApiPop/index.vue
@@ -272,6 +272,22 @@ export default {
             this.flexTableColumns.push(item)
           }
         })
+
+        // 子表-表单验证格式化
+        // todo:detailFormRules从配置文件格式化验证
+        // this.detailFormRules={}
+        // _detailDtos.forEach(item=>{
+        //   if(item.isRequired){
+        //     this.detailFormRules[item.prop] = [{ required: true, trigger: "blur", message: item.message }]
+        //   }
+        // })
+        this.detailFormRules = {
+          itemCode:[{ required: true, trigger: "blur", message: "不可为空" }],
+          rawQty:[
+            { required: true, trigger: "blur", message: "不可为空" },
+            { valid:(val)=>{return this.numberOverControl(val,1,20)}, trigger: "blur", message: "必须大于0，且小于等于20" }
+          ]
+        }
       }
 
       // 主表-表单验证格式化
@@ -281,16 +297,6 @@ export default {
           this.formRules[item.prop] = [{ required: true, trigger: "blur", message: "不可为空" }]
         }
       })
-
-      // 子表-表单验证格式化
-      // todo:detailFormRules从配置文件格式化
-      this.detailFormRules = {
-        itemCode:[{ required: true, trigger: "blur", message: "不可为空" }],
-        rawQty:[
-          { required: true, trigger: "blur", message: "不可为空" },
-          { valid:(val)=>{return this.numberOverControl(val,1,20)}, trigger: "blur", message: "必须大于0，且小于等于20" }
-        ]
-      }
     },
     // 判断是否存在子表
     isHaveDetail(){
diff --git a/WinIn.FasterZ.Wms.Fe/src/components/currenButton/index.vue b/WinIn.FasterZ.Wms.Fe/src/components/currenButton/index.vue
index 3f65acb65..40e53c9f1 100644
--- a/WinIn.FasterZ.Wms.Fe/src/components/currenButton/index.vue
+++ b/WinIn.FasterZ.Wms.Fe/src/components/currenButton/index.vue
@@ -67,7 +67,6 @@ export default {
       this.Butttondata.forEach(item=>{
         if(item.float && item.float == 'right'){
           this.buttonsRight.push(item)
-          console.log(70,this.buttonsRight)
         }else{
           this.buttonsLeft.push(item)
         }