82064491C07A712AE32B5B57EC6EF136 3 ヶ月 前
コミット
33c37faf13

+ 41 - 41
src/main/resources/static/app/main/integratedQuery/departmentAdvanceList.html

@@ -103,48 +103,48 @@
                         </div>
                     </td>
                 </tr>
+                <!-- <tr ng-show="isMore">
+                     <th>人数规模</th>
+                     <td>
+                         <div class="form-inline">
+                             <input type="number" autocomplete="off" class="form-control"
+                                    name="memberCountStart" ng-model="selectparams.memberCountStart"/>
+                             到
+                             <input type="number" autocomplete="off" class="form-control"
+                                    name="memberCountEnd" ng-model="selectparams.memberCountEnd"/>
+                         </div>
+                     </td>
+                 </tr>
+                 <tr ng-show="isMore">
+                     <th>年度考评结果</th>
+                     <td>
+                         <div class="form-inline">
+                             <input type="text" autocomplete="off" class="form-control"
+                                    autoclose="true" data-timezone="null" bs-datepicker data-date-format="yyyy"
+                                    data-has-clear="true" name="djkpxxYear" placeholder="选择年度"
+                                    ng-model="selectparams.djkpxxYear" data-start-view="2" data-min-view="2" data-date-type="string"
+                             />
+                             <div link-condition ng-model="selectparams.judgeLevel" always-select-all="!isJudgeLevelCanSelect()"
+                                  source-list="judgeLevelList1" text-field="dicvalue" value-field="dickey"></div>
+                         </div>
+                     </td>
+                 </tr>
+                 <tr ng-show="isMore">
+                     <th>年度分类定级</th>
+                     <td>
+                         <div class="form-inline">
+                             <input type="text" autocomplete="off" class="form-control"
+                                    autoclose="true" data-timezone="null" bs-datepicker data-date-format="yyyy"
+                                    data-has-clear="true" name="djkpxxYear_dzb" placeholder="选择年度"
+                                    ng-model="selectparams.djkpxxYear_dzb" data-start-view="2" data-min-view="2" data-date-type="string"
+                             />
+                             <div link-condition ng-model="selectparams.judgeLevel_dzb" always-select-all="!isJudgeLevelCanSelect2()"
+                                  source-list="judgeLevelList2" text-field="dicvalue" value-field="dickey"></div>
+                         </div>
+                     </td>
+                 </tr>-->
                 <tr ng-show="isMore">
-                    <th>人数规模</th>
-                    <td>
-                        <div class="form-inline">
-                            <input type="number" autocomplete="off" class="form-control"
-                                   name="memberCountStart" ng-model="selectparams.memberCountStart"/>
-                            到
-                            <input type="number" autocomplete="off" class="form-control"
-                                   name="memberCountEnd" ng-model="selectparams.memberCountEnd"/>
-                        </div>
-                    </td>
-                </tr>
-                <tr ng-show="isMore">
-                    <th>年度考评结果</th>
-                    <td>
-                        <div class="form-inline">
-                            <input type="text" autocomplete="off" class="form-control"
-                                   autoclose="true" data-timezone="null" bs-datepicker data-date-format="yyyy"
-                                   data-has-clear="true" name="djkpxxYear" placeholder="选择年度"
-                                   ng-model="selectparams.djkpxxYear" data-start-view="2" data-min-view="2" data-date-type="string"
-                            />
-                            <div link-condition ng-model="selectparams.judgeLevel" always-select-all="!isJudgeLevelCanSelect()"
-                                 source-list="judgeLevelList1" text-field="dicvalue" value-field="dickey"></div>
-                        </div>
-                    </td>
-                </tr>
-                <tr ng-show="isMore">
-                    <th>年度分类定级</th>
-                    <td>
-                        <div class="form-inline">
-                            <input type="text" autocomplete="off" class="form-control"
-                                   autoclose="true" data-timezone="null" bs-datepicker data-date-format="yyyy"
-                                   data-has-clear="true" name="djkpxxYear_dzb" placeholder="选择年度"
-                                   ng-model="selectparams.djkpxxYear_dzb" data-start-view="2" data-min-view="2" data-date-type="string"
-                            />
-                            <div link-condition ng-model="selectparams.judgeLevel_dzb" always-select-all="!isJudgeLevelCanSelect2()"
-                                 source-list="judgeLevelList2" text-field="dicvalue" value-field="dickey"></div>
-                        </div>
-                    </td>
-                </tr>
-                <tr ng-show="isMore">
-                    <th>评先评优</th>
+                    <th>组织评先</th>
                     <td>
                         <div class="form-inline">
                             <input type="text" autocomplete="off" class="form-control"

+ 29 - 29
src/main/resources/static/app/main/partyUser/bigSearch.html

@@ -71,7 +71,7 @@
                              text-field="HZMC" value-field="HZMC"></div>
                     </td>
                 </tr>
-                <tr ng-show="isMore">
+                <!--<tr ng-show="isMore">
                     <th>行政职务</th>
                     <td>
                         <div link-condition ng-model="selectparams.xzzw" source-list="xzzwList" default-count="6"
@@ -79,27 +79,27 @@
                     </td>
                 </tr>
                 <tr ng-show="isMore">
-                    <th>专业职务</th>
-                    <td>
-                        <div link-condition ng-model="selectparams.jszw" source-list="jszwList" default-count="6"
-                             text-field="HZMC" value-field="BM"></div>
-                    </td>
-                </tr>
-                <tr ng-show="isMore">
-                    <th>学历</th>
-                    <td>
-                        <div link-condition ng-model="selectparams.xl" source-list="xlList" text-field="HZMC"
-                             default-count="6" value-field="BM"></div>
-                    </td>
-                </tr>
-                <tr ng-show="isMore">
-                    <th>性别</th>
-                    <td>
-                        <div link-condition ng-model="selectparams.xb" source-list="xbList" text-field="HZMC"
-                             value-field="BM"></div>
-                    </td>
-                </tr>
-                <!--<tr ng-show="isMore">-->
+                     <th>专业职务</th>
+                     <td>
+                         <div link-condition ng-model="selectparams.jszw" source-list="jszwList" default-count="6"
+                              text-field="HZMC" value-field="BM"></div>
+                     </td>
+                 </tr>-->
+                 <tr ng-show="isMore">
+                     <th>学历</th>
+                     <td>
+                         <div link-condition ng-model="selectparams.xl" source-list="xlList" text-field="HZMC"
+                              default-count="6" value-field="BM"></div>
+                     </td>
+                 </tr>
+                 <tr ng-show="isMore">
+                     <th>性别</th>
+                     <td>
+                         <div link-condition ng-model="selectparams.xb" source-list="xbList" text-field="HZMC"
+                              value-field="BM"></div>
+                     </td>
+                 </tr>
+                 <!--<tr ng-show="isMore">-->
                     <!--<th>-->
                         <!--岗位状态-->
                     <!--</th>-->
@@ -108,13 +108,13 @@
                              <!--value-field="BM"></div>-->
                     <!--</td>-->
                 <!--</tr>-->
-                <tr ng-show="isMore">
+                <!--<tr ng-show="isMore">
                     <th>政治面貌</th>
                     <td>
                         <div link-condition ng-model="selectparams.zzmm" source-list="zzmmList" text-field="HZMC"
                              value-field="BM"></div>
                     </td>
-                </tr>
+                </tr>-->
                 <tr ng-show="isMore">
                     <th>
                         入党时间
@@ -135,7 +135,7 @@
                                placeholder="" bs-datepicker/>
                     </td>
                 </tr>
-                <tr ng-show="isMore">
+                <!--<tr ng-show="isMore">
                     <th>
                         转正时间
                     </th>
@@ -154,7 +154,7 @@
                                ng-model="selectparams.zzsj_end"
                                placeholder="" bs-datepicker/>
                     </td>
-                </tr>
+                </tr>-->
                 <tr ng-show="isMore">
                     <th>
                         籍贯
@@ -181,7 +181,7 @@
                 </tr>
                 <tr ng-show="isMore">
                     <th>
-                        评先评优
+                        党员评先
                     </th>
                     <td style="white-space: nowrap;">
                         <select style="display: inline;" class="form-control show-tick td-select"
@@ -202,7 +202,7 @@
                         </div>
                     </td>
                 </tr>
-                <tr ng-show="isMore">
+               <!-- <tr ng-show="isMore">
                     <th>
                         是否在处分影响期
                     </th>
@@ -210,7 +210,7 @@
                         <div link-condition ng-model="selectparams.sfzyxq" source-list="sfzyxqList" text-field="HZMC"
                              value-field="BM" single-mode="1"></div>
                     </td>
-                </tr>
+                </tr>-->
             </table>
         </div>
         <div style="text-align: center;padding: 15px;">

+ 2 - 2
src/main/resources/static/app/main/partyUser/myBaseInfo.html

@@ -208,7 +208,7 @@
                             data-ptotal="dnpxparams.ptotal"></pagination>
             </div>
 
-            <div panel-title data-title="'纪律处分情况'"></div>
+            <!--<div panel-title data-title="'纪律处分情况'"></div>
             <div class="dj-formtable">
                 <table class="dj-table dj-table-list">
                     <tr>
@@ -230,7 +230,7 @@
                 <pagination data-pageindex="jlcfparams.pageindex" ng-if="jlcfparams.ptotal>jlcfparams.pagesize"
                             data-pagesize="jlcfparams.pagesize"
                             data-ptotal="jlcfparams.ptotal"></pagination>
-            </div>
+            </div>-->
 
             <div panel-title data-title="'党内关怀帮扶信息'"></div>
             <div class="dj-formtable">

+ 9 - 18
src/main/resources/static/app/main/partyUser/show.html

@@ -100,14 +100,14 @@
                         <td>
                             {{extdata.ZWMC}}
                         </td>
-                        <th>技术职务</th>
-                        <td>
-                            {{fbModel.technologyposition}}
-                        </td>
                         <th>政治面貌</th>
                         <td>
                             {{dyvm.RYZTMC}}
                         </td>
+                        <th>联系电话</th>
+                        <td>
+                            {{fbModel.mobile}}
+                        </td>
                     </tr>
                     <tr>
                         <th>入党时间</th>
@@ -118,9 +118,9 @@
                         <td>
                             {{djxxModel.zzrq}}
                         </td>
-                        <th>工作时间</th>
+                        <th>学号/工号(登录帐号)</th>
                         <td colspan="2">
-                            {{fbModel.workdate | date:'yyyy-MM-dd'}}
+                            {{mobile}}
                         </td>
                     </tr>
                     <tr>
@@ -133,16 +133,7 @@
                             {{szdzbmc}}
                         </td>
                     </tr>
-                    <tr>
-                        <th>学号/工号(登录帐号)</th>
-                        <td>
-                            {{mobile}}
-                        </td>
-                        <th>联系电话</th>
-                        <td colspan="5">
-                            {{fbModel.mobile}}
-                        </td>
-                    </tr>
+
                 </table>
             </div>
 
@@ -243,7 +234,7 @@
                             data-ptotal="dnpxparams.ptotal"></pagination>
             </div>
 
-            <div panel-title data-title="'纪律处分情况'"></div>
+            <!--<div panel-title data-title="'纪律处分情况'"></div>
             <div class="dj-formtable">
                 <table class="dj-table dj-table-list">
                     <tr>
@@ -265,7 +256,7 @@
                 <pagination data-pageindex="jlcfparams.pageindex" ng-if="jlcfparams.ptotal>jlcfparams.pagesize"
                             data-pagesize="jlcfparams.pagesize"
                             data-ptotal="jlcfparams.ptotal"></pagination>
-            </div>
+            </div>-->
 
             <div panel-title data-title="'党内关怀帮扶信息'"></div>
             <div class="dj-formtable">