add:类型

CallCenterWeb.UI/WorkOrder/AddWorkOrder.html

@@ -199,7 +199,7 @@
 				<table class="customerService">
 					<tbody>
 						<tr>
-							<th>工单类型：</th>
+							<th>工单类别：</th>
 							<td id="order_isover" colspan="7" class="col-md-6 r_order_type">
 								<label class="radio-inline">
 													   <input type="radio" name="type" value="1" checked="checked"> 咨询

CallCenterWeb.UI/WorkOrder/WorkOrderComplaintTracking.html

@@ -134,7 +134,7 @@
 						</div>
 						<div class="form-group">
 							<select class="form-control" id="searchComType">
-								<option value="">请选择投诉类别</option>
+								<option value="">请选择投诉类型</option>
 								
 								<option value="生鲜品">生鲜品</option>
 								<option value="禽产品">禽产品</option>

CallCenterWeb.UI/WorkOrder/WorkOrderSearch.html

@@ -137,7 +137,7 @@
 						</div>
 						<div class="form-group">
 							<select class="form-control" id="searchComType">
-								<option value="">请选择投诉类别</option>
+								<option value="">请选择投诉类型</option>
 								
 								<option value="生鲜品">生鲜品</option>
 								<option value="禽产品">禽产品</option>
@@ -225,6 +225,7 @@
 							<th data-field="F_DealResult" data-class="W240" data-formatter="formatterDealResult" data-align="center">落实情况</th>
 							<th data-field="F_State" data-class="W100" data-formatter="workOrderStateJudge" data-align="center">处理进度</th>
 							<th data-field="F_Type" data-class="W100" data-align="center" data-formatter="workOrderTypeJudge">工单类别</th>
+							<th data-field="F_ComplaintType" data-class="W100" data-align="center">工单类型</th>
 							<th data-field="F_TransferTime" data-class="W190" data-align="center">转派时间</th>
 							<th data-field="F_Receiving" data-class="W190" data-align="center">接单时间</th>
 							<th data-field="F_DealTime" data-class="W300margin searchType">处理时间</th>

CallCenterWeb.UI/callScreen/call.js

@@ -640,8 +640,14 @@ var orderTypeArray = ['咨询', '投诉', '重复', '抽检', '生鲜品', '禽
 
 // 工单类别返回值判断
 function workOrderTypeJudge (val, row) {
+	console.log(val, 'val')
+	var str = orderTypeArray[parseInt(val) - 1]
+	if (str === '投诉' && row.F_ComplaintType) {
+		str += '(' + row.F_ComplaintType + ')'
+	}
+	if (str) return '<div class="workOrderTypeJudgeText">'+ str +'</div>';
 	
-	return '<div>'+orderTypeArray[Number(val) - 1]+'</div>'
+	return '<div class="workOrderTypeJudgeText">投诉</div>';
 }
 
 //格式化 字符长度 25

CallCenterWeb.UI/callScreen/callScreen.html

@@ -647,7 +647,7 @@
                                     <table class="customerService">
                                         <tbody>
                                         	<tr>
-                                        		<th>工单类型：</th>
+                                        		<th>工单类别：</th>
                                         		<th colspan="7" style="padding-left: 0px;" id="order_isover">
                                         			<label class="radio-inline">
 													   <input type="radio" name="type" value="1" checked="checked"> 咨询
@@ -665,7 +665,7 @@
                                         		</th>
                                         	</tr>
                                         	<tr class="complaintWorkOrderRequired" style="display: none;">
-                                        		<th>投诉分类：</th>
+                                        		<th>工单类型：</th>
                                         		<th colspan="7" style="padding-left: 0px;" id="complainType">
                                         			<label class="radio-inline">
 														<input type="radio" name="complainType" value="生鲜品" > 生鲜品

CallCenterWeb.UI/js/WorkOrder/WorkOrder.js

@@ -101,7 +101,7 @@ var orderTypeArray = ['咨询', '投诉', '重复', '抽检'];
 // 工单类别返回值判断
 function workOrderTypeJudge (val, row) {
 	
-	var str = orderTypeArray[Number(val) - 1]
+		var str = orderTypeArray[parseInt(val) - 1]
 	if (str === '投诉' && row.F_ComplaintType) {
 		str += '(' + row.F_ComplaintType + ')'
 	}
@@ -1144,7 +1144,7 @@ function dcexcel(state, isdc, CJ, reduction, isreductions) {
 	var manufacturer = $("#searchManufacturerName").val(); //生产厂家
 	var problemCode = $("#searchProblemCodeName").val(); //问题代码
 	var type = $("#searchOrderType").val(); //工单类别
-	var comType = $("#searchComType").val(); //投诉类别
+	var comType = $("#searchComType").val()  === undefined ? '' : $("#searchComType").val(); //投诉类别
 	var dealTimely = $("#searchDealTimely").val(); // 工单级别
 	var see = $("#searchSee").val(); //	处理专员是否只查看负责区域单子
 	var reminder = $("#searchReminder").val(); //是否催单

CallCenterWeb.UI/js/WorkOrder/xgWork.js

@@ -81,7 +81,7 @@ function getWorkOrderDetails() {
 				$("#reason option:selected").val(data.F_Reason); //原因
 				//工单类型
 				$("#order_isover input[type=radio][name=type][value="+data.F_Type+"]").attr("checked",'checked');
-				$("#complainType input[type=radio][name=complainType][value="+data.F_ComplaintType+"]").attr("checked",'checked');
+				if (data.F_ComplaintType) $("#complainType input[type=radio][name=complainType][value="+data.F_ComplaintType+"]").attr("checked",'checked');
 				console.log(data.F_ComplaintType, 'data.F_ComplaintType')
 				if (data.F_Type === 1){
 					$(".isOverWrapper").show();