物资信息列表

CallCenterWeb.UI/.project

@@ -105,5 +105,14 @@
 				<arguments>1.0-name-matches-false-false-node_modules</arguments>
 			</matcher>
 		</filter>
+		<filter>
+			<id>1572509296496</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
+			</matcher>
+		</filter>
 	</filteredResources>
 </projectDescription>

CallCenterWeb.UI/ArchivesManagement/ArchivesList.html

@@ -35,9 +35,8 @@
 				<div class="pull-left">
 					<div class="form-inline">
 						<div class="form-group">
-							<!-- <input type="text" class="form-control" id="sc_contel" placeholder="请输入物资名称" /> -->
+							<!--<input type="text" class="form-control" id="sc_contel" placeholder="请输入物资名称" />-->
 							<select class="form-control input-sm selectpicker" id="companyName" data-live-search="true">
-								<!-- <option value="">请选择公司名称</option> -->
 							</select>
 						</div>
 					</div>
@@ -59,11 +58,11 @@
 							<!--<th data-field="F_CustomerCode" data-align="center">客户编号</th>-->
 							<th data-field="companyname" data-align="center">公司名称</th>
 							<th data-field="countnum" data-align="center">物资数量</th>
-							<!-- <th data-field="stateName" 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="F_CustomerId" data-formatter="formatterOprate" data-align="center">操作</th> -->
+							<th data-field="OperationContent" data-align="center">变更记录</th>-->
+							<th data-field="F_CustomerId" data-formatter="formatterOprate" data-align="center">操作</th>
 						</tr>
 					</thead>
 				</table>
@@ -74,7 +73,6 @@
 		<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/archivesListInfo.js"></script>
-
 	</body>
 
 </html>

CallCenterWeb.UI/ArchivesManagement/js/addOrEditArchivesList.js

@@ -15,6 +15,7 @@ $(function() {
 	if(editId){
 		getArchivesDetail(editId);
 		$('#state').attr('disabled',true)
+		$("#customer_code").attr('disabled',true);
 	}else{
 		$('#state').attr('disabled',false)
 	}
@@ -28,19 +29,20 @@ $(function() {
 		} else {
 			var isadd = 0
 			editId = ''
+			if(!$('#customer_code').val()){
+				layer.msg('请输入客户编号！')
+				return
+			}
+			if(!$('#customer_name').val()){
+				layer.msg('请输入物资名称！')
+				return
+			}
+			if(!$('#state').val()){
+				layer.msg('请选择物资状态！')
+				return
+			}
 		}
-		if(!$('#customer_code').val()){
-			layer.msg('请输入客户编号！')
-			return
-		}
-		if(!$('#customer_name').val()){
-			layer.msg('请输入物资名称！')
-			return
-		}
-		if(!$('#state').val()){
-			layer.msg('请选择物资状态！')
-			return
-		}
+		
 		$.post(huayi.config.callcenter_url + 'archives/AddorUpdateArchivesNew', {
 			isadd: isadd,
 			id: editId,
@@ -70,17 +72,16 @@ function WZstate(obj) {
 		obj.append('<option value="' + n.id + '">' + n.stateName + '</option>');
 	})
 }
-
 //获取详情
 function getArchivesDetail(editId) {
-	$.getJSON(huayi.config.callcenter_url + "archives/GetModelarchives", {
-		id: editId,
+	$.getJSON(huayi.config.callcenter_url + "archives/getArchivesById", {
+		archivesId: editId,
 		token: $.cookie("token")
 	}, function(data) {
 		if(data.state=='success'){
-			$('#customer_code').val(data.data.A_archiveCode);
-			$('#customer_name').val(data.data.A_archiveName);
-			$('#state').val(data.data.A_archiveState);
+			$('#customer_code').val(data.data[0].A_archiveCode);
+			$('#customer_name').val(data.data[0].A_archiveName);
+			$('#state').val(data.data[0].A_archiveState);
 		}
 	})
 }

CallCenterWeb.UI/ArchivesManagement/js/archivesListInfo.js

@@ -59,42 +59,49 @@ function initTable() {
 	});
 }
 
-//选择公司名称
-$.getJSON(huayi.config.callcenter_url + "archives/getCompanyName", {
-		token: $.cookie("token"),
-		name:$("#companyName").val()
-	}, function(res) {
-		console.log(res);
-		if(res.state.toLowerCase() == "success") {
-			companyNameList = res.data.row;
-			CompanyName($("#companyName"));
-		}
-	});
-function CompanyName(obj) {
+//搜索公司名称
+$.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;
+		CompanyName($("#companyName"));
+	}
+})
+function CompanyName(obj){
 	obj.empty();
 	obj.append('<option value="">请选择公司名称</option>');
-	$(companyNameList).each(function(i, n) {
-		console.log(i,n);
-		obj.append('<option value="' + i + '">' + n + '</option>');
+	$(companyNameList).each(function(i,n) {
+		obj.append('<option value="' + i+ '">' + n + '</option>');
 	})
-}	
-
+}
 
 //格式化操作
 function formatterOprate(val, row) {
-	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>';
-	}
+	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_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_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>';
+//	}
 	
 }
 
@@ -120,6 +127,19 @@ function btn_out(id,archivesid) {
 	});
 }
 /**
+ * 查看
+ */
+function btn_watch(companyname){
+	console.log(companyname);
+	layer.open({
+		type: 2,
+		title: '查看档案物资信息',
+		maxmin: true, //开启最大化最小化按钮
+		area: ['50%', '60%'],
+		content: '../commonTpl/watchOrEditArchivesList.html?companyname='+companyname
+	});
+}
+/**
  * 入库
  */
 function btn_warehousing(id,archivesid) {
@@ -163,7 +183,7 @@ function btn_edit(editId) {
 		type: 2,
 		title: '修改档案物资信息',
 		maxmin: true, //开启最大化最小化按钮
-		area: ['50%', '60%'],
+		area: ['70%', '90%'],
 		content: '../commonTpl/addOrEditArchivesList.html?edit_id=' + editId
 	});
 }
@@ -183,6 +203,7 @@ function btn_export() {
 
 //删除
 function btn_delete(cid) {
+	console.log(cid);
 	layer.confirm('确定删除当前记录？', {
 		icon: 7,
 		btn: ['是', '否'] //按钮
@@ -190,11 +211,11 @@ function btn_delete(cid) {
 		/*执行删除*/
 		$.ajax({
 			type: "post",
-			url: huayi.config.callcenter_url + "archives/DeleteQuestion",
+			url: huayi.config.callcenter_url + "archives/delateArchivesByCompanyName",
 			dataType: 'json',
 			async: true,
 			data: {
-				id: cid,//客户Id，可多选[1,2,3]
+				companyName: cid,//客户Id，可多选[1,2,3]
 				token: $.cookie("token")
 			},
 			success: function(data) {
@@ -205,6 +226,29 @@ 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() {

CallCenterWeb.UI/ArchivesManagement/js/wacthOrEditArchivesList.js

@@ -0,0 +1,67 @@
+$(document).ready(function() {
+	initTable();
+});
+//表格初始化
+function initTable() {
+	var companyname = decodeURI(helper.request.queryString("companyname"));
+	//先销毁表格
+	$('#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: false, //启动分页
+		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 = {
+				F_CompanyName:companyname,
+				token: $.cookie("token")
+			};
+			return param;
+		},
+		responseHandler:function(res){
+		    return {
+		        "total": res.data.total,//总页数
+		        "rows": res.data.rows   //数据
+		    };
+		},
+		onLoadSuccess: function(res) { //加载成功时执行
+			console.log(res);
+			$("#totalNum").html(res.total[0].total);
+		},
+		onLoadError: function() { //加载失败时执行
+			//layer.msg("加载数据失败", { time: 1500, icon: 2 });
+		}
+	});
+}
+//格式化操作
+function formatterOprate(val, row){
+	console.log(val, row);
+	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>' +		
+	'</ul>';
+}
+/**
+ * 修改
+ * editId 物资id
+ * */
+function btn_edit(editId){
+	layer.open({
+		type: 2,
+		title: '修改档案物资信息',
+		maxmin: true, //开启最大化最小化按钮
+		area: ['70%', '90%'],
+		content: '../commonTpl/addOrEditArchivesList.html?edit_id=' + editId
+	});
+}

CallCenterWeb.UI/Script/Common/huayi.config.js

@@ -3,8 +3,8 @@ if (huayi == undefined) {
 }
 huayi.config = {
     //callcenter_url: "http://localhost:7459/",//生产环境 前端Web站IP和端口
-    //、callcenter_url: "http://192.168.4.18:4669/",//生产环境 前端Web站IP和端口
-	callcenter_url: "http://192.168.8.9:1031/",//生产环境 前端Web站IP和端口
+//  callcenter_url: "http://192.168.4.18:4669/",//生产环境 前端Web站IP和端口
+    callcenter_url: "http://192.168.8.9:1031/",//生产环境 前端Web站IP和端口
     socket_ip: "192.168.5.7",//WebSocket通讯ip
     socket_port: "8081",    //WebSocket通讯端口
     menuworktime: 30000,    //菜单工单数量刷新间隔

CallCenterWeb.UI/commonTpl/addOrEditArchivesList.html

@@ -47,7 +47,7 @@
 					<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="customer_name" class="form-control" type="text" autocomplete="off" />
+							<input id="customer_name" class="form-control" type="text" autocomplete="off" value="1"/>
 						</div>
 					</li>
 					<li class="form-group">

CallCenterWeb.UI/commonTpl/watchOrEditArchivesList.html

@@ -0,0 +1,61 @@
+<!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" />
+		<script src="../Script/Common/huayi.load.js"></script>
+		<script src="../Script/Common/huayi.config.js"></script>
+		<link rel="stylesheet" href="../css/customer.css" />
+		<style type="text/css">
+			.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;
+		     }
+		</style>
+	</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-field="A_CompanyName" data-align="center">公司名称</th>
+								<th data-field="A_archiveName" data-align="center">物资名称</th>
+								<th data-field="statename" data-align="center">物资状态</th>
+								<th data-formatter="formatterOprate" data-align="center">操作</th>
+							</tr>
+						</thead>
+					</table>
+					总共：<span id="totalNum" style="display: inline-block;margin-top: 10px;"></span> 条
+				</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="../Script/Common/regexs.js"></script>
+		<script src="../ArchivesManagement/js/wacthOrEditArchivesList.js"></script>
+	</body>
+
+</html>