82064491C07A712AE32B5B57EC6EF136 9 mēneši atpakaļ
vecāks
revīzija
b13708a88e

+ 1 - 1
src/main/resources/static/app/main/dsflow/appendStartTask.js

@@ -40,7 +40,7 @@
         });
         $scope.showDetail = function (e) {
             if (e.TaskNote != null && e.TaskNote.length >= 50) {
-                DModal.$scope.title = "通知描述:";
+                DModal.$scope.title = "任务描述:";
                 DModal.$scope.TaskNote = e.TaskNote;
                 DModal.$promise.then(DModal.show);
             }

+ 3 - 3
src/main/resources/static/app/main/home/mainindex.js

@@ -101,9 +101,9 @@
             $scope.loadFIle();
         }
 
-        //通知
+        //任务
         {
-            //加载通知信息
+            //加载任务信息
             $scope.loadMsgData = function (day, state) {
                 /* $scope.cdData = [];
                  $http
@@ -956,7 +956,7 @@
             }, 100);
         };
         $scope.mspageList = [
-            {id: 2, title: '通知公告', url: '../main/home/tabpage/mytask.html', number: 0}
+            {id: 2, title: '任务待办', url: '../main/home/tabpage/mytask.html', number: 0}
             // {id: 1, title: '会议', url: '../main/home/tabpage/meetingmsg.html', number: $scope.taskdataList.length}
         ];
 

+ 1 - 1
src/main/resources/static/app/main/home/tabpage/mytask.html

@@ -7,5 +7,5 @@
 <ul class="list-group" ng-if="taskdataList.length==0" style="text-align: center; ">
     <br>
     <br>
-    <span>暂无通知</span>
+    <span>暂无数据</span>
 </ul>

+ 5 - 5
src/main/resources/static/app/main/partyTwoExt/task/edit.html

@@ -2,11 +2,11 @@
 <div class="dj-card">
     <div class="dj-body"  activate-input activate-select>
         <form role="form" name="editForm" novalidate>
-            <div panel-title data-title="'通知信息'"></div>
+            <div panel-title data-title="'任务信息'"></div>
             <div ng-if="isDetail" class="dj-formtable">
                 <table class="dj-table">
                     <tr>
-                        <th>通知名称<span style="color: red;">*不超过15字</span></th>
+                        <th>任务名称<span style="color: red;">*不超过15字</span></th>
                         <td ng-class="{ 'focused error' : this.editForm.taskname.$invalid &&  this.editForm.$submitted}">
                             <input type="text" name="taskname" ng-model="dataModel.taskname"
                                    class="form-control" ng-required="true"/>
@@ -61,7 +61,7 @@
                         <td></td>
                     </tr>
                     <tr>
-                        <th>通知内容</th>
+                        <th>任务内容</th>
                         <td colspan="5">
                             <textarea maxlength="800" ng-model="dataModel.taskcontent" style="width: 100%;" rows="2" name="taskcontent"></textarea>
                         </td>
@@ -71,7 +71,7 @@
             <div ng-if="!isDetail" class="dj-formtable">
                 <table class="dj-table">
                     <tr>
-                        <th>通知名称</th>
+                        <th>任务名称</th>
                         <td>
                            {{dataModel.taskname}}
                         </td>
@@ -99,7 +99,7 @@
                         <td></td>
                     </tr>
                     <tr>
-                        <th>通知内容</th>
+                        <th>任务内容</th>
                         <td colspan="5">
                             <pre ng-bind-html="dataModel.taskcontent" style="white-space: pre-wrap;margin-top: 10px;"></pre>
                         </td>

+ 4 - 4
src/main/resources/static/app/main/partyTwoExt/task/list.html

@@ -9,7 +9,7 @@
                             <form class="form-horizontal">
                                 <div class="row clearfix form-inline">
                                     <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2 dj-label">
-                                        <label>通知名称</label>
+                                        <label>任务名称</label>
                                     </div>
                                     <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
                                         <div class="form-group">
@@ -69,10 +69,10 @@
                                     ng-click="export()">导出
                             </button>
                             <button class="btn btn-default1" role-permission-code="systask.btn.btnAdd"
-                                    ng-click="add()">下发通知
+                                    ng-click="add()">下发任务
                             </button>
                             <button class="btn btn-default1" role-permission-code="systask.btn.btnAdd"
-                                    ng-click="addpub()">下发材料收集通知
+                                    ng-click="addpub()">下发材料收集任务
                             </button>
                         </div>
                     </div>
@@ -84,7 +84,7 @@
                                 <thead>
                                 <tr>
                                     <th>序号</th>
-                                    <th WIDTH="30%">通知名称</th>
+                                    <th WIDTH="30%">任务名称</th>
                                     <th>接收人数</th>
                                     <th>下达时间</th>
                                     <th>截止时间</th>

+ 2 - 2
src/main/resources/static/app/main/partyTwoExt/task/mytask.html

@@ -9,7 +9,7 @@
                             <form class="form-horizontal">
                                 <div class="row clearfix form-inline">
                                     <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2 dj-label">
-                                        <label>通知名称</label>
+                                        <label>任务名称</label>
                                     </div>
                                     <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
                                         <div class="form-group">
@@ -97,7 +97,7 @@
                                 <thead>
                                 <tr>
                                     <th>序号</th>
-                                    <th WIDTH="30%">通知名称</th>
+                                    <th WIDTH="30%">任务名称</th>
                                     <th>下达时间</th>
                                     <th>截止时间</th>
                                     <th>发送部门</th>

+ 5 - 5
src/main/resources/static/app/main/taskpubmgr/taskpub/edit.html

@@ -2,11 +2,11 @@
 <div class="dj-card">
     <div class="dj-body" activate-input activate-select>
         <form role="form" name="editForm" novalidate>
-            <div panel-title data-title="'通知信息'"></div>
+            <div panel-title data-title="'任务信息'"></div>
             <div ng-if="isDetail" class="dj-formtable">
                 <table class="dj-table">
                     <tr>
-                        <th>通知名称<span style="color: red;">*不超过15字</span></th>
+                        <th>任务名称<span style="color: red;">*不超过15字</span></th>
                         <td ng-class="{ 'focused error' : this.editForm.taskname.$invalid &&  this.editForm.$submitted}">
                             <input type="text" name="taskname" ng-model="dataModel.taskname"
                                    class="form-control" ng-required="true"/>
@@ -61,7 +61,7 @@
                         <td></td>
                     </tr>
                     <tr>
-                        <th>通知内容</th>
+                        <th>任务内容</th>
                         <td colspan="5">
                             <textarea maxlength="800" ng-model="dataModel.taskcontent" style="width: 100%;" rows="2"
                                       name="taskcontent"></textarea>
@@ -72,7 +72,7 @@
             <div ng-if="!isDetail" class="dj-formtable">
                 <table class="dj-table">
                     <tr>
-                        <th>通知名称</th>
+                        <th>任务名称</th>
                         <td>
                             {{dataModel.taskname}}
                         </td>
@@ -100,7 +100,7 @@
                         <td></td>
                     </tr>
                     <tr>
-                        <th>通知内容</th>
+                        <th>任务内容</th>
                         <td colspan="5">
                             <pre ng-bind-html="dataModel.taskcontent"
                                  style="white-space: pre-wrap;margin-top: 10px;"></pre>

+ 2 - 2
src/main/resources/static/app/main/taskpubmgr/taskpub/view.html

@@ -2,11 +2,11 @@
 <div class="dj-card">
     <div class="dj-body" activate-input activate-select>
         <form role="form" name="editForm2" novalidate>
-            <div panel-title data-title="'通知信息'"></div>
+            <div panel-title data-title="'任务信息'"></div>
             <div class="dj-formtable">
                 <table class="dj-table">
                     <tr>
-                        <th>通知名称</th>
+                        <th>任务名称</th>
                         <td>
                             {{dataModel.taskname}}
                         </td>