zhaomin %!s(int64=4) %!d(string=před) roky
rodič
revize
e5e9245215

+ 28 - 0
.project

@@ -0,0 +1,28 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<projectDescription>
3
+	<name>三元</name>
4
+	<comment></comment>
5
+	<projects>
6
+	</projects>
7
+	<buildSpec>
8
+		<buildCommand>
9
+			<name>com.aptana.ide.core.unifiedBuilder</name>
10
+			<arguments>
11
+			</arguments>
12
+		</buildCommand>
13
+	</buildSpec>
14
+	<natures>
15
+		<nature>com.aptana.projects.webnature</nature>
16
+	</natures>
17
+	<filteredResources>
18
+		<filter>
19
+			<id>1620958705053</id>
20
+			<name></name>
21
+			<type>26</type>
22
+			<matcher>
23
+				<id>org.eclipse.ui.ide.multiFilter</id>
24
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
25
+			</matcher>
26
+		</filter>
27
+	</filteredResources>
28
+</projectDescription>

+ 9 - 0
CallCenterWeb.UI/.project

@@ -114,5 +114,14 @@
114 114
 				<arguments>1.0-name-matches-false-false-node_modules</arguments>
115 115
 			</matcher>
116 116
 		</filter>
117
+		<filter>
118
+			<id>1620958566902</id>
119
+			<name></name>
120
+			<type>26</type>
121
+			<matcher>
122
+				<id>org.eclipse.ui.ide.multiFilter</id>
123
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
124
+			</matcher>
125
+		</filter>
117 126
 	</filteredResources>
118 127
 </projectDescription>

+ 11 - 8
CallCenterWeb.UI/ArchivesManagement/ArchivesList.html

@@ -32,16 +32,19 @@
32 32
 		</div>
33 33
 		<div class="wrapper wrapper-content animated fadeInRight">
34 34
 			<div class="toolBox clearfix">
35
-				<div class="pull-left">
36
-					<div class="form-inline">
37
-						<div class="form-group">
38
-							<!--<input type="text" class="form-control" id="sc_contel" placeholder="请输入物资名称" />-->
39
-							<select class="form-control input-sm selectpicker" id="companyName" data-live-search="true">
40
-							</select>
41
-						</div>
35
+				<!-- <div class="form-inline">
36
+					<div class="form-group">
37
+						<select id="companyNameS" class="form-control selectpicker" data-live-search="true">
38
+						</select>
39
+					</div>
40
+				</div> -->
41
+				<div class="form-group">
42
+					<div class="col-md-4">
43
+						<select id="companyNameS" class="form-control input-sm selectpicker" data-live-search="true">
44
+							<option value="">请选择物资状态</option>
45
+						</select>
42 46
 					</div>
43 47
 				</div>
44
-
45 48
 				<div class="pull-right tool_bars">
46 49
 					<button class="btns" id="sc_btns">搜索</button>
47 50
 					<button class="btns" id="btn_add">添加</button>

+ 69 - 23
CallCenterWeb.UI/ArchivesManagement/js/archivesListInfo.js

@@ -13,6 +13,7 @@ $(document).ready(function() {
13 13
 	$("#sc_btns").on('click', initTable);
14 14
 	$('#btn_add').on('click', btn_add);
15 15
 	var companyname;
16
+	companyName()
16 17
 });
17 18
 
18 19
 //客户信息的列表
@@ -40,7 +41,8 @@ function initTable() {
40 41
 			var param = {
41 42
 				PageIndex: params.pageNumber, //int 页码,默认为1	
42 43
 				PageSize: params.pageSize, //int 条数,默认为10
43
-				A_archiveName: $('#sc_contel').val(), //string 关键词
44
+				F_CompanyName:$("#companyNameS").val(),
45
+				// A_archiveName: $('#sc_contel').val(), //string 关键词
44 46
 				token: $.cookie("token")
45 47
 			};
46 48
 			return param;
@@ -52,6 +54,7 @@ function initTable() {
52 54
 			};
53 55
 		},
54 56
 		onLoadSuccess: function() { //加载成功时执行
57
+		authorizeOperateButton();
55 58
 			//layer.msg("加载成功");
56 59
 		},
57 60
 		onLoadError: function() { //加载失败时执行
@@ -59,37 +62,80 @@ function initTable() {
59 62
 		}
60 63
 	});
61 64
 }
65
+//获取 userRoleCode 判断按钮权限
66
+function authorizeOperateButton() {
67
+	$('.tool_downs').find('[authorize=yes]').hide();
68
+	var userRoleCode = $.cookie("userRoleCode");
69
+	console.log(userRoleCode);
70
+	switch(userRoleCode) {
71
+		case "XTGLY": // 坐席班长 派单(分配)、处理、接单、删除、催办
72
+				$('.tool_downs').find('#GL_delete').show();
73
+			break;
74
+		case "JG": // JG-监管 删除/借阅、归还、入库、出库
75
+				$('.tool_downs').find('#GL_delete').show();
76
+				$('.tool_downs').find('#GL_warehousing').show();
77
+				$('.tool_downs').find('#GL_EXwarehouse').show();
78
+				$('.tool_downs').find('#GL_Borrowing').show();
79
+				$('.tool_downs').find('#GL_giveBack').show();
80
+			break;
81
+		default:
82
+				$('.tool_downs').find('#GL_watch').show();
83
+			break;
84
+	}
62 85
 
86
+}
63 87
 //搜索公司名称
64
-$.getJSON(huayi.config.callcenter_url + "archives/getCompanyName", {
65
-	token: $.cookie("token"),
66
-	name: $("#companyName").val()
67
-}, function(res) {
68
-	console.log(res);
69
-	if(res.state == "success") {
70
-		companyNameList = res.data.rows;
71
-		CompanyName($("#companyName"));
72
-	}
73
-})
74 88
 
75
-function CompanyName(obj) {
76
-	obj.empty();
77
-	obj.append('<option value="">请选择公司名称</option>');
78
-	$(companyNameList).each(function(i, n) {
79
-		obj.append('<option value="' + i + '">' + n + '</option>');
89
+
90
+function companyName() {
91
+	$.ajax({
92
+		type: "get",
93
+		url: huayi.config.callcenter_url + "archives/getCompanyName",
94
+		async: true,
95
+		dataType: 'json',
96
+		data: {
97
+			token: $.cookie("token"),
98
+			name: $("#companyNameS").val()
99
+		},
100
+		success: function(res) {
101
+			if(res.state == "success") {
102
+				companyNameList = res.data.rows;
103
+				debugger
104
+				//CompanyName();
105
+				$("#companyNameS").empty();
106
+				$("#companyNameS").append('<option value="">请选择公司名称</option>');
107
+				$(companyNameList).each(function(i, n) {
108
+					$("#companyNameS").append('<option value="' + i + '">' + n + '</option>');
109
+				})
110
+			}
111
+		}
80 112
 	})
113
+	// $.getJSON(huayi.config.callcenter_url + "archives/getCompanyName", {
114
+	// 	token: $.cookie("token"),
115
+	// 	name: $("#companyNameS").val()
116
+	// }, function(res) {
117
+	// 	if(res.state == "success") {
118
+	// 		companyNameList = res.data.rows;
119
+	// 		// debugger
120
+	// 		//CompanyName();
121
+	// 		$("#companyNameS").empty();
122
+	// 		$("#companyNameS").append('<option value="">请选择公司名称</option>');
123
+	// 		$(companyNameList).each(function(i, n) {
124
+	// 			$("#companyNameS").append('<option value="' + i + '">' + n + '</option>');
125
+	// 		})
126
+	// 	}
127
+	// })
81 128
 }
82 129
 
83 130
 //格式化操作
84 131
 function formatterOprate(val, row) {
85
-	console.log(val, row);
86 132
 	return '<ul class="tool_downs">' +
87
-		'<li><a href="javascript:;" class="aBtn " authorize="yes" id="HY_watch_' + row.companyname + '" onclick="btn_watch(\'' + row.companyname + '\')" title="查看">查看</a></li>' +
88
-		'<li><a href="javascript:;" class="aBtn " authorize="yes" id="HY_edit_' + row.companyname + '" onclick="btn_warehousing(\'' + row.companyname + '\')" title="入库">入库</a></li>' +
89
-		'<li><a href="javascript:;" class="aBtn " authorize="yes" id="HY_EXwarehouse_' + row.companyname + '" onclick="btn_EXwarehouse(\'' + row.companyname + '\')" title="出库">出库</a></li>' +
90
-		'<li><a href="javascript:;" class="aBtn " authorize="yes" id="HY_Borrowing_' + row.companyname + '" onclick="btn_Borrowing(\'' + row.companyname + '\')" title="借阅">借阅</a></li>' +
91
-		'<li><a href="javascript:;" class="aBtn " authorize="yes" id="HY_giveBack_' + row.companyname + '" onclick="btn_giveBack(\'' + row.companyname + '\')" title="出库">归还</a></li>' +
92
-		'<li><a href="javascript:;" class="aBtn " authorize="yes" id="HY_delete_' + row.companyname + '" onclick="btn_delete(\'' + row.companyname + '\')" title="删除">删除</a></li>' +
133
+		'<li><a href="javascript:;" class="aBtn " authorize="yes" id="GL_watch" onclick="btn_watch(\'' + row.companyname + '\')" title="查看">查看</a></li>' +
134
+		'<li><a href="javascript:;" class="aBtn " authorize="yes" id="GL_warehousing" onclick="btn_warehousing(\'' + row.companyname + '\')" title="入库">入库</a></li>' +
135
+		'<li><a href="javascript:;" class="aBtn " authorize="yes" id="GL_EXwarehouse" onclick="btn_EXwarehouse(\'' + row.companyname + '\')" title="出库">出库</a></li>' +
136
+		'<li><a href="javascript:;" class="aBtn " authorize="yes" id="GL_Borrowing" onclick="btn_Borrowing(\'' + row.companyname + '\')" title="借阅">借阅</a></li>' +
137
+		'<li><a href="javascript:;" class="aBtn " authorize="yes" id="GL_giveBack" onclick="btn_giveBack(\'' + row.companyname + '\')" title="出库">归还</a></li>' +
138
+		'<li><a href="javascript:;" class="aBtn " authorize="yes" id="GL_delete" onclick="btn_delete(\'' + row.companyname + '\')" title="删除">删除</a></li>' +
93 139
 		'</ul>';
94 140
 	//	if(row.stateName=='在库'){
95 141
 	//		return '<ul class="tool_downs">' +

+ 9 - 7
CallCenterWeb.UI/ArchivesManagement/js/archivesStateArchivesList.js

@@ -22,21 +22,23 @@ $(document).ready(function() {
22 22
 			function(row) {
23 23
 				return row;
24 24
 			});
25
+			console.log(ids);
25 26
 		//获取物资id、获取物资状态
26
-		for(var i = 0; i < ids.length; i++) {
27
+		for(var i = 0; i < ids.length; i++) {	
27 28
 			wzId.push(ids[i].id);
28 29
 			wzState.push(ids[i].statename);
29 30
 		}
31
+		console.log(wzId,wzState);
30 32
 		var newids = wzId.join(","); //物资id
31 33
 		var newfields = fields.join(","); //图片id
32 34
 		if(state == "出库") {
33 35
 			console.log("出库");
34 36
 			for(var i = 0; i < wzState.length; i++) {
35 37
 				if(wzState[i] == "已出库") {
36
-					var index = parent.layer.getFrameIndex(window.name);
37
-					parent.layer.close(index);
38 38
 					parent.layer.msg("出库失败,已有物资是出库状态");
39
-					wzState=null;
39
+					wzState=[];
40
+					wzId=[];
41
+					initTable();
40 42
 					return;
41 43
 				}
42 44
 				$.ajax({
@@ -69,10 +71,10 @@ $(document).ready(function() {
69 71
 			console.log("入库");
70 72
 			for(var i = 0; i < wzState.length; i++) {
71 73
 				if(wzState[i] == "在库") {
72
-					var index = parent.layer.getFrameIndex(window.name);
73
-					parent.layer.close(index);
74 74
 					parent.layer.msg("入库失败,已有物资是在库状态");
75
-//					parent.initTable();
75
+					wzState=[];
76
+					wzId=[];
77
+					initTable();
76 78
 					return;
77 79
 				}
78 80
 				$.ajax({

+ 9 - 3
CallCenterWeb.UI/ArchivesManagement/js/companyNameOrderDetails.js

@@ -1,7 +1,7 @@
1 1
 // 工单详情
2 2
 $(function() {
3
-	var companyname = decodeURI(helper.request.queryString("companyname"));
4
-	$("#wz_details").removeClass("Hidens");
3
+	var companyname = decodeURI(helper.request.queryString("companyname"));//获取父页面的公司名称
4
+	// $("#wz_details").removeClass("Hidens");
5 5
 	initTable(); //物资详情表
6 6
 	// 绑定事件
7 7
 	$("#wz_details ul li").click(function() {
@@ -197,9 +197,15 @@ $(function() {
197 197
 });
198 198
 //格式化图片
199 199
 function formatterPhoto(val, row) {
200
+	var uldom;
201
+	var lidom=""
200 202
 	if(row.File == null) {
201 203
 		return '<ul class="tool_downs" id="photos">' + '<li><img src="" id="aBtn " authorize="yes" />无图片</li>' + '</ul>'
202 204
 	} else {
203
-		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>';
205
+		for(var i=0;i<row.File.length;i++){
206
+			lidom+= '<li><img src="' + row.File[i].F_FileUrl + '" id="aBtn " authorize="yes" title="查看" style="width:100px;height:30ox"/></li>';
207
+		}
208
+		uldom ='<ul class="tool_downs" id="photos">'+lidom+'</ul>';
209
+		return uldom;
204 210
 	}
205 211
 }

+ 18 - 1
CallCenterWeb.UI/ArchivesManagement/js/wacthOrEditArchivesList.js

@@ -47,11 +47,28 @@ function initTable() {
47 47
 		}
48 48
 	});
49 49
 }
50
+//获取 userRoleCode 判断按钮权限
51
+function authorizeOperateButton() {
52
+	$('.tool_downs').find('[authorize=yes]').hide();
53
+	var userRoleCode = $.cookie("userRoleCode");
54
+	console.log(userRoleCode);
55
+	switch(userRoleCode) {
56
+		case "XTGLY": // 坐席班长 派单(分配)、处理、接单、删除、催办
57
+				$('.tool_downs').find('#GL_edit').show();
58
+			break;
59
+		case "JG": // JG-监管 删除/借阅、归还、入库、出库
60
+				$('.tool_downs').find('#GL_edit').show();
61
+			break;
62
+		default:
63
+			break;
64
+	}
65
+
66
+}
50 67
 //格式化操作
51 68
 function formatterOprate(val, row){
52 69
 	console.log(val, row);
53 70
 	return '<ul class="tool_downs">' +
54
-		'<li><a href="javascript:;" class="aBtn " authorize="yes" id="HY_edit_' + row.id+ '" onclick="btn_edit(\'' + row.id + '\')" title="修改">修改</a></li>' +		
71
+		'<li><a href="javascript:;" class="aBtn " authorize="yes" id="GL_edit" onclick="btn_edit(\'' + row.id + '\')" title="修改">修改</a></li>' +		
55 72
 	'</ul>';
56 73
 }
57 74
 ////格式化公司名称

+ 5 - 4
CallCenterWeb.UI/js/index.js

@@ -27,7 +27,7 @@ $(document).ready(function() {
27 27
 			// $.cookie("userType", result.data.usertype, {
28 28
 			// 	expires: 7
29 29
 			// });
30
-
30
+			console.log(result.data);
31 31
 			$.cookie("userRoleId", result.data.role.F_RoleId, {
32 32
 				expires: 7
33 33
 			});
@@ -210,7 +210,7 @@ $(document).ready(function() {
210 210
 
211 211
 				if (result.state.toLowerCase() == "success") {
212 212
 					var con = result.data.user;
213
-					// console.log(con)
213
+					console.log(con)
214 214
 					$('.mgh').val(con.F_UserId);
215 215
 					$('.mn').val(con.F_UserName);
216 216
 					$('.mobile').val(con.F_Mobile);
@@ -636,7 +636,9 @@ function loadMenu() {
636 636
 		$.ajaxSettings.async = true;
637 637
 		if (result.state.toLowerCase() == "success") {
638 638
 			var data = result.data;
639
-
639
+			data[3].ChildNodes.splice(1,1);
640
+			data[3].ChildNodes.splice(2,1);
641
+			data[3].ChildNodes.splice(1,1);
640 642
 			var _html = "";
641 643
 			$.each(data, function(i) {
642 644
 				var row = data[i];
@@ -650,7 +652,6 @@ function loadMenu() {
650 652
 						_html += '<ul class="nav nav-second-level">';
651 653
 						$.each(childNodes, function(i) {
652 654
 							var subrow = childNodes[i];
653
-
654 655
 							var childNodsThird = subrow.ChildNodes; //三级
655 656
 							if (childNodsThird.length > 0) {
656 657
 								_html += '<li>';