Selaa lähdekoodia

系统配置增加是否开通上下班

seimin 2 vuotta sitten
vanhempi
commit
f34e3d0d02

+ 15 - 2
assets/js/controllers/dashboard/newdash.js

@@ -15,8 +15,8 @@ appFormly.config(
15
     function config(formlyConfigProvider) {
15
     function config(formlyConfigProvider) {
16
         //格式转换方法 XXX-XXX转驼峰命名
16
         //格式转换方法 XXX-XXX转驼峰命名
17
     });
17
     });
18
-appFormly.controller('newDashCtrl', ['$rootScope', '$auth', '$scope', '$parse', '$injector', '$http', '$q', '$state', '$modal', '$timeout', '$interval', 'SweetAlert', 'i18nService', '$window', "ngTableParams", 'Restangular', 'UserRestangular', 'BpmRestangular', 'api_configure_form', 'api_bpm_domain', 'api_bpm_data','api_event_form', 'api_user_data', 'api_report', 'api_msg', 'api_bpm_schedule', 'api_newreport', 'api_statistic', "calendarConfig", "api_login",
19
-    function($rootScope, $auth, $scope, $parse, $injector, $http, $q, $state, $modal, $timeout, $interval, SweetAlert, i18nService, $window, ngTableParams, Restangular, UserRestangular, BpmRestangular, api_configure_form, api_bpm_domain, api_bpm_data,api_event_form, api_user_data, api_report, api_msg, api_bpm_schedule, api_newreport, api_statistic, calendarConfig, api_login) {
18
+appFormly.controller('newDashCtrl', ['$rootScope', '$auth', '$scope', '$parse', '$injector', '$http', '$q', '$state', '$modal', '$timeout', '$interval', 'SweetAlert', 'i18nService', '$window', "ngTableParams", 'Restangular', 'UserRestangular', 'BpmRestangular', 'api_configure_form', 'api_bpm_domain', 'api_bpm_data','api_event_form', 'api_user_data', 'api_report', 'api_msg', 'api_bpm_schedule', 'api_newreport', 'api_statistic', "calendarConfig", "api_login","api_sysinfo",
19
+    function($rootScope, $auth, $scope, $parse, $injector, $http, $q, $state, $modal, $timeout, $interval, SweetAlert, i18nService, $window, ngTableParams, Restangular, UserRestangular, BpmRestangular, api_configure_form, api_bpm_domain, api_bpm_data,api_event_form, api_user_data, api_report, api_msg, api_bpm_schedule, api_newreport, api_statistic, calendarConfig, api_login,api_sysinfo) {
20
         $scope.incidentlist = {};
20
         $scope.incidentlist = {};
21
         $scope.bodyheight = {};
21
         $scope.bodyheight = {};
22
         // $scope.tableParams = {};
22
         // $scope.tableParams = {};
@@ -1769,6 +1769,19 @@ appFormly.controller('newDashCtrl', ['$rootScope', '$auth', '$scope', '$parse',
1769
         }else{
1769
         }else{
1770
             $scope.isShowTj = false;
1770
             $scope.isShowTj = false;
1771
         }
1771
         }
1772
+        $scope.ifShowTj = false;
1773
+        $scope.ifShowTjFunc = function(){
1774
+            api_sysinfo.fetchDataList('systemConfiguration',{
1775
+                "idx": 0,
1776
+                "sum": 1,
1777
+                systemConfiguration: {
1778
+                  keyconfig: "ifWorking"
1779
+                }
1780
+              }).then(function(result) {
1781
+                $scope.ifShowTj = result.list[0].valueconfig == 1;
1782
+            });
1783
+        }
1784
+        $scope.ifShowTjFunc();
1772
         
1785
         
1773
         // 首页统计数据(新)
1786
         // 首页统计数据(新)
1774
         $scope.managerIndexInfo = {};
1787
         $scope.managerIndexInfo = {};

+ 4 - 0
assets/js/controllers/system/sysconfigCtrl.js

@@ -27,6 +27,7 @@ app.controller("sysconfigCtrl", ["$rootScope", "$scope", "$state", "$timeout", "
27
         arr.systemConfiguration.push(a.reqHasCategory);//是否选择事件分类
27
         arr.systemConfiguration.push(a.reqHasCategory);//是否选择事件分类
28
         arr.systemConfiguration.push(a.incidentWithConsumable);//是否需要绑定耗材
28
         arr.systemConfiguration.push(a.incidentWithConsumable);//是否需要绑定耗材
29
         arr.systemConfiguration.push(a.wxIncidentWithCmdb);//是否需要绑定资产
29
         arr.systemConfiguration.push(a.wxIncidentWithCmdb);//是否需要绑定资产
30
+        arr.systemConfiguration.push(a.ifWorking);//是否开通上下班
30
         arr.systemConfiguration.push(a.requesterLgoinType);//保修人登录方式
31
         arr.systemConfiguration.push(a.requesterLgoinType);//保修人登录方式
31
         arr.systemConfiguration.push(a.autoCloseIncidentHour);//自动关单小时
32
         arr.systemConfiguration.push(a.autoCloseIncidentHour);//自动关单小时
32
         console.log(arr,99999);
33
         console.log(arr,99999);
@@ -111,6 +112,9 @@ app.controller("sysconfigCtrl", ["$rootScope", "$scope", "$state", "$timeout", "
111
                     if (v.keyconfig == 'wxIncidentWithCmdb') {
112
                     if (v.keyconfig == 'wxIncidentWithCmdb') {
112
                         a.wxIncidentWithCmdb = v;//是否需要绑定资产
113
                         a.wxIncidentWithCmdb = v;//是否需要绑定资产
113
                     }
114
                     }
115
+                    if (v.keyconfig == 'ifWorking') {
116
+                        a.ifWorking = v;//是否开通上下班
117
+                    }
114
                     if (v.keyconfig == 'requesterLgoinType') {
118
                     if (v.keyconfig == 'requesterLgoinType') {
115
                         a.requesterLgoinType = v;//报修人登录方式
119
                         a.requesterLgoinType = v;//报修人登录方式
116
                     }
120
                     }

+ 1 - 1
assets/views/dashboard/newdash.html

@@ -233,7 +233,7 @@
233
 <div ng-style="bodyheight">
233
 <div ng-style="bodyheight">
234
     <div ng-controller="newDashCtrl" class="">
234
     <div ng-controller="newDashCtrl" class="">
235
         <div class="listbote dashheadcolor margin-top-15">
235
         <div class="listbote dashheadcolor margin-top-15">
236
-            <div class="list-controls clearfix" ng-if="isShowTj">
236
+            <div class="list-controls clearfix" ng-if="ifShowTj && isShowTj">
237
                 <!-- <div class="know-text-group"> -->
237
                 <!-- <div class="know-text-group"> -->
238
                     <!-- <div class="know-text-group-div pointfont center" ng-click="gowechart()" ng-if="thisuserrole=='admin'||thisuserrole=='center'">
238
                     <!-- <div class="know-text-group-div pointfont center" ng-click="gowechart()" ng-if="thisuserrole=='admin'||thisuserrole=='center'">
239
                         <span class="know-text-color"><i class="icon  iconfontsmall icon-baozhangzhuanhuan ashy"></i>移动端报障</span>
239
                         <span class="know-text-color"><i class="icon  iconfontsmall icon-baozhangzhuanhuan ashy"></i>移动端报障</span>

+ 19 - 0
assets/views/system/sysconfig.html

@@ -199,6 +199,25 @@
199
                         </ul>
199
                         </ul>
200
                     </div>
200
                     </div>
201
                 </div>
201
                 </div>
202
+                <div class="form-group col-sm-6">
203
+                    <label class="col-sm-4 control-label">
204
+                        是否开通上下班:
205
+                    </label>
206
+                    <div class="col-sm-8">
207
+                        <ul class="tab_bdItem_tab">
208
+                            <li class="fl">
209
+                                <i class="tab_bdItem_tabItem iconfont icon-icon_weizuo" ng-click="ifWorking.valueconfig = 1;"
210
+                                    ng-class="ifWorking.valueconfig == 1?'active':''"></i>
211
+                                <span>是</span>
212
+                            </li>
213
+                            <li class="fl">
214
+                                <i class="tab_bdItem_tabItem iconfont icon-icon_weizuo" ng-click="ifWorking.valueconfig = 0;"
215
+                                    ng-class="ifWorking.valueconfig == 0?'active':''"></i>
216
+                                <span>否</span>
217
+                            </li>
218
+                        </ul>
219
+                    </div>
220
+                </div>
202
             </div>
221
             </div>
203
             <!-- 保存 -->
222
             <!-- 保存 -->
204
             <div class="form-group margin-bottom-0">
223
             <div class="form-group margin-bottom-0">