liuyifan 5 jaren geleden
bovenliggende
commit
58fd6fca17

+ 8 - 0
CallCenterWeb.UI/WorkOrder/WorkOrderParty.html

@@ -138,6 +138,13 @@
138 138
 								<option value="1">否</option>
139 139
 							</select>
140 140
 						</div>
141
+						<div class="form-group">
142
+							<select class="form-control" id="searchComplete">
143
+								<option value="">请选择是否完善</option>
144
+								<option value="0">是</option>
145
+								<option value="1">否</option>
146
+							</select>
147
+						</div>
141 148
 						<div class="form-group btn-position">
142 149
 							<button class="btns ss">搜索</button>
143 150
 							<button class="btns export">导出</button>
@@ -251,6 +258,7 @@
251 258
 							duplicatetime: $('#duplicateTime').val() && $('#duplicateTime').val().split(' ~ ')[0], //重复投诉开始时间
252 259
 							endduplicatetime: $('#duplicateTime').val() && $('#duplicateTime').val().split(' ~ ')[1], //重复投诉结束时间
253 260
 							reminder: $("#searchReminder").val(), //是否催单
261
+							incomplete: $("#searchComplete").val(), //是否完善
254 262
 							pageindex: params.pageNumber, //页码
255 263
 							pagesize: params.pageSize, //条数
256 264
 						};

+ 2 - 2
CallCenterWeb.UI/WorkOrder/WorkOrderReminder.html

@@ -4,9 +4,9 @@
4 4
 <head>
5 5
     <meta charset="UTF-8">
6 6
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
7
-    <link href="../css/init.css" rel="stylesheet" />
8 7
     <script src="../Script/Common/huayi.load.js"></script>
9 8
     <script src="../Script/Common/huayi.config.js"></script>
9
+    <link href="../css/init.css" rel="stylesheet" />
10 10
     <link href="../css/WorkOrder/Search.css" rel="stylesheet">
11 11
     <link rel="stylesheet" href="../js/zTree/zTreeStyle.css" />
12 12
     <link href="../js/bootstrap-select/css/bootstrap-select.css" rel="stylesheet" />
@@ -67,7 +67,7 @@
67 67
             <table class="customerService">
68 68
             	<tbody>
69 69
 					<tr>
70
-						<th style="text-align: center;">催单内容:</th>
70
+						<th style="text-align: center;" class="reminderTitle"></th>
71 71
 						<td colspan="7">
72 72
 						    <textarea name="" rows="5" cols="" placeholder="" id="cont" style="margin-top:10px;"></textarea>
73 73
 						</td>

+ 8 - 0
CallCenterWeb.UI/WorkOrder/WorkOrderSearch.html

@@ -153,6 +153,13 @@
153 153
 								<option value="1">否</option>
154 154
 							</select>
155 155
 						</div>
156
+						<div class="form-group">
157
+							<select class="form-control" id="searchComplete">
158
+								<option value="">请选择是否完善</option>
159
+								<option value="0">是</option>
160
+								<option value="1">否</option>
161
+							</select>
162
+						</div>
156 163
 						<div class="form-group btn-position">
157 164
 							<button class="btns ss">搜索</button>
158 165
 							<button class="btns export">导出</button>
@@ -264,6 +271,7 @@
264 271
 							duplicatetime: $('#duplicateTime').val() && $('#duplicateTime').val().split(' ~ ')[0], //重复投诉开始时间
265 272
 							endduplicatetime: $('#duplicateTime').val() && $('#duplicateTime').val().split(' ~ ')[1], //重复投诉结束时间
266 273
 							reminder: $("#searchReminder").val(), //是否催单
274
+							incomplete: $("#searchComplete").val(), //是否完善
267 275
 							pageindex: params.pageNumber, //页码
268 276
 							pagesize: params.pageSize, //条数
269 277
 						};

+ 3 - 3
CallCenterWeb.UI/css/WorkOrder/Search.css

@@ -503,12 +503,12 @@ textarea {
503 503
 }
504 504
 .W300margin .th-inner {
505 505
     width: 150px !important;
506
-    margin-right: 245px !important;
507
-    padding-left: 25px !important; 
506
+    margin-right: 265px !important;
507
+    padding-left: 40px !important; 
508 508
 }
509 509
 .W300margin{
510 510
     width: 150px !important;
511
-    margin-right: 245px !important;
511
+    margin-right: 265px !important;
512 512
     padding-left: 10px !important;
513 513
 }
514 514
 

+ 23 - 15
CallCenterWeb.UI/js/WorkOrder/WorkOrder.js

@@ -302,7 +302,7 @@ function authorizeOperateButton(userRoleCode) {
302 302
 				// 无操作列表样式修改
303 303
 				$('#workorderlist').find('.submitType').removeClass('W60margin').addClass('W100').css("text-align", "center"); //待提交
304 304
 				$('#workorderlist').find('.searchType').removeClass('W60margin').addClass('W100').css("text-align", "center"); //综合查询
305
-				$('#workorderlist').find('.repeatComplaintType').removeClass('W300margin').addClass('W180').css("text-align", "center"); //重复投诉表
305
+				$('#workorderlist').find('.repeatComplaintType').removeClass('W300margin').addClass('W190').css("text-align", "center"); //重复投诉表
306 306
 				$('#workorderlist').find('.RemissionType').removeClass('W60margin').addClass('W100').css("text-align", "center"); //减免工单
307 307
 				$('#workorderlist').find('.consultType').removeClass('W60margin').addClass('W100').css("text-align", "center");//减免
308 308
 			break;
@@ -326,7 +326,7 @@ function authorizeOperateButton(userRoleCode) {
326 326
 				$('#workorderlist').find('.appointType').removeClass('W60margin').addClass('W100').css("text-align", "center"); //待指派
327 327
 				$('#workorderlist').find('.partyType').removeClass('W60margin').addClass('W100').css("text-align", "center"); //已处理
328 328
 				$('#workorderlist').find('.searchType').removeClass('W60margin').addClass('W100').css("text-align", "center"); //综合查询
329
-				$('#workorderlist').find('.repeatComplaintType').removeClass('W300margin').addClass('W180').css("text-align", "center"); //重复投诉表
329
+				$('#workorderlist').find('.repeatComplaintType').removeClass('W300margin').addClass('W190').css("text-align", "center"); //重复投诉表
330 330
 				$('#workorderlist').find('.consultType').removeClass('W60margin').addClass('W100').css("text-align", "center");//减免
331 331
 			break;
332 332
 		case "ZG":
@@ -349,7 +349,7 @@ function authorizeOperateButton(userRoleCode) {
349 349
 				$('#workorderlist').find('.appointType').removeClass('W60margin').addClass('W100').css("text-align", "center"); //待指派
350 350
 				$('#workorderlist').find('.partyType').removeClass('W60margin').addClass('W100').css("text-align", "center"); //已处理
351 351
 				$('#workorderlist').find('.searchType').removeClass('W60margin').addClass('W100').css("text-align", "center"); //综合查询
352
-				$('#workorderlist').find('.repeatComplaintType').removeClass('W300margin').addClass('W180').css("text-align", "center"); //重复投诉表
352
+				$('#workorderlist').find('.repeatComplaintType').removeClass('W300margin').addClass('W190').css("text-align", "center"); //重复投诉表
353 353
 				$('#workorderlist').find('.RemissionType').removeClass('W60margin').addClass('W100').css("text-align", "center"); //减免工单
354 354
 				$('#workorderlist').find('.consultType').removeClass('W60margin').addClass('W100').css("text-align", "center");//减免
355 355
 			break;
@@ -399,7 +399,7 @@ function authorizeOperateButton(userRoleCode) {
399 399
 				$('#workorderlist').find('.disposeType').removeClass('W60margin').addClass('W100').css("text-align", "center");//待处理
400 400
 				$('#workorderlist').find('.processingType').removeClass('W60margin').addClass('W100').css("text-align", "center");//处理中
401 401
 				$('#workorderlist').find('.searchType').removeClass('W60margin').addClass('W100').css("text-align", "center");//综合查询
402
-				$('#workorderlist').find('.repeatComplaintType').removeClass('W300margin').addClass('W180').css("text-align", "center"); //重复投诉表
402
+				$('#workorderlist').find('.repeatComplaintType').removeClass('W300margin').addClass('W190').css("text-align", "center"); //重复投诉表
403 403
 				$('#workorderlist').find('.partyType').removeClass('W60margin').addClass('W100').css("text-align", "center");//已处理
404 404
 				$('#workorderlist').find('.RemissionType').removeClass('W60margin').addClass('W100').css("text-align", "center");//减免
405 405
 			break;
@@ -421,11 +421,12 @@ function authorizeOperateButton(userRoleCode) {
421 421
 				$('#workorderlist').find('.workOprate2').show(); //待指派
422 422
 				$('#workorderlist').find('.workOprate4').show(); //待处理
423 423
 				$('#workorderlist').find('.workOprate5').show(); //处理中
424
+				$('#workorderlist').find('.workOprate6').show(); //已处理
424 425
 				$('#workorderlist').find('.workOprate9').show(); //咨询
425 426
 				// 无操作列表样式修改
426
-				$('#workorderlist').find('.partyType').removeClass('W60margin').addClass('W100').css("text-align", "center"); //已处理
427
+				// $('#workorderlist').find('.partyType').removeClass('W60margin').addClass('W100').css("text-align", "center"); //已处理
427 428
 				$('#workorderlist').find('.searchType').removeClass('W60margin').addClass('W100').css("text-align", "center"); //综合查询
428
-				$('#workorderlist').find('.repeatComplaintType').removeClass('W300margin').addClass('W180').css("text-align", "center"); //重复投诉表
429
+				$('#workorderlist').find('.repeatComplaintType').removeClass('W300margin').addClass('W190').css("text-align", "center"); //重复投诉表
429 430
 				$('#workorderlist').find('.RemissionType').removeClass('W60margin').addClass('W100').css("text-align", "center"); //减免
430 431
 			break;
431 432
 		case "ZR":
@@ -453,7 +454,7 @@ function authorizeOperateButton(userRoleCode) {
453 454
 				$('#workorderlist').find('.processingType').removeClass('W60margin').addClass('W100').css("text-align", "center");
454 455
 				$('#workorderlist').find('.partyType').removeClass('W60margin').addClass('W100').css("text-align", "center");
455 456
 				$('#workorderlist').find('.searchType').removeClass('W60margin').addClass('W100').css("text-align", "center");
456
-				$('#workorderlist').find('.repeatComplaintType').removeClass('W300margin').addClass('W180').css("text-align", "center"); //重复投诉表
457
+				$('#workorderlist').find('.repeatComplaintType').removeClass('W300margin').addClass('W190').css("text-align", "center"); //重复投诉表
457 458
 			break;
458 459
 		default:
459 460
 				$('#workorderlist').find('.submitType').removeClass('W60margin').addClass('W100').css("text-align", "center"); //待提交
@@ -461,7 +462,7 @@ function authorizeOperateButton(userRoleCode) {
461 462
 				$('#workorderlist').find('.disposeType').removeClass('W60margin').addClass('W100').css("text-align", "center");//待处理
462 463
 				$('#workorderlist').find('.processingType').removeClass('W60margin').addClass('W100').css("text-align", "center");//处理中
463 464
 				$('#workorderlist').find('.searchType').removeClass('W60margin').addClass('W100').css("text-align", "center");//综合查询
464
-				$('#workorderlist').find('.repeatComplaintType').removeClass('W300margin').addClass('W180').css("text-align", "center"); //重复投诉表
465
+				$('#workorderlist').find('.repeatComplaintType').removeClass('W300margin').addClass('W190').css("text-align", "center"); //重复投诉表
465 466
 				$('#workorderlist').find('.partyType').removeClass('W60margin').addClass('W100').css("text-align", "center");//已处理
466 467
 				$('#workorderlist').find('.RemissionType').removeClass('W60margin').addClass('W100').css("text-align", "center");//减免
467 468
 				$('#workorderlist').find('.consultType').removeClass('W60margin').addClass('W100').css("text-align", "center");//减免
@@ -488,7 +489,7 @@ function formatterDesig(val, row) {
488 489
 		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_mark_' + row.F_Id + '" onclick="btn_mark(\'' + row.F_Id + '\')" title="标记">标记</a></li>' +
489 490
 		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_delete_' + row.F_Id + '" onclick="btn_deleteid(\'' + row.F_Id + '\')" title="删除">删除</a></li>' +
490 491
 		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_return_' + row.F_Id + '" onclick="btn_return(\'' + row.F_Id + '\')" title="退回">退回</a></li>' +
491
-		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_reminder_' + row.F_Id + '" onclick="btn_reminder(\'' + row.F_Id + '\')" title="催单">催单</a></li>' +
492
+		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_reminder_' + row.F_Id + '" onclick="btn_reminder(\'' + row.F_Id + '\', 1)" title="催单">催单</a></li>' +
492 493
 		'</ul>';
493 494
 }
494 495
 
@@ -499,7 +500,7 @@ function formatterOprateDispose(val, row) {
499 500
 		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_mark_' + row.F_Id + '" onclick="btn_mark(\'' + row.F_Id + '\')" title="标记">标记</a></li>' +
500 501
 		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_delete_' + row.F_Id + '" onclick="btn_deleteid(\'' + row.F_Id + '\')" title="删除">删除</a></li>' +
501 502
 		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_return_' + row.F_Id + '" onclick="btn_return(\'' + row.F_Id + '\')" title="退回">退回</a></li>' +
502
-		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_reminder_' + row.F_Id + '" onclick="btn_reminder(\'' + row.F_Id + '\')" title="催单">催单</a></li>' +
503
+		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_reminder_' + row.F_Id + '" onclick="btn_reminder(\'' + row.F_Id + '\', 1)" title="催单">催单</a></li>' +
503 504
 		'</ul>';
504 505
 }
505 506
 
@@ -508,6 +509,7 @@ function formatterProcessed(val, row) {
508 509
 	return '<ul class="tool_downs">' +
509 510
 		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_delete_' + row.F_Id + '" onclick="btn_deleteid(\'' + row.F_Id + '\')" title="删除">删除</a></li>' +
510 511
 		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_return_' + row.F_Id + '" onclick="btn_return(\'' + row.F_Id + '\')" title="退回">退回</a></li>' +
512
+		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_reminder_' + row.F_Id + '" onclick="btn_reminder(\'' + row.F_Id + '\', 2)" title="完善">完善</a></li>' +
511 513
 		'</ul>';
512 514
 }
513 515
 
@@ -517,7 +519,7 @@ function formatterProcessing(val, row) {
517 519
 		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_dealWith_' + row.F_Id + '" onclick="btn_dealWith(\'' + row.F_Id + '\', 1)" title="处理">处理</a></li>' +
518 520
 		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_delete_' + row.F_Id + '" onclick="btn_deleteid(\'' + row.F_Id + '\')" title="删除">删除</a></li>' +
519 521
 		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_return_' + row.F_Id + '" onclick="btn_return(\'' + row.F_Id + '\')" title="退回">退回</a></li>' +
520
-		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_reminder_' + row.F_Id + '" onclick="btn_reminder(\'' + row.F_Id + '\')" title="催单">催单</a></li>' +
522
+		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_reminder_' + row.F_Id + '" onclick="btn_reminder(\'' + row.F_Id + '\',1)" title="催单">催单</a></li>' +
521 523
 		'</ul>';
522 524
 }
523 525
 
@@ -687,13 +689,18 @@ function btn_reduction(id){
687 689
 }
688 690
 
689 691
 // 催单
690
-function btn_reminder(id) {
692
+function btn_reminder(id, type) {
693
+	if (type === 1) {
694
+		var reminderTitle = '催单';
695
+	} else if (type === 2) {
696
+		var reminderTitle = '完善';
697
+	}
691 698
 	layer.open({
692 699
 		type: 2,
693
-		title: '催单',
700
+		title: reminderTitle,
694 701
 		maxmin: true, //开启最大化最小化按钮
695 702
 		area: ['35%', '40%'],
696
-		content: "../WorkOrder/WorkOrderReminder.html?id=" + id
703
+		content: "../WorkOrder/WorkOrderReminder.html?id=" + id + "&type=" + type
697 704
 	});
698 705
 }
699 706
 
@@ -1130,10 +1137,11 @@ function dcexcel(state, isdc, CJ, reduction) {
1130 1137
 	var dealTimely = $("#searchDealTimely").val(); // 工单级别
1131 1138
 	var see = $("#searchSee").val(); //	处理专员是否只查看负责区域单子
1132 1139
 	var reminder = $("#searchReminder").val(); //是否催单
1140
+	var complete = $("#searchComplete").val(); //是否完善
1133 1141
 
1134 1142
 	var url = huayi.config.callcenter_url + "WorkOrder/GetList?token=" + token;
1135 1143
 	url += "&state=" + state + "&code=" + code + "&area=" + area + "&office=" + office + "&starttime=" + starttime + "&endtime=" + endtime + "&keywords=" + keywords + "&productType=" + productType +"&productName=" + productName + "&productDate=" + productDate + "&batchNumber=" + batchNumber
1136 1144
 	+ "&manufacturer=" + manufacturer + "&problemCode=" + problemCode 
1137
-	+ "&type=" + type + "&dealTimely=" + dealTimely + "&see=" + see + "&isdc=" + isdc + "&CJ=" + CJ + "&IsReduction=" + reduction + "&reminder=" + reminder;
1145
+	+ "&type=" + type + "&dealTimely=" + dealTimely + "&see=" + see + "&isdc=" + isdc + "&CJ=" + CJ + "&IsReduction=" + reduction + "&reminder=" + reminder + "&incomplete=" + complete;
1138 1146
 	window.location.href = url;
1139 1147
 }

+ 6 - 0
CallCenterWeb.UI/js/WorkOrder/WorkOrderReminder.js

@@ -1,5 +1,11 @@
1 1
 var id = helper.request.queryString("id");
2
+var type = helper.request.queryString("type")
2 3
 $(document).ready(function () {
4
+    if (type === "1") {
5
+        $(".reminderTitle").text("催单内容:")
6
+    } else if (type === "2") {
7
+        $(".reminderTitle").text("完善内容:")
8
+    }
3 9
     //保存
4 10
     $('.customerSubmit').click(function() {
5 11
         saveCustomer();