微信

WeChat/client-side/css/AddWorkolder.css

@@ -73,6 +73,7 @@ body {
 }
 .radio_box {
 	display: inline-block;
+	padding-left: 20px;
 }
 
 .mui-radio input[type=radio]:before {

newWX/newWX/Script/Common/huayi.config.js

@@ -1,9 +1,10 @@
-if (huayi == undefined) {
+if (huayi == undefined) {
     var huayi = {};
 }
 huayi.config = {
 //  callcenter_url: "http://117.160.143.199:4673/",//生产环境 前端Web站IP和端口
     //callcenter_url: "http://117.158.196.116:4617/",//生产环境 前端Web站IP和端口
   	//callcenter_url: "http://139.224.236.21:4021/",//生产环境 前端Web站IP和端口
-    callcenter_url: "http://192.168.8.9:1005/",//生产环境 前端Web站IP和端口
+    // callcenter_url: "http://192.168.8.9:1005/",//生产环境 前端Web站IP和端口
+	callcenter_url:"http://39.164.159.192:1005/"
 };

newWX/newWX/client-side/Have_list.html

@@ -251,10 +251,16 @@
 										'</span><span>' +'</span><span id="" style="margin-left:25px;">' +
 										'</span></div><div class="fr"><span>' + n.F_CreateOn +'</span></div></div>' +
 										'<div class="mui-card-content"><div class="mui-card-content-inner"><p class="font-color2 details_line" style="padding:13px 0">' +n.F_Description 
-										if(flag == 1){
+										if(n.inout == 1 || n.inout == 0 || n.inout == 3){
 											str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName 
-										}else{
+										}else if(n.inout == 2){
 											str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName2 
+										}else if(n.inout == 9){
+											if(flag == 1){
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName 
+											}else if(flag == 2){
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName2
+											}
 										}
 										
 										str +='</span><span id="">' + n.F_WorkOrderCode + receiver +'</div></div></div></a>'
@@ -326,10 +332,16 @@
 										'</span><span>' +'</span><span id="" style="margin-left:25px;">' +
 										'</span></div><div class="fr"><span>' + n.F_CreateOn +'</span></div></div>' +
 										'<div class="mui-card-content"><div class="mui-card-content-inner"><p class="font-color2 details_line" style="padding:13px 0">' +n.F_Description 
-										if(flag == 1){
+										if(n.inout == 1 || n.inout == 0 || n.inout == 3){
 											str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName 
-										}else{
+										}else if(n.inout == 2){
 											str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName2 
+										}else if(n.inout == 9){
+											if(flag == 1){
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName 
+											}else if(flag == 2){
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName2
+											}
 										}
 										
 										str +='</span><span id="">' + n.F_WorkOrderCode + receiver +'</div></div></div></a>'

newWX/newWX/client-side/Retired_list.html

@@ -271,10 +271,16 @@
 										'</span><span>' +'</span><span id="" style="margin-left:25px;">' +
 										'</span></div><div class="fr"><span>' + n.F_CreateOn +'</span></div></div>' +
 										'<div class="mui-card-content"><div class="mui-card-content-inner"><p class="font-color2 details_line" style="padding:13px 0">' +n.F_Description 
-										if(flag == 1){
+										if(n.inout == 1 || n.inout == 0 || n.inout == 3){
 											str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName 
-										}else{
+										}else if(n.inout == 2){
 											str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName2 
+										}else if(n.inout == 9){
+											if(flag == 1){
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName 
+											}else if(flag == 2){
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName2
+											}
 										}
 										
 										str +='</span><span id="">' + n.F_WorkOrderCode + receiver +'</div></div></div></a>'
@@ -346,10 +352,16 @@
 										'</span><span>' +'</span><span id="" style="margin-left:25px;">' +
 										'</span></div><div class="fr"><span>' + n.F_CreateOn +'</span></div></div>' +
 										'<div class="mui-card-content"><div class="mui-card-content-inner"><p class="font-color2 details_line" style="padding:13px 0">' +n.F_Description 
-										if(flag == 1){
+										if(n.inout == 1 || n.inout == 0 || n.inout == 3){
 											str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName 
-										}else{
+										}else if(n.inout == 2){
 											str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName2 
+										}else if(n.inout == 9){
+											if(flag == 1){
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName 
+											}else if(flag == 2){
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName2
+											} 
 										}
 										
 										str +='</span><span id="">' + n.F_WorkOrderCode + receiver +'</div></div></div></a>'

newWX/newWX/client-side/Waiting_list.html

@@ -121,6 +121,7 @@
 			var UserType = helper.cookies.get("usertype");
 			var flag = helper.cookies.get("flag");
 			var itype = helper.request.queryString("itype");
+			var stateName = '待接单'
 			//			var openid = "oXF5e1mWpX5DajW5_yjNLPKb8ThE";
 			//			alert(openid);
 			var page = 1; //页数
@@ -287,10 +288,34 @@
 										'</span><span>' +'</span><span id="" style="margin-left:25px;">' +
 										'</span></div><div class="fr"><span>' + n.F_CreateOn +'</span></div></div>' +
 										'<div class="mui-card-content"><div class="mui-card-content-inner"><p class="font-color2 details_line" style="padding:13px 0">' +n.F_Description 
-										if(flag == 1){
-											str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName 
-										}else{
-											str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName2 
+										//内外线展示的工单状态
+										if(n.inout == 1 || n.inout == 0 || n.inout == 3){
+											if(stateName == '待接单' && n.F_StateName  == '待处理'){
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + stateName
+											}else{
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName
+											}
+											
+										}else if(n.inout == 2){
+											if(stateName == '待接单' && n.F_StateName2  == '待处理'){
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + stateName
+											}else{
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName2
+											}
+										}else if(n.inout == 9){
+											if(flag == 1) {
+												if(stateName == '待接单' && n.F_StateName  == '待处理'){
+													str +='</p><div class="mui-card-content-inner-span"><span id="">' + stateName
+												}else{
+													str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName
+												}
+											}else if(flag == 2){
+												if(stateName == '待接单' && n.F_StateName  == '待处理'){
+													str +='</p><div class="mui-card-content-inner-span"><span id="">' + stateName
+												}else{
+													str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName2
+												}
+											}
 										}
 										
 										str +='</span><span id="">' + n.F_WorkOrderCode + receiver +'</div></div></div></a>'
@@ -367,10 +392,34 @@
 									'</span><span>' +'</span><span id="" style="margin-left:25px;">' +
 									'</span></div><div class="fr"><span>' + n.F_CreateOn +'</span></div></div>' +
 									'<div class="mui-card-content"><div class="mui-card-content-inner"><p class="font-color2 details_line" style="padding:13px 0">' +n.F_Description 
-									if(flag == 1){
-										str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName 
-									}else{
-										str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName2 
+									if(n.inout == 1 || n.inout == 0 || n.inout == 3){
+										if(stateName == '待接单' && n.F_StateName  == '待处理'){
+											str +='</p><div class="mui-card-content-inner-span"><span id="">' + stateName
+										}else{
+											str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName
+										}
+										
+									}else if(n.inout == 2){
+										if(stateName == '待接单' && n.F_StateName2  == '待处理'){
+											str +='</p><div class="mui-card-content-inner-span"><span id="">' + stateName
+										}else{
+											str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName2
+										}
+									}else if(n.inout == 9){
+										if(flag == 1) {
+											if(stateName == '待接单' && n.F_StateName  == '待处理'){
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + stateName
+											}else{
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName
+											}
+										}else if(flag == 2){
+											if(stateName == '待接单' && n.F_StateName  == '待处理'){
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + stateName
+											}else{
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName2
+											}
+										}
+										
 									}
 									
 									str +='</span><span id="">' + n.F_WorkOrderCode + receiver +'</div></div></div></a>'

newWX/newWX/client-side/client_index.html

@@ -301,10 +301,17 @@
 										'</span><span>' +'</span><span id="" style="margin-left:25px;">' +
 										'</span></div><div class="fr"><span>' + n.F_CreateOn +'</span></div></div>' +
 										'<div class="mui-card-content"><div class="mui-card-content-inner"><p class="font-color2 details_line" style="padding:13px 0">' +n.F_Description 
-										if(flag == 1){
+										if(n.inout == 1 || n.inout == 0 || n.inout == 3){
 											str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName 
-										}else{
+										}else if(n.inout == 2){
 											str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName2 
+										}else if(n.inout == 9){
+											if(flag == 1){
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName 
+											}else if(flag == 2){
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName2
+											}
+											
 										}
 										
 										str +='</span><span id="">' + n.F_WorkOrderCode + receiver +'</div></div></div></a>'
@@ -366,10 +373,16 @@
 										'</span><span>' +'</span><span id="" style="margin-left:25px;">' +
 										'</span></div><div class="fr"><span>' + n.F_CreateOn +'</span></div></div>' +
 										'<div class="mui-card-content"><div class="mui-card-content-inner"><p class="font-color2 details_line" style="padding:13px 0">' +n.F_Description 
-										if(flag == 1){
+										if(n.inout == 1 || n.inout == 0 || n.inout == 3){
 											str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName 
-										}else{
+										}else if(n.inout == 2){
 											str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName2 
+										}else if(n.inout == 9){
+											if(flag == 1){
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName 
+											}else if(flag == 2){
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName2
+											}
 										}
 										
 										str +='</span><span id="">' + n.F_WorkOrderCode + receiver +'</div></div></div></a>'

newWX/newWX/client-side/css/AddWorkolder.css

@@ -270,6 +270,7 @@ body {
 
 .radio_box {
 	display: inline-block;
+	padding-left: 20px;
 }
 
 .mui-radio input[type=radio]:before {

newWX/newWX/client-side/details.html

@@ -924,6 +924,7 @@
 			if(isReply == 0) {
 				$('.btn_reply').show();
 			}
+			console.log(UserType)
 			console.log(csstate)
 			if(csstate) {
 				$(".type1").show();
@@ -1015,11 +1016,14 @@
 							if(result.F_TypeName == '投诉' || result.F_TypeName == '业务协办') {
 								$('.question_category').text('问题类别3：')
 							}
-							if(flag == 1) {
+							if(result.inout == 0 || result.inout == 1 || result.inout == 3) {
 								itype = result.F_State;
-							} else {
+							} else if(result.inout == 2) {
 								itype = result.F_State2;
 							}
+							if(helper.request.queryString("orderState") == 2) {
+								itype = 1
+							}
 
 							if(state == 1) {
 								$(".type1").hide();
@@ -1055,6 +1059,7 @@
 								$(".dispose1").hide();
 								$(".dispose2").show();
 							} else if(itype == 1) {
+								console.log(11)
 								$(".dispose1").show();
 								if(UserType == 4 || UserType == 0) {
 									$(".type1").show();
@@ -1077,11 +1082,7 @@
 
 							} else if(itype == 2) {
 								//								$(".dispose2").show();
-								if(UserType == 4) {
-									$(".type1").show();
-									$(".dispose1").show();
-									$(".shenpi").remove();
-								} else if(UserType == 0) {
+								if(UserType == 4 || UserType == 0) {
 									$(".type1").show();
 									$(".dispose1").show();
 									$(".shenpi").remove();
@@ -1104,6 +1105,8 @@
 									$(".dispose1").hide();
 									$(".dispose2").show();
 								} else if(UserType == 3 || UserType == 4) {
+									console.log(22)
+									$('.type2').hide()
 									$(".type1").show();
 									$(".dispose1").show();
 									$(".shenpi").remove();
@@ -1239,35 +1242,68 @@
 							$("#Work_note").text("注解内容：" + result.F_Annotation); //注解内容
 							$("#Work_timeOut").text("超期原因：" + result.F_Reasontimeout); //注解内容
 							// 区分内外线 1 是外线 2是内线
-							if((result.F_State == 1 && result.F_State2 == 1) || (result.F_State == 1 && result.F_State2 == 10) || (result.F_State == 10 && result.F_State2 == 1)) {
-								$('.returnBackState').show()
-							}else{
-								$('.returnBackState').hide()
-							}
-							if(flag == 1) {
+							// if((result.F_State == 1 && result.F_State2 == 1) || (result.F_State == 1 && result.F_State2 == 10) || (result.F_State == 10 && result.F_State2 == 1)) {
+							// 	$('.returnBackState').show()
+							// }else{
+							// 	$('.returnBackState').hide()
+							// }
+							//外线展示按钮
+							if(result.inout == 0 || result.inout == 1 || result.inout == 3) {
 								if(helper.request.queryString("orderState") == 4 && result.F_StateName == '待接单') {
 									$('.receState').hide()
 									$('.sendbackState').hide()
-									
-								} else if(helper.request.queryString("orderState") == 2 && result.F_StateName == '待接单') {
+									$('.returnBackState').show()
+								} else if((helper.request.queryString("orderState") == 2 && result.F_StateName == '待接单') || (helper.request.queryString("orderState") == 2 && result.F_StateName == '待处理')) {
 									console.log(8)
 									$('.receState').show()
 									$('.sendbackState').show()
-									
+									$('.returnBackState').hide()
 								}
 								$(".Work_lastDealUser").text(result.F_DealContent); //处理内容
-							} else {
+							// 内线线展示按钮
+							} else if(result.inout == 2){
 								if(helper.request.queryString("orderState") == 4 && result.F_StateName2 == '待接单') {
+									console.log(23)
 									$('.receState').hide()
 									$('.sendbackState').hide()
-									// $('.returnBackState').show()
-								} else if(helper.request.queryString("orderState") == 2 && result.F_StateName2 == '待接单') {
+									$('.returnBackState').show()
+								} else if((helper.request.queryString("orderState") == 2 && result.F_StateName2 == '待接单') || (helper.request.queryString("orderState") == 2 && result.F_StateName2 == '待处理')) {
 									console.log(8)
 									$('.receState').show()
 									$('.sendbackState').show()
-									// $('.returnBackState').hide()
+									$('.returnBackState').hide()
 								}
 								$(".Work_lastDealUser").text(result.F_DealContent2); //处理内容
+							// 市场管理科展示的按钮
+							}else if (result.inout == 9) {
+								//外线
+								if(flag == 1) {
+									if(helper.request.queryString("orderState") == 4 && result.F_StateName == '待接单') {
+										$('.receState').hide()
+										$('.sendbackState').hide()
+										$('.returnBackState').show()
+									} else if((helper.request.queryString("orderState") == 2 && result.F_StateName == '待接单') || (helper.request.queryString("orderState") == 2 && result.F_StateName == '待处理')) {
+										console.log(8)
+										$('.receState').show()
+										$('.sendbackState').show()
+										$('.returnBackState').hide()
+									}
+									$(".Work_lastDealUser").text(result.F_DealContent); //处理内容
+								// 内线
+								}else if (flag == 2) {
+									if(helper.request.queryString("orderState") == 4 && result.F_StateName2 == '待接单') {
+										console.log(23)
+										$('.receState').hide()
+										$('.sendbackState').hide()
+										$('.returnBackState').show()
+									} else if((helper.request.queryString("orderState") == 2 && result.F_StateName2 == '待接单') || (helper.request.queryString("orderState") == 2 && result.F_StateName2 == '待处理')) {
+										console.log(8)
+										$('.receState').show()
+										$('.sendbackState').show()
+										$('.returnBackState').hide()
+									}
+									$(".Work_lastDealUser").text(result.F_DealContent2); //处理内容
+								}
 							}
 							if(result.RemainingTime) {
 								$(".surplusText").html("超时时间")
@@ -1279,7 +1315,7 @@
 								}
 
 							}
-							if($("#section").text == "质量管理部" || $("#section").text() == "复合肥质量管理科") {
+							if(qualdepts.indexOf(result.F_Deptid) > -1) {
 								$("#depment").show();
 							} else {
 								$("#depment").hide();
@@ -1287,22 +1323,22 @@
 							//							F_Reasontimeout
 							//图片展示
 							if(data.FileUrl) {
-								var str = ''
-								$(data.FileUrl).each(function(i, n) {
-									var fileType1 = n.F_FileType.split("\/")[0];
-									if(n.F_FileType == '.jpg' || n.F_FileType == '.png' || fileType1 === 'image') {
+								// var str = ''
+								// $(data.FileUrl).each(function(i, n) {
+								// 	var fileType1 = n.F_FileType.split("\/")[0];
+								// 	if(n.F_FileType == '.jpg' || n.F_FileType == '.png' || fileType1 === 'image') {
 										
-										str += '<div class="img-box"><img src="' + n.F_FileUrl +'" alt="" class="image-item" data-preview-src="" data-preview-group="1" /></div>'
-										// $('<div class="img-box"><img src="' + n.F_FileUrl +
-										// 	'" alt="" class="image-item" data-preview-src="" data-preview-group="1" /><div>'
-										// ).appendTo("#image-list");
-										// $(".image-list").show();
-									}else if(fileType1 == 'video'){
-										str += '<video controls><source src="' + n.F_FileUrl +'" type="video/mp4"></source></video>'
-									}
-									$('#image-list').html(str)
-									$(".image-list").show();
-								})
+								// 		str += '<div class="img-box"><img src="' + n.F_FileUrl +'" alt="" class="image-item" data-preview-src="" data-preview-group="1" /></div>'
+								// 		// $('<div class="img-box"><img src="' + n.F_FileUrl +
+								// 		// 	'" alt="" class="image-item" data-preview-src="" data-preview-group="1" /><div>'
+								// 		// ).appendTo("#image-list");
+								// 		// $(".image-list").show();
+								// 	}else if(fileType1 == 'video'){
+								// 		str += '<video controls><source src="' + n.F_FileUrl +'" type="video/mp4"></source></video>'
+								// 	}
+								// 	$('#image-list').html(str)
+								// 	$(".image-list").show();
+								// })
 							}
 							//	判断数据为空隐藏li
 							if($("#Work_gohao").text() == '') { //抽检时间

newWX/newWX/client-side/dispose.html

@@ -11,13 +11,13 @@
 		<link href="../css/mui.picker.css" rel="stylesheet" />
 		<link href="../css/mui.poppicker.css" rel="stylesheet" />
 		<link href="../css/feedback-page.css" rel="stylesheet" />
-		<link href="../css/iconfont.css"  rel="stylesheet"/>
-		<link href="css/AddWorkolder.css"  rel="stylesheet"/>
+		<link href="../css/iconfont.css" rel="stylesheet" />
+		<link href="css/AddWorkolder.css" rel="stylesheet" />
 		<style>
-		   .mui-content{
-		   	height:100%;
-		   	padding-bottom: 55px;
-		   }
+			.mui-content {
+				height: 100%;
+				padding-bottom: 55px;
+			}
 		</style>
 	</head>
 	<body>
@@ -46,208 +46,128 @@
 				<li class="mui-table-view-cell mui-table-view-li">
 					<div class="mui-input-row">
 						<label class="label font-color5">注解内容：</label>
-						<div id="F_Annotation" class="mui-radio mui-right radio_box" style="width: 70%; line-height: 40px;">
-							
+						<div id="F_Annotation" class="mui-radio mui-right radio_box"
+							style="width: 70%; line-height: 40px;">
+
 						</div>
 					</div>
 				</li>
 				<li class="mui-table-view-cell">
 					<div class="mui-input-row">
 						<label class="label"><span style="color: #FF0000">*</span>处理结果：</label>
-						<input type="text" id='result' class="ui-alert type_con size-14" placeholder="请输入处理结果"/>
+						<input type="text" id='result' class="ui-alert type_con size-14" placeholder="请输入处理结果" />
 					</div>
 				</li>
 				<li class="mui-table-view-cell">
 					<div class="mui-input-row">
 						<label class="label"><span style="color: #FF0000">*</span>问题原因：</label>
-						<input type="text" id='answer' class="ui-alert type_con size-14" placeholder="请输入问题原因"/>
+						<input type="text" id='answer' class="ui-alert type_con size-14" placeholder="请输入问题原因" />
 					</div>
 				</li>
 				<li class="mui-table-view-cell">
 					<div class="mui-input-row">
 						<label class="label"><span style="color: #FF0000">*</span>责任单位：</label>
-						<input type="text" id='dutyDepart' class="ui-alert type_con size-14" placeholder="请输入责任单位"/>
+						<input type="text" id='dutyDepart' class="ui-alert type_con size-14" placeholder="请输入责任单位" />
 					</div>
 				</li>
 				<li class="mui-table-view-cell">
 					<div class="mui-input-row">
 						<label class="label"><span style="color: #FF0000">*</span>整改计划：</label>
-						<input type="text" id='editPlan' class="ui-alert type_con size-14" placeholder="请输入整改计划"/>
+						<input type="text" id='editPlan' class="ui-alert type_con size-14" placeholder="请输入整改计划" />
 					</div>
 				</li>
 				<li class="mui-table-view-cell">
 					<div class="mui-input-row tit">
-						<label class="label">是否处理工单：</label>
-						<div class="mui-input-row mui-radio mui-left radio_box order_type">
+						<label class="label">是否回访：</label>
+						<div class="mui-input-row mui-radio mui-left radio_box order_pay">
 							<label>否</label>
-							<input type="radio" type="radio" name="form"  value="0" class="size-14" />
+							<input type="radio" type="radio" name="form" value="0" class="size-14" />
 						</div>
-						<div class="mui-input-row mui-radio mui-left radio_box order_type">
+						<div class="mui-input-row mui-radio mui-left radio_box order_pay">
 							<label>是</label>
 							<input type="radio" type="radio" name="form" value="1" checked="checked" class="size-14" />
 						</div>
 					</div>
 				</li>
-				<li class="mui-table-view-cell receive" id="showCityPicker5" style="display: none;">
-					<div class="mui-input-row">
-						<label class="label">未处理原因：</label>
-						<input type="text" id='ower_recive' class="ui-alert type_con size-14" data-index="" readonly="readonly" />
-						<a href=""><span class="type_down mui-icon mui-icon mui-icon-arrowdown mui-pull-right"></span></a>
-					</div>
-				</li>
 			</ul>
-			<!--投诉类市场管理科-->	
-		    <ul class="mui-table-view" style="display: none;" id="aaaa">
-		    	<li class="mui-table-view-cell receive" id="production">
+			<!--投诉类市场管理科-->
+			<ul class="mui-table-view" style="display: none;" id="aaaa">
+				<li class="mui-table-view-cell receive" id="production">
 					<div class="mui-input-row">
 						<label class="label">生产基地：</label>
-						<input type="text" id='ower_production' class="ui-alert type_con size-14" data-index="" readonly="readonly" />
-						<a href=""><span class="type_down mui-icon mui-icon mui-icon-arrowdown mui-pull-right"></span></a>
-					</div>
-				</li>
-		    </ul>
-			<!--投诉类质量管理部-->	 
-	        <ul class="mui-table-view" style="display: none;" id="bbbb">
-		    	<li class="mui-table-view-cell">
-					<div class="mui-input-row tit">
-						<label class="label">是否回访：</label>
-						<div class="mui-input-row mui-radio mui-left radio_box order_pay">
-							<label>否</label>
-							<input type="radio" type="radio" name="pay" checked="checked" value="0" class="size-14" />
-						</div>
-						<div class="mui-input-row mui-radio mui-left radio_box order_pay">
-							<label>是</label>
-							<input type="radio" type="radio" name="pay" value="1" class="size-14" />
-						</div>
+						<input type="text" id='ower_production' class="ui-alert type_con size-14" data-index=""
+							readonly="readonly" />
+						<a href=""><span
+								class="type_down mui-icon mui-icon mui-icon-arrowdown mui-pull-right"></span></a>
 					</div>
 				</li>
-				<!--<li class="mui-table-view-cell" id="eventle">
+			</ul>
+			<!-- 市场管理科和质量管理科总有的字段 -->
+			<ul class="mui-table-view" style="display: none;" id="ffff">
+				<li class="mui-table-view-cell" id="eventle">
 					<div class="mui-input-row">
 						<label class="label">事件等级：</label>
-						<input type="text" id='ower_event' class="ui-alert type_con size-14" data-index="" readonly="readonly" placeholder="请选择"/>
+						<input type="text" id='ower_event' class="ui-alert type_con size-14" data-index=""
+							readonly="readonly" placeholder="请选择" />
 						<a href=""><span class="type_down mui-icon mui-icon-arrowdown mui-pull-right"></span></a>
 					</div>
-				</li>-->
-				<li class="mui-table-view-cell make">
-					<div class="mui-input-row">
-						<label class="label">实收数量：</label>
-						<input type="number" id="order_amount" placeholder="请输入实收数量(吨)" class="size-14">
-					</div>
 				</li>
 				<li class="mui-table-view-cell">
 					<div class="mui-input-row">
-						<label class="label">索赔金额：</label>
-						<input type="number" id="order_money" placeholder="请输入索赔金额" class="size-14">
+						<label class="label">工艺：</label>
+						<input type="text" id="gyi" placeholder="请输入工艺" class="size-14">
 					</div>
 				</li>
-				<!--<li class="mui-table-view-cell">
-					<div class="mui-input-row tit">
-						<label class="label">责任单位：</label>
-
-						<div class="mui-input-row mui-radio mui-left radio_box order_unit">
-							<input type="checkbox" type="radio" name="unit" value="生产" class="size-14" />生产
-							<input type="checkbox" type="radio" name="unit" value="研发" class="size-14" />研发
-							<input type="checkbox" type="radio" name="unit" value="农化" class="size-14" />农化
-							<input type="checkbox" type="radio" name="unit" value="物流" class="size-14" />物流
-							<input type="checkbox" type="radio" name="unit" value="质量管理科" class="size-14" />质量管理科
-							<input type="checkbox" type="radio" name="unit" value="销售内勤" class="size-14" />销售内勤
-						</div>
-						<input type="hidden" id="zerenSel" />
-					</div>
-				</li>-->
 				<li class="mui-table-view-cell">
-					<div class="mui-input-row tit">
-						<label class="label">审批意见：</label>
-						<div class="mui-input-row mui-radio mui-left radio_box order_opinion">
-							<label>同意</label>
-							<input type="radio" type="radio" name="opinion" checked="checked" value="同意" class="size-14" />
-						</div>
-						<div class="mui-input-row mui-radio mui-left radio_box order_opinion">
-							<label>不同意</label>
-							<input type="radio" type="radio" name="opinion" value="不同意" class="size-14" />
-						</div>
-					</div>
-				</li>
-				<li class="mui-table-view-cell F_Address" style="display: none;">
 					<div class="mui-input-row">
-						<label class="label">不同意意见：</label>
-						<input type="text" id="order_idea" placeholder="请输入不同意意见" class="size-14">
+						<label class="label">原料及厂家：</label>
+						<input type="text" id="ylcj" placeholder="请输入原料及厂家" class="size-14">
 					</div>
 				</li>
 				<li class="mui-table-view-cell">
-					<div class="mui-input-row tit">
-						<label class="label">补偿方式：</label>
-						<div class="mui-input-row mui-radio mui-left radio_box order_coin">
-							<label>实物</label>
-							<input type="radio" name="coin" checked="checked" value="实物" class="size-14" />
-						</div>
-						<div class="mui-input-row mui-radio mui-left radio_box order_coin">
-							<label>钱款</label>
-							<input type="radio" name="coin" value="钱款" class="size-14" />
-						</div>
-					</div>
-				</li>
-				<li class="mui-table-view-cell make" style="display: none;">
 					<div class="mui-input-row">
-						<label class="label">补偿钱款：</label>
-						<input type="text" id="order_make" placeholder="请输入索赔金额" class="size-14">
+						<label class="label">该批次生产数量：</label>
+						<input type="text" id="scsl" placeholder="请输入该批次生产数量" class="size-14">
 					</div>
 				</li>
-				<!--<li class="mui-table-view-cell" id="ponding">
-					<div class="mui-input-row">
-						<label class="label">责任比例：</label>
-						<input type="number" id='ower_ponding ' class="ui-alert type_con size-14" data-index=""  placeholder="请输入比例默认%"/>
-					</div>
-				</li>
-				<li class="mui-table-view-cell make">
-					<div class="mui-input-row">
-						<label class="label">实收数量：</label>
-						<input type="number" id="order_amount" placeholder="请输入实收数量(吨)" class="size-14">
-					</div>
-				</li>
-				<li class="mui-table-view-cell make">
-					<div class="mui-input-row">
-						<label class="label">改进要求：</label>
-						<input type="number" id="order_demand" placeholder="请输入改进要求" class="size-14">
-					</div>
-				</li>-->
-				<li class="mui-table-view-cell make">
+
+			</ul>
+			<!-- 咨询类市场管理科 -->
+			<!-- <ul class="mui-table-view" style="display: none;" id="bbbb">
+				<li class="mui-table-view-cell receive" id="production">
 					<div class="mui-input-row">
-						<label class="label">审批流单号：</label>
-						<input type="number" id="order_odd" placeholder="请输入审批流单号" class="size-14">
+						<label class="label">初审意见：</label>
+						<input type="text" id='ower_production' class="ui-alert type_con size-14" data-index="" readonly="readonly" />
+						<a href=""><span class="type_down mui-icon mui-icon mui-icon-arrowdown mui-pull-right"></span></a>
 					</div>
 				</li>
-		    </ul>
-			<!--抽检类市场管理科-->	
-			<ul class="mui-table-view" style="display: none;"  id="cccc">
+			</ul> -->
+
+			<!--抽检类市场管理科-->
+			<ul class="mui-table-view" style="display: none;" id="cccc">
 				<li class="mui-table-view-cell">
-					<div class="mui-input-row">
-						<label class="label">超出质保期限：</label>
-						<input type="number" id="order_spection" placeholder="请输入自检结果" class="size-14">
-					</div>
-				</li>
-			</ul>
-			<!--抽检类质量管理部-->
-	        <ul class="mui-table-view" style="display: none;"  id="dddd">
-	        	<li class="mui-table-view-cell">
 					<div class="mui-input-row tit">
-						<label class="label">是否回访：</label>
-						<div class="mui-input-row mui-radio mui-left radio_box order_return">
-							<label>否</label>
-							<input type="radio" type="radio" name="return" checked="checked" value="0" class="size-14" />
+						<label class="label">抽检是否合格：</label>
+						<div class="mui-input-row mui-radio mui-left radio_box order_qualified">
+							<label>合格</label>
+							<input type="radio" type="radio" name="reco" checked="checked" value="0" class="size-14" />
 						</div>
-						<div class="mui-input-row mui-radio mui-left radio_box order_return">
-							<label>是</label>
-							<input type="radio" type="radio" name="return" value="1" class="size-14" />
+						<div class="mui-input-row mui-radio mui-left radio_box order_qualified">
+							<label>不合格</label>
+							<input type="radio" type="radio" name="reco" value="1" class="size-14" />
 						</div>
 					</div>
 				</li>
+			</ul>
+			<!--抽检类质量管理部-->
+			<ul class="mui-table-view" style="display: none;" id="dddd">
 				<li class="mui-table-view-cell">
 					<div class="mui-input-row tit">
 						<label class="label">是否备案：</label>
 						<div class="mui-input-row mui-radio mui-left radio_box order_records">
 							<label>未备案</label>
-							<input type="radio" type="radio" name="reco" checked="checked" value="未备案" class="size-14" />
+							<input type="radio" type="radio" name="reco" checked="checked" value="未备案"
+								class="size-14" />
 						</div>
 						<div class="mui-input-row mui-radio mui-left radio_box order_records">
 							<label>已备案</label>
@@ -255,47 +175,41 @@
 						</div>
 					</div>
 				</li>
-				
-	        </ul>
+
+			</ul>
 			<!--销售内勤-->
-	        <ul class="mui-table-view" style="display: none;"  id="eeee">
-	        	<li class="mui-table-view-cell">
+			<ul class="mui-table-view" style="display: none;" id="eeee">
+				<li class="mui-table-view-cell">
 					<div class="mui-input-row">
 						<label class="label">返账金额：</label>
 						<input type="number" id="order_account" placeholder="请输入返账金额(元)" class="size-14">
 					</div>
 				</li>
-	        </ul>
-    		<!--质量管理科-->
-           	<ul class="mui-table-view" style="display: none;"  id="ffff">
-	        	<li class="mui-table-view-cell">
-					<div class="mui-input-row">
-						<label class="label">实收数量：</label>
-						<input type="number" id="order_receipts" placeholder="请输入实收数量(吨)" class="size-14">
-					</div>
-				</li>
-	        </ul>
+			</ul>
 			<div class="feedback">
-	            <div class="image-list" style="background-color: #fff;">
-	            	<input class="input" type="file" name="upFile" id="upFileHandle" multiple="multiple"
-	            		style="display: none;">
-	            	<div class="showFile">
-	            		<div id='scwjHandle' class="row image-item"></div>
-	            		<div class="fileBoxHandle" style="margin-left: 5px;float: left;width: 78%;">
-	            	
-	            		</div>
-	            	</div>
-	            	<input type="hidden" id="fileHandle" />
-	            	<ul id="fileList" class="file_imgs clearfix ">
-	            	</ul>
-	            </div>
-	        </div>
-	        <p class="action">
-	            <i class="iconfont icon-gantanhao" style="margin-right: 5px;font-size: 20px;vertical-align: middle;"></i>
-	            <span style="color: #f81737;">如事件内容地址填写不详细，将影响到你事件办理，请填写详细</span>
-	        </p>
+				<p>上传附件</p>
+				<div class="image-list" style="background-color: #fff;">
+					<input class="input" type="file" name="upFile" id="upFileHandle" multiple="multiple"
+						style="display: none;">
+					<div class="showFile">
+						<div id='scwjHandle' class="row image-item"></div>
+						<div class="fileBoxHandle" style="margin-left: 5px;float: left;width: 78%;">
+
+						</div>
+					</div>
+					<input type="hidden" id="fileHandle" />
+					<ul id="fileList" class="file_imgs clearfix ">
+					</ul>
+				</div>
+			</div>
+			<p class="action">
+				<i class="iconfont icon-gantanhao"
+					style="margin-right: 5px;font-size: 20px;vertical-align: middle;"></i>
+				<span style="color: #f81737;">如事件内容地址填写不详细，将影响到你事件办理，请填写详细</span>
+			</p>
 			<div class="submit-btn">
-				<button type="button" data-loading-text="提交中" class="mui-btn mui-btn-primary mui-btn-block block_button submit" id="submit">提交</button>
+				<button type="button" data-loading-text="提交中"
+					class="mui-btn mui-btn-primary mui-btn-block block_button submit" id="submit">提交</button>
 			</div>
 		</div>
 		<script src="../js/mui.js"></script>
@@ -305,8 +219,8 @@
 		<script src="../js/jquery.min.js"></script>
 		<script src="../Script/Common/huayi.config.js"></script>
 		<script src="../Script/Common/huayi.http.js"></script>
-		<script src="../js/feedback-page.js"></script>
+		<!-- <script src="../js/feedback-page.js"></script> -->
 		<script src="js/dispose.js"></script>
 	</body>
 
-</html>
+</html>

newWX/newWX/client-side/gcyi_list.html

@@ -287,10 +287,16 @@
 										'</span><span>' +'</span><span id="" style="margin-left:25px;">' +
 										'</span></div><div class="fr"><span>' + n.F_CreateOn +'</span></div></div>' +
 										'<div class="mui-card-content"><div class="mui-card-content-inner"><p class="font-color2 details_line" style="padding:13px 0">' +n.F_Description 
-										if(flag == 1){
+										if(n.inout == 1 || n.inout == 0 || n.inout == 3){
 											str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName 
-										}else{
+										}else if(n.inout == 2){
 											str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName2 
+										}else if(n.inout == 9){
+											if(flag == 1){
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName 
+											}else if(flag == 2){
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName2
+											}
 										}
 										
 										str +='</span><span id="">' + n.F_WorkOrderCode + receiver +'</div></div></div></a>'
@@ -367,10 +373,16 @@
 										'</span><span>' +'</span><span id="" style="margin-left:25px;">' +
 										'</span></div><div class="fr"><span>' + n.F_CreateOn +'</span></div></div>' +
 										'<div class="mui-card-content"><div class="mui-card-content-inner"><p class="font-color2 details_line" style="padding:13px 0">' +n.F_Description 
-										if(flag == 1){
+										if(n.inout == 1 || n.inout == 0 || n.inout == 3){
 											str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName 
-										}else{
+										}else if(n.inout == 2){
 											str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName2 
+										}else if(n.inout == 9){
+											if(flag == 1){
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName 
+											}else if(flag == 2){
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName2
+											}
 										}
 										
 										str +='</span><span id="">' + n.F_WorkOrderCode + receiver +'</div></div></div></a>'

newWX/newWX/client-side/haveorder_list.html

@@ -283,17 +283,23 @@
 //									if(data.rows){
 //										
 //									}
-									console.log(n.Customer);
+									console.log(n.inout);
 									//									|<button class="mui-btn-primary">重要' +	'</button>  重要程度
 									let str ='<a class="mui-card mui-card-detail order"  data-index="' + n.F_ID +
 										'"><div class="mui-card-header"><div class="fl"><span>' + n.F_TypeName +
 										'</span><span>' +'</span><span id="" style="margin-left:25px;">' +
 										'</span></div><div class="fr"><span>' + n.F_CreateOn +'</span></div></div>' +
 										'<div class="mui-card-content"><div class="mui-card-content-inner"><p class="font-color2 details_line" style="padding:13px 0">' +n.F_Description 
-										if(flag == 1){
+										if(n.inout == 1 || n.inout == 0 || n.inout == 3){
 											str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName 
-										}else{
+										}else if(n.inout == 2){
 											str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName2 
+										}else if(n.inout == 9){
+											if(flag == 1){
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName 
+											}else if(flag == 2){
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName2
+											} 
 										}
 										
 										str +='</span><span id="">' + n.F_WorkOrderCode + receiver +'</div></div></div></a>'
@@ -363,17 +369,23 @@
 									} else{
 										proName=n.proname
 									}
-									console.log(n.Customer);
+									// console.log(n.Customer);
 									//|<button class="mui-btn-primary">重要' +	'</button>  重要程度
 									let str ='<a class="mui-card mui-card-detail order"  data-index="' + n.F_ID +
 										'"><div class="mui-card-header"><div class="fl"><span>' + n.F_TypeName +
 										'</span><span>' +'</span><span id="" style="margin-left:25px;">' +
 										'</span></div><div class="fr"><span>' + n.F_CreateOn +'</span></div></div>' +
 										'<div class="mui-card-content"><div class="mui-card-content-inner"><p class="font-color2 details_line" style="padding:13px 0">' +n.F_Description 
-										if(flag == 1){
+										if(n.inout == 1 || n.inout == 0 || n.inout == 3){
 											str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName 
-										}else{
+										}else if(n.inout == 2){
 											str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName2 
+										}else if(n.inout == 9){
+											if(flag == 1){
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName 
+											}else if(flag == 2){
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName2
+											}
 										}
 										
 										str +='</span><span id="">' + n.F_WorkOrderCode + receiver +'</div></div></div></a>'

newWX/newWX/client-side/high_list.html

@@ -284,10 +284,16 @@
 										'</span><span>' +'</span><span id="" style="margin-left:25px;">' +
 										'</span></div><div class="fr"><span>' + n.F_CreateOn +'</span></div></div>' +
 										'<div class="mui-card-content"><div class="mui-card-content-inner"><p class="font-color2 details_line" style="padding:13px 0">' +n.F_Description 
-										if(flag == 1){
+										if(n.inout == 1 || n.inout == 0 || n.inout == 3){
 											str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName 
-										}else{
+										}else if(n.inout == 2){
 											str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName2 
+										}else if(n.inout == 9){
+											if(flag == 1){
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName 
+											}else if(flag == 2){
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName2
+											}
 										}
 										
 										str +='</span><span id="">' + n.F_WorkOrderCode + receiver +'</div></div></div></a>'
@@ -364,10 +370,16 @@
 										'</span><span>' +'</span><span id="" style="margin-left:25px;">' +
 										'</span></div><div class="fr"><span>' + n.F_CreateOn +'</span></div></div>' +
 										'<div class="mui-card-content"><div class="mui-card-content-inner"><p class="font-color2 details_line" style="padding:13px 0">' +n.F_Description 
-										if(flag == 1){
+										if(n.inout == 1 || n.inout == 0 || n.inout == 3){
 											str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName 
-										}else{
+										}else if(n.inout == 2){
 											str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName2 
+										}else if(n.inout == 9){
+											if(flag == 1){
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName 
+											}else if(flag == 2){
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName2
+											} 
 										}
 										
 										str +='</span><span id="">' + n.F_WorkOrderCode + receiver +'</div></div></div></a>'

newWX/newWX/client-side/js/dispose.js

@@ -5,7 +5,7 @@ var itype = helper.request.queryString("itype");
 var areaID = helper.request.queryString("areaID");
 var openid = helper.cookies.get("openid");
 var qualdepts = [12,36,295,245]
-var markdepts = [37,57,74,88,268,422,339]
+var markdepts = [37,57,74,88,268,422,339,213]
 //var openid = "oXF5e1mWpX5DajW5_yjNLPKb8ThE";
 $(function() {
 
@@ -13,12 +13,12 @@ $(function() {
 	$('.return').on('tap', function() {
 		window.location.href = "details.html?id=" + id + '&itype=' + itype;
 	});
-	$(".order_unit").on("click", function() {
-		var ichk = $("input:checkbox:checked").map(function() {
-			return $(this).val();
-		}).get().join(",");
-		$("#zerenSel").val(ichk);
-	})
+	// $(".order_unit").on("click", function() {
+	// 	var ichk = $("input:checkbox:checked").map(function() {
+	// 		return $(this).val();
+	// 	}).get().join(",");
+	// 	$("#zerenSel").val(ichk);
+	// })
 	Ajax() //获取详情
 	//提交按钮
 	$('#submit').on('tap', function() {
@@ -51,31 +51,36 @@ $(function() {
 					orderid: id, //否	strubg	工单编号
 					OpenId: openid, //微信openid,
 					isend: 0, //否	int	你看一下前端是什么参数
+					isover: 1, //是否处理工单
 					cont: $("#result").val(), //处理结果
 					EventReason:$("#answer").val(), // 问题原因
 					ResponsibleUnit:$("#dutyDepart").val(), // 责任单位
 					ImprovementRequirements:$("#editPlan").val(), //整改计划
-					isover: $('.order_type').find('input[type="radio"]:checked').val(), //是否处理工单
-					uncont: $('#ower_recive').attr('data-index'), //未处理原因
+					TS_Level: $('#ower_event').attr('data-index'),  //事件等级
+					WorkmanShip: $("#gyi").val(), //工艺
+					Manufacturers: $("#ylcj").val(), //原料及厂家
+					ProductionNum: $("#scsl").val(), //该批次生产数量
+					F_CJ_IsQualified :$(".order_qualified").find('input[type="radio"]:checked').val(), //抽检是否合格
+					
+					// uncont: $('#ower_recive').attr('data-index'), //未处理原因
 
 					//投诉类市场管理科 
 					ProductBase: $('#ower_production').attr('data-index'), //生产基地
 					//投诉类市场管理科   
 					isvisit: $('.order_pay').find('input[type="radio"]:checked').val(), //是否回访
-					QualityEventLevel: $('#ower_event').attr('data-index'), //事件等级
-					ClaimAmount: $('#order_money').val(), //索赔金额
+					// QualityEventLevel: $('#ower_event').attr('data-index'), //事件等级
 //					ResponsibleUnit: $("#zerenSel").val(), //责任单位
-					ApprovalOpinions: $('.order_opinion').find('input[type="radio"]:checked').val(), //审批意见
-					ApprovalDisagree: $("#order_idea").val(), //不同意意见
-					CompensationMethod: $('.order_coin').find('input[type="radio"]:checked').val(), //补偿方式
-					CompensationMoney: $("#order_make").val(), //补偿钱款
-					CResponsibleUnits: $('#ower_ponding').attr('data-index'), //对应责任单位
-					Fquantity: $("#order_amount").val(), //实收数量
+					// ApprovalOpinions: $('.order_opinion').find('input[type="radio"]:checked').val(), //审批意见
+					// ApprovalDisagree: $("#order_idea").val(), //不同意意见
+					// CompensationMethod: $('.order_coin').find('input[type="radio"]:checked').val(), //补偿方式
+					// CompensationMoney: $("#order_make").val(), //补偿钱款
+					// CResponsibleUnits: $('#ower_ponding').attr('data-index'), //对应责任单位
+					// Fquantity: $("#order_amount").val(), //实收数量
 //					ImprovementRequirements: $("#order_demand").val(), //改进要求
-					CApprovalNo: $("#order_odd").val(), //审批工作流单号
+					// CApprovalNo: $("#order_odd").val(), //审批工作流单号
 					//			抽检类市场管理科
 					//			抽检类质量管理部		
-					isvisit: $('.order_return').find('input[type="radio"]:checked').val(), //是否否回访
+					// isvisit: $('.order_return').find('input[type="radio"]:checked').val(), //是否否回访
 					IsRecord: $('.order_records').find('input[type="radio"]:checked').val(), //是否备案
 					//			销售内勤		
 					ReturnAccount: $("#order_account").val(), //确认返账金额
@@ -89,11 +94,11 @@ $(function() {
 					if (data.state == "success") {
 						mui.toast('成功');
 
-						if (itype == 2) {
-							window.location.href = "haveorder_list.html";
-						} else {
-							window.location.href = "haveorder_list.html";
-						}
+						// if (itype == 2) {
+						// 	window.location.href = "haveorder_list.html";
+						// } else {
+						// 	window.location.href = "haveorder_list.html";
+						// }
 
 					} else {
 						mui.toast(data.message);
@@ -168,28 +173,35 @@ $(function() {
 					$("#section").text(result.F_DeptName); //部门
 					if ($("#Work_classname").text() == "抽检") {
 						if (markdepts.indexOf(result.F_Deptid) > -1) {
-							$("#cccc").show();
-							$("#aaaa").show();
+							$("#ffff").show(); 
+							$("#cccc").show(); //超出质保期限
+							$("#aaaa").show(); //生产基地
 						} else if (qualdepts.indexOf(result.F_Deptid) > -1) {
-							$("#dddd").show();
+							$("#ffff").show(); 
+							$("#dddd").show(); //是否备案
 						}
 					} else if ($("#Work_classname").text() == "投诉" || $("#Work_classname").text() == "业务协办") {
 						if (markdepts.indexOf(result.F_Deptid) > -1) {
-							$("#aaaa").show();
-						} else if (qualdepts.indexOf(result.F_Deptid) > -1) {
-							$("#bbbb").show();
+							$("#ffff").show(); 
+							$("#aaaa").show(); //生产基地
+						}else if(qualdepts.indexOf(result.F_Deptid) > -1) {
+							$("#ffff").show(); 
 						}
 					} else if ($("#Work_classname").text() == "咨询") {
 						if (markdepts.indexOf(result.F_Deptid) > -1) {
-							$("#aaaa").show();
-						}else if (qualdepts.indexOf(result.F_Deptid) > -1) {
-							$("#bbbbb").show();
+							$("#aaaa").show(); //生产基地
+						}else if(qualdepts.indexOf(result.F_Deptid) > -1){
+							$("#ffff").show();
+						}
+					}else{
+						if(markdepts.indexOf(result.F_Deptid) > -1 || qualdepts.indexOf(result.F_Deptid) > -1) {
+							$("#ffff").show(); 
 						}
 					}
 
 					if ($("#Work_classname").text() == "销售内勤") {
 						if (qualdepts.indexOf(result.F_Deptid) > -1) {
-							$("#eeee").show();
+							$("#eeee").show(); //返账金额
 						}
 					}
 
@@ -402,18 +414,18 @@ $(function() {
 		$.init();
 		$.ready(function() {
 			//未处理原因
-			var cityc = new $.PopPicker();
-			cityc.setData(monad);
-			var showCityPickerButton1 = doc.getElementById('showCityPicker5');
-			var cityResultc1 = doc.getElementById('ower_recive');
-			showCityPickerButton1.addEventListener('tap', function(event) {
-				cityc.show(function(items) {
-					cityResultc1.value = items[0].text;
-					cityResultc1.setAttribute("data-index", items[0].value);
-					//返回 false 可以阻止选择框的关闭
-					//return false;
-				});
-			}, false);
+			// var cityc = new $.PopPicker();
+			// cityc.setData(monad);
+			// var showCityPickerButton1 = doc.getElementById('showCityPicker5');
+			// var cityResultc1 = doc.getElementById('ower_recive');
+			// showCityPickerButton1.addEventListener('tap', function(event) {
+			// 	cityc.show(function(items) {
+			// 		cityResultc1.value = items[0].text;
+			// 		cityResultc1.setAttribute("data-index", items[0].value);
+			// 		//返回 false 可以阻止选择框的关闭
+			// 		//return false;
+			// 	});
+			// }, false);
 			//生产基地
 			var matrix = new $.PopPicker();
 			matrix.setData(base);
@@ -428,18 +440,18 @@ $(function() {
 				});
 			}, false);
 			//事件等级
-//			var affair = new $.PopPicker();
-//			affair.setData(grade);
-//			var showCityPickerButton4 = doc.getElementById('eventle');
-//			var cityResultc4 = doc.getElementById('ower_event');
-//			showCityPickerButton4.addEventListener('tap', function(event) {
-//				affair.show(function(items) {
-//					cityResultc4.value = items[0].text;
-//					cityResultc4.setAttribute("data-index", items[0].value);
-//					//返回 false 可以阻止选择框的关闭
-//					//return false;
-//				});
-//			}, false);
+			var affair = new $.PopPicker();
+			affair.setData(grade);
+			var showCityPickerButton4 = doc.getElementById('eventle');
+			var cityResultc4 = doc.getElementById('ower_event');
+			showCityPickerButton4.addEventListener('tap', function(event) {
+				affair.show(function(items) {
+					cityResultc4.value = items[0].text;
+					cityResultc4.setAttribute("data-index", items[0].value);
+					//返回 false 可以阻止选择框的关闭
+					//return false;
+				});
+			}, false);
 		})
 
 	})(mui, document);
@@ -448,24 +460,24 @@ $(function() {
 
 
 
-$('.order_type').find('input[type="radio"]').on('change', function() {
-	if ($(this).val() == "0") { //业务办理
-		$('#showCityPicker5').show();
-	} else {
-		$('#showCityPicker5').hide();
-	}
-});
-$('.order_coin').find('input[type="radio"]').on('change', function() {
-	if ($(this).val() == "钱款") { //业务办理
-		$('.make').show();
-	} else {
-		$('.make').hide();
-	}
-});
-$('.order_opinion').find('input[type="radio"]').on('change', function() {
-	if ($(this).val() == "不同意") { //业务办理
-		$('.F_Address').show();
-	} else {
-		$('.F_Address').hide();
-	}
-});
+// $('.order_type').find('input[type="radio"]').on('change', function() {
+// 	if ($(this).val() == "0") { //业务办理
+// 		$('#showCityPicker5').show();
+// 	} else {
+// 		$('#showCityPicker5').hide();
+// 	}
+// });
+// $('.order_coin').find('input[type="radio"]').on('change', function() {
+// 	if ($(this).val() == "钱款") { //业务办理
+// 		$('.make').show();
+// 	} else {
+// 		$('.make').hide();
+// 	}
+// });
+// $('.order_opinion').find('input[type="radio"]').on('change', function() {
+// 	if ($(this).val() == "不同意") { //业务办理
+// 		$('.F_Address').show();
+// 	} else {
+// 		$('.F_Address').hide();
+// 	}
+// });

newWX/newWX/client-side/js/redeploy.js

@@ -6,7 +6,7 @@ var areaID = helper.request.queryString("areaID");
 var openid = helper.cookies.get("openid");
 var  preserveData;
 var qualdepts = [12,36,295,245]
-var markdepts = [37,57,74,88,268,422,339]
+var markdepts = [37,57,74,88,268,422,339,213,213]
 var detailflag = 0;
 var flag;
 //var openid = "oXF5e1mWpX5DajW5_yjNLPKb8ThE";
@@ -108,13 +108,21 @@ $(function() {
 			mui.alert('请输入正确的姓名')
 			return
 		}
-		if(detailflag == 9) {
+		// 根据内外线，传flag
+		//内线部门和外线部门都传
+		if($("#ower_reciveW").attr('data-index')&&$('#recive_type').attr('data-index')){
 			flag = 3
+		// 外线传，内线不传
+		}else if($('#recive_type').attr('data-index') && !$("#ower_reciveW").attr('data-index')){
+			flag = 1
+		// 内线传，外线不传
+		}else if(!$('#recive_type').attr('data-index') && $("#ower_reciveW").attr('data-index')){
+			flag = 2
 		}
-		if ($('#recive_type').attr('data-index') == '') {
+		if (!$('#recive_type').attr('data-index') && !$('#ower_reciveW').attr('data-index')) {
 			mui.alert('请选择部门！') //请输入工单类型
 		} else if ($('#order_reception').val() == '') {
-			mui.alert('请输入转派理由！') //填写详细描述
+			mui.alert('请输入指派理由！') //填写详细描述
 		} else {
 			$.ajax({
 				type: "post",
@@ -141,7 +149,7 @@ $(function() {
 					//              投诉类市场管理科   
 					isvisit: $('.order_pay').find('input[type="radio"]:checked').val(), //是否回访
 					QualityEventLevel: $('#ower_event').attr('data-index'), //事件等级
-					ClaimAmount: $('#order_money').attr('data-index'), //索赔金额
+					ClaimAmount: $('#order_money').attr('data-index'), // 投诉类索赔金额
 					ResponsibleUnit: $("#zerenSel").val(), //责任单位
 					ApprovalOpinions: $('.order_opinion').find('input[type="radio"]:checked').val(), //审批意见
 					ApprovalDisagree: $("#order_idea").val(), //不同意意见
@@ -156,7 +164,7 @@ $(function() {
 					SpotResult: $('#ower_result').attr('data-index'), //抽检结果
 					SelfResult: $("#order_spection").val(), //自检结果
 					ApprovalNo: $("#order_approve").val(), //对应审批工作流单号
-					ReturnAccount: $("#order_sum").val(), //确认返账金额
+					ReturnAccount: $("#order_sum").val(), //抽检类市场管理科 确认返账金额
 					//			抽检类质量管理部		
 					isvisit: $('.order_return').find('input[type="radio"]:checked').val(), //是否否回访
 					IsRecord: $('.order_records').find('input[type="radio"]:checked').val(), //是否备案
@@ -178,13 +186,13 @@ $(function() {
 				},
 				success: function(data) {
 					if (data.state == "success") {
-						mui.toast('成功');
+						mui.toast('工单指派成功');
 						$('.hhhj').remove()
-						if(itype == 2) {
-							window.location.href = "haveorder_list.html";
-						} else {
-							window.location.href = "haveorder_list.html";
-						}
+						// if(itype == 2) {
+						// 	window.location.href = "haveorder_list.html";
+						// } else {
+						// 	window.location.href = "haveorder_list.html";
+						// }
 
 					} else {
 						mui.toast(data.message);
@@ -320,7 +328,6 @@ $(function() {
 					}
 
 					if (markdepts.indexOf(result.F_Deptid) > -1 ) {
-						detailflag = result.F_Flag
 						$("#gcsp").show();
 						if(result.F_Flag == 9){
 							$('#showUserPickerWB').show()
@@ -354,6 +361,7 @@ $(function() {
 						$(".SamplTime").remove();
 						if (markdepts.indexOf(result.F_Deptid) > -1) {
 							$("#aaaa").show();
+							$('.order_money').show()
 						} else if ($("#section").text() == "计划调度科") {
 							$("#gggg").show();
 							$(".gggg").show();
@@ -377,14 +385,6 @@ $(function() {
 						if (qualdepts.indexOf(result.F_Deptid) > -1) {
 							$("#dddd").show();
 						}
-					} else if ($("#Work_classname").text() == "投诉" || $("#Work_classname").text() == "业务协办") {
-						if (qualdepts.indexOf(result.F_Deptid) > -1) {
-							$("#bbbb").show();
-						}
-					} else if ($("#Work_classname").text() == "咨询") {
-						if (qualdepts.indexOf(result.F_Deptid) > -1) {
-							$("#bbbbb").show();
-						}
 					}
 					if ($("#Work_classname").text() == "销售内勤") {
 						if (qualdepts.indexOf(result.F_Deptid) > -1) {
@@ -721,8 +721,11 @@ $(function() {
 			var RCResults3 = doc.getElementById('recive_type2');
 			RCs.addEventListener('tap', function(event) {
 				RCiPickers.show(function(items) {
-					console.log(items)
-					if (items[2].text) {
+					console.log(items[3].text)
+					if (items[3].text) {
+						RCResults.value = items[3].text
+						RCResults.setAttribute("data-index", items[3].id);
+					}else if (items[2].text) {
 						RCResults.value = items[2].text
 						RCResults.setAttribute("data-index", items[2].id);
 					} else if (items[1].text) {

newWX/newWX/client-side/pend_index.html

@@ -265,10 +265,16 @@
 										'</span><span>' +'</span><span id="" style="margin-left:25px;">' +
 										'</span></div><div class="fr"><span>' + n.F_CreateOn +'</span></div></div>' +
 										'<div class="mui-card-content"><div class="mui-card-content-inner"><p class="font-color2 details_line" style="padding:13px 0">' +n.F_Description 
-										if(flag == 1){
+										if(n.inout == 1 || n.inout == 0 || n.inout == 3){
 											str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName 
-										}else{
+										}else if(n.inout == 2){
 											str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName2 
+										}else if(n.inout == 9){
+											if(flag == 1){
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName 
+											}else if(flag == 2){
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName2
+											}
 										}
 										
 										str +='</span><span id="">' + n.F_WorkOrderCode + receiver +'</div></div></div></a>'
@@ -341,10 +347,16 @@
 										'</span><span>' +'</span><span id="" style="margin-left:25px;">' +
 										'</span></div><div class="fr"><span>' + n.F_CreateOn +'</span></div></div>' +
 										'<div class="mui-card-content"><div class="mui-card-content-inner"><p class="font-color2 details_line" style="padding:13px 0">' +n.F_Description 
-										if(flag == 1){
+										if(n.inout == 1 || n.inout == 0 || n.inout == 3){
 											str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName 
-										}else{
+										}else if(n.inout == 2){
 											str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName2 
+										}else if(n.inout == 9){
+											if(flag == 1){
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName 
+											}else if(flag == 2){
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName2
+											} 
 										}
 										
 										str +='</span><span id="">' + n.F_WorkOrderCode + receiver +'</div></div></div></a>'

newWX/newWX/client-side/processed_list.html

@@ -283,10 +283,16 @@
 										'</span><span>' +'</span><span id="" style="margin-left:25px;">' +
 										'</span></div><div class="fr"><span>' + n.F_CreateOn +'</span></div></div>' +
 										'<div class="mui-card-content"><div class="mui-card-content-inner"><p class="font-color2 details_line" style="padding:13px 0">' +n.F_Description 
-										if(flag == 1){
+										if(n.inout == 1 || n.inout == 0 || n.inout == 3){
 											str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName 
-										}else{
+										}else if(n.inout == 2){
 											str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName2 
+										}else if(n.inout == 9){
+											if(flag == 1){
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName 
+											}else if(flag == 2){
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName2
+											} 
 										}
 										
 										str +='</span><span id="">' + n.F_WorkOrderCode + receiver +'</div></div></div></a>'
@@ -363,10 +369,16 @@
 										'</span><span>' +'</span><span id="" style="margin-left:25px;">' +
 										'</span></div><div class="fr"><span>' + n.F_CreateOn +'</span></div></div>' +
 										'<div class="mui-card-content"><div class="mui-card-content-inner"><p class="font-color2 details_line" style="padding:13px 0">' +n.F_Description 
-										if(flag == 1){
+										if(n.inout == 1 || n.inout == 0 || n.inout == 3){
 											str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName 
-										}else{
+										}else if(n.inout == 2){
 											str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName2 
+										}else if(n.inout == 9){
+											if(flag == 1){
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName 
+											}else if(flag == 2){
+												str +='</p><div class="mui-card-content-inner-span"><span id="">' + n.F_StateName2
+											} 
 										}
 										
 										str +='</span><span id="">' + n.F_WorkOrderCode + receiver +'</div></div></div></a>'

newWX/newWX/client-side/redeploy.html

@@ -188,7 +188,7 @@
 					</div>
 				</li>
 			</ul>
-			<!--投诉类市场管理科-->	
+			<!--投诉类市场管理科-->
 		    <ul class="mui-table-view"  id="aaaa" style="display: none;">
 				<li class="mui-table-view-cell" id="showCityPicker3">
 					<div class="mui-input-row">
@@ -197,9 +197,15 @@
 						<a href=""><span class="type_down mui-icon mui-icon-arrowdown mui-pull-right"></span></a>
 					</div>
 				</li>
+				<li class="mui-table-view-cell" style="display: none;" class="order_money">
+					<div class="mui-input-row">
+						<label class="label">索赔金额：</label>
+						<input type="number" id="order_money" placeholder="请输入索赔金额" class="size-14">
+					</div>
+				</li>
 		    </ul>
 			<!--投诉类质量管理部-->	 
-	        <ul class="mui-table-view"   id="bbbb" style="display: none;">
+	        <!-- <ul class="mui-table-view"   id="bbbb" style="display: none;">
 		    	<li class="mui-table-view-cell">
 					<div class="mui-input-row tit">
 						<label class="label">是否回访：</label>
@@ -213,13 +219,13 @@
 						</div>
 					</div>
 				</li>
-				<!--<li class="mui-table-view-cell" id="eventle">
+				<li class="mui-table-view-cell" id="eventle">
 					<div class="mui-input-row">
 						<label class="label">事件等级：</label>
 						<input type="text" id='ower_event' class="ui-alert type_con size-14" data-index="" readonly="readonly" placeholder="请选择"/>
 						<a href=""><span class="type_down mui-icon mui-icon-arrowdown mui-pull-right"></span></a>
 					</div>
-				</li>-->
+				</li>
 				<li class="mui-table-view-cell make">
 					<div class="mui-input-row">
 						<label class="label">实收数量：</label>
@@ -271,14 +277,14 @@
 					</div>
 				</li>
 				
-				<!--<li class="mui-table-view-cell" id="ponding ">
+				<li class="mui-table-view-cell" id="ponding ">
 					<div class="mui-input-row">
 						<label class="label">对应责任单位：</label>
 						<input type="text" id='ower_ponding ' class="ui-alert type_con size-14" data-index="" readonly="readonly" placeholder="请选择"/>
 						<a href=""><span class="type_down mui-icon mui-icon-arrowdown mui-pull-right"></span></a>
 					</div>
-				</li>-->
-				<!--<li class="mui-table-view-cell make">
+				</li>
+				<li class="mui-table-view-cell make">
 					<div class="mui-input-row">
 						<label class="label">实收数量：</label>
 						<input type="number" id="order_amount" placeholder="请输入实收数量(吨)" class="size-14">
@@ -289,20 +295,20 @@
 						<label class="label">改进要求：</label>
 						<input type="text" id="order_demand" placeholder="请输入改进要求" class="size-14">
 					</div>
-				</li>-->
+				</li>
 				<li class="mui-table-view-cell make" style="display: none;">
 					<div class="mui-input-row">
 						<label class="label">审批流单号：</label>
 						<input type="number" id="order_odd" placeholder="请输入审批流单号" class="size-14">
 					</div>
 				</li>
-				<!--<li class="mui-table-view-cell make">
+				<li class="mui-table-view-cell make">
 					<div class="mui-input-row">
 						<label class="label">事件原因：</label>
 						<input type="number" id="thing_result" placeholder="请输入事件原因" class="size-14">
 					</div>
-				</li>-->
-		    </ul>
+				</li>
+		    </ul> -->
 			<!--抽检类市场管理科-->	
 			<ul class="mui-table-view"  id="cccc" style="display: none;">
 				<li class="mui-table-view-cell" id="result">
@@ -385,14 +391,14 @@
 				</li>
 	        </ul>
     		<!--质量管理科-->
-           	<ul class="mui-table-view"  id="ffff" style="display: none;">
+           <!-- 	<ul class="mui-table-view"  id="ffff" style="display: none;">
 	        	<li class="mui-table-view-cell">
 					<div class="mui-input-row">
 						<label class="label">实收数量：</label>
 						<input type="number" id="order_receipts" placeholder="请输入实收数量(吨)" class="size-14">
 					</div>
 				</li>
-	        </ul>
+	        </ul> -->
 	        <!-- 投诉计划调度科 -->
 	        <ul class="mui-table-view" style="display: none;"  id="gggg">
 	        	<div class="gggg" style="display: none;">