Merge branch 'master-mj-yjp' into 'master-mj'

fix:天津值班管理功能迁移



See merge request !1144

@@ -12,8 +12,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
     var upload = layui.upload; //上传
 
     exports('dutyIndex', function () {
-        var sessions = layui.sessions;
-        var accessToken = sessions.getToken()['access_token'];
+        //var sessions = layui.sessions;
+        var accessToken = localStorage.getItem("accessToken");
         var domainName = common.domainName;
         var user = localStorage.getItem("lgn");
         var roles = sessionStorage.getItem('roles');
@@ -40,13 +40,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
         $('.table-duty-title-text').text(yearNew + '年' + monthNew + '月');
 
         loadTable();
-
+        var param = {"accessToken": accessToken}
         //渲染上传组件
         var uploadIndex = upload.render({
             elem: '#btn-duty-dutyImport'
-            , url: domainName + '/api-web/manage/duty/importFromTemplate?access_token=' + accessToken
-            , accept: 'file',
-            before: function () {
+            , url: domainName + '/api-web/manage/duty/importFromTemplate?accessToken=' + accessToken
+            ,data: param
+            ,accept: 'file' //允许上传的文件类型
+            ,exts:'xlsx'
+            ,multiple:true
+            ,before: function () {
                 loadIndex = layer.load(1, {shade: [0.6], content: '正在导入，请稍后...'});
             }
             , done: function (res) {
@@ -306,7 +309,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
                     var paramMonth = $('#duty-calendar-export-month').val();
                     if (paramYear || paramMonth) {
                         var params = {};
-                        params.access_token = accessToken;
+                        params.accessToken = accessToken;
                         params.year = paramYear;
                         params.month = paramMonth;
                         layer.closeAll();
@@ -343,7 +346,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
                     var param = $('#dutyYearMonth').val();
                     if (param) {
                         var params = {};
-                        params.access_token = accessToken;
+                        params.accessToken = accessToken;
                         params.year = param.split("-")[0];
                         params.month = param.split("-")[1];
                         window.open(domainName + '/api-web/manage/duty/template?' + $.param(params));
@@ -460,7 +463,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
                         changeUserAccount
                     }
                     admin.req({
-                        url: domainName + '/api-web/manage/duty/save?access_token=' + accessToken,
+                        url: domainName + '/api-web/manage/duty/save?accessToken=' + accessToken,
                         type: 'POST',
                         async: false,
                         contentType: 'application/json',
@@ -486,7 +489,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
         function iSExchange(id) {
             var value = false;
             admin.req({
-                url: domainName + '/api-web/manage/duty/queryExchange?access_token=' + accessToken,
+                url: domainName + '/api-web/manage/duty/queryExchange?accessToken=' + accessToken,
                 async: false,
                 data: {id: id},
             }).done(function (response) {
@@ -502,7 +505,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
         function iSExchangeClass(id) {
             var value = false;
             admin.req({
-                url: domainName + '/api-web/manage/duty/queryExchangeClass?access_token=' + accessToken,
+                url: domainName + '/api-web/manage/duty/queryExchangeClass?accessToken=' + accessToken,
                 async: false,
                 data: {id: id},
             }).done(function (response) {
@@ -582,7 +585,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
         function obtain() {
             //获取用户数据
             $.ajax({
-                url: common.domainName + '/api-user/users/getAll?access_token=' + accessToken,
+                url: common.domainName + '/mj/user/getAll?accessToken=' + accessToken,
                 async: false,
                 data: {name: ''},
                 success: function (data) {
@@ -642,12 +645,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
             if (arr && arr.length == 1) {
                 changeUserId = arr[0].value;
             }
-            if (changeUserId == '') {
+            if (changeUserId == '') {d
                 return;
             }
             //获取时间段数据
             $.ajax({
-                url: common.domainName + '/api-web/manage/duty/getDutyDuration?userId=' + changeUserId + '&access_token=' + accessToken,
+                url: common.domainName + '/api-web/manage/duty/getDutyDuration?userId=' + changeUserId + '&accessToken=' + accessToken,
                 async: false,
                 success: function (data) {
                     data = data.data;