消息通知

assets/js/controllers/system/notificationCtrl.js

@@ -99,6 +99,7 @@ app.controller('notificationCtr', ["$rootScope", "$scope", "$state", "$timeout",
         var modalInstance = $modal.open({
             templateUrl: 'assets/views/system/tpl/notificationBj.html',
             controller: function ($scope, $modalInstance) {
+                $scope.data = data;
                 $scope.editData = {
                     id: data.id,//id
                     noticeCode: data.noticeCode,
@@ -216,6 +217,8 @@ app.controller('notificationCtr', ["$rootScope", "$scope", "$state", "$timeout",
                     }
                 });
                 //变量参数
+                $scope.varArr = ['[$事件单号$]','[$报修时间$]','[$故障地点$]', '[$联系人$]', '[$联系人电话$]', '[$受理人$]', '[$受理人电话$]', '[$处理人$]', '[$处理人电话$]', '[$故障描述$]', '[$区域$]', '[$地点$]', '[$详细地址$]', '[$学工号$]','[$报修科室$]','[$进入系统$]'];
+                $scope.varPlaceholder = '${联系人}${联系人电话}于${报修时间}${事件单号}的报修，${处理人}${处理人电话}已接单，正在处理中。';
                 switch ($scope.editData.noticeCode) {
                     case 'req_start':
                         $scope.varArr = ['[$事件单号$]', '[$报修时间$]', '[$报修人$]', '[$故障描述$]', '[$区域$]', '[$地点$]', '[$详细地址$]','[$报修科室$]','[$进入系统$]'];
@@ -353,6 +356,7 @@ app.controller('notificationCtr', ["$rootScope", "$scope", "$state", "$timeout",
                         };
                     }
                     // 关闭模态窗口并传递一个结果
+                    data = Object.assign({}, $scope.data, data);
                     $modalInstance.close(data);
                 };
             }