物资信息管理

CallCenterWeb.UI/ArchivesManagement/ArchivesList.html

@@ -54,14 +54,12 @@
 				<table id="cusList" data-row-style="rowStyle" data-query-params="queryParams" data-pagination="true">
 					<thead>
 						<tr>
-							<!--<th data-checkbox="true"></th>-->
-							<!--<th data-field="F_CustomerCode" data-align="center">客户编号</th>-->
-							<th data-field="companyname" data-align="center">公司名称</th>
+							<th data-field="companyname" data-align="center"   data-formatter="formatterCompany">公司名称</th>
 							<th data-field="countnum" data-align="center">物资数量</th>
-							<!--<th data-field="stateName" data-align="center">物资状态</th>
-							<th data-field="OperationDate" data-align="center">最近一次变更时间</th>
-							<th data-field="A_archivePeople" data-align="center">操作人</th>
-							<th data-field="OperationContent" data-align="center">变更记录</th>-->
+							<th data-field="arcname" data-align="center">物资名称</th>
+							<th data-field="content" data-align="center">变更记录</th>
+							<th data-field="operationdate" data-align="center">操作时间</th>
+							<th data-field="operatorname" data-align="center">操作人</th>
 							<th data-field="F_CustomerId" data-formatter="formatterOprate" data-align="center">操作</th>
 						</tr>
 					</thead>

CallCenterWeb.UI/ArchivesManagement/css/archivesStateArchivesList.css

@@ -0,0 +1,117 @@
+.OA_task_2 {
+	/*width: 124px;*/
+	position: absolute;
+	top: 105px;
+	left: 75px;
+	z-index: 123;
+	overflow: auto;
+	height: 84px !important;
+}
+
+.OA_task_2 li {
+	text-align: center;
+	line-height: 27px;
+	background: #FFFFFF;
+	border-bottom: 1px #CCCCCC solid;
+}
+
+.OA_task_2 li:hover {
+	background: #00a1cb;
+	color: #FFFFFF;
+	cursor: pointer;
+}
+
+.apply_forms_file {
+	margin: 15px 5px 0 15px;
+}
+
+.help-block,
+.col-md-8 {
+	display: inline-block;
+}
+
+.file_imgs {
+	padding: 10px 5px;
+	list-style: none;
+	margin-bottom: 60px;
+	margin-left: -15px;
+	margin-left: 10px;
+}
+
+.file_imgs li {
+	float: left;
+	position: relative;
+	width: 109px;
+	height: 109px;
+	margin-left: 10px;
+	margin-right: 10px;
+	margin-bottom: 40px;
+	padding-top: 0;
+	padding-bottom: 0;
+}
+
+.file_imgs li:hover .img_mask {
+	display: block;
+}
+
+.file_imgs .img_mask {
+	display: none;
+	position: absolute;
+	left: 0;
+	top: 0;
+	background-color: rgba(0, 0, 0, .3);
+	width: 100%;
+	height: 22px;
+	z-index: 1;
+}
+
+.file_imgs .img_mask i {
+	position: absolute;
+	right: 5px;
+	top: 5px;
+	display: inline-block;
+	width: 13px;
+	height: 12px;
+	cursor: pointer;
+	background: url(../../img/file_img_icons.png) no-repeat 0 0;
+}
+
+.file_imgs .file_name {
+	width: 100%;
+	display: inline-block;
+	text-align: center;
+	/*overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;*/
+	word-break: break-all;
+	padding-top: 8px;
+}
+
+.file_imgs li img {
+	width: 100%;
+	height: 100%;
+	border: 0;
+	vertical-align: middle;
+}
+
+.file_imgs .upload-state-done .img_state {
+	display: block;
+	position: absolute;
+	right: 0;
+	bottom: 0;
+	width: 0;
+	height: 0;
+	border-bottom: 40px solid #01b2fe;
+	border-left: 40px solid transparent;
+	overflow: inherit;
+}
+
+.file_imgs .img_state i {
+	position: absolute;
+	right: 4px;
+	bottom: -32px;
+	display: inline-block;
+	width: 15px;
+	height: 11px;
+	background: url(../../img/file_img_icons.png) no-repeat 0 -16px;
+}

CallCenterWeb.UI/ArchivesManagement/js/archivesListInfo.js

@@ -10,8 +10,9 @@ $(document).ready(function() {
 	//获取客户信誉等级
 	// helper.getDropList.getlistDropByDic($('#sc_layer'), 'KHLayer');
 	initTable();
-	$("#sc_btns").on('click',initTable);
+	$("#sc_btns").on('click', initTable);
 	$('#btn_add').on('click', btn_add);
+	var companyname;
 });
 
 //客户信息的列表
@@ -39,16 +40,16 @@ function initTable() {
 			var param = {
 				PageIndex: params.pageNumber, //int 页码，默认为1	
 				PageSize: params.pageSize, //int 条数，默认为10
-				A_archiveName: $('#sc_contel').val(),//string 关键词
+				A_archiveName: $('#sc_contel').val(), //string 关键词
 				token: $.cookie("token")
 			};
 			return param;
 		},
-		responseHandler:function(res){
-		    return {
-		        "total": res.data.total,//总页数
-		        "rows": res.data.rows   //数据
-		    };
+		responseHandler: function(res) {
+			return {
+				"total": res.data.total, //总页数
+				"rows": res.data.rows //数据
+			};
 		},
 		onLoadSuccess: function() { //加载成功时执行
 			//layer.msg("加载成功");
@@ -60,21 +61,22 @@ function initTable() {
 }
 
 //搜索公司名称
-$.getJSON(huayi.config.callcenter_url + "archives/getCompanyName",{
-	token:$.cookie("token"),
-	name:$("#companyName").val()
-},function(res){
+$.getJSON(huayi.config.callcenter_url + "archives/getCompanyName", {
+	token: $.cookie("token"),
+	name: $("#companyName").val()
+}, function(res) {
 	console.log(res);
-	if(res.state=="success"){
-		companyNameList=res.data.rows;
+	if(res.state == "success") {
+		companyNameList = res.data.rows;
 		CompanyName($("#companyName"));
 	}
 })
-function CompanyName(obj){
+
+function CompanyName(obj) {
 	obj.empty();
 	obj.append('<option value="">请选择公司名称</option>');
-	$(companyNameList).each(function(i,n) {
-		obj.append('<option value="' + i+ '">' + n + '</option>');
+	$(companyNameList).each(function(i, n) {
+		obj.append('<option value="' + i + '">' + n + '</option>');
 	})
 }
 
@@ -82,85 +84,130 @@ function CompanyName(obj){
 function formatterOprate(val, row) {
 	console.log(val, row);
 	return '<ul class="tool_downs">' +
-		'<li><a href="javascript:;" class="aBtn " authorize="yes" id="HY_watch_' + row.companyname+ '" onclick="btn_watch(\'' + row.companyname + '\')" title="查看">查看</a></li>' +
+		'<li><a href="javascript:;" class="aBtn " authorize="yes" id="HY_watch_' + row.companyname + '" onclick="btn_watch(\'' + row.companyname + '\')" title="查看">查看</a></li>' +
 		'<li><a href="javascript:;" class="aBtn " authorize="yes" id="HY_edit_' + row.companyname + '" onclick="btn_warehousing(\'' + row.companyname + '\')" title="入库">入库</a></li>' +
-		'<li><a href="javascript:;" class="aBtn " authorize="yes" id="HY_EXwarehouse_' + row.companyname + '" onclick="btn_EXwarehouse(' + row.companyname + ')" title="出库">出库</a></li>' +
-		'<li><a href="javascript:;" class="aBtn " authorize="yes" id="HY_Borrowing_' + row.companyname + '" onclick="btn_Borrowing(' + row.companyname + ')" title="借阅">借阅</a></li>' +
-		'<li><a href="javascript:;" class="aBtn " authorize="yes" id="HY_giveBack_' + row.companyname + '" onclick="btn_giveBack(' + row.companyname + ')" title="出库">归还</a></li>' +
+		'<li><a href="javascript:;" class="aBtn " authorize="yes" id="HY_EXwarehouse_' + row.companyname + '" onclick="btn_EXwarehouse(\'' + row.companyname + '\')" title="出库">出库</a></li>' +
+		'<li><a href="javascript:;" class="aBtn " authorize="yes" id="HY_Borrowing_' + row.companyname + '" onclick="btn_Borrowing(\'' + row.companyname + '\')" title="借阅">借阅</a></li>' +
+		'<li><a href="javascript:;" class="aBtn " authorize="yes" id="HY_giveBack_' + row.companyname + '" onclick="btn_giveBack(\'' + row.companyname + '\')" title="出库">归还</a></li>' +
 		'<li><a href="javascript:;" class="aBtn " authorize="yes" id="HY_delete_' + row.companyname + '" onclick="btn_delete(\'' + row.companyname + '\')" title="删除">删除</a></li>' +
-	'</ul>';
-//	if(row.stateName=='在库'){
-//		return '<ul class="tool_downs">' +
-//		'<li><a href="javascript:;" class="aBtn " authorize="yes" id="HY_edit_' + row.id + '" onclick="btn_edit(\'' + row.id + '\')" title="修改">修改</a></li>' +
-//		'<li><a href="javascript:;" class="aBtn " authorize="yes" id="HY_edit_' + row.id + '" onclick="btn_out( '+ row.id +' )" title="出库">出库</a></li>' +
-//		'<li><a href="javascript:;" class="aBtn " authorize="yes" id="HY_delete_' + row.id + '" onclick="btn_delete(' + row.id + ')" title="删除">删除</a></li>' +
-//		'</ul>';
-//	}else{
-//		return '<ul class="tool_downs">' +
-//		'<li><a href="javascript:;" class="aBtn " authorize="yes" id="HY_edit_' + row.id + '" onclick="btn_edit(\'' + row.id + '\')" title="修改">修改</a></li>' +
-//		'<li><a href="javascript:;" class="aBtn " authorize="yes" id="HY_edit_' + row.id + '" onclick="btn_warehousing(\'' + row.id + '\')" title="入库">入库</a></li>' +
-//		'<li><a href="javascript:;" class="aBtn " authorize="yes" id="HY_delete_' + row.id + '" onclick="btn_delete(' + row.id + ')" title="删除">删除</a></li>' +
-//		'</ul>';
-//	}
-	
+		'</ul>';
+	//	if(row.stateName=='在库'){
+	//		return '<ul class="tool_downs">' +
+	//		'<li><a href="javascript:;" class="aBtn " authorize="yes" id="HY_edit_' + row.id + '" onclick="btn_edit(\'' + row.id + '\')" title="修改">修改</a></li>' +
+	//		'<li><a href="javascript:;" class="aBtn " authorize="yes" id="HY_edit_' + row.id + '" onclick="btn_out( '+ row.id +' )" title="出库">出库</a></li>' +
+	//		'<li><a href="javascript:;" class="aBtn " authorize="yes" id="HY_delete_' + row.id + '" onclick="btn_delete(' + row.id + ')" title="删除">删除</a></li>' +
+	//		'</ul>';
+	//	}else{
+	//		return '<ul class="tool_downs">' +
+	//		'<li><a href="javascript:;" class="aBtn " authorize="yes" id="HY_edit_' + row.id + '" onclick="btn_edit(\'' + row.id + '\')" title="修改">修改</a></li>' +
+	//		'<li><a href="javascript:;" class="aBtn " authorize="yes" id="HY_edit_' + row.id + '" onclick="btn_warehousing(\'' + row.id + '\')" title="入库">入库</a></li>' +
+	//		'<li><a href="javascript:;" class="aBtn " authorize="yes" id="HY_delete_' + row.id + '" onclick="btn_delete(' + row.id + ')" title="删除">删除</a></li>' +
+	//		'</ul>';
+	//	}
+
+}
+//格式化公司名称
+function formatterCompany(val, row) {
+	return '<div class="imgs" ><a class="xg" onclick=btn_detail("' + row.companyname + '") >' + val + '</a></div>'
+}
+/**
+ * 查看详情
+ * companyName 公司名称
+ * */
+function btn_detail(companyName) {
+	layer.open({
+		type: 2,
+		title: '档案物资信息',
+		maxmin: true, //开启最大化最小化按钮
+		area: ['90%', '80%'],
+		content: '../commonTpl/companyNameOrderDetails.html?companyname=' + companyName
+	});
 }
 
+
 /**
  * 出库
  */
-function btn_out(id,archivesid) {
-	layer.confirm('确定出库么？', {
-		btn: ['确定', '取消'] //按钮
-	}, function() {
-		//请求后台数据
-		/*发送请求*/
-		$.post(huayi.config.callcenter_url + "archives/insideOperationCk", {
-			archivesids:id,
-			token: $.cookie("token")
-		}, function(result) {
-			result = JSON.parse(result);
-			if(result.state.toLowerCase() == "success") {
-				layer.msg("出库成功");
-				initTable();
-			}
-		})
+function btn_EXwarehouse(companyname) {
+	console.log(companyname);
+	layer.open({
+		type: 2,
+		title: '档案物资信息',
+		maxmin: true, //开启最大化最小化按钮
+		area: ['50%', '60%'],
+		content: '../commonTpl/archivesStateArchivesList.html?state=出库&companyname=' + companyname
 	});
 }
 /**
  * 查看
  */
-function btn_watch(companyname){
+function btn_watch(companyname) {
 	console.log(companyname);
 	layer.open({
 		type: 2,
 		title: '查看档案物资信息',
 		maxmin: true, //开启最大化最小化按钮
-		area: ['50%', '60%'],
-		content: '../commonTpl/watchOrEditArchivesList.html?companyname='+companyname
+		area: ['90%', '80%'],
+		content: '../commonTpl/watchOrEditArchivesList.html?companyname=' + companyname
 	});
 }
 /**
  * 入库
  */
-function btn_warehousing(id,archivesid) {
-	layer.confirm('确定入库么？', {
-		btn: ['确定', '取消'] //按钮
-	}, function() {
-		//请求后台数据
-		/*发送请求*/
-		$.post(huayi.config.callcenter_url + "archives/insideOperationRK", {
-			archivesids:id,
-			token: $.cookie("token")
-		}, function(result) {
-			result = JSON.parse(result);
-			if(result.state.toLowerCase() == "success") {
-				layer.msg("入库成功");
-				initTable();
-			}
-		})
+function btn_warehousing(companyname) {
+	console.log(companyname);
+	layer.open({
+		type: 2,
+		title: '档案物资信息',
+		maxmin: true, //开启最大化最小化按钮
+		area: ['50%', '60%'],
+		content: '../commonTpl/archivesStateArchivesList.html?state=入库&companyname=' + companyname
+	});
+}
+//function btn_warehousing(id,archivesid) {
+//	layer.confirm('确定入库么？', {
+//		btn: ['确定', '取消'] //按钮
+//	}, function() {
+//		//请求后台数据
+//		/*发送请求*/
+//		$.post(huayi.config.callcenter_url + "archives/insideOperationRK", {
+//			archivesids:id,
+//			token: $.cookie("token")
+//		}, function(result) {
+//			result = JSON.parse(result);
+//			if(result.state.toLowerCase() == "success") {
+//				layer.msg("入库成功");
+//				initTable();
+//			}
+//		})
+//	});
+//}
+/**
+ * 借阅
+ */
+function btn_Borrowing(companyname) {
+	console.log(companyname);
+	layer.open({
+		type: 2,
+		title: '档案物资信息',
+		maxmin: true, //开启最大化最小化按钮
+		area: ['50%', '60%'],
+		content: '../commonTpl/archivesStateArchivesList.html?state=借阅&companyname=' + companyname
+	});
+}
+/**
+ * 归还
+ */
+function btn_giveBack(companyname) {
+	console.log(companyname);
+	layer.open({
+		type: 2,
+		title: '档案物资信息',
+		maxmin: true, //开启最大化最小化按钮
+		area: ['50%', '60%'],
+		content: '../commonTpl/archivesStateArchivesList.html?state=归还&companyname=' + companyname
 	});
 }
-
 /**
  * 添加
  * */
@@ -188,7 +235,6 @@ function btn_edit(editId) {
 	});
 }
 
-
 //导入客户信息
 function btn_export() {
 	layer.open({
@@ -200,7 +246,6 @@ function btn_export() {
 	});
 }
 
-
 //删除
 function btn_delete(cid) {
 	console.log(cid);
@@ -215,7 +260,7 @@ function btn_delete(cid) {
 			dataType: 'json',
 			async: true,
 			data: {
-				companyName: cid,//客户Id，可多选[1,2,3]
+				companyName: cid, //客户Id，可多选[1,2,3]
 				token: $.cookie("token")
 			},
 			success: function(data) {
@@ -226,36 +271,14 @@ function btn_delete(cid) {
 		});
 	});
 }
-//function btn_delete(cid) {
-//	layer.confirm('确定删除当前记录？', {
-//		icon: 7,
-//		btn: ['是', '否'] //按钮
-//	}, function(index) {
-//		/*执行删除*/
-//		$.ajax({
-//			type: "post",
-//			url: huayi.config.callcenter_url + "archives/DeleteQuestion",
-//			dataType: 'json',
-//			async: true,
-//			data: {
-//				id: cid,//客户Id，可多选[1,2,3]
-//				token: $.cookie("token")
-//			},
-//			success: function(data) {
-//				layer.msg("删除成功！");
-//				$('#cusList').bootstrapTable('refresh');
-//				layer.close(index);
-//			}
-//		});
-//	});
-//}
 
 //导出
 $('.btn_export1').click(function() {
 	btn_export1(this);
 })
+
 function btn_export1(obj) {
 	var url = huayi.config.callcenter_url + "archives/ExportExcelarchives?token=" + $.cookie("token");
 	url += "&A_archiveName=" + $("#sc_contel").val();
 	obj.href = url;
-}
+}

CallCenterWeb.UI/ArchivesManagement/js/archivesStateArchivesList.js

@@ -0,0 +1,346 @@
+$(document).ready(function() {
+	var uploader;
+	var limitNum = 6; //限制数量
+	var proimglist = []; //保存附件数组
+	var fields = []; //图片id
+	var wzId = []; //物资id
+	var wzState = [];
+	var stateW;
+	//获取公司的名称
+	var companyname = decodeURI(helper.request.queryString("companyname"));
+	//按钮状态
+	var state = decodeURI(helper.request.queryString("state"));
+	initTable();
+	uploaderImages();
+	if(state == "借阅" || state == "归还") {
+		$("#out1").hide();
+	}
+	//提交
+	$("#btn_save").click(function() {
+		//获取表格选中内容
+		var ids = $.map($('#watchTable').bootstrapTable('getSelections'),
+			function(row) {
+				return row;
+			});
+		//获取物资id、获取物资状态
+		for(var i = 0; i < ids.length; i++) {
+			wzId.push(ids[i].id);
+			wzState.push(ids[i].statename);
+		}
+		var newids = wzId.join(","); //物资id
+		var newfields = fields.join(","); //图片id
+		if(state == "出库") {
+			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("出库失败，已有物资是出库状态");
+					wzState=null;
+					return;
+				}
+				$.ajax({
+					type: "post",
+					url: huayi.config.callcenter_url + "archives/CKOperate",
+					async: true,
+					dataType: 'json',
+					data: {
+						ids: newids, //物资id
+						remark: $('#content').val(), //备注信息
+						inside: $('#customer_isbankSlips').find('input[type="radio"]:checked').val(), //是否再外
+						openid: "", //微信公众号用的
+						companyName: companyname, //公司名称
+						fields: newfields, //图片id
+						token: $.cookie("token")
+					},
+					success: function(data) {
+
+						if(data.state == "success") {
+							var index = parent.layer.getFrameIndex(window.name);
+							parent.layer.close(index);
+							parent.layer.msg("出库成功");
+							parent.initTable();
+						}
+						console.log(data);
+					}
+				})
+			}
+		} else if(state == "入库") {
+			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();
+					return;
+				}
+				$.ajax({
+					type: "post",
+					url: huayi.config.callcenter_url + "archives/RKOperate",
+					async: true,
+					dataType: 'json',
+					data: {
+						ids: newids, //物资id
+						remark: $('#content').val(), //备注信息
+						inside: $('#customer_isbankSlips').find('input[type="radio"]:checked').val(), //是否再外
+						openid: "", //微信公众号用的
+						companyName: companyname, //公司名称
+						fields: newfields, //图片id
+						token: $.cookie("token")
+					},
+					success: function(data) {
+						if(data.state == "success") {
+							var index = parent.layer.getFrameIndex(window.name);
+							parent.layer.close(index);
+							parent.layer.msg("入库成功");
+							parent.initTable();
+						}
+						console.log(data);
+					}
+				})
+			}
+		} else if(state == "借阅") {
+			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();
+					return;
+				}
+				$.ajax({
+					type: "post",
+					url: huayi.config.callcenter_url + "archives/JYOperate ",
+					async: true,
+					dataType: 'json',
+					data: {
+						ids: newids, //物资id
+						remark: $('#content').val(), //备注信息
+						//					inside: $('#customer_isbankSlips').find('input[type="radio"]:checked').val(), //是否再外
+						openid: "", //微信公众号用的
+						companyName: companyname, //公司名称
+						fields: newfields, //图片id
+						token: $.cookie("token")
+					},
+					success: function(data) {
+						if(data.state == "success") {
+							var index = parent.layer.getFrameIndex(window.name);
+							parent.layer.close(index);
+							parent.layer.msg("借阅成功");
+							parent.initTable();
+						}
+						console.log(data);
+					}
+				})
+			}
+		} else {
+			console.log("归还");
+			$.ajax({
+				type: "post",
+				url: huayi.config.callcenter_url + "archives/GHOperate",
+				async: true,
+				dataType: 'json',
+				data: {
+					ids: newids, //物资id
+					remark: $('#content').val(), //备注信息
+					//					inside: $('#customer_isbankSlips').find('input[type="radio"]:checked').val(), //是否再外
+					openid: "", //微信公众号用的
+					companyName: companyname, //公司名称
+					fields: newfields, //图片id
+					token: $.cookie("token")
+				},
+				success: function(data) {
+					if(data.state == "success") {
+						var index = parent.layer.getFrameIndex(window.name);
+						parent.layer.close(index);
+						parent.layer.msg("归还成功");
+						parent.initTable();
+					}
+					console.log(data);
+				}
+			})
+		}
+
+	})
+	//上传图片
+	function uploaderImages() {
+		if(uploader) {
+			uploader.destroy();
+		}
+		uploader = WebUploader.create({
+			auto: true, // 选完文件后，是否自动上传 
+			swf: '../../js/webuploader/Uploader.swf', // swf文件路径 
+			server: huayi.config.callcenter_url + "archives/UpLoadProcess", // 文件接收服务端 
+			pick: '#imgPicker', // 选择文件的按钮。可选 
+			formData: {
+				token: $.cookie("token")
+			},
+			// 只允许选择图片文件。 
+			accept: {
+				//			title: 'Images',
+				//			extensions: 'gif,jpg,jpeg,bmp,png',
+				//			mimeTypes: 'image/*'
+			},
+			compress: false, //webuploader默认压缩图片,设置compress:false，可以按照原始比例上传图片  
+			//fileVal: "upFile",//设置文件上传域的name。  
+			threads: limitNum, //上传并发数。允许同时最大上传进程数,为了保证文件上传顺序  
+			fileNumLimit: limitNum,
+			fileSizeLimit: 30 * 1024 * 1024, // 30 M
+			fileSingleSizeLimit: 5 * 1024 * 1024 // 5 M
+		});
+
+		uploader.on('fileQueued', function(file) {
+			var $list = $("#fileList"),
+				$li = $(
+					'<li id="' + file.id + '"><span class="img_mask"><i class="img_del"></i></span>' +
+					'<img/>' +
+					'<span class="img_state"><i></i></span>' +
+					'<span class="file_name">' + file.name + '</span>' +
+					'</li>'
+				),
+				$img = $li.find('img');
+
+			// $list为容器jQuery实例 
+			$list.append($li);
+
+			// 保存缩略图 
+			uploader.makeThumb(file, function(error, src) {
+				if(error) {
+					$img.replaceWith('<div class="noThumb"><i class="glyphicon glyphicon-paperclip"></i><p>无法预览</p></div>');
+					return;
+				}
+				$img.attr('src', src);
+			}, 109, 109); //109*109为缩略图尺寸 
+
+			//绑定删除
+			$('#' + file.id).on('click', '.img_del', function() {
+				uploader.removeFile(file);
+				var $fileLi = $('#' + file.id);
+				$fileLi.off().find('.img_del').off().end().remove();
+				var itemFileName = $(this).parent().parent().find('.file_name').text();
+				$.each(proimglist, function(i, v) {
+					if(v && v.filename == itemFileName) {
+						proimglist.splice(i, 1);
+						//helper.methods.delImgs(v.filesmallurl, v.fileurl);
+					}
+				});
+				$('#fileNum').text(proimglist.length);
+			});
+
+		});
+
+		// 文件上传过程中保存进度条实时显示。 
+		uploader.on('uploadProgress', function(file, percentage) {
+			var $li = $('#' + file.id),
+				$percent = $li.find('.progress span');
+
+			// 避免重复保存 
+			if(!$percent.length) {
+				$percent = $('<div class="progress" style="">' +
+						'<span class="text">0%</span>' +
+						'<span class="percentage"></span>' +
+						'</div>')
+					.appendTo($li)
+					.find('span');
+			}
+
+			$percent.eq(0).text(Math.round(percentage * 100) + '%');
+			$percent.eq(1).css('width', Math.round(percentage * 100) + '%');
+		});
+
+		// 文件上传成功，给item添加成功class, 用样式标记上传成功。 
+		uploader.on('uploadSuccess', function(file, res) {
+			fields.push(res.data);
+			proimglist.push(res.data.F_FileId);
+			$('#fileNum').text(proimglist.length);
+			$('#' + file.id).addClass('upload-state-done');
+		});
+
+		// 文件上传失败，显示上传出错。 
+		uploader.on('uploadError', function(file) {
+			var $li = $('#' + file.id),
+				$error = $li.find('div.error');
+
+			// 避免重复创建
+			if(!$error.length) {
+				$error = $('<div class="error"></div>').appendTo($li);
+			}
+
+			$error.text('上传失败');
+		});
+
+		// 完成上传完了，成功或者失败，先删除进度条。 
+		uploader.on('uploadComplete', function(file) {
+			$('#' + file.id).find('.progress').remove();
+		});
+
+		uploader.onError = function(code) {
+			//		console.log('Error：' + code);
+			switch(code) {
+				case "Q_EXCEED_NUM_LIMIT":
+					layer.msg('只能上传六个文件。');
+					break;
+				case "Q_TYPE_DENIED":
+					layer.msg('文件类型不正确。');
+					break;
+				case "F_DUPLICATE":
+					layer.msg('该文件已上传，请选择其它文件。');
+					break;
+				case "F_EXCEED_SIZE":
+					layer.msg('单文件大小不能超过5M。');
+					break;
+				case "Q_EXCEED_SIZE_LIMIT":
+					layer.msg('总文件大小不能超过30M。');
+					break;
+				default:
+					break;
+			}
+
+		};
+	}
+	//表格初始化
+	function initTable() {
+		//先销毁表格
+		$('#watchTable').bootstrapTable('destroy');
+		//初始化表格,动态从服务器加载数据
+		$("#watchTable").bootstrapTable({
+			method: "get", //使用get请求到服务器获取数据
+			url: huayi.config.callcenter_url + "archives/GetListByCompany", //获取数据的Servlet地址
+			contentType: 'application/x-www-form-urlencoded',
+			striped: true, //表格显示条纹
+			pagination: true, //启动分页
+			pageSize: 10, //每页显示的记录数
+			pageNumber: 1, //当前第几页
+			pageList: [10, 20, 50, 100], //记录数可选列表
+			search: false, //是否启用查询
+			showColumns: false, //显示下拉框勾选要显示的列
+			showRefresh: false, //显示刷新按钮
+			sidePagination: "server", //表示服务端请求
+			//设置为undefined可以获取pageNumber，pageSize，searchText，sortName，sortOrder
+			//设置为limit可以获取limit, offset, search, sort, order
+			queryParamsType: "undefined",
+			queryParams: function queryParams(params) { //设置查询参数
+				var param = {
+					PageIndex:params.pageNumber,
+					pageSize:params.pageSize,
+					F_CompanyName: companyname,
+					token: $.cookie("token")
+				};
+				return param;
+			},
+			responseHandler: function(res) {
+				return {
+					"total": res.data.total, //总页数
+					"rows": res.data.rows //数据
+				};
+			},
+			onLoadSuccess: function() { //加载成功时执行
+			},
+			onLoadError: function() { //加载失败时执行
+				//layer.msg("加载数据失败", { time: 1500, icon: 2 });
+			}
+		});
+	}
+});

CallCenterWeb.UI/ArchivesManagement/js/wacthOrEditArchivesList.js

@@ -12,7 +12,7 @@ function initTable() {
 		url: huayi.config.callcenter_url + "archives/GetListByCompany", //获取数据的Servlet地址
 		contentType: 'application/x-www-form-urlencoded',
 		striped: true, //表格显示条纹
-		pagination: false, //启动分页
+		pagination: true, //启动分页
 		pageSize: 10, //每页显示的记录数
 		pageNumber: 1, //当前第几页
 		pageList: [10, 20, 50, 100], //记录数可选列表
@@ -25,7 +25,9 @@ function initTable() {
 		queryParamsType: "undefined",
 		queryParams: function queryParams(params) { //设置查询参数
 			var param = {
-				F_CompanyName:companyname,
+				PageIndex:params.pageNumber,
+				pageSize:params.pageSize,
+				F_CompanyName: companyname,
 				token: $.cookie("token")
 			};
 			return param;
@@ -36,9 +38,9 @@ function initTable() {
 		        "rows": res.data.rows   //数据
 		    };
 		},
-		onLoadSuccess: function(res) { //加载成功时执行
-			console.log(res);
-			$("#totalNum").html(res.total[0].total);
+		onLoadSuccess: function() { //加载成功时执行
+//			console.log(res);
+//			$("#totalNum").html(res.total[0].total);
 		},
 		onLoadError: function() { //加载失败时执行
 			//layer.msg("加载数据失败", { time: 1500, icon: 2 });
@@ -52,6 +54,19 @@ function formatterOprate(val, row){
 		'<li><a href="javascript:;" class="aBtn " authorize="yes" id="HY_edit_' + row.id+ '" 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/archivesStateArchivesList.html

@@ -0,0 +1,79 @@
+<!DOCTYPE html>
+<html>
+
+	<head>
+		<meta charset="UTF-8">
+		<title>添加或编辑档案物资信息</title>
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
+		<link href="../js/bootstrap-select/css/bootstrap-select.css" rel="stylesheet" />
+		<link rel="stylesheet" href="../js/webuploader/webuploader.css" />
+		<script src="../Script/Common/huayi.load.js"></script>
+		<script src="../Script/Common/huayi.config.js"></script>
+		<link rel="stylesheet" href="../css/customer.css" />
+		<link rel="stylesheet" type="text/css" href="../ArchivesManagement/css/archivesStateArchivesList.css" />
+	</head>
+
+	<body>
+		<div class="container">
+			<div class="tab_contents" id="tab_user_contents">
+				<div style="width: 100%;padding: 10px;">
+					<table id="watchTable" data-row-style="rowStyle" data-query-params="queryParams" data-pagination="true">
+						<thead>
+							<tr>
+								<th data-checkbox="true"></th>
+								<th data-field="A_CompanyName" data-align="center">公司名称</th>
+								<th data-field="A_archiveName" data-align="center">物资名称</th>
+								<th data-field="statename" data-align="center" id="state">物资状态</th>
+							</tr>
+						</thead>
+					</table>
+				</div>
+			</div>
+			<div class="tab_contents" id="tab_user_contents">
+				<ul class="project_items form-horizontal showtabs">
+					<li class="form-group">
+						<label for="customer_isbankSlips" class="col-md-3">状态</label>
+						<div class="col-md-8" id="customer_isbankSlips">
+							<label class="radio-inline" id="out1">
+								<input type="radio" name="inlineisbankSlips" value="0" >外部
+							</label>
+							<label class="radio-inline">
+								<input type="radio" name="inlineisbankSlips" value="1" checked="checked">内部
+							</label>
+						</div>
+					</li>
+					</li>
+					<li class="form-group">
+						<label for="customer_name" class="col-md-2"><b class="text_require">*</b>备注信息</label>
+						<div class="col-md-4">
+							<input id="content" class="form-control" type="text" autocomplete="off" />
+							<!--<textarea id="content" class="form-control" rows="6" placeholder="请输入备注信息"></textarea>-->
+						</div>
+					</li>
+					<li class="form-group">
+						<div id="imgPicker" class="apply_forms_file">+</div>
+						<!--<span id="fileNum">0</span>/6 每个文件大小不超过5M-->
+						<p class="help-block text-warning">
+							<span id="fileNum">0</span>/6 每个文件大小不超过5M
+						</p>
+					</li>
+					<li class="form-group">
+						<div id="fileList" class="file_imgs clearfix"></div>
+					</li>
+				</ul>
+				<div class="form-group clearfix">
+					<div class="col-md-offset-3 col-md-10">
+						<button class="project_save btn btn-primary" id="btn_save" type="button">确认</button>
+					</div>
+				</div>
+			</div>
+		</div>
+		<script src="../js/laydate/laydate.js"></script>
+		<script src="../js/bootstrap-select/js/bootstrap-select.js"></script>
+		<script src="../js/bootstrap-select/js/i18n/defaults-zh_CN.js"></script>
+		<script src="../js/webuploader/webuploader.min.js"></script>
+		<script src="../Script/Common/regexs.js"></script>
+		<script src="../ArchivesManagement/js/archivesStateArchivesList.js"></script>
+	</body>
+
+</html>

CallCenterWeb.UI/commonTpl/companyNameOrderDetails.html

@@ -0,0 +1,279 @@
+<!DOCTYPE html>
+<html>
+
+	<head>
+		<meta charset="UTF-8">
+		<title>客户信息</title>
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
+		<script src="../Script/Common/huayi.load.js"></script>
+		<script src="../Script/Common/huayi.config.js"></script>
+		<link href="../css/WorkOrder/Search.css" rel="stylesheet">
+		<link href="../js/bootstrap-select/css/bootstrap-select.css" rel="stylesheet" />
+		<link href="../css/init.css" rel="stylesheet" />
+	</head>
+
+	<body>
+		<div id="wz_details" class="ckxq">
+			<!-- 工单详情 orderDtails -->
+			<ul class="clearfix ckxq_ul">
+				<li class="Active">物资详情</li>
+				<li>物资变更记录内部</li>
+				<li>物资变更记录外部</li>
+				<li>修改记录</li>
+				<!--<span class="Closed">×</span>-->
+			</ul>
+			<div class="gdxq">
+				<table id="watchTable" data-row-style="rowStyle" data-query-params="queryParams" data-pagination="true">
+					<thead>
+						<tr>
+							<th data-field="A_CompanyName" data-align="center">公司名称</th>
+							<th data-field="A_archiveName" data-align="center">物资名称</th>
+							<th data-field="statename" data-align="center">物资状态</th>
+						</tr>
+					</thead>
+				</table>
+			</div>
+			<div class="gdxq" style="display:none;">
+				<table id="itemTableList1" data-row-style="rowStyle" data-query-params="queryParams" data-pagination="true">
+					<thead>
+						<tr>
+							<th data-field="Operator" data-align="center">操作人</th>
+							<th data-field="WarehousingDate" data-align="center">操作时间</th>
+							<th data-field="remark" data-align="center">备注</th>
+							<th data-field="fieldId" data-align="center" data-formatter="formatterPhoto">照片</th>
+						</tr>
+					</thead>
+				</table>
+			</div>
+			<div class="gdxq" style="display:none;">
+				<table id="itemTableList2" data-row-style="rowStyle" data-query-params="queryParams" data-pagination="true">
+					<thead>
+						<tr>
+							<th data-field="Operator" data-align="center">操作人</th>
+							<th data-field="WarehousingDate" data-align="center">操作时间</th>
+							<th data-field="remark" data-align="center">备注</th>
+							<th data-field="fieldId" data-align="center" data-formatter="formatterPhoto">照片</th>
+						</tr>
+					</thead>
+				</table>
+			</div>
+			<div class="gdxq" style="display:none;">
+				<table id="itemTableList3" data-row-style="rowStyle" data-query-params="queryParams" data-pagination="true">
+					<thead>
+						<tr>
+							<th data-field="OperationDate" data-align="center">修改时间</th>
+							<th data-field="OperationContent" data-align="center">修改内容</th>
+							<th data-field="Operator" data-align="center">修改人</th>
+						</tr>
+					</thead>
+				</table>
+			</div>
+		</div>
+	</body>
+	<script type="text/javascript">
+		// 工单详情
+		$(function() {
+			var companyname = decodeURI(helper.request.queryString("companyname"));
+			$("#wz_details").removeClass("Hidens");
+			initTable(); //物资详情表
+			// 绑定事件
+			$("#wz_details ul li").click(function() {
+				$(this).addClass("Active").siblings().removeClass("Active");
+				var tabindex = $(this).index();
+				$(".gdxq").hide();
+				$(".gdxq").eq(tabindex).show();
+				if(tabindex == 1) {
+					initTable1(); //物资变更记录内部表
+				} else if(tabindex == 2) {
+					initTable2(); //物资变更记录外部表
+				} else if(tabindex == 3) {
+					initTable3(); //修改记录表
+				}
+			});
+			//如果是来电弹屏中的 工单详情不显示关闭按钮
+			$(".Closed").click(function() {
+				$("#wz_details").addClass("Hidens");
+			});
+			$("#order_details ul li").eq(0).trigger("click");
+
+			//物资详情
+			function initTable() {
+				//先销毁表格
+				$('#watchTable').bootstrapTable('destroy');
+				//初始化表格,动态从服务器加载数据
+				$('#watchTable').bootstrapTable({
+					method: "get", //使用get请求到服务器获取数据
+					url: huayi.config.callcenter_url + "archives/GetListByCompany", //获取数据的Servlet地址
+					contentType: 'application/x-www-form-urlencoded',
+					striped: true, //表格显示条纹
+					pagination: true, //启动分页
+					pageSize: 10, //每页显示的记录数
+					pageNumber: 1, //当前第几页
+					pageList: [10, 20, 50, 100], //记录数可选列表
+					search: false, //是否启用查询
+					showColumns: false, //显示下拉框勾选要显示的列
+					showRefresh: false, //显示刷新按钮
+					sidePagination: "server", //表示服务端请求
+					queryParamsType: "undefined",
+					queryParams: function queryParams(params) { //设置查询参数
+						var param = {
+							PageIndex: params.pageNumber,
+							pageSize: params.pageSize,
+							F_CompanyName: companyname,
+							token: $.cookie("token")
+						};
+						return param;
+					},
+					responseHandler: function(res) {
+						return {
+							"total": res.data.total, //总页数
+							"rows": res.data.rows //数据
+						};
+					},
+					onLoadSuccess: function() { //加载成功时执行
+
+					},
+					onLoadError: function() { //加载失败时执行
+					}
+				});
+			}
+			//物资变更记录内部表格
+			function initTable1() {
+				//先销毁表格
+				$('#itemTableList1').bootstrapTable('destroy');
+				//初始化表格,动态从服务器加载数据
+				$('#itemTableList1').bootstrapTable({
+					method: "get", //使用get请求到服务器获取数据
+					url: huayi.config.callcenter_url + "archives/GetNbOperatorByCompanyName", //获取数据的Servlet地址
+					contentType: 'application/x-www-form-urlencoded',
+					striped: true, //表格显示条纹
+					pagination: true, //启动分页
+					pageSize: 10, //每页显示的记录数
+					pageNumber: 1, //当前第几页
+					pageList: [10, 20, 50, 100], //记录数可选列表
+					search: false, //是否启用查询
+					showColumns: false, //显示下拉框勾选要显示的列
+					showRefresh: false, //显示刷新按钮
+					sidePagination: "server", //表示服务端请求
+					queryParamsType: "undefined",
+					queryParams: function queryParams(params) { //设置查询参数
+						var param = {
+							PageIndex: params.pageNumber,
+							PageSize: params.pageSize,
+							companyName: companyname,
+							token: $.cookie("token")
+						};
+						return param;
+					},
+					responseHandler: function(res) {
+						return {
+							"total": res.data.total, //总页数
+							"rows": res.data.bndt //数据
+						};
+					},
+					onLoadSuccess: function() { //加载成功时执行
+						layer.photos({
+							photos: '.tool_downs',
+							anim: 5 //0-6的选择，指定弹出图片动画类型，默认随机（请注意，3.0之前的版本用shift参数）
+						});
+					},
+					onLoadError: function() { //加载失败时执行
+					}
+				});
+			}
+			//物资变更记录外部表格
+			function initTable2() {
+				//先销毁表格
+				$('#itemTableList2').bootstrapTable('destroy');
+				//初始化表格,动态从服务器加载数据
+				$('#itemTableList2').bootstrapTable({
+					method: "get", //使用get请求到服务器获取数据
+					url: huayi.config.callcenter_url + "archives/GetWbOperatorByCompanyName", //获取数据的Servlet地址
+					contentType: 'application/x-www-form-urlencoded',
+					striped: true, //表格显示条纹
+					pagination: true, //启动分页
+					pageSize: 10, //每页显示的记录数
+					pageNumber: 1, //当前第几页
+					pageList: [10, 20, 50, 100], //记录数可选列表
+					search: false, //是否启用查询
+					showColumns: false, //显示下拉框勾选要显示的列
+					showRefresh: false, //显示刷新按钮
+					sidePagination: "server", //表示服务端请求
+					queryParamsType: "undefined",
+					queryParams: function queryParams(params) { //设置查询参数
+						var param = {
+							PageIndex: params.pageNumber,
+							PageSize: params.pageSize,
+							companyName: companyname,
+							token: $.cookie("token")
+						};
+						return param;
+					},
+					responseHandler: function(res) {
+						return {
+							"total": res.data.total, //总页数
+							"rows": res.data.wbdt //数据
+						};
+					},
+					onLoadSuccess: function() { //加载成功时执行
+						layer.photos({
+							photos: '.tool_downs',
+							anim: 5 //0-6的选择，指定弹出图片动画类型，默认随机（请注意，3.0之前的版本用shift参数）
+						});
+					},
+					onLoadError: function() { //加载失败时执行
+					}
+				});
+			}
+			//修改记录
+			function initTable3() {
+				//先销毁表格
+				$('#itemTableList3').bootstrapTable('destroy');
+				//初始化表格,动态从服务器加载数据
+				$('#itemTableList3').bootstrapTable({
+					method: "get", //使用get请求到服务器获取数据
+					url: huayi.config.callcenter_url + "archives/GetXGOperatorByCompanyName", //获取数据的Servlet地址
+					contentType: 'application/x-www-form-urlencoded',
+					striped: true, //表格显示条纹
+					pagination: true, //启动分页
+					pageSize: 10, //每页显示的记录数
+					pageNumber: 1, //当前第几页
+					pageList: [10, 20, 50, 100], //记录数可选列表
+					search: false, //是否启用查询
+					showColumns: false, //显示下拉框勾选要显示的列
+					showRefresh: false, //显示刷新按钮
+					sidePagination: "server", //表示服务端请求
+					queryParamsType: "undefined",
+					queryParams: function queryParams(params) { //设置查询参数
+						var param = {
+							PageIndex: params.pageNumber,
+							PageSize: params.pageSize,
+							companyName: companyname,
+							token: $.cookie("token")
+						};
+						return param;
+					},
+					responseHandler: function(res) {
+						return {
+							"total": res.data.total, //总页数
+							"rows": res.data.xgdt //数据
+						};
+					},
+					onLoadSuccess: function() { //加载成功时执行
+
+					},
+					onLoadError: function() { //加载失败时执行
+					}
+				});
+			}
+
+		});
+		//格式化图片
+		function formatterPhoto(val, row) {
+			if(row.File == null) {
+				return '<ul class="tool_downs" id="photos">' + '<li><img src="" id="aBtn " authorize="yes" />无图片</li>' + '</ul>'
+			} else {
+				return '<ul class="tool_downs" id="photos">' + '<li><img src="' + row.File[0].F_FileUrl + '" id="aBtn " authorize="yes" title="查看" style="width:100px;height:30ox"/></li>' + '</ul>';
+			}
+		}
+	</script>

CallCenterWeb.UI/commonTpl/watchOrEditArchivesList.html

@@ -47,8 +47,8 @@
 							</tr>
 						</thead>
 					</table>
-					总共：<span id="totalNum" style="display: inline-block;margin-top: 10px;"></span> 条
 				</div>
+				<div id="order_details" class="ckxq Hidens"></div>
 			</div>
 		</div>
 		<script src="../js/laydate/laydate.js"></script>

CallCenterWeb.UI/js/WorkOrder/WorkOrder.js

@@ -301,6 +301,7 @@ function formatterOprateLogs(val, row) {
 
 //格式化工单编号
 function formatterOrderId(val, row) {
+	console.log(val, row);
 	return '<div class="imgs" ><a class="xg" onclick=btn_detail("' + row.ID + '") >' + val + '</a></div>'
 }
 
@@ -677,6 +678,7 @@ function btn_deleteLogs(oid) {
  * isCallScreen 是否是来单弹屏中的工单详情
  * */
 function btn_detail(oid, isCallScreen) {
+	console.log(oid, isCallScreen);
 	if(!isCallScreen){
 		$('#order_details').load('./template/orderDetails.html');
 	}else{

CallCenterWeb.UI/schedule/template/addOrEditSchedule.html

@@ -44,13 +44,13 @@
 				</div>
 			</div>
 		</div>
-		<!-- <script src="../../js/bootstrap-select/js/bootstrap-select.js"></script> -->
-		<!-- <script src="../../js/bootstrap-select/js/i18n/defaults-zh_CN.js"></script> -->
+		 <script src="../../js/bootstrap-select/js/bootstrap-select.js"></script> 
+		 <script src="../../js/bootstrap-select/js/i18n/defaults-zh_CN.js"></script> 
 		<script src="../../js/autosize/autosize.min.js"></script>
 		<script src="../../js/laydate/laydate.js"></script>
-		<!-- <script src="../../js/zTree/jquery.ztree.core.js"></script> -->
-    <!-- <script src="../../js/zTree/jquery.ztree.excheck.min.js"></script> -->
-		<script src="../js/addOrEditSchedule.js"></script>
+		 <script src="../../js/zTree/jquery.ztree.core.js"></script> 
+     <script src="../../js/zTree/jquery.ztree.excheck.min.js"></script> 
+		<!--<script src="../js/addOrEditSchedule.js"></script>-->
 	</body>
 
 </html>