物资

CallCenterWeb.UI/ArchivesManagement/ArchivesList.html

@@ -33,9 +33,8 @@
 		<div class="wrapper wrapper-content animated fadeInRight">
 			<div class="toolBox clearfix">
 				<div class="form-group">
-					<div class="col-md-4">
+					<div class="col-md-2">
 						<select id="companyNameS" class="form-control input-sm" data-live-search="true">
-							<!-- <option value="">请选择物资状态</option> -->
 						</select>
 					</div>
 				</div>

CallCenterWeb.UI/ArchivesManagement/js/archivesListInfo.js

@@ -53,11 +53,9 @@ function initTable() {
 			};
 		},
 		onLoadSuccess: function() { //加载成功时执行
-		authorizeOperateButton();
-			//layer.msg("加载成功");
+			// authorizeOperateButton();
 		},
 		onLoadError: function() { //加载失败时执行
-			//layer.msg("加载数据失败", { time: 1500, icon: 2 });
 		}
 	});
 }
@@ -69,6 +67,7 @@ function authorizeOperateButton() {
 	switch(userRoleCode) {
 		case "XTGLY": // 坐席班长 派单(分配)、处理、接单、删除、催办
 				$('.tool_downs').find('#GL_delete').show();
+				$('.tool_downs').find('#GL_watch').show();
 			break;
 		case "JG": // JG-监管 删除/借阅、归还、入库、出库
 				$('.tool_downs').find('#GL_delete').show();
@@ -76,9 +75,9 @@ function authorizeOperateButton() {
 				$('.tool_downs').find('#GL_EXwarehouse').show();
 				$('.tool_downs').find('#GL_Borrowing').show();
 				$('.tool_downs').find('#GL_giveBack').show();
+				$('.tool_downs').find('#GL_watch').show();
 			break;
 		default:
-				$('.tool_downs').find('#GL_watch').show();
 			break;
 	}
 
@@ -278,6 +277,6 @@ $('.btn_export1').click(function() {
 
 function btn_export1(obj) {
 	var url = huayi.config.callcenter_url + "archives/ExportExcelarchives?token=" + $.cookie("token");
-	url += "&A_archiveName=" + $("#sc_contel").val();
+	url += "&A_archiveName=" + $("#companyNameS").val();
 	obj.href = url;
 }

CallCenterWeb.UI/ArchivesManagement/js/archivesStateArchivesList.js

@@ -106,10 +106,10 @@ $(document).ready(function() {
 			console.log("借阅");
 			for(var i = 0; i < wzState.length; i++) {
 				if(wzState[i] == "已出库") {
-					var index = parent.layer.getFrameIndex(window.name);
-					parent.layer.close(index);
 					parent.layer.msg("借阅失败，有物资是出库状态");
-					parent.initTable();
+					wzState=[];
+					wzId=[];
+					initTable();
 					return;
 				}
 				$.ajax({
@@ -159,8 +159,11 @@ $(document).ready(function() {
 						parent.layer.close(index);
 						parent.layer.msg("归还成功");
 						parent.initTable();
+					}else{
+						wzState=[];
+						wzId=[];
+						initTable();
 					}
-					console.log(data);
 				}
 			})
 		}

CallCenterWeb.UI/ArchivesManagement/js/wacthOrEditArchivesList.js

@@ -39,6 +39,7 @@ function initTable() {
 		    };
 		},
 		onLoadSuccess: function() { //加载成功时执行
+			// authorizeOperateButton();
 //			console.log(res);
 //			$("#totalNum").html(res.total[0].total);
 		},
@@ -71,19 +72,6 @@ function formatterOprate(val, row){
 		'<li><a href="javascript:;" class="aBtn " authorize="yes" id="GL_edit" onclick="btn_edit(\'' + row.id + '\')" title="修改">修改</a></li>' +		
 	'</ul>';
 }
-////格式化公司名称
-//function formatterCompanyName(val, row) {
-//	console.log(val, row);
-//	return '<div class="imgs" ><a class="xg" onclick=btn_detail("' + row.A_CompanyName + '") >' + val + '</a></div>'
-//}
-///**
-// * 查看详情
-// * companyName 公司名称
-// * */
-//function btn_detail(companyName){
-//	console.log(companyName)
-//	$('#order_details').load('../commonTpl/companyNameOrderDetails.html?companyName='+companyName);
-//}
 /**
  * 修改
  * editId 物资id

CallCenterWeb.UI/commonTpl/companyNameOrderDetails.html

@@ -61,6 +61,7 @@
 				<table id="itemTableList3" data-row-style="rowStyle" data-query-params="queryParams" data-pagination="true">
 					<thead>
 						<tr>
+							<th data-field="companyName" data-align="center">公司名称</th>
 							<th data-field="OperationDate" data-align="center">修改时间</th>
 							<th data-field="OperationContent" data-align="center">修改内容</th>
 							<th data-field="Operator" data-align="center">修改人</th>

CallCenterWeb.UI/commonTpl/importArchivesList.html

@@ -114,7 +114,6 @@
 			function ExcelMod() {
 			    window.location.href = "archivesList.xls";
 			}
-
 			//上传Excel文件 模拟实时进度
 			function uploads() {
 				var txtName = $('.excelName').text();