From 75c4ec6f18f5ae2db91a22b034ecbadf25a7880c Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周四, 25 4月 2024 12:35:56 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/System/CodeGen/CodeGenConfigService.cs | 2 +-
iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/Template/addForm.vue.vm | 30 ++++++++++++++++++++----------
2 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/System/CodeGen/CodeGenConfigService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/System/CodeGen/CodeGenConfigService.cs
index a1b23b9..2329610 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/System/CodeGen/CodeGenConfigService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/System/CodeGen/CodeGenConfigService.cs
@@ -159,7 +159,7 @@
codeGenConfig.WhetherTable = YesOrNo;
codeGenConfig.WhetherOrderBy = YesOrNo;
//鏄惁鑱斿悎涓婚敭 update by liuwq 20240418
- codeGenConfig.WhetherRequired = YesOrNot.N.ToString();
+ codeGenConfig.WhetherUnionKey = YesOrNot.N.ToString();
codeGenConfig.ColumnKey = tableColumn.ColumnKey;
codeGenConfig.DataType = tableColumn.DataType;
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/Template/addForm.vue.vm b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/Template/addForm.vue.vm
index c89c74c..8708b44 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/Template/addForm.vue.vm
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/Template/addForm.vue.vm
@@ -203,16 +203,26 @@
}
});
-@foreach (var column in Model.TableField){
-if (@column.DictTypeCode != ""){
-if (@column.EffectType == "select" || @column.EffectType == "radio" || @column.EffectType == "checkbox"){
- @:const @(@column.ColumnName)Option = this.$options
- @:this.@(@column.ColumnName)Data = @(@column.ColumnName)Option.filters['dictData']('@column.DictTypeCode')
-}
-}
-}
-@foreach (var column in Model.TableField){
-if(@column.EffectType == "fk" && @column.FkEntityName != "" && @column.FkColumnName != ""){
+ //鏂板鐨勬椂鍊欙紝璁剧疆鍒濆鍊�
+ this.$nextTick(() => {
+ this.form.setFieldsValue(
+ {
+ @foreach (var column in Model.TableField){
+if (@column.EffectType == "switch" && @column.WhetherRequired == "Y" ){
+ @:@(@column.ColumnName): false,
+ }}
+ })
+ });
+ @foreach (var column in Model.TableField){
+ if (@column.DictTypeCode != ""){
+ if (@column.EffectType == "select" || @column.EffectType == "radio" || @column.EffectType == "checkbox"){
+ @:const @(@column.ColumnName)Option = this.$options
+ @:this.@(@column.ColumnName)Data = @(@column.ColumnName)Option.filters['dictData']('@column.DictTypeCode')
+ }
+ }
+ }
+ @foreach (var column in Model.TableField){
+ if(@column.EffectType == "fk" && @column.FkEntityName != "" && @column.FkColumnName != ""){
@:this.@(@Model.ClassName)Fk@(@column.FkEntityName)List()
}
}
--
Gitblit v1.9.3