Browse Source

消息通知

seimin 11 months ago
parent
commit
bf98e7de35

+ 1 - 1
assets/js/controllers/system/notificationCtrl.js

@@ -210,7 +210,7 @@ app.controller('notificationCtr', ["$rootScope", "$scope", "$state", "$timeout",
210
                     if (newVal === undefined) {//负号
210
                     if (newVal === undefined) {//负号
211
                         $scope.editData.noticeRule = 0;
211
                         $scope.editData.noticeRule = 0;
212
                     } else {
212
                     } else {
213
-                        if ($scope.editData.id == 11) {//百分比
213
+                        if ($scope.editData.noticeCode == 'user_receive') {//百分比
214
                             $scope.editData.noticeRule = newVal < 0 ? 0 : newVal;
214
                             $scope.editData.noticeRule = newVal < 0 ? 0 : newVal;
215
                         }
215
                         }
216
                     }
216
                     }

+ 2 - 2
assets/views/system/tpl/notificationBj.html

@@ -219,10 +219,10 @@
219
     <div class="modal-body-group">
219
     <div class="modal-body-group">
220
         <div class="modal-body-groupItem">
220
         <div class="modal-body-groupItem">
221
             <h2 ng-if="editData.noticeRule === 'no'">{{editData.processName}}- 进入步骤时</h2>
221
             <h2 ng-if="editData.noticeRule === 'no'">{{editData.processName}}- 进入步骤时</h2>
222
-            <h2 ng-if="editData.noticeRule !== 'no'&&(editData.id==13||editData.id==14||editData.id==12)">
222
+            <h2 ng-if="editData.noticeRule !== 'no'&&(editData.noticeCode == 'user_receive_overresp' || editData.noticeCode == 'manager_receive_overresp')">
223
                 {{editData.processName}}-【逾期响应时长】<input class="noticeRule" type="number"
223
                 {{editData.processName}}-【逾期响应时长】<input class="noticeRule" type="number"
224
                 ng-model="editData.noticeRule">分钟</h2>
224
                 ng-model="editData.noticeRule">分钟</h2>
225
-            <h2 ng-if="editData.noticeRule !== 'no'&&(editData.id == 18||editData.id == 19)">{{editData.processName}}-【解决时长】剩余<input
225
+            <h2 ng-if="editData.noticeRule !== 'no'&&(editData.noticeCode == 'user_doing_overresp' || editData.noticeCode == 'manager_doing_overresp')">{{editData.processName}}-【解决时长】剩余<input
226
                     class="noticeRule" type="number" ng-model="editData.noticeRule">%</h2>
226
                     class="noticeRule" type="number" ng-model="editData.noticeRule">%</h2>
227
             <div class="noticeNode">流程节点:<span>{{editData.noticeNode}}</span></div>
227
             <div class="noticeNode">流程节点:<span>{{editData.noticeNode}}</span></div>
228
             <div class="infoParent">
228
             <div class="infoParent">