Sfoglia il codice sorgente

减免工单,减免备注

liuyifan 5 anni fa
parent
commit
27d4e6f4ac

+ 7 - 2
CallCenterWeb.UI/WorkOrder/WorkOrderAppoint.html

@@ -1,4 +1,4 @@
1
-<!DOCTYPE html>
1
+<!DOCTYPE html>
2 2
 <html>
3 3
 <head>
4 4
     <meta charset="UTF-8">
@@ -292,8 +292,13 @@
292 292
 									</td>
293 293
 								</tr>
294 294
 								<tr>
295
+									<th>减免备注</th>
296
+									<td>
297
+										<span id="detailReductionRemarks"></span>
298
+									</td>
295 299
 									<th>备注:</th>
296
-									<td colspan="5" id="detailContent">
300
+									<td>
301
+										<span id="detailContent"></span>
297 302
 									</td>
298 303
 								</tr>
299 304
 							</tbody>

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

@@ -317,8 +317,13 @@
317 317
 									</td>
318 318
 								<tr>
319 319
 								<tr>
320
+									<th>减免备注</th>
321
+									<td>
322
+										<span id="detailReductionRemarks"></span>
323
+									</td>
320 324
 									<th>备注:</th>
321
-									<td colspan="5" id="detailContent">
325
+									<td>
326
+										<span id="detailContent"></span>
322 327
 									</td>
323 328
 								</tr>
324 329
 							</tbody>

+ 6 - 2
CallCenterWeb.UI/WorkOrder/WorkOrderDetails.html

@@ -173,9 +173,13 @@
173 173
 								</td>
174 174
 							</tr>
175 175
 							<tr>
176
-							<tr>
176
+								<th>减免备注</th>
177
+								<td>
178
+									<span id="detailReductionRemarks"></span>
179
+								</td>
177 180
 								<th>备注:</th>
178
-								<td colspan="5" id="detailContent">
181
+								<td>
182
+									<span id="detailContent"></span>
179 183
 								</td>
180 184
 							</tr>
181 185
 						</tbody>

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

@@ -1,4 +1,4 @@
1
-<!DOCTYPE html>
1
+<!DOCTYPE html>
2 2
 <html>
3 3
 	<head>
4 4
 		<meta charset="UTF-8">
@@ -365,8 +365,13 @@
365 365
 									</td>
366 366
 								</tr>
367 367
 								<tr>
368
+									<th>减免备注</th>
369
+									<td>
370
+										<span id="detailReductionRemarks"></span>
371
+									</td>
368 372
 									<th>备注:</th>
369
-									<td colspan="5" id="detailContent">
373
+									<td>
374
+										<span id="detailContent"></span>
370 375
 									</td>
371 376
 								</tr>
372 377
 							</tbody>

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

@@ -1,4 +1,4 @@
1
-<!DOCTYPE html>
1
+<!DOCTYPE html>
2 2
 <html>
3 3
 
4 4
 	<head>
@@ -306,8 +306,13 @@
306 306
 									</td>
307 307
 								</tr>
308 308
 								<tr>
309
+									<th>减免备注</th>
310
+									<td>
311
+										<span id="detailReductionRemarks"></span>
312
+									</td>
309 313
 									<th>备注:</th>
310
-									<td colspan="5" id="detailContent">
314
+									<td>
315
+										<span id="detailContent"></span>
311 316
 									</td>
312 317
 								</tr>
313 318
 							</tbody>

+ 6 - 1
CallCenterWeb.UI/WorkOrder/WorkOrderProcessing.html

@@ -311,8 +311,13 @@
311 311
 									</td>
312 312
 								</tr>
313 313
 								<tr>
314
+									<th>减免备注</th>
315
+									<td>
316
+										<span id="detailReductionRemarks"></span>
317
+									</td>
314 318
 									<th>备注:</th>
315
-									<td colspan="5" id="detailContent">
319
+									<td>
320
+										<span id="detailContent"></span>
316 321
 									</td>
317 322
 								</tr>
318 323
 							</tbody>

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

@@ -13,7 +13,7 @@
13 13
     <link rel="stylesheet" href="../css/WorkOrder/jquery.editable-select.css" />
14 14
     <link rel="stylesheet" href="../js/comboSelect/combo.select.css" />
15 15
     <link rel="stylesheet" href="../css/init.css" />
16
-    <title>指派</title>
16
+    <title>减免</title>
17 17
     <style>
18 18
         ul li {
19 19
             float: initial;
@@ -72,12 +72,12 @@
72 72
 							</div>
73 73
 	                    </td>
74 74
 					</tr>
75
-					<!--<tr>
75
+					<tr>
76 76
                         <th>减免内容:</th>
77 77
                         <td colspan="7">
78 78
                             <textarea name="" rows="5" cols="" placeholder="" id="cont" style="margin-top:10px;"></textarea>
79 79
                         </td>
80
-                    </tr>-->
80
+                    </tr>
81 81
                     <tr>
82 82
                         <td colspan="8" style="text-align: center;">
83 83
                             <button class="btns customerSubmit">确&nbsp;定</button>

+ 453 - 0
CallCenterWeb.UI/WorkOrder/WorkOrderRemission.html

@@ -0,0 +1,453 @@
1
+<!DOCTYPE html>
2
+<html>
3
+<head>
4
+    <meta charset="UTF-8">
5
+    <title>待提交工单</title>
6
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
7
+    <script src="../Script/Common/huayi.load.js"></script>
8
+	<script src="../Script/Common/huayi.config.js"></script>
9
+	<link rel="stylesheet" href="../js/zTree/zTreeStyle.css" />
10
+	<link href="../css/WorkOrder/Search.css" rel="stylesheet">
11
+	<link rel="stylesheet" href="../js/comboSelect/combo.select.css" />
12
+	<link href="../css/init.css" rel="stylesheet" />
13
+    <link rel="stylesheet" href="../css/bootstrap-table-fixed-columns.css">
14
+    <script src="../js/bootstrap-table-fixed-columns.js"></script>
15
+    <style>
16
+		.toolBox{
17
+			padding-top: 15px;	
18
+		}
19
+		
20
+		.toolBox .form-inline .form-group{
21
+			margin-bottom: 10px;
22
+		}
23
+				
24
+		.workOprate{
25
+			/*border: 0;*/
26
+		}
27
+		tbody tr .W200{
28
+			/*border: 0;*/
29
+		}
30
+    </style>
31
+</head>
32
+<body class="gray-bg">
33
+    <div class="wrapper wrapper-content animated fadeInRight">
34
+        <div class="daoHang clearfix">
35
+            <div class="dhLeft">
36
+                <sapn><i class="syIcon"></i>位置:<a href="javaScript:;" id="ReIndex">首页</a>&gt;<a href="javaScript:;">工单管理</a>&gt;<a href=""class="nowPosition">待提交工单</a></sapn>
37
+            </div>
38
+            <div class="dhRight">
39
+            	<a href="#" title="刷新"><i class="fa fa-refresh"></i></a>
40
+            </div>
41
+        </div>
42
+        <div class="wrapper wrapper-content animated fadeInRight">
43
+			<div class="toolBox clearfix">
44
+				<div class="pull-left">
45
+					<div class="form-inline clearfix">
46
+						<div class="form-group">
47
+							<input class="form-control" type="text" id="searchCode" placeholder="请输入工单编号">
48
+						</div>
49
+						<div class="form-group">
50
+							<select class="form-control" id="searchArea">
51
+								<option value="">请选择大区</option>
52
+							</select>
53
+						</div>
54
+						<div class="form-group">
55
+							<select class="form-control" id="searchOffice">
56
+								<option value="">请选择办事处</option>
57
+							</select>
58
+						</div>
59
+						<div class="time-box form-group">
60
+							<i class="tub fa fa-calendar"></i>
61
+							<input class="form-control search_time" type="text" id="greetingTimes" placeholder="请选择投诉时间" autocomplete="off">
62
+						</div>
63
+						<div class="form-group">
64
+							<input class="form-control" type="text" id="searchKeywords" placeholder="联系电话">
65
+						</div>
66
+						<div class="form-group">
67
+							<select class="form-control" id="searchProductType">
68
+								<option value="">请选择产品代码</option>
69
+							</select>
70
+						</div>
71
+						<div class="form-group">
72
+							<input class="form-control" type="text" id="searchProductDate" placeholder="生产日期(YYYY.MM.DD)">
73
+						</div>
74
+						<div class="form-group">
75
+							<input class="form-control" type="text" id="searchBatchNumber" placeholder="产品编码">
76
+						</div>
77
+						<div class="form-group">
78
+							<input type="text" class="form-control" id="searchManufacturer" list="searchManufacturerDataList" placeholder="生产厂家"/>
79
+							<datalist id="searchManufacturerDataList">
80
+							</datalist>
81
+						</div>
82
+						<div class="form-group">
83
+							<select class="form-control" id="searchProblemCode">
84
+								<option value="">请选择问题代码</option>
85
+							</select>
86
+						</div>
87
+						<div class="form-group">
88
+							<select class="form-control" id="searchNotifications">
89
+								<option value="">请选择通知人</option>
90
+							</select>
91
+						</div>
92
+						<div class="form-group">
93
+							<select class="form-control" id="searchOrderType">
94
+								<option value="">请选择工单类别</option>
95
+								<option value="1">咨询</option>
96
+								<option value="2">投诉</option>
97
+								<option value="3">重复</option>
98
+							</select>
99
+						</div>
100
+						<div class="form-group">
101
+							<select class="form-control" id="searchDealTimely">
102
+								<option value="">请选择工单级别</option>
103
+							</select>
104
+						</div>
105
+						<!--<div class="form-group">
106
+							<select class="form-control" id="searchOrderSource">
107
+								<option value="">请选择工单来源</option>
108
+								<option value="1">PC</option>
109
+								<option value="2">APP</option>
110
+								<option value="3">微信</option>
111
+							</select>
112
+						</div>-->
113
+						<div class="form-group">
114
+							<select class="form-control" id="searchSee">
115
+								<option value="">查看负责区域单子</option>
116
+								<option value="0">所有</option>
117
+								<option value="1">管理区域</option>
118
+							</select>
119
+						</div>
120
+						<div class="time-box form-group">
121
+							<i class="tub fa fa-calendar"></i>
122
+							<input class="form-control search_time" type="text" id="duplicateTime" placeholder="请选择重复投诉时间" autocomplete="off">
123
+						</div>
124
+						<div class="form-group">
125
+							<select class="form-control" id="searchRemission">
126
+								<option value="">是否减免</option>
127
+								<option value="0">否</option>
128
+								<option value="1">是</option>
129
+							</select>
130
+						</div>
131
+						<div class="form-group btn-position">
132
+							<button class="btns ss">搜索</button>
133
+							<button class="btns export">导出</button>
134
+						</div>
135
+					</div>
136
+				</div>
137
+			</div>
138
+        <div style="width: 100%;padding: 10px;">
139
+			<table id="workorderlist" class="market" data-row-style="rowStyle" data-query-params="queryParams" data-pagination="true">
140
+                <thead>
141
+                    <tr>
142
+						<th data-field="F_WorkOrderId" data-class="W160" data-formatter="View" data-align="center">工单编号</th>
143
+						<th data-field="F_AreaName" data-class="W60" data-align="center">大区</th>
144
+						<th data-field="F_OfficName" data-class="W80" data-align="center">办事处</th>
145
+						<th data-field="F_CreateTime" data-class="W190" data-formatter="formatterAddressResult" data-align="center">投诉时间</th>
146
+						<th data-field="F_SerialNumber" data-class="W60" data-align="center">序号</th>
147
+						<th data-field="F_CusName" data-class="W100" data-align="center">姓名</th>
148
+						<th data-field="F_AddRess" data-class="W380" data-formatter="formatterAddressResult" data-align="center">地址</th>
149
+						<th data-field="F_CusPhone" data-class="W220" data-formatter="formatterAddressResult" data-align="center">联系电话</th>
150
+						<th data-field="F_ProductType" data-class="W80" data-align="center">产品代码</th>
151
+						<th data-field="F_ProductName" data-class="W380" data-formatter="formatterAddressResult" data-align="center">产品名称</th>
152
+						<th data-field="F_Specifications" data-class="W80" data-formatter="formatterCharacterLength" data-align="center">规格</th>
153
+						<th data-field="F_ProductDate" data-class="W100" data-align="center">生产日期</th>
154
+						<th data-field="F_BatchNumber" data-class="W380" data-formatter="formatterAddressResult" data-align="center">产品编码</th>
155
+						<th data-field="F_Manufacturer" data-class="W100" data-formatter="formatterCharacterLength" data-align="center">生产厂家</th>
156
+						<th data-field="F_ProblemCode" data-class="W80" data-align="center">问题代码</th>
157
+						<th data-field="F_QualityProblem" data-class="W380" data-formatter="formatterAddressResult" data-align="center">质量问题</th>
158
+						<th data-field="F_Notifications" data-class="W80" data-align="center">通知人</th>
159
+						<th data-field="F_ReceivingPerson" data-class="W80" data-align="center">接听人</th>
160
+						<th data-field="F_DealResult" data-class="W380" data-formatter="formatterAddressResult" data-align="center">落实情况</th>
161
+						<th data-field="F_State" data-class="W100" data-formatter="workOrderStateJudge" data-align="center">处理进度</th>
162
+						<th data-field="F_Type" data-class="W60margin RemissionType" data-formatter="workOrderTypeJudge">工单类别</th>
163
+						<th data-field="F_WorkOrderId" data-class="workOprate workOprate8 W200" data-formatter="formatterRemission" data-align="center">操作</th>
164
+					</tr>
165
+                </thead>
166
+            </table>
167
+        </div>
168
+        <!--查看详情-->
169
+        <div class="ckxq  Hidens">
170
+			<ul class="clearfix ckxq_ul">
171
+				<li class="Active">工单详情</li>
172
+				<li>工单记录</li>
173
+				<li>附件记录</li>
174
+				<span class="Closed">×</span>
175
+			</ul>
176
+			<div class="gdxq">
177
+				<div class="">
178
+					<table id="gdxq_table" border="0" class="table table-bordered  table-hover " style="width: 100%;">
179
+						<tbody class="tbodys">
180
+							<tr>
181
+								<th>工单编号:</th>
182
+								<td>
183
+									<span id="detailWorkOrderId"></span>
184
+								</td>
185
+								<th>工单来源:</th>
186
+								<td>
187
+									<span id="detailSource"></span>
188
+								</td>
189
+								<th>工单类型:</th>
190
+								<td>
191
+									<span id="detailType"></span>
192
+								</td>
193
+							</tr>
194
+							<tr>
195
+								<th>大区:</th>
196
+								<td>
197
+									<span id="detailAreaName"></span>
198
+								</td>
199
+								<th>办事处:</th>
200
+								<td>
201
+									<span id="detailOfficeName"></span>
202
+								</td>
203
+								<th>投诉时间:</th>
204
+								<td>
205
+									<span id="detailCreateTime"></span>
206
+								</td>
207
+							</tr>
208
+							<tr>
209
+								<th>工单级别:</th>
210
+								<td>
211
+									<span id="detailDealTimely"></span>
212
+								</td>
213
+								<th>原因:</th>
214
+								<td>
215
+									<span id="detailReason"></span>
216
+								</td>
217
+								<th>通知人:</th>
218
+								<td>
219
+									<span id="detailNotifications"></span>
220
+								</td>
221
+							</tr>
222
+							<tr>
223
+								<th>姓名:</th>
224
+								<td>
225
+									<span id="detailCusName"></span>
226
+								</td>
227
+								<th>联系电话:</th>
228
+								<td>
229
+									<span id="detailCusPhone"></span>
230
+								</td>
231
+								<th>接听人:</th>
232
+								<td>
233
+									<span id="detailReceivingPerson"></span>
234
+								</td>
235
+							</tr>
236
+							<tr>
237
+								<th>地址:</th>
238
+								<td>
239
+									<span id="detailAddress"></span>
240
+								</td>
241
+								<th>产品代码:</th>
242
+								<td>
243
+									<span id="detailProductType"></span>
244
+								</td>
245
+								<th>产品名称:</th>
246
+								<td>
247
+									<span id="detailProductName"></span>
248
+								</td>
249
+							</tr>
250
+							<tr>
251
+								<th>规格:</th>
252
+								<td>
253
+									<span id="detailSpecifications"></span>
254
+								</td>
255
+								<th>生产日期:</th>
256
+								<td>
257
+									<span id="detailPRoductDate"></span>
258
+								</td>
259
+								<th>产品编码:</th>
260
+								<td>
261
+									<span id="detailBatchNumber"></span>
262
+								</td>									
263
+							</tr>
264
+							<tr>
265
+								<th>生产厂家:</th>
266
+								<td>
267
+									<span id="detailManufacturer"></span>
268
+								</td>
269
+								<th>问题代码:</th>
270
+								<td>
271
+									<span id="detailProblemCode"></span>
272
+								</td>
273
+								<th>质量问题:</th>
274
+								<td>
275
+									<span id="detailQualityProblem"></span>
276
+								</td>
277
+							</tr>
278
+							<tr>
279
+								<th>序号:</th>
280
+								<td>
281
+									<span id="detailSerialNumber"></span>
282
+								</td>
283
+								<th>工单状态:</th>
284
+								<td>
285
+									<span id="detailState"></span>
286
+								</td>
287
+								<th>处理时间:</th>
288
+								<td>
289
+									<span id="detailDealTime"></span>
290
+								</td>
291
+							</tr>
292
+							<tr>
293
+								<th>落实情况:</th>
294
+								<td>
295
+									<span id="detailDealResult"></span>
296
+								</td>
297
+								<th>处理人:</th>
298
+								<td>
299
+									<span id="detailDealUser"></span>
300
+								</td>
301
+								<th>是否减免:</th>
302
+								<td>
303
+									<span id="detailReduction"></span>
304
+								</td>
305
+							</tr>
306
+							<tr>
307
+								<th>减免备注</th>
308
+								<td>
309
+									<span id="detailReductionRemarks"></span>
310
+								</td>
311
+								<th>备注:</th>
312
+								<td>
313
+									<span id="detailContent"></span>
314
+								</td>
315
+							</tr>
316
+						</tbody>
317
+					</table>
318
+				</div>
319
+			</div>
320
+			<div class="gdxq" style="display:none;">
321
+				<div class="">
322
+					<table id="workOrderRecord" data-row-style="rowStyle" data-query-params="queryParams" data-pagination="true">
323
+						<thead>
324
+							<tr>
325
+								<th data-field="F_WoState" data-width="20%" data-align="left" data-formatter="formatterWorkOrderRecordStatus">工单状态</th>
326
+								<th data-field="F_OptContent" data-align="left">内容</th>
327
+								<th data-field="F_CreateTime" data-width="10%" data-align="center">创建时间</th>
328
+							</tr>
329
+						</thead>
330
+					</table>
331
+				</div>
332
+			</div>
333
+			<div class="gdxq" style="display:none;">
334
+				<table id="itemTableList5" data-row-style="rowStyle" data-query-params="queryParams" data-pagination="true">
335
+					<thead>
336
+						<table id="gdxq_table" border="0" class="table table-bordered  table-hover " style="width: 100%;">
337
+							<tbody class="tbodys">
338
+								<tr>
339
+									<th>附件:</th>
340
+									<td colspan="3">
341
+										<ul id="fileList" class="clearfix">
342
+										</ul>
343
+									</td>
344
+								</tr>
345
+						</table>
346
+					</thead>
347
+				</table>
348
+			</div>
349
+		</div>
350
+		
351
+	<script src="../js/laydate/laydate.js"></script>
352
+	<script src="../js/comboSelect/jquery.combo.select.js"></script>
353
+	<script src="../js/kindeditor/kindeditor.js"></script>
354
+	<script src="../js/kindeditor/lang/zh_CN.js"></script>
355
+	<script src="../js/WorkOrder/WorkOrder.js"></script>
356
+    <script>
357
+        $(document).ready(function () {
358
+        	// 时间组件
359
+        	laydate.render({
360
+				elem: '#greetingTimes',
361
+				range: '~',
362
+				theme: '#1ab394',
363
+				calendar: 'true'
364
+				//type: 'datetime',
365
+				//max : 31,
366
+				//min: 0,
367
+			});
368
+			laydate.render({
369
+				elem: '#duplicateTime',
370
+				range: '~',
371
+				theme: '#1ab394',
372
+			});
373
+			
374
+			// 导出
375
+			$('.export').click(function() {
376
+				var state = 8; //处理进度
377
+				var reduction = $("#searchRemission").val();
378
+				dcexcel(state, "", "", reduction);
379
+			});
380
+        })
381
+        
382
+//      $('#workorderlist').bootstrapTable({
383
+//          dataType: "json",
384
+//          method: 'get',
385
+//          contentType: "application/x-www-form-urlencoded",
386
+//          cache: false,
387
+//          url: '',
388
+//          pagination: true,
389
+//          fixedColumns: true,
390
+//          fixedNumber: 1,
391
+//          columns: []
392
+//      }) 
393
+        function initTable() {
394
+            //先销毁表格
395
+            $('#workorderlist').bootstrapTable('destroy');
396
+            //初始化表格,动态从服务器加载数据
397
+            $("#workorderlist").bootstrapTable({
398
+                method: "get",  //使用get请求到服务器获取数据
399
+                url: huayi.config.callcenter_url + "WorkOrder/GetList", //获取数据的Servlet地址
400
+                contentType: 'application/x-www-form-urlencoded',
401
+                striped: true,  //表格显示条纹
402
+                pagination: true, //启动分页
403
+                pageSize: 10,  //每页显示的记录数
404
+                pageNumber: 1, //当前第几页
405
+                pageList: [10, 20, 50, 100],  //记录数可选列表
406
+                search: false,  //是否启用查询
407
+                showColumns: false,  //显示下拉框勾选要显示的列
408
+                showRefresh: false,  //显示刷新按钮
409
+                sidePagination: "server", //表示服务端请求
410
+				columns:[],
411
+                //设置为undefined可以获取pageNumber,pageSize,searchText,sortName,sortOrder
412
+                //设置为limit可以获取limit, offset, search, sort, order
413
+                queryParamsType: "undefined",
414
+                queryParams: function queryParams(params) { //设置查询参数
415
+						var param = {
416
+							state: 8, //处理进度
417
+							token: $.cookie("token"),
418
+							code: $("#searchCode").val(), //工单编号
419
+							area: $("#searchArea").val(), //大区
420
+							office: $("#searchOffice").val(), //办事处
421
+							starttime: $('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[0], //开始时间
422
+							endtime: $('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[1], //结束时间
423
+							keywords: $("#searchKeywords").val(),//联系电话
424
+							productType: $("#searchProductType").val(), //产品代码
425
+							productDate: $("#searchProductDate").val(), //生产日期
426
+							batchNumber: $("#searchBatchNumber").val(), //产品编码
427
+							manufacturer: $("#searchManufacturer").val(), //生产厂家
428
+							problemCode: $("#searchProblemCode").val(), //问题代码
429
+							notifications: $("#searchNotifications").val(), //通知人
430
+							type: $("#searchOrderType").val(), //工单类别
431
+							dealTimely: $("#searchDealTimely").val(), // 工单级别
432
+							see: $("#searchSee").val(), //处理专员是否只查看负责区域单子
433
+							IsReduction: $("#searchRemission").val(), //是否减免
434
+							duplicatetime: $('#duplicateTime').val() && $('#duplicateTime').val().split(' ~ ')[0], //重复投诉开始时间
435
+							endduplicatetime: $('#duplicateTime').val() && $('#duplicateTime').val().split(' ~ ')[1], //重复投诉结束时间
436
+//							source: $("#searchOrderSource").val(), //工单来源
437
+							pageindex: params.pageNumber, //页码
438
+							pagesize: params.pageSize, //条数
439
+						};
440
+						return param;
441
+					},
442
+                onLoadSuccess: function () {  //加载成功时执行
443
+                    //layer.msg("加载成功");
444
+                    getLoginPersonNow();
445
+                },
446
+                onLoadError: function () {  //加载失败时执行
447
+                    //layer.msg("加载数据失败", { time: 1500, icon: 2 });
448
+                }
449
+            });
450
+        }
451
+    </script>
452
+</body>
453
+</html>

+ 6 - 1
CallCenterWeb.UI/WorkOrder/WorkOrderReturnAssigned.html

@@ -294,8 +294,13 @@
294 294
 									</td>
295 295
 								</tr>
296 296
 								<tr>
297
+									<th>减免备注</th>
298
+									<td>
299
+										<span id="detailReductionRemarks"></span>
300
+									</td>
297 301
 									<th>备注:</th>
298
-									<td colspan="5" id="detailContent">
302
+									<td>
303
+										<span id="detailContent"></span>
299 304
 									</td>
300 305
 								</tr>
301 306
 							</tbody>

+ 6 - 2
CallCenterWeb.UI/WorkOrder/WorkOrderReturnSubmit.html

@@ -293,9 +293,13 @@
293 293
 								</td>
294 294
 							</tr>
295 295
 							<tr>
296
-							<tr>
296
+								<th>减免备注</th>
297
+								<td>
298
+									<span id="detailReductionRemarks"></span>
299
+								</td>
297 300
 								<th>备注:</th>
298
-								<td colspan="5" id="detailContent">
301
+								<td>
302
+									<span id="detailContent"></span>
299 303
 								</td>
300 304
 							</tr>
301 305
 						</tbody>

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

@@ -1,4 +1,4 @@
1
-<!DOCTYPE html>
1
+<!DOCTYPE html>
2 2
 <html>
3 3
 	<head>
4 4
 		<meta charset="UTF-8">
@@ -326,8 +326,13 @@
326 326
 									</td>
327 327
 								<tr>
328 328
 								<tr>
329
+									<th>减免备注</th>
330
+									<td>
331
+										<span id="detailReductionRemarks"></span>
332
+									</td>
329 333
 									<th>备注:</th>
330
-									<td colspan="5" id="detailContent">
334
+									<td>
335
+										<span id="detailContent"></span>
331 336
 									</td>
332 337
 								</tr>
333 338
 							</tbody>

+ 6 - 1
CallCenterWeb.UI/WorkOrder/WorkOrderSpotCheck.html

@@ -317,8 +317,13 @@
317 317
 									</td>
318 318
 								<tr>
319 319
 								<tr>
320
+									<th>减免备注</th>
321
+									<td>
322
+										<span id="detailReductionRemarks"></span>
323
+									</td>
320 324
 									<th>备注:</th>
321
-									<td colspan="5" id="detailContent">
325
+									<td>
326
+										<span id="detailContent"></span>
322 327
 									</td>
323 328
 								</tr>
324 329
 							</tbody>

+ 6 - 2
CallCenterWeb.UI/WorkOrder/WorkOrderSubmit.html

@@ -302,9 +302,13 @@
302 302
 								</td>
303 303
 							</tr>
304 304
 							<tr>
305
-							<tr>
305
+								<th>减免备注</th>
306
+								<td>
307
+									<span id="detailReductionRemarks"></span>
308
+								</td>
306 309
 								<th>备注:</th>
307
-								<td colspan="5" id="detailContent">
310
+								<td>
311
+									<span id="detailContent"></span>
308 312
 								</td>
309 313
 							</tr>
310 314
 						</tbody>

+ 37 - 5
CallCenterWeb.UI/js/WorkOrder/WorkOrder.js

@@ -1,4 +1,4 @@
1
-var selid;//工单ID
1
+var selid;//工单ID
2 2
 $(document).ready(function() {
3 3
 	initTable();
4 4
 	$(".ss").click(function() {
@@ -267,6 +267,7 @@ function getWorkOrderDetails() {
267 267
 				$("#detailDealUser").text(data.F_DealUser);
268 268
 				$("#detailDealTime").text(data.F_DealTime);
269 269
 				$("#detailReduction").text(workOrderDetailsReductionJudge(data)) //是否减免
270
+				$("#detailReductionRemarks").text(data.F_RemissionRemarks) //减免备注
270 271
 			}
271 272
 		}
272 273
 	})
@@ -548,11 +549,13 @@ function authorizeOperateButton(userRoleCode) {
548 549
 				$('.tool_downs').find('[id*="HY_mark"]').show(); // 标记
549 550
 				$('.tool_downs').find('[id*="HY_delete"]').hide(); //删除
550 551
 				$('.tool_downs').find('[id*="HY_edit"]').hide(); //修改
552
+				$('.tool_downs').find('[id*="HY_reductionEdit"]').show(); //减免修改
551 553
 				$('.tool_downs').find('[id*="HY_remark_"]').hide(); //备注
552 554
 				$('.tool_downs').find('[id*="HY_dealWith"]').show(); //处理
553 555
 				$('.tool_downs').find('[id*="HY_return"]').show();//退回
554 556
 				$('.tool_downs').find('[id*="HY_reduction"]').show();//减免
555 557
 				$('#workorderlist').find('.workOprate7').show(); //处理中
558
+				$('#workorderlist').find('.workOprate8').show(); //减免工单
556 559
 				$('#workorderlist').find('.submitType').removeClass('W60margin').addClass('W100').css("text-align", "center");
557 560
 				$('#workorderlist').find('.appointType').removeClass('W60margin').addClass('W100').css("text-align", "center");
558 561
 				$('#workorderlist').find('.returnSubmitType').removeClass('W60margin').addClass('W100').css("text-align", "center");
@@ -561,6 +564,27 @@ function authorizeOperateButton(userRoleCode) {
561 564
 				$('#workorderlist').find('.processingType').removeClass('W60margin').addClass('W100').css("text-align", "center");
562 565
 				$('#workorderlist').find('.partyType').removeClass('W60margin').addClass('W100').css("text-align", "center");
563 566
 			break;
567
+		case "ZR": // ZR - 主任
568
+				$('.tool_downs').find('[id*="HY_transfer"]').hide(); //指派
569
+				$('.tool_downs').find('[id*="HY_mark"]').hide(); // 标记
570
+				$('.tool_downs').find('[id*="HY_delete"]').hide(); //删除
571
+				$('.tool_downs').find('[id*="HY_edit"]').hide(); //修改
572
+				$('.tool_downs').find('[id*="HY_reductionEdit"]').show(); //减免修改
573
+				$('.tool_downs').find('[id*="HY_remark_"]').hide(); //备注
574
+				$('.tool_downs').find('[id*="HY_dealWith"]').hide(); //处理
575
+				$('.tool_downs').find('[id*="HY_return"]').hide();//退回
576
+				$('.tool_downs').find('[id*="HY_reduction"]').show();//减免
577
+				$('#workorderlist').find('.workOprate8').show();//减免工单
578
+				// $('#workorderlist').find('.workOprate7').hide(); //处理中
579
+				$('#workorderlist').find('.submitType').removeClass('W60margin').addClass('W100').css("text-align", "center");
580
+				$('#workorderlist').find('.appointType').removeClass('W60margin').addClass('W100').css("text-align", "center");
581
+				$('#workorderlist').find('.returnSubmitType').removeClass('W60margin').addClass('W100').css("text-align", "center");
582
+				$('#workorderlist').find('.returnAssignedType').removeClass('W60margin').addClass('W100').css("text-align", "center");
583
+				$('#workorderlist').find('.disposeType').removeClass('W60margin').addClass('W100').css("text-align", "center");
584
+				$('#workorderlist').find('.processingType').removeClass('W60margin').addClass('W100').css("text-align", "center");
585
+				$('#workorderlist').find('.partyType').removeClass('W60margin').addClass('W100').css("text-align", "center");
586
+				$('#workorderlist').find('.searchType').removeClass('W60margin').addClass('W100').css("text-align", "center");
587
+			break;
564 588
 		default:
565 589
 				$('#workorderlist').find('.submitType').removeClass('W60margin').addClass('W100').css("text-align", "center");
566 590
 				$('#workorderlist').find('.appointType').removeClass('W60margin').addClass('W100').css("text-align", "center");
@@ -641,6 +665,14 @@ function formatterReceive(val,row) {
641 665
 		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_return_' + row.F_Id + '" onclick="btn_return(\'' + row.F_Id + '\')" title="退回">退回</a></li>' +
642 666
 		'</ul>';
643 667
 	}
668
+//格式化操作(减免工单)
669
+function formatterRemission(val, row) {
670
+	return '<ul class="tool_downs">' +
671
+		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_reductionEdit' + row.F_Id + '" onclick="btn_edit(\'' + row.F_Id + '\')" title="修改">修改</a></li>' +
672
+		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_reduction_' + row.F_Id + '" onclick="btn_reduction(\'' + row.F_Id + '\')" title="减免">减免</a></li>' +
673
+		'</ul>';
674
+}
675
+
644 676
 
645 677
 //指派工单,提交工单
646 678
 function btn_transfer(id, type) {
@@ -744,7 +776,7 @@ function btn_reduction(id){
744 776
 		type: 2,
745 777
 		title: '减免工单',
746 778
 		maxmin: true, //开启最大化最小化按钮
747
-		area: ['40%', '25%'],
779
+		area: ['40%', '50%'],
748 780
 		content: "../WorkOrder/WorkOrderReduction.html?id=" + id
749 781
 	});
750 782
 }
@@ -959,7 +991,8 @@ document.onkeydown = function (e) {
959 991
 }
960 992
 
961 993
 // 导出
962
-function dcexcel(state, isdc, CJ) {
994
+function dcexcel(state, isdc, CJ, reduction) {
995
+	
963 996
 	if (isdc === 3) {
964 997
 		var isdc = 3;
965 998
 	} else {
@@ -970,7 +1003,6 @@ function dcexcel(state, isdc, CJ) {
970 1003
 	} else {
971 1004
 		var CJ = "";
972 1005
 	}
973
-	
974 1006
 	var token = $.cookie("token");
975 1007
 	var code = $("#searchCode").val(); //工单编号
976 1008
 	var area = $("#searchArea").val(); //大区
@@ -991,6 +1023,6 @@ function dcexcel(state, isdc, CJ) {
991 1023
 	url += "&state=" + state + "&code=" + code + "&area=" + area + "&office=" + office + "&starttime=" + starttime
992 1024
 	+ "&endtime=" + endtime + "&productType=" + productType + "&productDate=" + productDate + "&batchNumber=" + batchNumber
993 1025
 	+ "&manufacturer=" + manufacturer + "&problemCode=" + problemCode + "&notifications=" + notifications
994
-	+ "&type=" + type + "&dealTimely=" + dealTimely + "&see=" + see + "&isdc=" + isdc + "&CJ=" + CJ;
1026
+	+ "&type=" + type + "&dealTimely=" + dealTimely + "&see=" + see + "&isdc=" + isdc + "&CJ=" + CJ + "&IsReduction=" + reduction;
995 1027
 	window.location.href = url;
996 1028
 }

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

@@ -20,8 +20,8 @@ function saveCustomer() {
20 20
         data: {
21 21
             token: $.cookie("token"),
22 22
             id: id,
23
-//          cont: $('#cont').val(), //提交内容
24
-            IsReduction: $('#customer_reduction').val(), // 是否完结
23
+			RemissionRemarks: $('#cont').val(), //减免备注
24
+            IsReduction: $('#customer_reduction').val(), // 是否减免
25 25
         },
26 26
         success: function(data) {
27 27
             if (data.state.toLowerCase() == 'success') {