Browse Source

bug修改

raolu 7 years ago
parent
commit
e011ad3fc7
4 changed files with 21 additions and 9 deletions
  1. 10 5
      js/api-service.js
  2. 8 1
      js/buz/index.js
  3. 1 1
      js/buz/order-list.js
  4. 2 2
      js/util.js

+ 10 - 5
js/api-service.js

@ -18,12 +18,14 @@
	
	
    userAgent = localStorage.getItem(agentName)
    //hard code userAgent for test
	
    //hard code userAgent for test start
    //全科
    // userAgent = {"id":4798,"uid":"hxmD201703150222","token":"a69244e7c000c2db07f6cb5c2e44e8f4","imei":"A8221352625AFE32","platform":4}
    // userAgent = {"id":4800,"uid":"zbqD201703150222","imei":"864394010176834","token":"9b23e4ec0bcd3b9fa72a52f91544a4e9","platform":4,"hospital":"3502050100"}
	//健管
    // userAgent = {"id":4821,"uid":"zbqD201703150228","imei":"864394010176834","token":"73f5ace5c7d4cdb811f743902fd705d9","platform":2,"hospital":"3502050100"}; 
    userAgent = JSON.stringify({"id":4798,"uid":"hxmD201703150222","token":"0af1d911281cfec43bcf7da6e18f227b","imei":"40C1416D42D02EA9","platform":4});
    // userAgent = {"id":4821,"uid":"zbqD201703150228","imei":"864394010176834","token":"73f5ace5c7d4cdb811f743902fd705d9","platform":4,"hospital":"3502050100"}; 
    // userAgent = JSON.stringify(userAgent);
    //hard code userAgent for test end
    
    if(userAgent) {
        try{
@ -133,7 +135,10 @@
		}
		if(tip) {
			toastr && toastr.warning(tip)
			// location.replace(loginUrl+'?redirect_url='+encodeURIComponent(location.href))
			
			setTimeout(function(){
                location.replace(loginUrl+'?redirect_url='+encodeURIComponent(location.href))
            }, 1000);
		}
    }
	

+ 8 - 1
js/buz/index.js

@ -34,14 +34,21 @@ function getTeamInfo(){
        if(res.status == 200){
            var manageTeams = '',
                orderTeams = '';
            var isLeader2 = false;
            if(level == 3){ //健管师,则续方订单中需要加上额外的两个菜单
                orderTeams = '<li><a class="J_menuItem" href="order-list-jg.html?type=1" data-index="0">需跟踪订单</a></li>'+
                    '<li><a class="J_menuItem" href="order-list-jg.html?type=2" data-index="0">已接收订单</a></li>';
            }
            for(var i=0; i<res.data.length; i++){
                var item = res.data[i];
                if(item.leaderCode == docInfo.code){
                    isLeader2 = true;
                }else{
                    isLeader2 = false;
                }
                console.log(isLeader2);
                manageTeams += '<li><a class="J_menuItem" href="prescription-management.html?id='+item.id+'" data-index="0" data-id="'+item.id+'">'+item.name+'</a></li>';
                orderTeams += '<li><a class="J_menuItem" href="order-list.html?id='+item.id+'&isLeader='+isLeader+'" data-index="0">'+item.name+'</a></li>';
                orderTeams += '<li><a class="J_menuItem" href="order-list.html?id='+item.id+'&isLeader='+isLeader2+'" data-index="0">'+item.name+'</a></li>';
            }
            $("#manageTeams").empty().append(manageTeams);
            $("#orderTeams").empty().append(orderTeams);

+ 1 - 1
js/buz/order-list.js

@ -20,7 +20,7 @@ var startDate = '',
    selectDoctor; //选中的医生
$(function(){
    //非团队长隐藏操作按钮
    if(!isLeader){
    if(!isLeader || isLeader == 'false'){
        $("#arrange").hide();
    }
    //填充下拉框数据

+ 2 - 2
js/util.js

@ -129,10 +129,10 @@ function getStatusName(status){
            name = '支付失败';
            break;
        case '50':
            name = '配药中';
            name = '订单已支付';
            break;
        case '60':
            name = '等待领药';
            name = '配药完成';
            break;
        case '61':
        case '62':