Browse Source

工单接口对接 修改

jinquanwu 6 years ago
parent
commit
c38509b8ca

+ 8 - 2
CallCenterWeb.UI/ReportForm/callTime.html

@@ -1,4 +1,4 @@
1
-<!DOCTYPE html>
1
+<!DOCTYPE html>
2 2
 <html>
3 3
 
4 4
 	<head>
@@ -289,6 +289,12 @@
289 289
 									width: '',
290 290
 								},
291 291
 								{
292
+									field: '呼入未接通次数',
293
+									title: '呼入未接通次数',
294
+									align: 'center',
295
+									width: '',
296
+								},
297
+								{
292 298
 									field: '呼出次数',
293 299
 									title: '呼出次数',
294 300
 									align: 'center',
@@ -385,7 +391,7 @@
385 391
 										return [formatterArr(tbodyCon, "呼入次数"), formatterArr(tbodyCon, "呼入时长"),
386 392
 											formatterArr(tbodyCon, "呼出次数"), formatterArr(tbodyCon, "呼出时长"), formatterArr(tbodyCon, "呼出未接通次数"),
387 393
 											formatterArr(tbodyCon, "振铃时长"), formatterArr(tbodyCon, "通话总时长"),
388
-											formatterArr(tbodyCon, "平均通话总时长")
394
+											formatterArr(tbodyCon, "平均通话总时长"),
389 395
 										]
390 396
 									})(),
391 397
 								});

+ 5 - 0
CallCenterWeb.UI/ReportForm/riTongHuaTime.html

@@ -140,6 +140,11 @@
140 140
 									title: '呼入时长',
141 141
 									align: 'center',
142 142
 									width: '',
143
+								},{
144
+									field: '呼入未接通次数',
145
+									title: '呼入未接通次数',
146
+									align: 'center',
147
+									width: '',
143 148
 								},
144 149
 								{
145 150
 									field: '呼出次数',

+ 2 - 1
CallCenterWeb.UI/Script/Common/huayi.config.js

@@ -3,7 +3,8 @@ if (huayi == undefined) {
3 3
 }
4 4
 huayi.config = {
5 5
     //callcenter_url: "http://localhost:7459/",//生产环境 前端Web站IP和端口
6
-    callcenter_url: "http://192.168.4.18:4669/",//生产环境 前端Web站IP和端口
6
+	callcenter_url: "http://192.168.1.88:7101/",//生产环境 前端Web站IP和端口
7
+    // callcenter_url: "http://192.168.4.18:4669/",//生产环境 前端Web站IP和端口
7 8
     socket_ip: "192.168.5.7",//WebSocket通讯ip
8 9
     socket_port: "8081",    //WebSocket通讯端口
9 10
     menuworktime: 30000,    //菜单工单数量刷新间隔

+ 9 - 8
CallCenterWeb.UI/WorkOrder/WorkOrderAppoint.html

@@ -66,18 +66,19 @@
66 66
 						<tr>
67 67
 							<th data-field="WorkOrderID" data-formatter="formatterOrderId" data-align="center">工单编号</th>
68 68
 							<th data-field="State" data-formatter="formatterState" data-align="center">工单状态</th>
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 70
 							<th data-field="GDLYName" data-align="center">工单来源</th>
71 71
 							<th data-field="GDLXName" data-align="center">工单类型</th>
72
-							<th data-field="TypeClassName" data-align="center">业务办理</th>
73
-							<th data-field="Customer" data-align="center">姓名</th>
72
+							<th data-field="GDZLName" data-align="center">工单子类</th>
73
+							<!-- <th data-field="TypeClassName" data-align="center">业务办理</th> -->
74
+							<th data-field="Customer" data-align="center">客户姓名</th>
74 75
 							<th data-field="CustomerTel" data-formatter="helper.filter.cutTel" data-align="center">客户电话</th>
75
-							<th data-field="County" data-align="center">公司名称</th>
76
+							<!-- <th data-field="County" data-align="center">公司名称</th> -->
76 77
 							<th data-field="Detail" data-align="center" data-formatter="formatterDetail">反馈内容</th>
77
-							<th data-field="ResponDeptName" data-formatter="" data-align="center">接收部门</th>
78
-							<th data-field="AuditUserNameRel" data-formatter="formatterAuditUser" data-align="center">接收人</th>
79
-							<th data-field="CBCount" data-align="center">催办</th>
80
-							<th data-field="TimeoutTime" data-align="center">超时提醒(剩余)</th>
78
+							<!-- <th data-field="ResponDeptName" data-formatter="" data-align="center">接收部门</th> -->
79
+							<!-- <th data-field="AuditUserNameRel" data-formatter="formatterAuditUser" data-align="center">接收人</th> -->
80
+							<!-- <th data-field="CBCount" data-align="center">催办</th> -->
81
+							<!-- <th data-field="TimeoutTime" data-align="center">超时提醒(剩余)</th> -->
81 82
 							<th data-field="CreateUserNameRel" data-align="center">创建人</th>
82 83
 							<th data-field="CreateTime" data-width="100" data-align="center">创建时间</th>
83 84
 							<th data-field="WorkOrderID" data-class="workOprate workOprate1" data-formatter="formatterOprateDeal" data-align="center">操作工单</th>

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

@@ -0,0 +1,125 @@
1
+<!DOCTYPE html>
2
+<html>
3
+
4
+	<head>
5
+		<meta charset="UTF-8">
6
+		<title>已指派工单</title>
7
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
8
+		<script src="../Script/Common/huayi.load.js"></script>
9
+		<script src="../Script/Common/huayi.config.js"></script>
10
+		<link href="../js/bootstrap-select/css/bootstrap-select.css" rel="stylesheet" />
11
+		<link href="../css/WorkOrder/Search.css" rel="stylesheet">
12
+		<link href="../css/init.css" rel="stylesheet" />
13
+	</head>
14
+
15
+	<body class="gray-bg">
16
+		<div class="daoHang clearfix">
17
+			<div class="dhLeft">
18
+				<sapn><i class="syIcon"></i>位置:
19
+					<a href="javaScript:;" id="ReIndex">首页</a>&gt;
20
+					<a href="javaScript:;">工单管理</a>&gt;
21
+					<a href="" class="nowPosition">已指派工单</a>
22
+				</sapn>
23
+			</div>
24
+			<div class="dhRight">
25
+				<a href="#" title="刷新"><i class="fa fa-refresh"></i></a>
26
+			</div>
27
+		</div>
28
+		<div class="wrapper wrapper-content animated fadeInRight">
29
+			<div class="toolBox clearfix">
30
+				<div class="pull-left">
31
+					<div class="form-inline">
32
+						<div class="time-box form-group">
33
+							<i class="tub fa fa-calendar"></i>
34
+							<input class="form-control search_time" type="text" id="sc_time" placeholder="请选择起止时间">
35
+						</div>
36
+						<div class="form-group">
37
+							<select class="form-control" id="sc_source" data-live-search="true">
38
+								<option value ="0">请选择工单来源</option>
39
+								<option value ="1">电话</option>
40
+								<option value ="2">微信业务员</option>
41
+								<option value ="3">微信客户</option>
42
+								<option value ="4">官网</option>
43
+								
44
+							</select>
45
+						</div>
46
+						<div class="form-group">
47
+							<select class="form-control" id="sc_type" data-live-search="true">
48
+								<option value="0">请选择工单类型</option>
49
+								<option value="1">咨询</option>
50
+								<option value="2">投诉</option>
51
+								<option value="3">抽检</option>
52
+							</select>
53
+						</div>
54
+						<!-- <div class="form-group">
55
+							<select class="form-control selectpicker" id="sc_source" data-live-search="true">
56
+								<option value="0">请选择工单来源</option>
57
+							</select>
58
+						</div> -->
59
+						<!-- <div class="form-group">
60
+							<select class="form-control selectpicker" id="sc_type" data-live-search="true">
61
+								<option value="0">请选择工单类型</option>
62
+							</select>
63
+						</div> -->
64
+						<!-- <div class="form-group" id="order_handles">
65
+							<select class="form-control selectpicker" id="sc_handle" data-live-search="true">
66
+								<option value="0">请选择业务办理</option>
67
+							</select>
68
+						</div> -->
69
+						<div class="form-group">
70
+							<input type="text" class="form-control" id="sc_key" placeholder="请输入姓名、电话、反馈内容" />
71
+						</div>
72
+						<div class="form-group">
73
+							<input type="text" class="form-control" id="sc_ke" placeholder="请输入工单号" />
74
+						</div>
75
+					</div>
76
+				</div>
77
+
78
+				<div class="pull-right tool_bars">
79
+					<button class="btns" id="sc_btns">搜索</button>
80
+					<!-- <a class="btns" onclick="dcexcel(this)">导出</a> -->
81
+				</div>
82
+			</div>
83
+
84
+			<div style="width: 100%;padding: 10px;">
85
+				<table id="workorderlist" data-row-style="rowStyle" data-query-params="queryParams" data-pagination="true">
86
+					<thead>
87
+						<tr>
88
+							<th data-field="WorkOrderID" data-formatter="formatterOrderId" data-align="center">工单编号</th>
89
+							<th data-field="State" data-formatter="formatterState" data-align="center">工单状态</th>
90
+							<!-- <th data-field="IsEffective" data-formatter="formatterIsEffective" data-align="center">工单有效性</th> -->
91
+							<th data-field="GDLYName" data-align="center">工单来源</th>
92
+							<th data-field="GDLXName" data-align="center">工单类型</th>
93
+							<th data-field="" data-align="center">工单子类</th>
94
+							<th data-field="Customer" data-align="center">客户姓名</th>
95
+							<th data-field="CustomerTel" data-formatter="helper.filter.cutTel" data-align="center">客户电话</th>
96
+							<th data-field="Detail" data-align="center" data-formatter="formatterDetail">反馈内容</th>
97
+							<th data-field="Files" data-align="center">附件</th>
98
+							<th data-field="TimeoutTime" data-align="center">剩余时间</th>
99
+							<th data-field="CreateUserNameRel" data-align="center">创建人</th>
100
+							<th data-field="CreateTime" data-align="center">创建时间</th>
101
+							<th data-field="AppointUserNameRel" data-align="center">指派人</th>
102
+							<th data-field="AppointTime" data-align="center">指派时间</th>
103
+							<th data-field="AppointContent" data-align="center">指派说明</th>
104
+							<th data-field="ToDeptName" data-align="center">接收部门</th>
105
+							<th data-field="SureUserNameRel" data-align="center">接单人</th>
106
+							<th data-field="SureTime" data-align="center">接单时间</th>
107
+						</tr>
108
+					</thead>
109
+				</table>
110
+			</div>
111
+
112
+			<!--查看详情-->
113
+			<div id="order_details" class="ckxq Hidens"></div>
114
+
115
+
116
+		</div>
117
+
118
+		<script src="../js/laydate/laydate.js"></script>
119
+		<script src="../js/bootstrap-select/js/bootstrap-select.js"></script>
120
+		<script src="../js/bootstrap-select/js/i18n/defaults-zh_CN.js"></script>
121
+		<script src="../js/WorkOrder/WorkOrder.js"></script>
122
+
123
+	</body>
124
+
125
+</html>

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

@@ -0,0 +1,125 @@
1
+<!DOCTYPE html>
2
+<html>
3
+
4
+	<head>
5
+		<meta charset="UTF-8">
6
+		<title>待回访工单</title>
7
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
8
+		<script src="../Script/Common/huayi.load.js"></script>
9
+		<script src="../Script/Common/huayi.config.js"></script>
10
+		<link href="../js/bootstrap-select/css/bootstrap-select.css" rel="stylesheet" />
11
+		<link href="../css/WorkOrder/Search.css" rel="stylesheet">
12
+		<link href="../css/init.css" rel="stylesheet" />
13
+	</head>
14
+
15
+	<body class="gray-bg">
16
+		<div class="daoHang clearfix">
17
+			<div class="dhLeft">
18
+				<sapn><i class="syIcon"></i>位置:
19
+					<a href="javaScript:;" id="ReIndex">首页</a>&gt;
20
+					<a href="javaScript:;">工单管理</a>&gt;
21
+					<a href="" class="nowPosition">待回访工单</a>
22
+				</sapn>
23
+			</div>
24
+			<div class="dhRight">
25
+				<a href="#" title="刷新"><i class="fa fa-refresh"></i></a>
26
+			</div>
27
+		</div>
28
+		<div class="wrapper wrapper-content animated fadeInRight">
29
+			<div class="toolBox clearfix">
30
+				<div class="pull-left">
31
+					<div class="form-inline">
32
+						<div class="time-box form-group">
33
+							<i class="tub fa fa-calendar"></i>
34
+							<input class="form-control search_time" type="text" id="sc_time" placeholder="请选择起止时间">
35
+						</div>
36
+						<div class="form-group">
37
+							<select class="form-control" id="sc_source" data-live-search="true">
38
+								<option value ="0">请选择工单来源</option>
39
+								<option value ="1">电话</option>
40
+								<option value ="2">微信业务员</option>
41
+								<option value ="3">微信客户</option>
42
+								<option value ="4">官网</option>
43
+								
44
+							</select>
45
+						</div>
46
+						<div class="form-group">
47
+							<select class="form-control" id="sc_type" data-live-search="true">
48
+								<option value="0">请选择工单类型</option>
49
+								<option value="1">咨询</option>
50
+								<option value="2">投诉</option>
51
+								<option value="3">抽检</option>
52
+							</select>
53
+						</div>
54
+						<!-- <div class="form-group">
55
+							<select class="form-control selectpicker" id="sc_source" data-live-search="true">
56
+								<option value="0">请选择工单来源</option>
57
+							</select>
58
+						</div> -->
59
+						<!-- <div class="form-group">
60
+							<select class="form-control selectpicker" id="sc_type" data-live-search="true">
61
+								<option value="0">请选择工单类型</option>
62
+							</select>
63
+						</div> -->
64
+						<!-- <div class="form-group" id="order_handles">
65
+							<select class="form-control selectpicker" id="sc_handle" data-live-search="true">
66
+								<option value="0">请选择业务办理</option>
67
+							</select>
68
+						</div> -->
69
+						<div class="form-group">
70
+							<input type="text" class="form-control" id="sc_key" placeholder="请输入姓名、电话、反馈内容" />
71
+						</div>
72
+						<div class="form-group">
73
+							<input type="text" class="form-control" id="sc_ke" placeholder="请输入工单号" />
74
+						</div>
75
+					</div>
76
+				</div>
77
+
78
+				<div class="pull-right tool_bars">
79
+					<button class="btns" id="sc_btns">搜索</button>
80
+					<!-- <a class="btns" onclick="dcexcel(this)">导出</a> -->
81
+				</div>
82
+			</div>
83
+
84
+			<div style="width: 100%;padding: 10px;">
85
+				<table id="workorderlist" data-row-style="rowStyle" data-query-params="queryParams" data-pagination="true">
86
+					<thead>
87
+						<tr>
88
+							<th data-field="WorkOrderID" data-formatter="formatterOrderId" data-align="center">工单编号</th>
89
+							<th data-field="State" data-formatter="formatterState" data-align="center">工单状态</th>
90
+							<!-- <th data-field="IsEffective" data-formatter="formatterIsEffective" data-align="center">工单有效性</th> -->
91
+							<th data-field="GDLYName" data-align="center">工单来源</th>
92
+							<th data-field="GDLXName" data-align="center">工单类型</th>
93
+							<th data-field="" data-align="center">工单子类</th>
94
+							<th data-field="Customer" data-align="center">客户姓名</th>
95
+							<th data-field="CustomerTel" data-formatter="helper.filter.cutTel" data-align="center">客户电话</th>
96
+							<th data-field="Detail" data-align="center" data-formatter="formatterDetail">反馈内容</th>
97
+							<th data-field="Files" data-align="center">附件</th>
98
+							<th data-field="CreateUserNameRel" data-align="center">创建人</th>
99
+							<th data-field="CreateTime" data-align="center">创建时间</th>
100
+							<th data-field="AppointUserNameRel" data-align="center">指派人</th>
101
+							<th data-field="AppointTime" data-align="center">指派时间</th>
102
+							<th data-field="AppointContent" data-align="center">指派说明</th>
103
+							<th data-field="ToDeptName" data-align="center">处理人</th>
104
+							<th data-field="SureUserNameRel" data-align="center">处理时间</th>
105
+							<th data-field="Clcontent" data-align="center">处理详情</th>
106
+							<th data-field="SureTime" data-formatter="formatterOprateHuiF" data-align="center">操作工单</th>
107
+						</tr>
108
+					</thead>
109
+				</table>
110
+			</div>
111
+
112
+			<!--查看详情-->
113
+			<div id="order_details" class="ckxq Hidens"></div>
114
+
115
+
116
+		</div>
117
+
118
+		<script src="../js/laydate/laydate.js"></script>
119
+		<script src="../js/bootstrap-select/js/bootstrap-select.js"></script>
120
+		<script src="../js/bootstrap-select/js/i18n/defaults-zh_CN.js"></script>
121
+		<script src="../js/WorkOrder/WorkOrder.js"></script>
122
+
123
+	</body>
124
+
125
+</html>

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

@@ -0,0 +1,128 @@
1
+<!DOCTYPE html>
2
+<html>
3
+
4
+	<head>
5
+		<meta charset="UTF-8">
6
+		<title>待回访工单</title>
7
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
8
+		<script src="../Script/Common/huayi.load.js"></script>
9
+		<script src="../Script/Common/huayi.config.js"></script>
10
+		<link href="../js/bootstrap-select/css/bootstrap-select.css" rel="stylesheet" />
11
+		<link href="../css/WorkOrder/Search.css" rel="stylesheet">
12
+		<link href="../css/init.css" rel="stylesheet" />
13
+	</head>
14
+
15
+	<body class="gray-bg">
16
+		<div class="daoHang clearfix">
17
+			<div class="dhLeft">
18
+				<sapn><i class="syIcon"></i>位置:
19
+					<a href="javaScript:;" id="ReIndex">首页</a>&gt;
20
+					<a href="javaScript:;">工单管理</a>&gt;
21
+					<a href="" class="nowPosition">待回访工单</a>
22
+				</sapn>
23
+			</div>
24
+			<div class="dhRight">
25
+				<a href="#" title="刷新"><i class="fa fa-refresh"></i></a>
26
+			</div>
27
+		</div>
28
+		<div class="wrapper wrapper-content animated fadeInRight">
29
+			<div class="toolBox clearfix">
30
+				<div class="pull-left">
31
+					<div class="form-inline">
32
+						<div class="time-box form-group">
33
+							<i class="tub fa fa-calendar"></i>
34
+							<input class="form-control search_time" type="text" id="sc_time" placeholder="请选择起止时间">
35
+						</div>
36
+						<div class="form-group">
37
+							<select class="form-control" id="sc_source" data-live-search="true">
38
+								<option value ="0">请选择工单来源</option>
39
+								<option value ="1">电话</option>
40
+								<option value ="2">微信业务员</option>
41
+								<option value ="3">微信客户</option>
42
+								<option value ="4">官网</option>
43
+								
44
+							</select>
45
+						</div>
46
+						<div class="form-group">
47
+							<select class="form-control" id="sc_type" data-live-search="true">
48
+								<option value="0">请选择工单类型</option>
49
+								<option value="1">咨询</option>
50
+								<option value="2">投诉</option>
51
+								<option value="3">抽检</option>
52
+							</select>
53
+						</div>
54
+						<!-- <div class="form-group">
55
+							<select class="form-control selectpicker" id="sc_source" data-live-search="true">
56
+								<option value="0">请选择工单来源</option>
57
+							</select>
58
+						</div> -->
59
+						<!-- <div class="form-group">
60
+							<select class="form-control selectpicker" id="sc_type" data-live-search="true">
61
+								<option value="0">请选择工单类型</option>
62
+							</select>
63
+						</div> -->
64
+						<!-- <div class="form-group" id="order_handles">
65
+							<select class="form-control selectpicker" id="sc_handle" data-live-search="true">
66
+								<option value="0">请选择业务办理</option>
67
+							</select>
68
+						</div> -->
69
+						<div class="form-group">
70
+							<input type="text" class="form-control" id="sc_key" placeholder="请输入姓名、电话、反馈内容" />
71
+						</div>
72
+						<div class="form-group">
73
+							<input type="text" class="form-control" id="sc_ke" placeholder="请输入工单号" />
74
+						</div>
75
+					</div>
76
+				</div>
77
+
78
+				<div class="pull-right tool_bars">
79
+					<button class="btns" id="sc_btns">搜索</button>
80
+					<!-- <a class="btns" onclick="dcexcel(this)">导出</a> -->
81
+				</div>
82
+			</div>
83
+
84
+			<div style="width: 100%;padding: 10px;">
85
+				<table id="workorderlist" data-row-style="rowStyle" data-query-params="queryParams" data-pagination="true">
86
+					<thead>
87
+						<tr>
88
+							<th data-field="WorkOrderID" data-formatter="formatterOrderId" data-align="center">工单编号</th>
89
+							<th data-field="State" data-formatter="formatterState" data-align="center">工单状态</th>
90
+							<!-- <th data-field="IsEffective" data-formatter="formatterIsEffective" data-align="center">工单有效性</th> -->
91
+							<th data-field="GDLYName" data-align="center">工单来源</th>
92
+							<th data-field="GDLXName" data-align="center">工单类型</th>
93
+							<th data-field="" data-align="center">工单子类</th>
94
+							<th data-field="Customer" data-align="center">客户姓名</th>
95
+							<th data-field="CustomerTel" data-formatter="helper.filter.cutTel" data-align="center">客户电话</th>
96
+							<th data-field="Detail" data-align="center" data-formatter="formatterDetail">反馈内容</th>
97
+							<th data-field="Files" data-align="center">附件</th>
98
+							<th data-field="CreateUserNameRel" data-align="center">创建人</th>
99
+							<th data-field="CreateTime" data-align="center">创建时间</th>
100
+							<th data-field="AppointUserNameRel" data-align="center">指派人</th>
101
+							<th data-field="AppointTime" data-align="center">指派时间</th>
102
+							<th data-field="AppointContent" data-align="center">指派说明</th>
103
+							<th data-field="ToDeptName" data-align="center">处理人</th>
104
+							<th data-field="SureUserNameRel" data-align="center">处理时间</th>
105
+							<th data-field="Clcontent" data-align="center">处理详情</th>
106
+							<th data-field="ReturnUserNameRel" data-align="center">回访人</th>
107
+							<th data-field="ReturnBakTime" data-align="center">回访时间</th>
108
+							<th data-field="ReturnContent" data-align="center">回访结果</th>
109
+							
110
+						</tr>
111
+					</thead>
112
+				</table>
113
+			</div>
114
+
115
+			<!--查看详情-->
116
+			<div id="order_details" class="ckxq Hidens"></div>
117
+
118
+
119
+		</div>
120
+
121
+		<script src="../js/laydate/laydate.js"></script>
122
+		<script src="../js/bootstrap-select/js/bootstrap-select.js"></script>
123
+		<script src="../js/bootstrap-select/js/i18n/defaults-zh_CN.js"></script>
124
+		<script src="../js/WorkOrder/WorkOrder.js"></script>
125
+
126
+	</body>
127
+
128
+</html>

+ 8 - 10
CallCenterWeb.UI/WorkOrder/WorkOrderDispose.html

@@ -68,20 +68,18 @@
68 68
 						<tr>
69 69
 							<th data-field="WorkOrderID" data-formatter="formatterOrderId" data-align="center">工单编号</th>
70 70
 							<th data-field="State" data-formatter="formatterState" data-align="center">工单状态</th>
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 72
 							<th data-field="GDLYName" data-align="center">工单来源</th>
73 73
 							<th data-field="GDLXName" data-align="center">工单类型</th>
74
-							<th data-field="TypeClassName" data-align="center">业务办理</th>
75
-							<th data-field="Customer" data-align="center">姓名</th>
74
+							<th data-field="" data-align="center">工单子类</th>
75
+							<th data-field="Customer" data-align="center">客户姓名</th>
76 76
 							<th data-field="CustomerTel" data-formatter="helper.filter.cutTel" data-align="center">客户电话</th>
77
-							<th data-field="County" data-align="center">公司名称</th>
78 77
 							<th data-field="Detail" data-align="center" data-formatter="formatterDetail">反馈内容</th>
79
-							<th data-field="ResponDeptName" data-formatter="" data-align="center">接收部门</th>
80
-							<th data-field="AuditUserNameRel" data-formatter="formatterAuditUser" data-align="center">接收人</th>
81
-							<th data-field="CBCount" data-align="center">催办</th>
82
-							<th data-field="TimeoutTime" data-align="center">超时提醒(剩余)</th>
83
-							<th data-field="CreateUserNameRel" data-align="center">创建人</th>
84
-							<th data-field="CreateTime" data-align="center">创建时间</th>
78
+							<th data-field="Files" data-align="center">附件</th>
79
+							<th data-field="TimeoutTime" data-align="center">剩余时间</th>
80
+							<th data-field="AppointUserNameRel" data-align="center">指派人</th>
81
+							<th data-field="AppointTime" data-align="center">指派时间</th>
82
+							<th data-field="AppointContent" data-align="center">指派说明</th>
85 83
 							<th data-field="WorkOrderID" data-class="workOprate workOprate2" data-formatter="formatterOprateDispose"
86 84
 							 data-align="center">操作工单</th>
87 85
 						</tr>

+ 13 - 6
CallCenterWeb.UI/WorkOrder/WorkOrderPartake.html

@@ -66,19 +66,26 @@
66 66
 						<tr>
67 67
 							<th data-field="WorkOrderID" data-formatter="formatterOrderId" data-align="center">工单编号</th>
68 68
 							<th data-field="State" data-formatter="formatterState" data-align="center">工单状态</th>
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 70
 							<th data-field="GDLYName" data-align="center">工单来源</th>
71 71
 							<th data-field="GDLXName" data-align="center">工单类型</th>
72
+							<th data-field="" data-align="center">工单子类</th>
72 73
 							<th data-field="TypeClassName" data-align="center">业务办理</th>
73
-							<th data-field="Customer" data-align="center">姓名</th>
74
+							<th data-field="Customer" data-align="center">客户姓名</th>
74 75
 							<th data-field="CustomerTel" data-formatter="helper.filter.cutTel" data-align="center">客户电话</th>
75
-							<th data-field="County" data-align="center">公司名称</th>
76
+							<!-- <th data-field="County" data-align="center">公司名称</th> -->
76 77
 							<th data-field="Detail" data-align="center" data-formatter="formatterDetail">反馈内容</th>
77
-							<th data-field="ResponDeptName" data-formatter="" data-align="center">接收部门</th>
78
-							<th data-field="AuditUserNameRel" data-formatter="formatterAuditUser" data-align="center">接收人</th>
79
-							<th data-field="CBCount" data-align="center">催办</th>
78
+							<th data-field="Files" data-align="center">附件</th>
79
+							<th data-field="TimeoutTime" data-align="center">剩余时间</th>
80
+							<!-- <th data-field="AuditUserNameRel" data-formatter="formatterAuditUser" data-align="center">接收人</th> -->
81
+							<!-- <th data-field="CBCount" data-align="center">催办</th> -->
80 82
 							<th data-field="CreateUserNameRel" data-align="center">创建人</th>
81 83
 							<th data-field="CreateTime" data-align="center">创建时间</th>
84
+							<th data-field="AppointTime" data-align="center">指派时间</th>
85
+							<th data-field="AppointContentAppointTime" data-align="center">指派说明</th>
86
+							<th data-field="ToDeptName" data-formatter="" data-align="center">接收部门</th>
87
+							<th data-field="SureUserNameRel" data-align="center">接单人</th>
88
+							<th data-field="SureTime" data-align="center">接单时间</th>
82 89
 						</tr>
83 90
 					</thead>
84 91
 				</table>

+ 14 - 6
CallCenterWeb.UI/WorkOrder/WorkOrderParty.html

@@ -67,20 +67,28 @@
67 67
 						<tr>
68 68
 							<th data-field="WorkOrderID" data-formatter="formatterOrderId" data-align="center">工单编号</th>
69 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 71
 							<th data-field="GDLYName" data-align="center">工单来源</th>
72 72
 							<th data-field="GDLXName" data-align="center">工单类型</th>
73
-							<th data-field="TypeClassName" data-align="center">业务办理</th>
74
-							<th data-field="Customer" data-align="center">姓名</th>
73
+							<th data-field="" data-align="center">工单子类</th>
74
+							<!-- <th data-field="TypeClassName" data-align="center">业务办理</th> -->
75
+							<th data-field="Customer" data-align="center">客户姓名</th>
75 76
 							<th data-field="CustomerTel" data-formatter="helper.filter.cutTel" data-align="center">客户电话</th>
76
-							<th data-field="County" data-align="center">公司名称</th>
77 77
 							<th data-field="Detail" data-align="center" data-formatter="formatterDetail">反馈内容</th>
78
-							<th data-field="ResponDeptName" data-formatter="" data-align="center">接收部门</th>
78
+							<th data-field="Files" data-align="center">附件</th>
79
+							<th data-field="AppointUserNameRel" data-align="center">指派人</th>
80
+							<th data-field="AppointTime" data-align="center">指派时间</th>
81
+							<th data-field="AppointContent" data-align="center">指派说明</th>
82
+							<th data-field="ToDeptName" data-align="center">处理人</th>
83
+							<th data-field="SureUserNameRel" data-align="center">处理时间</th>
84
+							<th data-field="Clcontent" data-align="center">处理详情</th>
85
+							
86
+							<!-- <th data-field="ResponDeptName" data-formatter="" data-align="center">接收部门</th>
79 87
 							<th data-field="AuditUserNameRel" data-formatter="formatterAuditUser" data-align="center">接收人</th>
80 88
 							<th data-field="LastDealUserNameRel" data-align="center">处理人</th>
81 89
 							<th data-field="CBCount" data-align="center">催办</th>
82 90
 							<th data-field="CreateUserNameRel" data-align="center">创建人</th>
83
-							<th data-field="CreateTime" data-align="center">创建时间</th>
91
+							<th data-field="CreateTime" data-align="center">创建时间</th> -->
84 92
 							<!-- <th data-field="WorkOrderID" data-class="workOprate workOprate5" data-formatter="formatterOprateParty" data-align="center">操作工单</th> -->
85 93
 						</tr>
86 94
 					</thead>

+ 13 - 9
CallCenterWeb.UI/WorkOrder/WorkOrderReceive.html

@@ -67,19 +67,23 @@
67 67
 						<tr>
68 68
 							<th data-field="WorkOrderID" data-formatter="formatterOrderId" data-align="center">工单编号</th>
69 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 71
 							<th data-field="GDLYName" data-align="center">工单来源</th>
72 72
 							<th data-field="GDLXName" data-align="center">工单类型</th>
73
-							<th data-field="TypeClassName" data-align="center">业务办理</th>
74
-							<th data-field="Customer" data-align="center">姓名</th>
73
+							<th data-field="" data-align="center">工单子类</th>
74
+							<th data-field="Customer" data-align="center">客户姓名</th>
75 75
 							<th data-field="CustomerTel" data-formatter="helper.filter.cutTel" data-align="center">客户电话</th>
76
-							<th data-field="County" data-align="center">公司名称</th>
77 76
 							<th data-field="Detail" data-align="center" data-formatter="formatterDetail">反馈内容</th>
78
-							<th data-field="ResponDeptName" data-formatter="" data-align="center">接收部门</th>
79
-							<th data-field="AuditUserNameRel" data-formatter="formatterAuditUser" data-align="center">接收人</th>
80
-							<th data-field="TimeoutTime" data-align="center">超时提醒(剩余)</th>
81
-							<th data-field="CreateUserNameRel" data-align="center">创建人</th>
82
-							<th data-field="CreateTime" data-align="center">创建时间</th>
77
+							<th data-field="Files" data-align="center">附件</th>
78
+							<th data-field="TimeoutTime" data-align="center">剩余时间</th>
79
+							<th data-field="AppointUserNameRel" data-align="center">指派人</th>
80
+							<th data-field="AppointTime" data-align="center">指派时间</th>
81
+							<th data-field="AppointContent" data-align="center">指派说明</th>
82
+							<!-- <th data-field="ResponDeptName" data-formatter="" data-align="center">接收部门</th> -->
83
+							<!-- <th data-field="AuditUserNameRel" data-formatter="formatterAuditUser" data-align="center">接收人</th> -->
84
+							<!-- <th data-field="TimeoutTime" data-align="center">超时提醒(剩余)</th> -->
85
+							<!-- <th data-field="CreateUserNameRel" data-align="center">创建人</th> -->
86
+							<!-- <th data-field="CreateTime" data-align="center">创建时间</th> -->
83 87
 							<th data-field="WorkOrderID" data-class="workOprate workOprate6" data-formatter="formatterOprateReceive"
84 88
 							 data-align="center">操作工单</th>
85 89
 						</tr>

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

@@ -39,10 +39,10 @@
39 39
 				</td>
40 40
 			</tr>
41 41
 			<tr>
42
-				<th>公司名称:</th>
42
+				<!-- <th>公司名称:</th>
43 43
 				<td>
44 44
 					<span id="xq_company"></span>
45
-				</td>
45
+				</td> -->
46 46
 				<th>工单有效性:</th>
47 47
 				<td>
48 48
 					<span id="xq_iseffective"></span>
@@ -51,20 +51,21 @@
51 51
 				<td>
52 52
 					<span id="xq_source"></span>
53 53
 				</td>
54
-			</tr>
55
-			<tr>
56
-				<th>业务办理:</th>
57
-				<td>
58
-					<span id="xq_handle"></span>
59
-				</td>
60 54
 				<th>接收部门</th>
61 55
 				<td>
62 56
 					<span id="xq_fkdep"></span>
63 57
 				</td>
64
-				<th>接收人:</th>
58
+			</tr>
59
+			<tr>
60
+				<!-- <th>业务办理:</th>
61
+				<td>
62
+					<span id="xq_handle"></span>
63
+				</td> -->
64
+				
65
+				<!-- <th>接收人:</th>
65 66
 				<td>
66 67
 					<span id="xq_responseUser"></span>
67
-				</td>
68
+				</td> -->
68 69
 			</tr>
69 70
 			<tr>
70 71
 				<th>创建人:</th>

File diff suppressed because it is too large
+ 546 - 549
CallCenterWeb.UI/callScreen/call.js


+ 9 - 19
CallCenterWeb.UI/callScreen/callScreen.html

@@ -428,6 +428,12 @@
428 428
 							<form class="form-inline clearfix" id="order_form">
429 429
 								<div class="form-group col-md-12 clearfix">
430 430
 									<label class="col-md-2">工单类型:</label>
431
+									<div id="" class="col-md-10 r_order_type">
432
+								         <select name="" id="order_source"></select>
433
+									</div>
434
+								</div>
435
+								<div class="form-group col-md-12 clearfix">
436
+									<label class="col-md-2">工单类型:</label>
431 437
 									<div id="order_type" class="col-md-10 r_order_type">
432 438
 
433 439
 									</div>
@@ -442,24 +448,8 @@
442 448
 									<div class="form-group col-md-4" id="order_handles">
443 449
 										<label for="order_handle">工单子类:</label>
444 450
 										<select class="form-control input-sm selectpicker" id="order_godant" data-live-search="true">
445
-											<option value="0">请选择工单子类</option>
446
-											<option value="管道泡水">管道泡水</option>
447
-											<option value="闸井设施">闸井设施</option>
448
-											<option value="表井设施">表井设施</option>
449
-											<option value="消防设施">消防设施</option>
450
-											<option value="水压低">水压低</option>
451
-											<option value="无水">无水</option>
452
-											<option value="水费水量">水费水量</option>
453
-											<option value="停水复装">停水复装</option>
454
-											<option value="水质">水质</option>
455
-											<option value="表位插花">表位插花</option>
456
-											<option value="户表安装">户表安装</option>
457
-											<option value="违章用水">违章用水</option>
458
-											<option value="水域不洁">水域不洁</option>
459
-											<option value="施工围挡">施工围挡</option>
460
-											<option value="垃圾渣土">垃圾渣土</option>
461
-											<option value="道路破损">道路破损</option>
462
-											<option value="其他">其他</option>
451
+											<option value="">请选择工单子类</option>
452
+										
463 453
 										</select>
464 454
 									</div>
465 455
 									<div class="form-group col-md-4">
@@ -475,7 +465,7 @@
475 465
 									</div>
476 466
 									<div class="form-group col-md-4">
477 467
 										<label for="order_tel">联系电话:</label>
478
-										<input type="text" class="form-control input-sm" id="order_tel" placeholder="请输入联系电话" readonly>
468
+										<input type="text" class="form-control input-sm" id="order_tel" placeholder="请输入联系电话" >
479 469
 									</div>
480 470
 									<!-- <div class="form-group col-md-4">
481 471
 										<label for="order_company">公司名称:</label>

+ 18 - 17
CallCenterWeb.UI/commonTpl/addOrEditCusInfo.html

@@ -29,37 +29,43 @@
29 29
 							<input id="customer_code" class="form-control" type="text" autocomplete="off" placeholder="请输入客户编号" />
30 30
 						</div>
31 31
 					</li>
32
-					<li class="form-group">
32
+					<!-- <li class="form-group">
33 33
 						<label for="customer_companyname" class="col-md-2"><b class="text_require">*</b>公司名称</label>
34 34
 						<div class="col-md-9">
35 35
 							<input id="customer_companyname" class="form-control" type="text" autocomplete="off" placeholder="请输入公司名称" />
36 36
 						</div>
37
-					</li>
38
-					<li class="form-group">
37
+					</li> -->
38
+					<!-- <li class="form-group">
39 39
 						<label for="customer_comaddress" class="col-md-2">公司地址</label>
40 40
 						<div class="col-md-9">
41 41
 							<textarea id="customer_comaddress" class="form-control" rows="2" placeholder="请输入公司地址"></textarea>
42 42
 						</div>
43
-					</li>
43
+					</li> -->
44 44
 					<li class="form-group">
45
-						<label for="customer_legalName" class="col-md-2">法人姓名</label>
45
+						<label for="customer_legalName" class="col-md-2">客户姓名</label>
46 46
 						<div class="col-md-9">
47 47
 							<input id="customer_legalName" class="form-control" type="text" autocomplete="off" placeholder="请输入法人姓名" />
48 48
 						</div>
49 49
 					</li>
50 50
 					<li class="form-group">
51
-						<label for="customer_lehalTel" class="col-md-2">法人电话</label>
51
+						<label for="customer_lehalTel" class="col-md-2">客户电话</label>
52 52
 						<div class="col-md-9">
53 53
 							<input id="customer_lehalTel" class="form-control" type="text" autocomplete="off" placeholder="请输入法人电话" />
54 54
 						</div>
55 55
 					</li>
56 56
 					<li class="form-group">
57
+						<label for="customer_address" class="col-md-2">联系地址</label>
58
+						<div class="col-md-9">
59
+							<input id="customer_address" class="form-control" type="text" autocomplete="off" placeholder="请输入联系地址" />
60
+						</div>
61
+					</li>	
62
+					<!-- <li class="form-group">
57 63
 						<label for="customer_subtrade" class="col-md-2">所属行业</label>
58 64
 						<div class="col-md-9">
59 65
 							<input id="customer_subtrade" class="form-control" type="text" autocomplete="off" placeholder="请输入所属行业" />
60 66
 						</div>
61
-					</li>
62
-					<li class="form-group">
67
+					</li> -->
68
+					<!-- <li class="form-group">
63 69
 						<label for="customer_taxCategory" class="col-md-2">税务类别</label>
64 70
 						<div class="col-md-9">
65 71
 							<input id="customer_taxCategory" class="form-control" type="text" autocomplete="off" placeholder="请输入税务类别" />
@@ -181,14 +187,9 @@
181 187
182 188
 								</label>
183 189
 						</div>
184
-					</li>	
185
-					<li class="form-group">
186
-						<label for="customer_address" class="col-md-2">联系地址</label>
187
-						<div class="col-md-9">
188
-							<input id="customer_address" class="form-control" type="text" autocomplete="off" placeholder="请输入联系地址" />
189
-						</div>
190
-					</li>	
191
-					<li class="form-group">
190
+					</li>	 -->
191
+					
192
+					<!-- <li class="form-group">
192 193
 						<label for="customer_address1" class="col-md-2">联系地址1</label>
193 194
 						<div class="col-md-9">
194 195
 							<input id="customer_address1" class="form-control" type="text" autocomplete="off" placeholder="请输入联系地址1" />
@@ -229,7 +230,7 @@
229 230
 								<span class="text-warning">提示:点击添加可以增加联系人信息</span>
230 231
 							</div>
231 232
 						</li>
232
-					</div>
233
+					</div> -->
233 234
 					<div id="contactList">
234 235
 						<!-- <div class="contactList_item col-md-offset-2 clearfix">
235 236
 							<div class="form-group col-md-5 col-sm-5">

+ 47 - 6
CallCenterWeb.UI/commonTpl/addOrEditWorkOrder.html

@@ -10,6 +10,19 @@
10 10
 		<link href="../js/bootstrap-select/css/bootstrap-select.css" rel="stylesheet" />
11 11
 		<link rel="stylesheet" type="text/css" href="../js/bootstrap-treeview/bootstrap-treeview.min.css" />
12 12
 		<link href="../callScreen/css/call.css" rel="stylesheet" />
13
+		<style type="text/css">
14
+			i.tub {
15
+				position: absolute;
16
+				right: 130px;
17
+				top: 8px;
18
+				font-size: 18px;
19
+				color: #1ab494;
20
+			}
21
+			
22
+			.tub+input {
23
+				padding-right: 30px;
24
+			}
25
+		</style>
13 26
 	</head>
14 27
 
15 28
 	<body>
@@ -28,25 +41,52 @@
28 41
 
29 42
 						</div>
30 43
 					</div>
31
-					<div class="form-group col-md-12" id="order_handles">
44
+					<!--<div class="form-group col-md-12" id="order_handles">
32 45
 						<label for="order_handle">业务办理:</label>
33 46
 						<select class="form-control input-sm selectpicker" id="order_handle" data-live-search="true">
34 47
 							<option value="0">请选择业务办理</option>
35 48
 						</select>
36
-					</div>
37
-					
49
+					</div>-->
50
+					<div class="form-group col-md-4" id="order_handles">
51
+										<label for="order_handle">工单子类:</label>
52
+										<select class="form-control input-sm selectpicker" id="order_godant" data-live-search="true">
53
+											<option value="0">请选择工单子类</option>
54
+											<option value="管道泡水">管道泡水</option>
55
+											<option value="闸井设施">闸井设施</option>
56
+											<option value="表井设施">表井设施</option>
57
+											<option value="消防设施">消防设施</option>
58
+											<option value="水压低">水压低</option>
59
+											<option value="无水">无水</option>
60
+											<option value="水费水量">水费水量</option>
61
+											<option value="停水复装">停水复装</option>
62
+											<option value="水质">水质</option>
63
+											<option value="表位插花">表位插花</option>
64
+											<option value="户表安装">户表安装</option>
65
+											<option value="违章用水">违章用水</option>
66
+											<option value="水域不洁">水域不洁</option>
67
+											<option value="施工围挡">施工围挡</option>
68
+											<option value="垃圾渣土">垃圾渣土</option>
69
+											<option value="道路破损">道路破损</option>
70
+											<option value="其他">其他</option>
71
+										</select>
72
+									</div>
38 73
 					<div class="form-group col-md-4">
39
-						<label for="order_name"><b class="text-red">*</b>客户姓名:</label>
74
+						<label for="order_name">客户姓名:</label>
40 75
 						<input type="text" class="form-control input-sm" id="order_name" placeholder="请输入客户姓名">
41 76
 					</div>
42 77
 					<div class="form-group col-md-4">
43
-						<label for="order_tel"><b class="text-red">*</b>电话:</label>
78
+						<label for="order_tel">电话:</label>
44 79
 						<input type="text" class="form-control input-sm" id="order_tel" placeholder="请输入电话">
45 80
 					</div>
46 81
 					<div class="form-group col-md-4">
82
+						<label for="order_name">截止日期:</label>
83
+						<i class="tub fa fa-calendar"></i>
84
+						<input class="form-control search_time" type="text" id="sc_time" placeholder="请选择截止时间">
85
+					</div>
86
+					<!--<div class="form-group col-md-4">
47 87
 						<label for="order_company"><b class="text-red">*</b>公司名称:</label>
48 88
 						<input type="text" class="form-control input-sm" id="order_company" placeholder="请输入公司名称">
49
-					</div>
89
+					</div>-->
50 90
 	
51 91
 					<div class="form-group col-md-12">
52 92
 						<label for="order_reception">反馈内容:</label>
@@ -92,6 +132,7 @@
92 132
 		<script src="../js/bootstrap-select/js/i18n/defaults-zh_CN.js"></script>
93 133
 		<script src="../js/bootstrap-treeview/bootstrap-treeview.min.js"></script>
94 134
 		<script src="../Script/Common/regexs.js"></script>
135
+		<script src="../js/laydate/laydate.js"></script>
95 136
 		<script src="../js/WorkOrder/addOrEditWorkOrder.js"></script>
96 137
 	</body>
97 138
 

+ 10 - 10
CallCenterWeb.UI/commonTpl/cusDetails.html

@@ -28,23 +28,23 @@
28 28
 							<label for="customer_code">客户编号:</label>
29 29
 							<span id="customer_code"></span>
30 30
 						</li>
31
-						<li class="col-md-3 col-sm-4">
31
+						<!-- <li class="col-md-3 col-sm-4">
32 32
 							<label for="customer_companyname">公司名称:</label>
33 33
 							<span id="customer_companyname"></span>
34 34
 						</li>
35 35
 						<li class="col-md-3 col-sm-4">
36 36
 							<label for="customer_comaddress">公司地址:</label>
37 37
 							<span id="customer_comaddress"></span>
38
-						</li>
38
+						</li> -->
39 39
 						<li class="col-md-3 col-sm-4">
40
-							<label for="customer_legalName">法人姓名:</label>
40
+							<label for="customer_legalName">客户姓名:</label>
41 41
 							<span id="customer_legalName"></span>
42 42
 						</li>
43 43
 						<li class="col-md-3 col-sm-4">
44
-							<label for="customer_lehalTel">法人电话:</label>
44
+							<label for="customer_lehalTel">客户电话:</label>
45 45
 							<span id="customer_lehalTel"></span>
46 46
 						</li>
47
-						<li class="col-md-3 col-sm-4">
47
+						<!-- <li class="col-md-3 col-sm-4">
48 48
 							<label for="customer_subtrade">所属行业:</label>
49 49
 							<span id="customer_subtrade"></span>
50 50
 						</li>
@@ -115,12 +115,12 @@
115 115
 						<li class="col-md-12 col-sm-12">
116 116
 							<label for="customer_RegisteredAddress">注册地址:</label>
117 117
 							<span id="customer_RegisteredAddress"></span>
118
-						</li>
118
+						</li> -->
119 119
 						<li class="col-md-12 col-sm-12">
120 120
 							<label for="customer_address">联系地址:</label>
121 121
 							<span id="customer_address"></span>
122 122
 						</li>
123
-						<li class="col-md-12 col-sm-12">
123
+						<!-- <li class="col-md-12 col-sm-12">
124 124
 							<label for="customer_address1">联系地址1:</label>
125 125
 							<span id="customer_address1"></span>
126 126
 						</li>
@@ -147,11 +147,11 @@
147 147
 						<li class="col-md-12 col-sm-12">
148 148
 							<label for="customer_Remark3">备注3:</label>
149 149
 							<span id="customer_Remark3"></span>
150
-						</li>
150
+						</li> -->
151 151
 					</ul>
152 152
 			</div>
153 153
 			
154
-			<div class="content_1 clearfix">
154
+			<!-- <div class="content_1 clearfix">
155 155
 				<div class="shark_content_title clearfix">
156 156
 					<span>财税情况</span>
157 157
 					<a id="btn_editTax" style="display: none;" href="javascript:;" class="aBtn hide_btn pull-right" onclick="btn_editTax()" title="修改财税情况">修改</a>
@@ -272,7 +272,7 @@
272 272
 					</div>
273 273
 					
274 274
 				</ul>
275
-			</div>
275
+			</div> -->
276 276
 		
277 277
 		</div>
278 278
 		<script src="../keHuManager/js/cusDetails.js"></script>

+ 1 - 0
CallCenterWeb.UI/js/WorkOrder/AddWorkOrder.js

@@ -128,6 +128,7 @@ function orderSave() {
128 128
     callCustomer: $('#order_name').val(),//string 客户姓名; -此参数可根据来电弹屏时的客户绑定
129 129
     tel: $('#order_tel').val(),//string 联系电话 ; -此参数可根据来电弹屏时的客户绑定
130 130
     company: $('#order_company').val(),// 公司名称
131
+    limitdate:$('#sc_time').val(),//截止日期
131 132
 		fkcont:  $('#order_reception').val(),//string 反馈内容;
132 133
     iseffective: $('#order_iseffective').find('input[type="radio"]:checked').val(),//int 是否有效工单项(0有效,1无效);
133 134
     note: $('#order_note').val(),//string 无效工单必填备注;

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

@@ -55,6 +55,18 @@ function initTable() {
55 55
 			ltype = '5';
56 56
 			isaudit = '1';
57 57
 			break;
58
+		case "WorkOrderAssigned.html": //已指派工单
59
+			ltype = '6';
60
+			isaudit = '1';
61
+			break;
62
+		case "WorkOrderAwaitVist.html": //待回访工单
63
+			ltype = '7';
64
+			isaudit = '1';
65
+			break;
66
+		case "WorkOrderBeen.html": //待回访工单
67
+			ltype = '8';
68
+			isaudit = '1';
69
+			break;
58 70
 		case "WorkOrderWchartList.html": //微信工单
59 71
 			isaudit = '0';
60 72
 			break;
@@ -268,9 +280,10 @@ function formatterOprateWchart(val, row) {
268 280
 function formatterOprateDispose(val, row) {
269 281
 	return '<ul class="tool_downs">' +
270 282
 		// '<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_delete_' + row.ID + '" onclick="btn_delete(\'' + row.ID + '\')" title="删除">删除</a></li>' +
271
-		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_transfer_' + row.ID + '" onclick="btn_transfer(\'' + row.ID + '\', false, \''+ row.IsAdminSend +'\')" title="分配">分配</a></li>' +
283
+		// '<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_transfer_' + row.ID + '" onclick="btn_transfer(\'' + row.ID + '\', false, \''+ row.IsAdminSend +'\')" title="分配">分配</a></li>' +
272 284
 		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_end_' + row.ID + '" onclick="btn_end(\'' + row.ID + '\', false)" title="处理">处理</a></li>' +
273
-		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_abnormal_back_' + row.ID + '" onclick="btn_abnormal_back(\'' + row.ID + '\')" title="异常退回">异常退回</a></li>' +
285
+		// '<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_abnormal_back_' + row.ID + '" onclick="btn_abnormal_back(\'' + row.ID + '\')" title="异常退回">异常退回</a></li>' +
286
+		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_back_' + row.ID + '" onclick="btn_back(\'' + row.ID + '\')" title="退回">退回</a></li>' +
274 287
 		'</ul>';
275 288
 
276 289
 }
@@ -299,6 +312,12 @@ function formatterOprateLogs(val, row) {
299 312
 		'</ul>';
300 313
 }
301 314
 
315
+//格式化操作 (待回访)
316
+function formatterOprateHuiF(val, row) {
317
+	return '<ul class="tool_downs">' +
318
+		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_deleteLogs_' + row.Id + '" onclick="(' + row.Id + ')" title="回访">回访</a></li>' +
319
+		'</ul>';
320
+}
302 321
 //格式化工单编号
303 322
 function formatterOrderId(val, row) {
304 323
 	return '<div class="imgs" ><a class="xg" onclick=btn_detail("' + row.ID + '") >' + val + '</a></div>'

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

@@ -210,13 +210,13 @@ function dealWorkOrder(oid) {
210 210
 	// var ltype = $("input[name='ltype']:checked").val();
211 211
 	var isDetail = helper.request.queryString("isDetail"); //是否是详情页面的处理
212 212
 	
213
-	if($.trim($('#clbmname').val()) && !$('#clid').val()){
214
-		layer.confirm('请选择接收人!', {
215
-			icon: 2,
216
-			btn: ['确定']
217
-		});
218
-		return;
219
-	}
213
+	// if($.trim($('#clbmname').val()) && !$('#clid').val()){
214
+	// 	layer.confirm('请选择接收人!', {
215
+	// 		icon: 2,
216
+	// 		btn: ['确定']
217
+	// 	});
218
+	// 	return;
219
+	// }
220 220
 	
221 221
 	$.post(huayi.config.callcenter_url + 'WorkOrder/AssignWorkOrder', {
222 222
 		orderid: oid, //否	strubg	工单ID

+ 18 - 26
CallCenterWeb.UI/js/WorkOrder/addOrEditWorkOrder.js

@@ -12,15 +12,15 @@ $(function() {
12 12
 	helper.getDropList.getOrderRadios($('#order_type'), 'GDLX', 'inlineRadioOptions'))
13 13
 	.then(function(){
14 14
 		$('#order_source').selectpicker('val', '468');
15
-		$('#order_type').find('input[type="radio"]').on('change', function() {
16
-			$('#order_type').find('input[type="radio"]').on('change', function() {
17
-				if($(this).val() === "107") { // 业务办理
18
-					$('#order_handles').show();
19
-				}else{
20
-					$('#order_handles').hide();
21
-				}
22
-			});
23
-		});
15
+		// $('#order_type').find('input[type="radio"]').on('change', function() {
16
+		// 	$('#order_type').find('input[type="radio"]').on('change', function() {
17
+		// 		if($(this).val() === "107") { // 业务办理
18
+		// 			$('#order_handles').show();
19
+		// 		}else{
20
+		// 			$('#order_handles').hide();
21
+		// 		}
22
+		// 	});
23
+		// });
24 24
 		if(oid) {
25 25
 			getWorkOrder(oid); //获取工单信息
26 26
 		}
@@ -38,7 +38,13 @@ $(function() {
38 38
 	
39 39
 	//新增工单创建
40 40
 	$('#save_order').on('click', orderSave);
41
-
41
+    laydate.render({
42
+    	elem: '#sc_time',
43
+    	// range: '~',
44
+    	type: 'datetime',
45
+    	theme: '#1ab394',
46
+    	// calendar: true
47
+    });
42 48
 });
43 49
 
44 50
 //新建工单 保存
@@ -68,22 +74,6 @@ function orderSave() {
68 74
 		});
69 75
 		return;
70 76
 	}
71
-	if(!$.trim($('#order_company').val())) {
72
-		layer.confirm('请输入公司名称!', {
73
-			icon: 2,
74
-			btn: ['确定']
75
-		});
76
-		return;
77
-	}
78
-	if($('#order_iseffective').find('input[type="radio"]:checked').val() === '1') {
79
-		if(!$.trim($('#order_note').val())) {
80
-			layer.confirm('请输入无效原因!', {
81
-				icon: 2,
82
-				btn: ['确定']
83
-			});
84
-			return;
85
-		}
86
-	}
87 77
 	var order_handle = $('#order_handles').is(':visible') ? $('#order_handle').val() : 0;
88 78
 	$.post(huayi.config.callcenter_url + wURL, {
89 79
 		orderid: oid, //int 工单id;
@@ -96,6 +86,7 @@ function orderSave() {
96 86
     tel: $('#order_tel').val(), //string 联系电话 ; -此参数可根据来电弹屏时的客户绑定
97 87
 		company: $('#order_company').val(), //公司名称
98 88
     fkcont: $('#order_reception').val(), //string 反馈内容;
89
+	limitdate:$('#sc_time').val(),//截止日期
99 90
     iseffective: $('#order_iseffective').find('input[type="radio"]:checked').val(), //	int 是否有效工单项(0有效,1无效);
100 91
     note: $('#order_note').val(), // string 无效工单必填备注;
101 92
 		// isover: $('#order_isover').find('input[type="radio"]:checked').val(), //int 是否立即处理(默认为0,立即处理为1,立即处理的工单无法指派接收人和接受部门)
@@ -134,6 +125,7 @@ function getWorkOrder(oid) {
134 125
 				$('#order_name').val(data.Customer); //是	string	姓名/联系人
135 126
 				$('#order_tel').val(data.CustomerTel); //否	string	联系电话
136 127
 				$('#order_company').val(data.County); // 公司名称
128
+				$('#sc_time').val(data.limitdate),//截止日期
137 129
 				$('#order_reception').val(decodeURIComponent(data.Detail)); //否	string	反馈内容 - 反馈内容
138 130
 				$('#order_iseffective').find('input[type="radio"][value="' + data.IsEffective + '"]').prop('checked', true).trigger('change'); //是否有效
139 131
 				if(data.Province) {

+ 28 - 27
CallCenterWeb.UI/keHuManager/customerInfo.html

@@ -48,37 +48,37 @@
48 48
 								<option value="">请选择客户信誉等级</option>
49 49
 							</select>
50 50
 						</div>-->
51
-						<div class="form-group">
51
+						<!-- <div class="form-group">
52 52
 							<input type="text" class="form-control" id="sc_subtrade" placeholder="请输入所属行业" />
53
-						</div>
54
-						<div class="form-group">
53
+						</div> -->
54
+						<!-- <div class="form-group">
55 55
 							<input type="text" class="form-control" id="sc_layer" placeholder="请输入客户信誉等级" />
56
-						</div>
57
-						<div class="form-group">
56
+						</div> -->
57
+						<!-- <div class="form-group">
58 58
 							<input type="text" class="form-control" id="sc_key" placeholder="请输入关键词" />
59
-						</div>
59
+						</div> -->
60 60
 						<div class="form-group">
61 61
 							<input type="text" class="form-control" id="sc_code" placeholder="请输入客户编号" />
62 62
 						</div>
63
-						<div class="form-group">
63
+						<!-- <div class="form-group">
64 64
 							<input type="text" class="form-control" id="sc_cmpname" placeholder="请输入公司名称" />
65
-						</div>
65
+						</div> -->
66 66
 						<div class="form-group">
67
-							<input type="text" class="form-control" id="sc_compaddress" placeholder="请输入公司地址" />
67
+							<input type="text" class="form-control" id="sc_legname" placeholder="请输入客户姓名" />
68 68
 						</div>
69 69
 						<div class="form-group">
70
-							<input type="text" class="form-control" id="sc_legname" placeholder="请输入法人姓名" />
70
+							<input type="text" class="form-control" id="sc_legtel" placeholder="请输入客户电话" />
71 71
 						</div>
72 72
 						<div class="form-group">
73
-							<input type="text" class="form-control" id="sc_legtel" placeholder="请输入法人电话" />
73
+							<input type="text" class="form-control" id="sc_compaddress" placeholder="请输入客户地址" />
74 74
 						</div>
75
-						<div class="form-group">
75
+						<!-- <div class="form-group">
76 76
 							<input type="text" class="form-control" id="sc_bedept" placeholder="请输入客户归属部门" />
77
-						</div>
78
-						<div class="form-group">
77
+						</div> -->
78
+						<!-- <div class="form-group">
79 79
 							<input type="text" class="form-control" id="sc_berelacc" placeholder="请输入归属涉税会计" />
80
-						</div>
81
-						<div class="form-group">
80
+						</div> -->
81
+						<!-- <div class="form-group">
82 82
 							<input type="text" class="form-control" id="sc_beaudacc" placeholder="请输入归属审核会计" />
83 83
 						</div>
84 84
 						<div class="form-group">
@@ -89,7 +89,7 @@
89 89
 						</div>
90 90
 						<div class="form-group">
91 91
 							<input type="text" class="form-control" id="sc_contel" placeholder="请输入联系人电话" />
92
-						</div>
92
+						</div> -->
93 93
 					</div>
94 94
 				</div>
95 95
 
@@ -108,19 +108,20 @@
108 108
 							<th data-checkbox="true"></th>
109 109
 							<th data-field="F_CustomerCode" data-align="center">客户编号</th>
110 110
 							<!-- <th data-field="F_KeyWords" data-align="center">关键词</th> -->
111
-							<th data-field="F_CompanyName" data-align="center">公司名称</th>
112
-							<th data-field="F_CompanyAddress" data-align="center">公司地址</th>
111
+							<th data-field="F_LegalName" data-align="center">客户姓名</th>
112
+							<th data-field="F_LegalTel" data-align="center">客户电话</th>
113
+							<th data-field="F_Address" data-align="center">客户地址</th>
113 114
 							<!-- <th data-field="F_LegalName" data-align="center">法人姓名</th> -->
114 115
 							<!-- <th data-field="F_LegalTel" data-align="center">法人电话</th> -->
115
-							<th data-field="F_SubTrade" data-align="center">所属行业</th>
116
-							<th data-field="F_TaxCategory" data-align="center">税务类别</th>
116
+							<!-- <th data-field="F_SubTrade" data-align="center">所属行业</th> -->
117
+							<!-- <th data-field="F_TaxCategory" data-align="center">税务类别</th> -->
117 118
 							<!-- <th data-field="F_TaxPointDes" data-align="center">税点描述</th> -->
118
-							<th data-field="F_InvoiceRange" data-align="center">开票范围</th>
119
-							<th data-field="F_Layer" data-align="center">客户信誉等级</th>
120
-							<th data-field="F_BeDeptName" data-align="center">客户归属部门</th>
121
-							<th data-field="F_BeRelatedAcc" data-align="center">客户归属涉税会计</th>
122
-							<th data-field="F_BeAuditAcc" data-align="center">客户归属审核会计</th>
123
-							<th data-field="F_BeMakeAcc" data-align="center">客户归属做账会计</th>
119
+							<!-- <th data-field="F_InvoiceRange" data-align="center">开票范围</th> -->
120
+							<!-- <th data-field="F_Layer" data-align="center">客户信誉等级</th> -->
121
+							<!-- <th data-field="F_BeDeptName" data-align="center">客户归属部门</th> -->
122
+							<!-- <th data-field="F_BeRelatedAcc" data-align="center">客户归属涉税会计</th> -->
123
+							<!-- <th data-field="F_BeAuditAcc" data-align="center">客户归属审核会计</th> -->
124
+							<!-- <th data-field="F_BeMakeAcc" data-align="center">客户归属做账会计</th> -->
124 125
 							<!-- <th data-field="ContactList" data-align="center">联系人信息</th> -->
125 126
 							<th data-field="F_CustomerId" data-formatter="formatterOprate" data-align="center">操作</th>
126 127
 						</tr>

+ 1 - 1
CallCenterWeb.UI/keHuManager/js/customerInfo.js

@@ -96,7 +96,7 @@ function formatterOprate(val, row) {
96 96
 	return '<ul class="tool_downs">' +
97 97
 		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_details_' + row.F_CustomerId + '" onclick="btn_details(\'' + row.F_CustomerId + '\')" title="详情">详情</a></li>' +
98 98
 		'<li><a href="javascript:;" class="aBtn hide_btn" authorize="yes" id="HY_edit_' + row.F_CustomerId + '" onclick="btn_edit(\'' + row.F_CustomerId + '\')" title="修改">修改</a></li>' +
99
-		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_addCus_' + row.F_CustomerId + '" onclick="btn_addCus(\'' + row.F_CustomerId + '\')" title="添加联系人信息">添加</a></li>' +
99
+		// '<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_addCus_' + row.F_CustomerId + '" onclick="btn_addCus(\'' + row.F_CustomerId + '\')" title="添加联系人信息">添加</a></li>' +
100 100
 		'<li><a href="javascript:;" class="aBtn hide_btnd" authorize="yes" id="HY_delete_' + row.F_CustomerId + '" onclick="btn_delete(' + row.F_CustomerId + ')" title="删除">删除</a></li>' +
101 101
 		'</ul>';
102 102
 }

+ 17 - 14
CallCenterWeb.UI/visit/awaitVist.html

@@ -61,22 +61,23 @@
61 61
 						<tr>
62 62
 							<th data-field="WorkOrderID" data-formatter="formatterOrderId" data-align="center">工单编号</th>
63 63
 							<th data-field="State" data-formatter="formatterState" data-align="center">工单状态</th>
64
-							<th data-field="IsEffective" data-formatter="formatterIsEffective" data-align="center">工单有效性</th>
65
-							<th data-field="Customer" data-width="60" data-align="center">客户姓名</th>
66
-							<th data-field="CustomerTel" data-formatter="formatterTel" data-align="center">客户电话</th>
67
-							<th data-field="areaname" data-align="center">区域名称</th>
68
-							<th data-field="proname" data-align="center">项目名称</th>
69
-							<th data-field="buildingname" data-align="center">期号名称</th>
70
-							<th data-field="Address" data-align="center">房间号</th>
64
+							<!-- <th data-field="IsEffective" data-formatter="formatterIsEffective" data-align="center">工单有效性</th> -->
71 65
 							<th data-field="GDLYName" data-align="center">工单来源</th>
72
-							<th data-field="TypeClassName" data-align="center">工单类型</th>
73
-							<th data-field="complaintTypeName" data-align="center">投诉类型</th>
66
+							<th data-field="GDLXName" data-align="center">工单类型</th>
67
+							<th data-field="" data-align="center">工单子类</th>
68
+							<th data-field="Customer" data-align="center">客户姓名</th>
69
+							<th data-field="CustomerTel" data-formatter="helper.filter.cutTel" data-align="center">客户电话</th>
74 70
 							<th data-field="Detail" data-align="center" data-formatter="formatterDetail">反馈内容</th>
75
-							<th data-field="clcontent" data-align="center" data-formatter="formatterDetail">处理内容</th>
76
-							<th data-field="AuditUserNameRel" data-formatter="formatterAuditUser" data-align="center">接收人</th>
71
+							<th data-field="Files" data-align="center">附件</th>
77 72
 							<th data-field="CreateUserNameRel" data-align="center">创建人</th>
78
-							<th data-field="CBCount" data-align="center">催办</th>
79
-							<th data-field="CreateTime" data-width="150" data-align="center">创建时间</th>
73
+							<th data-field="CreateTime" data-align="center">创建时间</th>
74
+							<th data-field="AppointUserNameRel" data-align="center">指派人</th>
75
+							<th data-field="AppointTime" data-align="center">指派时间</th>
76
+							<th data-field="AppointContent" data-align="center">指派说明</th>
77
+							<th data-field="ToDeptName" data-align="center">处理人</th>
78
+							<th data-field="SureUserNameRel" data-align="center">处理时间</th>
79
+							<th data-field="Clcontent" data-align="center">处理详情</th>
80
+							<th data-field="SureTime" data-align="center">操作工单</th>
80 81
 						</tr>
81 82
 					</thead>
82 83
 				</table>
@@ -88,7 +89,9 @@
88 89
 		<script src="../js/laydate/laydate.js"></script>
89 90
 		<script src="../js/bootstrap-select/js/bootstrap-select.js"></script>
90 91
 		<script src="../js/bootstrap-select/js/i18n/defaults-zh_CN.js"></script>
91
-		<script src="js/visitList.js"></script>
92
+		<!-- <script src="js/visitList.js"></script> -->
93
+		<script src="../js/WorkOrder/WorkOrder.js"></script>
94
+		
92 95
 	</body>
93 96
 
94 97
 </html>

+ 20 - 15
CallCenterWeb.UI/visit/haveVisit.html

@@ -66,23 +66,26 @@
66 66
 						<tr>
67 67
 							<th data-field="WorkOrderID" data-formatter="formatterOrderId" data-align="center">工单编号</th>
68 68
 							<th data-field="State" data-formatter="formatterState" data-align="center">工单状态</th>
69
-							<th data-field="IsEffective" data-formatter="formatterIsEffective" data-align="center">工单有效性</th>
70
-							<th data-field="Customer" data-width="60" data-align="center">客户姓名</th>
71
-							<th data-field="CustomerTel" data-formatter="formatterHaveTel" data-align="center">客户电话</th>
72
-							<th data-field="CallResult" data-align="center">呼叫结果</th>
73
-							<th data-field="ResponUserName" data-align="center">回访人</th>
74
-							<th data-field="proname" data-align="center">项目名称</th>
75
-							<th data-field="buildingname" data-align="center">期号名称</th>
76
-							<th data-field="Address" data-align="center">房间号</th>
69
+							<!-- <th data-field="IsEffective" data-formatter="formatterIsEffective" data-align="center">工单有效性</th> -->
77 70
 							<th data-field="GDLYName" data-align="center">工单来源</th>
78
-							<th data-field="TypeClassName" data-align="center">工单类型</th>
79
-							<th data-field="complaintTypeName" data-align="center">投诉类型</th>
71
+							<th data-field="GDLXName" data-align="center">工单类型</th>
72
+							<th data-field="" data-align="center">工单子类</th>
73
+							<th data-field="Customer" data-align="center">客户姓名</th>
74
+							<th data-field="CustomerTel" data-formatter="helper.filter.cutTel" data-align="center">客户电话</th>
80 75
 							<th data-field="Detail" data-align="center" data-formatter="formatterDetail">反馈内容</th>
81
-							<th data-field="clcontent" data-align="center" data-formatter="formatterDetail">处理内容</th>
82
-							<th data-field="AuditUserNameRel" data-formatter="formatterAuditUser" data-align="center">接收人</th>
76
+							<th data-field="Files" data-align="center">附件</th>
83 77
 							<th data-field="CreateUserNameRel" data-align="center">创建人</th>
84
-							<th data-field="CBCount" data-align="center">催办</th>
85
-							<th data-field="CreateTime" data-width="150" data-align="center">创建时间</th>
78
+							<th data-field="CreateTime" data-align="center">创建时间</th>
79
+							<th data-field="AppointUserNameRel" data-align="center">指派人</th>
80
+							<th data-field="AppointTime" data-align="center">指派时间</th>
81
+							<th data-field="AppointContent" data-align="center">指派说明</th>
82
+							<th data-field="ToDeptName" data-align="center">处理人</th>
83
+							<th data-field="SureUserNameRel" data-align="center">处理时间</th>
84
+							<th data-field="Clcontent" data-align="center">处理详情</th>
85
+							<th data-field="ReturnUserNameRel" data-align="center">回访人</th>
86
+							<th data-field="ReturnBakTime" data-align="center">回访时间</th>
87
+							<th data-field="ReturnContent" data-align="center">回访结果</th>
88
+							
86 89
 						</tr>
87 90
 					</thead>
88 91
 				</table>
@@ -265,7 +268,9 @@
265 268
 		<script src="../js/laydate/laydate.js"></script>
266 269
 		<script src="../js/bootstrap-select/js/bootstrap-select.js"></script>
267 270
 		<script src="../js/bootstrap-select/js/i18n/defaults-zh_CN.js"></script>
268
-		<script src="js/visitList.js"></script>
271
+		<!-- <script src="js/visitList.js"></script> -->
272
+		<script src="../js/WorkOrder/WorkOrder.js"></script>
273
+		
269 274
 	</body>
270 275
 
271 276
 </html>