Pārlūkot izejas kodu

Revert "bug 修改"

This reverts commit af98136ec28c493fcc9cc2b68ec48437c4fcf1a8.
liuyifan 6 gadi atpakaļ
vecāks
revīzija
ada88ac99f

+ 0 - 9
CallCenterWeb.UI/.project

105
 				<arguments>1.0-name-matches-false-false-node_modules</arguments>
105
 				<arguments>1.0-name-matches-false-false-node_modules</arguments>
106
 			</matcher>
106
 			</matcher>
107
 		</filter>
107
 		</filter>
108
-		<filter>
109
-			<id>1574815288818</id>
110
-			<name></name>
111
-			<type>26</type>
112
-			<matcher>
113
-				<id>org.eclipse.ui.ide.multiFilter</id>
114
-				<arguments>1.0-name-matches-false-false-node_modules</arguments>
115
-			</matcher>
116
-		</filter>
117
 	</filteredResources>
108
 	</filteredResources>
118
 </projectDescription>
109
 </projectDescription>

+ 0 - 15
CallCenterWeb.UI/WorkOrder/AddWorkOrder.html

13
 		<link rel="stylesheet" href="../js/webuploader/webuploader.css" />
13
 		<link rel="stylesheet" href="../js/webuploader/webuploader.css" />
14
 		<link href="../css/init.css" rel="stylesheet" />
14
 		<link href="../css/init.css" rel="stylesheet" />
15
 		<style type="text/css">
15
 		<style type="text/css">
16
-			body {
17
-				font-family: "微软雅黑";
18
-				font-size: 14px;
19
-			}
20
 			i.tub {
16
 			i.tub {
21
 				position: absolute;
17
 				position: absolute;
22
 				right: 180px;
18
 				right: 180px;
311
 							</select>
307
 							</select>
312
 						</div> -->
308
 						</div> -->
313
 					</div>
309
 					</div>
314
-					<div id="order_isover_box" class="form-group col-md-12 clearfix">
315
-						<label class="col-md-2">特殊案件:</label>
316
-						<div id="order_specialcase" class="r_order_type col-md-10">
317
-							<label class="radio-inline">
318
-								<input type="radio" name="specialCase" value="1">特殊
319
-							</label>
320
-							<label class="radio-inline">
321
-								<input type="radio" name="specialCase" value="0" checked="checked">非特殊
322
-							</label>
323
-						</div>
324
-					</div>
325
 					
310
 					
326
 					<div class="form-group text-center col-sm-12">
311
 					<div class="form-group text-center col-sm-12">
327
 						<button type="button" class="btn btn-primary btn-sm" id="save_order">创建</button>
312
 						<button type="button" class="btn btn-primary btn-sm" id="save_order">创建</button>

+ 0 - 1
CallCenterWeb.UI/WorkOrder/WorkOrderAppoint.html

69
 							<!-- <th data-field="IsEffective" data-formatter="formatterIsEffective" data-align="center">工单有效性</th> -->
69
 							<!-- <th data-field="IsEffective" data-formatter="formatterIsEffective" data-align="center">工单有效性</th> -->
70
 							<th data-field="GDLYName" data-formatter="formatterSource" data-align="center">工单来源</th>
70
 							<th data-field="GDLYName" data-formatter="formatterSource" data-align="center">工单来源</th>
71
 							<th data-field="GDLXName" data-align="center">工单类型</th>
71
 							<th data-field="GDLXName" data-align="center">工单类型</th>
72
-							<th data-field="EFlag" data-formatter="formatterEFlag" data-align="center">特殊案件</th>
73
 							<th data-field="GDZLName" data-align="center">工单子类</th>
72
 							<th data-field="GDZLName" data-align="center">工单子类</th>
74
 							<!-- <th data-field="TypeClassName" data-align="center">业务办理</th> -->
73
 							<!-- <th data-field="TypeClassName" data-align="center">业务办理</th> -->
75
 							<th data-field="Customer" data-align="center">客户姓名</th>
74
 							<th data-field="Customer" data-align="center">客户姓名</th>

+ 0 - 1
CallCenterWeb.UI/WorkOrder/WorkOrderAssigned.html

90
 							<!-- <th data-field="IsEffective" data-formatter="formatterIsEffective" data-align="center">工单有效性</th>   data-formatter="helper.filter.cutTel" -->
90
 							<!-- <th data-field="IsEffective" data-formatter="formatterIsEffective" data-align="center">工单有效性</th>   data-formatter="helper.filter.cutTel" -->
91
 							<th data-field="GDLYName" data-formatter="formatterSource" data-align="center">工单来源</th>
91
 							<th data-field="GDLYName" data-formatter="formatterSource" data-align="center">工单来源</th>
92
 							<th data-field="GDLXName" data-align="center">工单类型</th>
92
 							<th data-field="GDLXName" data-align="center">工单类型</th>
93
-							<th data-field="EFlag" data-formatter="formatterEFlag" data-align="center">特殊案件</th>
94
 							<th data-field="GDZLName" data-align="center">工单子类</th>
93
 							<th data-field="GDZLName" data-align="center">工单子类</th>
95
 							<th data-field="Customer" data-align="center">客户姓名</th>
94
 							<th data-field="Customer" data-align="center">客户姓名</th>
96
 							<th data-field="CustomerTel" data-align="center">客户电话</th>
95
 							<th data-field="CustomerTel" data-align="center">客户电话</th>

+ 0 - 1
CallCenterWeb.UI/WorkOrder/WorkOrderAwaitVist.html

90
 							<!-- <th data-field="IsEffective" data-formatter="formatterIsEffective" data-align="center">工单有效性</th> -->
90
 							<!-- <th data-field="IsEffective" data-formatter="formatterIsEffective" data-align="center">工单有效性</th> -->
91
 							<th data-field="GDLYName" data-formatter="formatterSource" data-align="center">工单来源</th>
91
 							<th data-field="GDLYName" data-formatter="formatterSource" data-align="center">工单来源</th>
92
 							<th data-field="GDLXName" data-align="center">工单类型</th>
92
 							<th data-field="GDLXName" data-align="center">工单类型</th>
93
-							<th data-field="EFlag" data-formatter="formatterEFlag" data-align="center">特殊案件</th>
94
 							<th data-field="GDZLName" data-align="center">工单子类</th>
93
 							<th data-field="GDZLName" data-align="center">工单子类</th>
95
 							<th data-field="Customer" data-align="center">客户姓名</th>
94
 							<th data-field="Customer" data-align="center">客户姓名</th>
96
 							<th data-field="CustomerTel"  data-align="center">客户电话</th>
95
 							<th data-field="CustomerTel"  data-align="center">客户电话</th>

+ 0 - 1
CallCenterWeb.UI/WorkOrder/WorkOrderBeen.html

90
 							<!-- <th data-field="IsEffective" data-formatter="formatterIsEffective" data-align="center">工单有效性</th> -->
90
 							<!-- <th data-field="IsEffective" data-formatter="formatterIsEffective" data-align="center">工单有效性</th> -->
91
 							<th data-field="GDLYName" data-formatter="formatterSource" data-align="center">工单来源</th>
91
 							<th data-field="GDLYName" data-formatter="formatterSource" data-align="center">工单来源</th>
92
 							<th data-field="GDLXName" data-align="center">工单类型</th>
92
 							<th data-field="GDLXName" data-align="center">工单类型</th>
93
-							<th data-field="EFlag" data-formatter="formatterEFlag" data-align="center">特殊案件</th>
94
 							<th data-field="GDZLName" data-align="center">工单子类</th>
93
 							<th data-field="GDZLName" data-align="center">工单子类</th>
95
 							<th data-field="Customer" data-align="center">客户姓名</th>
94
 							<th data-field="Customer" data-align="center">客户姓名</th>
96
 							<th data-field="CustomerTel"  data-align="center">客户电话</th>
95
 							<th data-field="CustomerTel"  data-align="center">客户电话</th>

+ 1 - 2
CallCenterWeb.UI/WorkOrder/WorkOrderDispose.html

71
 							<!-- <th data-field="IsEffective" data-formatter="formatterIsEffective" data-align="center">工单有效性</th> -->
71
 							<!-- <th data-field="IsEffective" data-formatter="formatterIsEffective" data-align="center">工单有效性</th> -->
72
 							<th data-field="GDLYName" data-formatter="formatterSource" data-align="center">工单来源</th>
72
 							<th data-field="GDLYName" data-formatter="formatterSource" data-align="center">工单来源</th>
73
 							<th data-field="GDLXName" data-align="center">工单类型</th>
73
 							<th data-field="GDLXName" data-align="center">工单类型</th>
74
-							<th data-field="EFlag" data-formatter="formatterEFlag" data-align="center">特殊案件</th>
75
 							<th data-field="GDZLName" data-align="center">工单子类</th>
74
 							<th data-field="GDZLName" data-align="center">工单子类</th>
76
 							<th data-field="Customer" data-align="center">客户姓名</th>
75
 							<th data-field="Customer" data-align="center">客户姓名</th>
77
 							<th data-field="CustomerTel"  data-align="center">客户电话</th>
76
 							<th data-field="CustomerTel"  data-align="center">客户电话</th>
78
 							<th data-field="Detail" data-align="center" data-formatter="formatterDetail">反馈内容</th>
77
 							<th data-field="Detail" data-align="center" data-formatter="formatterDetail">反馈内容</th>
79
 							<th data-field="FileUrl" data-formatter="formatfujian" data-align="center">附件</th>
78
 							<th data-field="FileUrl" data-formatter="formatfujian" data-align="center">附件</th>
80
-							<th data-field="LimitDate" data-formatter="formatterLimitDate" data-align="center">当前截至时间</th>
79
+							<th data-field="TimeoutTime" data-align="center">剩余时间</th>
81
 							<th data-field="AppointUserNameRel" data-align="center">指派人</th>
80
 							<th data-field="AppointUserNameRel" data-align="center">指派人</th>
82
 							<th data-field="AppointTime" data-align="center">指派时间</th>
81
 							<th data-field="AppointTime" data-align="center">指派时间</th>
83
 							<th data-field="AppointContent" data-align="center">指派说明</th>
82
 							<th data-field="AppointContent" data-align="center">指派说明</th>

+ 0 - 1
CallCenterWeb.UI/WorkOrder/WorkOrderPartake.html

69
 							<!-- <th data-field="IsEffective" data-formatter="formatterIsEffective" data-align="center">工单有效性</th> -->
69
 							<!-- <th data-field="IsEffective" data-formatter="formatterIsEffective" data-align="center">工单有效性</th> -->
70
 							<th data-field="GDLYName" data-formatter="formatterSource" data-align="center">工单来源</th>
70
 							<th data-field="GDLYName" data-formatter="formatterSource" data-align="center">工单来源</th>
71
 							<th data-field="GDLXName" data-align="center">工单类型</th>
71
 							<th data-field="GDLXName" data-align="center">工单类型</th>
72
-							<th data-field="EFlag" data-formatter="formatterEFlag" data-align="center">特殊案件</th>
73
 							<th data-field="GDZLName" data-align="center">工单子类</th>
72
 							<th data-field="GDZLName" data-align="center">工单子类</th>
74
 							<!-- <th data-field="TypeClassName" data-align="center">业务办理</th> -->
73
 							<!-- <th data-field="TypeClassName" data-align="center">业务办理</th> -->
75
 							<th data-field="Customer" data-align="center">客户姓名</th>
74
 							<th data-field="Customer" data-align="center">客户姓名</th>

+ 1 - 2
CallCenterWeb.UI/WorkOrder/WorkOrderParty.html

69
 							<th data-field="State" data-formatter="formatterState" data-align="center">工单状态</th>
69
 							<th data-field="State" data-formatter="formatterState" data-align="center">工单状态</th>
70
 							<!-- <th data-field="IsEffective" data-formatter="formatterIsEffective" data-align="center">工单有效性</th> -->
70
 							<!-- <th data-field="IsEffective" data-formatter="formatterIsEffective" data-align="center">工单有效性</th> -->
71
 							<th data-field="GDLYName" data-formatter="formatterSource" data-align="center">工单来源</th>
71
 							<th data-field="GDLYName" data-formatter="formatterSource" data-align="center">工单来源</th>
72
-							<th data-field="GDLXName" data-align="center">工单类型</th>							
73
-							<th data-field="EFlag" data-formatter="formatterEFlag" data-align="center">特殊案件</th>
72
+							<th data-field="GDLXName" data-align="center">工单类型</th>
74
 							<th data-field="GDZLName" data-align="center">工单子类</th>
73
 							<th data-field="GDZLName" data-align="center">工单子类</th>
75
 							<!-- <th data-field="TypeClassName" data-align="center">业务办理</th> -->
74
 							<!-- <th data-field="TypeClassName" data-align="center">业务办理</th> -->
76
 							<th data-field="Customer" data-align="center">客户姓名</th>
75
 							<th data-field="Customer" data-align="center">客户姓名</th>

+ 0 - 1
CallCenterWeb.UI/WorkOrder/WorkOrderReceive.html

70
 							<!-- <th data-field="IsEffective" data-formatter="formatterIsEffective" data-align="center">工单有效性</th> -->
70
 							<!-- <th data-field="IsEffective" data-formatter="formatterIsEffective" data-align="center">工单有效性</th> -->
71
 							<th data-field="GDLYName" data-formatter="formatterSource" data-align="center">工单来源</th>
71
 							<th data-field="GDLYName" data-formatter="formatterSource" data-align="center">工单来源</th>
72
 							<th data-field="GDLXName" data-align="center">工单类型</th>
72
 							<th data-field="GDLXName" data-align="center">工单类型</th>
73
-							<th data-field="EFlag" data-formatter="formatterEFlag" data-align="center">特殊案件</th>
74
 							<th data-field="GDZLName" data-align="center">工单子类</th>
73
 							<th data-field="GDZLName" data-align="center">工单子类</th>
75
 							<th data-field="Customer" data-align="center">客户姓名</th>
74
 							<th data-field="Customer" data-align="center">客户姓名</th>
76
 							<th data-field="CustomerTel"  data-align="center">客户电话</th>
75
 							<th data-field="CustomerTel"  data-align="center">客户电话</th>

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

35
 			width: 100%;
35
 			width: 100%;
36
 		}
36
 		}
37
 		.contant{
37
 		.contant{
38
-			width: 20% !important;
38
+			width: 15% !important;
39
 		}
39
 		}
40
 	</style>
40
 	</style>
41
 	<body class="gray-bg">
41
 	<body class="gray-bg">
119
 							<th data-field="IsEffective" data-formatter="formatterIsEffective" data-align="center">工单有效性</th>
119
 							<th data-field="IsEffective" data-formatter="formatterIsEffective" data-align="center">工单有效性</th>
120
 							<th data-field="GDLYName" data-formatter="formatterSource" data-align="center">工单来源</th>
120
 							<th data-field="GDLYName" data-formatter="formatterSource" data-align="center">工单来源</th>
121
 							<th data-field="GDLXName" data-align="center">工单类型</th>
121
 							<th data-field="GDLXName" data-align="center">工单类型</th>
122
-							<th data-field="EFlag" data-formatter="formatterEFlag" data-align="center">特殊案件</th>
123
 							<!--<th data-field="TypeClassName" data-align="center">业务办理</th>-->
122
 							<!--<th data-field="TypeClassName" data-align="center">业务办理</th>-->
124
 							<th data-field="Customer" data-align="center">姓名</th>
123
 							<th data-field="Customer" data-align="center">姓名</th>
125
 							<th data-field="CustomerTel" data-align="center">客户电话</th>
124
 							<th data-field="CustomerTel" data-align="center">客户电话</th>

+ 1 - 11
CallCenterWeb.UI/WorkOrder/template/orderDetails.html

11
 		<link href="../../js/bootstrap-select/css/bootstrap-select.css" rel="stylesheet" />
11
 		<link href="../../js/bootstrap-select/css/bootstrap-select.css" rel="stylesheet" />
12
 		<link href="../../css/WorkOrder/Search.css" rel="stylesheet">
12
 		<link href="../../css/WorkOrder/Search.css" rel="stylesheet">
13
 		<link href="../../css/init.css" rel="stylesheet" />
13
 		<link href="../../css/init.css" rel="stylesheet" />
14
-		<style>
15
-			body{
16
-				font-family: "微软雅黑";
17
-				font-size: 16px;
18
-			}
19
-		</style>
20
 	</head>
14
 	</head>
21
 	<body>
15
 	<body>
22
 		<div  class="ckxq" id="order_details">
16
 		<div  class="ckxq" id="order_details">
91
 						</tr>
85
 						</tr>
92
 						<tr>
86
 						<tr>
93
 							<th>创建人:</th>
87
 							<th>创建人:</th>
94
-							<td>
88
+							<td colspan="5">
95
 								<span id="xq_zxgh"></span>
89
 								<span id="xq_zxgh"></span>
96
 							</td>
90
 							</td>
97
-							<th>特殊案件:</th>
98
-							<td>
99
-								<span id="xq_eflag"></span>
100
-							</td>
101
 						</tr>
91
 						</tr>
102
 						<tr>
92
 						<tr>
103
 							<th>反馈内容:</th>
93
 							<th>反馈内容:</th>

+ 0 - 2
CallCenterWeb.UI/callScreen/callScreen.html

10
 		<link rel="stylesheet" type="text/css" href="../js/bootstrap-treeview/bootstrap-treeview.min.css" />
10
 		<link rel="stylesheet" type="text/css" href="../js/bootstrap-treeview/bootstrap-treeview.min.css" />
11
 		<!-- <link href="../css/init.css" rel="stylesheet" /> -->
11
 		<!-- <link href="../css/init.css" rel="stylesheet" /> -->
12
 		<link rel="stylesheet" href="./css/call.css" />
12
 		<link rel="stylesheet" href="./css/call.css" />
13
-		<link rel="stylesheet" href="../js/zTree/zTreeStyle.css" />
14
 		<link rel="stylesheet" href="../js/webuploader/webuploader.css" />
13
 		<link rel="stylesheet" href="../js/webuploader/webuploader.css" />
15
 		<style type="text/css">
14
 		<style type="text/css">
16
 			i.tub {
15
 			i.tub {
619
 		<script src="../js/webuploader/webuploader.min.js"></script>
618
 		<script src="../js/webuploader/webuploader.min.js"></script>
620
 		<script src="../Script/Common/regexs.js"></script>
619
 		<script src="../Script/Common/regexs.js"></script>
621
 		<script src="../js/main.js?v=1.5"></script>
620
 		<script src="../js/main.js?v=1.5"></script>
622
-		<script src="../js/zTree/jquery.ztree.core.js"></script>
623
 		<script src="call.js"></script>
621
 		<script src="call.js"></script>
624
 	</body>
622
 	</body>
625
 
623
 

+ 1 - 1
CallCenterWeb.UI/callScreen/css/call.css

1031
 .order_form .form-group>label {
1031
 .order_form .form-group>label {
1032
 	height: 30px;
1032
 	height: 30px;
1033
 	line-height: 30px;
1033
 	line-height: 30px;
1034
-	width: 115px;
1034
+	width: 100px;
1035
 	text-align: right;
1035
 	text-align: right;
1036
 	padding-right: 0;
1036
 	padding-right: 0;
1037
 }
1037
 }

+ 0 - 11
CallCenterWeb.UI/commonTpl/addOrEditWorkOrder.html

104
 							</label>
104
 							</label>
105
 						</div>
105
 						</div>
106
 					</div>
106
 					</div>
107
-					<div class="form-group col-md-8 clearfix">
108
-						<label class="col-md-2">特殊案件:</label>
109
-						<div id="order_specialcase" class="r_order_type col-md-6">
110
-							<label class="radio-inline">
111
-								<input type="radio" name="specialCase" value="1">特殊
112
-							</label>
113
-							<label class="radio-inline">
114
-								<input type="radio" name="specialCase" value="0" checked="checked">非特殊
115
-							</label>
116
-						</div>
117
-					</div>
118
 					<div class="form-group col-md-12 order_note">
107
 					<div class="form-group col-md-12 order_note">
119
 						<label for="order_note"><b class="text-red">*</b>无效原因:</label>
108
 						<label for="order_note"><b class="text-red">*</b>无效原因:</label>
120
 						<textarea id="order_note" rows="3" cols="20" class="form-control" placeholder="请输入无效原因"></textarea>
109
 						<textarea id="order_note" rows="3" cols="20" class="form-control" placeholder="请输入无效原因"></textarea>

+ 0 - 5
CallCenterWeb.UI/css/WorkOrder/AddWorkOrder.css

1
-body {
2
-	font-family: "微软雅黑";
3
-	font-size: 16px;
4
-}
5
-
6
 .ldtp-cl {
1
 .ldtp-cl {
7
 	border: 1px solid #e6e6e6;
2
 	border: 1px solid #e6e6e6;
8
 	padding: 0;
3
 	padding: 0;

+ 0 - 8
CallCenterWeb.UI/css/WorkOrder/Search.css

656
   height: calc(100% - 22px);
656
   height: calc(100% - 22px);
657
 } 
657
 } 
658
 /* 附件结束 */
658
 /* 附件结束 */
659
-
660
-/*截至时间*/
661
-.LimitDate4Hour{
662
-	color: #FF6600;
663
-}
664
-.LimitDate2Hour{
665
-	color: #FF0000;
666
-}

+ 13 - 14
CallCenterWeb.UI/js/WorkOrder/AddWorkOrder.js

130
 	
130
 	
131
 	$.post(huayi.config.callcenter_url + 'CallInScreen/AddWorkOrder', {
131
 	$.post(huayi.config.callcenter_url + 'CallInScreen/AddWorkOrder', {
132
 		source: $('#order_source').val(),//int 工单来源-下拉,数据来源:数据字典GDLY;
132
 		source: $('#order_source').val(),//int 工单来源-下拉,数据来源:数据字典GDLY;
133
-	    gdlx: $('#order_type').find('input[type="radio"]:checked').val(),//int 工单类型-单选,数据来源:数据字典GDLX;
134
-	    ywlx: order_handle,//int 业务办理-下拉,工单类型选择“业务办理”时数据来源:数据字典GDLX,工单类型选择“投诉”时数据是投诉,传值ID与工单类型一致
135
-	    // customerid: ,//int 客户id; -此参数可根据来电弹屏时的客户绑定
136
-	    callid: callId,//string; -此参数可根据来电弹屏时的客户绑定
137
-	    callCustomer: $('#order_name').val(),//string 客户姓名; -此参数可根据来电弹屏时的客户绑定
138
-	    tel: $('#order_tel').val(),//string 联系电话 ; -此参数可根据来电弹屏时的客户绑定
139
-	    company: $('#order_company').val(),// 公司名称
140
-	    limitdate:$('#sc_time').val(),//截止日期
133
+    gdlx: $('#order_type').find('input[type="radio"]:checked').val(),//int 工单类型-单选,数据来源:数据字典GDLX;
134
+    ywlx: order_handle,//int 业务办理-下拉,工单类型选择“业务办理”时数据来源:数据字典GDLX,工单类型选择“投诉”时数据是投诉,传值ID与工单类型一致
135
+    // customerid: ,//int 客户id; -此参数可根据来电弹屏时的客户绑定
136
+    callid: callId,//string; -此参数可根据来电弹屏时的客户绑定
137
+    callCustomer: $('#order_name').val(),//string 客户姓名; -此参数可根据来电弹屏时的客户绑定
138
+    tel: $('#order_tel').val(),//string 联系电话 ; -此参数可根据来电弹屏时的客户绑定
139
+    company: $('#order_company').val(),// 公司名称
140
+    limitdate:$('#sc_time').val(),//截止日期
141
 		fkcont:  $('#order_reception').val(),//string 反馈内容;
141
 		fkcont:  $('#order_reception').val(),//string 反馈内容;
142
-	    iseffective: $('#order_iseffective').find('input[type="radio"]:checked').val(),//int 是否有效工单项(0有效,1无效);
143
-	    note: $('#order_note').val(),//string 无效工单必填备注;
144
-	    clbm: order_transfer_dept,//int 接收部门;
145
-	    clid: order_receiveUser,//int 接收人;
146
-	    eflag:  $('#order_specialcase').find('input[type="radio"]:checked').val(), //特殊案件
147
-	    files:str,//附件id
142
+    iseffective: $('#order_iseffective').find('input[type="radio"]:checked').val(),//int 是否有效工单项(0有效,1无效);
143
+    note: $('#order_note').val(),//string 无效工单必填备注;
144
+    clbm: order_transfer_dept,//int 接收部门;
145
+    clid: order_receiveUser,//int 接收人;
146
+    files:str,//附件id
148
 		isover: $('#order_isover').find('input[type="radio"]:checked').val(), //int 是否立即处理(默认为0,立即处理为1,立即处理的工单无法指派接收人和接受部门)
147
 		isover: $('#order_isover').find('input[type="radio"]:checked').val(), //int 是否立即处理(默认为0,立即处理为1,立即处理的工单无法指派接收人和接受部门)
149
 		token: $.cookie("token")
148
 		token: $.cookie("token")
150
 	}, function(result) {
149
 	}, function(result) {

+ 3 - 33
CallCenterWeb.UI/js/WorkOrder/WorkOrder.js

436
 	if(val) {
436
 	if(val) {
437
 		var strD = decodeURIComponent(val);
437
 		var strD = decodeURIComponent(val);
438
 		strD = helper.filter.filterHTMLTag(strD);
438
 		strD = helper.filter.filterHTMLTag(strD);
439
-		if(strD.length > 20) {
440
-			strD = strD.substring(0, 20) + '...';
439
+		if(strD.length > 10) {
440
+			strD = strD.substring(0, 10) + '...';
441
 		}
441
 		}
442
 		return strD;
442
 		return strD;
443
 	}
443
 	}
452
 	}
452
 	}
453
 }
453
 }
454
 
454
 
455
-//格式化截至时间
456
-function formatterLimitDate(val, row) {
457
-	if(row.BackColor === 1){
458
-		return '<div class="LimitDate4Hour">' + val + '</div>'
459
-	} else if (row.BackColor === 2){
460
-		return '<div class="LimitDate2Hour">' + val + '</div>'
461
-	} else {
462
-		return '<div>' + val + '</div>'
463
-	}
464
-}
465
-
466
-//格式化特殊案件
467
-function formatterEFlag(val) {
468
-	if (val === 0) {
469
-		return '<div></div>'
470
-	} else if (val === 1) {
471
-		return '<div><img src="../img/qigan.png"></div>'
472
-	}
473
-}
474
-
475
 /**
455
 /**
476
  * 修改
456
  * 修改
477
  * oid工单id
457
  * oid工单id
837
 				$("#xq_zxgh").text(data.CreateUserName1); //创建人
817
 				$("#xq_zxgh").text(data.CreateUserName1); //创建人
838
 				$("#xq_clcontent").text(data.clcontent); //处理内容
818
 				$("#xq_clcontent").text(data.clcontent); //处理内容
839
 				$("#xq_gdnr").html(decodeURIComponent(data.Detail)); //反馈内容
819
 				$("#xq_gdnr").html(decodeURIComponent(data.Detail)); //反馈内容
840
-				$("#xq_eflag").html(displayEFlag(data.EFlag))
841
 				if(data.IsEffective === 0) {
820
 				if(data.IsEffective === 0) {
842
 					$('.xq_notes').hide();
821
 					$('.xq_notes').hide();
843
 				} else {
822
 				} else {
844
 					$('.xq_notes').show();
823
 					$('.xq_notes').show();
845
 					$("#xq_note").text(data.Province); //无效原因
824
 					$("#xq_note").text(data.Province); //无效原因
846
 				}
825
 				}
826
+
847
 			}
827
 			}
848
 		}
828
 		}
849
 	});
829
 	});
850
 }
830
 }
851
-
852
-//特殊案件
853
-function displayEFlag(val) {
854
-	if (val === 0) {
855
-		return ''
856
-	} else if (val === 1) {
857
-		return '<img src="../../img/qigan.png">'
858
-	}
859
-}
860
-
861
 // 获取附件信息
831
 // 获取附件信息
862
 function getWorkOrderDe(wid) {
832
 function getWorkOrderDe(wid) {
863
 	$.getJSON(huayi.config.callcenter_url + 'WorkOrder/GetWorkOrder', {
833
 	$.getJSON(huayi.config.callcenter_url + 'WorkOrder/GetWorkOrder', {

+ 7 - 9
CallCenterWeb.UI/js/WorkOrder/addOrEditWorkOrder.js

81
 		gdlx: $('#order_type').find('input[type="radio"]:checked').val(),//int 工单类型-单选,数据来源:数据字典GDLX;
81
 		gdlx: $('#order_type').find('input[type="radio"]:checked').val(),//int 工单类型-单选,数据来源:数据字典GDLX;
82
 		ywlx: order_handle,//int 业务办理-下拉,工单类型选择“业务办理”时数据来源:数据字典GDLX,工单类型选择“投诉”时数据是投诉,传值ID与工单类型一致
82
 		ywlx: order_handle,//int 业务办理-下拉,工单类型选择“业务办理”时数据来源:数据字典GDLX,工单类型选择“投诉”时数据是投诉,传值ID与工单类型一致
83
 		// customerid:int 客户id; -此参数可根据来电弹屏时的客户绑定
83
 		// customerid:int 客户id; -此参数可根据来电弹屏时的客户绑定
84
-	    // callid:string; -此参数可根据来电弹屏时的客户绑定
85
-    	callCustomer: $('#order_name').val(), //string 客户姓名; -此参数可根据来电弹屏时的客户绑定
86
-    	tel: $('#order_tel').val(), //string 联系电话 ; -此参数可根据来电弹屏时的客户绑定
84
+    // callid:string; -此参数可根据来电弹屏时的客户绑定
85
+    callCustomer: $('#order_name').val(), //string 客户姓名; -此参数可根据来电弹屏时的客户绑定
86
+    tel: $('#order_tel').val(), //string 联系电话 ; -此参数可根据来电弹屏时的客户绑定
87
 		company: $('#order_company').val(), //公司名称
87
 		company: $('#order_company').val(), //公司名称
88
-	    fkcont: $('#order_reception').val(), //string 反馈内容;
89
-		limitdate:$('#sc_time').val(),//截止日期
90
-    	iseffective: $('#order_iseffective').find('input[type="radio"]:checked').val(), //	int 是否有效工单项(0有效,1无效);
91
-    	eflag:  $('#order_specialcase').find('input[type="radio"]:checked').val(), //特殊案件
92
-    	note: $('#order_note').val(), // string 无效工单必填备注;
88
+    fkcont: $('#order_reception').val(), //string 反馈内容;
89
+	limitdate:$('#sc_time').val(),//截止日期
90
+    iseffective: $('#order_iseffective').find('input[type="radio"]:checked').val(), //	int 是否有效工单项(0有效,1无效);
91
+    note: $('#order_note').val(), // string 无效工单必填备注;
93
 		// isover: $('#order_isover').find('input[type="radio"]:checked').val(), //int 是否立即处理(默认为0,立即处理为1,立即处理的工单无法指派接收人和接受部门)
92
 		// isover: $('#order_isover').find('input[type="radio"]:checked').val(), //int 是否立即处理(默认为0,立即处理为1,立即处理的工单无法指派接收人和接受部门)
94
 		token: $.cookie("token")
93
 		token: $.cookie("token")
95
 	}, function(result) {
94
 	}, function(result) {
129
 				$('#sc_time').val(data.limitdate),//截止日期
128
 				$('#sc_time').val(data.limitdate),//截止日期
130
 				$('#order_reception').val(decodeURIComponent(data.Detail)); //否	string	反馈内容 - 反馈内容
129
 				$('#order_reception').val(decodeURIComponent(data.Detail)); //否	string	反馈内容 - 反馈内容
131
 				$('#order_iseffective').find('input[type="radio"][value="' + data.IsEffective + '"]').prop('checked', true).trigger('change'); //是否有效
130
 				$('#order_iseffective').find('input[type="radio"][value="' + data.IsEffective + '"]').prop('checked', true).trigger('change'); //是否有效
132
-				$('#order_specialcase').find('input[type="radio"][value="' + data.EFlag + '"]').prop('checked', true).trigger('change'); //特殊案件
133
 				if(data.Province) {
131
 				if(data.Province) {
134
 					$('#order_note').val(decodeURIComponent(data.Province)); //否	string 无效原因
132
 					$('#order_note').val(decodeURIComponent(data.Province)); //否	string 无效原因
135
 				}
133
 				}

+ 4 - 74
CallCenterWeb.UI/js/contabs.min.js

123
 				return false;
123
 				return false;
124
 			}
124
 			}
125
 		});
125
 		});
126
-	
127
 		if(k) {
126
 		if(k) {
128
-				console.log(o)
129
-			if(o == './TelCall/SeatMonitor.html' || o.substring(0,28) == './callScreen/callScreen.html') { //来电弹屏
127
+			if(o == './TelCall/SeatMonitor.html' || o.substring(0,28) == './callScreen/callScreen.html') {
128
+				// console.log(o)
130
 				var p = '<a href="javascript:;" class="active J_menuTab" data-id="' + o + '">' + l + ' <i class="fa fa-times-circle"></i></a>';
129
 				var p = '<a href="javascript:;" class="active J_menuTab" data-id="' + o + '">' + l + ' <i class="fa fa-times-circle"></i></a>';
131
 				$(".J_menuTab").removeClass("active");
130
 				$(".J_menuTab").removeClass("active");
132
 				var n = '<iframe class="J_iframe J_iframeNew" name="iframe' + m + '" width="100%" height="100%" src="' + o + '" frameborder="0" data-id="' + o + '" seamless></iframe>';
131
 				var n = '<iframe class="J_iframe J_iframeNew" name="iframe' + m + '" width="100%" height="100%" src="' + o + '" frameborder="0" data-id="' + o + '" seamless></iframe>';
133
 				$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(n);
132
 				$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(n);
134
 				$(".J_menuTabs .page-tabs-content").append(p);
133
 				$(".J_menuTabs .page-tabs-content").append(p);
135
 				g($(".J_menuTab.active"))
134
 				g($(".J_menuTab.active"))
136
-			} else if(o == './WorkOrder/AddWorkOrder.html') { //手工制单
137
-				var p = '<a href="javascript:;" class="active J_menuTab" data-id="' + o + '">' + l + ' <i class="fa fa-times-circle"></i></a>';
138
-				$(".J_menuTab").removeClass("active");
139
-				var n = '<iframe class="J_iframe" name="iframe' + m + '" width="100%" height="100%" src="' + o + '" frameborder="0" data-id="' + o + '" seamless></iframe>';
140
-				$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(n);
141
-				$(".J_menuTabs .page-tabs-content").append(p);
142
-				g($(".J_menuTab.active"))
143
-			} else if(o == './WorkOrder/WorkOrderAppoint.html') { //待指派工单
144
-				var p = '<a href="javascript:;" class="active J_menuTab" data-id="' + o + '">' + l + ' <i class="fa fa-times-circle"></i></a>';
145
-				$(".J_menuTab").removeClass("active");
146
-				var n = '<iframe class="J_iframe" name="iframe' + m + '" width="100%" height="100%" src="' + o + '" frameborder="0" data-id="' + o + '" seamless></iframe>';
147
-				$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(n);
148
-				$(".J_menuTabs .page-tabs-content").append(p);
149
-				g($(".J_menuTab.active"))
150
-			} else if(o == './WorkOrder/WorkOrderAssigned.html'){ //已指派工单
151
-				var p = '<a href="javascript:;" class="active J_menuTab" data-id="' + o + '">' + l + ' <i class="fa fa-times-circle"></i></a>';
152
-				$(".J_menuTab").removeClass("active");
153
-				var n = '<iframe class="J_iframe" name="iframe' + m + '" width="100%" height="100%" src="' + o + '" frameborder="0" data-id="' + o + '" seamless></iframe>';
154
-				$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(n);
155
-				$(".J_menuTabs .page-tabs-content").append(p);
156
-				g($(".J_menuTab.active"))
157
-			} else if(o == './WorkOrder/WorkOrderReceive.html') { //待接单工单
158
-				var p = '<a href="javascript:;" class="active J_menuTab" data-id="' + o + '">' + l + ' <i class="fa fa-times-circle"></i></a>';
159
-				$(".J_menuTab").removeClass("active");
160
-				var n = '<iframe class="J_iframe" name="iframe' + m + '" width="100%" height="100%" src="' + o + '" frameborder="0" data-id="' + o + '" seamless></iframe>';
161
-				$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(n);
162
-				$(".J_menuTabs .page-tabs-content").append(p);
163
-				g($(".J_menuTab.active"))
164
-			} else if(o == './WorkOrder/WorkOrderDispose.html') { //待处理工单
165
-				var p = '<a href="javascript:;" class="active J_menuTab" data-id="' + o + '">' + l + ' <i class="fa fa-times-circle"></i></a>';
166
-				$(".J_menuTab").removeClass("active");
167
-				var n = '<iframe class="J_iframe" name="iframe' + m + '" width="100%" height="100%" src="' + o + '" frameborder="0" data-id="' + o + '" seamless></iframe>';
168
-				$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(n);
169
-				$(".J_menuTabs .page-tabs-content").append(p);
170
-				g($(".J_menuTab.active"))
171
-			} else if(o == './WorkOrder/WorkOrderParty.html') { //已处理工单
172
-				var p = '<a href="javascript:;" class="active J_menuTab" data-id="' + o + '">' + l + ' <i class="fa fa-times-circle"></i></a>';
173
-				$(".J_menuTab").removeClass("active");
174
-				var n = '<iframe class="J_iframe" name="iframe' + m + '" width="100%" height="100%" src="' + o + '" frameborder="0" data-id="' + o + '" seamless></iframe>';
175
-				$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(n);
176
-				$(".J_menuTabs .page-tabs-content").append(p);
177
-				g($(".J_menuTab.active"))
178
-			} else if(o == './WorkOrder/WorkOrderPartake.html') { //已参与工单
179
-				var p = '<a href="javascript:;" class="active J_menuTab" data-id="' + o + '">' + l + ' <i class="fa fa-times-circle"></i></a>';
180
-				$(".J_menuTab").removeClass("active");
181
-				var n = '<iframe class="J_iframe" name="iframe' + m + '" width="100%" height="100%" src="' + o + '" frameborder="0" data-id="' + o + '" seamless></iframe>';
182
-				$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(n);
183
-				$(".J_menuTabs .page-tabs-content").append(p);
184
-				g($(".J_menuTab.active"))
185
-			} else if (o == './WorkOrder/WorkOrderAwaitVist.html') { //待回访工单
186
-				var p = '<a href="javascript:;" class="active J_menuTab" data-id="' + o + '">' + l + ' <i class="fa fa-times-circle"></i></a>';
187
-				$(".J_menuTab").removeClass("active");
188
-				var n = '<iframe class="J_iframe" name="iframe' + m + '" width="100%" height="100%" src="' + o + '" frameborder="0" data-id="' + o + '" seamless></iframe>';
189
-				$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(n);
190
-				$(".J_menuTabs .page-tabs-content").append(p);
191
-				g($(".J_menuTab.active"))
192
-			} else if (o == './WorkOrder/WorkOrderBeen.html') { //已回访工单
193
-				var p = '<a href="javascript:;" class="active J_menuTab" data-id="' + o + '">' + l + ' <i class="fa fa-times-circle"></i></a>';
194
-				$(".J_menuTab").removeClass("active");
195
-				var n = '<iframe class="J_iframe" name="iframe' + m + '" width="100%" height="100%" src="' + o + '" frameborder="0" data-id="' + o + '" seamless></iframe>';
196
-				$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(n);
197
-				$(".J_menuTabs .page-tabs-content").append(p);
198
-				g($(".J_menuTab.active"))
199
-			} else if (o == './WorkOrder/WorkOrderSearch.html') { //综合查询
200
-				var p = '<a href="javascript:;" class="active J_menuTab" data-id="' + o + '">' + l + ' <i class="fa fa-times-circle"></i></a>';
201
-				$(".J_menuTab").removeClass("active");
202
-				var n = '<iframe class="J_iframe" name="iframe' + m + '" width="100%" height="100%" src="' + o + '" frameborder="0" data-id="' + o + '" seamless></iframe>';
203
-				$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(n);
204
-				$(".J_menuTabs .page-tabs-content").append(p);
205
-				g($(".J_menuTab.active"))
206
 			} else {
135
 			} else {
207
 				$(".J_mainContent .J_iframe0").show();
136
 				$(".J_mainContent .J_iframe0").show();
208
 				$(".J_mainContent .J_iframe0").attr("src", o);
137
 				$(".J_mainContent .J_iframe0").attr("src", o);
214
 			}
143
 			}
215
 		}
144
 		}
216
 		
145
 		
146
+		
217
 		//改之前
147
 		//改之前
218
 //		$(".J_mainContent").empty();
148
 //		$(".J_mainContent").empty();
219
 //		var p = '<a href="javascript:;" class="active J_menuTab" data-id="' + o + '">' + l + ' <i class="fa fa-times-circle"></i></a>';
149
 //		var p = '<a href="javascript:;" class="active J_menuTab" data-id="' + o + '">' + l + ' <i class="fa fa-times-circle"></i></a>';
222
 //			$(".J_mainContent").append(n);
152
 //			$(".J_mainContent").append(n);
223
 //			$(".J_menuTabs .page-tabs-content").append(p);
153
 //			$(".J_menuTabs .page-tabs-content").append(p);
224
 //			g($(".J_menuTab.active"));
154
 //			g($(".J_menuTab.active"));
225
-			
155
+//			
226
 			//多标签
156
 			//多标签
227
 //		$(".J_menuTab").each(function() {
157
 //		$(".J_menuTab").each(function() {
228
 //			if($(this).data("id") == o) {
158
 //			if($(this).data("id") == o) {