Merge branch 'master' of http://39.98.153.250:9080/bowintek/GHSCPartyBuild

src/main/resources/static/app/main/partylife/meeting/edit.html

@@ -7,7 +7,7 @@
                     <div class="dj-formtable">
                         <table class="dj-table dj-table3">
                             <tr>
-                                <th>所属党组织</th>
+                                <th>所属党组织<span style="color:red;">*</span></th>
                                 <td>
                                     <div class="input-group input-group-search"
                                          title="选择党组织" ng-click="selectParty()">
@@ -19,14 +19,14 @@
                                     <span ng-show="this.editForm.partyname.$invalid &&  this.editForm.$submitted"
                                           class="error">必填.</span>
                                 </td>
-                                <th>会议名称</th>
+                                <th>会议名称<span style="color:red;">*</span></th>
                                 <td ng-class="{ 'has-error' : this.editForm.title.$invalid &&  this.editForm.$submitted}">
                                     <input type="text" class="form-control" name="title" autocomplete="off" autoclose="true"
                                            ng-model="dataModel.title" ng-required="true"/>
                                     <span ng-show="this.editForm.title.$invalid &&  this.editForm.$submitted"
                                           class="error">必填.</span>
                                 </td>
-                                <th>会议时间</th>
+                                <th>会议时间<span style="color:red;">*</span></th>
                                 <td ng-class="{ 'has-error' : this.editForm.meetingdate.$invalid &&  this.editForm.$submitted}">
                                     <input name="meetingdate" class="form-control"
                                            autocomplete="off" autoclose="true"

src/main/resources/static/app/main/partylife/reportSystem/detail.html

@@ -7,9 +7,9 @@
                         <tr>
                             <th>所属党组织</th>
                             <td>{{dataModel.dzzmc}}</td>
-                            <th>请求主体</th>
+                            <th>请示报告主体</th>
                             <td>{{dataModel.zt}}</td>
-                            <th>请求对象</th>
+                            <th>请示报告对象</th>
                             <td>{{dataModel.dx}}</td>
                         </tr>
                         <tr>

src/main/resources/static/app/main/partylife/reportSystem/edit.html

@@ -7,7 +7,7 @@
                     <div class="dj-formtable">
                         <table class="dj-table dj-table3">
                             <tr>
-                                <th>所属党组织</th>
+                                <th>所属党组织<span style="color:red;">*</span></th>
                                 <td>
                                     <div class="input-group input-group-search"
                                          title="选择党组织" ng-click="selectParty()">
@@ -19,14 +19,14 @@
                                     <span ng-show="this.editForm.dzzmc.$invalid &&  this.editForm.$submitted"
                                           class="error">必填.</span>
                                 </td>
-                                <th>请求主体</th>
+                                <th>请示报告主体<span style="color:red;">*</span></th>
                                 <td ng-class="{ 'has-error' : this.editForm.zt.$invalid &&  this.editForm.$submitted}">
                                     <input type="text" class="form-control" name="zt" autocomplete="off" autoclose="true"
                                            ng-model="dataModel.zt" ng-required="true"/>
                                     <span ng-show="this.editForm.zt.$invalid &&  this.editForm.$submitted"
                                           class="error">必填.</span>
                                 </td>
-                                <th>请求对象</th>
+                                <th>请示报告对象<span style="color:red;">*</span></th>
                                 <td ng-class="{ 'has-error' : this.editForm.dx.$invalid &&  this.editForm.$submitted}">
                                     <input type="text" class="form-control" name="dx" autocomplete="off" autoclose="true"
                                            ng-model="dataModel.dx" ng-required="true"/>
@@ -35,7 +35,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <th>请示时间</th>
+                                <th>请示时间<span style="color:red;">*</span></th>
                                 <td ng-class="{ 'has-error' : this.editForm.qssj.$invalid &&  this.editForm.$submitted}">
                                     <input name="qssj" class="form-control"
                                            autocomplete="off" autoclose="true"
@@ -45,14 +45,14 @@
                                     <span ng-show="this.editForm.qssj.$invalid &&  this.editForm.$submitted"
                                           class="error">必填.</span>
                                 </td>
-                                <th>请示报告事项</th>
+                                <th>请示报告事项<span style="color:red;">*</span></th>
                                 <td ng-class="{ 'has-error' : this.editForm.sx.$invalid &&  this.editForm.$submitted}">
                                     <input type="text" class="form-control" name="sx" ng-required="true"
                                            autocomplete="off" autoclose="true" ng-model="dataModel.sx"/>
                                     <span ng-show="this.editForm.sx.$invalid &&  this.editForm.$submitted"
                                           class="error">必填.</span>
                                 </td>
-                                <th>请示报告方式</th>
+                                <th>请示报告方式<span style="color:red;">*</span></th>
                                 <td ng-class="{ 'has-error' : this.editForm.fs.$invalid &&  this.editForm.$submitted}">
                                     <input type="text" class="form-control" name="fs" ng-required="true"
                                            autocomplete="off" autoclose="true" ng-model="dataModel.fs"/>

src/main/resources/static/app/main/partylife/scyd/edit.html

@@ -7,7 +7,7 @@
                     <div class="dj-formtable">
                         <table class="dj-table dj-table3">
                             <tr>
-                                <th>所属党组织</th>
+                                <th>所属党组织<span style="color:red;">*</span></th>
                                 <td>
                                     <div class="input-group input-group-search"
                                          title="选择党组织" ng-click="selectParty()">
@@ -19,14 +19,14 @@
                                     <span ng-show="this.editForm.partyname.$invalid &&  this.editForm.$submitted"
                                           class="error">必填.</span>
                                 </td>
-                                <th>会议名称</th>
+                                <th>会议名称<span style="color:red;">*</span></th>
                                 <td ng-class="{ 'has-error' : this.editForm.title.$invalid &&  this.editForm.$submitted}">
                                     <input type="text" class="form-control" name="title" autocomplete="off" autoclose="true"
                                            ng-model="dataModel.title" ng-required="true"/>
                                     <span ng-show="this.editForm.title.$invalid &&  this.editForm.$submitted"
                                           class="error">必填.</span>
                                 </td>
-                                <th>会议时间</th>
+                                <th>会议时间<span style="color:red;">*</span></th>
                                 <td ng-class="{ 'has-error' : this.editForm.meetingdate.$invalid &&  this.editForm.$submitted}">
                                     <input name="meetingdate" class="form-control"
                                            autocomplete="off" autoclose="true"

src/main/resources/static/app/main/partylife/txth/edit.html

@@ -11,7 +11,7 @@
                     <div class="dj-formtable">
                         <table class="dj-table">
                             <tr>
-                                <th>所属党组织</th>
+                                <th>所属党组织<span style="color:red;">*</span></th>
                                 <td colspan="3">
                                     <div class="input-group input-group-search"
                                          title="选择党组织" ng-click="selectParty()">
@@ -25,14 +25,14 @@
                                 </td>
                             </tr>
                             <tr>
-                                <th>会议主题</th>
+                                <th>会议主题<span style="color:red;">*</span></th>
                                 <td colspan="3" ng-class="{ 'has-error' : this.editForm.title.$invalid &&  this.editForm.$submitted}">
                                     <input type="text" class="form-control" name="title"
                                            ng-model="dataModel.title" ng-required="true"/>
                                 </td>
                             </tr>
                             <tr>
-                                <th>会议时间</th>
+                                <th>会议时间<span style="color:red;">*</span></th>
                                 <td ng-class="{ 'has-error' : this.editForm.meetingdate.$invalid &&  this.editForm.$submitted}">
                                     <input name="meetingdate" class="form-control"
                                            autocomplete="off"
@@ -41,14 +41,14 @@
                                            ng-model="dataModel.meetingdate"
                                            placeholder="" bs-datepicker ng-required="true"/>
                                 </td>
-                                <th>会议参加人数</th>
+                                <th>会议参加人数<span style="color:red;">*</span></th>
                                 <td ng-class="{ 'has-error' : this.editForm.usercount.$invalid &&  this.editForm.$submitted}">
                                     <input type="number" class="form-control" name="usercount"
                                            ng-model="dataModel.usercount" min="0" ng-required="true"/>
                                 </td>
                             </tr>
                             <tr>
-                                <th>会议地址</th>
+                                <th>会议地址<span style="color:red;">*</span></th>
                                 <td colspan="3" ng-class="{ 'has-error' : this.editForm.address.$invalid &&  this.editForm.$submitted}">
                                     <input type="text" class="form-control" name="address"
                                            ng-model="dataModel.address" ng-required="true"/>