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) }