Skip to content

F
fgqyxxlr
Commit 41884a7b by liru
Options

修改

parent f59cf6c0
Showing with 64 additions and 28 deletions
ruoyi-admin/src/main/resources/templates/system/fgqy/add.html
...@@ -224,7 +224,6 @@ ...@@ -224,7 +224,6 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">住所：</label> <label class="col-sm-3 control-label">住所：</label>
...@@ -233,6 +232,16 @@ ...@@ -233,6 +232,16 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">企业状态：</label>
<div class="col-sm-8">
<select name="lx" class="form-control m-b" th:with="type=${@dict.getType('orhon_lx')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
</div>
</div> </div>
<h4 class="form-header h4">党组织情况</h4> <h4 class="form-header h4">党组织情况</h4>
...@@ -303,12 +312,11 @@ ...@@ -303,12 +312,11 @@
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<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">
<div class="radio-box" th:each="dict : ${@dict.getType('is_tzz')}"> <select name="type" class="form-control m-b" th:with="type=${@dict.getType('is_tzz')}">
<input type="radio" th:id="${'istzz_' + dict.dictCode}" name="istzz" th:value="${dict.dictValue}" th:checked="${dict.default}"> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
<label th:for="${'istzz_' + dict.dictCode}" th:text="${dict.dictLabel}"></label> </select>
</div>
</div> </div>
</div> </div>
</div> </div>
......
ruoyi-admin/src/main/resources/templates/system/fgqy/edit.html
...@@ -224,7 +224,6 @@ ...@@ -224,7 +224,6 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">住所：</label> <label class="col-sm-3 control-label">住所：</label>
...@@ -233,6 +232,16 @@ ...@@ -233,6 +232,16 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">企业状态：</label>
<div class="col-sm-8">
<select name="lx" th:field="*{lx}" class="form-control m-b" th:with="type=${@dict.getType('orhon_lx')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
</div>
</div> </div>
<h4 class="form-header h4">党组织情况</h4> <h4 class="form-header h4">党组织情况</h4>
...@@ -304,12 +313,11 @@ ...@@ -304,12 +313,11 @@
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<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">
<div class="radio-box" th:each="dict : ${@dict.getType('is_tzz')}"> <select name="type" class="form-control m-b" th:with="type=${@dict.getType('is_tzz')}">
<input type="radio" th:id="${'istzz_' + dict.dictCode}" name="istzz" th:value="${dict.dictValue}" th:checked="${dict.default}" th:field="*{istzz}"> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
<label th:for="${'istzz_' + dict.dictCode}" th:text="${dict.dictLabel}"></label> </select>
</div>
</div> </div>
</div> </div>
</div> </div>
......
ruoyi-admin/src/main/resources/templates/system/shzz/add.html
...@@ -297,6 +297,16 @@ ...@@ -297,6 +297,16 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">企业状态：</label>
<div class="col-sm-8">
<select name="lx" class="form-control m-b" th:with="type=${@dict.getType('orhon_lx')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
</div>
</div> </div>
<div class="row"> <div class="row">
...@@ -388,12 +398,11 @@ ...@@ -388,12 +398,11 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<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">
<div class="radio-box" th:each="dict : ${@dict.getType('is_tzz')}"> <select name="type" class="form-control m-b" th:with="type=${@dict.getType('is_tzz')}">
<input type="radio" th:id="${'istzz_' + dict.dictCode}" name="istzz" th:value="${dict.dictValue}" th:checked="${dict.default}"> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
<label th:for="${'istzz_' + dict.dictCode}" th:text="${dict.dictLabel}"></label> </select>
</div>
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
...@@ -856,7 +865,7 @@ ...@@ -856,7 +865,7 @@
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<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">
<div class="radio-box" th:each="dict : ${@dict.getType('is_sqlh')}"> <div class="radio-box" th:each="dict : ${@dict.getType('is_sqlh')}">
<input type="radio" th:id="${'issqlh_' + dict.dictCode}" name="issqlh" th:value="${dict.dictValue}" th:checked="${dict.default}"> <input type="radio" th:id="${'issqlh_' + dict.dictCode}" name="issqlh" th:value="${dict.dictValue}" th:checked="${dict.default}">
......
ruoyi-admin/src/main/resources/templates/system/shzz/edit.html
...@@ -289,6 +289,16 @@ ...@@ -289,6 +289,16 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">企业状态：</label>
<div class="col-sm-8">
<select name="lx" th:field="*{lx}" class="form-control m-b" th:with="type=${@dict.getType('orhon_lx')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
</div>
</div> </div>
<div class="row"> <div class="row">
...@@ -380,12 +390,11 @@ ...@@ -380,12 +390,11 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<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">
<div class="radio-box" th:each="dict : ${@dict.getType('is_tzz')}"> <select name="type" class="form-control m-b" th:with="type=${@dict.getType('is_tzz')}">
<input type="radio" th:field="*{istzz}" th:id="${'istzz_' + dict.dictCode}" name="istzz" th:value="${dict.dictValue}" th:checked="${dict.default}"> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
<label th:for="${'istzz_' + dict.dictCode}" th:text="${dict.dictLabel}"></label> </select>
</div>
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
...@@ -847,7 +856,7 @@ ...@@ -847,7 +856,7 @@
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<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">
<div class="radio-box" th:each="dict : ${@dict.getType('is_sqlh')}"> <div class="radio-box" th:each="dict : ${@dict.getType('is_sqlh')}">
<input type="radio" th:field="*{issqlh}" th:id="${'issqlh_' + dict.dictCode}" name="issqlh" th:value="${dict.dictValue}" th:checked="${dict.default}"> <input type="radio" th:field="*{issqlh}" th:id="${'issqlh_' + dict.dictCode}" name="issqlh" th:value="${dict.dictValue}" th:checked="${dict.default}">
......
ruoyi-admin/target/classes/templates/demo/table/reporttwo.html
...@@ -43,10 +43,7 @@ ...@@ -43,10 +43,7 @@
], ],
[ { [ {
field: 'type', field: 'type',
title: '类别', title: '类别'
formatter: function(value, row, index) {
return $.table.selectDictLabel(shzzlxDatas, value);
}
}, { }, {
field: 'dws', field: 'dws',
title: '单位数' title: '单位数'
......
ruoyi-system/target/classes/mapper/system/OrhonFgqyMapper.xml
...@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="mc" column="mc" /> <result property="mc" column="mc" />
<result property="deptId" column="dept_id" /> <result property="deptId" column="dept_id" />
<result property="type" column="type" /> <result property="type" column="type" />
<result property="lx" column="lx" />
<result property="szd" column="szd" /> <result property="szd" column="szd" />
<result property="zcze" column="zcze" /> <result property="zcze" column="zcze" />
<result property="nyysr" column="nyysr" /> <result property="nyysr" column="nyysr" />
...@@ -95,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -95,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="mc != null and mc != ''"> and mc like concat('%','${mc}','%' )</if> <if test="mc != null and mc != ''"> and mc like concat('%','${mc}','%' )</if>
<if test="deptId != null "> and dept_id = #{deptId}</if> <if test="deptId != null "> and dept_id = #{deptId}</if>
<if test="type != null and type != ''"> and type = #{type}</if> <if test="type != null and type != ''"> and type = #{type}</if>
<if test="lx != null and lx != ''"> and lx = #{lx}</if>
<if test="szd != null and szd != ''"> and szd = #{szd}</if> <if test="szd != null and szd != ''"> and szd = #{szd}</if>
<if test="params.beginZcze != null and params.beginZcze != '' and params.endZcze != null and params.endZcze != ''"> and zcze between #{params.beginZcze} and #{params.endZcze}</if> <if test="params.beginZcze != null and params.beginZcze != '' and params.endZcze != null and params.endZcze != ''"> and zcze between #{params.beginZcze} and #{params.endZcze}</if>
<if test="params.beginNyysr != null and params.beginNyysr != '' and params.endNyysr != null and params.endNyysr != ''"> and nyysr between #{params.beginNyysr} and #{params.endNyysr}</if> <if test="params.beginNyysr != null and params.beginNyysr != '' and params.endNyysr != null and params.endNyysr != ''"> and nyysr between #{params.beginNyysr} and #{params.endNyysr}</if>
...@@ -133,6 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -133,6 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="mc != null and mc != ''">mc,</if> <if test="mc != null and mc != ''">mc,</if>
<if test="deptId != null">dept_id,</if> <if test="deptId != null">dept_id,</if>
<if test="type != null">type,</if> <if test="type != null">type,</if>
<if test="lx != null">lx,</if>
<if test="szd != null">szd,</if> <if test="szd != null">szd,</if>
<if test="zcze != null">zcze,</if> <if test="zcze != null">zcze,</if>
<if test="nyysr != null">nyysr,</if> <if test="nyysr != null">nyysr,</if>
...@@ -211,6 +214,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -211,6 +214,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="mc != null and mc != ''">#{mc},</if> <if test="mc != null and mc != ''">#{mc},</if>
<if test="deptId != null">#{deptId},</if> <if test="deptId != null">#{deptId},</if>
<if test="type != null">#{type},</if> <if test="type != null">#{type},</if>
<if test="lx != null">#{lx},</if>
<if test="szd != null">#{szd},</if> <if test="szd != null">#{szd},</if>
<if test="zcze != null">#{zcze},</if> <if test="zcze != null">#{zcze},</if>
<if test="nyysr != null">#{nyysr},</if> <if test="nyysr != null">#{nyysr},</if>
...@@ -292,6 +296,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -292,6 +296,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="mc != null and mc != ''">mc = #{mc},</if> <if test="mc != null and mc != ''">mc = #{mc},</if>
<if test="deptId != null">dept_id = #{deptId},</if> <if test="deptId != null">dept_id = #{deptId},</if>
<if test="type != null">type = #{type},</if> <if test="type != null">type = #{type},</if>
<if test="lx != null">lx = #{lx},</if>
<if test="szd != null">szd = #{szd},</if> <if test="szd != null">szd = #{szd},</if>
<if test="zcze != null">zcze = #{zcze},</if> <if test="zcze != null">zcze = #{zcze},</if>
<if test="nyysr != null">nyysr = #{nyysr},</if> <if test="nyysr != null">nyysr = #{nyysr},</if>
......
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