liuyifan %!s(int64=5) %!d(string=hace) años
padre
commit
b97291a948

+ 3 - 3
CallCenterWeb.UI/WorkOrder/AddWorkOrder.html

@@ -340,16 +340,16 @@
340 340
 							</td>
341 341
 						</tr>
342 342
 						<tr class="isAssignWrapper">
343
-							<th>是否派:</th>
343
+							<th>是否派:</th>
344 344
                             <td>
345 345
                             	<div id="isAssign" class="col-md-6 r_order_type">
346 346
                             		<input class="radio-input" id="assign-yes" type="radio"  name="isAssign" value="1" checked="checked"> 
347 347
 									<label class="radio-inline" for="assign-yes">
348
-						   				
348
+						   				
349 349
 									</label>
350 350
 									<input class="radio-input" id="assign-no" type="radio" name="isAssign" value="0" > 
351 351
 									<label class="radio-inline" for="assign-no">
352
-						   				不
352
+						   				不
353 353
 									</label>
354 354
 								</div>
355 355
                             </td>

+ 1 - 1
CallCenterWeb.UI/WorkOrder/WorkOrderComplaintTracking.html

@@ -112,7 +112,7 @@
112 112
 								<option value="1">待分派</option>
113 113
 								<option value="3">待处理</option>
114 114
 								<option value="4">处理中</option>
115
-								<option value="5">退回待派</option>
115
+								<option value="5">退回待派</option>
116 116
 								<option value="6">退回待提交</option>
117 117
 								<option value="10">已完成</option>
118 118
 							</select>

+ 1 - 1
CallCenterWeb.UI/WorkOrder/WorkOrderSearch.html

@@ -112,7 +112,7 @@
112 112
 								<option value="1">待分派</option>
113 113
 								<option value="3">待处理</option>
114 114
 								<option value="4">处理中</option>
115
-								<option value="5">退回待派</option>
115
+								<option value="5">退回待派</option>
116 116
 								<option value="6">退回待提交</option>
117 117
 								<option value="10">已完成</option>
118 118
 							</select>

+ 0 - 3
CallCenterWeb.UI/WorkOrder/WorkOrderSubmit.html

@@ -72,9 +72,6 @@
72 72
 							<input class="form-control" type="text" id="searchProductDate" placeholder="生产日期(YYYY.MM.DD)">
73 73
 						</div>
74 74
 						<div class="form-group">
75
-							<input class="form-control" type="text" id="searchProductDate" placeholder="生产日期(YYYY.MM.DD)">
76
-						</div>
77
-						<div class="form-group">
78 75
 							<input class="form-control" type="text" id="searchBatchNumber" placeholder="产品编码">
79 76
 						</div>
80 77
 						<div class="form-group">

+ 1 - 1
CallCenterWeb.UI/WorkOrder/WorkOrderTransfer.html

@@ -11,7 +11,7 @@
11 11
     <link rel="stylesheet" href="../css/WorkOrder/jquery.editable-select.css" />
12 12
     <link rel="stylesheet" href="../js/comboSelect/combo.select.css" />
13 13
     <link rel="stylesheet" href="../css/init.css" />
14
-    <title>派</title>
14
+    <title>派</title>
15 15
     <style>
16 16
         ul li {
17 17
             float: initial;

+ 3 - 3
CallCenterWeb.UI/callScreen/callScreen.html

@@ -795,14 +795,14 @@
795 795
 												</td>
796 796
 											</tr>
797 797
 											<tr class="isAssignWrapper">
798
-												<th>是否派:</th>
798
+												<th>是否派:</th>
799 799
                                                 <td>
800 800
                                                 	<div id="isAssign" class="col-md-6 r_order_type">
801 801
 														<label class="radio-inline">
802
-											   				<input type="radio" name="isAssign" value="1" checked="checked"> 
802
+											   				<input type="radio" name="isAssign" value="1" checked="checked"> 
803 803
 														</label>
804 804
 														<label class="radio-inline">
805
-											   				<input type="radio" name="isAssign" value="0" > 不
805
+											   				<input type="radio" name="isAssign" value="0" > 不
806 806
 														</label>
807 807
 													</div>
808 808
                                                 </td>

+ 4 - 4
CallCenterWeb.UI/js/WorkOrder/WorkOrder.js

@@ -218,12 +218,12 @@ function authorizeOperateButton(userRoleCode) {
218 218
 		/*
219 219
 			BSCJL:办事处经理
220 220
 			操作:
221
-				指派 (待指派、退回待指派)
221
+				分派 (待分派、退回待分派)
222 222
 				标记 (待指派、退回待指派、待处理)
223 223
 				退回 (待指派、退回待指派、待处理、处理中、已处理)
224 224
 		*/
225 225
 				// 操作功能
226
-				$('.tool_downs').find('[id*="HY_transfer"]').show(); //
226
+				$('.tool_downs').find('[id*="HY_transfer"]').show(); //
227 227
 				$('.tool_downs').find('[id*="HY_mark"]').show(); // 标记
228 228
 				$('.tool_downs').find('[id*="HY_return"]').show(); //退回
229 229
 				// 操作列表
@@ -397,7 +397,7 @@ function formatterSubmit(val, row) {
397 397
 //格式化操作 (待指派)
398 398
 function formatterDesig(val, row) {
399 399
 	return '<ul class="tool_downs">' +
400
-		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_transfer_' + row.F_Id + '" onclick="btn_transfer(\'' + row.F_Id + '\', 2)" title="指派">指派</a></li>' +
400
+		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_transfer_' + row.F_Id + '" onclick="btn_transfer(\'' + row.F_Id + '\', 2)" title="分派">分派</a></li>' +
401 401
 		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_mark_' + row.F_Id + '" onclick="btn_mark(\'' + row.F_Id + '\')" title="标记">标记</a></li>' +
402 402
 		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_delete_' + row.F_Id + '" onclick="btn_deleteid(\'' + row.F_Id + '\')" title="删除">删除</a></li>' +
403 403
 		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_return_' + row.F_Id + '" onclick="btn_return(\'' + row.F_Id + '\')" title="退回">退回</a></li>' +
@@ -478,7 +478,7 @@ function btn_transfer(id, type) {
478 478
 		var title = "提交工单";
479 479
 		var areaTransfer = ['50%', '50%'];
480 480
 	} else if (type === 2) {
481
-		var title = "派工单";
481
+		var title = "派工单";
482 482
 		var areaTransfer = ['40%', '45%'];
483 483
 	}
484 484
 	layer.open({

+ 4 - 4
CallCenterWeb.UI/js/WorkOrder/WorkOrderDetails.js

@@ -261,7 +261,7 @@ function workOrderDetailsStateJudge (data) {
261 261
 	if (data.F_State === 0) {
262 262
 		return '待提交';
263 263
 	} else if (data.F_State === 1) {
264
-		return '待派';
264
+		return '待派';
265 265
 	} else if (data.F_State === 2) {
266 266
 		return '待接单';
267 267
 	} else if (data.F_State === 3) {
@@ -269,7 +269,7 @@ function workOrderDetailsStateJudge (data) {
269 269
 	} else if (data.F_State === 4) {
270 270
 		return '处理中';
271 271
 	} else if (data.F_State === 5) {
272
-		return '退回待派';
272
+		return '退回待派';
273 273
 	} else if (data.F_State === 6) {
274 274
 		return '退回待提交';
275 275
 	} else if (data.F_State === 10) {
@@ -365,10 +365,10 @@ function getLoginPerson(processingProgress) {
365 365
 /* 
366 366
 	催单判断
367 367
 	processingProgress 
368
-		1、待
368
+		1、待
369 369
 		3、待处理
370 370
 		4、处理中
371
-		5、退回待
371
+		5、退回待
372 372
 	userRoleCode
373 373
 		XTGLY:系统维护
374 374
 		CJGLY:超级管理员

+ 2 - 2
CallCenterWeb.UI/js/WorkOrder/WorkOrderTransfer.js

@@ -20,8 +20,8 @@ $(document).ready(function () {
20 20
 		$(".comaddressTitle").hide();
21 21
 		$(".comaddressSelect").hide();
22 22
 		//修改文本
23
-		$(".submitterTitle").text("派人:");
24
-		$(".contentTitle").text("派内容:")
23
+		$(".submitterTitle").text("派人:");
24
+		$(".contentTitle").text("派内容:")
25 25
 		$(".submitterSelect").css("width", "80%");
26 26
 		$(".wrapper-content").css("padding","3% 10% 0 0")
27 27
 	}

+ 6 - 2
CallCenterWeb.UI/js/main.js

@@ -426,8 +426,12 @@ function DropCallBack() {
426 426
 	if(window.frames['iframe'+ hidCallID +'']){
427 427
 		 window.frames['iframe'+ hidCallID +''].$(".td-call").hide();
428 428
 	}
429
-
430
-
429
+	if ($("#isml").val() === "1") {
430
+		$(".SayBusy").removeClass("active");
431
+		$(".SayFree").addClass("active");
432
+		$(".zxzt").removeClass("bl").addClass("br");
433
+		$(".hwzt").text('置忙');
434
+	}
431 435
 }
432 436
 //线路状态通知
433 437
 function LineStateAgentBack(data) {