Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWare...

payne

2024-04-25 75c4ec6f18f5ae2db91a22b034ecbadf25a7880c

Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse

 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;

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