Showing
1 changed file
with
17 additions
and
14 deletions
@@ -12,8 +12,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl | @@ -12,8 +12,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl | ||
12 | var upload = layui.upload; //上传 | 12 | var upload = layui.upload; //上传 |
13 | 13 | ||
14 | exports('dutyIndex', function () { | 14 | exports('dutyIndex', function () { |
15 | - var sessions = layui.sessions; | ||
16 | - var accessToken = sessions.getToken()['access_token']; | 15 | + //var sessions = layui.sessions; |
16 | + var accessToken = localStorage.getItem("accessToken"); | ||
17 | var domainName = common.domainName; | 17 | var domainName = common.domainName; |
18 | var user = localStorage.getItem("lgn"); | 18 | var user = localStorage.getItem("lgn"); |
19 | var roles = sessionStorage.getItem('roles'); | 19 | var roles = sessionStorage.getItem('roles'); |
@@ -40,13 +40,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl | @@ -40,13 +40,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl | ||
40 | $('.table-duty-title-text').text(yearNew + '年' + monthNew + '月'); | 40 | $('.table-duty-title-text').text(yearNew + '年' + monthNew + '月'); |
41 | 41 | ||
42 | loadTable(); | 42 | loadTable(); |
43 | - | 43 | + var param = {"accessToken": accessToken} |
44 | //渲染上传组件 | 44 | //渲染上传组件 |
45 | var uploadIndex = upload.render({ | 45 | var uploadIndex = upload.render({ |
46 | elem: '#btn-duty-dutyImport' | 46 | elem: '#btn-duty-dutyImport' |
47 | - , url: domainName + '/api-web/manage/duty/importFromTemplate?access_token=' + accessToken | ||
48 | - , accept: 'file', | ||
49 | - before: function () { | 47 | + , url: domainName + '/api-web/manage/duty/importFromTemplate?accessToken=' + accessToken |
48 | + ,data: param | ||
49 | + ,accept: 'file' //允许上传的文件类型 | ||
50 | + ,exts:'xlsx' | ||
51 | + ,multiple:true | ||
52 | + ,before: function () { | ||
50 | loadIndex = layer.load(1, {shade: [0.6], content: '正在导入,请稍后...'}); | 53 | loadIndex = layer.load(1, {shade: [0.6], content: '正在导入,请稍后...'}); |
51 | } | 54 | } |
52 | , done: function (res) { | 55 | , done: function (res) { |
@@ -306,7 +309,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl | @@ -306,7 +309,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl | ||
306 | var paramMonth = $('#duty-calendar-export-month').val(); | 309 | var paramMonth = $('#duty-calendar-export-month').val(); |
307 | if (paramYear || paramMonth) { | 310 | if (paramYear || paramMonth) { |
308 | var params = {}; | 311 | var params = {}; |
309 | - params.access_token = accessToken; | 312 | + params.accessToken = accessToken; |
310 | params.year = paramYear; | 313 | params.year = paramYear; |
311 | params.month = paramMonth; | 314 | params.month = paramMonth; |
312 | layer.closeAll(); | 315 | layer.closeAll(); |
@@ -343,7 +346,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl | @@ -343,7 +346,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl | ||
343 | var param = $('#dutyYearMonth').val(); | 346 | var param = $('#dutyYearMonth').val(); |
344 | if (param) { | 347 | if (param) { |
345 | var params = {}; | 348 | var params = {}; |
346 | - params.access_token = accessToken; | 349 | + params.accessToken = accessToken; |
347 | params.year = param.split("-")[0]; | 350 | params.year = param.split("-")[0]; |
348 | params.month = param.split("-")[1]; | 351 | params.month = param.split("-")[1]; |
349 | window.open(domainName + '/api-web/manage/duty/template?' + $.param(params)); | 352 | window.open(domainName + '/api-web/manage/duty/template?' + $.param(params)); |
@@ -460,7 +463,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl | @@ -460,7 +463,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl | ||
460 | changeUserAccount | 463 | changeUserAccount |
461 | } | 464 | } |
462 | admin.req({ | 465 | admin.req({ |
463 | - url: domainName + '/api-web/manage/duty/save?access_token=' + accessToken, | 466 | + url: domainName + '/api-web/manage/duty/save?accessToken=' + accessToken, |
464 | type: 'POST', | 467 | type: 'POST', |
465 | async: false, | 468 | async: false, |
466 | contentType: 'application/json', | 469 | contentType: 'application/json', |
@@ -486,7 +489,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl | @@ -486,7 +489,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl | ||
486 | function iSExchange(id) { | 489 | function iSExchange(id) { |
487 | var value = false; | 490 | var value = false; |
488 | admin.req({ | 491 | admin.req({ |
489 | - url: domainName + '/api-web/manage/duty/queryExchange?access_token=' + accessToken, | 492 | + url: domainName + '/api-web/manage/duty/queryExchange?accessToken=' + accessToken, |
490 | async: false, | 493 | async: false, |
491 | data: {id: id}, | 494 | data: {id: id}, |
492 | }).done(function (response) { | 495 | }).done(function (response) { |
@@ -502,7 +505,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl | @@ -502,7 +505,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl | ||
502 | function iSExchangeClass(id) { | 505 | function iSExchangeClass(id) { |
503 | var value = false; | 506 | var value = false; |
504 | admin.req({ | 507 | admin.req({ |
505 | - url: domainName + '/api-web/manage/duty/queryExchangeClass?access_token=' + accessToken, | 508 | + url: domainName + '/api-web/manage/duty/queryExchangeClass?accessToken=' + accessToken, |
506 | async: false, | 509 | async: false, |
507 | data: {id: id}, | 510 | data: {id: id}, |
508 | }).done(function (response) { | 511 | }).done(function (response) { |
@@ -582,7 +585,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl | @@ -582,7 +585,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl | ||
582 | function obtain() { | 585 | function obtain() { |
583 | //获取用户数据 | 586 | //获取用户数据 |
584 | $.ajax({ | 587 | $.ajax({ |
585 | - url: common.domainName + '/api-user/users/getAll?access_token=' + accessToken, | 588 | + url: common.domainName + '/mj/user/getAll?accessToken=' + accessToken, |
586 | async: false, | 589 | async: false, |
587 | data: {name: ''}, | 590 | data: {name: ''}, |
588 | success: function (data) { | 591 | success: function (data) { |
@@ -642,12 +645,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl | @@ -642,12 +645,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl | ||
642 | if (arr && arr.length == 1) { | 645 | if (arr && arr.length == 1) { |
643 | changeUserId = arr[0].value; | 646 | changeUserId = arr[0].value; |
644 | } | 647 | } |
645 | - if (changeUserId == '') { | 648 | + if (changeUserId == '') {d |
646 | return; | 649 | return; |
647 | } | 650 | } |
648 | //获取时间段数据 | 651 | //获取时间段数据 |
649 | $.ajax({ | 652 | $.ajax({ |
650 | - url: common.domainName + '/api-web/manage/duty/getDutyDuration?userId=' + changeUserId + '&access_token=' + accessToken, | 653 | + url: common.domainName + '/api-web/manage/duty/getDutyDuration?userId=' + changeUserId + '&accessToken=' + accessToken, |
651 | async: false, | 654 | async: false, |
652 | success: function (data) { | 655 | success: function (data) { |
653 | data = data.data; | 656 | data = data.data; |
-
Please register or login to post a comment