From b8b92b27c6d7bc46c6dfef332d2448e5ce70b806 Mon Sep 17 00:00:00 2001 From: guochaojie Date: Mon, 20 May 2024 15:02:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E5=AD=90=E5=9B=B4=E6=A0=8F=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/jnpf/mapper/StationAreaMapper.java | 4 +- .../java/jnpf/service/StationAreaService.java | 13 ++- .../service/impl/StationAreaServiceImpl.java | 53 ++++--------- .../controller/StationAreaController.java | 6 +- .../java/jnpf/entity/StationAreaEntity.java | 2 +- .../stationarea/StationAreaConstant.java | 10 +-- .../model/stationarea/StationAreaForm.java | 20 ++++- .../stationarea/StationAreaPagination.java | 13 ++- .../jnpf-web/src/views/stationarea/Detail.vue | 23 +++++- .../src/views/stationarea/columnList.js | 2 +- .../jnpf-web/src/views/stationarea/form.vue | 71 ++++++++--------- .../jnpf-web/src/views/stationarea/index.vue | 79 ++++++++----------- .../src/views/stationarea/superQueryJson.js | 2 +- 13 files changed, 143 insertions(+), 155 deletions(-) diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/StationAreaMapper.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/StationAreaMapper.java index 9b628c4..a6e5669 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/StationAreaMapper.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/StationAreaMapper.java @@ -5,11 +5,11 @@ import jnpf.entity.StationAreaEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** - * nx_station_area + * 回收站电子围栏 * 版本： V3.5 * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * 作者： JNPF开发平台组 - * 日期： 2024-05-15 + * 日期： 2024-05-20 */ public interface StationAreaMapper extends BaseMapper { diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/StationAreaService.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/StationAreaService.java index 77c91db..85989b0 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/StationAreaService.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/StationAreaService.java @@ -1,23 +1,22 @@ package jnpf.service; -import jnpf.entity.StationAreaEntity; import jnpf.model.stationarea.*; - +import jnpf.entity.*; import java.util.*; import com.baomidou.mybatisplus.extension.service.IService; -import jnpf.model.stationarea.StationAreaForm; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; /** - * stationArea + * 回收站电子围栏 * 版本： V3.5 * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * 作者： JNPF开发平台组 - * 日期： 2024-05-15 + * 日期： 2024-05-20 */ public interface StationAreaService extends IService { List getList(StationAreaPagination stationAreaPagination); - List getTypeList(StationAreaPagination stationAreaPagination, String dataType); + List getTypeList(StationAreaPagination stationAreaPagination,String dataType); StationAreaEntity getInfo(String id); @@ -29,7 +28,7 @@ public interface StationAreaService extends IService { //子表方法 //副表数据方法 - String checkForm(StationAreaForm form, int i); + String checkForm(StationAreaForm form,int i); void saveOrUpdate(StationAreaForm stationAreaForm,String id, boolean isSave) throws Exception; diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/StationAreaServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/StationAreaServiceImpl.java index 3504eb6..2fe2042 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/StationAreaServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/StationAreaServiceImpl.java @@ -32,11 +32,11 @@ import jnpf.base.UserInfo; import jnpf.permission.entity.UserEntity; /** * - * stationArea + * 回收站电子围栏 * 版本： V3.5 * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * 作者： JNPF开发平台组 - * 日期： 2024-05-15 + * 日期： 2024-05-20 */ @Service public class StationAreaServiceImpl extends ServiceImpl implements StationAreaService{ @@ -52,7 +52,7 @@ public class StationAreaServiceImpl extends ServiceImpl getTypeList(StationAreaPagination stationAreaPagination, String dataType){ + public List getTypeList(StationAreaPagination stationAreaPagination,String dataType){ String userId=userProvider.get().getUserId(); List AllIdList =new ArrayList(); List> intersectionList =new ArrayList<>(); @@ -144,32 +144,13 @@ public class StationAreaServiceImpl extends ServiceImpl idList = new ArrayList<>(); - try { - String[][] stationCode = JsonUtil.getJsonToBean(stationAreaPagination.getStationCode(),String[][].class); - for(int i=0;i0){ - idList.add(JsonUtil.getObjectToString(Arrays.asList(stationCode[i]))); - } - } - }catch (Exception e1){ - try { - List stationCode = JsonUtil.getJsonToList(stationAreaPagination.getStationCode(),String.class); - if(stationCode.size()>0){ - idList.addAll(stationCode); - } - }catch (Exception e2){ - idList.add(String.valueOf(stationAreaPagination.getStationCode())); - } - } - stationAreaQueryWrapper.lambda().and(t->{ - idList.forEach(tt->{ - t.like(StationAreaEntity::getStationCode, tt).or(); - }); - }); + String value = stationAreaPagination.getAreaName() instanceof List ? + JsonUtil.getObjectToString(stationAreaPagination.getAreaName()) : + String.valueOf(stationAreaPagination.getAreaName()); + stationAreaQueryWrapper.lambda().like(StationAreaEntity::getAreaName,value); } @@ -202,16 +183,6 @@ public class StationAreaServiceImpl extends ServiceImpl - +

{{dataForm.stationCode}}

 @@ -42,6 +42,18 @@

{{dataForm.areaDesc}}

+ + +

{{dataForm.lastModifyUserId}}

+ + + + +

{{dataForm.lastModifyTime}}

+ + @@ -70,15 +82,18 @@ dataForm: { id :'', areaName : '', - areaType : "1", + areaType : "", status : "1", stationCode : "", areaMapInfo : '', areaDesc : '', + creatorUserId : "", + deleteTime : "", + lastModifyUserId : "", + lastModifyTime : "", }, areaTypeProps:{"label":"fullName","value":"enCode" }, statusProps:{"label":"fullName","value":"enCode" }, - stationCodeProps:{"label":"fullName","value":"id" }, } }, diff --git a/jnpf-java-boot/jnpf-web/src/views/stationarea/columnList.js b/jnpf-java-boot/jnpf-web/src/views/stationarea/columnList.js index c2084b5..d1994dd 100644 --- a/jnpf-java-boot/jnpf-web/src/views/stationarea/columnList.js +++ b/jnpf-java-boot/jnpf-web/src/views/stationarea/columnList.js @@ -1,2 +1,2 @@ -const columnList = [{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"区域名称","label":"区域名称","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":101,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"围栏区域名称","dragDisabled":false,"className":[],"label":"区域名称","trigger":"blur","showLabel":true,"required":true,"tableName":"nx_station_area","renderKey":1715752071089,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"prop":"areaName","showWordLimit":false,"width":0,"__vModel__":"areaName","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"areaName","placeholder":"电子围栏名称","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"区域类型","label":"区域类型","sortable":false,"align":"left","props":{"label":"fullName","value":"enCode"},"__config__":{"formId":102,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"1","noShow":false,"dataType":"dictionary","dictionaryType":"560423985691492677","tipLabel":"请选择围栏类型","dragDisabled":false,"className":[],"label":"区域类型","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"nx_station_area","renderKey":1715752074918,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":24},"prop":"areaType","width":0,"options":[{"enCode":"1","children":null,"hasChildren":false,"fullName":"接单区域","id":"560424128079724869","parentId":"0"},{"enCode":"2","children":null,"hasChildren":false,"fullName":"不接单区域","id":"560424264616902981","parentId":"0"}],"__vModel__":"areaType","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"areaType","placeholder":"请选择围栏类型","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"所属回收站","label":"所属回收站","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"__config__":{"formId":119,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"dynamic","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"所属回收站","trigger":"change","propsUrl":"520259300875047493","templateJson":[],"showLabel":true,"required":true,"tableName":"nx_station_area","renderKey":1715754670040,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"查询全部回收站","tag":"JnpfSelect","regList":[],"span":24},"prop":"stationCode","width":0,"options":[],"__vModel__":"stationCode","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"stationCode","placeholder":"选择本组织回收站进行绑定","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"border":false,"jnpfKey":"radio","fullName":"是否启用","label":"是否启用","sortable":false,"align":"left","props":{"label":"fullName","value":"enCode"},"optionType":"default","__config__":{"formId":108,"visibility":["pc","app"],"jnpfKey":"radio","defaultValue":"1","noShow":false,"dataType":"dictionary","dictionaryType":"519107761586309125","tipLabel":"","dragDisabled":false,"className":[],"label":"是否启用","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"nx_station_area","renderKey":1715752554218,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-radio","propsName":"","tag":"JnpfRadio","regList":[],"span":24},"size":"small","prop":"status","width":0,"options":[{"enCode":"0","children":null,"hasChildren":false,"fullName":"禁用","id":"519107882239657989","parentId":"0"},{"enCode":"1","children":null,"hasChildren":false,"fullName":"启用","id":"519107823167080453","parentId":"0"}],"__vModel__":"status","fixed":"none","style":{},"disabled":false,"interfaceHasPage":false,"id":"status","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"direction":"horizontal"},{"clearable":true,"maxlength":"65539","jnpfKey":"input","suffixIcon":"","fullName":"地图信息","label":"地图信息","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":109,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"在地图上做选择","dragDisabled":false,"className":[],"label":"地图信息","trigger":"blur","showLabel":true,"required":true,"tableName":"nx_station_area","renderKey":1715752808402,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"prop":"areaMapInfo","showWordLimit":false,"width":0,"__vModel__":"areaMapInfo","showPassword":true,"fixed":"none","style":{"width":"100%"},"disabled":true,"id":"areaMapInfo","placeholder":"绘制电子围栏区域","prefixIcon":"ym-custom ym-custom-google-maps","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"maxlength":null,"jnpfKey":"textarea","fullName":"区域描述","label":"区域描述","sortable":false,"align":"left","type":"textarea","autoSize":{"minRows":4,"maxRows":4},"__config__":{"formId":103,"visibility":["pc","app"],"jnpfKey":"textarea","noShow":false,"tipLabel":"请输入区域描述","dragDisabled":false,"className":[],"label":"区域描述","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_station_area","renderKey":1715752078721,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-textarea","tag":"JnpfTextarea","regList":[],"span":24},"readonly":false,"prop":"areaDesc","showWordLimit":true,"width":0,"__vModel__":"areaDesc","fixed":"none","style":{"width":"100%"},"disabled":false,"id":"areaDesc","placeholder":"请输入不超过两百字的标题描述","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}}] +const columnList = [{"popupType":"dialog","hasPage":true,"pageSize":20,"columnOptions":[{"label":"站点编码","value":"station_code"},{"label":"站点名称","value":"station_name"}],"align":"center","templateJson":[],"__config__":{"formId":124,"visibility":["pc","app"],"jnpfKey":"popupSelect","defaultValue":"","noShow":false,"tipLabel":"绑定站点编码","dragDisabled":false,"className":[],"label":"站点编号","trigger":"change","showLabel":true,"required":true,"tableName":"nx_station_area","renderKey":1716183392539,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-popup","tag":"JnpfPopupSelect","regList":[],"span":24},"prop":"stationCode","__vModel__":"stationCode","disabled":false,"id":"stationCode","placeholder":"请选择为那个站点绘制区域","interfaceName":"查询全部回收站","popupWidth":"800px","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"clearable":true,"jnpfKey":"popupSelect","fullName":"站点编号","label":"站点编号","sortable":true,"relationField":"station_name","popupTitle":"选择数据","width":0,"fixed":"none","style":{"width":"100%"},"interfaceHasPage":false,"interfaceId":"520259300875047493","propsValue":"station_code"},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"区域名称","label":"区域名称","sortable":false,"align":"center","addonAfter":"","__config__":{"formId":101,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"围栏区域名称","dragDisabled":false,"className":[],"label":"区域名称","trigger":"blur","showLabel":true,"required":true,"tableName":"nx_station_area","renderKey":1715752071089,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"prop":"areaName","showWordLimit":false,"width":0,"__vModel__":"areaName","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"areaName","placeholder":"电子围栏名称","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"区域类型","label":"区域类型","sortable":false,"align":"center","props":{"label":"fullName","value":"enCode"},"__config__":{"formId":102,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"dictionary","dictionaryType":"560423985691492677","tipLabel":"请选择围栏类型","dragDisabled":false,"className":[],"label":"区域类型","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"nx_station_area","renderKey":1715752074918,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":24},"prop":"areaType","width":0,"options":[{"enCode":"1","children":null,"hasChildren":false,"fullName":"接单区域","id":"560424128079724869","parentId":"0"},{"enCode":"2","children":null,"hasChildren":false,"fullName":"不接单区域","id":"560424264616902981","parentId":"0"}],"__vModel__":"areaType","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"areaType","placeholder":"请选择围栏类型","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"border":false,"jnpfKey":"radio","fullName":"是否启用","label":"是否启用","sortable":false,"align":"center","props":{"label":"fullName","value":"enCode"},"optionType":"default","__config__":{"formId":108,"visibility":["pc","app"],"jnpfKey":"radio","defaultValue":"1","noShow":false,"dataType":"dictionary","dictionaryType":"519107761586309125","tipLabel":"","dragDisabled":false,"className":[],"label":"是否启用","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"nx_station_area","renderKey":1715752554218,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-radio","propsName":"","tag":"JnpfRadio","regList":[],"span":24},"size":"small","prop":"status","width":0,"options":[{"enCode":"0","children":null,"hasChildren":false,"fullName":"禁用","id":"519107882239657989","parentId":"0"},{"enCode":"1","children":null,"hasChildren":false,"fullName":"启用","id":"519107823167080453","parentId":"0"}],"__vModel__":"status","fixed":"none","style":{},"disabled":false,"interfaceHasPage":false,"id":"status","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"direction":"horizontal"},{"clearable":true,"maxlength":"65539","jnpfKey":"input","suffixIcon":"","fullName":"地图信息","label":"地图信息","sortable":false,"align":"center","addonAfter":"","__config__":{"formId":109,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"在地图上绘制电子围栏","dragDisabled":false,"className":[],"label":"地图信息","trigger":"blur","showLabel":true,"required":true,"tableName":"nx_station_area","renderKey":1715752808402,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"prop":"areaMapInfo","showWordLimit":false,"width":0,"__vModel__":"areaMapInfo","showPassword":true,"fixed":"none","style":{"width":"100%"},"disabled":true,"id":"areaMapInfo","placeholder":"绘制电子围栏区域","prefixIcon":"el-icon-map-location","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"maxlength":null,"jnpfKey":"textarea","fullName":"区域描述","label":"区域描述","sortable":false,"align":"center","type":"textarea","autoSize":{"minRows":4,"maxRows":4},"__config__":{"formId":103,"visibility":["pc","app"],"jnpfKey":"textarea","noShow":false,"tipLabel":"请输入区域描述","dragDisabled":false,"className":[],"label":"区域描述","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_station_area","renderKey":1715752078721,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-textarea","tag":"JnpfTextarea","regList":[],"span":24},"readonly":false,"prop":"areaDesc","showWordLimit":true,"width":0,"__vModel__":"areaDesc","fixed":"none","style":{"width":"100%"},"disabled":false,"id":"areaDesc","placeholder":"请输入不超过两百字的区域描述","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"jnpfKey":"createUser","fullName":"创建用户","label":"创建用户","sortable":false,"align":"center","type":"currUser","__config__":{"formId":120,"visibility":["pc","app"],"jnpfKey":"createUser","defaultValue":"","noShow":true,"tipLabel":"","dragDisabled":false,"className":[],"label":"创建用户","showLabel":true,"required":false,"tableName":"nx_station_area","renderKey":1716175629683,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-founder","tag":"JnpfOpenData","span":24},"readonly":true,"prop":"creatorUserId","width":0,"__vModel__":"creatorUserId","fixed":"none","style":{"width":"100%"},"id":"creatorUserId","placeholder":""},{"jnpfKey":"modifyUser","fullName":"修改用户","label":"修改用户","sortable":false,"align":"center","__config__":{"formId":122,"visibility":["pc","app"],"jnpfKey":"modifyUser","defaultValue":"","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"修改用户","showLabel":true,"required":false,"tableName":"nx_station_area","renderKey":1716175633950,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-modifier","tag":"JnpfInput","span":24},"readonly":true,"prop":"lastModifyUserId","width":0,"__vModel__":"lastModifyUserId","fixed":"none","style":{"width":"100%"},"id":"lastModifyUserId","placeholder":"系统自动生成"},{"jnpfKey":"modifyTime","fullName":"修改时间","label":"修改时间","sortable":false,"align":"center","__config__":{"formId":123,"visibility":["pc","app"],"jnpfKey":"modifyTime","defaultValue":"","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"修改时间","showLabel":true,"required":false,"tableName":"nx_station_area","renderKey":1716175636085,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-modifytime","tag":"JnpfInput","span":24},"readonly":true,"prop":"lastModifyTime","width":0,"__vModel__":"lastModifyTime","fixed":"none","style":{"width":"100%"},"id":"lastModifyTime","placeholder":"系统自动生成"}] export default columnList \ No newline at end of file diff --git a/jnpf-java-boot/jnpf-web/src/views/stationarea/form.vue b/jnpf-java-boot/jnpf-web/src/views/stationarea/form.vue index f6dd5a4..b35d2d6 100644 --- a/jnpf-java-boot/jnpf-web/src/views/stationarea/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/stationarea/form.vue @@ -36,17 +36,17 @@ - - + label="站点编号" tipLabel="绑定站点编码" prop="stationCode" > + + + placeholder="绘制电子围栏区域" disabled :maxlength="65539" clearable prefix-icon='el-icon-map-location' :style='{"width":"100%"}' show-password > @@ -54,8 +54,24 @@ + placeholder="请输入不超过两百字的区域描述" :style='{"width":"100%"}' true type="textarea" :autosize='{"minRows":4,"maxRows":4}' > + + + + + + + + + + + + @@ -123,11 +139,15 @@ currVmodel:"", dataForm: { areaName : undefined, - areaType : "1", + areaType : undefined, status : "1", stationCode : undefined, areaMapInfo : undefined, areaDesc : undefined, + creatorUserId : undefined, + deleteTime : undefined, + lastModifyUserId : undefined, + lastModifyTime : undefined, }, tableRequiredData: {}, dataRule: @@ -142,7 +162,7 @@ areaType: [ { required: true, - message: '请至少选择一个', + message: '请选择围栏类型', trigger: 'change' }, ], @@ -156,7 +176,7 @@ stationCode: [ { required: true, - message: '选择本组织回收站进行绑定', + message: '请选择为那个站点绘制区域', trigger: 'change' }, ], @@ -172,8 +192,7 @@ areaTypeProps:{"label":"fullName","value":"enCode" }, statusOptions:[], statusProps:{"label":"fullName","value":"enCode" }, - stationCodeOptions:[], - stationCodeProps:{"label":"fullName","value":"id" }, + stationCodecolumnOptions:[ {"label":"站点编码","value":"station_code"}, {"label":"站点名称","value":"station_name"},], childIndex:-1, isEdit:false, interfaceRes: { @@ -183,6 +202,10 @@ stationCode:[] , areaMapInfo:[] , areaDesc:[] , + creatorUserId:[] , + deleteTime:[] , + lastModifyUserId:[] , + lastModifyTime:[] , }, } }, @@ -276,7 +299,6 @@ dataAll(){ this.getareaTypeOptions(); this.getstatusOptions(); - this.getstationCodeOptions(); }, getareaTypeOptions() { getDictionaryDataSelector('560423985691492677').then(res => { @@ -288,31 +310,6 @@ this.statusOptions = res.data.list }) }, - getstationCodeOptions() { - const index = this.childIndex - let templateJsonList = JSON.parse(JSON.stringify(this.interfaceRes.stationCode)) - for (let i = 0; i < templateJsonList.length; i++) { - let json = templateJsonList[i]; - if(json.relationField){ - let relationFieldAll = json.relationField.split("-"); - let val = json.defaultValue; - if(relationFieldAll.length>1 && index>-1){ - val = this.dataForm[relationFieldAll[0]+'List']&&this.dataForm[relationFieldAll[0]+'List'].length?this.dataForm[relationFieldAll[0]+'List'][index][relationFieldAll[1]]:'' - }else { - val = this.dataForm[relationFieldAll] - } - json.defaultValue = val - } - } - let template ={ - paramList:templateJsonList - } - getDataInterfaceRes('520259300875047493',template).then(res => { - let data = res.data - this.stationCodeOptions = data - this.changeDataFormData(1,'stationCode','stationCode',index,'') - }) - }, clearData(){ this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll)) }, diff --git a/jnpf-java-boot/jnpf-web/src/views/stationarea/index.vue b/jnpf-java-boot/jnpf-web/src/views/stationarea/index.vue index 281b3f5..3b71548 100644 --- a/jnpf-java-boot/jnpf-web/src/views/stationarea/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/stationarea/index.vue @@ -11,11 +11,8 @@ - - - + + @@ -27,30 +24,17 @@ - - + + + - 查询 重置 - - 展开 - - - 收起 - @@ -77,33 +61,48 @@ > + prop="stationCode" + label="站点编号" align="center" + sortable="custom" > + + + + + + { - let data = res.data - this.stationCodeOptions = data - }) - }, getareaTypeOptions() { getDictionaryDataSelector('560423985691492677').then(res => { this.areaTypeOptions = res.data.list diff --git a/jnpf-java-boot/jnpf-web/src/views/stationarea/superQueryJson.js b/jnpf-java-boot/jnpf-web/src/views/stationarea/superQueryJson.js index da37bcb..8d58d96 100644 --- a/jnpf-java-boot/jnpf-web/src/views/stationarea/superQueryJson.js +++ b/jnpf-java-boot/jnpf-web/src/views/stationarea/superQueryJson.js @@ -1,2 +1,2 @@ -const superQueryJson = [{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"区域名称","addonAfter":"","__config__":{"formId":101,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"围栏区域名称","dragDisabled":false,"className":[],"label":"区域名称","trigger":"blur","showLabel":true,"required":true,"tableName":"nx_station_area","renderKey":1715752071089,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"showWordLimit":false,"__vModel__":"areaName","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"areaName","placeholder":"电子围栏名称","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"filterable":false,"clearable":true,"multiple":false,"fullName":"区域类型","props":{"label":"fullName","value":"enCode"},"__config__":{"formId":102,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"1","noShow":false,"dataType":"dictionary","dictionaryType":"560423985691492677","tipLabel":"请选择围栏类型","dragDisabled":false,"className":[],"label":"区域类型","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"nx_station_area","renderKey":1715752074918,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":24},"options":[{"enCode":"1","children":null,"hasChildren":false,"fullName":"接单区域","id":"560424128079724869","parentId":"0"},{"enCode":"2","children":null,"hasChildren":false,"fullName":"不接单区域","id":"560424264616902981","parentId":"0"}],"__vModel__":"areaType","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"areaType","placeholder":"请选择围栏类型","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"border":false,"fullName":"是否启用","props":{"label":"fullName","value":"enCode"},"optionType":"default","__config__":{"formId":108,"visibility":["pc","app"],"jnpfKey":"radio","defaultValue":"1","noShow":false,"dataType":"dictionary","dictionaryType":"519107761586309125","tipLabel":"","dragDisabled":false,"className":[],"label":"是否启用","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"nx_station_area","renderKey":1715752554218,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-radio","propsName":"","tag":"JnpfRadio","regList":[],"span":24},"size":"small","options":[{"enCode":"0","children":null,"hasChildren":false,"fullName":"禁用","id":"519107882239657989","parentId":"0"},{"enCode":"1","children":null,"hasChildren":false,"fullName":"启用","id":"519107823167080453","parentId":"0"}],"__vModel__":"status","style":{},"disabled":false,"interfaceHasPage":false,"id":"status","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"direction":"horizontal"},{"filterable":false,"clearable":true,"multiple":false,"fullName":"所属回收站","props":{"label":"fullName","value":"id"},"__config__":{"formId":119,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"dynamic","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"所属回收站","trigger":"change","propsUrl":"520259300875047493","templateJson":[],"showLabel":true,"required":true,"tableName":"nx_station_area","renderKey":1715754670040,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"查询全部回收站","tag":"JnpfSelect","regList":[],"span":24},"options":[],"__vModel__":"stationCode","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"stationCode","placeholder":"选择本组织回收站进行绑定","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":"65539","suffixIcon":"","fullName":"地图信息","addonAfter":"","__config__":{"formId":109,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"在地图上做选择","dragDisabled":false,"className":[],"label":"地图信息","trigger":"blur","showLabel":true,"required":true,"tableName":"nx_station_area","renderKey":1715752808402,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"showWordLimit":false,"__vModel__":"areaMapInfo","showPassword":true,"style":{"width":"100%"},"disabled":true,"id":"areaMapInfo","placeholder":"绘制电子围栏区域","prefixIcon":"ym-custom ym-custom-google-maps","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"maxlength":null,"fullName":"区域描述","type":"textarea","autoSize":{"minRows":4,"maxRows":4},"__config__":{"formId":103,"visibility":["pc","app"],"jnpfKey":"textarea","noShow":false,"tipLabel":"请输入区域描述","dragDisabled":false,"className":[],"label":"区域描述","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_station_area","renderKey":1715752078721,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-textarea","tag":"JnpfTextarea","regList":[],"span":24},"readonly":false,"showWordLimit":true,"__vModel__":"areaDesc","style":{"width":"100%"},"disabled":false,"id":"areaDesc","placeholder":"请输入不超过两百字的标题描述","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}}] +const superQueryJson = [{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"区域名称","addonAfter":"","__config__":{"formId":101,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"围栏区域名称","dragDisabled":false,"className":[],"label":"区域名称","trigger":"blur","showLabel":true,"required":true,"tableName":"nx_station_area","renderKey":1715752071089,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"showWordLimit":false,"__vModel__":"areaName","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"areaName","placeholder":"电子围栏名称","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"filterable":false,"clearable":true,"multiple":false,"fullName":"区域类型","props":{"label":"fullName","value":"enCode"},"__config__":{"formId":102,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"dictionary","dictionaryType":"560423985691492677","tipLabel":"请选择围栏类型","dragDisabled":false,"className":[],"label":"区域类型","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"nx_station_area","renderKey":1715752074918,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":24},"options":[{"enCode":"1","children":null,"hasChildren":false,"fullName":"接单区域","id":"560424128079724869","parentId":"0"},{"enCode":"2","children":null,"hasChildren":false,"fullName":"不接单区域","id":"560424264616902981","parentId":"0"}],"__vModel__":"areaType","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"areaType","placeholder":"请选择围栏类型","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"border":false,"fullName":"是否启用","props":{"label":"fullName","value":"enCode"},"optionType":"default","__config__":{"formId":108,"visibility":["pc","app"],"jnpfKey":"radio","defaultValue":"1","noShow":false,"dataType":"dictionary","dictionaryType":"519107761586309125","tipLabel":"","dragDisabled":false,"className":[],"label":"是否启用","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"nx_station_area","renderKey":1715752554218,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-radio","propsName":"","tag":"JnpfRadio","regList":[],"span":24},"size":"small","options":[{"enCode":"0","children":null,"hasChildren":false,"fullName":"禁用","id":"519107882239657989","parentId":"0"},{"enCode":"1","children":null,"hasChildren":false,"fullName":"启用","id":"519107823167080453","parentId":"0"}],"__vModel__":"status","style":{},"disabled":false,"interfaceHasPage":false,"id":"status","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"direction":"horizontal"},{"popupType":"dialog","hasPage":true,"clearable":true,"fullName":"站点编号","pageSize":20,"columnOptions":[{"label":"站点编码","value":"station_code"},{"label":"站点名称","value":"station_name"}],"templateJson":[],"relationField":"station_name","__config__":{"formId":124,"visibility":["pc","app"],"jnpfKey":"popupSelect","defaultValue":"","noShow":false,"tipLabel":"绑定站点编码","dragDisabled":false,"className":[],"label":"站点编号","trigger":"change","showLabel":true,"required":true,"tableName":"nx_station_area","renderKey":1716183392539,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-popup","tag":"JnpfPopupSelect","regList":[],"span":24},"popupTitle":"选择数据","__vModel__":"stationCode","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"stationCode","placeholder":"请选择为那个站点绘制区域","interfaceId":"520259300875047493","interfaceName":"查询全部回收站","popupWidth":"800px","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"propsValue":"station_code"},{"clearable":true,"maxlength":"65539","suffixIcon":"","fullName":"地图信息","addonAfter":"","__config__":{"formId":109,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"在地图上绘制电子围栏","dragDisabled":false,"className":[],"label":"地图信息","trigger":"blur","showLabel":true,"required":true,"tableName":"nx_station_area","renderKey":1715752808402,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"showWordLimit":false,"__vModel__":"areaMapInfo","showPassword":true,"style":{"width":"100%"},"disabled":true,"id":"areaMapInfo","placeholder":"绘制电子围栏区域","prefixIcon":"el-icon-map-location","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"maxlength":null,"fullName":"区域描述","type":"textarea","autoSize":{"minRows":4,"maxRows":4},"__config__":{"formId":103,"visibility":["pc","app"],"jnpfKey":"textarea","noShow":false,"tipLabel":"请输入区域描述","dragDisabled":false,"className":[],"label":"区域描述","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_station_area","renderKey":1715752078721,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-textarea","tag":"JnpfTextarea","regList":[],"span":24},"readonly":false,"showWordLimit":true,"__vModel__":"areaDesc","style":{"width":"100%"},"disabled":false,"id":"areaDesc","placeholder":"请输入不超过两百字的区域描述","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"__config__":{"formId":120,"visibility":["pc","app"],"jnpfKey":"createUser","defaultValue":"","noShow":true,"tipLabel":"","dragDisabled":false,"className":[],"label":"创建用户","showLabel":true,"required":false,"tableName":"nx_station_area","renderKey":1716175629683,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-founder","tag":"JnpfOpenData","span":24},"readonly":true,"__vModel__":"creatorUserId","fullName":"创建用户","style":{"width":"100%"},"id":"creatorUserId","placeholder":"","type":"currUser"},{"__config__":{"formId":121,"visibility":["pc","app"],"jnpfKey":"createTime","defaultValue":"","noShow":true,"tipLabel":"","dragDisabled":false,"className":[],"label":"删除时间","showLabel":true,"required":false,"tableName":"nx_station_area","renderKey":1716175632682,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-createtime","tag":"JnpfOpenData","span":24},"readonly":true,"__vModel__":"deleteTime","fullName":"删除时间","style":{"width":"100%"},"id":"deleteTime","placeholder":"","type":"currTime"},{"__config__":{"formId":122,"visibility":["pc","app"],"jnpfKey":"modifyUser","defaultValue":"","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"修改用户","showLabel":true,"required":false,"tableName":"nx_station_area","renderKey":1716175633950,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-modifier","tag":"JnpfInput","span":24},"readonly":true,"__vModel__":"lastModifyUserId","fullName":"修改用户","style":{"width":"100%"},"id":"lastModifyUserId","placeholder":"系统自动生成"},{"__config__":{"formId":123,"visibility":["pc","app"],"jnpfKey":"modifyTime","defaultValue":"","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"修改时间","showLabel":true,"required":false,"tableName":"nx_station_area","renderKey":1716175636085,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-modifytime","tag":"JnpfInput","span":24},"readonly":true,"__vModel__":"lastModifyTime","fullName":"修改时间","style":{"width":"100%"},"id":"lastModifyTime","placeholder":"系统自动生成"}] export default superQueryJson \ No newline at end of file