2.5.0

CallCenterWeb.UI/WorkOrder/WorkOrderDispose.html

@@ -156,16 +156,16 @@
 				var chustr = '<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_back_' + row.ID + '" onclick="btn_zhuei(\'' + row.F_ID + '\')" title="注解">注解</a></li>' +
 					'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_abnorm' + row.ID + '" onclick="btn_send(\'' + row.F_ID + '\')" title="抄送">抄送</a></li>' +
 					'</ul>';
-				if(row.woflag == 9) {
-					if((row.F_State == 1 && row.F_State2 == 1) || (row.F_State == 1 && row.F_State2 == 11) || (row.F_State == 11 && row.F_State2 == 1)) {
+				if(row.woflag == 9&&row.inout==3) {
+					if((row.F_State == 1 && row.F_State2 == 1) || (row.F_State == 1 && (row.F_State2 == 11|| row.F_State2 == 10) )|| ((row.F_State == 11|| row.F_State == 10) && row.F_State2 == 1) ) {
 						if(deptarr.indexOf($.cookie('userDeptId')) == -1) {
 							return '<ul class="tool_downs">' +
-								'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_transfer_' + row.ID + '" onclick="btn_withdraw(\'' + row.F_ID + '\', false,\'' + row.inout + '\',\'' + row.F_Flag + '\')" title="撤回">撤回</a></li>' +
+								'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_transfer_' + row.ID + '" onclick="btn_withdraw(\'' + row.F_ID + '\', false,\'' + row.inout + '\',\'' + row.F_Flag + '\',\'' + row.woflag + '\')" title="撤回">撤回</a></li>' +
 								//'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_end_' + row.ID + '" onclick="btn_end(\'' + row.F_ID + '\', false)" title="申请结单">申请结单</a></li>' +
 								chustr
 						} else {
 							return '<ul class="tool_downs">' +
-								'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_transfer_' + row.ID + '" onclick="btn_withdraw(\'' + row.F_ID + '\', false,\'' + row.inout + '\',\'' + row.F_Flag + '\')" title="撤回">撤回</a></li>' +
+								'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_transfer_' + row.ID + '" onclick="btn_withdraw(\'' + row.F_ID + '\', false,\'' + row.inout + '\',\'' + row.F_Flag + '\',\'' + row.woflag + '\')" title="撤回">撤回</a></li>' +
 //								'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_end_' + row.ID + '" onclick="btn_end(\'' + row.F_ID + '\', false)" title="申请结单">申请结单</a></li>' +
 								chustr
 						}
@@ -187,24 +187,24 @@
 						if(row.F_State == 1) {
 							if(deptarr.indexOf($.cookie('userDeptId')) == -1) {
 								return '<ul class="tool_downs">' +
-									'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_transfer_' + row.ID + '" onclick="btn_withdraw(\'' + row.F_ID + '\', false,\'' + row.inout + '\',\'' + row.F_Flag + '\')" title="撤回">撤回</a></li>' +
+									'<li><a href="javascript:;" class="aBtn" authorize="yes"  onclick="btn_withdraw(\'' + row.F_ID + '\', false,\'' + row.inout + '\',\'' + row.F_Flag + '\',\'' + row.woflag + '\')" title="撤回">撤回</a></li>' +
 									//'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_end_' + row.ID + '" onclick="btn_end(\'' + row.F_ID + '\', false)" title="申请结单">申请结单</a></li>' +
 									chustr
 							} else {
 								return '<ul class="tool_downs">' +
-									'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_transfer_' + row.ID + '" onclick="btn_withdraw(\'' + row.F_ID + '\', false,\'' + row.inout + '\',\'' + row.F_Flag + '\')" title="撤回">撤回</a></li>' +
+									'<li><a href="javascript:;" class="aBtn" authorize="yes" onclick="btn_withdraw(\'' + row.F_ID + '\', false,\'' + row.inout + '\',\'' + row.F_Flag + '\',\'' + row.woflag + '\')" title="撤回">撤回</a></li>' +
 //									'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_end_' + row.ID + '" onclick="btn_end(\'' + row.F_ID + '\', false)" title="申请结单">申请结单</a></li>' +
 									chustr
 							}
 						} else {
 							if(deptarr.indexOf($.cookie('userDeptId')) == -1) {
 								return '<ul class="tool_downs">' +
-									'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_transfer_' + row.ID + '" onclick="btn_transfer(\'' + row.F_ID + '\', false, \'' + row.IsAdminSend + '\',2)" title="处理">处理</a></li>' +
+									'<li><a href="javascript:;" class="aBtn" authorize="yes" onclick="btn_transfer(\'' + row.F_ID + '\', false, \'' + row.IsAdminSend + '\',2)" title="处理">处理</a></li>' +
 									//'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_end_' + row.ID + '" onclick="btn_end(\'' + row.F_ID + '\', false)" title="申请结单">申请结单</a></li>' +
 									ustr
 							} else {
 								return '<ul class="tool_downs">' +
-									'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_transfer_' + row.ID + '" onclick="btn_transfer(\'' + row.F_ID + '\', false, \'' + row.IsAdminSend + '\',2)" title="处理">处理</a></li>' +
+									'<li><a href="javascript:;" class="aBtn" authorize="yes" onclick="btn_transfer(\'' + row.F_ID + '\', false, \'' + row.IsAdminSend + '\',2)" title="处理">处理</a></li>' +
 									'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_end_' + row.ID + '" onclick="btn_end(\'' + row.F_ID + '\', false)" title="申请结单">申请结单</a></li>' +
 									ustr
 							}
@@ -213,25 +213,25 @@
 						if(row.F_State2 == 1) {
 							if(deptarr.indexOf($.cookie('userDeptId')) == -1) {
 								return '<ul class="tool_downs">' +
-									'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_transfer_' + row.ID + '" onclick="btn_withdraw(\'' + row.F_ID + '\', false,\'' + row.inout + '\',\'' + row.F_Flag + '\')" title="撤回">撤回</a></li>' +
+									'<li><a href="javascript:;" class="aBtn" authorize="yes" onclick="btn_withdraw(\'' + row.F_ID + '\', false,\'' + row.inout + '\',\'' + row.F_Flag + '\',\'' + row.woflag + '\')" title="撤回">撤回</a></li>' +
 									//'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_end_' + row.ID + '" onclick="btn_end(\'' + row.F_ID + '\', false)" title="申请结单">申请结单</a></li>' +
 									chustr
 							} else {
 								return '<ul class="tool_downs">' +
-									'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_transfer_' + row.ID + '" onclick="btn_withdraw(\'' + row.F_ID + '\', false,\'' + row.inout + '\',\'' + row.F_Flag + '\')" title="撤回">撤回</a></li>' +
+									'<li><a href="javascript:;" class="aBtn" authorize="yes" onclick="btn_withdraw(\'' + row.F_ID + '\', false,\'' + row.inout + '\',\'' + row.F_Flag + '\',\'' + row.woflag + '\')" title="撤回">撤回</a></li>' +
 //									'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_end_' + row.ID + '" onclick="btn_end(\'' + row.F_ID + '\', false)" title="申请结单">申请结单</a></li>' +
 									chustr
 							}
 						} else {
 							if(deptarr.indexOf($.cookie('userDeptId')) == -1) {
 								return '<ul class="tool_downs">' +
-									'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_transfer_' + row.ID + '" onclick="btn_transfer(\'' + row.F_ID + '\', false, \'' + row.IsAdminSend + '\',2)" title="处理">处理</a></li>' +
+									'<li><a href="javascript:;" class="aBtn" authorize="yes" onclick="btn_transfer(\'' + row.F_ID + '\', false, \'' + row.IsAdminSend + '\',2)" title="处理">处理</a></li>' +
 									//'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_end_' + row.ID + '" onclick="btn_end(\'' + row.F_ID + '\', false)" title="申请结单">申请结单</a></li>' +
 									ustr
 							} else {
 								return '<ul class="tool_downs">' +
-									'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_transfer_' + row.ID + '" onclick="btn_transfer(\'' + row.F_ID + '\', false, \'' + row.IsAdminSend + '\',2)" title="处理">处理</a></li>' +
-									'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_end_' + row.ID + '" onclick="btn_end(\'' + row.F_ID + '\', false)" title="申请结单">申请结单</a></li>' +
+									'<li><a href="javascript:;" class="aBtn" authorize="yes" onclick="btn_transfer(\'' + row.F_ID + '\', false, \'' + row.IsAdminSend + '\',2)" title="处理">处理</a></li>' +
+									'<li><a href="javascript:;" class="aBtn" authorize="yes" onclick="btn_end(\'' + row.F_ID + '\', false)" title="申请结单">申请结单</a></li>' +
 									ustr
 							}
 						}

CallCenterWeb.UI/WorkOrder/WorkOrderTobeass.html

@@ -136,46 +136,46 @@
 			function formatterDesig(val, row) { //0 17
 				if(row.F_State == 0 || row.F_State == 17) {
 					return '<ul class="tool_downs">' +
-						'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_transfer_' + row.ID + '" onclick="btn_transfer(\'' + row.F_ID + '\', false,\'' + row.F_Type + '\',0)" title="指派">指派</a></li>' +
-						'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_edit_' + row.ID + '" onclick="btn_edit(\'' + row.F_ID + '\',0)" title="修改">修改</a></li>' +
-						'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_end_' + row.ID + '" onclick="btn_receiv(\'' + row.F_ID + '\',\'' + row.F_State + '\',\'' + row.F_State2 + '\',\'' + row.F_Flag + '\')" title="完结">完结</a></li>' +
-						'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_end_' + row.ID + '" onclick="btn_visit(\'' + row.F_ID + '\', false)" title="回访">回访</a></li>' +
-						'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_delete_' + row.ID + '" onclick="btn_delete(\'' + row.F_ID + '\')" title="删除">删除</a></li>' +
-						'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_back_' + row.ID + '" onclick="btn_zhuei(\'' + row.F_ID + '\')" title="注解">注解</a></li>' +
-						'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_abnorm' + row.ID + '" onclick="btn_send(\'' + row.F_ID + '\')" title="抄送">抄送</a></li>' +
+						'<li><a href="javascript:;" class="aBtn" authorize="yes" onclick="btn_transfer(\'' + row.F_ID + '\', false,\'' + row.F_Type + '\',0)" title="指派">指派</a></li>' +
+						'<li><a href="javascript:;" class="aBtn" authorize="yes" onclick="btn_edit(\'' + row.F_ID + '\',0)" title="修改">修改</a></li>' +
+						'<li><a href="javascript:;" class="aBtn" authorize="yes" onclick="btn_receiv(\'' + row.F_ID + '\',\'' + row.F_State + '\',\'' + row.F_State2 + '\',\'' + row.F_Flag + '\')" title="完结">完结</a></li>' +
+						'<li><a href="javascript:;" class="aBtn" authorize="yes" onclick="btn_visit(\'' + row.F_ID + '\', false)" title="回访">回访</a></li>' +
+						'<li><a href="javascript:;" class="aBtn" authorize="yes" onclick="btn_delete(\'' + row.F_ID + '\')" title="删除">删除</a></li>' +
+						'<li><a href="javascript:;" class="aBtn" authorize="yes" onclick="btn_zhuei(\'' + row.F_ID + '\')" title="注解">注解</a></li>' +
+						'<li><a href="javascript:;" class="aBtn" authorize="yes" onclick="btn_send(\'' + row.F_ID + '\')" title="抄送">抄送</a></li>' +
 						'</ul>';
 				}
 				if(row.F_State == 1) {
 					return '<ul class="tool_downs">' +
-						'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_transfer_' + row.ID + '" onclick="btn_withdraw(\'' + row.F_ID + '\', false,\'' + row.inout + '\',\'' + row.F_Flag + '\')" title="撤回">撤回</a></li>' +
-						'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_edit_' + row.ID + '" onclick="btn_edit(\'' + row.F_ID + '\',0)" title="修改">修改</a></li>' +
-						'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_end_' + row.ID + '" onclick="btn_receiv(\'' + row.F_ID + '\',\'' + row.F_State + '\',\'' + row.F_State2 + '\',\'' + row.F_Flag + '\')" title="完结">完结</a></li>' +
-						'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_end_' + row.ID + '" onclick="btn_visit(\'' + row.F_ID + '\', false)" title="回访">回访</a></li>' +
-						'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_delete_' + row.ID + '" onclick="btn_delete(\'' + row.F_ID + '\')" title="删除">删除</a></li>' +
-						'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_back_' + row.ID + '" onclick="btn_zhuei(\'' + row.F_ID + '\')" title="注解">注解</a></li>' +
-						'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_abnorm' + row.ID + '" onclick="btn_send(\'' + row.F_ID + '\')" title="抄送">抄送</a></li>' +
+						'<li><a href="javascript:;" class="aBtn" authorize="yes" onclick="btn_withdraw(\'' + row.F_ID + '\', false,\'' + row.inout + '\',\'' + row.F_Flag + '\',\'' + row.woflag + '\')" title="撤回">撤回</a></li>' +
+						'<li><a href="javascript:;" class="aBtn" authorize="yes" onclick="btn_edit(\'' + row.F_ID + '\',0)" title="修改">修改</a></li>' +
+						'<li><a href="javascript:;" class="aBtn" authorize="yes" onclick="btn_receiv(\'' + row.F_ID + '\',\'' + row.F_State + '\',\'' + row.F_State2 + '\',\'' + row.F_Flag + '\')" title="完结">完结</a></li>' +
+						'<li><a href="javascript:;" class="aBtn" authorize="yes" onclick="btn_visit(\'' + row.F_ID + '\', false)" title="回访">回访</a></li>' +
+						'<li><a href="javascript:;" class="aBtn" authorize="yes" onclick="btn_delete(\'' + row.F_ID + '\')" title="删除">删除</a></li>' +
+						'<li><a href="javascript:;" class="aBtn" authorize="yes" onclick="btn_zhuei(\'' + row.F_ID + '\')" title="注解">注解</a></li>' +
+						'<li><a href="javascript:;" class="aBtn" authorize="yes" onclick="btn_send(\'' + row.F_ID + '\')" title="抄送">抄送</a></li>' +
 						'</ul>';
 				}
 				if(row.F_State == 11 && row.F_State2 == 1) {
 					return '<ul class="tool_downs">' +
-						'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_transfer_' + row.ID + '" onclick="btn_withdraw(\'' + row.F_ID + '\', false,\'' + row.inout + '\',\'' + row.F_Flag + '\')" title="撤回">撤回</a></li>' +
-						'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_edit_' + row.ID + '" onclick="btn_edit(\'' + row.F_ID + '\',0)" title="修改">修改</a></li>' +
-						'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_end_' + row.ID + '" onclick="btn_receiv(\'' + row.F_ID + '\',\'' + row.F_State + '\',\'' + row.F_State2 + '\',\'' + row.F_Flag + '\')" title="完结">完结</a></li>' +
-						'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_end_' + row.ID + '" onclick="btn_visit(\'' + row.F_ID + '\', false)" title="回访">回访</a></li>' +
-						'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_delete_' + row.ID + '" onclick="btn_delete(\'' + row.F_ID + '\')" title="删除">删除</a></li>' +
-						'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_back_' + row.ID + '" onclick="btn_zhuei(\'' + row.F_ID + '\')" title="注解">注解</a></li>' +
-						'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_abnorm' + row.ID + '" onclick="btn_send(\'' + row.F_ID + '\')" title="抄送">抄送</a></li>' +
+						'<li><a href="javascript:;" class="aBtn" authorize="yes" onclick="btn_withdraw(\'' + row.F_ID + '\', false,\'' + row.inout + '\',\'' + row.F_Flag + '\',\'' + row.woflag + '\')" title="撤回">撤回</a></li>' +
+						'<li><a href="javascript:;" class="aBtn" authorize="yes" onclick="btn_edit(\'' + row.F_ID + '\',0)" title="修改">修改</a></li>' +
+						'<li><a href="javascript:;" class="aBtn" authorize="yes" onclick="btn_receiv(\'' + row.F_ID + '\',\'' + row.F_State + '\',\'' + row.F_State2 + '\',\'' + row.F_Flag + '\')" title="完结">完结</a></li>' +
+						'<li><a href="javascript:;" class="aBtn" authorize="yes" onclick="btn_visit(\'' + row.F_ID + '\', false)" title="回访">回访</a></li>' +
+						'<li><a href="javascript:;" class="aBtn" authorize="yes" onclick="btn_delete(\'' + row.F_ID + '\')" title="删除">删除</a></li>' +
+						'<li><a href="javascript:;" class="aBtn" authorize="yes" onclick="btn_zhuei(\'' + row.F_ID + '\')" title="注解">注解</a></li>' +
+						'<li><a href="javascript:;" class="aBtn" authorize="yes" onclick="btn_send(\'' + row.F_ID + '\')" title="抄送">抄送</a></li>' +
 						'</ul>';
 				}
 				if(row.F_State == 12 || row.F_State2 == 12) {
 					return '<ul class="tool_downs">' +
-						'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_transfer_' + row.ID + '" onclick="btn_transfer(\'' + row.F_ID + '\', false,\'' + row.F_Type + '\',0)" title="指派">指派</a></li>' +
-						'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_edit_' + row.ID + '" onclick="btn_edit(\'' + row.F_ID + '\',0)" title="修改">修改</a></li>' +
-						'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_end_' + row.ID + '" onclick="btn_receiv(\'' + row.F_ID + '\',\'' + row.F_State + '\',\'' + row.F_State2 + '\',\'' + row.F_Flag + '\')" title="完结">完结</a></li>' +
-						'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_end_' + row.ID + '" onclick="btn_visit(\'' + row.F_ID + '\', false)" title="回访">回访</a></li>' +
-						'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_delete_' + row.ID + '" onclick="btn_delete(\'' + row.F_ID + '\')" title="删除">删除</a></li>' +
-						'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_back_' + row.ID + '" onclick="btn_zhuei(\'' + row.F_ID + '\')" title="注解">注解</a></li>' +
-						'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_abnorm' + row.ID + '" onclick="btn_send(\'' + row.F_ID + '\')" title="抄送">抄送</a></li>' +
+						'<li><a href="javascript:;" class="aBtn" authorize="yes" onclick="btn_transfer(\'' + row.F_ID + '\', false,\'' + row.F_Type + '\',0)" title="指派">指派</a></li>' +
+						'<li><a href="javascript:;" class="aBtn" authorize="yes" onclick="btn_edit(\'' + row.F_ID + '\',0)" title="修改">修改</a></li>' +
+						'<li><a href="javascript:;" class="aBtn" authorize="yes" onclick="btn_receiv(\'' + row.F_ID + '\',\'' + row.F_State + '\',\'' + row.F_State2 + '\',\'' + row.F_Flag + '\')" title="完结">完结</a></li>' +
+						'<li><a href="javascript:;" class="aBtn" authorize="yes" onclick="btn_visit(\'' + row.F_ID + '\', false)" title="回访">回访</a></li>' +
+						'<li><a href="javascript:;" class="aBtn" authorize="yes" onclick="btn_delete(\'' + row.F_ID + '\')" title="删除">删除</a></li>' +
+						'<li><a href="javascript:;" class="aBtn" authorize="yes" onclick="btn_zhuei(\'' + row.F_ID + '\')" title="注解">注解</a></li>' +
+						'<li><a href="javascript:;" class="aBtn" authorize="yes" onclick="btn_send(\'' + row.F_ID + '\')" title="抄送">抄送</a></li>' +
 						'</ul>';
 				}
 			}

CallCenterWeb.UI/WorkOrder/commonHtml/LookMessage.html

@@ -11,6 +11,18 @@
 		<link href="../../css/init.css" rel="stylesheet" />
 		<link rel="stylesheet" type="text/css" href="../../css/lookMsg.css" />
 	</head>
+	<style>
+		#cli input {
+			margin: 0 5px;
+		}
+		
+		#cli label {
+			font-weight: bold !important;
+		}
+		#btn_submit{
+			margin-bottom: 30px;
+		}
+	</style>
 
 	<body class="gray-bg">
 		<div class="wrapper">
@@ -103,25 +115,20 @@
 					<ul class="Qus_box" id="questionBody">
 						<li>
 							<div id="cli">
-								<div>
-									<lable>NPS：</lable>
-									<select name="" id="npscore"></select>
+								<div id="npscore">
+									<label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;NPS：</label>
 								</div>
-								<div>
-									<lable>产品质量：</lable>
-									<select name="" id="qualityscore"></select>
+								<div id="qualityscore">
+									<label>产品质量：</label>
 								</div>
-								<div>
-									<lable>处理结果：</lable>
-									<select name="" id="resultscore"></select>
+								<div id="resultscore">
+									<label>处理结果：</label>
 								</div>
-								<div>
-									<lable>服务态度：</lable>
-									<select name="" id="servicescore"></select>
+								<div id="servicescore">
+									<label>服务态度：</label>
 								</div>
-								<div>
-									<lable>处理时效：</lable>
-									<select name="" id="effectscore"></select>
+								<div id="effectscore">
+									<label>处理时效：</label>
 								</div>
 							</div>
 							<div id="qta" style="display: none;">

CallCenterWeb.UI/WorkOrder/commonHtml/WorkOrderEnd.html

@@ -126,7 +126,7 @@
 						</td>
 					</tr>
 					<tr class="isvi">
-						<th>是否回访：</th>
+						<th>是否建议客服回访：</th>
 						<td>
 							<div id="hui_FA">
 								<input type="radio" name="radio" id="" value="0" checked="checked" />否

CallCenterWeb.UI/WorkOrder/commonHtml/WorkOrderTransfer.html

@@ -13,7 +13,7 @@
 				.my-skin .layui-layer-btn a {
 				background-color: #00A4FF;
 				border: 1px solid #00A4FF;
-				color: #FFF;			
+				color: #FFF;
 		</style>
 		<title>分配</title>
 		<style type="text/css">
@@ -337,7 +337,7 @@
 							<input class="form-control" id="fzje" type="text" placeholder="请输入返账金额" />
 						</td>
 					</tr>-->
-						<tr>
+					<tr>
 						<th>处理结果：</th>
 						<td colspan="3">
 							<div>
@@ -522,43 +522,6 @@
 						</tr>
 					</table>
 					<table id="abcd" class="_table1 table table-bordered  table-hover " border="0" cellspacing="0" cellpadding="0" style="width: 100%; display: none;">
-						<!--<tr>
-							<th colspan="4" id="bazaar1">投诉、业务协办类质量管理部</th>
-						</tr>-->
-						<!--<tr>
-							<th>办理意见：</th>
-							<td>
-								<div id="yijian">
-									<input type="radio" name="tong" value="同意" checked="checked">同意
-									<input type="radio" name="tong" value="不同意">不同意
-								</div>
-							</td>
-
-							<th style="display: none;" id="pionn">不同意意见：</th>
-							<td style="display: none;" id="piocni">
-								<input type="text" name="" id="butong" value="" class="form-control selectpicker" placeholder="请输入不同意意见" />
-							</td>
-
-						</tr>
-						<tr>
-							<th>补偿方式：</th>
-							<td>
-								<div id="buchang">
-									<input type="radio" name="buchang" value="实物" checked="checked">实物
-									<input type="radio" name="buchang" value="钱款">钱款
-								</div>
-							</td>
-							<th style="display: none;" class="mmm">补偿钱款：</th>
-							<td style="display: none;" class="mmm">
-								<input type="text" name="" id="buqian" value="" class="form-control selectpicker" onkeyup="this.value=this.value.replace(/[^0-9\.]/g,'')" placeholder="请输入补偿钱款" />
-							</td>
-						</tr>
-						<tr>
-							<th>对应办理工作流单号：</th>
-							<td>
-								<input type="text" id="danhao" value="" placeholder="请输入工作流单号" class="form-control selectpicker">
-							</td>
-						</tr>-->
 						<tr>
 							<th class="huayan" style="display: none;">化验是否合格：</th>
 							<td class="huayan" style="display: none;">
@@ -569,54 +532,6 @@
 							</td>
 						</tr>
 					</table>
-					<!--<table id="zcetey" class="_table1 table table-bordered  table-hover " border="0" cellspacing="0" cellpadding="0" style="width: 100%; display: none;">-->
-					<!--<tr>-->
-					<!--<th>是否回访：</th>
-							<td>
-								<div id="hui_FA">
-									<input type="radio" name="radio" id="" value="0" checked="checked" />否
-									<input type="radio" name="radio" id="" value="1" />是
-								</div>
-							</td>-->
-					<!--<th class="huayan" style="display: none;">化验是否合格：</th>
-							<td class="huayan" style="display: none;">
-								<div id="hua_yan">
-									<input type="radio" name="radio" id="" value="0" checked="checked" />合格
-									<input type="radio" name="radio" id="" value="1" />不合格
-								</div>
-							</td>
-							<th>索赔金额：</th>
-							<td>
-								<div id="">
-									<input type="text" name="" id="suopeijin" value="" class="form-control selectpicker" placeholder="请输入金额/单位元" onkeyup="this.value=this.value.replace(/[^0-9\.]/g,'')" />
-								</div>
-							</td>-->
-					<!--</tr>-->
-					<!--<tr>
-							<th>质量事件等级：</th>
-							<td>
-								<select class="form-control selectpicker" id="cat">
-									<option selected="selected" value="">请选择</option>
-								</select>
-							</td>
-							<th>责任单位可多选：</th>
-							<td>
-								<div style="display: inline-block;">
-									<input type="text" class="form-control selectpicker" id="add_com" placeholder="请输入单位" autocomplete="off" />
-								</div>
-								<div id="duoxuan" style="display: inline-block;">
-								</div>								
-							</td>
-						</tr>
-						<tr>
-							<th>对应责任单位：</th>
-							<td>
-								<div id="zeren">
-									<select class="form-control selectpicker" id="danwei"></select>
-								</div>
-							</td>
-						</tr>-->
-					<!--</table>-->
 					<table id="abcde" class="_table1 table table-bordered  table-hover " border="0" cellspacing="0" cellpadding="0" style="width: 100%; display: none;">
 						<tr>
 							<th colspan="4" id="bazaar2">抽检类市场管理科</th>
@@ -658,12 +573,6 @@
 							</td>
 						</tr>
 					</table>
-					<!--<table id="zipeti" class="_table1 table table-bordered  table-hover " border="0" cellspacing="0" cellpadding="0" style="width: 100%; display: none;">
-						<th>确认实收数量：</th>
-						<td>
-							<input type="text" id="shuliang" value="" placeholder="吨" class="form-control selectpicker" onkeyup="this.value=this.value.replace(/[^0-9\.]/g,'')" />
-						</td>
-					</table>-->
 				</table>
 			</div>
 			<div class="cpk" style="display: none;text-align: center;">
@@ -688,6 +597,7 @@
 			<div class="clearfix wh_btn">
 				<input type="button" value="提交工单" class="btn btn-primary btn-sm" id="clgd" />
 				<input type="button" value="暂存工单" class="btn btn-primary btn-sm" id="zcgd" />
+				<!--<input type="button" value="暂存工单" class="btn btn-primary btn-sm" id="hh" />-->				
 			</div>
 		</div>
 		<script src="../../js/autosize/autosize.js"></script>
@@ -708,14 +618,17 @@
 				window.open(tourl)
 			}
 
-			//			function addCom() {
-			//				if($('#add_com').val() == '') {
-			//					layer.msg("请输入单位")
-			//					return;
-			//				}
-			//				$("#duoxuan").append("<span>" + $('#add_com').val() + "</span>" + "<input type='checkbox' name='duo' value='" + $('#add_com').val() + "'>" + "</input>")
-			//				$('#add_com').val('')
-			//			}
+//			$("#hh").click(function() {
+//				layer.open({
+//					shadeClose: true,
+//					type: 2,
+//					title: '内线处理方式',
+//					maxmin: true, //开启最大化最小化按钮
+//					area: ['80%', '90%'],
+//					content: '../../WorkOrder/commonHtml/handleMethod.html'
+//				});
+//			})
+
 			$(document).on('blur', '.code', function() {
 				console.log($(this).val())
 				var this_ = $(this);

CallCenterWeb.UI/WorkOrder/commonHtml/handleMethod.html

@@ -0,0 +1,121 @@
+<!DOCTYPE html>
+<html>
+
+	<head>
+		<meta charset="UTF-8">
+		<title></title>
+		<script src="../../Script/Common/huayi.load.js"></script>
+		<script src="../../Script/Common/huayi.config.js"></script>
+		<link href="../../css/Table/table1.css" rel="stylesheet" />
+		<link href="../../css/init.css" rel="stylesheet" />
+		<link rel="stylesheet" type="text/css" href="../../css/lookMsg.css" />
+	</head>
+	<style>
+		table th{
+			width: 150px;
+			text-align: center;
+		}
+		.zhujie{
+			margin-bottom: 20px;
+		}
+	</style>
+
+	<body style="padding: 30px;">
+		<div class="zhujie">
+			<label>请选择处理方式：</label>
+			<input type="radio" name="zhu" value="1" checked="checked">是否完结
+			<input type="radio" name="zhu" value="2">是
+			<input type="radio" name="zhu" value="3">否
+		</div>
+		<div>
+			<table class="table table-bordered table-hover tabbox" border="0" cellspacing="0" cellpadding="0" style="width: 100%;display: none;">
+				<tr>
+					<th>处理结果：</th>
+					<td colspan="3">
+						<div>
+							<textarea id="contres" class="form-control" rows="2" style="width:100%; resize: none;" placeholder="请输入处理结果"></textarea>
+						</div>
+					</td>
+				</tr>
+				<tr>
+					<th>问题原因：</th>
+					<td colspan="3">
+						<div>
+							<textarea id="cont1" class="form-control" rows="2" style="width:100%; resize: none;" placeholder="请输入问题原因"></textarea>
+						</div>
+					</td>
+				</tr>
+				<tr>
+					<th>责任单位：</th>
+					<td colspan="3">
+						<div>
+							<textarea id="cont2" class="form-control" rows="2" style="width:100%; resize: none;" placeholder="请输入责任单位"></textarea>
+						</div>
+					</td>
+				</tr>
+				<tr>
+					<th>整改计划：</th>
+					<td colspan="3">
+						<div>
+							<textarea id="cont3" class="form-control" rows="2" style="width:100%; resize: none;" placeholder="请输入整改计划"></textarea>
+						</div>
+					</td>
+				</tr>
+				<tr>
+					<th>重要级别：</th>
+					<td>
+						<select class="form-control input-sm " id="level" style="height: 45px;">
+							<option value="0">请选择重要级别</option>
+						</select>
+					</td>
+				</tr>
+			</table>
+			<!--<label>注解原因：</label>
+			<textarea id="reception" rows="3" cols="20" class="form-control" placeholder="请输入注解原因"></textarea>-->
+		</div>
+		<div style="text-align: center;margin-top: 20px;">
+			<button type="button" id="btn_submit" class="btn btn-primary">确定</button>
+		</div>
+	</body>
+	<script>
+		var oid = helper.request.queryString('oid')
+		var flag = helper.request.queryString('flag')
+		$(document).ready(function() {
+			ZYJB($("#level")); //重要级别
+			var obj = JSON.parse(localStorage.getItem('handleMethod'))
+			$("#contres").val(obj.contres) //处理内容	
+			$("#cont1").val(obj.EventReason) //问题原因
+			$("#cont2").val(obj.ResponsibleUnit) //责任单位
+			$("#cont3").val(obj.ImprovementRequirements) //整改计划
+			$("#level").val(obj.TS_Level); //重要级别
+			$("#level").text(obj.TS_Level); //重要级别			
+		})
+		//重要级别
+		function ZYJB(obj) {
+			obj.empty();
+			obj.append('<option selected="selected" value="">请选择</option>');
+			$.getJSON(huayi.config.callcenter_url + "Dictionary/GetDicValueListByFlag", {
+				"token": $.cookie("token"),
+				flag: "ZYJB",
+			}, function(data) {
+				if(data.state.toLowerCase() == "success") {
+					var content = data.data;
+					$(content).each(function(i, n) {
+						$("<option value='" + n.F_Name + "'>" + n.F_Name + "</option>").appendTo(obj);
+					})
+				}
+			})
+		}
+		$('input[name="zhu"]').change(function() {
+			if($('input[name="zhu"]:checked').val() == '2') {
+				$(".tabbox").show()
+			} else {
+				$(".tabbox").hide()
+			}
+		})
+		$("#btn_submit").click(function(){
+			parent.Assign(oid,flag,$('input[name="zhu"]:checked').val(),$("#contres").val(),$("#cont1").val(),$("#cont2").val(),$("#cont3").val(),$("#level").val())
+		})
+	</script>
+
+</html>

CallCenterWeb.UI/WorkOrder/commonHtml/js/LookMessage.js

@@ -15,11 +15,16 @@ $(document).ready(function() {
 			calloutopt($("#visit_tel").text());
 		}
 	});
-	$('#npscore').val(10)
-	$('#qualityscore').val(10)
-	$('#resultscore').val(10)
-	$('#servicescore').val(10)
-	$('#effectscore').val(10)
+//	$("#npscore input[type=radio][value='10']").prop("checked", true);
+//	$("#qualityscore input[type=radio][value='10']").prop("checked", true);
+//	$("#resultscore input[type=radio][value='10']").prop("checked", true);
+//	$("#servicescore input[type=radio][value='10']").prop("checked", true);
+//	$("#effectscore input[type=radio][value='10']").prop("checked", true);
+	//	$('#npscore').val(10)
+	//	$('#qualityscore').val(10)
+	//	$('#resultscore').val(10)
+	//	$('#servicescore').val(10)
+	//	$('#effectscore').val(10)
 });
 
 //外呼
@@ -73,19 +78,55 @@ $('input[name="fwu"]').change(function() {
 	}
 })
 // 分值
-scoreCount($('#npscore'))
-scoreCount($('#qualityscore'))
-scoreCount($('#resultscore'))
-scoreCount($('#servicescore'))
-scoreCount($('#effectscore'))
-function scoreCount(dom){
-	let scoreNum = [{value:'1', score:'1分'},{value:'2', score:'2分'},{value:'3', score:'3分'},{value:'4', score:'4分'},{value:'5', score:'5分'},
-	{value:'6', score:'6分'},{value:'7', score:'7分'},{value:'8', score:'8分'},{value:'9', score:'9分'},{value:'10', score:'10分'}]
-	let str ='<option value="">请选择分值</option>'
-	scoreNum.forEach(function(v){
-		str += '<option value = "'+v.value+'">'+v.score+'</option>'
+scoreCount($('#npscore'), 'nps')
+scoreCount($('#qualityscore'), 'quality')
+scoreCount($('#resultscore'), 'result')
+scoreCount($('#servicescore'), 'service')
+scoreCount($('#effectscore'), 'effect')
+
+function scoreCount(dom, index) {
+	let scoreNum = [{
+			value: '-1',
+			score: '未评价'
+		}, {
+			value: '1',
+			score: '1分'
+		}, {
+			value: '2',
+			score: '2分'
+		}, {
+			value: '3',
+			score: '3分'
+		}, {
+			value: '4',
+			score: '4分'
+		}, {
+			value: '5',
+			score: '5分'
+		},
+		{
+			value: '6',
+			score: '6分'
+		}, {
+			value: '7',
+			score: '7分'
+		}, {
+			value: '8',
+			score: '8分'
+		}, {
+			value: '9',
+			score: '9分'
+		}, {
+			value: '10',
+			score: '10分'
+		}
+	]
+	//	let str ='<option value="">请选择分值</option>'
+	scoreNum.forEach(function(v) {
+		$("<input type='radio' name='" + index + "' value='" + v.value + "'>" + v.score + "</input>").appendTo(dom);
+		//		str += '<input type="radio" value = "'+v.value+'">'+v.score+'</input>'
 	})
-	dom.html(str)
+	//	dom.append(str)
 }
 var attr;
 
@@ -122,11 +163,11 @@ function submitPages() {
 			isover: $('input[name="wan"]:checked').val(), //是否完结
 			sms: $('input[name="duxin"]:checked').val(), //是否发送短信
 			F_VisitRemarks: $('#remarks').val(), //底部备注
-			npscore: $('#npscore').val(),  //nps得分
-			qualityscore: $('#qualityscore').val(), //产品质量
-			servicescore: $('#servicescore').val(), //服务态度
-			effectscore: $('#effectscore').val(), //处理时效
-			resultscore: $('#resultscore').val(),  //处理结果
+			npscore: $('#npscore').find('input[type="radio"]:checked').val(), //nps得分
+			qualityscore: $('#qualityscore').find('input[type="radio"]:checked').val(), //产品质量
+			resultscore: $('#resultscore').find('input[type="radio"]:checked').val(), //处理结果
+			servicescore: $('#servicescore').find('input[type="radio"]:checked').val(), //服务态度
+			effectscore: $('#effectscore').find('input[type="radio"]:checked').val(), //处理时效
 			token: $.cookie("token")
 		},
 		beforeSend: function() {
@@ -165,7 +206,7 @@ function getWorkOrderInfo() {
 			if(result.rows && result.rows.length > 0) {
 				var data = result.rows[0];
 				$("#F_WorkOrderCode").text(data.F_WorkOrderCode), //工单编号
-				$("#F_Type").text(data.F_TypeName); //工单类型
+					$("#F_Type").text(data.F_TypeName); //工单类型
 				$("#F_State").text(data.F_StateName); //工单状态
 				$("#F_Source").text(data.F_SourceName); //工单来源
 				$('#F_CusName').text(data.F_CusName); //客户姓名		
@@ -271,4 +312,33 @@ function GetHJJG() {
 			}
 		}
 	});
-}
+}
+$('#Tgetruset').delegate($('input:radio[name="check"]'), 'change', function() {
+	if($('input[name="check"]:checked').val() == '正常接通') {
+		$("#npscore input[type=radio][value='10']").prop("checked", true);
+		$("#qualityscore input[type=radio][value='10']").prop("checked", true);
+		$("#resultscore input[type=radio][value='10']").prop("checked", true);
+		$("#servicescore input[type=radio][value='10']").prop("checked", true);
+		$("#effectscore input[type=radio][value='10']").prop("checked", true);
+		
+//		$("#npscore input[type=radio]").prop("disabled", true);
+//		$("#qualityscore input[type=radio]").prop("disabled", true);		
+//		$("#resultscore input[type=radio]").prop("disabled", true);		
+//		$("#servicescore input[type=radio]").prop("disabled", true);
+//		$("#effectscore input[type=radio]").prop("disabled", true);
+		
+	}else{
+		$("#npscore input[type=radio][value='-1']").prop("checked", true);
+		$("#qualityscore input[type=radio][value='-1']").prop("checked", true);
+		$("#resultscore input[type=radio][value='-1']").prop("checked", true);
+		$("#servicescore input[type=radio][value='-1']").prop("checked", true);
+		$("#effectscore input[type=radio][value='-1']").prop("checked", true);
+		
+//		$("#npscore input[type=radio]").prop("disabled", false);
+//		$("#qualityscore input[type=radio]").prop("disabled", false);		
+//		$("#resultscore input[type=radio]").prop("disabled", false);		
+//		$("#servicescore input[type=radio]").prop("disabled", false);		
+//		$("#effectscore input[type=radio]").prop("disabled", false);		
+		
+	}
+})

CallCenterWeb.UI/WorkOrder/commonHtml/js/WorkOrderTransfer.js

@@ -15,7 +15,7 @@ $(document).ready(function() {
 	//	if(ID) {
 	//		getWorkOrderInfo(ID);
 	//	}
-	if($.cookie('userRoleCode') == 'JDYPTZX' || $.cookie('userRoleCode') == 'JDYBZZX' || $.cookie('userRoleCode') == 'XTGLY' || arr.indexOf($.cookie('userDeptId')) != -1) {		
+	if($.cookie('userRoleCode') == 'JDYPTZX' || $.cookie('userRoleCode') == 'JDYBZZX' || $.cookie('userRoleCode') == 'XTGLY' || arr.indexOf($.cookie('userDeptId')) != -1) {
 		$('.zy').show()
 		$('.pt').hide()
 		$('.commonjs').show()
@@ -52,7 +52,7 @@ $(document).ready(function() {
 			numarr.push($(this).val())
 		})
 		for(var i = 0; i < codearr.length; i++) {
-//			console.log(codearr)
+			//			console.log(codearr)
 			for(var j = 0; j < namearr.length; j++) {
 				for(var m = 0; m < pfarr.length; m++) {
 					for(var n = 0; n < numarr.length; n++) {
@@ -71,12 +71,20 @@ $(document).ready(function() {
 			allarr.push(obj)
 		}
 		jsonarr = allarr
-//		console.log(jsonarr)
+		//		console.log(jsonarr)
 		if(jsonarr.length > 0) {
 			if(jsonarr[0].materialcode == '' && jsonarr[0].materialname == '' && jsonarr[0].formula == '' && jsonarr[0].specs == '' && jsonarr[0].returnum == '') {
 				jsonarr = ''
 			}
 		}
+		var obj = {
+			contres: $("#contres").val(), //处理内容	
+			EventReason: $("#cont1").val(), //问题原因
+			ResponsibleUnit: $("#cont2").val(), //责任单位
+			ImprovementRequirements: $("#cont3").val(), //整改计划
+			TS_Level: $("#level").val() //重要级别
+		}
+		localStorage.setItem("handleMethod", JSON.stringify(obj))
 		dealWorkOrder(ID);
 	});
 	//暂存按钮
@@ -198,9 +206,9 @@ $(document).ready(function() {
 			IsRecord: $("#shenpi").val(),
 			ClaimAmount: $("#suopeijin").val(),
 			contres: $("#contres").val(), //否	处理内容	
-		    EventReason: $("#cont1").val(), //问题原因
-		    ResponsibleUnit: $("#cont2").val(), //责任单位
-		    ImprovementRequirements: $("#cont3").val(), //整改计划
+			EventReason: $("#cont1").val(), //问题原因
+			ResponsibleUnit: $("#cont2").val(), //责任单位
+			ImprovementRequirements: $("#cont3").val(), //整改计划
 			token: $.cookie("token"),
 			jsonstr: JSON.stringify(jsonarr)
 		}
@@ -421,7 +429,7 @@ $('#buchang').find('input[type="radio"]').on('change', function() {
 	}
 });
 //获取工单信息
-function getWorkOrderInfo(oid,rstate) {
+function getWorkOrderInfo(oid, rstate) {
 	var obj = JSON.parse(localStorage.getItem('workDetail'))
 	if(obj) {
 		var materialArr = JSON.parse(obj.jsonstr)
@@ -479,7 +487,7 @@ function getWorkOrderInfo(oid,rstate) {
 		dataType: 'json',
 		data: {
 			id: oid,
-			state : rstate,
+			state: rstate,
 			token: $.cookie("token")
 		},
 		success: function(data) {
@@ -504,41 +512,41 @@ function getWorkOrderInfo(oid,rstate) {
 					$("#cl_khdh").text(helper.filter.cutTel(Str[0].F_CusPhone)); //电话
 					$('#cl_gdnr').text(decodeURIComponent(Str[0].Detail));
 					$("#fanzhaje").val(Str[0].F_SC_CJ_ReturnAccount); //销售财务返账金额
-					$("#cont1").val(Str[0].F_EventReason)//问题原因
-					$("#level").val(Str[0].F_TS_Level);//重要级别
+					$("#cont1").val(Str[0].F_EventReason) //问题原因
+					$("#level").val(Str[0].F_TS_Level); //重要级别
 					$("#cont2").val(Str[0].F_ZL_ResponsibleUnit) //责任单位
 					$("#cont3").val(Str[0].F_ZL_ImprovementRequirements) //整改计划
-//					if(Str[0].inout==1) {
-//						if(Str[0].SuperiorOpinion.indexOf(':')!= -1){							
-//							$("#contres").val(Str[0].SuperiorOpinion.split(" ")[3]) //处理内容
-//						}else{
-//							$("#contres").val(Str[0].SuperiorOpinion) //处理内容
-//						}
-//					}
-					if(Str[0].inout==2){
-						if(Str[0].SuperiorOpinion2.indexOf(':')!= -1){							
+					//					if(Str[0].inout==1) {
+					//						if(Str[0].SuperiorOpinion.indexOf(':')!= -1){							
+					//							$("#contres").val(Str[0].SuperiorOpinion.split(" ")[3]) //处理内容
+					//						}else{
+					//							$("#contres").val(Str[0].SuperiorOpinion) //处理内容
+					//						}
+					//					}
+					if(Str[0].inout == 2) {
+						if(Str[0].SuperiorOpinion2.indexOf(':') != -1) {
 							$("#contres").val(Str[0].SuperiorOpinion2.split(" ")[3]) //处理内容	
-						}else{
+						} else {
 							$("#contres").val(Str[0].SuperiorOpinion2) //处理内容	
 						}
-					}else{
-						if(Str[0].SuperiorOpinion.indexOf(':')!= -1){							
+					} else {
+						if(Str[0].SuperiorOpinion.indexOf(':') != -1) {
 							$("#contres").val(Str[0].SuperiorOpinion.split(" ")[3]) //处理内容
-						}else{
+						} else {
 							$("#contres").val(Str[0].SuperiorOpinion) //处理内容
 						}
 					}
-					if(Str[0].inout!=2 && Str[0].F_Flag!=1 && Str[0].F_Flag!=9 && Str[0].inout!=3){
-						$("#cont1").attr('disabled',true)
-						$("#cont2").attr('disabled',true)
-						$("#cont3").attr('disabled',true)					
-						$("#level").attr('disabled',true)											
+					if(Str[0].inout != 2 && Str[0].F_Flag != 1 && Str[0].F_Flag != 9 && Str[0].inout != 3) {
+						$("#cont1").attr('disabled', true)
+						$("#cont2").attr('disabled', true)
+						$("#cont3").attr('disabled', true)
+						$("#level").attr('disabled', true)
 					}
-					if((Str[0].F_State==0&&Str[0].F_State2==0)||(Str[0].F_State==17&&Str[0].F_State2==17)||(Str[0].F_State==12&&Str[0].F_State2==12)||(arr.indexOf($.cookie('userDeptId')) != -1 && Str[0].F_Flag == 9)){
+					if((Str[0].F_State == 0 && Str[0].F_State2 == 0) || (Str[0].F_State == 17 && Str[0].F_State2 == 17) || (Str[0].F_State == 12 && Str[0].F_State2 == 12) || (arr.indexOf($.cookie('userDeptId')) != -1 && Str[0].F_Flag == 9)) {
 						$('.zy').show()
-		                $('.pt').hide()
-		                $('.commonjs').show()
-					}else{
+						$('.pt').hide()
+						$('.commonjs').show()
+					} else {
 						$('.zy').hide()
 						$('.pt').show()
 						$('.commonjs').hide()
@@ -1126,56 +1134,83 @@ function dealWorkOrder(oid) {
 	var flag;
 	if($("#clbm").val() && $("#clbm2").val()) {
 		flag = 3
-		if(inout == 3 && F_Flag == 3 && $(".commonjs").hide()==true) {
-			layer.confirm('您要处理外线还是内线?请选择', {
-				skin : "my-skin",
-				btn: ['外线', '内线'],
-				cancel: function(index, layero) {}
-			}, function() {
-				Assign(oid, flag, 1)
-			}, function() {
-				Assign(oid, flag, 2)
-			});
-		}else{
-			Assign(oid, flag)
-		}
+		Assign(oid, flag,'0',$("#contres").val(),$("#cont1").val(),$("#cont2").val(),$("#cont3").val(),$("#level").val());
+//		if(inout == 3 && F_Flag == 3 && $(".commonjs").hide() == true) {
+//			layer.confirm('您要处理外线还是内线?请选择', {
+//				skin: "my-skin",
+//				btn: ['外线', '内线'],
+//				cancel: function(index, layero) {}
+//			}, function() {
+//				Assign(oid, flag, 1)
+//			}, function() {
+//				Assign(oid, flag, 2)
+//			});
+//		} else {
+//			Assign(oid, flag)
+//		}
 	} else if($("#clbm").val() && $("#clbm2").val('')) {
 		flag = 1
-		if(inout == 3 && F_Flag == 3 && $(".commonjs").hide()==true) {
-			layer.confirm('您要处理外线还是内线?请选择', {
-				skin : "my-skin",
-				btn: ['外线', '内线'],
-				cancel: function(index, layero) {}
-			}, function() {
-				Assign(oid, flag, 1)
-			}, function() {
-				Assign(oid, flag, 2)
+		if(inout == 9) {
+			debugger
+			layer.open({
+				shadeClose: true,
+				type: 2,
+				title: '内线处理方式',
+				maxmin: true, //开启最大化最小化按钮
+				area: ['70%', '80%'],
+				content: '../../WorkOrder/commonHtml/handleMethod.html?oid=' + oid + '&flag=' + flag
 			});
-		}else{
-			Assign(oid, flag)
+		} else {
+			debugger
+			Assign(oid, flag,'0',$("#contres").val(),$("#cont1").val(),$("#cont2").val(),$("#cont3").val(),$("#level").val())
 		}
+		//		if(inout == 3 && F_Flag == 3 && $(".commonjs").hide() == true) {
+		//			layer.confirm('您要处理外线还是内线?请选择', {
+		//				skin: "my-skin",
+		//				btn: ['外线', '内线'],
+		//				cancel: function(index, layero) {}
+		//			}, function() {
+		//				Assign(oid, flag, 1)
+		//			}, function() {
+		//				Assign(oid, flag, 2)
+		//			});
+		//		} else {
+		//			Assign(oid, flag)
+		//		}
 	} else if($("#clbm2").val() && $("#clbm").val('')) {
 		flag = 2
-		if(inout == 3 && F_Flag == 3 && $(".commonjs").hide()==true) {
-			layer.confirm('您要处理外线还是内线?请选择', {
-				skin : "my-skin",
-				btn: ['外线', '内线'],
-				cancel: function(index, layero) {}
-			}, function() {
-				Assign(oid, flag, 1)
-			}, function() {
-				Assign(oid, flag, 2)
+		if(inout == 9) {
+			layer.open({
+				shadeClose: true,
+				type: 2,
+				title: '外线处理方式',
+				maxmin: true, //开启最大化最小化按钮
+				area: ['70%', '80%'],
+				content: '../../WorkOrder/commonHtml/handleMethod.html?oid=' + oid + '&flag=' + flag
 			});
-		}else{
-			Assign(oid, flag)
+		} else {
+			Assign(oid, flag,'0',$("#contres").val(),$("#cont1").val(),$("#cont2").val(),$("#cont3").val(),$("#level").val())
 		}
-	}else if($("#clbm2").val('') && $("#clbm").val('')){
+		//		if(inout == 3 && F_Flag == 3 && $(".commonjs").hide() == true) {
+		//			layer.confirm('您要处理外线还是内线?请选择', {
+		//				skin: "my-skin",
+		//				btn: ['外线', '内线'],
+		//				cancel: function(index, layero) {}
+		//			}, function() {
+		//				Assign(oid, flag, 1)
+		//			}, function() {
+		//				Assign(oid, flag, 2)
+		//			});
+		//		} else {
+		//			Assign(oid, flag)
+		//		}
+	} else if($("#clbm2").val('') && $("#clbm").val('')) {
 		layer.msg('请选择指派人员')
 	}
 
 }
 //指派
-function Assign(oid, flag, inoutflag) {
+function Assign(oid, flag,type, a, b, c, d, e) {
 	loadIndex = layer.load();
 	var isDetail = helper.request.queryString("isDetail"); //是否是详情页面的处理
 	var overtime = $(".chaishi").find('input[type="radio"]:checked').val()
@@ -1190,7 +1225,8 @@ function Assign(oid, flag, inoutflag) {
 		async: true,
 		data: {
 			flag: flag,
-			inoutflag: inoutflag,
+			opttype:type,
+			//			inoutflag: inoutflag,
 			orderid: oid, //否	strubg	工单ID
 			overtime: overtime, //超时时限
 			clbm: $("#clbm").val(), //是	int	部门Id
@@ -1204,16 +1240,22 @@ function Assign(oid, flag, inoutflag) {
 			DrivePhone: $("#zxphone").val(),
 			ReturnAccount2: $("#fzje").val(), //销售内勤返账金额
 			ReturnAccount3: $("#qrfanzha").val(), //销售财务曲确认返账金额			
-//			EventReason: $("#ereason").val(),
+			//			EventReason: $("#ereason").val(),
 			WorkmanShip: $("#gyi").val(),
 			Manufacturers: $("#ylcj").val(),
 			ProductionNum: $("#scsl").val(),
 			cont: $("#cont").val(), //指派说明
-			Supercont: $("#contres").val(), //否	处理内容	
-			EventReason: $("#cont1").val(),//问题原因
-			ResponsibleUnit: $("#cont2").val(),//责任单位
-			ImprovementRequirements: $("#cont3").val(),//整改计划
-			TS_Level: $("#level").val(),//重要级别
+			//			Supercont: $("#contres").val(), //否	处理内容	
+			//			EventReason: $("#cont1").val(), //问题原因
+			//			ResponsibleUnit: $("#cont2").val(), //责任单位
+			//			ImprovementRequirements: $("#cont3").val(), //整改计划
+			//			TS_Level: $("#level").val(), //重要级别
+			Supercont: $("#contres").val(), //否	处理内容
+			cont2: a, //否	另一条线处理内容
+			EventReason: b, //问题原因
+			ResponsibleUnit: c, //责任单位
+			ImprovementRequirements: d, //整改计划
+			TS_Level: e, //重要级别
 			isApprovalp: $("#gcDuanxin").find('input[type="radio"]:checked').val(), //高层办理
 			hclid: $("#gcRevice").val(), //办理人员
 			sms: $("#duanxin").find('input[type="radio"]:checked').val(), //短信提醒
@@ -1221,13 +1263,13 @@ function Assign(oid, flag, inoutflag) {
 			PreliminaryOpinion: $("#zhibao").val(), //初审意见
 			QualityEventLevel: $("#dengji").val(),
 			ApprovalDisagree: $("#butong").val(),
-//			ResponsibleUnit: arr.toString(),
+			//			ResponsibleUnit: arr.toString(),
 			ApprovalOpinions: $("#yijian").find('input[type="radio"]:checked').val(),
 			CompensationMethod: $("#buchang").find('input[type="radio"]:checked').val(),
 			CompensationMoney: $("#buqian").val(),
 			CResponsibleUnits: $("#danwei").val(),
 			//			Fquantity: $("#shuliang").val(),
-//			ImprovementRequirements: $("#yaoqiu").val(),
+			//			ImprovementRequirements: $("#yaoqiu").val(),
 			CApprovalNo: $("#danhao").val(),
 			F_Files: proimglist && proimglist.join(','),
 			Fquantity: $("#fanzha").val(),
@@ -1267,6 +1309,7 @@ function Assign(oid, flag, inoutflag) {
 			layer.close(loadIndex);
 			if(result.state.toLowerCase() == "success") {
 				localStorage.removeItem("workDetail")
+				localStorage.removeItem("handleMethod")
 				$("#clgd").attr("disabled", true);
 				$("#clgd").val("确定");
 				$(document).on('click', '#clgd');
@@ -1309,7 +1352,7 @@ $(document).ready(function() {
 	var rtype = helper.request.queryString("rtype"); //工单类型
 	var rstate = helper.request.queryString("rstate"); //工单类型
 	if(ID) {
-		getWorkOrderInfo(ID,rstate);
+		getWorkOrderInfo(ID, rstate);
 	}
 
 });
@@ -1329,6 +1372,7 @@ function ZYJB(obj) {
 		}
 	})
 }
+
 function SCCS(obj) {
 	obj.empty();
 	obj.append('<option selected="selected" value="">请选择</option>');

CallCenterWeb.UI/WorkOrder/commonHtml/js/materiel.js

@@ -13,7 +13,6 @@ $(document).ready(function() {
 		initTable();
 	});
 
-
 	if($.cookie('userRoleCode') == 'BLRY') {
 		$(".nosee").hide()
 	}
@@ -79,9 +78,10 @@ function formatterContent(val) {
 
 //格式化 备注
 function formatterDetail(val) {
+//	console.log(val)
 	if(val) {
-		var strD = decodeURIComponent(val);
-		strD = helper.filter.filterHTMLTag(strD);
+//		var strD = decodeURIComponent(val);
+		strD = helper.filter.filterHTMLTag(val);
 		if(strD.length > 10) {
 			strD = strD.substring(0, 10) + '...';
 		}

CallCenterWeb.UI/WorkOrder/commonHtml/orderDetails.html

@@ -193,11 +193,11 @@
 							<td>
 								<span id="client_ciont"></span>
 							</td>
-							<th>业务员:</th>
+							<th>业务经理:</th>
 							<td>
 								<span id="client_wich"></span>
 							</td>
-							<th>电话:</th>
+							<th>业务经理电话:</th>
 							<td>
 								<span id="client_bnum"></span>
 							</td>

CallCenterWeb.UI/WorkOrder/js/orderOperation.js

@@ -33,6 +33,7 @@ function btn_detail(oid, isCallScreen) {
 	detailOrderNum = $(oid).attr("index")
 	console.log(detailOrderNum)
 	layer.open({
+		shadeClose: true,
 		type: 2,
 		title: '工单详情',
 		maxmin: true, //开启最大化最小化按钮
@@ -126,9 +127,9 @@ function btn_visit(oid) {
 	});
 }
 //撤回
-function btn_withdraw(oid, inf, inoutstate, flagstate) {
-	console.log(oid, inf, inoutstate, flagstate)
-	if(inoutstate == 3 && flagstate == 3) {
+function btn_withdraw(oid, inf, inoutstate, flagstate,woflag) {
+	console.log(oid, inf, inoutstate, flagstate,woflag)
+	if(inoutstate == 3 && flagstate == 3 && woflag != 9) {
 		layer.confirm('您要撤回外线还是内线?请选择', {
 			skin: "my-skin",
 			btn: ['外线', '内线'],

CallCenterWeb.UI/callScreen/call1.js

@@ -885,6 +885,7 @@ function btn_detailta(oid, isCallScreen) {
 	detailOrderNum = oid
 	console.log(detailOrderNum)
 	layer.open({
+		shadeClose: true,
 		type: 2,
 		title: '工单详情',
 		maxmin: true, //开启最大化最小化按钮

CallCenterWeb.UI/callScreen/callScreen.html

@@ -918,7 +918,8 @@
 										<thead>
 											<tr>
 												<th data-field="F_WorkOrderCode" data-formatter="formatterWorkOrderID" data-align="center">工单编号</th>
-												<th data-field="F_StateName" data-width="110" data-align="center">工单状态</th>
+												<th data-field="F_StateName" data-width="110" data-align="center">外线工单状态</th>
+												<th data-field="F_StateName2" data-width="110" data-align="center">内线工单状态</th>
 												<!-- <th data-field="IsEffective" data-formatter="formatterIsEffective" data-align="center">工单有效性</th> -->
 												<th data-field="F_TypeName" data-align="center">工单类型</th>
 												<!-- <th data-field="TypeClassName" data-align="center">业务办理</th> -->

CallCenterWeb.UI/visit/Tobeend.html

@@ -92,7 +92,7 @@
 							<th data-field="F_CusPhone" data-align="center">客户电话</th>
 							<th data-field="F_Description" data-align="center" data-formatter="formatterDetails">问题描述</th>
 							<th data-field="F_DealResult" data-align="center">处理意见</th>
-							<th data-field="F_IsVisit" data-width="150" data-align="center">是否回访</th>
+							<th data-field="F_IsVisit" data-align="center">是否回访</th>
 							<th data-field="WorkOrderID" data-class="workOprate workOprate2" data-formatter="formatterOprateDispose" data-align="center">操作工单</th>
 						</tr>
 					</thead>

CallCenterWeb.UI/visit/awaitVist.html

@@ -90,7 +90,7 @@
 							<th data-field="F_Description" data-align="center" data-formatter="formatterDetails">问题描述</th>
 							<th data-field="F_DealResult" data-align="center">处理意见</th>
 							<th data-field="F_VisitBy" data-align="center">回访人</th>
-							<th data-field="F_IsVisit" data-width="150" data-align="center">是否回访</th>
+							<th data-field="F_IsVisit" data-align="center">是否回访</th>
 							<th data-field="F_VisitOn" data-width="150" data-align="center">回访时间</th>
 							<th data-field="F_ID" data-formatter="formatterOprateT" data-align="center">操作</th>
 						</tr>

CallCenterWeb.UI/visit/haveVisit.html

@@ -116,12 +116,12 @@
 							<th data-field="F_DealResult" data-align="center">处理意见</th>
 							<th data-field="F_Callresults" data-align="center">呼叫结果</th>
 							<th data-field="F_VisitBy" data-align="center">回访人</th>
-							<th data-field="F_NPS" data-align="center">NPS</th>
-							<th data-field="F_ProductQuality" data-align="center">产品质量</th>
-							<th data-field="F_ServiceAttitude" data-align="center">服务态度</th>
-							<th data-field="F_VisitResultScore" data-align="center">处理结果</th>
-							<th data-field="F_EffectiveScore" data-align="center">处理时效</th>
-							<th data-field="F_EvaluationResult" data-align="center">评价结果</th>
+							<th data-field="F_NPS" data-formatter="formatternps"  data-align="center">NPS</th>
+							<th data-field="F_ProductQuality" data-formatter="formatternps" data-align="center">产品质量</th>
+							<th data-field="F_ServiceAttitude" data-formatter="formatternps" data-align="center">服务态度</th>
+							<th data-field="F_VisitResultScore" data-formatter="formatternps" data-align="center">处理结果</th>
+							<th data-field="F_EffectiveScore" data-formatter="formatternps" data-align="center">处理时效</th>
+							<th data-field="F_EvaluationResult" data-formatter="formatternps" data-align="center">评价结果</th>
 							<th data-field="F_MailingNumber" data-align="center">样品邮寄单号</th>
 							<th data-field="F_ExpressName" data-align="center">快递名称</th>
 							<th data-field="F_IsVisit" data-width="150" data-align="center">是否回访</th>
@@ -131,381 +131,6 @@
 					</thead>
 				</table>
 			</div>
-			<!--查看详情开始-->
-			<!--<div class="ckxq Hidens">
-				<ul class="clearfix ckxq_ul">
-					<li class="Active">工单详情</li>
-					<li>外线处理记录</li>
-					<li>内线处理记录</li>
-					<li>催办记录</li>
-					<li>回访记录</li>
-					<li>修改记录</li>
-					<li>附件记录</li>
-					<li>抄送记录</li>
-					<span class="Closed">×</span>
-				</ul>
-				<div class="gdxq">
-					<table id="gdxq_table" border="0" class="table table-bordered  table-hover " style="width: 100%;">
-						<tbody class="tbodys">
-							<tr>
-								<th>工单编号：</th>
-								<td>
-									<span id="xq_gdbh"></span>
-								</td>
-								<th>工单状态：</th>
-								<td>
-									<span id="xq_gdlx"></span>
-								</td>
-								<th>工单来源：</th>
-								<td data-formatter="order">
-									<span id="xq_cjsj"></span>
-								</td>
-								<th>工单类型：</th>
-								<td>
-									<span id="xq_gdzt"></span>
-								</td>
-							</tr>
-							<tr style="display: none;" class="zixun1">
-								<th>问题类别:</th>
-								<td data-formatter="order">
-									<span id="con_witl"></span>
-								</td>
-								<th>产品名称:</th>
-								<td>
-									<span id="con_cpiit"></span>
-								</td>
-								<th>问题数量:</th>
-								<td>
-									<span id="con_wtlin"></span>
-								</td>
-								<th>销售基地:</th>
-								<td>
-									<span id="con_refer"></span>
-								</td>
-							</tr>
-							<tr style="display: none;" class="tousu1">
-								<th>产品名称:</th>
-								<td>
-									<span id="lain_cuse"></span>
-								</td>
-								<th>问题数量:</th>
-								<td>
-									<span id="lain_licti"></span>
-								</td>
-								<th>销售基地:</th>
-								<td>
-									<span id="lain_citon"></span>
-								</td>
-								<th>生产批次号:</th>
-								<td>
-									<span id="lain_kicou"></span>
-								</td>
-							</tr>
-							<tr style="display: none;" class="tousu1">
-								<th>问题类别1:</th>
-								<td>
-									<span id="lain_with1"></span>
-								</td>
-								<th>问题类别2:</th>
-								<td>
-									<span id="lain_with2"></span>
-								</td>
-								<th>问题类别3:</th>
-								<td>
-									<span id="lain_with3"></span>
-								</td>
-								<th>重要级别:</th>
-								<td>
-									<span id="lain_iunct"></span>
-								</td>
-							</tr>
-							<tr style="display: none;" class="tousu1">
-								<th>品牌:</th>
-								<td>
-									<span id="Complaints_abou"></span>
-								</td>
-							</tr>
-							<tr style="display: none;" class="choujian1">
-								<th>问题类别:</th>
-								<td>
-									<span id="spot_spion"></span>
-								</td>
-								<th>抽检级别:</th>
-								<td>
-									<span id="spot_jion"></span>
-								</td>
-								<th>抽检单位:</th>
-								<td>
-									<span id="spot_danei"></span>
-								</td>
-								<th>抽检吨数:</th>
-								<td>
-									<span id="spot_dunus"></span>
-								</td>
-							</tr>
-							<tr style="display: none;" class="choujian1">
-								<th>抽检袋数:</th>
-								<td>
-									<span id="spot_dihi"></span>
-								</td>
-								<th>抽检时间:</th>
-								<td>
-									<span id="spot_time"></span>
-								</td>
-								<th>化验单位:</th>
-								<td>
-									<span id="spot_unit"></span>
-								</td>
-								<th>生产批次号:</th>
-								<td>
-									<span id="spot_cihao"></span>
-								</td>
-							</tr>
-							<tr style="display: none;" class="choujian1">
-								<th>公关费用金额:</th>
-								<td>
-									<span id="spot_cihicon"></span>
-								</td>
-							</tr>
-							<tr style="display: none;" class="bianhao1">
-								<th>客户编号：</th>
-								<td>
-									<span id="client_ciont"></span>
-								</td>
-								<th>业务员：</th>
-								<td>
-									<span id="client_wich"></span>
-								</td>
-								<th>电话：</th>
-								<td>
-									<span id="client_bnum"></span>
-								</td>
-								<th>经营品牌：</th>
-								<td>
-									<span id="client_xlx"></span>
-								</td>
-							</tr>
-							<tr style="display: none;" class="bianhao1">
-								<th>大区：</th>
-								<td>
-									<span id="client_uict"></span>
-								</td>
-								<th>分公司：</th>
-								<td>
-									<span id="client_tyicu"></span>
-								</td>
-							</tr>
-							<tr style="display: none;" class="bianhao1">
-								<th>物料编码：</th>
-								<td>
-									<span id="client_citon"></span>
-								</td>
-								<th>物料名称：</th>
-								<td>
-									<span id="client_ituec"></span>
-								</td>
-								<th>型号：</th>
-								<td>
-									<span id="client_uitio"></span>
-								</td>
-								<th>规格：</th>
-								<td>
-									<span id="client_yousft"></span>
-								</td>
-							</tr>
-							<tr style="display: none;" class="bianhao1">
-								<th>一级分类：</th>
-								<td>
-									<span id="client_classify1"></span>
-								</td>
-								<th>二级分类：</th>
-								<td>
-									<span id="client_classify2"></span>
-								</td>
-								<th>三级分类：</th>
-								<td>
-									<span id="client_classify3"></span>
-								</td>
-								<th>品牌：</th>
-								<td>
-									<span id="client_lovei"></span>
-								</td>
-							</tr>
-							<tr style="display: none;" class="bianhao1">
-								<th>复合肥肥效：</th>
-								<td>
-									<span id="client_fpeiro"></span>
-								</td>
-								<th>产品线：</th>
-								<td>
-									<span id="client_chnpin"></span>
-								</td>
-								<th>工艺：</th>
-								<td>
-									<span id="client_goniy"></span>
-								</td>
-							</tr>
-							<tr style="display: none;" class="kehu1">
-								<th>客户姓名：</th>
-								<td>
-									<span id="xq_khxm"></span>
-								</td>
-								<th>客户电话：</th>
-								<td>
-									<span id="xq_khdh"></span>
-								</td>
-								<th>公司名称：</th>
-								<td>
-									<span id="xq_company"></span>
-								</td>
-							</tr>
-							<tr style="display: none;" class="kehu1">
-								<th>事发地省：</th>
-								<td>
-									<span id="xq_source"></span>
-								</td>
-								<th>事发地市：</th>
-								<td>
-									<span id="xq_dieuig"></span>
-								</td>
-								<th>事发区县：</th>
-								<td>
-									<span id="xq_handle"></span>
-								</td>
-								<th>事发地乡：</th>
-								<td>
-									<span id="xq_fkdep"></span>
-								</td>
-							</tr>
-							<tr style="display: none;" class="kehu1">
-								<th>事发地详细地址：</th>
-								<td>
-									<span id="xq_responseUser"></span>
-								</td>
-								<th>问题描述：</th>
-								<td>
-									<span id="xq_description"></span>
-								</td>
-								<th>上级处理意见：</th>
-								<td>
-									<span id="xq_suggestion"></span>
-								</td>
-								<th>备注：</th>
-								<td>
-									<span id="xq_bitye"></span>
-								</td>
-							</tr>
-							<tr>
-								<th>处理详情(外)：</th>
-								<td>
-									<span id="xq_details"></span>
-								</td>
-								<th>处理详情(内)：</th>
-								<td>
-									<span id="xq_details2"></span>
-								</td>
-								<th>注解：</th>
-								<td>
-									<span id="xq_zhujie"></span>
-								</td>
-							</tr>
-							<tr>
-
-							</tr>
-						</tbody>
-					</table>
-				</div>
-				<div class="gdxq" style="display:none;">
-					<table id="itemTableList1" data-row-style="rowStyle" data-query-params="queryParams" data-pagination="true">
-						<thead>
-							<tr>
-								<th data-field="WorkOrderID" data-width="20%" data-align="left" data-formatter="formatterDealDetail">处理详情</th>
-								<th data-field="F_OptContent" data-align="left">处理内容</th>
-								<th data-field="F_CreateTime" data-width="10%" data-align="center">创建时间</th>
-								<th data-field="Timeuse" data-width="10%" data-align="center">节点用时</th>
-							</tr>
-						</thead>
-					</table>
-				</div>
-				<div class="gdxq" style="display:none;">
-					<table id="itemTableList11" data-row-style="rowStyle" data-query-params="queryParams" data-pagination="true">
-						<thead>
-							<tr>
-								<th data-field="WorkOrderID" data-width="20%" data-align="left" data-formatter="formatterDealDetail">处理详情</th>
-								<th data-field="F_OptContent" data-align="left">处理内容</th>
-								<th data-field="F_CreateTime" data-width="10%" data-align="center">创建时间</th>
-								<th data-field="Timeuse" data-width="10%" data-align="center">节点用时</th>
-							</tr>
-						</thead>
-					</table>
-				</div>
-				<div class="gdxq" style="display:none;">
-					<table id="itemTableList2" data-row-style="rowStyle" data-query-params="queryParams" data-pagination="true">
-						<thead>
-							<tr>
-								<th data-field="F_CreateUser" data-width="6%" data-align="center">催办人</th>
-								<th data-field="F_NextDept" data-width="6%" data-align="center">被催办部门</th>
-								<th data-field="F_NextUser" data-width="6%" data-align="center">被催办人</th>
-								<th data-field="F_OptContent" data-align="left">催办详情</th>
-								<th data-field="F_CreateTime" data-width="10%" data-align="center">创建时间</th>
-							</tr>
-						</thead>
-					</table>
-				</div>
-				<div class="gdxq" style="display:none;">
-					<table id="itemTableList3" data-row-style="rowStyle" data-query-params="queryParams" data-pagination="true">
-						<thead>
-							<tr>
-								<th data-field="F_CreateUser" data-width="15%" data-align="center">回访人</th>
-								<th data-field="F_OptContent" data-width="" data-align="left">回访详情</th>
-								<th data-field="F_CreateTime" data-width="10%" data-align="center">创建时间</th>
-							</tr>
-						</thead>
-					</table>
-				</div>
-				<div class="gdxq" style="display:none;">
-					<table id="itemTableList4" data-row-style="rowStyle" data-query-params="queryParams" data-pagination="true">
-						<thead>
-							<tr>
-								<th data-field="F_WoID" data-align="center">工单编号</th>
-								<th data-field="F_OptContent" data-align="left">修改内容</th>
-								<th data-field="F_CreateUser" data-align="center">修改人</th>
-								<th data-field="F_CreateTime" data-width="180" data-align="center">修改时间</th>
-							</tr>
-						</thead>
-					</table>
-				</div>
-				<div class="gdxq" style="display:none;">
-					<table id="itemTableList5" data-row-style="rowStyle" data-query-params="queryParams" data-pagination="true">
-						<thead>
-							<table id="gdxq_table" border="0" class="table table-bordered  table-hover " style="width: 100%;">
-								<tbody class="tbodys">
-									<tr>
-										<th>附件：</th>
-										<td colspan="3">
-											<ul id="fileList" class="clearfix">
-											</ul>
-										</td>
-
-									</tr>
-							</table>
-						</thead>
-					</table>
-				</div>
-				<div class="gdxq" style="display:none;">
-					<table id="itemTableList6" data-row-style="rowStyle" data-query-params="queryParams" data-pagination="true">
-						<thead>
-							<tr>
-								<th data-field="F_CreateUser" data-width="20%" data-align="center">抄送详情</th>
-								<th data-field="F_OptContent" data-width="" data-align="left">抄送内容</th>
-								<th data-field="F_CreateTime" data-width="10%" data-align="center">创建时间</th>
-							</tr>
-						</thead>
-					</table>
-				</div>
-			</div>-->
-			<!--查看详情结束-->
-
 		</div>
 
 		<script src="../js/laydate/laydate.js"></script>

CallCenterWeb.UI/visit/js/visitList.js

@@ -253,6 +253,7 @@ function btn_detail(oid) {
 	detailOrderNum = $(oid).attr("index")
 	console.log(detailOrderNum)
 	layer.open({
+		shadeClose: true,
 		type: 2,
 		title: '工单详情',
 		maxmin: true, //开启最大化最小化按钮
@@ -444,284 +445,6 @@ function btn_haveVisit(oid) {
 		content: '../commonTpl/LookMessages.html?oid=' + oid
 	});
 }
-//获取工单详情
-//function getWorkOrderDetails() {
-//	$.getJSON(huayi.config.callcenter_url + 'WorkOrderNew/GetDetails', {
-//		id: detailOrderNum,
-//		"token": $.cookie("token")
-//	}, function(result) {
-//		if(result.state.toLowerCase() == "success") {
-//
-//			if(result.rows && result.rows.length > 0) {
-//				var data = result.rows[0];
-//				$("#xq_gdbh").text(data.F_WorkOrderCode); //工单编号
-//				$("#xq_gdlx").text(data.F_StateName); //工单状态
-//				$("#xq_cjsj").text(data.F_SourceName); //工单来源
-//				$("#xq_gdzt").text(data.F_TypeName); //工单类型
-//				// 咨询详情模块
-//				$("#con_witl").text(data.F_QuestionType); //问题类别
-//				$("#con_cpiit").text(data.F_TS_Category); //产品名称
-//				$("#con_wtlin").text(data.F_ZX_Quantity); //问题数量
-//				$("#con_refer").text(data.F_SalesBase); //销售基地
-//				// 投诉详情模块	
-//				$("#lain_cuse").text(data.F_TS_Category); //产品名称
-//				$("#lain_licti").text(data.F_ZX_Quantity); //问题数量
-//				$("#lain_citon").text(data.F_SalesBase); //销售基地
-//				$("#lain_kicou").text(data.F_BatchNumber); //生产批次号
-//				$("#lain_with1").text(data.F_QuestionTypeone); //问题类别1
-//				$("#lain_with2").text(data.F_QuestionTypetwo); //问题类别2
-//				$("#lain_with3").text(data.F_QuestionType); //问题类别3
-//				$("#lain_iunct").text(data.F_TS_Level); //重要级别
-//				$("#Complaints_abou").text(data.F_WorkerBrand); //品牌
-//				// 抽检详情模块
-//				$("#spot_spion").text(data.F_QuestionType); //问题类别
-//				$("#spot_jion").text(data.F_CJ_Level); //抽检级别
-//				$("#spot_danei").text(data.F_CJ_Unit); //抽检单位
-//				$("#spot_dunus").text(data.F_CJ_Tonnage); //抽检吨数
-//				$("#spot_dihi").text(data.F_CJ_BagNo); //抽检袋数
-//				$("#spot_time").text(data.F_CJ_Time); //抽检时间
-//				$("#spot_unit").text(data.F_CJ_TestUnit); //化验单位
-//				$("#spot_cihao").text(data.F_BatchNumber); //生产批次号
-//				$("#spot_cihicon").text(data.F_CJ_Outlay); //公关费用
-//				// 客户编号 物料编号模块
-//				$("#client_ciont").text(data.F_CustomerID); //客户编号 ........
-//				$("#client_wich").text(data.F_Salesman); //业务员
-//				$("#client_bnum").text(data.F_SalesPhone); //电话
-//				$("#client_xlx").text(data.client_xlx); //经营品牌
-//				$("#client_uict").text(data.F_AreaName); //大区
-//				$("#client_tyicu").text(data.F_BranchName); //分公司
-//
-//				$("#client_citon").text(data.F_MaterialID); //物料编码
-//				$("#client_ituec").text(data.F_MaterialName); //物料名称
-//				$("#client_uitio").text(data.F_Model); //型号
-//				$("#client_yousft").text(data.F_Specs); //规格
-//				$("#client_classify1").text(data.F_Level1); //一级分类
-//				$("#client_classify2").text(data.F_Level2); //二级分类
-//				$("#client_classify3").text(data.F_Level3); //三级分类
-//				$("#client_lovei").text(data.F_Brand); //品牌
-//				$("#client_fpeiro").text(data.F_MaterialEffect); //复合肥肥效
-//				$("#client_chnpin").text(data.F_Pipeline); //产品线
-//				$("#client_goniy").text(data.F_Craft); //工艺
-//				// 客户姓名 事发地模块
-//				$("#xq_khxm").text(data.F_CusName); //客户姓名
-//				$("#xq_khdh").text(data.F_CusPhone); //客户电话
-//				$("#xq_company").text(data.F_CompanyName); //公司名称
-//				$("#xq_source").text(data.F_IncidentProvince); //事发地省
-//				$('#xq_dieuig').text(data.F_IncidentCity); //事发地市	
-//				$('#xq_handle').text(data.F_IncidentCountry); //事发地县	
-//				$("#xq_fkdep").text(data.F_IncidentTownship); //事发地乡
-//				$("#xq_responseUser").text(data.F_IncidentDetailed); //事发地详细地址
-//				$("#xq_description").text(data.F_Description); //问题描述
-//				$("#xq_suggestion").text(data.SuperiorOpinion); //上级处理意见
-//				$("#xq_details").text(data.F_DealContent); //处理详情
-//				$("#xq_details2").text(data.F_DealContent2);
-//				$("#xq_bitye").text(data.F_VisitRemarks); //品牌
-//				$("#xq_zhujie").text(data.F_Annotation); //注解
-//
-//				if($("#xq_gdzt").text() == "咨询") {
-//					$('.zixun1').show(); //咨询模块
-//					$('.kehu1').show(); //客户姓名 事发地
-//					$('.tousu1').hide(); //咨询模块
-//					$('.bianhao1').hide(); //客户 物料编码
-//					$('.choujian1').hide(); //咨询模块
-//				} else if($("#xq_gdzt").text() == "投诉") {
-//					$('.tousu1').show(); //咨询模块
-//					$('.bianhao1').show(); //客户 物料编码
-//					$('.kehu1').show(); //客户姓名 事发地
-//					$('.zixun1').hide(); //咨询模块
-//
-//					$('.choujian1').hide(); //咨询模块
-//				} else if($("#xq_gdzt").text() == "抽检") {
-//					$('.choujian1').show(); //咨询模块
-//					$('.bianhao1').show(); //客户 物料编码
-//					$('.kehu1').show(); //客户姓名 事发地
-//					$('.tousu1').hide(); //咨询模块
-//					$('.zixun1').hide(); //咨询模块
-//
-//				} else if($("#xq_gdzt").text() == "咨询") {
-//					$('.zixun1').show(); //咨询模块
-//					$('.kehu1').show(); //客户姓名 事发地
-//					$('.tousu1').hide(); //咨询模块
-//					$('.bianhao1').hide(); //客户 物料编码
-//					$('.choujian1').hide(); //咨询模块
-//				}
-//			}
-//		}
-//	});
-//}
-
-//获取 处理记录催办记录评论记录
-//function getItemList(type) {
-//	//先销毁表格
-//	var table;
-//	if(type == 3) {
-//		table = $("#itemTableList2");
-//	}
-//	if(type == 4) {
-//		table = $("#itemTableList3");
-//	}
-//	//	var table = $("#itemTableList3");
-//	table.bootstrapTable('destroy');
-//	//初始化表格,动态从服务器加载数据
-//	table.bootstrapTable({
-//		method: "get", //使用get请求到服务器获取数据
-//		url: huayi.config.callcenter_url + "WorkOrderNew/GetItemList", //获取数据的Servlet地址
-//		contentType: 'application/x-www-form-urlencoded',
-//		striped: true, //表格显示条纹
-//		pagination: true, //启动分页
-//		pageSize: 10, //每页显示的记录数
-//		pageNumber: 1, //当前第几页
-//		pageList: [10, 20, 50, 100], //记录数可选列表
-//		search: false, //是否启用查询
-//		showColumns: false, //显示下拉框勾选要显示的列
-//		showRefresh: false, //显示刷新按钮
-//		sidePagination: "server", //表示服务端请求
-//		//设置为undefined可以获取pageNumber，pageSize，searchText，sortName，sortOrder
-//		//设置为limit可以获取limit, offset, search, sort, order
-//		queryParamsType: "undefined",
-//		queryParams: function queryParams(params) { //设置查询参数
-//			var param = {
-//				pageindex: params.pageNumber,
-//				pagesize: params.pageSize,
-//				type: type - 1,
-//				id: detailOrderNum,
-//				token: $.cookie("token")
-//			};
-//			return param;
-//		},
-//		onLoadSuccess: function() { //加载成功时执行
-//			//layer.msg("加载成功");
-//		},
-//		onLoadError: function() { //加载失败时执行
-//			//layer.msg("加载数据失败", { time: 1500, icon: 2 });
-//		}
-//	});
-//}
-
-//function getItemListTypeout() {
-//	//先销毁表格
-//	var table = $("#itemTableList1");
-//	table.bootstrapTable('destroy');
-//	//初始化表格,动态从服务器加载数据
-//	table.bootstrapTable({
-//		method: "get", //使用get请求到服务器获取数据
-//		url: huayi.config.callcenter_url + "WorkOrderNew/GetItemList", //获取数据的Servlet地址
-//		contentType: 'application/x-www-form-urlencoded',
-//		striped: true, //表格显示条纹
-//		pagination: true, //启动分页
-//		pageSize: 10, //每页显示的记录数
-//		pageNumber: 1, //当前第几页
-//		pageList: [10, 20, 50, 100], //记录数可选列表
-//		search: false, //是否启用查询
-//		showColumns: false, //显示下拉框勾选要显示的列
-//		showRefresh: false, //显示刷新按钮
-//		sidePagination: "server", //表示服务端请求
-//		//设置为undefined可以获取pageNumber，pageSize，searchText，sortName，sortOrder
-//		//设置为limit可以获取limit, offset, search, sort, order
-//		queryParamsType: "undefined",
-//		queryParams: function queryParams(params) { //设置查询参数
-//			var param = {
-//				pageindex: params.pageNumber,
-//				pagesize: params.pageSize,
-//				type: 1,
-//				flag: 1,
-//				id: detailOrderNum, // 工单ID
-//				token: $.cookie("token")
-//			};
-//			return param;
-//		},
-//		onLoadSuccess: function() { //加载成功时执行
-//			//layer.msg("加载成功");
-//		},
-//		onLoadError: function() { //加载失败时执行
-//			//layer.msg("加载数据失败", { time: 1500, icon: 2 });
-//		}
-//	});
-//}
-
-//function getItemListTypein() {
-//	//先销毁表格
-//	var table = $("#itemTableList11");
-//	table.bootstrapTable('destroy');
-//	//初始化表格,动态从服务器加载数据
-//	table.bootstrapTable({
-//		method: "get", //使用get请求到服务器获取数据
-//		url: huayi.config.callcenter_url + "WorkOrderNew/GetItemList", //获取数据的Servlet地址
-//		contentType: 'application/x-www-form-urlencoded',
-//		striped: true, //表格显示条纹
-//		pagination: true, //启动分页
-//		pageSize: 10, //每页显示的记录数
-//		pageNumber: 1, //当前第几页
-//		pageList: [10, 20, 50, 100], //记录数可选列表
-//		search: false, //是否启用查询
-//		showColumns: false, //显示下拉框勾选要显示的列
-//		showRefresh: false, //显示刷新按钮
-//		sidePagination: "server", //表示服务端请求
-//		//设置为undefined可以获取pageNumber，pageSize，searchText，sortName，sortOrder
-//		//设置为limit可以获取limit, offset, search, sort, order
-//		queryParamsType: "undefined",
-//		queryParams: function queryParams(params) { //设置查询参数
-//			var param = {
-//				pageindex: params.pageNumber,
-//				pagesize: params.pageSize,
-//				type: 1,
-//				flag: 2,
-//				id: detailOrderNum, // 工单ID
-//				token: $.cookie("token")
-//			};
-//			return param;
-//		},
-//		onLoadSuccess: function() { //加载成功时执行
-//			//layer.msg("加载成功");
-//		},
-//		onLoadError: function() { //加载失败时执行
-//			//layer.msg("加载数据失败", { time: 1500, icon: 2 });
-//		}
-//	});
-//}
-//获取修改记录
-//function initTableLogs() {
-//	//先销毁表格
-//	$('#itemTableList4').bootstrapTable('destroy');
-//	//初始化表格,动态从服务器加载数据
-//	$("#itemTableList4").bootstrapTable({
-//		method: "get", //使用get请求到服务器获取数据
-//		url: huayi.config.callcenter_url + "WorkOrderLogs/GetList", //获取数据的Servlet地址
-//		contentType: 'application/x-www-form-urlencoded',
-//		striped: true, //表格显示条纹
-//		pagination: true, //启动分页
-//		pageSize: 10, //每页显示的记录数
-//		pageNumber: 1, //当前第几页
-//		pageList: [10, 20, 50, 100], //记录数可选列表
-//		search: false, //是否启用查询
-//		showColumns: false, //显示下拉框勾选要显示的列
-//		showRefresh: false, //显示刷新按钮
-//		sidePagination: "server", //表示服务端请求
-//		//设置为undefined可以获取pageNumber，pageSize，searchText，sortName，sortOrder
-//		//设置为limit可以获取limit, offset, search, sort, order
-//		queryParamsType: "undefined",
-//		queryParams: function queryParams(params) { //设置查询参数
-//			var param = {
-//				page: params.pageNumber, //否	int	当前页
-//				pagesize: params.pageSize, //否	int	每页数
-//				// orderid: detailOrderNum, //否	string	工单编号
-//				orderid: $("#xq_gdbh").text(), //否	string 工单编号
-//				//				keyword: detailOrderNum, //否	string	模糊搜索（之前反馈内容，修改的反馈内容，工单编号）
-//				//starttime: $('#sc_time').val() && $('#sc_time').val().split(' ~ ')[0], //否	string	工单起止时间
-//				//endtime: $('#sc_time').val() && $('#sc_time').val().split(' ~ ')[1], //否	string	工单起止时间
-//				token: $.cookie("token"),
-//			};
-//			return param;
-//		},
-//		onLoadSuccess: function() { //加载成功时执行
-//			//layer.msg("加载成功");
-//			authorizeOperateButton();
-//		},
-//		onLoadError: function() { //加载失败时执行
-//			//layer.msg("加载数据失败", { time: 1500, icon: 2 });
-//		}
-//	});
-//}
 
 //格式化处理详情
 function formatterDealDetail(val, row) {
@@ -782,10 +505,20 @@ function formatterDetails(val, row) {
 		if(val.length > 10) {
 			val = val.substring(0, 10) + '...';
 		}
-//		return '<a href="javascript:;" onclick="btn_queDescribe(\'' + id + '\')">' + val + '</a>';
+		//		return '<a href="javascript:;" onclick="btn_queDescribe(\'' + id + '\')">' + val + '</a>';
 		return '<div><a onclick=btn_queDescribe(this) index="' + row.F_ID + '" >' + val + '</a></div>'
 	}
 }
+//格式化nps
+function formatternps(val, row) {
+	if(val) {
+		if(val == -1) {
+			return '未评价'
+		}else{
+			return val;
+		}
+	}
+}
 
 function btn_queDescribe(val) {
 	oid = $(val).attr("index")
@@ -883,102 +616,4 @@ function authorizeOperateButton() {
 			break;
 	}
 
-}
-//附件记录
-//function getWorkOrderDe() {
-//	$.getJSON(huayi.config.callcenter_url + 'WorkOrderNew/GetDetails', {
-//		id: detailOrderNum,
-//		"token": $.cookie("token")
-//	}, function(result) {
-//		if(result.state.toLowerCase() == "success") {
-//			var con = result;
-//			if(con) {
-//				$("#fileList").empty();
-//				var proimglist = con.FileUrl;
-//				if(proimglist && proimglist.length > 0) {
-//					$(proimglist).each(function(i, n) {
-//						var fileType = n.F_FileType;
-//						var fileType1 = n.F_FileType.split("\/")[0];
-//						if(fileType === '.jpg' || fileType === '.png' || fileType1 === 'image') {
-//							$('<div class="img-box">' +
-//								'<span class="img_mask"><span onclick=downloadFile("' + n.F_FileUrl + '","' + n.F_FileName + '","' + n.F_FileType +
-//								'") title="点击下载"><i class="fa fa-download" aria-hidden="true"></i></span></span>' +
-//								'<img layer-src="' + n.F_FileUrl + '" src="' + n.F_FileUrl + '" alt="' + n.F_FileName +
-//								'" class="image-item" /><div>').appendTo("#fileList");
-//						} else {
-//							$('<div class="img-box">' +
-//								'<span class="img_mask"><span href="javascript:;" onclick=downloadFile("' + n.F_FileUrl + '","' + n.F_FileName +
-//								'","' + n.F_FileType +
-//								'") title="点击下载"><i class="fa fa-download" aria-hidden="true"></i></span></span>' +
-//								'<span class="img_filename">' + n.F_OriName + n.F_FileName.split(".")[1] + '</span><div>').appendTo("#fileList");
-//						}
-//					});
-//					layer.photos({
-//						photos: '#fileList',
-//						anim: 5, //0-6的选择，指定弹出图片动画类型，默认随机（请注意，3.0之前的版本用shift参数）
-//						title: '查看图片',
-//						move: '.layui-layer-title',
-//						shadeClose: false,
-//						closeBtn: 1,
-//						area: ['80%', '90%'],
-//						tab: function(pic, layero) {
-//							$('.layui-layer-content').on("mousewheel", function(e, d) {
-//
-//								helper.methods.zoomImg($('#layui-layer-photos').find('img[alt="' + pic.alt + '"]'), d);
-//								$('#layui-layer-photos').find('img[alt="' + pic.alt + '"]').dragging({
-//									move: "both", //拖动方向，x y both
-//									randomPosition: false //初始位置是否随机
-//								});
-//								return false;
-//
-//							});
-//							helper.methods.initLayerPhotos('#layui-layer-photos', pic, layero);
-//						},
-//					});
-//				}
-//
-//			}
-//		}
-//	});
-//}
-
-//获取-抄送记录
-//function getItemListSend() {
-//	//先销毁表格
-//	var table = $("#itemTableList6");
-//	table.bootstrapTable('destroy');
-//	//初始化表格,动态从服务器加载数据
-//	table.bootstrapTable({
-//		method: "get", //使用get请求到服务器获取数据
-//		url: huayi.config.callcenter_url + "WorkOrderNew/GetItemList", //获取数据的Servlet地址
-//		contentType: 'application/x-www-form-urlencoded',
-//		striped: true, //表格显示条纹
-//		pagination: true, //启动分页
-//		pageSize: 10, //每页显示的记录数
-//		pageNumber: 1, //当前第几页
-//		pageList: [10, 20, 50, 100], //记录数可选列表
-//		search: false, //是否启用查询
-//		showColumns: false, //显示下拉框勾选要显示的列
-//		showRefresh: false, //显示刷新按钮
-//		sidePagination: "server", //表示服务端请求
-//		//设置为undefined可以获取pageNumber，pageSize，searchText，sortName，sortOrder
-//		//设置为limit可以获取limit, offset, search, sort, order
-//		queryParamsType: "undefined",
-//		queryParams: function queryParams(params) { //设置查询参数
-//			var param = {
-//				pageindex: params.pageNumber,
-//				pagesize: params.pageSize,
-//				type: 9,
-//				id: detailOrderNum, // 工单ID
-//				token: $.cookie("token")
-//			};
-//			return param;
-//		},
-//		onLoadSuccess: function() { //加载成功时执行
-//			//layer.msg("加载成功");
-//		},
-//		onLoadError: function() { //加载失败时执行
-//			//layer.msg("加载数据失败", { time: 1500, icon: 2 });
-//		}
-//	});
-//}
+}

CallCenterWeb.UI/visit/resultVisit.html

@@ -117,13 +117,13 @@
 							<th data-field="F_DealResult" data-align="center">处理意见</th>
 							<th data-field="F_Callresults" data-align="center">呼叫结果</th>
 							<th data-field="F_VisitBy" data-align="center">回访人</th>
-							<th data-field="F_NPS" data-align="center">NPS</th>
-							<th data-field="F_ProductQuality" data-align="center">产品质量</th>
-							<th data-field="F_ServiceAttitude" data-align="center">服务态度</th>
-							<th data-field="F_VisitResultScore" data-align="center">处理结果</th>
-							<th data-field="F_EffectiveScore" data-align="center">处理时效</th>
-							<th data-field="F_EvaluationResult" data-align="center">评价结果</th>
-							<th data-field="F_IsVisit" data-width="150" data-align="center">是否回访</th>
+							<th data-field="F_NPS" data-formatter="formatternps" data-align="center">NPS</th>
+							<th data-field="F_ProductQuality" data-formatter="formatternps" data-align="center">产品质量</th>
+							<th data-field="F_ServiceAttitude" data-formatter="formatternps" data-align="center">服务态度</th>
+							<th data-field="F_VisitResultScore" data-formatter="formatternps" data-align="center">处理结果</th>
+							<th data-field="F_EffectiveScore" data-formatter="formatternps" data-align="center">处理时效</th>
+							<th data-field="F_EvaluationResult" data-formatter="formatternps" data-align="center">评价结果</th>
+							<th data-field="F_IsVisit" data-align="center">是否回访</th>
 							<th data-field="F_VisitOn" data-width="150" data-align="center">回访时间</th>
 						</tr>
 					</thead>