物资信息列表

CallCenterWeb.UI/ArchivesManagement/ArchivesList.html

@@ -35,7 +35,10 @@
 				<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>
 				</div>
@@ -54,13 +57,13 @@
 						<tr>
 							<!--<th data-checkbox="true"></th>-->
 							<!--<th data-field="F_CustomerCode" data-align="center">客户编号</th>-->
-							<th data-field="F_CompanyName" data-align="center">公司名称</th>
-							<th data-field="A_archiveName" data-align="center">物资名称</th>
-							<th data-field="stateName" 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="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="F_CustomerId" data-formatter="formatterOprate" data-align="center">操作</th> -->
 						</tr>
 					</thead>
 				</table>

CallCenterWeb.UI/ArchivesManagement/js/addOrEditArchivesList.js

@@ -41,7 +41,7 @@ $(function() {
 			layer.msg('请选择物资状态！')
 			return
 		}
-		$.post(huayi.config.callcenter_url + 'archives/AddorUpdateArchives', {
+		$.post(huayi.config.callcenter_url + 'archives/AddorUpdateArchivesNew', {
 			isadd: isadd,
 			id: editId,
 			A_archiveCode: $('#customer_code').val(),

CallCenterWeb.UI/ArchivesManagement/js/archivesListInfo.js

@@ -21,7 +21,7 @@ function initTable() {
 	//初始化表格,动态从服务器加载数据
 	$("#cusList").bootstrapTable({
 		method: "get", //使用get请求到服务器获取数据
-		url: huayi.config.callcenter_url + "archives/GetList", //获取数据的Servlet地址
+		url: huayi.config.callcenter_url + "archives/GetListNew", //获取数据的Servlet地址
 		contentType: 'application/x-www-form-urlencoded',
 		striped: true, //表格显示条纹
 		pagination: true, //启动分页
@@ -59,6 +59,26 @@ 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) {
+	obj.empty();
+	obj.append('<option value="">请选择公司名称</option>');
+	$(companyNameList).each(function(i, n) {
+		console.log(i,n);
+		obj.append('<option value="' + i + '">' + n + '</option>');
+	})
+}	
+
 
 //格式化操作
 function formatterOprate(val, row) {

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

@@ -3,7 +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.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,    //菜单工单数量刷新间隔