From 5bb2d139af4a9ce40a3d11507dbd9759b7b0c560 Mon Sep 17 00:00:00 2001 From: "CJYXTX\\27961" <971623072tx> Date: Tue, 26 Mar 2024 16:38:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E5=8A=A0=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jnpf/controller/NxWalletController.java | 2 +- .../java/jnpf/entity/HousingEstateEntity.java | 2 + .../housingestate/HousingEstateConstant.java | 4 +- .../housingestate/HousingEstateForm.java | 3 + .../src/views/housingestate/Detail.vue | 27 ++- .../jnpf-web/src/views/housingestate/form.vue | 200 ++++++------------ 6 files changed, 84 insertions(+), 154 deletions(-) diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/NxWalletController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/NxWalletController.java index 615a8a5..7643780 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/NxWalletController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/NxWalletController.java @@ -406,7 +406,7 @@ public class NxWalletController { //organize表的json赋值出来 OrganizeCrModel organizeCrModel=new OrganizeCrModel(); organizeCrModel= JSONObject.parseObject(organizeEntityList.get(0).getPropertyJson(),OrganizeCrModel.class); - organizeCrModel.getManagerTelePhone(); +// organizeCrModel.getManagerTelePhone(); //修改人手机号是否等于商户创建人的手机号 boolean areEqual = userUserAccountId.equals(organizeCrModel.getManagerTelePhone()); if (areEqual==false){ diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/HousingEstateEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/HousingEstateEntity.java index 3aa13aa..50d519e 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/HousingEstateEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/HousingEstateEntity.java @@ -18,6 +18,8 @@ public class HousingEstateEntity { private String id; @TableField(value = "NAME" , updateStrategy = FieldStrategy.IGNORED) private String name; + @TableField(value = "IMAGES" , updateStrategy = FieldStrategy.IGNORED) + private String images; @TableField(value = "ADDRESS" , updateStrategy = FieldStrategy.IGNORED) private String address; @TableField(value = "LONGITUDE" , updateStrategy = FieldStrategy.IGNORED) diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/housingestate/HousingEstateConstant.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/housingestate/HousingEstateConstant.java index 3980263..bdd608a 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/housingestate/HousingEstateConstant.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/housingestate/HousingEstateConstant.java @@ -21,7 +21,7 @@ public class HousingEstateConstant{ /** 整个表单配置json */ public static final String getFormData(){ StringBuilder sb = new StringBuilder(); - sb.append("{\"popupType\":\"fullScreen\",\"idGlobal\":117,\"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\":\"default\",\"formRules\":\"rules\",\"generalWidth\":\"600px\",\"hasConfirmBtn\":true,\"formStyle\":\"\",\"colon\":false,\"fields\":[{\"__config__\":{\"formId\":109,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"groupTitle\",\"noShow\":false,\"dragDisabled\":false,\"className\":[],\"label\":\"分组标题\",\"showLabel\":false,\"required\":false,\"renderKey\":1706158508359,\"tableName\":\"nx_housing_estate\",\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-group\",\"tag\":\"JnpfGroupTitle\",\"span\":24},\"contentPosition\":\"left\",\"helpMessage\":\"\",\"content\":\"基本信息\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"小区名\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"nx_housing_estate\",\"renderKey\":1706158324661,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"__vModel__\":\"name\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"filterable\":false,\"clearable\":true,\"__config__\":{\"formId\":117,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"depSelect\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"企业id\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"tableName\":\"nx_housing_estate\",\"renderKey\":1710660187436,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-department\",\"defaultCurrent\":true,\"tag\":\"JnpfDepSelect\",\"regList\":[],\"span\":8},\"ableIds\":[],\"multiple\":false,\"__vModel__\":\"enterpriseId\",\"style\":{\"width\":\"100%\"},\"selectType\":\"all\",\"disabled\":false,\"placeholder\":\"请选择\"},{\"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\":\"nx_housing_estate\",\"renderKey\":1706158338195,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"tag\":\"JnpfInput\",\"regList\":[],\"span\":10},\"readonly\":false,\"__vModel__\":\"address\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"__config__\":{\"formId\":103,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"switch\",\"defaultValue\":1,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"启用禁用\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"tableName\":\"nx_housing_estate\",\"renderKey\":1706158362120,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-switch\",\"tag\":\"JnpfSwitch\",\"regList\":[],\"span\":8},\"activeValue\":1,\"inactiveValue\":0,\"__vModel__\":\"enabledMark\",\"inactiveTxt\":\"关\",\"disabled\":false,\"activeTxt\":\"开\"},{\"__config__\":{\"formId\":105,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"inputNumber\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"纬度\",\"trigger\":[\"blur\",\"change\"],\"showLabel\":true,\"required\":false,\"tableName\":\"nx_housing_estate\",\"renderKey\":1706158425173,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-number\",\"tag\":\"JnpfInputNumber\",\"regList\":[],\"span\":8},\"controls\":false,\"__vModel__\":\"latitude\",\"style\":{\"width\":\"100%\"},\"step\":1,\"disabled\":false,\"placeholder\":\"请输入\",\"thousands\":false,\"isAmountChinese\":false,\"addonBefore\":\"\",\"addonAfter\":\"\"},{\"controls\":false,\"thousands\":false,\"isAmountChinese\":false,\"addonAfter\":\"\",\"__config__\":{\"formId\":104,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"inputNumber\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"经度\",\"trigger\":[\"blur\",\"change\"],\"showLabel\":true,\"required\":false,\"tableName\":\"nx_housing_estate\",\"renderKey\":1706158392543,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-number\",\"tag\":\"JnpfInputNumber\",\"regList\":[],\"span\":8},\"__vModel__\":\"longitude\",\"style\":{\"width\":\"100%\"},\"step\":1,\"disabled\":false,\"placeholder\":\"请输入\",\"addonBefore\":\"\"},{\"__config__\":{\"formId\":110,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"groupTitle\",\"noShow\":false,\"dragDisabled\":false,\"className\":[],\"label\":\"分组标题\",\"showLabel\":false,\"required\":false,\"renderKey\":1706158519150,\"tableName\":\"nx_housing_estate\",\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-group\",\"tag\":\"JnpfGroupTitle\",\"span\":24},\"contentPosition\":\"left\",\"helpMessage\":\"\",\"content\":\"定时回收配置\"},{\"__config__\":{\"formId\":106,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"switch\",\"defaultValue\":0,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"定时定点回收\",\"trigger\":\"change\",\"showLabel\":true,\"required\":false,\"tableName\":\"nx_housing_estate\",\"renderKey\":1706158444857,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-switch\",\"tag\":\"JnpfSwitch\",\"regList\":[],\"span\":24},\"activeValue\":1,\"inactiveValue\":0,\"__vModel__\":\"hasSchedule\",\"inactiveTxt\":\"关\",\"disabled\":false,\"activeTxt\":\"开\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":116,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"回收地址\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"nx_housing_estate\",\"renderKey\":1706678713277,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"recycleAddress\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"defaultValue\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":false,\"tableName\":\"nx_housing_estate\",\"renderKey\":1706158548055,\"tagIcon\":\"icon-ym icon-ym-generator-time\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfTimePicker\",\"formId\":111,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"timePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"回收时间起\",\"trigger\":\"change\",\"startTimeRule\":false,\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":8},\"format\":\"HH:mm\",\"__vModel__\":\"appointmentTimeStart\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择\"},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"defaultValue\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":false,\"tableName\":\"nx_housing_estate\",\"renderKey\":1706158575352,\"tagIcon\":\"icon-ym icon-ym-generator-time\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfTimePicker\",\"formId\":113,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"timePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"回收时间止\",\"trigger\":\"change\",\"startTimeRule\":false,\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":8},\"format\":\"HH:mm\",\"__vModel__\":\"appointmentTimeEnd\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择\"},{\"filterable\":false,\"clearable\":true,\"__config__\":{\"formId\":114,\"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\":\"nx_housing_estate\",\"renderKey\":1706158609968,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":8},\"options\":[{\"fullName\":\"系统导入\",\"id\":\"1\"},{\"fullName\":\"用户自定义\",\"id\":\"2\"}],\"multiple\":false,\"__vModel__\":\"sourceType\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"}}],\"span\":24}"); return sb.toString(); + sb.append("{\"popupType\":\"fullScreen\",\"idGlobal\":118,\"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\":\"default\",\"formRules\":\"rules\",\"generalWidth\":\"600px\",\"hasConfirmBtn\":true,\"formStyle\":\"\",\"colon\":false,\"fields\":[{\"__config__\":{\"formId\":109,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"groupTitle\",\"noShow\":false,\"dragDisabled\":false,\"className\":[],\"label\":\"分组标题\",\"showLabel\":false,\"required\":false,\"renderKey\":1706158508359,\"tableName\":\"nx_housing_estate\",\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-group\",\"tag\":\"JnpfGroupTitle\",\"span\":24},\"contentPosition\":\"left\",\"helpMessage\":\"\",\"content\":\"基本信息\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"小区名\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"nx_housing_estate\",\"renderKey\":1706158324661,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"__vModel__\":\"name\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"filterable\":false,\"clearable\":true,\"__config__\":{\"formId\":117,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"depSelect\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"企业id\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"tableName\":\"nx_housing_estate\",\"renderKey\":1710660187436,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-department\",\"defaultCurrent\":true,\"tag\":\"JnpfDepSelect\",\"regList\":[],\"span\":8},\"ableIds\":[],\"multiple\":false,\"__vModel__\":\"enterpriseId\",\"style\":{\"width\":\"100%\"},\"selectType\":\"all\",\"disabled\":false,\"placeholder\":\"请选择\"},{\"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\":\"nx_housing_estate\",\"renderKey\":1706158338195,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"tag\":\"JnpfInput\",\"regList\":[],\"span\":10},\"readonly\":false,\"__vModel__\":\"address\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"showTip\":false,\"isAccount\":0,\"pathType\":\"defaultPath\",\"accept\":\"\",\"__config__\":{\"formId\":118,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"uploadImg\",\"defaultValue\":[],\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"小区图片\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"tableName\":\"nx_housing_estate\",\"renderKey\":1711440412679,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-upload\",\"tag\":\"JnpfUploadImg\",\"regList\":[],\"span\":24},\"folder\":\"\",\"fileSize\":10,\"limit\":1,\"__vModel__\":\"images\",\"sizeUnit\":\"MB\",\"tipText\":\"\",\"disabled\":false},{\"__config__\":{\"formId\":103,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"switch\",\"defaultValue\":1,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"启用禁用\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"tableName\":\"nx_housing_estate\",\"renderKey\":1706158362120,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-switch\",\"tag\":\"JnpfSwitch\",\"regList\":[],\"span\":8},\"activeValue\":1,\"inactiveValue\":0,\"__vModel__\":\"enabledMark\",\"inactiveTxt\":\"关\",\"disabled\":false,\"activeTxt\":\"开\"},{\"__config__\":{\"formId\":105,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"inputNumber\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"纬度\",\"trigger\":[\"blur\",\"change\"],\"showLabel\":true,\"required\":false,\"tableName\":\"nx_housing_estate\",\"renderKey\":1706158425173,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-number\",\"tag\":\"JnpfInputNumber\",\"regList\":[],\"span\":8},\"controls\":false,\"__vModel__\":\"latitude\",\"style\":{\"width\":\"100%\"},\"step\":1,\"disabled\":false,\"placeholder\":\"请输入\",\"thousands\":false,\"isAmountChinese\":false,\"addonBefore\":\"\",\"addonAfter\":\"\"},{\"controls\":false,\"thousands\":false,\"isAmountChinese\":false,\"addonAfter\":\"\",\"__config__\":{\"formId\":104,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"inputNumber\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"经度\",\"trigger\":[\"blur\",\"change\"],\"showLabel\":true,\"required\":false,\"tableName\":\"nx_housing_estate\",\"renderKey\":1706158392543,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-number\",\"tag\":\"JnpfInputNumber\",\"regList\":[],\"span\":8},\"__vModel__\":\"longitude\",\"style\":{\"width\":\"100%\"},\"step\":1,\"disabled\":false,\"placeholder\":\"请输入\",\"addonBefore\":\"\"},{\"__config__\":{\"formId\":110,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"groupTitle\",\"noShow\":false,\"dragDisabled\":false,\"className\":[],\"label\":\"分组标题\",\"showLabel\":false,\"required\":false,\"renderKey\":1706158519150,\"tableName\":\"nx_housing_estate\",\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-group\",\"tag\":\"JnpfGroupTitle\",\"span\":24},\"contentPosition\":\"left\",\"helpMessage\":\"\",\"content\":\"定时回收配置\"},{\"__config__\":{\"formId\":106,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"switch\",\"defaultValue\":0,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"定时定点回收\",\"trigger\":\"change\",\"showLabel\":true,\"required\":false,\"tableName\":\"nx_housing_estate\",\"renderKey\":1706158444857,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-switch\",\"tag\":\"JnpfSwitch\",\"regList\":[],\"span\":24},\"activeValue\":1,\"inactiveValue\":0,\"__vModel__\":\"hasSchedule\",\"inactiveTxt\":\"关\",\"disabled\":false,\"activeTxt\":\"开\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":116,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"回收地址\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"nx_housing_estate\",\"renderKey\":1706678713277,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"recycleAddress\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"defaultValue\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":false,\"tableName\":\"nx_housing_estate\",\"renderKey\":1706158548055,\"tagIcon\":\"icon-ym icon-ym-generator-time\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfTimePicker\",\"formId\":111,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"timePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"回收时间起\",\"trigger\":\"change\",\"startTimeRule\":false,\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":8},\"format\":\"HH:mm\",\"__vModel__\":\"appointmentTimeStart\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择\"},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"defaultValue\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":false,\"tableName\":\"nx_housing_estate\",\"renderKey\":1706158575352,\"tagIcon\":\"icon-ym icon-ym-generator-time\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfTimePicker\",\"formId\":113,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"timePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"回收时间止\",\"trigger\":\"change\",\"startTimeRule\":false,\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":8},\"format\":\"HH:mm\",\"__vModel__\":\"appointmentTimeEnd\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择\"},{\"filterable\":false,\"clearable\":true,\"__config__\":{\"formId\":114,\"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\":\"nx_housing_estate\",\"renderKey\":1706158609968,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":8},\"options\":[{\"fullName\":\"系统导入\",\"id\":\"1\"},{\"fullName\":\"用户自定义\",\"id\":\"2\"}],\"multiple\":false,\"__vModel__\":\"sourceType\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"}}],\"span\":24}"); return sb.toString(); } /** 列表字段配置json */ public static final String getColumnData(){ @@ -36,6 +36,6 @@ public class HousingEstateConstant{ /** 表列表 */ public static final String getTableList(){ StringBuilder sb = new StringBuilder(); - sb.append("[{\"relationField\":\"\",\"relationTable\":\"\",\"table\":\"nx_housing_estate\",\"tableName\":\"小区信息表\",\"tableField\":\"\",\"typeId\":\"1\",\"fields\":[{\"columnName\":\"id\",\"field\":\"id\",\"fieldName\":\"自然主键\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":1,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"enterprise_id\",\"field\":\"enterpriseId\",\"fieldName\":\"企业id(直接绑定组织id)\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"name\",\"field\":\"name\",\"fieldName\":\"小区名\",\"dataType\":\"varchar\",\"dataLength\":\"25\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"address\",\"field\":\"address\",\"fieldName\":\"小区详细地址\",\"dataType\":\"varchar\",\"dataLength\":\"25\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"longitude\",\"field\":\"longitude\",\"fieldName\":\"经度\",\"dataType\":\"double\",\"dataLength\":\"10,6\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"latitude\",\"field\":\"latitude\",\"fieldName\":\"纬度\",\"dataType\":\"double\",\"dataLength\":\"10,6\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"has_schedule\",\"field\":\"hasSchedule\",\"fieldName\":\"是否是定时定点回收\",\"dataType\":\"int\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"recycle_address\",\"field\":\"recycleAddress\",\"fieldName\":\"定点回收地址\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"appointment_time_start\",\"field\":\"appointmentTimeStart\",\"fieldName\":\"定点回收时间起\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"appointment_time_end\",\"field\":\"appointmentTimeEnd\",\"fieldName\":\"定点回收时间止\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"is_choosed\",\"field\":\"isChoosed\",\"fieldName\":\"是否已被配置(0-否，1-是)\",\"dataType\":\"int\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"source_type\",\"field\":\"sourceType\",\"fieldName\":\"来源id：1系统导入，2用户自定义\",\"dataType\":\"int\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"enabled_mark\",\"field\":\"enabledMark\",\"fieldName\":\"有效标志(0-禁用，1-启用)\",\"dataType\":\"int\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"creator_user_id\",\"field\":\"creatorUserId\",\"fieldName\":\"创建人\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"creator_time\",\"field\":\"creatorTime\",\"fieldName\":\"创建时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"remark\",\"field\":\"remark\",\"fieldName\":\"备注\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_flow_id\",\"field\":\"flowId\",\"fieldName\":\"流程id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_creator_time\",\"field\":\"creatorTime\",\"fieldName\":\"创建时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_creator_user_id\",\"field\":\"creatorUserId\",\"fieldName\":\"创建用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_last_modify_time\",\"field\":\"lastModifyTime\",\"fieldName\":\"修改时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_last_modify_user_id\",\"field\":\"lastModifyUserId\",\"fieldName\":\"修改用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_time\",\"field\":\"deleteTime\",\"fieldName\":\"删除时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_user_id\",\"field\":\"deleteUserId\",\"fieldName\":\"删除用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_mark\",\"field\":\"deleteMark\",\"fieldName\":\"删除标志\",\"dataType\":\"int\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_tenant_id\",\"field\":\"tenantId\",\"fieldName\":\"租户id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0}]}]"); return sb.toString(); + sb.append("[{\"relationField\":\"\",\"relationTable\":\"\",\"table\":\"nx_housing_estate\",\"tableName\":\"小区信息表\",\"tableField\":\"\",\"typeId\":\"1\",\"fields\":[{\"columnName\":\"id\",\"field\":\"id\",\"fieldName\":\"自然主键\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":1,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"name\",\"field\":\"name\",\"fieldName\":\"小区名\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"images\",\"field\":\"images\",\"fieldName\":\"小区图片\",\"dataType\":\"text\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"address\",\"field\":\"address\",\"fieldName\":\"小区详细地址\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"longitude\",\"field\":\"longitude\",\"fieldName\":\"经度\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"latitude\",\"field\":\"latitude\",\"fieldName\":\"纬度\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"has_schedule\",\"field\":\"hasSchedule\",\"fieldName\":\"是否支持定时定点回收 0 否 1 是\",\"dataType\":\"int\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"recycle_address\",\"field\":\"recycleAddress\",\"fieldName\":\"定点回收地址\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"appointment_time_start\",\"field\":\"appointmentTimeStart\",\"fieldName\":\"定点回收时间起\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"appointment_time_end\",\"field\":\"appointmentTimeEnd\",\"fieldName\":\"定点回收时间止\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"enterprise_id\",\"field\":\"enterpriseId\",\"fieldName\":\"企业id(直接绑定组织id)\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"station_id\",\"field\":\"stationId\",\"fieldName\":\"所属回收站id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"is_choosed\",\"field\":\"isChoosed\",\"fieldName\":\"是否已被配置(0-否，1-是)\",\"dataType\":\"int\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"source_type\",\"field\":\"sourceType\",\"fieldName\":\"来源id：1系统导入，2用户自定义\",\"dataType\":\"int\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"enabled_mark\",\"field\":\"enabledMark\",\"fieldName\":\"有效标志(0-禁用，1-启用)\",\"dataType\":\"int\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"creator_user_id\",\"field\":\"creatorUserId\",\"fieldName\":\"创建人\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"creator_time\",\"field\":\"creatorTime\",\"fieldName\":\"创建时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"remark\",\"field\":\"remark\",\"fieldName\":\"备注\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_flow_id\",\"field\":\"flowId\",\"fieldName\":\"流程id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_creator_time\",\"field\":\"creatorTime\",\"fieldName\":\"创建时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_creator_user_id\",\"field\":\"creatorUserId\",\"fieldName\":\"创建用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_last_modify_time\",\"field\":\"lastModifyTime\",\"fieldName\":\"修改时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_last_modify_user_id\",\"field\":\"lastModifyUserId\",\"fieldName\":\"修改用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_time\",\"field\":\"deleteTime\",\"fieldName\":\"删除时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_user_id\",\"field\":\"deleteUserId\",\"fieldName\":\"删除用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_mark\",\"field\":\"deleteMark\",\"fieldName\":\"删除标志\",\"dataType\":\"int\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_tenant_id\",\"field\":\"tenantId\",\"fieldName\":\"租户id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"company_id\",\"field\":\"companyId\",\"fieldName\":\"公司id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"department_id\",\"field\":\"departmentId\",\"fieldName\":\"部门id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"organize_json_id\",\"field\":\"organizeJsonId\",\"fieldName\":\"组织id\",\"dataType\":\"varchar\",\"dataLength\":\"1000\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0}]}]"); return sb.toString(); } } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/housingestate/HousingEstateForm.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/housingestate/HousingEstateForm.java index e36a233..ca0069e 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/housingestate/HousingEstateForm.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/housingestate/HousingEstateForm.java @@ -25,6 +25,9 @@ public class HousingEstateForm { /** 小区详细地址 **/ @JsonProperty("address") private String address; + /** 小区图片 **/ + @JsonProperty("images") + private Object images; /** 启用禁用 **/ @JsonProperty("enabledMark") private Integer enabledMark; diff --git a/jnpf-java-boot/jnpf-web/src/views/housingestate/Detail.vue b/jnpf-java-boot/jnpf-web/src/views/housingestate/Detail.vue index f99d548..e026bcd 100644 --- a/jnpf-java-boot/jnpf-web/src/views/housingestate/Detail.vue +++ b/jnpf-java-boot/jnpf-web/src/views/housingestate/Detail.vue @@ -8,9 +8,8 @@ 取消 - - + + - + - + @@ -307,6 +215,7 @@ export default { Vmodel: "", currVmodel: "", dataForm: { + images: [], enterpriseId: undefined, name: undefined, address: undefined, @@ -356,6 +265,14 @@ export default { trigger: "blur", }, ], + images: [ + { + required: true, + message: '请至少选择一个', + trigger: 'change' + }, + ], + }, sourceTypeOptions: [ { fullName: "系统导入", id: "1" }, @@ -368,6 +285,7 @@ export default { enterpriseId: [], name: [], address: [], + images: [], enabledMark: [], latitude: [], longitude: [], @@ -388,7 +306,7 @@ export default { this.initDefaultData(); this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm)); }, - mounted() {}, + mounted() { }, methods: { handleShowMap() { this.visibleMap = true; @@ -482,7 +400,7 @@ export default { } } }, - dataAll() {}, + dataAll() { }, goBack() { this.$emit("refresh"); },