解决冲突

双汇APP-andriod/.project

@@ -219,5 +219,14 @@
 				<arguments>1.0-name-matches-false-false-node_modules</arguments>
 			</matcher>
 		</filter>
+		<filter>
+			<id>1662016130863</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>

双汇APP-andriod/Common/js/tj_manage.js

@@ -1,6 +1,6 @@
 mui.init({
-	beforeback: function() {　　　　
-		var list = plus.webview.currentWebview().opener();　　　　
+	beforeback: function() {
+		var list = plus.webview.currentWebview().opener();
 		//refresh是A页面自定义事件
 		mui.fire(list, 'refresh');
 		//返回true,继续页面关闭逻辑
@@ -11,7 +11,7 @@ mui.init({
 //初始化单页的区域滚动
 mui('.mui-scroll-wrapper').scroll();
 mui.plusReady(function() {
-	
+
 	//	产品代码
 	var Product = [];
 	$.ajax({
@@ -20,13 +20,13 @@ mui.plusReady(function() {
 		async: false,
 		data: {
 			flag: "CPDM",
-			token:localStorage.getItem("token")
+			token: localStorage.getItem("token")
 		},
 		dataType: 'json',
 		success: function(res) {
-			if(res.state.toLowerCase() === "success") {
+			if (res.state.toLowerCase() === "success") {
 				res = res.data;
-				if(res && res.length > 0) {
+				if (res && res.length > 0) {
 					res.forEach(function(v, i) {
 						var obj = {};
 						obj.id = v.id;
@@ -37,47 +37,89 @@ mui.plusReady(function() {
 				}
 			}
 		}
-	});	
+	});
+	// 角色
+	var roleList = []
+	$.ajax({
+		type: "get",
+		url: huayi.config.callcenter_url + 'RoleInfo/GetRoleList',
+		async: false,
+		data: {
+			code: '',
+			name: '',
+			pageindex: 1,
+			pagesize: 100,
+			token: localStorage.getItem("token")
+		},
+		dataType: 'json',
+		success: function(res) {
+			res = res.rows;
+			if (res && res.length > 0) {
+				res.forEach(function(v, i) {
+					var obj = {};
+					obj.id = v.F_RoleId;
+					obj.text = v.F_RoleName;
+					roleList.push(obj);
+				});
+			}
+		}
+	});
 	(function($, doc) {
-		$.init(); 
+		$.init();
 		$.ready(function() {
 			//产品代码
-			var userPicker2 = new $.PopPicker({layer: 3});
+			var userPicker2 = new $.PopPicker({
+				layer: 3
+			});
 			userPicker2.setData(Product);
 			var showUserPickerButton2 = doc.getElementById('showUserPickerProduct');
 			var F_Product = doc.getElementById('F_ProductType');
 			showUserPickerButton2.addEventListener('tap', function(event) {
 				userPicker2.show(function(items) {
-					
-					if (items[2].text==undefined) {
-						if (items[1].text==undefined) {
+
+					if (items[2].text == undefined) {
+						if (items[1].text == undefined) {
 							F_Product.value = items[0].text;
 							F_Product.setAttribute("data-index", items[0].id);
 						} else {
 							F_Product.value = items[1].text;
 							F_Product.setAttribute("data-index", items[1].id);
 						}
-					}else {
-						F_Product.value =items[2].text;
+					} else {
+						F_Product.value = items[2].text;
 						F_Product.setAttribute("data-index", items[2].id);
 					}
 				});
-			}, false); 
+			}, false);
+			var rolePicker = new $.PopPicker({
+				layer: 1
+			});
+			rolePicker.setData(roleList)
+			var showRolePickerButton = doc.getElementById('showRolePickerProduct');
+			var role = doc.getElementById('role');
+			showRolePickerButton.addEventListener('tap', function(event) {
+				rolePicker.show(function(items) {
+					role.value = items[0].text
+					role.setAttribute("data-index", items[0].id);
+				});
+			}, false);
 		})
 	})(mui, document);
 })
 $('#xgPassword').on('tap', function() {
-	
-//	alert($('.F_UserName').val());
-//	alert($('.password').val());
-//	alert($("#F_ProductType").attr("data-index"));
-//	alert($(".F_Mobile").val());
-	if($('#F_CusName').val() == '') {
+
+	//	alert($('.F_UserName').val());
+	//	alert($('.password').val());
+	//	alert($("#F_ProductType").attr("data-index"));
+	//	alert($(".F_Mobile").val());
+	if ($('.F_UserName').val() == '') {
 		mui.alert('请输入用户名！')
-	} else if($('.password').val() == '') {
+	} else if ($('.password').val() == '') {
 		mui.alert('请输入密码！')
-	} else if($("#F_ProductType").val() == '') {
+	} else if ($("#F_ProductType").val() == '') {
 		mui.alert('请选择部门！')
+	} else if ($("#role").val() == '') {
+		mui.alert('请选择角色！')
 	}  else {
 		$.ajax({
 			type: "post",
@@ -87,19 +129,20 @@ $('#xgPassword').on('tap', function() {
 			data: {
 				username: $('.F_UserName').val(), //用户名
 				password: $('.password').val(), //密码
-				deptid:$("#F_ProductType").attr("data-index"), //部门
-				roleid: 53, 
-				mobile:$(".F_Mobile").val(),
+				deptid: $("#F_ProductType").attr("data-index"), //部门
+				roleid: $("#role").attr("data-index"),
+				mobile: $(".F_Mobile").val(),
 				token: localStorage.getItem("token")
 			},
 			success: function(data) {
-				if(data.state == "success") {
-					
-					mui.alert( '账号'+data.data.F_UserCode+'--密码'+data.data.F_Password,'添加成功', function() {
-						var wobj = plus.webview.getWebviewById("Setting_manage");
-						wobj.reload(true);
-					});
-					
+				if (data.state == "success") {
+
+					mui.alert('账号' + data.data.F_UserCode + '--密码' + data.data.F_Password, '添加成功',
+						function() {
+							var wobj = plus.webview.getWebviewById("Setting_manage");
+							wobj.reload(true);
+						});
+
 				} else {
 					mui.toast(data.message);
 				}
@@ -107,5 +150,3 @@ $('#xgPassword').on('tap', function() {
 		});
 	}
 })
-
-

双汇APP-andriod/Common/js/xg_manage.js

@@ -16,6 +16,32 @@ mui.plusReady(function() {
 	var wv = plus.webview.currentWebview();
 	var nameid = wv.nameid;
 	var name = wv.name;
+	// 角色
+	var roleList = []
+	$.ajax({
+		type: "get",
+		url: huayi.config.callcenter_url + 'RoleInfo/GetRoleList',
+		async: false,
+		data: {
+			code: '',
+			name: '',
+			pageindex: 1,
+			pagesize: 100,
+			token: localStorage.getItem("token")
+		},
+		dataType: 'json',
+		success: function(res) {
+			res = res.rows;
+			if (res && res.length > 0) {
+				res.forEach(function(v, i) {
+					var obj = {};
+					obj.id = v.F_RoleId;
+					obj.text = v.F_RoleName;
+					roleList.push(obj);
+				});
+			}
+		}
+	});
 	mui.ajax(huayi.config.callcenter_url + '/UserAccount/GetUser', {
 		data: {
 			usercode:name,
@@ -32,7 +58,12 @@ mui.plusReady(function() {
 		success: function(data) {
 			var RoleCode = data.data; 
 			$("#UserId").val(RoleCode.F_UserId) //用户id
-			$("#RoldId").val(RoleCode.F_RoleId)
+			roleList.forEach((v,n) =>{
+				if(v.id == RoleCode.F_RoleId) {
+					$("#role").val(v.text)
+					$("#role").attr("data-index", v.id)
+				}
+			})
 			$(".F_UserName").val(RoleCode.F_UserName); //员工姓名
 			$(".F_SeatGroup").val(RoleCode.depname); //部门
 			$(".F_SeatGroup").attr("data-index",RoleCode.F_DeptId); //部门
@@ -71,6 +102,7 @@ mui.plusReady(function() {
 			}
 		}
 	});	
+	
 	(function($, doc) {
 		$.init(); 
 		$.ready(function() {
@@ -96,6 +128,18 @@ mui.plusReady(function() {
 					
 				});
 			}, false); 
+			var rolePicker = new $.PopPicker({
+				layer: 1
+			});
+			rolePicker.setData(roleList)
+			var showRolePickerButton = doc.getElementById('showRolePickerProduct');
+			var role = doc.getElementById('role');
+			showRolePickerButton.addEventListener('tap', function(event) {
+				rolePicker.show(function(items) {
+					role.value = items[0].text
+					role.setAttribute("data-index", items[0].id);
+				});
+			}, false);
 		})
 	})(mui, document);
 })
@@ -149,6 +193,7 @@ $('#xgPassword').on('tap', function() {
 						Password: $('.password').val(), //密码
 						mobile:$(".F_Mobile").val(), //手机号
 						deptid:$("#F_ProductType").attr("data-index"), //部门
+						roleid:$("#role").attr("data-index"),
 						token: localStorage.getItem("token")
 					},
 					success: function(data) {

双汇APP-andriod/Common/tj_manage.html

@@ -16,7 +16,7 @@
 				right: 0px;
 				top: 8px; 
 			}
-			#F_ProductType{
+			#F_ProductType, #role{
 				font-size: 14px;
 			}
 		</style>
@@ -44,10 +44,17 @@
 								<span class="type_down mui-icon mui-icon-arrowdown mui-pull-right"></span>
 							</div>
 						</li>
+						<li class="mui-table-view-cell" id="showRolePickerProduct">
+							<div class="mui-input-row">
+								<label class="label">角色：</label>
+								<input id='role'  data-index="" type="text" placeholder="请选择角色">
+								<span class="type_down mui-icon mui-icon-arrowdown mui-pull-right"></span>
+							</div>
+						</li>
 						<li class="mui-table-view-cell">
 							<div class="mui-input-row">
 								<label class="label">手机号：</label>
-								<input style="font-size: 14px;" type="text" placeholder="请填写手机" class="F_Mobile">
+								<input style="font-size: 14px;" type="text" placeholder="请填写手机号" class="F_Mobile">
 							</div>
 						</li>
 						<li class="mui-table-view-cell">

双汇APP-andriod/Common/xg_manage.html

@@ -16,7 +16,7 @@
 				right: 0px;
 				top: 8px; 
 			}
-			#F_ProductType{
+			#F_ProductType,#role{
 				font-size: 14px;
 			}
 		</style>
@@ -52,6 +52,13 @@
 								<span class="type_down mui-icon mui-icon-arrowdown mui-pull-right"></span>
 							</div>
 						</li>
+						<li class="mui-table-view-cell" id="showRolePickerProduct">
+							<div class="mui-input-row">
+								<label class="label">角色：</label>
+								<input id='role'  data-index="" type="text" placeholder="请选择角色">
+								<span class="type_down mui-icon mui-icon-arrowdown mui-pull-right"></span>
+							</div>
+						</li>
 						<li class="mui-table-view-cell">
 							<div class="mui-input-row">
 								<label class="label">手机号：</label>

双汇APP-andriod/js/feedback-page-work.js

@@ -109,6 +109,7 @@ function upFile() {
 		timeout: 300000, //超时时间设置为30秒
 		success: function(data) {
 			if (data.state == "success") {
+				console.log(1)
 				for (var i in data.acs) {
 					$("#imgs li").eq(Number(imgsLength)).attr("imgId", data.acs[i].F_Id)
           imgsLength++;
@@ -129,12 +130,34 @@ function upFile() {
 // 添加文件  
 var f1 = null;
 function appendFile(path) {
-	
   //fileArr=[]
 	var bitmap = new plus.nativeObj.Bitmap("test");
 	// 从本地加载Bitmap图片  
 	bitmap.load(path,function(){  
 		var base64 = bitmap.toBase64Data()  
+	var img = new Image();
+	img .crossOrigin = "Anonymous"; 
+	img.src = path; // 传过来的图片路径在这里用。   
+	img.onload = function() {
+		var that = this;
+		//生成比例   
+		var w = that.width,
+			h = that.height,
+			scale = w / h;
+		w = 480 || w; //480  你想压缩到多大，改这里  
+		h = w / scale;
+		//生成canvas  
+		var canvas = document.createElement('canvas');
+		var ctx = canvas.getContext('2d');
+		$(canvas).attr({
+			width: w,
+			height: h
+		});
+		ctx.drawImage(that, 0, 0, w, h);
+		
+		var base64 = canvas.toDataURL('image/jpeg', 1 || 0.8); //1最清晰，越低越模糊。有一点不清楚这里明明设置的是jpeg。弹出 base64 开头的一段 data：image/png;却是png。哎开心就好，开心就好       
+		
+>>>>>>> f29dad500623be9c7a8807978452db6bae1fdcea
 		f1 = base64; // 把base64数据丢过去，上传要用。
 		setHtml(path, f1);
 		fileArr.push(f1);

双汇APP-andriod/js/huayi.config.js

@@ -4,7 +4,7 @@ if(huayi == undefined) {
 huayi.config = {
 	callcenter_url: "http://oa.shuanghui.net:8046/",//生产环境
 	//callcenter_url: "http://121.196.219.217:8046/",//生产环境
-	//callcenter_url: "http://192.168.8.9:1001/",//生产环境
+	// callcenter_url: "http://192.168.8.9:1001/",//生产环境
 	socket_ip: "222.143.137.63", //ip
 	socket_port: "8081", //端口
 	indexOutTime: 2000, //菜单工单数量刷新间隔

双汇APP-andriod/js/personal.js

@@ -2,6 +2,7 @@ mui.init();
 
 var token = localStorage.getItem("token"); //获取本地存储
 mui.plusReady(function() {
+	console.log(1)
 	ajaxRefresh();
 	
 	setTimeout(function() {
@@ -36,10 +37,15 @@ $.ajax({
 		$(".F_UserName").text(data.data.user.F_UserName);
 		localStorage.setItem("F_UserName", data.data.user.F_UserName);
 		localStorage.setItem("F_RoleId", data.data.user.F_RoleId);
-    localStorage.setItem("RoleCode", RoleCode);
+		localStorage.setItem("RoleCode", RoleCode);
 		localStorage.setItem("F_See", data.data.user.F_See);
 		$(".rolname").text(data.data.user.rolname);
 		if(RoleCode == "0") { //调度   
+			if(data.data.role.F_RoleCode == 'CLZY') {
+				$(".cx").show()
+			}else{
+				$(".cx").hide()
+			}
 			$(".RoleCode_0").css('display', 'block')
 		} else if(RoleCode == "1") {
 			$(".RoleCode_1").css('display', 'block')
@@ -107,6 +113,7 @@ $.ajax({
 });
 
 function ajaxRefresh() {
+	
  	//权限判断
 	$.ajax({
 		data: {

双汇APP-andriod/manifest.json

@@ -201,6 +201,9 @@
                     "unipush" : {}
                 },
                 "payment" : {}
+            },
+            "ios" : {
+                "dSYMs" : false
             }
         },
         "adid" : "128026090911",

双汇APP-andriod/personal.html

@@ -133,6 +133,14 @@
 						<div class="mui-media-body font-weight-bold">咨询工单</div>
 					</a>
 				</li>
+				<li class="mui-table-view-cell mui-media mui-col-xs-4 mui-col-sm-4 cx" style="display: none;">
+					<a href="javascript:;" class="work-list" index="-1">
+						<div class="Icon icon-3">
+							<img src="img/icon-3.png" />
+							</i></div>
+						<div class="mui-media-body font-weight-bold">查询工单</div>
+					</a>
+				</li>
 			</ul>
 
 			<!--客服-->

双汇APP-andriod/workOrder/js/Work-list.js

@@ -8,12 +8,14 @@ window.onload = function() {
     
 		var page = 1; //页数
 		var pageSize = 10; //每页显示条目
+		var comprehensive = -1
 		var total; //数据总条数
 		var wv = plus.webview.currentWebview();
 		var index = wv.index; //交办条件
 		var importClass = wv.importClass; //工单等级
 		var keyw="";
 		plus.nativeUI.closeWaiting();
+		console.log(index)
 		//显示当前页面
 		mui.currentWebview.show();
 		
@@ -33,6 +35,9 @@ window.onload = function() {
 			$(".Totle-box").text('已处理')
 		} else if(index == 11) {
 			$(".Totle-box").text('咨询')
+		}else if(index == -1) {
+			$(".Totle-box").text('查询')
+			comprehensive = 0
 		}
 		if(importClass == 1) {
 			$(".Totle-box").text('一级列表')
@@ -83,6 +88,7 @@ window.onload = function() {
 		function pullupRefresh() {
 			setTimeout(function() {
 				mui('#pullrefresh').pullRefresh().endPullupToRefresh((page++ >= Math.ceil(total / 10)));
+				console.log(comprehensive)
 				mui.ajax(huayi.config.callcenter_url + 'WorkorderApp/GetList', {
 					data: {
 						token: token,
@@ -92,7 +98,8 @@ window.onload = function() {
 						offce:officeId,
 						extensionphone: 1,
 						pageindex: page,
-						pagesize: pageSize
+						pagesize: pageSize,
+						comprehensive:comprehensive
 					},
 					dataType: 'json', //服务器返回json格式数据
 					type: 'get', //HTTP请求类型
@@ -199,6 +206,7 @@ window.onload = function() {
 			$(".orderLi").remove();
 			page=1;
 			pageSize=10;
+			console.log(comprehensive)
 			mui.ajax(huayi.config.callcenter_url + 'WorkorderApp/GetList', {
 				data: {
 					token: token, 
@@ -209,7 +217,8 @@ window.onload = function() {
 					extensionphone: 1,
 					keywords:keyw, 
 					page:1,
-					pageSize:10
+					pageSize:10,
+					comprehensive:comprehensive
 				},
 				dataType: 'json', //服务器返回json格式数据
 				type: 'get', //HTTP请求类型

双汇APP/Common/js/tj_manage.js

@@ -1,6 +1,6 @@
 mui.init({
-	beforeback: function() {　　　　
-		var list = plus.webview.currentWebview().opener();　　　　
+	beforeback: function() {
+		var list = plus.webview.currentWebview().opener();
 		//refresh是A页面自定义事件
 		mui.fire(list, 'refresh');
 		//返回true,继续页面关闭逻辑
@@ -11,7 +11,7 @@ mui.init({
 //初始化单页的区域滚动
 mui('.mui-scroll-wrapper').scroll();
 mui.plusReady(function() {
-	
+
 	//	产品代码
 	var Product = [];
 	$.ajax({
@@ -20,13 +20,13 @@ mui.plusReady(function() {
 		async: false,
 		data: {
 			flag: "CPDM",
-			token:localStorage.getItem("token")
+			token: localStorage.getItem("token")
 		},
 		dataType: 'json',
 		success: function(res) {
-			if(res.state.toLowerCase() === "success") {
+			if (res.state.toLowerCase() === "success") {
 				res = res.data;
-				if(res && res.length > 0) {
+				if (res && res.length > 0) {
 					res.forEach(function(v, i) {
 						var obj = {};
 						obj.id = v.id;
@@ -37,46 +37,89 @@ mui.plusReady(function() {
 				}
 			}
 		}
-	});	
+	});
+	// 角色
+	var roleList = []
+	$.ajax({
+		type: "get",
+		url: huayi.config.callcenter_url + 'RoleInfo/GetRoleList',
+		async: false,
+		data: {
+			code: '',
+			name: '',
+			pageindex: 1,
+			pagesize: 100,
+			token: localStorage.getItem("token")
+		},
+		dataType: 'json',
+		success: function(res) {
+			res = res.rows;
+			if (res && res.length > 0) {
+				res.forEach(function(v, i) {
+					var obj = {};
+					obj.id = v.F_RoleId;
+					obj.text = v.F_RoleName;
+					roleList.push(obj);
+				});
+			}
+		}
+	});
 	(function($, doc) {
-		$.init(); 
+		$.init();
 		$.ready(function() {
 			//产品代码
-			var userPicker2 = new $.PopPicker({layer: 3});
+			var userPicker2 = new $.PopPicker({
+				layer: 3
+			});
 			userPicker2.setData(Product);
 			var showUserPickerButton2 = doc.getElementById('showUserPickerProduct');
 			var F_Product = doc.getElementById('F_ProductType');
 			showUserPickerButton2.addEventListener('tap', function(event) {
 				userPicker2.show(function(items) {
-					if (items[2].text==undefined) {
-						if (items[1].text==undefined) {
+
+					if (items[2].text == undefined) {
+						if (items[1].text == undefined) {
 							F_Product.value = items[0].text;
 							F_Product.setAttribute("data-index", items[0].id);
 						} else {
 							F_Product.value = items[1].text;
 							F_Product.setAttribute("data-index", items[1].id);
 						}
-					}else {
-						F_Product.value =items[2].text;
+					} else {
+						F_Product.value = items[2].text;
 						F_Product.setAttribute("data-index", items[2].id);
 					}
 				});
-			}, false); 
+			}, false);
+			var rolePicker = new $.PopPicker({
+				layer: 1
+			});
+			rolePicker.setData(roleList)
+			var showRolePickerButton = doc.getElementById('showRolePickerProduct');
+			var role = doc.getElementById('role');
+			showRolePickerButton.addEventListener('tap', function(event) {
+				rolePicker.show(function(items) {
+					role.value = items[0].text
+					role.setAttribute("data-index", items[0].id);
+				});
+			}, false);
 		})
 	})(mui, document);
 })
 $('#xgPassword').on('tap', function() {
-	
-//	alert($('.F_UserName').val());
-//	alert($('.password').val());
-//	alert($("#F_ProductType").attr("data-index"));
-//	alert($(".F_Mobile").val());
-	if($('#F_CusName').val() == '') {
+
+	//	alert($('.F_UserName').val());
+	//	alert($('.password').val());
+	//	alert($("#F_ProductType").attr("data-index"));
+	//	alert($(".F_Mobile").val());
+	if ($('.F_UserName').val() == '') {
 		mui.alert('请输入用户名！')
-	} else if($('.password').val() == '') {
+	} else if ($('.password').val() == '') {
 		mui.alert('请输入密码！')
-	} else if($("#F_ProductType").val() == '') {
+	} else if ($("#F_ProductType").val() == '') {
 		mui.alert('请选择部门！')
+	} else if ($("#role").val() == '') {
+		mui.alert('请选择角色！')
 	}  else {
 		$.ajax({
 			type: "post",
@@ -86,19 +129,20 @@ $('#xgPassword').on('tap', function() {
 			data: {
 				username: $('.F_UserName').val(), //用户名
 				password: $('.password').val(), //密码
-				deptid:$("#F_ProductType").attr("data-index"), //部门
-				roleid: 53, 
-				mobile:$(".F_Mobile").val(),
+				deptid: $("#F_ProductType").attr("data-index"), //部门
+				roleid: $("#role").attr("data-index"),
+				mobile: $(".F_Mobile").val(),
 				token: localStorage.getItem("token")
 			},
 			success: function(data) {
-				if(data.state == "success") {
-					
-					mui.alert( '账号'+data.data.F_UserCode+'--密码'+data.data.F_Password,'添加成功', function() {
-						var wobj = plus.webview.getWebviewById("Setting_manage");
-						wobj.reload(true);
-					});
-					
+				if (data.state == "success") {
+
+					mui.alert('账号' + data.data.F_UserCode + '--密码' + data.data.F_Password, '添加成功',
+						function() {
+							var wobj = plus.webview.getWebviewById("Setting_manage");
+							wobj.reload(true);
+						});
+
 				} else {
 					mui.toast(data.message);
 				}
@@ -106,5 +150,3 @@ $('#xgPassword').on('tap', function() {
 		});
 	}
 })
-
-

双汇APP/Common/js/xg_manage.js

@@ -16,6 +16,32 @@ mui.plusReady(function() {
 	var wv = plus.webview.currentWebview();
 	var nameid = wv.nameid;
 	var name = wv.name;
+	// 角色
+	var roleList = []
+	$.ajax({
+		type: "get",
+		url: huayi.config.callcenter_url + 'RoleInfo/GetRoleList',
+		async: false,
+		data: {
+			code: '',
+			name: '',
+			pageindex: 1,
+			pagesize: 100,
+			token: localStorage.getItem("token")
+		},
+		dataType: 'json',
+		success: function(res) {
+			res = res.rows;
+			if (res && res.length > 0) {
+				res.forEach(function(v, i) {
+					var obj = {};
+					obj.id = v.F_RoleId;
+					obj.text = v.F_RoleName;
+					roleList.push(obj);
+				});
+			}
+		}
+	});
 	mui.ajax(huayi.config.callcenter_url + '/UserAccount/GetUser', {
 		data: {
 			usercode:name,
@@ -32,7 +58,12 @@ mui.plusReady(function() {
 		success: function(data) {
 			var RoleCode = data.data; 
 			$("#UserId").val(RoleCode.F_UserId) //用户id
-			$("#RoldId").val(RoleCode.F_RoleId)
+			roleList.forEach((v,n) =>{
+				if(v.id == RoleCode.F_RoleId) {
+					$("#role").val(v.text)
+					$("#role").attr("data-index", v.id)
+				}
+			})
 			$(".F_UserName").val(RoleCode.F_UserName); //员工姓名
 			$(".F_SeatGroup").val(RoleCode.depname); //部门
 			$(".F_SeatGroup").attr("data-index",RoleCode.F_DeptId); //部门
@@ -71,6 +102,7 @@ mui.plusReady(function() {
 			}
 		}
 	});	
+	
 	(function($, doc) {
 		$.init(); 
 		$.ready(function() {
@@ -96,6 +128,18 @@ mui.plusReady(function() {
 					
 				});
 			}, false); 
+			var rolePicker = new $.PopPicker({
+				layer: 1
+			});
+			rolePicker.setData(roleList)
+			var showRolePickerButton = doc.getElementById('showRolePickerProduct');
+			var role = doc.getElementById('role');
+			showRolePickerButton.addEventListener('tap', function(event) {
+				rolePicker.show(function(items) {
+					role.value = items[0].text
+					role.setAttribute("data-index", items[0].id);
+				});
+			}, false);
 		})
 	})(mui, document);
 })
@@ -128,7 +172,8 @@ $('#deteBtn').on('tap', function() {
 	})
 	
 })
-$('#xgPassword').on('tap', function() {	
+$('#xgPassword').on('tap', function() {
+	
 	if ($("#RoldId").val()==F_RoleId&&$(".rolname").val()!=F_UserCode) {
 		mui.toast("没有修改权限");
 	}else{
@@ -148,6 +193,7 @@ $('#xgPassword').on('tap', function() {
 						Password: $('.password').val(), //密码
 						mobile:$(".F_Mobile").val(), //手机号
 						deptid:$("#F_ProductType").attr("data-index"), //部门
+						roleid:$("#role").attr("data-index"),
 						token: localStorage.getItem("token")
 					},
 					success: function(data) {

双汇APP/Common/tj_manage.html

@@ -16,7 +16,7 @@
 				right: 0px;
 				top: 8px; 
 			}
-			#F_ProductType{
+			#F_ProductType, #role{
 				font-size: 14px;
 			}
 		</style>
@@ -44,6 +44,13 @@
 								<span class="type_down mui-icon mui-icon-arrowdown mui-pull-right"></span>
 							</div>
 						</li>
+						<li class="mui-table-view-cell" id="showRolePickerProduct">
+							<div class="mui-input-row">
+								<label class="label">角色：</label>
+								<input id='role'  data-index="" type="text" placeholder="请选择角色">
+								<span class="type_down mui-icon mui-icon-arrowdown mui-pull-right"></span>
+							</div>
+						</li>
 						<li class="mui-table-view-cell">
 							<div class="mui-input-row">
 								<label class="label">手机号：</label>

双汇APP/Common/xg_manage.html

@@ -16,7 +16,7 @@
 				right: 0px;
 				top: 8px; 
 			}
-			#F_ProductType{
+			#F_ProductType,#role{
 				font-size: 14px;
 			}
 		</style>
@@ -52,6 +52,13 @@
 								<span class="type_down mui-icon mui-icon-arrowdown mui-pull-right"></span>
 							</div>
 						</li>
+						<li class="mui-table-view-cell" id="showRolePickerProduct">
+							<div class="mui-input-row">
+								<label class="label">角色：</label>
+								<input id='role'  data-index="" type="text" placeholder="请选择角色">
+								<span class="type_down mui-icon mui-icon-arrowdown mui-pull-right"></span>
+							</div>
+						</li>
 						<li class="mui-table-view-cell">
 							<div class="mui-input-row">
 								<label class="label">手机号：</label>

双汇APP/js/huayi.config.js

@@ -4,7 +4,7 @@ if(huayi == undefined) {
 huayi.config = {
 	callcenter_url: "http://oa.shuanghui.net:8046/",//生产环境 
 	//callcenter_url: "http://121.196.219.217:8046/",//生产环境
-	//callcenter_url: "http://192.168.8.9:1001",//生产环境
+	// callcenter_url: "http://192.168.8.9:1001/",//生产环境
 	socket_ip: "222.143.137.63", //ip
 	socket_port: "8081", //端口
 	indexOutTime: 2000, //菜单工单数量刷新间隔

双汇APP/js/personal.js

@@ -35,6 +35,11 @@ $.ajax({
 		localStorage.setItem("F_See", data.data.user.F_See);
 		$(".rolname").text(data.data.user.rolname);
 		if(RoleCode == "0") { //调度   
+			if(data.data.role.F_RoleCode == 'CLZY') {
+				$(".cx").show()
+			}else{
+				$(".cx").hide()
+			}
 			$(".RoleCode_0").css('display', 'block')
 		} else if(RoleCode == "1") {
 			$(".RoleCode_1").css('display', 'block')

双汇APP/manifest.json

@@ -3,7 +3,11 @@
     "id" : "H5BFC9619", /*应用的标识，创建应用时自动生成，勿手动修改*/
     "name" : "双汇售后服务平台", /*应用名称，程序桌面图标名称*/
     "version" : {
+<<<<<<< HEAD
         "name" : "1.5.4", /*应用版本名称*/
+=======
+        "name" : "1.6.1", /*应用版本名称*/
+>>>>>>> f29dad500623be9c7a8807978452db6bae1fdcea
         "code" : "83"
     },
     "description" : "", /*应用描述信息*/
@@ -202,7 +206,16 @@
             },
             "plugins" : {
                 "ad" : {},
+<<<<<<< HEAD
                 "push" : {}
+=======
+                "push" : {
+                    "unipush" : {}
+                }
+            },
+            "ios" : {
+                "dSYMs" : false
+>>>>>>> f29dad500623be9c7a8807978452db6bae1fdcea
             }
         },
         "adid" : "128026090911",

双汇APP/personal.html

@@ -132,6 +132,14 @@
 						<div class="mui-media-body font-weight-bold">咨询工单</div>
 					</a> 
 				</li>
+				<li class="mui-table-view-cell mui-media mui-col-xs-4 mui-col-sm-4 cx" style="display: none;">
+					<a href="javascript:;" class="work-list" index="-1">
+						<div class="Icon icon-3">
+							<img src="img/icon-3.png" />
+							</i></div>
+						<div class="mui-media-body font-weight-bold">查询工单</div>
+					</a>
+				</li>
 			</ul>
 			
 			<!--客服-->

双汇APP/workOrder/js/Work-list.js

@@ -7,6 +7,7 @@ window.onload = function() {
 		var F_RoleId = localStorage.getItem("F_RoleId");
 		var page = 1; //页数
 		var pageSize = 10; //每页显示条目
+		var comprehensive = -1
 		var total; //数据总条数
 		var wv = plus.webview.currentWebview();
 		var index = wv.index; //交办条件
@@ -32,6 +33,9 @@ window.onload = function() {
 			$(".Totle-box").text('已处理')
 		} else if(index == 11) {
 			$(".Totle-box").text('咨询')
+		}else if(index == -1) {
+			$(".Totle-box").text('查询')
+			comprehensive = 0
 		}
 		if(importClass == 1) {
 			$(".Totle-box").text('一级列表')
@@ -92,7 +96,8 @@ window.onload = function() {
 						offce:officeId,
 						extensionphone: 1,
 						pageindex: page,
-						pagesize: pageSize
+						pagesize: pageSize,
+						comprehensive:comprehensive
 					},
 					dataType: 'json', //服务器返回json格式数据
 					type: 'get', //HTTP请求类型
@@ -208,7 +213,8 @@ window.onload = function() {
 					extensionphone: 1,
 					keywords:keyw, 
 					page:1,
-					pageSize:10
+					pageSize:10,
+					comprehensive:comprehensive
 				},
 				dataType: 'json', //服务器返回json格式数据
 				type: 'get', //HTTP请求类型