Skip to content

F
fgqyxxlr
Commit 5a2c9686 by liru
Options

非公企业修改

parent 9a0f240e
Showing with 448 additions and 135 deletions
ruoyi-admin/src/main/resources/templates/system/fgqy/add.html
......@@ -331,6 +331,30 @@
</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">
<div class="radio-box" th:each="dict : ${@dict.getType('is_gh')}">
<input type="radio" th:id="${'isgh_' + dict.dictCode}" name="isgh" th:value="${dict.dictValue}" th:checked="${dict.default}">
<label th:for="${'isgh_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">是否建立基层妇女组织：</label>
<div class="col-sm-8">
<div class="radio-box" th:each="dict : ${@dict.getType('is_jcfnzz')}">
<input type="radio" th:id="${'isjcfnzz_' + dict.dictCode}" name="isjljcfnzz" th:value="${dict.dictValue}" th:checked="${dict.default}">
<label th:for="${'isjcfnzz_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
</div>
</div>
</div>
</div>
<h4 class="form-header h4">党组织班子情况</h4>
......@@ -347,7 +371,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人联系方式：</label>
<div class="col-sm-8">
<input name="shzzdh" class="form-control" type="text" >
<input name="fddbrdh" class="form-control" type="text" >
</div>
</div>
</div>
......@@ -358,7 +382,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人党内职务：</label>
<div class="col-sm-8">
<input name="fddbr" class="form-control" type="text" required>
<input name="fddbrdnzw" class="form-control" type="text" required>
</div>
</div>
</div>
......@@ -366,7 +390,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人行政职务：</label>
<div class="col-sm-8">
<input name="shzzdh" class="form-control" type="text" >
<input name="fddbrxzzw" class="form-control" type="text" >
</div>
</div>
</div>
......@@ -376,7 +400,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人政治面貌：</label>
<div class="col-sm-8">
<input name="fddbr" class="form-control" type="text" required>
<input name="fddbrzzmm" class="form-control" type="text" required>
</div>
</div>
</div>
......@@ -384,7 +408,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人政治待遇：</label>
<div class="col-sm-8">
<input name="shzzdh" class="form-control" type="text" >
<input name="fddbrzzdy" class="form-control" type="text" >
</div>
</div>
</div>
......@@ -427,7 +451,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
<input name="dzzsjdnzw" class="form-control" type="text">
</div>
</div>
</div>
......@@ -435,7 +459,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
<input name="dzzsjxzzw" class="form-control" type="text">
</div>
</div>
</div>
......@@ -445,7 +469,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
<input name="dzzsjzzdy" class="form-control" type="text">
</div>
</div>
</div>
......@@ -456,7 +480,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员姓名：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
<input name="dzzbzcyxm" class="form-control" type="text">
</div>
</div>
</div>
......@@ -464,7 +488,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员联系方式：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
<input name="dzzbzcydh" class="form-control" type="text">
</div>
</div>
</div>
......@@ -474,7 +498,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
<input name="dzzbzcydnzw" class="form-control" type="text">
</div>
</div>
</div>
......@@ -482,7 +506,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
<input name="dzzbzcyxzzw" class="form-control" type="text">
</div>
</div>
</div>
......@@ -492,7 +516,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
<input name="dzzbzcyzzdy" class="form-control" type="text">
</div>
</div>
</div>
......@@ -504,7 +528,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者姓名：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
<input name="dwgzzxm" class="form-control" type="text">
</div>
</div>
</div>
......@@ -512,7 +536,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者联系方式：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
<input name="dwgzzdh" class="form-control" type="text">
</div>
</div>
</div>
......@@ -522,7 +546,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
<input name="dwgzzdnzw" class="form-control" type="text">
</div>
</div>
</div>
......@@ -530,7 +554,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
<input name="dwgzzxzzw" class="form-control" type="text">
</div>
</div>
</div>
......@@ -540,7 +564,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
<input name="dwgzzzzdy" class="form-control" type="text">
</div>
</div>
</div>
......@@ -587,23 +611,72 @@
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<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">
<input name="dfsjbz" class="form-control" type="text" placeholder="请输入党费收缴标准">
<input name="zzdysl" class="form-control" type="text" placeholder="请输入在职党员数量">
</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">
<input name="ybdysl" class="form-control" type="text" placeholder="请输入预备党员数量">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">流动党员数量：</label>
<div class="col-sm-8">
<input name="lddysl" class="form-control" type="text" placeholder="请输入流动党员数量">
</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">
<input name="slhkddysl" class="form-control" type="text" placeholder="请输入失联或口袋党员数量">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">年内发展党员数：</label>
<div class="col-sm-8">
<input name="nnfzdys" class="form-control" type="text" placeholder="请输入年内发展党员数">
</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">
<input name="qtsl" class="form-control" type="text" placeholder="请输入其他数量">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党费收缴标准：</label>
<div class="col-sm-8">
<input name="dfsjbz" class="form-control" type="text" placeholder="请输入党费收缴标准">
</div>
</div>
</div>
</div>
<h4 class="form-header h4">党建工作保障情况</h4>
<div class="row">
......@@ -637,6 +710,25 @@
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">上级拨付额：</label>
<div class="col-sm-8">
<input name="sjbfe" class="form-control" type="text" placeholder="请输入上级拨付额">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">本级匹配额：</label>
<div class="col-sm-8">
<input name="bjppe" class="form-control" type="text" placeholder="请输入本级匹配额">
</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">
<div class="radio-box" th:each="dict : ${@dict.getType('orhon_isdy')}">
......@@ -647,6 +739,7 @@
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
......@@ -668,12 +761,9 @@
<div class="row">
<div class="col-md-6">
<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="radio-box" th:each="dict : ${@dict.getType('is_gh')}">
<input type="radio" th:id="${'isgh_' + dict.dictCode}" name="isgh" th:value="${dict.dictValue}" th:checked="${dict.default}">
<label th:for="${'isgh_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
<input name="gzdwjzw" class="form-control" type="text" placeholder="请输入党建指导员工作单位及职务">
</div>
</div>
</div>
......@@ -682,7 +772,7 @@
<div class="row">
<div class="col-md-6">
<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">
<select name="issqlh" class="form-control m-b" th:with="type=${@dict.getType('is_sqlh')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
......@@ -702,6 +792,24 @@
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">评定时间：</label>
<div class="col-sm-8">
<input name="qdsj" class="form-control" type="text" placeholder="请输入评定时间">
</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">
<input name="qdjb" class="form-control" type="text" placeholder="请输入评定级别">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">奖惩情况：</label>
<div class="col-sm-8">
<input name="jcqk" class="form-control" type="text" placeholder="请输入奖惩情况">
......@@ -748,14 +856,14 @@
</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">
<textarea name="jzzjyysm" class="form-control" placeholder="请输入集中组建阶段具体措施"></textarea>
</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">-->
<!-- <textarea name="jzzjyysm" class="form-control" placeholder="请输入集中组建阶段具体措施"></textarea>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
</div>
</form>
</div>
......
ruoyi-admin/src/main/resources/templates/system/fgqy/edit.html
......@@ -348,7 +348,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人联系方式：</label>
<div class="col-sm-8">
<input name="shzzdh" class="form-control" type="text" >
<input name="fddbrdh" class="form-control" type="text" >
</div>
</div>
</div>
......@@ -359,7 +359,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人党内职务：</label>
<div class="col-sm-8">
<input name="fddbr" class="form-control" type="text" required>
<input name="fddbrdnzw" class="form-control" type="text" required>
</div>
</div>
</div>
......@@ -367,7 +367,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人行政职务：</label>
<div class="col-sm-8">
<input name="shzzdh" class="form-control" type="text" >
<input name="fddbrxzzw" class="form-control" type="text" >
</div>
</div>
</div>
......@@ -377,7 +377,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人政治面貌：</label>
<div class="col-sm-8">
<input name="fddbr" class="form-control" type="text" required>
<input name="fddbrzzmm" class="form-control" type="text" required>
</div>
</div>
</div>
......@@ -385,7 +385,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人政治待遇：</label>
<div class="col-sm-8">
<input name="shzzdh" class="form-control" type="text" >
<input name="fddbrzzdy" class="form-control" type="text" >
</div>
</div>
</div>
......@@ -428,7 +428,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
<input name="dzzsjdnzw" class="form-control" type="text">
</div>
</div>
</div>
......@@ -436,7 +436,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
<input name="dzzsjxzzw" class="form-control" type="text">
</div>
</div>
</div>
......@@ -446,7 +446,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
<input name="dzzsjzzdy" class="form-control" type="text">
</div>
</div>
</div>
......@@ -457,7 +457,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员姓名：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
<input name="dzzbzcyxm" class="form-control" type="text">
</div>
</div>
</div>
......@@ -465,7 +465,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员联系方式：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
<input name="dzzbzcydh" class="form-control" type="text">
</div>
</div>
</div>
......@@ -475,7 +475,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
<input name="dzzbzcydnzw" class="form-control" type="text">
</div>
</div>
</div>
......@@ -483,7 +483,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
<input name="dzzbzcyxzzw" class="form-control" type="text">
</div>
</div>
</div>
......@@ -493,7 +493,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
<input name="dzzbzcyzzdy" class="form-control" type="text">
</div>
</div>
</div>
......@@ -505,7 +505,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者姓名：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
<input name="dwgzzxm" class="form-control" type="text">
</div>
</div>
</div>
......@@ -513,7 +513,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者联系方式：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
<input name="dwgzzdh" class="form-control" type="text">
</div>
</div>
</div>
......@@ -523,7 +523,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
<input name="dwgzzdnzw" class="form-control" type="text">
</div>
</div>
</div>
......@@ -531,7 +531,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
<input name="dwgzzxzzw" class="form-control" type="text">
</div>
</div>
</div>
......@@ -541,7 +541,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
<input name="dwgzzzzdy" class="form-control" type="text">
</div>
</div>
</div>
......
ruoyi-admin/src/main/resources/templates/system/fgqy/fgqy.html
......@@ -243,11 +243,11 @@
},
{
field: 'shzzxm',
title: '法定代表人姓名'
field: 'fddbr',
title: '法定代表人'
},
{
field: 'shzzdh',
field: 'fddbrdh',
title: '法定代表人电话'
},
......
ruoyi-admin/target/classes/templates/system/fgqy/add.html
......@@ -331,6 +331,30 @@
</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">
<div class="radio-box" th:each="dict : ${@dict.getType('is_gh')}">
<input type="radio" th:id="${'isgh_' + dict.dictCode}" name="isgh" th:value="${dict.dictValue}" th:checked="${dict.default}">
<label th:for="${'isgh_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">是否建立基层妇女组织：</label>
<div class="col-sm-8">
<div class="radio-box" th:each="dict : ${@dict.getType('is_jcfnzz')}">
<input type="radio" th:id="${'isjcfnzz_' + dict.dictCode}" name="isjljcfnzz" th:value="${dict.dictValue}" th:checked="${dict.default}">
<label th:for="${'isjcfnzz_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
</div>
</div>
</div>
</div>
<h4 class="form-header h4">党组织班子情况</h4>
......@@ -347,7 +371,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人联系方式：</label>
<div class="col-sm-8">
<input name="shzzdh" class="form-control" type="text" >
<input name="fddbrdh" class="form-control" type="text" >
</div>
</div>
</div>
......@@ -358,7 +382,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人党内职务：</label>
<div class="col-sm-8">
<input name="fddbr" class="form-control" type="text" required>
<input name="fddbrdnzw" class="form-control" type="text" required>
</div>
</div>
</div>
......@@ -366,7 +390,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人行政职务：</label>
<div class="col-sm-8">
<input name="shzzdh" class="form-control" type="text" >
<input name="fddbrxzzw" class="form-control" type="text" >
</div>
</div>
</div>
......@@ -376,7 +400,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人政治面貌：</label>
<div class="col-sm-8">
<input name="fddbr" class="form-control" type="text" required>
<input name="fddbrzzmm" class="form-control" type="text" required>
</div>
</div>
</div>
......@@ -384,7 +408,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人政治待遇：</label>
<div class="col-sm-8">
<input name="shzzdh" class="form-control" type="text" >
<input name="fddbrzzdy" class="form-control" type="text" >
</div>
</div>
</div>
......@@ -427,7 +451,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
<input name="dzzsjdnzw" class="form-control" type="text">
</div>
</div>
</div>
......@@ -435,7 +459,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
<input name="dzzsjxzzw" class="form-control" type="text">
</div>
</div>
</div>
......@@ -445,7 +469,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
<input name="dzzsjzzdy" class="form-control" type="text">
</div>
</div>
</div>
......@@ -456,7 +480,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员姓名：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
<input name="dzzbzcyxm" class="form-control" type="text">
</div>
</div>
</div>
......@@ -464,7 +488,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员联系方式：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
<input name="dzzbzcydh" class="form-control" type="text">
</div>
</div>
</div>
......@@ -474,7 +498,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
<input name="dzzbzcydnzw" class="form-control" type="text">
</div>
</div>
</div>
......@@ -482,7 +506,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
<input name="dzzbzcyxzzw" class="form-control" type="text">
</div>
</div>
</div>
......@@ -492,7 +516,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
<input name="dzzbzcyzzdy" class="form-control" type="text">
</div>
</div>
</div>
......@@ -504,7 +528,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者姓名：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
<input name="dwgzzxm" class="form-control" type="text">
</div>
</div>
</div>
......@@ -512,7 +536,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者联系方式：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
<input name="dwgzzdh" class="form-control" type="text">
</div>
</div>
</div>
......@@ -522,7 +546,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
<input name="dwgzzdnzw" class="form-control" type="text">
</div>
</div>
</div>
......@@ -530,7 +554,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
<input name="dwgzzxzzw" class="form-control" type="text">
</div>
</div>
</div>
......@@ -540,7 +564,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
<input name="dwgzzzzdy" class="form-control" type="text">
</div>
</div>
</div>
......@@ -587,23 +611,72 @@
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<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">
<input name="dfsjbz" class="form-control" type="text" placeholder="请输入党费收缴标准">
<input name="zzdysl" class="form-control" type="text" placeholder="请输入在职党员数量">
</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">
<input name="ybdysl" class="form-control" type="text" placeholder="请输入预备党员数量">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">流动党员数量：</label>
<div class="col-sm-8">
<input name="lddysl" class="form-control" type="text" placeholder="请输入流动党员数量">
</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">
<input name="slhkddysl" class="form-control" type="text" placeholder="请输入失联或口袋党员数量">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">年内发展党员数：</label>
<div class="col-sm-8">
<input name="nnfzdys" class="form-control" type="text" placeholder="请输入年内发展党员数">
</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">
<input name="qtsl" class="form-control" type="text" placeholder="请输入其他数量">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党费收缴标准：</label>
<div class="col-sm-8">
<input name="dfsjbz" class="form-control" type="text" placeholder="请输入党费收缴标准">
</div>
</div>
</div>
</div>
<h4 class="form-header h4">党建工作保障情况</h4>
<div class="row">
......@@ -637,6 +710,25 @@
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">上级拨付额：</label>
<div class="col-sm-8">
<input name="sjbfe" class="form-control" type="text" placeholder="请输入上级拨付额">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">本级匹配额：</label>
<div class="col-sm-8">
<input name="bjppe" class="form-control" type="text" placeholder="请输入本级匹配额">
</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">
<div class="radio-box" th:each="dict : ${@dict.getType('orhon_isdy')}">
......@@ -647,6 +739,7 @@
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
......@@ -668,12 +761,9 @@
<div class="row">
<div class="col-md-6">
<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="radio-box" th:each="dict : ${@dict.getType('is_gh')}">
<input type="radio" th:id="${'isgh_' + dict.dictCode}" name="isgh" th:value="${dict.dictValue}" th:checked="${dict.default}">
<label th:for="${'isgh_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
<input name="gzdwjzw" class="form-control" type="text" placeholder="请输入党建指导员工作单位及职务">
</div>
</div>
</div>
......@@ -682,7 +772,7 @@
<div class="row">
<div class="col-md-6">
<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">
<select name="issqlh" class="form-control m-b" th:with="type=${@dict.getType('is_sqlh')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
......@@ -702,6 +792,24 @@
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">评定时间：</label>
<div class="col-sm-8">
<input name="qdsj" class="form-control" type="text" placeholder="请输入评定时间">
</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">
<input name="qdjb" class="form-control" type="text" placeholder="请输入评定级别">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">奖惩情况：</label>
<div class="col-sm-8">
<input name="jcqk" class="form-control" type="text" placeholder="请输入奖惩情况">
......@@ -748,14 +856,14 @@
</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">
<textarea name="jzzjyysm" class="form-control" placeholder="请输入集中组建阶段具体措施"></textarea>
</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">-->
<!-- <textarea name="jzzjyysm" class="form-control" placeholder="请输入集中组建阶段具体措施"></textarea>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
</div>
</form>
</div>
......
ruoyi-admin/target/classes/templates/system/fgqy/edit.html
......@@ -348,7 +348,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人联系方式：</label>
<div class="col-sm-8">
<input name="shzzdh" class="form-control" type="text" >
<input name="fddbrdh" class="form-control" type="text" >
</div>
</div>
</div>
......@@ -359,7 +359,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人党内职务：</label>
<div class="col-sm-8">
<input name="fddbr" class="form-control" type="text" required>
<input name="fddbrdnzw" class="form-control" type="text" required>
</div>
</div>
</div>
......@@ -367,7 +367,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人行政职务：</label>
<div class="col-sm-8">
<input name="shzzdh" class="form-control" type="text" >
<input name="fddbrxzzw" class="form-control" type="text" >
</div>
</div>
</div>
......@@ -377,7 +377,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人政治面貌：</label>
<div class="col-sm-8">
<input name="fddbr" class="form-control" type="text" required>
<input name="fddbrzzmm" class="form-control" type="text" required>
</div>
</div>
</div>
......@@ -385,7 +385,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人政治待遇：</label>
<div class="col-sm-8">
<input name="shzzdh" class="form-control" type="text" >
<input name="fddbrzzdy" class="form-control" type="text" >
</div>
</div>
</div>
......@@ -428,7 +428,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
<input name="dzzsjdnzw" class="form-control" type="text">
</div>
</div>
</div>
......@@ -436,7 +436,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
<input name="dzzsjxzzw" class="form-control" type="text">
</div>
</div>
</div>
......@@ -446,7 +446,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
<input name="dzzsjzzdy" class="form-control" type="text">
</div>
</div>
</div>
......@@ -457,7 +457,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员姓名：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
<input name="dzzbzcyxm" class="form-control" type="text">
</div>
</div>
</div>
......@@ -465,7 +465,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员联系方式：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
<input name="dzzbzcydh" class="form-control" type="text">
</div>
</div>
</div>
......@@ -475,7 +475,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
<input name="dzzbzcydnzw" class="form-control" type="text">
</div>
</div>
</div>
......@@ -483,7 +483,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
<input name="dzzbzcyxzzw" class="form-control" type="text">
</div>
</div>
</div>
......@@ -493,7 +493,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
<input name="dzzbzcyzzdy" class="form-control" type="text">
</div>
</div>
</div>
......@@ -505,7 +505,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者姓名：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
<input name="dwgzzxm" class="form-control" type="text">
</div>
</div>
</div>
......@@ -513,7 +513,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者联系方式：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
<input name="dwgzzdh" class="form-control" type="text">
</div>
</div>
</div>
......@@ -523,7 +523,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
<input name="dwgzzdnzw" class="form-control" type="text">
</div>
</div>
</div>
......@@ -531,7 +531,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
<input name="dwgzzxzzw" class="form-control" type="text">
</div>
</div>
</div>
......@@ -541,7 +541,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
<input name="dwgzzzzdy" class="form-control" type="text">
</div>
</div>
</div>
......
ruoyi-admin/target/classes/templates/system/fgqy/fgqy.html
......@@ -243,11 +243,11 @@
},
{
field: 'shzzxm',
title: '法定代表人姓名'
field: 'fddbr',
title: '法定代表人'
},
{
field: 'shzzdh',
field: 'fddbrdh',
title: '法定代表人电话'
},
......
ruoyi-system/src/main/java/com/ruoyi/system/domain/OrhonFgqy.java
......@@ -57,14 +57,30 @@ public class OrhonFgqy extends com.ruoyi.common.core.domain.BaseEntity
private String dys;
/** 法定代表人姓名 */
@com.ruoyi.common.annotation.Excel(name = "法定代表人姓名")
private String shzzxm;
@com.ruoyi.common.annotation.Excel(name = "法定代表人")
private String fddbr;
/** 法定代表人电话 */
@com.ruoyi.common.annotation.Excel(name = "法定代表人电话")
private String shzzdh;
private String fddbrdh;
/** 是否党员 */
/** 法定代表人党内职务 */
@com.ruoyi.common.annotation.Excel(name = "法定代表人党内职务")
private String fddbrdnzw;
/** 法定代表人行政职务 */
@com.ruoyi.common.annotation.Excel(name = "法定代表人行政职务")
private String fddbrxzzw;
/** 法定代表人政治面貌 */
@com.ruoyi.common.annotation.Excel(name = "法定代表人政治面貌")
private String fddbrzzmm;
/** 法定代表人政治待遇 */
@com.ruoyi.common.annotation.Excel(name = "法定代表人政治待遇")
private String fddbrzzdy;
/** 法人是否党员 */
@com.ruoyi.common.annotation.Excel(name = "是否党员")
private String isdy;
......@@ -96,10 +112,61 @@ public class OrhonFgqy extends com.ruoyi.common.core.domain.BaseEntity
@com.ruoyi.common.annotation.Excel(name = "党组织书记姓名")
private String dzzsjxm;
/** 党组织书记电话 */
/** 党组织书记联系方式 */
@com.ruoyi.common.annotation.Excel(name = "党组织书记电话")
private String dzzsjdh;
/** 党组织书记党内职务 */
@com.ruoyi.common.annotation.Excel(name = "党组织书记党内职务")
private String dzzsjdnzw;
/** 党组织书记行政职务 */
@com.ruoyi.common.annotation.Excel(name = "党组织书记行政职务")
private String dzzsjxzzw;
/** 党组织书记政治待遇 */
@com.ruoyi.common.annotation.Excel(name = "党组织书记政治待遇")
private String dzzsjzzdy;
/** 党组织班子成员姓名 */
@com.ruoyi.common.annotation.Excel(name = "党组织班子成员姓名")
private String dzzbzcyxm;
/** 党组织班子成员联系方式 */
@com.ruoyi.common.annotation.Excel(name = "党组织班子成员联系方式")
private String dzzbzcydh;
/** 党组织班子成员党内职务 */
@com.ruoyi.common.annotation.Excel(name = "党组织班子成员党内职务")
private String dzzbzcydnzw;
/** 党组织班子成员行政职务 */
@com.ruoyi.common.annotation.Excel(name = "党组织班子成员行政职务")
private String dzzbzcyxzzw;
/** 党组织班子成员政治待遇 */
@com.ruoyi.common.annotation.Excel(name = "党组织班子成员政治待遇")
private String dzzbzcyzzdy;
/** 党务工作者姓名 */
@com.ruoyi.common.annotation.Excel(name = "党务工作者姓名")
private String dwgzzxm;
/** 党务工作者联系方式 */
@com.ruoyi.common.annotation.Excel(name = "党务工作者联系方式")
private String dwgzzdh;
/** 党务工作者党内职务 */
@com.ruoyi.common.annotation.Excel(name = "党务工作者党内职务")
private String dwgzzdnzw;
/** 党务工作者行政职务 */
@com.ruoyi.common.annotation.Excel(name = "党务工作者行政职务")
private String dwgzzxzzw;
/** 党务工作者政治待遇 */
@com.ruoyi.common.annotation.Excel(name = "党务工作者政治待遇")
private String dwgzzzzdy;
/** 登记方式 */
@com.ruoyi.common.annotation.Excel(name = "登记方式")
private String djfs;
......@@ -255,6 +322,54 @@ public class OrhonFgqy extends com.ruoyi.common.core.domain.BaseEntity
@com.ruoyi.common.annotation.Excel(name = "年内发展党员数")
private String nnfzdys;
public String getFddbr() {
return fddbr;
}
public void setFddbr(String fddbr) {
this.fddbr = fddbr;
}
public String getFddbrdh() {
return fddbrdh;
}
public void setFddbrdh(String fddbrdh) {
this.fddbrdh = fddbrdh;
}
public String getFddbrdnzw() {
return fddbrdnzw;
}
public void setFddbrdnzw(String fddbrdnzw) {
this.fddbrdnzw = fddbrdnzw;
}
public String getFddbrxzzw() {
return fddbrxzzw;
}
public void setFddbrxzzw(String fddbrxzzw) {
this.fddbrxzzw = fddbrxzzw;
}
public String getFddbrzzmm() {
return fddbrzzmm;
}
public void setFddbrzzmm(String fddbrzzmm) {
this.fddbrzzmm = fddbrzzmm;
}
public String getFddbrzzdy() {
return fddbrzzdy;
}
public void setFddbrzzdy(String fddbrzzdy) {
this.fddbrzzdy = fddbrzzdy;
}
public OrhonFgqy() {
}
......@@ -595,24 +710,6 @@ public class OrhonFgqy extends com.ruoyi.common.core.domain.BaseEntity
{
return dys;
}
public void setShzzxm(String shzzxm)
{
this.shzzxm = shzzxm;
}
public String getShzzxm()
{
return shzzxm;
}
public void setShzzdh(String shzzdh)
{
this.shzzdh = shzzdh;
}
public String getShzzdh()
{
return shzzdh;
}
public void setIsdy(String isdy)
{
this.isdy = isdy;
......@@ -768,8 +865,8 @@ public class OrhonFgqy extends com.ruoyi.common.core.domain.BaseEntity
.append("nyysr", getNyysr())
.append("cyrs", getCyrs())
.append("dys", getDys())
.append("shzzxm", getShzzxm())
.append("shzzdh", getShzzdh())
.append("fddbr", getFddbr())
.append("fddbrdh",getFddbrdh())
.append("isdy", getIsdy())
.append("isgh", getIsgh())
.append("istzz", getIstzz())
......
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