miaofuhao 10 kuukautta sitten
vanhempi
commit
86670788d6

+ 2 - 114
.project

@@ -1,6 +1,6 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <projectDescription>
3
-	<name>CallCenterWeb.UI</name>
3
+	<name>yiheRepair</name>
4 4
 	<comment></comment>
5 5
 	<projects>
6 6
 	</projects>
@@ -16,119 +16,7 @@
16 16
 	</natures>
17 17
 	<filteredResources>
18 18
 		<filter>
19
-			<id>1499962560129</id>
20
-			<name></name>
21
-			<type>26</type>
22
-			<matcher>
23
-				<id>org.eclipse.ui.ide.multiFilter</id>
24
-				<arguments>1.0-name-matches-false-false-node_modules</arguments>
25
-			</matcher>
26
-		</filter>
27
-		<filter>
28
-			<id>1499962627366</id>
29
-			<name></name>
30
-			<type>26</type>
31
-			<matcher>
32
-				<id>org.eclipse.ui.ide.multiFilter</id>
33
-				<arguments>1.0-name-matches-false-false-node_modules</arguments>
34
-			</matcher>
35
-		</filter>
36
-		<filter>
37
-			<id>1500016710765</id>
38
-			<name></name>
39
-			<type>26</type>
40
-			<matcher>
41
-				<id>org.eclipse.ui.ide.multiFilter</id>
42
-				<arguments>1.0-name-matches-false-false-node_modules</arguments>
43
-			</matcher>
44
-		</filter>
45
-		<filter>
46
-			<id>1517817891898</id>
47
-			<name></name>
48
-			<type>26</type>
49
-			<matcher>
50
-				<id>org.eclipse.ui.ide.multiFilter</id>
51
-				<arguments>1.0-name-matches-false-false-node_modules</arguments>
52
-			</matcher>
53
-		</filter>
54
-		<filter>
55
-			<id>1521507130765</id>
56
-			<name></name>
57
-			<type>26</type>
58
-			<matcher>
59
-				<id>org.eclipse.ui.ide.multiFilter</id>
60
-				<arguments>1.0-name-matches-false-false-node_modules</arguments>
61
-			</matcher>
62
-		</filter>
63
-		<filter>
64
-			<id>1600676513311</id>
65
-			<name></name>
66
-			<type>26</type>
67
-			<matcher>
68
-				<id>org.eclipse.ui.ide.multiFilter</id>
69
-				<arguments>1.0-name-matches-false-false-node_modules</arguments>
70
-			</matcher>
71
-		</filter>
72
-		<filter>
73
-			<id>1602818813800</id>
74
-			<name></name>
75
-			<type>26</type>
76
-			<matcher>
77
-				<id>org.eclipse.ui.ide.multiFilter</id>
78
-				<arguments>1.0-name-matches-false-false-node_modules</arguments>
79
-			</matcher>
80
-		</filter>
81
-		<filter>
82
-			<id>1611045506191</id>
83
-			<name></name>
84
-			<type>26</type>
85
-			<matcher>
86
-				<id>org.eclipse.ui.ide.multiFilter</id>
87
-				<arguments>1.0-name-matches-false-false-node_modules</arguments>
88
-			</matcher>
89
-		</filter>
90
-		<filter>
91
-			<id>1622001222994</id>
92
-			<name></name>
93
-			<type>26</type>
94
-			<matcher>
95
-				<id>org.eclipse.ui.ide.multiFilter</id>
96
-				<arguments>1.0-name-matches-false-false-node_modules</arguments>
97
-			</matcher>
98
-		</filter>
99
-		<filter>
100
-			<id>1622085864161</id>
101
-			<name></name>
102
-			<type>26</type>
103
-			<matcher>
104
-				<id>org.eclipse.ui.ide.multiFilter</id>
105
-				<arguments>1.0-name-matches-false-false-node_modules</arguments>
106
-			</matcher>
107
-		</filter>
108
-		<filter>
109
-			<id>1651029210861</id>
110
-			<name></name>
111
-			<type>26</type>
112
-			<matcher>
113
-				<id>org.eclipse.ui.ide.multiFilter</id>
114
-				<arguments>1.0-name-matches-false-false-node_modules</arguments>
115
-			</matcher>
116
-		</filter>
117
-		<filter>
118
-			<id>1694749865378</id>
119
-			<name></name>
120
-			<type>26</type>
121
-			<matcher>
122
-				<id>org.eclipse.ui.ide.multiFilter</id>
123
-				<arguments>1.0-name-matches-false-false-node_modules</arguments>
124
-			</matcher>
125
-		</filter>
126
-		<filter>
127
-<<<<<<< HEAD
128
-			<id>1709534682738</id>
129
-=======
130
-			<id>1709518648059</id>
131
->>>>>>> ee750815a3115b28b68abc6f72f6e1a1c2dd6d20
19
+			<id>1741051063323</id>
132 20
 			<name></name>
133 21
 			<type>26</type>
134 22
 			<matcher>

+ 2 - 2
equipmentOperationManage/equipmentRepair.html

@@ -114,10 +114,10 @@
114 114
 						已接单
115 115
 						<span class="audit_order">0</span>
116 116
 					</li>
117
-					<li data-index="2">
117
+					<!--<li data-index="2">
118 118
 						待评价
119 119
 						<span class="audit_waitEvaluate">0</span>
120
-					</li>
120
+					</li>-->
121 121
 					<li data-index="3">
122 122
 						已完结
123 123
 						<span class="audit_complete">0</span>

+ 37 - 6
equipmentOperationManage/js/equipmentRepair.js

@@ -3,7 +3,7 @@
3 3
  * */
4 4
 var $storages = window.localStorage;
5 5
 var $tableLeft;
6
-var state = ''; // state tab页的 data-index(工单状态参数);
6
+var state = ''; 	// state tab页的 data-index(工单状态参数);
7 7
 var f_State = ''
8 8
 $(document).ready(function() { 
9 9
 	$('.tool_bars').authorizeButton();
@@ -379,6 +379,8 @@ function formatterOperate(val, row) {
379 379
 				'\')"><i class="fa icon-qiangdan tub"></i>接收</a><li>' +
380 380
 				'<li><a class="aBtn" authorize="yes" id="HY_details_' + row.id + '" onclick="btn_details(\'' + row.id +
381 381
 				'\')"><i class="fa icon-detail tub"></i>详情</a><li>' +
382
+				'<li><a class="aBtn" authorize="yes" id="HY_cancel_' + row.id + '" onclick="btn_cancel(\'' + row.wocode +  
383
+				'\')"><i class="fa icon-edit tub"></i>取消</a><li>' +
382 384
 				'<li><a class="aBtn" authorize="yes" id="HY_edit_' + row.id + '" onclick="btn_edit(\'' + row.id +
383 385
 				'\')"><i class="fa icon-edit tub"></i>编辑</a><li>' +
384 386
 				'<li><a class="aBtn" authorize="yes" id="HY_delete_' + row.id + '" onclick="btn_delete(\'' + row.id +
@@ -391,7 +393,8 @@ function formatterOperate(val, row) {
391 393
 				row.floorid + '\')"><i class="fa icon-msnui-audit tub"></i>处理</a><li>' +
392 394
 				'<li><a class="aBtn" authorize="yes" id="HY_details_' + row.id + '" onclick="btn_details(\'' + row.id +
393 395
 				'\')"><i class="fa icon-detail tub"></i>详情</a><li>' +
394
-
396
+				'<li><a class="aBtn" authorize="yes" id="HY_cancel_' + row.id + '" onclick="btn_cancel(\'' + row.wocode +  
397
+				'\')"><i class="fa icon-edit tub"></i>取消</a><li>' +
395 398
 				'<li><a class="aBtn" authorize="yes" id="HY_delete_' + row.id + '" onclick="btn_delete(\'' + row.id +
396 399
 				'\')"><i class="fa icon-delete tub"></i>删除</a><li>'
397 400
 			break;
@@ -402,14 +405,16 @@ function formatterOperate(val, row) {
402 405
 				row.floorid + '\')"><i class="fa icon-msnui-audit tub"></i>返修</a><li>' +
403 406
 				'<li><a class="aBtn" authorize="yes" id="HY_details_' + row.id + '" onclick="btn_details(\'' + row.id +
404 407
 				'\')"><i class="fa icon-detail tub"></i>详情</a><li>' +
405
-
408
+				'<li><a class="aBtn" authorize="yes" id="HY_cancel_' + row.id + '" onclick="btn_cancel(\'' + row.wocode +  
409
+				'\')"><i class="fa icon-edit tub"></i>取消</a><li>' +
406 410
 				'<li><a class="aBtn" authorize="yes" id="HY_delete_' + row.id + '" onclick="btn_delete(\'' + row.id +
407 411
 				'\')"><i class="fa icon-delete tub"></i>删除</a><li>'
408 412
 			break;
409 413
 		case '3':
410 414
 			str += '<li><a class="aBtn" authorize="yes" id="HY_details_' + row.id + '" onclick="btn_details(\'' + row.id +
411 415
 				'\')"><i class="fa icon-detail tub"></i>详情</a><li>' +
412
-
416
+				'<li><a class="aBtn" authorize="yes" id="HY_cancel_' + row.id + '" onclick="btn_cancel(\'' + row.wocode +  
417
+				'\')"><i class="fa icon-edit tub"></i>取消</a><li>' +
413 418
 				'<li><a class="aBtn" authorize="yes" id="HY_delete_' + row.id + '" onclick="btn_delete(\'' + row.id +
414 419
 				'\')"><i class="fa icon-delete tub"></i>删除</a><li>'
415 420
 			break;
@@ -418,14 +423,16 @@ function formatterOperate(val, row) {
418 423
 				'\',\'' + row.wocode + '\')"><i class="fa icon-paidan tub"></i>派单</a><li>' +
419 424
 				'<li><a class="aBtn" authorize="yes" id="HY_details_' + row.id + '" onclick="btn_details(\'' + row.id +
420 425
 				'\')"><i class="fa icon-detail tub"></i>详情</a><li>' +
421
-
426
+				'<li><a class="aBtn" authorize="yes" id="HY_cancel_' + row.id + '" onclick="btn_cancel(\'' + row.wocode +  
427
+				'\')"><i class="fa icon-edit tub"></i>取消</a><li>' +
422 428
 				'<li><a class="aBtn" authorize="yes" id="HY_delete_' + row.id + '" onclick="btn_delete(\'' + row.id +
423 429
 				'\')"><i class="fa icon-delete tub"></i>删除</a><li>'
424 430
 			break;
425 431
 		case '8':
426 432
 			str += '<li><a class="aBtn" authorize="yes" id="HY_details_' + row.id + '" onclick="btn_details(\'' + row.id +
427 433
 				'\')"><i class="fa icon-detail tub"></i>详情</a><li>' +
428
-
434
+				'<li><a class="aBtn" authorize="yes" id="HY_cancel_' + row.id + '" onclick="btn_cancel(\'' + row.wocode +  
435
+				'\')"><i class="fa icon-edit tub"></i>取消</a><li>' +
429 436
 				'<li><a class="aBtn" authorize="yes" id="HY_delete_' + row.id + '" onclick="btn_delete(\'' + row.id +
430 437
 				'\')"><i class="fa icon-delete tub"></i>删除</a><li>'
431 438
 			break;
@@ -916,6 +923,30 @@ function btn_robbing(wocode) {
916 923
 		});
917 924
 	});
918 925
 }
926
+//接收
927
+function btn_cancel(wocode) {
928
+	layer.confirm('您确定取消吗?', {
929
+		icon: 7,
930
+		btn: ['是', '否'] //按钮
931
+	}, function() {
932
+		/*发送请求*/
933
+		$.ajax({
934
+			type: "post",
935
+			url: huayi.config.callcenter_url + "/equipmentapi/api/worepairbase/cancle",
936
+			async: true,
937
+			dataType: 'json',
938
+			data: {
939
+				wocode: wocode,
940
+			},
941
+			success: function(data) {
942
+				if(data.state.toLowerCase() == 'success') {
943
+					layer.msg("取消成功!");
944
+					$('#table1').bootstrapTable('refresh');
945
+				}
946
+			}
947
+		});
948
+	});
949
+}
919 950
 
920 951
 //评价
921 952
 function btn_evaluate(wocode, ids) {

+ 0 - 1
equipmentOperationManage/js/notSingleRepair.js

@@ -5,7 +5,6 @@ var $storages = window.localStorage;
5 5
 var state = ''; // state tab页的 data-index(工单状态参数);
6 6
 $(document).ready(function() {
7 7
 
8
-
9 8
 	$('.tool_bars').authorizeButton();
10 9
 	//搜索
11 10
 	$('#sc_btns').click(function() {

+ 2 - 2
equipmentOperationManage/notSingleRepair.html

@@ -96,10 +96,10 @@
96 96
 						已接单
97 97
 						<span class="audit_order">0</span>
98 98
 					</li>
99
-					<li data-index="2">
99
+					<!--<li data-index="2">
100 100
 						待评价
101 101
 						<span class="audit_waitEvaluate">0</span>
102
-					</li>
102
+					</li>-->
103 103
 					<li data-index="3">
104 104
 						已完结
105 105
 						<span class="audit_complete">0</span>