zhaomin лет назад: 4
Родитель
Сommit
a83620506e

+ 9 - 0
CallCenterWeb.UI/.project

123
 				<arguments>1.0-name-matches-false-false-node_modules</arguments>
123
 				<arguments>1.0-name-matches-false-false-node_modules</arguments>
124
 			</matcher>
124
 			</matcher>
125
 		</filter>
125
 		</filter>
126
+		<filter>
127
+			<id>1625706589579</id>
128
+			<name></name>
129
+			<type>26</type>
130
+			<matcher>
131
+				<id>org.eclipse.ui.ide.multiFilter</id>
132
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
133
+			</matcher>
134
+		</filter>
126
 	</filteredResources>
135
 	</filteredResources>
127
 </projectDescription>
136
 </projectDescription>

+ 2 - 0
CallCenterWeb.UI/commonTpl/companyNameOrderDetails.html

39
 						<tr>
39
 						<tr>
40
 							<th data-field="Operator" data-align="center">操作人</th>
40
 							<th data-field="Operator" data-align="center">操作人</th>
41
 							<th data-field="WarehousingDate" data-align="center">操作时间</th>
41
 							<th data-field="WarehousingDate" data-align="center">操作时间</th>
42
+							<th data-field="Warehousing" data-align="center">操作内容</th>
42
 							<th data-field="remark" data-align="center">备注</th>
43
 							<th data-field="remark" data-align="center">备注</th>
43
 							<th data-field="fieldId" data-align="center" data-formatter="formatterPhoto">照片</th>
44
 							<th data-field="fieldId" data-align="center" data-formatter="formatterPhoto">照片</th>
44
 						</tr>
45
 						</tr>
51
 						<tr>
52
 						<tr>
52
 							<th data-field="Operator" data-align="center">操作人</th>
53
 							<th data-field="Operator" data-align="center">操作人</th>
53
 							<th data-field="WarehousingDate" data-align="center">操作时间</th>
54
 							<th data-field="WarehousingDate" data-align="center">操作时间</th>
55
+							<th data-field="Warehousing" data-align="center">操作内容</th>
54
 							<th data-field="remark" data-align="center">备注</th>
56
 							<th data-field="remark" data-align="center">备注</th>
55
 							<th data-field="fieldId" data-align="center" data-formatter="formatterPhoto">照片</th>
57
 							<th data-field="fieldId" data-align="center" data-formatter="formatterPhoto">照片</th>
56
 						</tr>
58
 						</tr>

+ 3 - 1
WeChat/Script/Common/huayi.config.js

2
     var huayi = {};
2
     var huayi = {};
3
 }
3
 }
4
 huayi.config = {
4
 huayi.config = {
5
-    callcenter_url: "http://117.160.143.195:4669/",//生产环境 前端Web站IP和端口
5
+   
6
+    //callcenter_url: "http://117.160.143.195:4669/",//生产环境 前端Web站IP和端口
7
+    callcenter_url: "http://192.168.8.9:1031/",//生产环境 前端Web站IP和端口
6
     //callcenter_url: "http://117.158.196.116:4617/",//生产环境 前端Web站IP和端口
8
     //callcenter_url: "http://117.158.196.116:4617/",//生产环境 前端Web站IP和端口
7
 
9
 
8
 };
10
 };

+ 2 - 1
WeChat/content/js/borrowDetail.js

33
 })
33
 })
34
 function Ajax() {
34
 function Ajax() {
35
 	$.ajax({
35
 	$.ajax({
36
-		url: huayi.config.callcenter_url + 'archives/GetModelarchives',
36
+		// url: huayi.config.callcenter_url + 'archives/GetModelarchives',
37
+		url: huayi.config.callcenter_url + 'archives/GetModelarchivesNew',
37
 		data: {
38
 		data: {
38
 			id: id, //工单编号
39
 			id: id, //工单编号
39
 			openid: openid, //微信openid,
40
 			openid: openid, //微信openid,

+ 4 - 2
WeChat/content/js/borrowList.js

55
 function Ajax() {
55
 function Ajax() {
56
 	//$(".order").remove();
56
 	//$(".order").remove();
57
 	$.ajax({
57
 	$.ajax({
58
-		url: huayi.config.callcenter_url + 'archives/GetList',
58
+		// url: huayi.config.callcenter_url + 'archives/GetList',
59
+		url: huayi.config.callcenter_url + 'archives/GetListByCompany',
59
 		data: {
60
 		data: {
60
 			openid: openid, //微信openid,
61
 			openid: openid, //微信openid,
61
 //			openid: 'oXF5e1mWpX5DajW5_yjNLPKb8ThE',
62
 //			openid: 'oXF5e1mWpX5DajW5_yjNLPKb8ThE',
71
 			if(data.data.rows && data.data.rows.length > 0) {
72
 			if(data.data.rows && data.data.rows.length > 0) {
72
 				$(".noinfor").text("");
73
 				$(".noinfor").text("");
73
 				$(data.data.rows).each(function(i, n) {
74
 				$(data.data.rows).each(function(i, n) {
75
+					console.log(n);
74
 					$('<li class="mui-table-view-cell">' +
76
 					$('<li class="mui-table-view-cell">' +
75
 						'<div class="mui-input-row mui-checkbox mui-left">'+
77
 						'<div class="mui-input-row mui-checkbox mui-left">'+
76
 						'<input name="checkbox1" data-item="' + n.id + '" value="'+n.stateName+'" type="checkbox" class="selected"></div>'+
78
 						'<input name="checkbox1" data-item="' + n.id + '" value="'+n.stateName+'" type="checkbox" class="selected"></div>'+
80
 						'</h4><h5>' + n.OperationDate +
82
 						'</h4><h5>' + n.OperationDate +
81
 						'</h5></div>'+
83
 						'</h5></div>'+
82
 						'<div class="mui-table-cell mui-col-xs-4 mui-text-right">'+
84
 						'<div class="mui-table-cell mui-col-xs-4 mui-text-right">'+
83
-						'<span class="mui-h5">'+n.stateName+
85
+						'<span class="mui-h5">'+n.statename+
84
 						'</span></div></div></li>').appendTo('#OA_task');
86
 						'</span></div></div></li>').appendTo('#OA_task');
85
 				});
87
 				});
86
 				//工单跳转
88
 				//工单跳转

+ 7 - 6
WeChat/login.html

42
 			//var openid = helper.cookies.get("openid");
42
 			//var openid = helper.cookies.get("openid");
43
 			var menucode = helper.request.queryString("menuCode");
43
 			var menucode = helper.request.queryString("menuCode");
44
 			var code = helper.request.queryString("code");
44
 			var code = helper.request.queryString("code");
45
-			var openid = helper.request.queryString("openid");
46
-			//var openid = "oXF5e1mWpX5DajW5_yjNLPKb8ThE";
45
+			//var openid = helper.request.queryString("openid");
46
+			var openid = "oXF5e1mWpX5DajW5_yjNLPKb8ThE";
47
 			var typeUser = helper.cookies.get("typeUser");
47
 			var typeUser = helper.cookies.get("typeUser");
48
 			if (typeUser) {
48
 			if (typeUser) {
49
 				typeUser = helper.cookies.get("typeUser");
49
 				typeUser = helper.cookies.get("typeUser");
80
 				login();
80
 				login();
81
 			})
81
 			})
82
 			function login () {
82
 			function login () {
83
+				debugger
83
 				//请求
84
 				//请求
84
 				$.ajax({
85
 				$.ajax({
85
 					type: "post",
86
 					type: "post",
91
 						Password: $("#password").val(),
92
 						Password: $("#password").val(),
92
 						UserType:typeUser, 
93
 						UserType:typeUser, 
93
 						openid: openid,
94
 						openid: openid,
94
-						//openid: 'oXF5e1mWpX5DajW5_yjNLPKb8ThE', //微信openid 测试用
95
+						openid: 'oXF5e1mWpX5DajW5_yjNLPKb8ThE', //微信openid 测试用
95
 					},
96
 					},
96
 					success: function(data) {
97
 					success: function(data) {
97
 						if(data.state == "success") {
98
 						if(data.state == "success") {
98
 							var UserWord=$("#password").val();
99
 							var UserWord=$("#password").val();
99
 							helper.cookies.set("typeUser", typeUser, 365);
100
 							helper.cookies.set("typeUser", typeUser, 365);
100
 							helper.cookies.set("UserWord", UserWord, 365);
101
 							helper.cookies.set("UserWord", UserWord, 365);
101
-							debugger
102
+							// debugger
102
 							if (openid) {
103
 							if (openid) {
103
 								helper.cookies.set("openid", openid, 365);
104
 								helper.cookies.set("openid", openid, 365);
104
-								debugger
105
+								// debugger
105
 								if (typeUser=="5") {
106
 								if (typeUser=="5") {
106
 									if(data.data.usertype==2){
107
 									if(data.data.usertype==2){
107
-										debugger
108
+										// debugger
108
 										window.location.replace('content/AdminList.html');
109
 										window.location.replace('content/AdminList.html');
109
 										helper.cookies.set("username", data.data.username, 7);
110
 										helper.cookies.set("username", data.data.username, 7);
110
 									}else{
111
 									}else{