Pārlūkot izejas kodu

组织生活-更改表单名称、id

lizeyu 8 mēneši atpakaļ
vecāks
revīzija
e9a79cea5c

+ 5 - 0
src/main/resources/static/app/main/leaderwork/leaderteam/list.js

@@ -31,6 +31,11 @@
         $scope.pageInfo = {ptotal: 0};
         $scope.sexList = [];
 
+        $scope.$on('tabChildReloadData', function (event, data) {
+            if (data.name == 'leaderTeamListCtrl') {
+                $scope.getList();
+            }
+        });
 
         //加载列表数据
         $scope.getList = function () {

+ 12 - 12
src/main/resources/static/app/main/partylife/djscgz/edit.html

@@ -2,8 +2,8 @@
 <div class="dj-card">
     <div class="dj-body" activate-input activate-select>
         <div class="card">
-                <form class="form-horizontal" role="form" id="editForm"
-                      name="editForm" ng-submit="save(editForm.$valid)" novalidate>
+                <form class="form-horizontal" role="form" id="djscgzform"
+                      name="djscgzform" ng-submit="save(djscgzform.$valid)" novalidate>
                     <div class="dj-formtable">
                         <table class="dj-table dj-table3">
                             <tr>
@@ -16,49 +16,49 @@
                                                ng-disabled="true"/>
                                         <span class="input-group-addon"><i class="material-icons">search</i></span>
                                     </div>
-                                    <span ng-show="this.editForm.dzzmc.$invalid &&  this.editForm.$submitted"
+                                    <span ng-show="this.djscgzform.dzzmc.$invalid &&  this.djscgzform.$submitted"
                                           class="error">必填.</span>
                                 </td>
                                 <th>评选级别<span style="color:red;">*</span></th>
-                                <td ng-class="{ 'has-error' : this.editForm.pxjb.$invalid &&  this.editForm.$submitted}">
+                                <td ng-class="{ 'has-error' : this.djscgzform.pxjb.$invalid &&  this.djscgzform.$submitted}">
                                     <select name="pxjb" ng-model="dataModel.pxjb" class="form-control"
                                             ng-options="type.dickey as type.dicvalue for type in pxjbTypeList"
                                             ng-required="true">
                                         <option value="">--全部--</option>
                                     </select>
-                                    <span ng-show="this.editForm.pxjb.$invalid &&  this.editForm.$submitted"
+                                    <span ng-show="this.djscgzform.pxjb.$invalid &&  this.djscgzform.$submitted"
                                           class="error">必填.</span>
                                 </td>
                                 <th>评选类别<span style="color:red;">*</span></th>
-                                <td ng-class="{ 'has-error' : this.editForm.pxlb.$invalid &&  this.editForm.$submitted}">
+                                <td ng-class="{ 'has-error' : this.djscgzform.pxlb.$invalid &&  this.djscgzform.$submitted}">
                                     <select name="pxlb" ng-model="dataModel.pxlb" class="form-control"
                                             ng-options="type.dickey as type.dicvalue for type in pxlbTypeList"
                                             ng-required="true">
                                         <option value="">--全部--</option>
                                     </select>
-                                    <span ng-show="this.editForm.pxlb.$invalid &&  this.editForm.$submitted"
+                                    <span ng-show="this.djscgzform.pxlb.$invalid &&  this.djscgzform.$submitted"
                                           class="error">必填.</span>
                                 </td>
                             </tr>
                             <tr>
                                 <th>评选启动时间<span style="color:red;">*</span></th>
-                                <td ng-class="{ 'has-error' : this.editForm.pxqdsj.$invalid &&  this.editForm.$submitted}">
+                                <td ng-class="{ 'has-error' : this.djscgzform.pxqdsj.$invalid &&  this.djscgzform.$submitted}">
                                     <input name="pxqdsj" class="form-control fm-ct-first"
                                            autocomplete="off" autoclose="true"
                                            data-date-format="yyyy-MM-dd" data-date-type="string"
                                            ng-model="dataModel.pxqdsj"
                                            placeholder="" bs-datepicker ng-required="true"/>
-                                    <span ng-show="this.editForm.pxqdsj.$invalid &&  this.editForm.$submitted"
+                                    <span ng-show="this.djscgzform.pxqdsj.$invalid &&  this.djscgzform.$submitted"
                                           class="error">必填.</span>
                                 </td>
                                 <th>评选结果确定时间<span style="color:red;">*</span></th>
-                                <td ng-class="{ 'has-error' : this.editForm.pxjgqdsj.$invalid &&  this.editForm.$submitted}">
+                                <td ng-class="{ 'has-error' : this.djscgzform.pxjgqdsj.$invalid &&  this.djscgzform.$submitted}">
                                     <input name="pxjgqdsj" class="form-control fm-ct-first"
                                            autocomplete="off" autoclose="true"
                                            data-date-format="yyyy-MM-dd" data-date-type="string"
                                            ng-model="dataModel.pxjgqdsj"
                                            placeholder="" bs-datepicker ng-required="true"/>
-                                    <span ng-show="this.editForm.pxjgqdsj.$invalid &&  this.editForm.$submitted"
+                                    <span ng-show="this.djscgzform.pxjgqdsj.$invalid &&  this.djscgzform.$submitted"
                                           class="error">必填.</span>
                                 </td>
                                 <td colspan="2"></td>
@@ -75,7 +75,7 @@
                     <bsfiles ng-model="reqFileModel"/>
                     <div class="form_foot">
                         <button type="button" class="btn btn-default" ng-click="pagechange()">取消</button>
-                        <button type="submit" class="btn btn-primary" form="editForm">保存</button>
+                        <button type="submit" class="btn btn-primary" form="djscgzform">保存</button>
                     </div>
                 </form>
         </div>

+ 8 - 8
src/main/resources/static/app/main/partylife/dnjzjy/edit.html

@@ -2,8 +2,8 @@
 <div class="dj-card">
     <div class="dj-body" activate-input activate-select>
         <div class="card">
-                <form class="form-horizontal" role="form" id="editForm"
-                      name="editForm" ng-submit="save(editForm.$valid)" novalidate>
+                <form class="form-horizontal" role="form" id="dnjzjyform"
+                      name="dnjzjyform" ng-submit="save(dnjzjyform.$valid)" novalidate>
                     <div class="dj-formtable">
                         <table class="dj-table dj-table3">
                             <tr>
@@ -16,11 +16,11 @@
                                                ng-disabled="true"/>
                                         <span class="input-group-addon"><i class="material-icons">search</i></span>
                                     </div>
-                                    <span ng-show="this.editForm.dzzmc.$invalid &&  this.editForm.$submitted"
+                                    <span ng-show="this.dnjzjyform.dzzmc.$invalid &&  this.dnjzjyform.$submitted"
                                           class="error">必填.</span>
                                 </td>
                                 <th>时间范围<span style="color:red;">*</span></th>
-                                <td ng-class="{ 'has-error' : (this.editForm.jykssj.$invalid || this.editForm.jyjssj.$invalid) &&  this.editForm.$submitted}">
+                                <td ng-class="{ 'has-error' : (this.dnjzjyform.jykssj.$invalid || this.dnjzjyform.jyjssj.$invalid) &&  this.dnjzjyform.$submitted}">
                                     <div class="form-group">
                                         <div class="form-line">
                                     <input name="jykssj" class="form-control fm-ct-first"
@@ -33,16 +33,16 @@
                                            data-date-format="yyyy-MM-dd" data-date-type="string"
                                            ng-model="dataModel.jyjssj"
                                            placeholder="" bs-datepicker ng-required="true"/>
-                                    <span ng-show="(this.editForm.jykssj.$invalid || this.editForm.jyjssj.$invalid) &&  this.editForm.$submitted"
+                                    <span ng-show="(this.dnjzjyform.jykssj.$invalid || this.dnjzjyform.jyjssj.$invalid) &&  this.dnjzjyform.$submitted"
                                           class="error">必填.</span>
                                         </div>
                                     </div>
                                 </td>
                                 <th>主题<span style="color:red;">*</span></th>
-                                <td ng-class="{ 'has-error' : this.editForm.zt.$invalid &&  this.editForm.$submitted}">
+                                <td ng-class="{ 'has-error' : this.dnjzjyform.zt.$invalid &&  this.dnjzjyform.$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"
+                                    <span ng-show="this.dnjzjyform.zt.$invalid &&  this.dnjzjyform.$submitted"
                                           class="error">必填.</span>
                                 </td>
                             </tr>
@@ -65,7 +65,7 @@
                     <bsfiles ng-model="reqFileModel"/>
                     <div class="form_foot">
                         <button type="button" class="btn btn-default" ng-click="pagechange()">取消</button>
-                        <button type="submit" class="btn btn-primary" form="editForm">保存</button>
+                        <button type="submit" class="btn btn-primary" form="dnjzjyform">保存</button>
                     </div>
                 </form>
         </div>

+ 18 - 18
src/main/resources/static/app/main/partylife/jljyxxyhd/edit.html

@@ -2,8 +2,8 @@
 <div class="dj-card">
     <div class="dj-body" activate-input activate-select>
         <div class="card">
-                <form class="form-horizontal" role="form" id="editForm"
-                      name="editForm" ng-submit="save(editForm.$valid)" novalidate>
+                <form class="form-horizontal" role="form" id="jljyxxyhdform"
+                      name="jljyxxyhdform" ng-submit="save(jljyxxyhdform.$valid)" novalidate>
                     <div class="dj-formtable">
                         <table class="dj-table dj-table3">
                             <tr>
@@ -16,25 +16,25 @@
                                                ng-disabled="true"/>
                                         <span class="input-group-addon"><i class="material-icons">search</i></span>
                                     </div>
-                                    <span ng-show="this.editForm.dzzmc.$invalid &&  this.editForm.$submitted"
+                                    <span ng-show="this.jljyxxyhdform.dzzmc.$invalid &&  this.jljyxxyhdform.$submitted"
                                           class="error">必填.</span>
                                 </td>
                                 <th>活动名称<span style="color:red;">*</span></th>
-                                <td ng-class="{ 'has-error' : this.editForm.hdmc.$invalid &&  this.editForm.$submitted}">
+                                <td ng-class="{ 'has-error' : this.jljyxxyhdform.hdmc.$invalid &&  this.jljyxxyhdform.$submitted}">
                                     <input type="text" class="form-control" name="hdmc" autocomplete="off" autoclose="true"
                                            ng-model="dataModel.hdmc" ng-required="true"/>
-                                    <span ng-show="this.editForm.hdmc.$invalid &&  this.editForm.$submitted"
+                                    <span ng-show="this.jljyxxyhdform.hdmc.$invalid &&  this.jljyxxyhdform.$submitted"
                                           class="error">必填.</span>
                                 </td>
                                 <th>日期<span style="color:red;">*</span></th>
-                                <td ng-class="{ 'has-error' : this.editForm.rq.$invalid &&  this.editForm.$submitted}">
+                                <td ng-class="{ 'has-error' : this.jljyxxyhdform.rq.$invalid &&  this.jljyxxyhdform.$submitted}">
                                     <input name="rq" class="form-control"
                                            autocomplete="off" autoclose="true"
                                            data-date-format="yyyyMM" data-date-type="string"
                                            data-min-view="1" data-start-view="1"
                                            ng-model="dataModel.rq"
                                            placeholder="" bs-datepicker ng-required="true"/>
-                                    <span ng-show="this.editForm.rq.$invalid &&  this.editForm.$submitted"
+                                    <span ng-show="this.jljyxxyhdform.rq.$invalid &&  this.jljyxxyhdform.$submitted"
                                           class="error">必填.</span>
                                 </td>
                             </tr>
@@ -74,37 +74,37 @@
                                     <tbody>
                                     <tr ng-repeat="it in dataModel.fblist">
                                         <td scope="row">{{$index+1}}</td>
-                                        <td ng-class="{ 'has-error' : invalidFee($index, editForm, 'zdgz') &&  this.editForm.$submitted}">
+                                        <td ng-class="{ 'has-error' : invalidFee($index, jljyxxyhdform, 'zdgz') &&  this.jljyxxyhdform.$submitted}">
                                             <input type="text" class="form-control" name="zdgz_{{$index}}" autocomplete="off" autoclose="true"
                                                    ng-model="it.zdgz" ng-required="true"/>
-                                            <span ng-show="invalidFee($index, editForm, 'zdgz') &&  this.editForm.$submitted"
+                                            <span ng-show="invalidFee($index, jljyxxyhdform, 'zdgz') &&  this.jljyxxyhdform.$submitted"
                                                   style="color: red;">必填.</span>
                                         </td>
-                                        <td ng-class="{ 'has-error' : invalidFee($index, editForm, 'mc') &&  this.editForm.$submitted}">
+                                        <td ng-class="{ 'has-error' : invalidFee($index, jljyxxyhdform, 'mc') &&  this.jljyxxyhdform.$submitted}">
                                             <input type="text" class="form-control" name="mc_{{$index}}" autocomplete="off" autoclose="true"
                                                    ng-model="it.mc" ng-required="true"/>
-                                            <span ng-show="invalidFee($index, editForm, 'mc') &&  this.editForm.$submitted"
+                                            <span ng-show="invalidFee($index, jljyxxyhdform, 'mc') &&  this.jljyxxyhdform.$submitted"
                                                   style="color: red;">必填.</span>
                                         </td>
-                                        <td ng-class="{ 'has-error' : invalidFee($index, editForm, 'sj') &&  this.editForm.$submitted}">
+                                        <td ng-class="{ 'has-error' : invalidFee($index, jljyxxyhdform, 'sj') &&  this.jljyxxyhdform.$submitted}">
                                             <input name="sj_{{$index}}" class="form-control"
                                                    autocomplete="off" autoclose="true"
                                                    data-date-format="yyyy-MM-dd" data-date-type="string"
                                                    ng-model="it.sj"
                                                    placeholder="" bs-datetimepicker ng-required="true"/>
-                                            <span ng-show="invalidFee($index, editForm, 'sj') &&  this.editForm.$submitted"
+                                            <span ng-show="invalidFee($index, jljyxxyhdform, 'sj') &&  this.jljyxxyhdform.$submitted"
                                                   style="color: red;">必填.</span>
                                         </td>
-                                        <td ng-class="{ 'has-error' : invalidFee($index, editForm, 'jydx') &&  this.editForm.$submitted}">
+                                        <td ng-class="{ 'has-error' : invalidFee($index, jljyxxyhdform, 'jydx') &&  this.jljyxxyhdform.$submitted}">
                                             <input type="text" class="form-control" name="jydx_{{$index}}" autocomplete="off" autoclose="true"
                                                    ng-model="it.jydx" ng-required="true"/>
-                                            <span ng-show="invalidFee($index, editForm, 'jydx') &&  this.editForm.$submitted"
+                                            <span ng-show="invalidFee($index, jljyxxyhdform, 'jydx') &&  this.jljyxxyhdform.$submitted"
                                                   style="color: red;">必填.</span>
                                         </td>
-                                        <td ng-class="{ 'has-error' : invalidFee($index, editForm, 'cjrs') &&  this.editForm.$submitted}">
+                                        <td ng-class="{ 'has-error' : invalidFee($index, jljyxxyhdform, 'cjrs') &&  this.jljyxxyhdform.$submitted}">
                                             <input type="number" class="form-control" name="cjrs_{{$index}}" autocomplete="off" autoclose="true"
                                                    ng-model="it.cjrs" ng-required="true"/>
-                                            <span ng-show="invalidFee($index, editForm, 'cjrs') &&  this.editForm.$submitted"
+                                            <span ng-show="invalidFee($index, jljyxxyhdform, 'cjrs') &&  this.jljyxxyhdform.$submitted"
                                                   style="color: red;">必填.</span>
                                         </td>
                                         <td>
@@ -129,7 +129,7 @@
                     <bsfiles ng-model="reqFileModel"/>
                     <div class="form_foot">
                         <button type="button" class="btn btn-default" ng-click="pagechange()">取消</button>
-                        <button type="submit" class="btn btn-primary" form="editForm">保存</button>
+                        <button type="submit" class="btn btn-primary" form="jljyxxyhdform">保存</button>
                     </div>
                 </form>
         </div>

+ 12 - 12
src/main/resources/static/app/main/partylife/meeting/edit.html

@@ -2,8 +2,8 @@
 <div class="dj-card">
     <div class="dj-body" activate-input activate-select>
         <div class="card">
-                <form class="form-horizontal" role="form" id="editForm"
-                      name="editForm" ng-submit="save(editForm.$valid)" novalidate>
+                <form class="form-horizontal" role="form" id="meetingform"
+                      name="meetingform" ng-submit="save(meetingform.$valid)" novalidate>
                     <div class="dj-formtable">
                         <table class="dj-table dj-table3">
                             <tr>
@@ -16,35 +16,35 @@
                                                ng-disabled="true"/>
                                         <span class="input-group-addon"><i class="material-icons">search</i></span>
                                     </div>
-                                    <span ng-show="this.editForm.partyname.$invalid &&  this.editForm.$submitted"
+                                    <span ng-show="this.meetingform.partyname.$invalid &&  this.meetingform.$submitted"
                                           class="error">必填.</span>
                                 </td>
                                 <th>会议名称<span style="color:red;">*</span></th>
-                                <td ng-class="{ 'has-error' : this.editForm.title.$invalid &&  this.editForm.$submitted}">
+                                <td ng-class="{ 'has-error' : this.meetingform.title.$invalid &&  this.meetingform.$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"
+                                    <span ng-show="this.meetingform.title.$invalid &&  this.meetingform.$submitted"
                                           class="error">必填.</span>
                                 </td>
                                 <th>会议时间<span style="color:red;">*</span></th>
-                                <td ng-class="{ 'has-error' : this.editForm.meetingdate.$invalid &&  this.editForm.$submitted}">
+                                <td ng-class="{ 'has-error' : this.meetingform.meetingdate.$invalid &&  this.meetingform.$submitted}">
                                     <input name="meetingdate" class="form-control"
                                            autocomplete="off" autoclose="true"
                                            data-date-format="yyyy-MM-dd" data-date-type="date"
                                            ng-model="dataModel.meetingdate"
                                            placeholder="" bs-datepicker ng-required="true"/>
-                                    <span ng-show="this.editForm.meetingdate.$invalid &&  this.editForm.$submitted"
+                                    <span ng-show="this.meetingform.meetingdate.$invalid &&  this.meetingform.$submitted"
                                           class="error">必填.</span>
                                 </td>
                             </tr>
                             <tr>
                                 <th>主持人</th>
-                                <td ng-class="{ 'has-error' : this.editForm.compere.$invalid &&  this.editForm.$submitted}">
+                                <td ng-class="{ 'has-error' : this.meetingform.compere.$invalid &&  this.meetingform.$submitted}">
                                     <input type="text" class="form-control" name="compere"
                                            autocomplete="off" autoclose="true" ng-model="dataModel.compere"/>
                                 </td>
                                 <th>会议地址</th>
-                                <td colspan="3" ng-class="{ 'has-error' : this.editForm.address.$invalid &&  this.editForm.$submitted}">
+                                <td colspan="3" ng-class="{ 'has-error' : this.meetingform.address.$invalid &&  this.meetingform.$submitted}">
                                     <div class="form-group" style="margin-bottom: 4px;margin-top: 5px;">
                                         <div class="form-line select-group" style="padding-bottom: 1px;">
                                             <select ng-model="dataModel.address"
@@ -54,13 +54,13 @@
                                             </select>
                                         </div>
                                         <div class="form-line" style="width: 98%;margin-top: -29px;z-index: 9;"
-                                             ng-class="{ 'focused error' : this.editForm.address.$invalid &&  this.editForm.$submitted}">
+                                             ng-class="{ 'focused error' : this.meetingform.address.$invalid &&  this.meetingform.$submitted}">
                                             <input type="text" name="address"
                                                    ng-model="dataModel.address"
                                                    maxlength="1000" autocomplete="off" autoclose="true"
                                                    class="form-control"/>
                                         </div>
-                                        <span ng-show="this.editForm.address.$invalid &&  this.editForm.$submitted"
+                                        <span ng-show="this.meetingform.address.$invalid &&  this.meetingform.$submitted"
                                               class="error">必填.</span>
                                     </div>
                                 </td>
@@ -145,7 +145,7 @@
                     <bsfiles ng-model="reqFileModel"/>
                     <div class="form_foot">
                         <button type="button" class="btn btn-default" ng-click="pagechange()">取消</button>
-                        <button type="submit" class="btn btn-primary" form="editForm">保存</button>
+                        <button type="submit" class="btn btn-primary" form="meetingform">保存</button>
                     </div>
                 </form>
         </div>

+ 1 - 1
src/main/resources/static/app/main/partylife/meeting/edit.js

@@ -110,7 +110,7 @@
             $http({
                 method: 'get',
                 url: '../../api/partylife/meeting/getUserAddressList',
-                params: {}
+                params: {partyLifeMeetingType : $scope.editParams.partyLifeMeetingType}
             }).then(function (result) {
                 $scope.addressList = result.data.item;
             }, function (resp) {

+ 14 - 14
src/main/resources/static/app/main/partylife/reportSystem/edit.html

@@ -2,8 +2,8 @@
 <div class="dj-card">
     <div class="dj-body" activate-input activate-select>
         <div class="card">
-                <form class="form-horizontal" role="form" id="editForm"
-                      name="editForm" ng-submit="save(editForm.$valid)" novalidate>
+                <form class="form-horizontal" role="form" id="reportsystemform"
+                      name="reportsystemform" ng-submit="save(reportsystemform.$valid)" novalidate>
                     <div class="dj-formtable">
                         <table class="dj-table dj-table3">
                             <tr>
@@ -16,47 +16,47 @@
                                                ng-disabled="true"/>
                                         <span class="input-group-addon"><i class="material-icons">search</i></span>
                                     </div>
-                                    <span ng-show="this.editForm.dzzmc.$invalid &&  this.editForm.$submitted"
+                                    <span ng-show="this.reportsystemform.dzzmc.$invalid &&  this.reportsystemform.$submitted"
                                           class="error">必填.</span>
                                 </td>
                                 <th>请示报告主体<span style="color:red;">*</span></th>
-                                <td ng-class="{ 'has-error' : this.editForm.zt.$invalid &&  this.editForm.$submitted}">
+                                <td ng-class="{ 'has-error' : this.reportsystemform.zt.$invalid &&  this.reportsystemform.$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"
+                                    <span ng-show="this.reportsystemform.zt.$invalid &&  this.reportsystemform.$submitted"
                                           class="error">必填.</span>
                                 </td>
                                 <th>请示报告对象<span style="color:red;">*</span></th>
-                                <td ng-class="{ 'has-error' : this.editForm.dx.$invalid &&  this.editForm.$submitted}">
+                                <td ng-class="{ 'has-error' : this.reportsystemform.dx.$invalid &&  this.reportsystemform.$submitted}">
                                     <input type="text" class="form-control" name="dx" autocomplete="off" autoclose="true"
                                            ng-model="dataModel.dx" ng-required="true"/>
-                                    <span ng-show="this.editForm.dx.$invalid &&  this.editForm.$submitted"
+                                    <span ng-show="this.reportsystemform.dx.$invalid &&  this.reportsystemform.$submitted"
                                           class="error">必填.</span>
                                 </td>
                             </tr>
                             <tr>
                                 <th>请示时间<span style="color:red;">*</span></th>
-                                <td ng-class="{ 'has-error' : this.editForm.qssj.$invalid &&  this.editForm.$submitted}">
+                                <td ng-class="{ 'has-error' : this.reportsystemform.qssj.$invalid &&  this.reportsystemform.$submitted}">
                                     <input name="qssj" class="form-control"
                                            autocomplete="off" autoclose="true"
                                            data-date-format="yyyy-MM-dd" data-date-type="date"
                                            ng-model="dataModel.qssj"
                                            placeholder="" bs-datepicker ng-required="true"/>
-                                    <span ng-show="this.editForm.qssj.$invalid &&  this.editForm.$submitted"
+                                    <span ng-show="this.reportsystemform.qssj.$invalid &&  this.reportsystemform.$submitted"
                                           class="error">必填.</span>
                                 </td>
                                 <th>请示报告事项<span style="color:red;">*</span></th>
-                                <td ng-class="{ 'has-error' : this.editForm.sx.$invalid &&  this.editForm.$submitted}">
+                                <td ng-class="{ 'has-error' : this.reportsystemform.sx.$invalid &&  this.reportsystemform.$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"
+                                    <span ng-show="this.reportsystemform.sx.$invalid &&  this.reportsystemform.$submitted"
                                           class="error">必填.</span>
                                 </td>
                                 <th>请示报告方式<span style="color:red;">*</span></th>
-                                <td ng-class="{ 'has-error' : this.editForm.fs.$invalid &&  this.editForm.$submitted}">
+                                <td ng-class="{ 'has-error' : this.reportsystemform.fs.$invalid &&  this.reportsystemform.$submitted}">
                                     <input type="text" class="form-control" name="fs" ng-required="true"
                                            autocomplete="off" autoclose="true" ng-model="dataModel.fs"/>
-                                    <span ng-show="this.editForm.fs.$invalid &&  this.editForm.$submitted"
+                                    <span ng-show="this.reportsystemform.fs.$invalid &&  this.reportsystemform.$submitted"
                                           class="error">必填.</span>
                                 </td>
                             </tr>
@@ -72,7 +72,7 @@
                     <bsfiles ng-model="reqFileModel"/>
                     <div class="form_foot">
                         <button type="button" class="btn btn-default" ng-click="pagechange()">取消</button>
-                        <button type="submit" class="btn btn-primary" form="editForm">保存</button>
+                        <button type="submit" class="btn btn-primary" form="reportsystemform">保存</button>
                     </div>
                 </form>
         </div>

+ 12 - 12
src/main/resources/static/app/main/partylife/scyd/edit.html

@@ -2,8 +2,8 @@
 <div class="dj-card">
     <div class="dj-body" activate-input activate-select>
         <div class="card">
-                <form class="form-horizontal" role="form" id="editForm"
-                      name="editForm" ng-submit="save(editForm.$valid)" novalidate>
+                <form class="form-horizontal" role="form" id="scydmeetingform"
+                      name="scydmeetingform" ng-submit="save(scydmeetingform.$valid)" novalidate>
                     <div class="dj-formtable">
                         <table class="dj-table dj-table3">
                             <tr>
@@ -16,35 +16,35 @@
                                                ng-disabled="true"/>
                                         <span class="input-group-addon"><i class="material-icons">search</i></span>
                                     </div>
-                                    <span ng-show="this.editForm.partyname.$invalid &&  this.editForm.$submitted"
+                                    <span ng-show="this.scydmeetingform.partyname.$invalid &&  this.scydmeetingform.$submitted"
                                           class="error">必填.</span>
                                 </td>
                                 <th>会议名称<span style="color:red;">*</span></th>
-                                <td ng-class="{ 'has-error' : this.editForm.title.$invalid &&  this.editForm.$submitted}">
+                                <td ng-class="{ 'has-error' : this.scydmeetingform.title.$invalid &&  this.scydmeetingform.$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"
+                                    <span ng-show="this.scydmeetingform.title.$invalid &&  this.scydmeetingform.$submitted"
                                           class="error">必填.</span>
                                 </td>
                                 <th>会议时间<span style="color:red;">*</span></th>
-                                <td ng-class="{ 'has-error' : this.editForm.meetingdate.$invalid &&  this.editForm.$submitted}">
+                                <td ng-class="{ 'has-error' : this.scydmeetingform.meetingdate.$invalid &&  this.scydmeetingform.$submitted}">
                                     <input name="meetingdate" class="form-control"
                                            autocomplete="off" autoclose="true"
                                            data-date-format="yyyy-MM-dd" data-date-type="date"
                                            ng-model="dataModel.meetingdate"
                                            placeholder="" bs-datepicker ng-required="true"/>
-                                    <span ng-show="this.editForm.meetingdate.$invalid &&  this.editForm.$submitted"
+                                    <span ng-show="this.scydmeetingform.meetingdate.$invalid &&  this.scydmeetingform.$submitted"
                                           class="error">必填.</span>
                                 </td>
                             </tr>
                             <tr>
                                 <th>主持人</th>
-                                <td ng-class="{ 'has-error' : this.editForm.compere.$invalid &&  this.editForm.$submitted}">
+                                <td ng-class="{ 'has-error' : this.scydmeetingform.compere.$invalid &&  this.scydmeetingform.$submitted}">
                                     <input type="text" class="form-control" name="compere"
                                            autocomplete="off" autoclose="true" ng-model="dataModel.compere"/>
                                 </td>
                                 <th>会议地址</th>
-                                <td colspan="3" ng-class="{ 'has-error' : this.editForm.address.$invalid &&  this.editForm.$submitted}">
+                                <td colspan="3" ng-class="{ 'has-error' : this.scydmeetingform.address.$invalid &&  this.scydmeetingform.$submitted}">
                                     <div class="form-group" style="margin-bottom: 4px;margin-top: 5px;">
                                         <div class="form-line select-group" style="padding-bottom: 1px;">
                                             <select ng-model="dataModel.address"
@@ -54,13 +54,13 @@
                                             </select>
                                         </div>
                                         <div class="form-line" style="width: 98%;margin-top: -29px;z-index: 9;"
-                                             ng-class="{ 'focused error' : this.editForm.address.$invalid &&  this.editForm.$submitted}">
+                                             ng-class="{ 'focused error' : this.scydmeetingform.address.$invalid &&  this.scydmeetingform.$submitted}">
                                             <input type="text" name="address"
                                                    ng-model="dataModel.address"
                                                    maxlength="1000" autocomplete="off" autoclose="true"
                                                    class="form-control"/>
                                         </div>
-                                        <span ng-show="this.editForm.address.$invalid &&  this.editForm.$submitted"
+                                        <span ng-show="this.scydmeetingform.address.$invalid &&  this.scydmeetingform.$submitted"
                                               class="error">必填.</span>
                                     </div>
                                 </td>
@@ -156,7 +156,7 @@
                     <bsfiles ng-model="reqFileModel"/>
                     <div class="form_foot">
                         <button type="button" class="btn btn-default" ng-click="pagechange()">取消</button>
-                        <button type="submit" class="btn btn-primary" form="editForm">保存</button>
+                        <button type="submit" class="btn btn-primary" form="scydmeetingform">保存</button>
                     </div>
                 </form>
         </div>

+ 1 - 1
src/main/resources/static/app/main/partylife/scyd/edit.js

@@ -111,7 +111,7 @@
             $http({
                 method: 'get',
                 url: '../../api/partylife/meeting/getUserAddressList',
-                params: {}
+                params: {partyLifeMeetingType : $scope.editParams.partyLifeMeetingType}
             }).then(function (result) {
                 $scope.addressList = result.data.item;
             }, function (resp) {