Skip to content

cfld-liyeyun-admin
cfld-liyeyun-admin
Commit 896e3a9c authored by yaobaizheng's avatar yaobaizheng
Browse files
Options

细节调整

parent 57a215a8
Show whitespace changes
Inline Side-by-side
Showing with 247 additions and 44 deletions
ruoyi-system/src/main/java/com/ruoyi/system/VO/BaseInfoParam.java
View file @ 896e3a9c
...@@ -12,6 +12,12 @@ public class BaseInfoParam extends BaseEntity { ...@@ -12,6 +12,12 @@ public class BaseInfoParam extends BaseEntity {
/** 片区名称 */ /** 片区名称 */
private String name; private String name;
/** 主键id */
private Integer parentId;
/** 片区名称 */
private String parentName;
public Integer getType() { public Integer getType() {
return type; return type;
} }
...@@ -28,11 +34,29 @@ public class BaseInfoParam extends BaseEntity { ...@@ -28,11 +34,29 @@ public class BaseInfoParam extends BaseEntity {
this.name = name; this.name = name;
} }
public Integer getParentId() {
return parentId;
}
public void setParentId(Integer parentId) {
this.parentId = parentId;
}
public String getParentName() {
return parentName;
}
public void setParentName(String parentName) {
this.parentName = parentName;
}
@Override @Override
public String toString() { public String toString() {
return "BaseInfoParam{" + return "BaseInfoParam{" +
"type=" + type + "type=" + type +
", name='" + name + '\'' + ", name='" + name + '\'' +
", parentId=" + parentId +
", parentName='" + parentName + '\'' +
'}'; '}';
} }
} }
ruoyi-system/src/main/java/com/ruoyi/system/VO/BaseInfoVO.java
View file @ 896e3a9c
...@@ -12,6 +12,12 @@ public class BaseInfoVO extends BaseEntity { ...@@ -12,6 +12,12 @@ public class BaseInfoVO extends BaseEntity {
/** 名称 */ /** 名称 */
private String name; private String name;
/** 主键id */
private Long parentId;
/** 名称 */
private String parentName;
public Long getId() { public Long getId() {
return id; return id;
} }
...@@ -28,11 +34,29 @@ public class BaseInfoVO extends BaseEntity { ...@@ -28,11 +34,29 @@ public class BaseInfoVO extends BaseEntity {
this.name = name; this.name = name;
} }
public Long getParentId() {
return parentId;
}
public void setParentId(Long parentId) {
this.parentId = parentId;
}
public String getParentName() {
return parentName;
}
public void setParentName(String parentName) {
this.parentName = parentName;
}
@Override @Override
public String toString() { public String toString() {
return "BaseInfoVO{" + return "BaseInfoVO{" +
"id=" + id + "id=" + id +
", name='" + name + '\'' + ", name='" + name + '\'' +
", parentId=" + parentId +
", parentName='" + parentName + '\'' +
'}'; '}';
} }
} }
ruoyi-system/src/main/java/com/ruoyi/system/controller/DevelopmentIndustrialLandInfoController.java
View file @ 896e3a9c
...@@ -50,7 +50,7 @@ public class DevelopmentIndustrialLandInfoController extends BaseController ...@@ -50,7 +50,7 @@ public class DevelopmentIndustrialLandInfoController extends BaseController
public TableDataInfo list(DevelopmentIndustrialLandInfo developmentIndustrialLandInfo) public TableDataInfo list(DevelopmentIndustrialLandInfo developmentIndustrialLandInfo)
{ {
startPage(); startPage();
List<DevelopmentIndustrialLandInfo> list = developmentIndustrialLandInfoService.selectDevelopmentIndustrialLandInfoList(developmentIndustrialLandInfo); List<DevelopmentIndustrialLandInfo> list = developmentIndustrialLandInfoService.selectLandInfoList(developmentIndustrialLandInfo);
return getDataTable(list); return getDataTable(list);
} }
......
ruoyi-system/src/main/java/com/ruoyi/system/controller/SysCarouselInfoController.java
View file @ 896e3a9c
...@@ -222,10 +222,13 @@ public class SysCarouselInfoController extends BaseController ...@@ -222,10 +222,13 @@ public class SysCarouselInfoController extends BaseController
}else if(type == 4){ }else if(type == 4){
DevelopmentIndustrialLandInfo info = new DevelopmentIndustrialLandInfo(); DevelopmentIndustrialLandInfo info = new DevelopmentIndustrialLandInfo();
info.setName(baseInfoParam.getName()); info.setName(baseInfoParam.getName());
List<DevelopmentIndustrialLandInfo> infos = developmentIndustrialLandInfoService.selectDevelopmentIndustrialLandInfoList(info); info.setDevelopmentName(baseInfoParam.getParentName());
List<DevelopmentIndustrialLandInfo> infos = developmentIndustrialLandInfoService.selectLandInfoList(info);
list = infos.stream().map(e -> { list = infos.stream().map(e -> {
BaseInfoVO baseInfoVO = new BaseInfoVO(); BaseInfoVO baseInfoVO = new BaseInfoVO();
BeanUtils.copyProperties(e, baseInfoVO); BeanUtils.copyProperties(e, baseInfoVO);
baseInfoVO.setParentId(e.getDevelopmentId());
baseInfoVO.setParentName(e.getDevelopmentName());
return baseInfoVO; return baseInfoVO;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
rspData.setRows(list); rspData.setRows(list);
...@@ -233,11 +236,14 @@ public class SysCarouselInfoController extends BaseController ...@@ -233,11 +236,14 @@ public class SysCarouselInfoController extends BaseController
}else if(type == 5){ }else if(type == 5){
CarrierInfo info = new CarrierInfo(); CarrierInfo info = new CarrierInfo();
info.setBuildingNumber(baseInfoParam.getName()); info.setBuildingNumber(baseInfoParam.getName());
info.setParkName(baseInfoParam.getParentName());
List<CarrierInfo> infos = carrierInfoService.selectCarrierInfoList(info); List<CarrierInfo> infos = carrierInfoService.selectCarrierInfoList(info);
list = infos.stream().map(e -> { list = infos.stream().map(e -> {
BaseInfoVO baseInfoVO = new BaseInfoVO(); BaseInfoVO baseInfoVO = new BaseInfoVO();
BeanUtils.copyProperties(e, baseInfoVO); BeanUtils.copyProperties(e, baseInfoVO);
baseInfoVO.setName(e.getBuildingNumber()); baseInfoVO.setName(e.getBuildingNumber());
baseInfoVO.setParentId(e.getParkId());
baseInfoVO.setParentName(e.getParkName());
return baseInfoVO; return baseInfoVO;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
rspData.setRows(list); rspData.setRows(list);
......
ruoyi-system/src/main/java/com/ruoyi/system/controller/SysCarouselVRInfoController.java
View file @ 896e3a9c
...@@ -222,7 +222,7 @@ public class SysCarouselVRInfoController extends BaseController ...@@ -222,7 +222,7 @@ public class SysCarouselVRInfoController extends BaseController
}else if(type == 4){ }else if(type == 4){
DevelopmentIndustrialLandInfo info = new DevelopmentIndustrialLandInfo(); DevelopmentIndustrialLandInfo info = new DevelopmentIndustrialLandInfo();
info.setName(baseInfoParam.getName()); info.setName(baseInfoParam.getName());
List<DevelopmentIndustrialLandInfo> infos = developmentIndustrialLandInfoService.selectDevelopmentIndustrialLandInfoList(info); List<DevelopmentIndustrialLandInfo> infos = developmentIndustrialLandInfoService.selectLandInfoList(info);
list = infos.stream().map(e -> { list = infos.stream().map(e -> {
BaseInfoVO baseInfoVO = new BaseInfoVO(); BaseInfoVO baseInfoVO = new BaseInfoVO();
BeanUtils.copyProperties(e, baseInfoVO); BeanUtils.copyProperties(e, baseInfoVO);
......
ruoyi-system/src/main/java/com/ruoyi/system/domain/DevelopmentIndustrialLandInfo.java
View file @ 896e3a9c
...@@ -43,6 +43,10 @@ public class DevelopmentIndustrialLandInfo extends BaseEntity ...@@ -43,6 +43,10 @@ public class DevelopmentIndustrialLandInfo extends BaseEntity
@Excel(name = "开发区id") @Excel(name = "开发区id")
private Long developmentId; private Long developmentId;
/** 开发区id */
@Excel(name = "开发区id")
private String developmentName;
/** 产业方向 */ /** 产业方向 */
@Excel(name = "产业方向") @Excel(name = "产业方向")
private String industryDirection; private String industryDirection;
...@@ -183,6 +187,14 @@ public class DevelopmentIndustrialLandInfo extends BaseEntity ...@@ -183,6 +187,14 @@ public class DevelopmentIndustrialLandInfo extends BaseEntity
this.industryDirection = industryDirection; this.industryDirection = industryDirection;
} }
public String getDevelopmentName() {
return developmentName;
}
public void setDevelopmentName(String developmentName) {
this.developmentName = developmentName;
}
public String getIndustryDirection() public String getIndustryDirection()
{ {
return industryDirection; return industryDirection;
...@@ -351,6 +363,7 @@ public class DevelopmentIndustrialLandInfo extends BaseEntity ...@@ -351,6 +363,7 @@ public class DevelopmentIndustrialLandInfo extends BaseEntity
.append("type", getType()) .append("type", getType())
.append("landStatus", getLandStatus()) .append("landStatus", getLandStatus())
.append("developmentId", getDevelopmentId()) .append("developmentId", getDevelopmentId())
.append("developmentName", getDevelopmentName())
.append("industryDirection", getIndustryDirection()) .append("industryDirection", getIndustryDirection())
.append("contacterName", getContacterName()) .append("contacterName", getContacterName())
.append("contacterPhone", getContacterPhone()) .append("contacterPhone", getContacterPhone())
......
ruoyi-system/src/main/java/com/ruoyi/system/mapper/DevelopmentIndustrialLandInfoMapper.java
View file @ 896e3a9c
...@@ -27,6 +27,8 @@ public interface DevelopmentIndustrialLandInfoMapper ...@@ -27,6 +27,8 @@ public interface DevelopmentIndustrialLandInfoMapper
*/ */
public List<DevelopmentIndustrialLandInfo> selectDevelopmentIndustrialLandInfoList(DevelopmentIndustrialLandInfo developmentIndustrialLandInfo); public List<DevelopmentIndustrialLandInfo> selectDevelopmentIndustrialLandInfoList(DevelopmentIndustrialLandInfo developmentIndustrialLandInfo);
public List<DevelopmentIndustrialLandInfo> selectLandInfoList(DevelopmentIndustrialLandInfo developmentIndustrialLandInfo);
/** /**
* 新增土地信息 * 新增土地信息
* *
......
ruoyi-system/src/main/java/com/ruoyi/system/service/IDevelopmentIndustrialLandInfoService.java
View file @ 896e3a9c
...@@ -26,6 +26,7 @@ public interface IDevelopmentIndustrialLandInfoService ...@@ -26,6 +26,7 @@ public interface IDevelopmentIndustrialLandInfoService
* @return 土地信息集合 * @return 土地信息集合
*/ */
public List<DevelopmentIndustrialLandInfo> selectDevelopmentIndustrialLandInfoList(DevelopmentIndustrialLandInfo developmentIndustrialLandInfo); public List<DevelopmentIndustrialLandInfo> selectDevelopmentIndustrialLandInfoList(DevelopmentIndustrialLandInfo developmentIndustrialLandInfo);
public List<DevelopmentIndustrialLandInfo> selectLandInfoList(DevelopmentIndustrialLandInfo developmentIndustrialLandInfo);
/** /**
* 新增土地信息 * 新增土地信息
......
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DevelopmentIndustrialLandInfoServiceImpl.java
View file @ 896e3a9c
...@@ -45,6 +45,12 @@ public class DevelopmentIndustrialLandInfoServiceImpl implements IDevelopmentInd ...@@ -45,6 +45,12 @@ public class DevelopmentIndustrialLandInfoServiceImpl implements IDevelopmentInd
return developmentIndustrialLandInfoMapper.selectDevelopmentIndustrialLandInfoList(developmentIndustrialLandInfo); return developmentIndustrialLandInfoMapper.selectDevelopmentIndustrialLandInfoList(developmentIndustrialLandInfo);
} }
@Override
public List<DevelopmentIndustrialLandInfo> selectLandInfoList(DevelopmentIndustrialLandInfo developmentIndustrialLandInfo)
{
return developmentIndustrialLandInfoMapper.selectLandInfoList(developmentIndustrialLandInfo);
}
/** /**
* 新增土地信息 * 新增土地信息
* *
......
ruoyi-system/src/main/resources/mapper/land/DevelopmentIndustrialLandInfoMapper.xml
View file @ 896e3a9c
...@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="type" column="type" /> <result property="type" column="type" />
<result property="landStatus" column="land_status" /> <result property="landStatus" column="land_status" />
<result property="developmentId" column="development_id" /> <result property="developmentId" column="development_id" />
<result property="developmentName" column="development_name" />
<result property="industryDirection" column="industry_direction" /> <result property="industryDirection" column="industry_direction" />
<result property="contacterName" column="contacter_name" /> <result property="contacterName" column="contacter_name" />
<result property="contacterPhone" column="contacter_phone" /> <result property="contacterPhone" column="contacter_phone" />
...@@ -70,6 +71,48 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -70,6 +71,48 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where> </where>
</select> </select>
<sql id="landInfoVo">
select dili.id, dili.name, dili.address, dili.area, dili.type,
dili.land_status, dili.development_id, dili.industry_direction, dili.contacter_name, dili.contacter_phone,
dili.price, dili.img_url, dili.ratio, dili.land_deed, dili.age_limit,
dili.develop_level, dili.shell_state, dili.holder_type, dili.total_investment, dili.output_value,
dili.invest_num, dili.tax_revenue, dili.construction_cycle, dili.energy_require, dili.version,
dili.create_by, dili.create_time, dili.update_by, dili.update_time,di.name development_name from development_industrial_land_info dili
LEFT JOIN development_info di ON dili.development_id = di.id
</sql>
<select id="selectLandInfoList" parameterType="DevelopmentIndustrialLandInfo" resultMap="DevelopmentIndustrialLandInfoResult">
<include refid="landInfoVo"/>
<where>
<if test="name != null and name != ''"> and dili.name like concat('%', #{name}, '%')</if>
<if test="address != null and address != ''"> and dili.address = #{address}</if>
<if test="area != null "> and dili.area = #{area}</if>
<if test="type != null and type != ''"> and dili.type = #{type}</if>
<if test="landStatus != null and landStatus != ''"> and dili.land_status = #{landStatus}</if>
<if test="developmentId != null "> and dili.development_id = #{developmentId}</if>
<if test="developmentName != null and developmentName != '' "> and di.name = #{developmentName}</if>
<if test="industryDirection != null and industryDirection != ''"> and dili.industry_direction = #{industryDirection}</if>
<if test="contacterName != null and contacterName != ''"> and dili.contacter_name like concat('%', #{contacterName}, '%')</if>
<if test="contacterPhone != null and contacterPhone != ''"> and dili.contacter_phone = #{contacterPhone}</if>
<if test="price != null "> and dili.price = #{price}</if>
<if test="imgUrl != null and imgUrl != ''"> and dili.img_url = #{imgUrl}</if>
<if test="ratio != null and ratio != ''"> and dili.ratio = #{ratio}</if>
<if test="landDeed != null and landDeed != ''"> and dili.land_deed = #{landDeed}</if>
<if test="ageLimit != null and ageLimit != ''"> and dili.age_limit = #{ageLimit}</if>
<if test="developLevel != null and developLevel != ''"> and dili.develop_level = #{developLevel}</if>
<if test="shellState != null and shellState != ''"> and dili.shell_state = #{shellState}</if>
<if test="holderType != null and holderType != ''"> and dili.holder_type = #{holderType}</if>
<if test="totalInvestment != null and totalInvestment != ''"> and dili.total_investment = #{totalInvestment}</if>
<if test="outputValue != null and outputValue != ''"> and dili.output_value = #{outputValue}</if>
<if test="investNum != null "> and dili.invest_num = #{investNum}</if>
<if test="taxRevenue != null and taxRevenue != ''"> and dili.tax_revenue = #{taxRevenue}</if>
<if test="constructionCycle != null and constructionCycle != ''"> and dili.construction_cycle = #{constructionCycle}</if>
<if test="energyRequire != null and energyRequire != ''"> and dili.energy_require = #{energyRequire}</if>
<if test="version != null "> and dili.version = #{version}</if>
</where>
</select>
<select id="selectDevelopmentIndustrialLandInfoById" parameterType="Long" resultMap="DevelopmentIndustrialLandInfoResult"> <select id="selectDevelopmentIndustrialLandInfoById" parameterType="Long" resultMap="DevelopmentIndustrialLandInfoResult">
<include refid="selectDevelopmentIndustrialLandInfoVo"/> <include refid="selectDevelopmentIndustrialLandInfoVo"/>
where id = #{id} where id = #{id}
......
ruoyi-system/src/main/resources/templates/carousel/info/selectType.html
View file @ 896e3a9c
...@@ -20,6 +20,14 @@ ...@@ -20,6 +20,14 @@
<li> <li>
<input type="hidden" name="type" id="type" th:value="${type}" > <input type="hidden" name="type" id="type" th:value="${type}" >
</li> </li>
<!-- <li>-->
<!-- <label>所属id：</label>-->
<!-- <input type="hidden" name="parentId" />-->
<!-- </li>-->
<li>
<label>所属名称：</label>
<input type="text" name="parentName">
</li>
<li> <li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a> <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a> <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
...@@ -66,6 +74,14 @@ ...@@ -66,6 +74,14 @@
{ {
field : 'name', field : 'name',
title : '名称' title : '名称'
},
{
field : 'parentId',
title : '所属id'
},
{
field : 'parentName',
title : '所属名称'
} }
// , // ,
// { // {
......
ruoyi-system/src/main/resources/templates/carrier/info/add.html
View file @ 896e3a9c
...@@ -7,40 +7,43 @@ ...@@ -7,40 +7,43 @@
<body class="white-bg"> <body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> <div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-info-add"> <form class="form-horizontal m" id="form-info-add">
<div class="form-group"> <!-- <div class="form-group"> -->
<label class="col-sm-3 control-label">所属集团id(1-产业新城；2-幸福产城)：</label> <!-- <label class="col-sm-3 control-label">所属集团id(1-产业新城；2-幸福产城)：</label>-->
<div class="col-sm-8"> <!-- <div class="col-sm-8">-->
<input name="groupId" class="form-control" type="text"> <!-- <input name="groupId" class="form-control" type="text">-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div class="form-group"> <!-- <div class="form-group"> -->
<label class="col-sm-3 control-label">所属集团：</label> <!-- <label class="col-sm-3 control-label">所属集团：</label>-->
<div class="col-sm-8"> <!-- <div class="col-sm-8">-->
<input name="groupName" class="form-control" type="text"> <!-- <input name="groupName" class="form-control" type="text">-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div class="form-group"> <!-- <div class="form-group"> -->
<label class="col-sm-3 control-label">所属片区id：</label> <!-- <label class="col-sm-3 control-label">所属片区id：</label>-->
<div class="col-sm-8"> <!-- <div class="col-sm-8">-->
<input name="zoneId" class="form-control" type="text"> <!-- <input name="zoneId" class="form-control" type="text">-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div class="form-group"> <!-- <div class="form-group"> -->
<label class="col-sm-3 control-label">所属片区：</label> <!-- <label class="col-sm-3 control-label">所属片区：</label>-->
<div class="col-sm-8"> <!-- <div class="col-sm-8">-->
<input name="zoneName" class="form-control" type="text"> <!-- <input name="zoneName" class="form-control" type="text">-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">所属园区id：</label> <label class="col-sm-3 control-label">所属园区id：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="parkId" class="form-control" type="text"> <input id="parkId" name="parkId" class="form-control" type="text" readonly>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">所属园区名称：</label> <label class="col-sm-3 control-label">所属园区名称：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="parkName" class="form-control" type="text"> <div class="input-group">
<input id="parkName" name="parkName" class="form-control" type="text" onclick="selectType()">
<span class="input-group-addon"><i class="fa fa-search"></i></span>
</div>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
...@@ -169,6 +172,28 @@ ...@@ -169,6 +172,28 @@
$.operate.save(prefix + "/add", $('#form-info-add').serialize()); $.operate.save(prefix + "/add", $('#form-info-add').serialize());
} }
} }
function selectType(){
var options = {
title: '选择',
url: "carousel/info/selectType?type=2",
callBack: doSubmit2
};
$.modal.openOptions(options);
}
function doSubmit2(index, layero){
var rows = layero.find("iframe")[0].contentWindow.getSelections();
if (rows.length == 0) {
$.modal.alertWarning("请至少选择一条记录");
return;
}
// $('#userids').html('我是通过方式二来的：' + rows.join())
$('#parkName').val(rows.name);
$('#parkId').val(rows.id);
$.modal.close(index);
}
$(".img-upload").each(function (i) { $(".img-upload").each(function (i) {
var val = $("input[name='" + this.id + "']").val() var val = $("input[name='" + this.id + "']").val()
$(this).fileinput({ $(this).fileinput({
......
ruoyi-system/src/main/resources/templates/carrier/info/edit.html
View file @ 896e3a9c
...@@ -35,13 +35,13 @@ ...@@ -35,13 +35,13 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">所属园区id：</label> <label class="col-sm-3 control-label">所属园区id：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="parkId" th:field="*{parkId}" class="form-control" type="text"> <input name="parkId" th:field="*{parkId}" class="form-control" type="text" readonly>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">所属园区名称：</label> <label class="col-sm-3 control-label">所属园区名称：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="parkName" th:field="*{parkName}" class="form-control" type="text"> <input name="parkName" th:field="*{parkName}" class="form-control" type="text" readonly>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
......
ruoyi-system/src/main/resources/templates/land/info/add.html
View file @ 896e3a9c
...@@ -25,12 +25,21 @@ ...@@ -25,12 +25,21 @@
<input name="area" class="form-control" type="text"> <input name="area" class="form-control" type="text">
</div> </div>
</div> </div>
<!-- <div class="form-group"> --> <div class="form-group">
<!-- <label class="col-sm-3 control-label is-required">开发区id：</label>--> <label class="col-sm-3 control-label ">所属开发区id：</label>
<!-- <div class="col-sm-8">--> <div class="col-sm-8">
<!-- <input name="developmentId" class="form-control" type="text" required>--> <input id="developmentId" name="developmentId" class="form-control" type="text" readonly>
<!-- </div>--> </div>
<!-- </div>--> </div>
<div class="form-group">
<label class="col-sm-3 control-label ">所属开发区：</label>
<div class="col-sm-8">
<div class="input-group">
<input id="developmentName" name="developmentName" class="form-control" type="text" onclick="selectType()" >
<span class="input-group-addon"><i class="fa fa-search"></i></span>
</div>
</div>
</div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">土地类型：</label> <label class="col-sm-3 control-label">土地类型：</label>
<div class="col-sm-8"> <div class="col-sm-8">
...@@ -164,6 +173,27 @@ ...@@ -164,6 +173,27 @@
} }
} }
function selectType(){
var options = {
title: '选择',
url: "carousel/info/selectType?type=1",
callBack: doSubmit2
};
$.modal.openOptions(options);
}
function doSubmit2(index, layero){
var rows = layero.find("iframe")[0].contentWindow.getSelections();
if (rows.length == 0) {
$.modal.alertWarning("请至少选择一条记录");
return;
}
// $('#userids').html('我是通过方式二来的：' + rows.join())
$('#developmentName').val(rows.name);
$('#developmentId').val(rows.id);
$.modal.close(index);
}
$(".img-upload").each(function (i) { $(".img-upload").each(function (i) {
var val = $("input[name='" + this.id + "']").val() var val = $("input[name='" + this.id + "']").val()
$(this).fileinput({ $(this).fileinput({
......
ruoyi-system/src/main/resources/templates/land/info/edit.html
View file @ 896e3a9c
...@@ -26,10 +26,19 @@ ...@@ -26,10 +26,19 @@
<input name="area" th:field="*{area}" class="form-control" type="text"> <input name="area" th:field="*{area}" class="form-control" type="text">
</div> </div>
</div> </div>
<!-- <div class="form-group"> --> <div class="form-group">
<!-- <label class="col-sm-3 control-label is-required">开发区id：</label>--> <label class="col-sm-3 control-label ">所属开发区id：</label>
<div class="col-sm-8">
<input id="developmentId" name="developmentId" th:field="*{developmentId}" class="form-control" type="text" readonly>
</div>
</div>
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label ">所属开发区：</label>-->
<!-- <div class="col-sm-8">--> <!-- <div class="col-sm-8">-->
<!-- <input name="developmentId" th:field="*{developmentId}" class="form-control" type="text" required>--> <!-- <div class="input-group">-->
<!-- <input id="developmentName" name="developmentName" th:field="*{developmentName}" class="form-control" type="text" onclick="selectType()" >-->
<!-- <span class="input-group-addon"><i class="fa fa-search"></i></span>-->
<!-- </div>-->
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
<div class="form-group"> <div class="form-group">
......
ruoyi-system/src/main/resources/templates/land/info/info.html
View file @ 896e3a9c
...@@ -72,14 +72,18 @@ ...@@ -72,14 +72,18 @@
title: '主键id', title: '主键id',
visible: false visible: false
}, },
{
field: 'name',
title: '地块名称'
},
{ {
field: 'developmentId', field: 'developmentId',
title: '所属开发区id' title: '所属开发区id'
}, },
{
field: 'developmentName',
title: '所属开发区'
},
{
field: 'name',
title: '地块名称'
},
{ {
field: 'address', field: 'address',
title: '位置信息' title: '位置信息'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment