发送短信

assets/js/controllers/incident/incidentCtrl.js

@@ -2415,10 +2415,13 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         console.log(model)
         var modalInstance = $modal.open({
             templateUrl: 'assets/views/incident/tpl/toSms.tpl.html',
-            controller: function ($scope, $modalInstance, api_bpm_domain, modelData, currentUserId, Alert, api_user_data) {
+            controller: function ($scope, $modalInstance, api_bpm_domain, api_webservice1, modelData, currentUserId, Alert, api_user_data) {
                 console.log(model,loginUser);
-                $scope.assignUser = null;
-                $scope.assignGroup = null;
+                $scope.sms = {
+                    assignUser: null,
+                    assignGroup: null,
+                    content: '',
+                }
                 //获取用户
                 $scope.getUsers = function(key = ''){
                     $scope.user = [];
@@ -2456,7 +2459,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                 $scope.getGroups();
                 
                 $scope.ok = function () {
-                    if ($scope.userOrGroup == 1 && !$scope.assignUser){
+                    if ($scope.userOrGroup == 1 && !$scope.sms.assignUser){
                         Alert.swal({
                             title: "操作失败",
                             text: "请选择处理人!",
@@ -2464,7 +2467,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                         });
                         return;
                     }
-                    if ($scope.userOrGroup == 2 && !$scope.assignGroup){
+                    if ($scope.userOrGroup == 2 && !$scope.sms.assignGroup){
                         Alert.swal({
                             title: "操作失败",
                             text: "请选择处理组!",
@@ -2472,10 +2475,9 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                         });
                         return;
                     }
-                    return;
-                    api_bpm_domain.delegateTask(model.taskId, {assginee:$scope.assignUser}).then(function (response) {
+                    api_webservice1.notifyUser({content: $scope.sms.content, groupId: $scope.sms.assignGroup ? $scope.sms.assignGroup.id : undefined, userId: $scope.sms.assignUser ? $scope.sms.assignUser.id : undefined}).then(function (response) {
                         console.log(response)
-                        if (response.status == 200) {
+                        if (response.state == 200) {
                             Alert.swal({
                                 title: "操作成功!",
                                 confirmButtonColor: "#007AFF",

assets/js/controllers/system/user/schedulingplan.js

@@ -103,7 +103,9 @@ app.controller("calendarCtrl", function($scope,$rootScope, $filter, $q, $timeout
                 }
             }
             // delete weekdata[0];
+        $rootScope.isMask = true;
         api_bpm_data.addData('workDayconfigure', weekdata).then(function(response) {
+            $rootScope.isMask = false;
             if (response.status == 200) {
                 SweetAlert.swal({
                     title: "修改成功!",

assets/js/main.js

@@ -331,6 +331,9 @@ app.factory('api_webservice1', ['webserviceRestangular', function (webserviceRes
     return {
         fetchDataList: function (model, data) {
             return dataService.customPOST(data, 'samsQuery/' + model, {});
+        },
+        notifyUser: function (data) {
+            return dataService.customPOST(data, 'notifyUser', {});
         }
     };
 }]);

assets/views/incident/tpl/toSms.tpl.html

@@ -26,11 +26,11 @@
             <div class="control-label pull-left margin-top-5 margin-right-5">
                 <label class="demoincident">处理人</label>:</div>
             <div class="pull-right">
-                <ui-select class="pull-left" style="width:230px" ng-model="assignUser" theme="bootstrap">
+                <ui-select class="pull-left" style="width:230px" ng-model="sms.assignUser" theme="bootstrap">
                     <ui-select-match placeholder="">
                         {{$select.selected.name}}
                     </ui-select-match>
-                    <ui-select-choices repeat="item in user | filter:{$:$select.search}" refresh="getUsers($select.search)">
+                    <ui-select-choices repeat="item in user" refresh="getUsers($select.search)">
                         <div ng-bind-html="(item.name + '(' + item.account + ')') | highlight: $select.search"></div>
                     </ui-select-choices>
                 </ui-select>
@@ -42,17 +42,34 @@
             <div class="control-label pull-left margin-top-5 margin-right-5">
                 <label class="demoincident">处理组</label>:</div>
             <div class="pull-right">
-                <ui-select class="pull-left" style="width:230px" ng-model="assignGroup" theme="bootstrap">
+                <ui-select class="pull-left" style="width:230px" ng-model="sms.assignGroup" theme="bootstrap">
                     <ui-select-match placeholder="">
                         {{$select.selected.groupName}}
                     </ui-select-match>
-                    <ui-select-choices repeat="item in group | filter:{$:$select.search}">
+                    <ui-select-choices repeat="item in group">
                         <div ng-bind-html="item.groupName | highlight: $select.search"></div>
                     </ui-select-choices>
                 </ui-select>
             </div>
         </div>
     </div>
+    <div class="form-group incidentsearch" style="margin:0 auto;width: 300px;">
+        <div class=" input-group" style="margin:8px 0 0;">
+            <div class="control-label pull-left margin-top-5 margin-right-5">
+                <label class="demoincident">内容</label>:</div>
+            <div class="pull-right">
+                <!-- <ui-select class="pull-left" style="width:230px" ng-model="assignGroup" theme="bootstrap">
+                    <ui-select-match placeholder="">
+                        {{$select.selected.groupName}}
+                    </ui-select-match>
+                    <ui-select-choices repeat="item in group">
+                        <div ng-bind-html="item.groupName | highlight: $select.search"></div>
+                    </ui-select-choices>
+                </ui-select> -->
+                <textarea rows="3" ng-model="sms.content" class="describePlace" style="resize:none;width:230px;"></textarea>
+            </div>
+        </div>
+    </div>
     
 </div>
 <div class="modal-footer modelfooter-hint pointfont">