From a5f8fddd87fa10c08116b2033b5c2d174d4087fc Mon Sep 17 00:00:00 2001 From: zengchenxi Date: Thu, 8 Aug 2024 16:49:55 +0800 Subject: [PATCH] month --- .../jnpf/entity/YysBillMaterialEntity.java | 2 +- .../jnpf/entity/YysUnitInformationEntity.java | 2 +- .../YysBillMaterialConstant.java | 2 +- .../yysbillmaterial/YysBillMaterialForm.java | 2 +- .../YysUnitInformationConstant.java | 2 +- .../YysUnitInformationForm.java | 2 +- .../src/views/yys/yysbillmaterial/Detail.vue | 251 +++--- .../src/views/yys/yysbillmaterial/form.vue | 809 +++++++++--------- .../src/views/yys/yysbillmaterial/index.vue | 2 + .../yys/yyssupplierinformation/Detail.vue | 199 +++-- .../views/yys/yyssupplierinformation/form.vue | 11 +- .../yys/yyssupplierinformation/index.vue | 2 + .../views/yys/yysunitinformation/Detail.vue | 6 +- .../src/views/yys/yysunitinformation/form.vue | 10 +- .../views/yys/yysunitinformation/index.vue | 750 ++++++++-------- 15 files changed, 1033 insertions(+), 1019 deletions(-) diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/YysBillMaterialEntity.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/YysBillMaterialEntity.java index 5673a83..7e924f9 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/YysBillMaterialEntity.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/YysBillMaterialEntity.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.util.Date; /** - * + * * * @版本： V3.5 * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/YysUnitInformationEntity.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/YysUnitInformationEntity.java index a7b5ef1..4e13966 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/YysUnitInformationEntity.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/YysUnitInformationEntity.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.util.Date; /** - * + * * * @版本： V3.5 * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysbillmaterial/YysBillMaterialConstant.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysbillmaterial/YysBillMaterialConstant.java index 29be7d3..1be4621 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysbillmaterial/YysBillMaterialConstant.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysbillmaterial/YysBillMaterialConstant.java @@ -21,7 +21,7 @@ public class YysBillMaterialConstant{ /** 整个表单配置json */ public static final String getFormData(){ StringBuilder sb = new StringBuilder(); -sb.append("{\"popupType\":\"general\",\"idGlobal\":109,\"formBtns\":false,\"labelWidth\":100,\"classNames\":[],\"className\":[],\"fullScreenWidth\":\"100%\",\"hasConfirmAndAddBtn\":true,\"labelPosition\":\"right\",\"printId\":\"\",\"disabled\":false,\"formModel\":\"dataForm\",\"cancelButtonText\":\"取 消\",\"confirmButtonText\":\"确 定\",\"hasCancelBtn\":true,\"primaryKeyPolicy\":1,\"confirmAndAddText\":\"确定并继续操作\",\"hasPrintBtn\":false,\"concurrencyLock\":false,\"classJson\":\"\",\"drawerWidth\":\"600px\",\"printButtonText\":\"打 印\",\"formRef\":\"formRef\",\"gutter\":15,\"logicalDelete\":false,\"size\":\"small\",\"formRules\":\"rules\",\"generalWidth\":\"600px\",\"hasConfirmBtn\":true,\"formStyle\":\"\",\"fields\":[{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"母件编码\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_bill_material\",\"renderKey\":1723100412530,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"pieceId\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":102,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"母件名称\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_bill_material\",\"renderKey\":1723100412763,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"pieceName\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":103,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"规格型号\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_bill_material\",\"renderKey\":1723100413069,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"models\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":104,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"计量单位\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_bill_material\",\"renderKey\":1723100413417,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"unit\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":105,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"版本代号\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_bill_material\",\"renderKey\":1723100413745,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"versionCode\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":106,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"版本说明\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_bill_material\",\"renderKey\":1723100414081,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"versionIllustrate\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":107,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"版本日期\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_bill_material\",\"renderKey\":1723100414399,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"versionDate\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":109,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"创建时间\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_bill_material\",\"renderKey\":1723102851119,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"creatorTime\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":108,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"单据状态\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_bill_material\",\"renderKey\":1723100414752,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"documentStatus\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"}],\"span\":24}"); return sb.toString(); +sb.append("{\"popupType\":\"general\",\"idGlobal\":112,\"formBtns\":false,\"labelWidth\":100,\"classNames\":[],\"className\":[],\"fullScreenWidth\":\"100%\",\"hasConfirmAndAddBtn\":true,\"labelPosition\":\"right\",\"printId\":\"\",\"disabled\":false,\"formModel\":\"dataForm\",\"cancelButtonText\":\"取 消\",\"confirmButtonText\":\"确 定\",\"hasCancelBtn\":true,\"primaryKeyPolicy\":1,\"confirmAndAddText\":\"确定并继续操作\",\"hasPrintBtn\":false,\"concurrencyLock\":false,\"classJson\":\"\",\"drawerWidth\":\"600px\",\"printButtonText\":\"打 印\",\"formRef\":\"formRef\",\"gutter\":15,\"logicalDelete\":false,\"size\":\"small\",\"formRules\":\"rules\",\"generalWidth\":\"600px\",\"hasConfirmBtn\":true,\"formStyle\":\"\",\"fields\":[{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"母件编码\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_bill_material\",\"renderKey\":1723100412530,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"pieceId\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":102,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"母件名称\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_bill_material\",\"renderKey\":1723100412763,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"pieceName\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":103,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"规格型号\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_bill_material\",\"renderKey\":1723100413069,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"models\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":104,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"计量单位\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_bill_material\",\"renderKey\":1723100413417,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"unit\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":105,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"版本代号\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_bill_material\",\"renderKey\":1723100413745,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"versionCode\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":106,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"版本说明\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_bill_material\",\"renderKey\":1723100414081,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"versionIllustrate\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":false,\"tableName\":\"yys_bill_material\",\"renderKey\":1723105581799,\"tagIcon\":\"icon-ym icon-ym-generator-date\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfDatePicker\",\"formId\":110,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"datePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"版本日期\",\"startTimeRule\":false,\"startTimeValue\":\"\",\"trigger\":\"change\",\"endTimeValue\":\"\",\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":24},\"readonly\":false,\"format\":\"yyyy-MM-dd\",\"__vModel__\":\"versionDate\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择\",\"type\":\"date\"},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":false,\"tableName\":\"yys_bill_material\",\"renderKey\":1723105582166,\"tagIcon\":\"icon-ym icon-ym-generator-date\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfDatePicker\",\"formId\":111,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"datePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"创建时间\",\"startTimeRule\":false,\"startTimeValue\":\"\",\"trigger\":\"change\",\"endTimeValue\":\"\",\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":24},\"readonly\":false,\"format\":\"yyyy-MM-dd HH:mm:ss\",\"__vModel__\":\"creatorTime\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择\",\"type\":\"datetime\"},{\"filterable\":false,\"clearable\":true,\"__config__\":{\"formId\":112,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"2\",\"noShow\":false,\"dataType\":\"static\",\"dictionaryType\":\"\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"单据状态\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":false,\"tableName\":\"yys_bill_material\",\"renderKey\":1723105587320,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":24},\"options\":[{\"fullName\":\"已审核\",\"id\":\"1\"},{\"fullName\":\"未审核\",\"id\":\"2\"}],\"multiple\":false,\"__vModel__\":\"documentStatus\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"}}],\"span\":24}"); return sb.toString(); } /** 列表字段配置json */ public static final String getColumnData(){ diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysbillmaterial/YysBillMaterialForm.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysbillmaterial/YysBillMaterialForm.java index fb40bd6..ab99c19 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysbillmaterial/YysBillMaterialForm.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysbillmaterial/YysBillMaterialForm.java @@ -43,5 +43,5 @@ public class YysBillMaterialForm { private String creatorTime; /** 单据状态 **/ @JsonProperty("documentStatus") - private String documentStatus; + private Object documentStatus; } diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysunitinformation/YysUnitInformationConstant.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysunitinformation/YysUnitInformationConstant.java index aae09b0..eef0e5c 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysunitinformation/YysUnitInformationConstant.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysunitinformation/YysUnitInformationConstant.java @@ -21,7 +21,7 @@ public class YysUnitInformationConstant{ /** 整个表单配置json */ public static final String getFormData(){ StringBuilder sb = new StringBuilder(); -sb.append("{\"popupType\":\"general\",\"idGlobal\":103,\"formBtns\":false,\"labelWidth\":100,\"classNames\":[],\"className\":[],\"fullScreenWidth\":\"100%\",\"hasConfirmAndAddBtn\":true,\"labelPosition\":\"right\",\"printId\":\"\",\"disabled\":false,\"formModel\":\"dataForm\",\"cancelButtonText\":\"取 消\",\"confirmButtonText\":\"确 定\",\"hasCancelBtn\":true,\"primaryKeyPolicy\":1,\"confirmAndAddText\":\"确定并继续操作\",\"hasPrintBtn\":false,\"concurrencyLock\":false,\"classJson\":\"\",\"drawerWidth\":\"600px\",\"printButtonText\":\"打 印\",\"formRef\":\"formRef\",\"gutter\":15,\"logicalDelete\":false,\"size\":\"small\",\"formRules\":\"rules\",\"generalWidth\":\"600px\",\"hasConfirmBtn\":true,\"formStyle\":\"\",\"fields\":[{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"单位编码\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_unit_information\",\"renderKey\":1723102213960,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"unitId\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":102,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"单位名称\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_unit_information\",\"renderKey\":1723102214103,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"unitName\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":103,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"启用状态\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_unit_information\",\"renderKey\":1723102214513,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"enableStatus\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"}],\"span\":24}"); return sb.toString(); +sb.append("{\"popupType\":\"general\",\"idGlobal\":104,\"formBtns\":false,\"labelWidth\":100,\"classNames\":[],\"className\":[],\"fullScreenWidth\":\"100%\",\"hasConfirmAndAddBtn\":true,\"labelPosition\":\"right\",\"printId\":\"\",\"disabled\":false,\"formModel\":\"dataForm\",\"cancelButtonText\":\"取 消\",\"confirmButtonText\":\"确 定\",\"hasCancelBtn\":true,\"primaryKeyPolicy\":1,\"confirmAndAddText\":\"确定并继续操作\",\"hasPrintBtn\":false,\"concurrencyLock\":false,\"classJson\":\"\",\"drawerWidth\":\"600px\",\"printButtonText\":\"打 印\",\"formRef\":\"formRef\",\"gutter\":15,\"logicalDelete\":false,\"size\":\"small\",\"formRules\":\"rules\",\"generalWidth\":\"600px\",\"hasConfirmBtn\":true,\"formStyle\":\"\",\"fields\":[{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"单位编码\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_unit_information\",\"renderKey\":1723102213960,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"unitId\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":102,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"单位名称\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_unit_information\",\"renderKey\":1723102214103,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"unitName\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"filterable\":false,\"clearable\":true,\"__config__\":{\"formId\":104,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"1\",\"noShow\":false,\"dataType\":\"static\",\"dictionaryType\":\"\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"启用状态\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":false,\"tableName\":\"yys_unit_information\",\"renderKey\":1723106784894,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":24},\"options\":[{\"fullName\":\"启用\",\"id\":\"1\"},{\"fullName\":\"禁用\",\"id\":\"2\"}],\"multiple\":false,\"__vModel__\":\"enableStatus\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"}}],\"span\":24}"); return sb.toString(); } /** 列表字段配置json */ public static final String getColumnData(){ diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysunitinformation/YysUnitInformationForm.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysunitinformation/YysUnitInformationForm.java index b329a4b..59aa0ca 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysunitinformation/YysUnitInformationForm.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysunitinformation/YysUnitInformationForm.java @@ -25,5 +25,5 @@ public class YysUnitInformationForm { private String unitName; /** 启用状态 **/ @JsonProperty("enableStatus") - private String enableStatus; + private Object enableStatus; } diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysbillmaterial/Detail.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysbillmaterial/Detail.vue index 0134be5..7eb7794 100644 --- a/jnpf-java-boot/jnpf-web/src/views/yys/yysbillmaterial/Detail.vue +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysbillmaterial/Detail.vue @@ -1,147 +1,138 @@ diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysbillmaterial/form.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysbillmaterial/form.vue index 7561972..38df512 100644 --- a/jnpf-java-boot/jnpf-web/src/views/yys/yysbillmaterial/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysbillmaterial/form.vue @@ -1,124 +1,117 @@ + diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysbillmaterial/index.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysbillmaterial/index.vue index a8b51f7..3914566 100644 --- a/jnpf-java-boot/jnpf-web/src/views/yys/yysbillmaterial/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysbillmaterial/index.vue @@ -160,6 +160,8 @@ export default { flowListVisible: false, flowList: [], exportBoxVisible: false, + documentStatusOptions: [{ "fullName": "已审核", "id": "1" }, { "fullName": "未审核", "id": "2" }], + documentStatusProps: { "label": "fullName", "value": "id" }, interfaceRes: { }, } diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yyssupplierinformation/Detail.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yyssupplierinformation/Detail.vue index cb85221..992a8c9 100644 --- a/jnpf-java-boot/jnpf-web/src/views/yys/yyssupplierinformation/Detail.vue +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yyssupplierinformation/Detail.vue @@ -1,119 +1,114 @@ diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yyssupplierinformation/form.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yyssupplierinformation/form.vue index 37bec45..a09bf19 100644 --- a/jnpf-java-boot/jnpf-web/src/views/yys/yyssupplierinformation/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yyssupplierinformation/form.vue @@ -37,9 +37,10 @@ - - + + @@ -110,12 +111,14 @@ export default { supplierSname: undefined, supplierCname: undefined, supplierClassification: undefined, - enableStatus: undefined, + enableStatus: 2, }, tableRequiredData: {}, dataRule: { }, + enableStatusOptions: [{ "fullName": "启用", "id": "1" }, { "fullName": "禁用", "id": "2" }], + enableStatusProps: { "label": "fullName", "value": "id" }, childIndex: -1, isEdit: false, interfaceRes: { diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yyssupplierinformation/index.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yyssupplierinformation/index.vue index f6321ae..9a7c5d8 100644 --- a/jnpf-java-boot/jnpf-web/src/views/yys/yyssupplierinformation/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yyssupplierinformation/index.vue @@ -152,6 +152,8 @@ export default { flowListVisible: false, flowList: [], exportBoxVisible: false, + enableStatusOptions: [{ "fullName": "启用", "id": "1" }, { "fullName": "禁用", "id": "2" }], + enableStatusProps: { "label": "fullName", "value": "id" }, interfaceRes: { }, } diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysunitinformation/Detail.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysunitinformation/Detail.vue index 4bfc97e..9cc3c0e 100644 --- a/jnpf-java-boot/jnpf-web/src/views/yys/yysunitinformation/Detail.vue +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysunitinformation/Detail.vue @@ -21,7 +21,7 @@ -

{{dataForm.enableStatus}}

+

{{ dataForm.enableStatus }}

@@ -53,8 +53,10 @@ id :'', unitId : '', unitName : '', - enableStatus : '', + enableStatus : "1", }, + enableStatusOptions:[{"fullName":"启用","id":"1"},{"fullName":"禁用","id":"2"}], + enableStatusProps:{"label":"fullName","value":"id" }, } }, diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysunitinformation/form.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysunitinformation/form.vue index c3cc562..554b1f2 100644 --- a/jnpf-java-boot/jnpf-web/src/views/yys/yysunitinformation/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysunitinformation/form.vue @@ -29,9 +29,9 @@ - - + + @@ -100,12 +100,14 @@ dataForm: { unitId : undefined, unitName : undefined, - enableStatus : undefined, + enableStatus : "1", }, tableRequiredData: {}, dataRule: { }, + enableStatusOptions:[{"fullName":"启用","id":"1"},{"fullName":"禁用","id":"2"}], + enableStatusProps:{"label":"fullName","value":"id" }, childIndex:-1, isEdit:false, interfaceRes: { diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysunitinformation/index.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysunitinformation/index.vue index 4dc0cc8..43f18ee 100644 --- a/jnpf-java-boot/jnpf-web/src/views/yys/yysunitinformation/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysunitinformation/index.vue @@ -1,18 +1,25 @@ + + + + + + +