miaofuhao 1 rok temu
rodzic
commit
b22c2c6c65

+ 4 - 0
.project

124
 			</matcher>
124
 			</matcher>
125
 		</filter>
125
 		</filter>
126
 		<filter>
126
 		<filter>
127
+<<<<<<< HEAD
127
 			<id>1709534682738</id>
128
 			<id>1709534682738</id>
129
+=======
130
+			<id>1709518648059</id>
131
+>>>>>>> ee750815a3115b28b68abc6f72f6e1a1c2dd6d20
128
 			<name></name>
132
 			<name></name>
129
 			<type>26</type>
133
 			<type>26</type>
130
 			<matcher>
134
 			<matcher>

+ 2 - 2
Script/Common/regexs.js

44
 	 * */
44
 	 * */
45
 	accountReg: /^[\da-zA-Z_\u4e00-\u9f5a]{4,20}$/,
45
 	accountReg: /^[\da-zA-Z_\u4e00-\u9f5a]{4,20}$/,
46
 	/**
46
 	/**
47
-	 * 登录账号: 4-20个字符只能是字母、下划线、数字
47
+	 * 登录账号: 只能是字母、下划线、数字
48
 	 * */
48
 	 * */
49
-	userReg: /^[\da-zA-Z_]{4,20}$/,
49
+	userReg: /^[A-Za-z0-9_]+$/,
50
 	/**
50
 	/**
51
 	 * 密码: 6-32个字符只能是字母、下划线、数字
51
 	 * 密码: 6-32个字符只能是字母、下划线、数字
52
 	 * */
52
 	 * */

+ 1 - 1
SystemManager/js/addOrEditUserManage.js

300
 		}
300
 		}
301
 	}
301
 	}
302
 	if(!regexs.userReg.test($.trim($('#usercode').val()))) {
302
 	if(!regexs.userReg.test($.trim($('#usercode').val()))) {
303
-		layer.confirm('请输入有效的用户工号(4-20个字符只能是字母、下划线、数字)', {
303
+		layer.confirm('请输入有效的用户工号(只能是字母、下划线、数字)', {
304
 			icon: 2,
304
 			icon: 2,
305
 			btn: ['确定']
305
 			btn: ['确定']
306
 		});
306
 		});

+ 1 - 1
SystemManager/js/addUserManage.js

210
 //保存
210
 //保存
211
 function saveUsers() {
211
 function saveUsers() {
212
 	if(!regexs.userReg.test($.trim($('#usercode').val()))) {
212
 	if(!regexs.userReg.test($.trim($('#usercode').val()))) {
213
-		layer.confirm('请输入有效的用户工号(4-20个字符只能是字母、下划线、数字)', {
213
+		layer.confirm('请输入有效的用户工号(只能是字母、下划线、数字)', {
214
 			icon: 2,
214
 			icon: 2,
215
 			btn: ['确定']
215
 			btn: ['确定']
216
 		});
216
 		});

+ 4 - 4
equipmentMaintenance/js/equipmentRepair.js

663
 	layer.open({
663
 	layer.open({
664
 		type: 2,
664
 		type: 2,
665
 		content: "template/addEquipmentRepair.html",
665
 		content: "template/addEquipmentRepair.html",
666
-		title: '添加设备维修',
666
+		title: '添加故障维修',
667
 		area: ['70%', '80%'], //宽高
667
 		area: ['70%', '80%'], //宽高
668
 	});
668
 	});
669
 }
669
 }
672
 	layer.open({
672
 	layer.open({
673
 		type: 2,
673
 		type: 2,
674
 		content: "template/addEquipmentRepair.html?ids=" + ids,
674
 		content: "template/addEquipmentRepair.html?ids=" + ids,
675
-		title: '修改设备维修',
675
+		title: '修改故障维修',
676
 		area: ['70%', '80%'], //宽高
676
 		area: ['70%', '80%'], //宽高
677
 	});
677
 	});
678
 }
678
 }
692
 	layer.open({
692
 	layer.open({
693
 		type: 2,
693
 		type: 2,
694
 		content: "template/seeEquipmentRepair.html?ids=" + ids,
694
 		content: "template/seeEquipmentRepair.html?ids=" + ids,
695
-		title: '设备维修详情',
695
+		title: '故障维修详情',
696
 		area: ['70%', '80%'], //宽高
696
 		area: ['70%', '80%'], //宽高
697
 	});
697
 	});
698
 }
698
 }
702
 	layer.open({
702
 	layer.open({
703
 		type: 2,
703
 		type: 2,
704
 		content: "template/assignEquipmentRepair.html?&proId=" + proId + "&code=" + wocode,
704
 		content: "template/assignEquipmentRepair.html?&proId=" + proId + "&code=" + wocode,
705
-		title: '设备维修派单',
705
+		title: '故障维修派单',
706
 		area: ['70%', '80%'], //宽高
706
 		area: ['70%', '80%'], //宽高
707
 	});
707
 	});
708
 }
708
 }

+ 4 - 4
equipmentMaintenance/js/notSingleRepair.js

453
 	layer.open({
453
 	layer.open({
454
 		type: 2,
454
 		type: 2,
455
 		content: "template/addEquipmentRepair.html",
455
 		content: "template/addEquipmentRepair.html",
456
-		title: '添加设备维修',
456
+		title: '添加故障维修',
457
 		area: ['70%', '80%'], //宽高
457
 		area: ['70%', '80%'], //宽高
458
 	});
458
 	});
459
 }
459
 }
463
 	layer.open({
463
 	layer.open({
464
 		type: 2,
464
 		type: 2,
465
 		content: "template/HandleEquipmentRepair.html?code=" + code + "&floorId=" + floorId,
465
 		content: "template/HandleEquipmentRepair.html?code=" + code + "&floorId=" + floorId,
466
-		title: '设备维修处理',
466
+		title: '故障维修处理',
467
 		area: ['70%', '80%'], //宽高
467
 		area: ['70%', '80%'], //宽高
468
 	});
468
 	});
469
 }
469
 }
483
 	layer.open({
483
 	layer.open({
484
 		type: 2,
484
 		type: 2,
485
 		content: "template/seeEquipmentRepair.html?ids=" + ids,
485
 		content: "template/seeEquipmentRepair.html?ids=" + ids,
486
-		title: '设备维修详情',
486
+		title: '故障维修详情',
487
 		area: ['70%', '80%'], //宽高
487
 		area: ['70%', '80%'], //宽高
488
 	});
488
 	});
489
 }
489
 }
493
 	layer.open({
493
 	layer.open({
494
 		type: 2,
494
 		type: 2,
495
 		content: "template/assignEquipmentRepair.html?&proId=" + proId + "&code=" + wocode,
495
 		content: "template/assignEquipmentRepair.html?&proId=" + proId + "&code=" + wocode,
496
-		title: '设备维修派单',
496
+		title: '故障维修派单',
497
 		area: ['70%', '80%'], //宽高
497
 		area: ['70%', '80%'], //宽高
498
 	});
498
 	});
499
 }
499
 }

+ 1 - 1
equipmentOperationManage/equipmentRepair.html

161
 									<!--<th data-field="sysname" data-align="center">系统名称</th>
161
 									<!--<th data-field="sysname" data-align="center">系统名称</th>
162
 									<th data-field="equipname" data-align="center">设备名称</th>
162
 									<th data-field="equipname" data-align="center">设备名称</th>
163
 									<th data-field="faulttype" data-align="center">故障类型</th>-->
163
 									<th data-field="faulttype" data-align="center">故障类型</th>-->
164
-									<th data-field="faultdescripe" data-align="center" data-formatter="formatterDescripe">设备名称</th>
164
+									<th data-field="faultdescripe" data-align="center" data-formatter="formatterDescripe">报修类型</th>
165
 									<th data-field="Pwcode" data-align="center">原接单班组</th>
165
 									<th data-field="Pwcode" data-align="center">原接单班组</th>
166
 									<!--<th data-field="appointman" data-align="center">指定维修人</th>-->
166
 									<!--<th data-field="appointman" data-align="center">指定维修人</th>-->
167
                                       
167
                                       

+ 5 - 2
equipmentOperationManage/js/addEquipmentRepair.js

215
 					$sTree.treeview('clearSearch');
215
 					$sTree.treeview('clearSearch');
216
 					console.log(event, node)
216
 					console.log(event, node)
217
 					$('#menus').val(node.text);
217
 					$('#menus').val(node.text);
218
+					$('#menusName').val(node.name);
218
 					$('#menus').attr('data-id', node.id);
219
 					$('#menus').attr('data-id', node.id);
219
 					$('#menusTreeView').removeClass('show').addClass('hidden');
220
 					$('#menusTreeView').removeClass('show').addClass('hidden');
220
 				},
221
 				},
246
 		newData.push({
247
 		newData.push({
247
             id: ele.id,
248
             id: ele.id,
248
             parentid: ele.pid,
249
             parentid: ele.pid,
249
-            text: ele.wxcenter +'-'+ ele.name,
250
-            children: (ele.child && ele.child.length > 0) ? getTreeData(ele.child) : []
250
+//          text: ele.wxcenter +'-'+ ele.name,
251
+			name: ele.name,
252
+			text: ele.wxcenter,
253
+			children: (ele.child && ele.child.length > 0) ? getTreeData(ele.child) : []
251
        })
254
        })
252
 	})
255
 	})
253
 	return newData
256
 	return newData

+ 5 - 5
equipmentOperationManage/js/equipmentRepair.js

848
 	layer.open({
848
 	layer.open({
849
 		type: 2,
849
 		type: 2,
850
 		content: "template/addEquipmentRepair.html?ids=" + ids,
850
 		content: "template/addEquipmentRepair.html?ids=" + ids,
851
-		title: '修改设备维修',
851
+		title: '修改故障维修',
852
 		area: ['70%', '80%'], //宽高
852
 		area: ['70%', '80%'], //宽高
853
 	});
853
 	});
854
 }
854
 }
858
 	layer.open({
858
 	layer.open({
859
 		type: 2,
859
 		type: 2,
860
 		content: "template/HandleEquipmentRepair.html?code=" + code + "&floorId=" + floorId,
860
 		content: "template/HandleEquipmentRepair.html?code=" + code + "&floorId=" + floorId,
861
-		title: '设备维修处理',
861
+		title: '故障维修处理',
862
 		area: ['70%', '80%'], //宽高
862
 		area: ['70%', '80%'], //宽高
863
 	});
863
 	});
864
 }
864
 }
867
 	layer.open({
867
 	layer.open({
868
 		type: 2,
868
 		type: 2,
869
 		content: "template/HandleReturnRepair.html?code=" + code + "&floorId=" + floorId,
869
 		content: "template/HandleReturnRepair.html?code=" + code + "&floorId=" + floorId,
870
-		title: '设备维修处理',
870
+		title: '故障维修处理',
871
 		area: ['70%', '80%'], //宽高
871
 		area: ['70%', '80%'], //宽高
872
 	});
872
 	});
873
 }
873
 }
876
 	layer.open({
876
 	layer.open({
877
 		type: 2,
877
 		type: 2,
878
 		content: "template/seeEquipmentRepair.html?ids=" + ids,
878
 		content: "template/seeEquipmentRepair.html?ids=" + ids,
879
-		title: '设备维修详情',
879
+		title: '故障维修详情',
880
 		area: ['70%', '80%'], //宽高
880
 		area: ['70%', '80%'], //宽高
881
 	});
881
 	});
882
 }
882
 }
886
 	layer.open({
886
 	layer.open({
887
 		type: 2,
887
 		type: 2,
888
 		content: "template/assignEquipmentRepair.html?&proId=" + proId + "&code=" + wocode,
888
 		content: "template/assignEquipmentRepair.html?&proId=" + proId + "&code=" + wocode,
889
-		title: '设备维修派单',
889
+		title: '故障维修派单',
890
 		area: ['70%', '80%'], //宽高
890
 		area: ['70%', '80%'], //宽高
891
 	});
891
 	});
892
 }
892
 }

+ 4 - 4
equipmentOperationManage/js/notSingleRepair.js

492
 	layer.open({
492
 	layer.open({
493
 		type: 2,
493
 		type: 2,
494
 		content: "template/addEquipmentRepair.html",
494
 		content: "template/addEquipmentRepair.html",
495
-		title: '添加设备维修',
495
+		title: '添加故障维修',
496
 		area: ['70%', '80%'], //宽高
496
 		area: ['70%', '80%'], //宽高
497
 	});
497
 	});
498
 }
498
 }
502
 	layer.open({
502
 	layer.open({
503
 		type: 2,
503
 		type: 2,
504
 		content: "template/HandleEquipmentRepair.html?code=" + code + "&floorId=" + floorId,
504
 		content: "template/HandleEquipmentRepair.html?code=" + code + "&floorId=" + floorId,
505
-		title: '设备维修处理',
505
+		title: '故障维修处理',
506
 		area: ['70%', '80%'], //宽高
506
 		area: ['70%', '80%'], //宽高
507
 	});
507
 	});
508
 }
508
 }
522
 	layer.open({
522
 	layer.open({
523
 		type: 2,
523
 		type: 2,
524
 		content: "template/seeEquipmentRepair.html?ids=" + ids,
524
 		content: "template/seeEquipmentRepair.html?ids=" + ids,
525
-		title: '设备维修详情',
525
+		title: '故障维修详情',
526
 		area: ['70%', '80%'], //宽高
526
 		area: ['70%', '80%'], //宽高
527
 	});
527
 	});
528
 }
528
 }
532
 	layer.open({
532
 	layer.open({
533
 		type: 2,
533
 		type: 2,
534
 		content: "template/assignEquipmentRepair.html?&proId=" + proId + "&code=" + wocode,
534
 		content: "template/assignEquipmentRepair.html?&proId=" + proId + "&code=" + wocode,
535
-		title: '设备维修派单',
535
+		title: '故障维修派单',
536
 		area: ['70%', '80%'], //宽高
536
 		area: ['70%', '80%'], //宽高
537
 	});
537
 	});
538
 }
538
 }

+ 4 - 4
equipmentOperationManage/js/warrantyWorkOrder.js

190
 	layer.open({
190
 	layer.open({
191
 		type: 2,
191
 		type: 2,
192
 		content: "template/addEquipmentRepair.html",
192
 		content: "template/addEquipmentRepair.html",
193
-		title: '添加设备维修',
193
+		title: '添加故障维修',
194
 		area: ['70%', '80%'], //宽高
194
 		area: ['70%', '80%'], //宽高
195
 	});
195
 	});
196
 }
196
 }
200
 	layer.open({
200
 	layer.open({
201
 		type: 2,
201
 		type: 2,
202
 		content: "template/HandleEquipmentRepair.html?code=" + code + "&floorId=" + floorId,
202
 		content: "template/HandleEquipmentRepair.html?code=" + code + "&floorId=" + floorId,
203
-		title: '设备维修处理',
203
+		title: '故障维修处理',
204
 		area: ['70%', '80%'], //宽高
204
 		area: ['70%', '80%'], //宽高
205
 	});
205
 	});
206
 }
206
 }
210
 	layer.open({
210
 	layer.open({
211
 		type: 2,
211
 		type: 2,
212
 		content: "template/seeEquipmentRepair.html?ids=" + ids,
212
 		content: "template/seeEquipmentRepair.html?ids=" + ids,
213
-		title: '设备维修详情',
213
+		title: '故障维修详情',
214
 		area: ['70%', '80%'], //宽高
214
 		area: ['70%', '80%'], //宽高
215
 	});
215
 	});
216
 }
216
 }
220
 	layer.open({
220
 	layer.open({
221
 		type: 2,
221
 		type: 2,
222
 		content: "template/assignEquipmentRepair.html?&proId=" + proId + "&code=" + wocode,
222
 		content: "template/assignEquipmentRepair.html?&proId=" + proId + "&code=" + wocode,
223
-		title: '设备维修派单',
223
+		title: '故障维修派单',
224
 		area: ['70%', '80%'], //宽高
224
 		area: ['70%', '80%'], //宽高
225
 	});
225
 	});
226
 }
226
 }

+ 1 - 1
equipmentOperationManage/template/EvaluateEquipmentRepair.html

11
 		<link href="../../css/init.css" rel="stylesheet" />
11
 		<link href="../../css/init.css" rel="stylesheet" />
12
 		<link rel="stylesheet" type="text/css" href="../../css/Table/table1.css" />
12
 		<link rel="stylesheet" type="text/css" href="../../css/Table/table1.css" />
13
 		<link rel="stylesheet" href="../../css/webuploader.css" />
13
 		<link rel="stylesheet" href="../../css/webuploader.css" />
14
-		<title>设备维修评价</title>
14
+		<title>故障维修评价</title>
15
 		<style>
15
 		<style>
16
 			.btnn {
16
 			.btnn {
17
 				background: #2f4050;
17
 				background: #2f4050;

+ 1 - 1
equipmentOperationManage/template/HandleEquipmentRepair.html

14
     <link rel="stylesheet" type="text/css" href="../../css/Table/table1.css" />
14
     <link rel="stylesheet" type="text/css" href="../../css/Table/table1.css" />
15
     <link href="../../js/bootstrap-select/css/bootstrap-select.css" rel="stylesheet" />
15
     <link href="../../js/bootstrap-select/css/bootstrap-select.css" rel="stylesheet" />
16
     <link rel="stylesheet" href="../../css/webuploader.css" />
16
     <link rel="stylesheet" href="../../css/webuploader.css" />
17
-    <title>设备维修处理</title>
17
+    <title>故障维修处理</title>
18
     <style>
18
     <style>
19
         .btnn {
19
         .btnn {
20
             background: #2f4050;
20
             background: #2f4050;

+ 1 - 1
equipmentOperationManage/template/HandleReturnRepair.html

14
     <link rel="stylesheet" type="text/css" href="../../css/Table/table1.css" />
14
     <link rel="stylesheet" type="text/css" href="../../css/Table/table1.css" />
15
     <link href="../../js/bootstrap-select/css/bootstrap-select.css" rel="stylesheet" />
15
     <link href="../../js/bootstrap-select/css/bootstrap-select.css" rel="stylesheet" />
16
     <link rel="stylesheet" href="../../css/webuploader.css" />
16
     <link rel="stylesheet" href="../../css/webuploader.css" />
17
-    <title>设备维修处理</title>
17
+    <title>故障维修处理</title>
18
     <style>
18
     <style>
19
         .btnn {
19
         .btnn {
20
             background: #2f4050;
20
             background: #2f4050;

+ 3 - 3
equipmentOperationManage/template/addEquipmentRepair.html

19
 		<link rel="stylesheet" href="../../css/webuploader.css" />
19
 		<link rel="stylesheet" href="../../css/webuploader.css" />
20
 		<link rel="stylesheet" type="text/css" href="../../js/bootstrap-treeview/bootstrap-treeview.min.css" />
20
 		<link rel="stylesheet" type="text/css" href="../../js/bootstrap-treeview/bootstrap-treeview.min.css" />
21
 		<!-- <link rel="stylesheet" type="text/css" href="../css/call.css"/> -->
21
 		<!-- <link rel="stylesheet" type="text/css" href="../css/call.css"/> -->
22
-		<title>新增设备维修</title>
22
+		<title>新增故障维修</title>
23
 		<style>
23
 		<style>
24
 			.btnn {
24
 			.btnn {
25
             background: #2f4050;
25
             background: #2f4050;
241
 						<input type="text" autocomplete="off" class="form-control" id="menus" data-id="0" placeholder="请选择报修类型默认是顶级分类" />
241
 						<input type="text" autocomplete="off" class="form-control" id="menus" data-id="0" placeholder="请选择报修类型默认是顶级分类" />
242
 						<span class="caret" style="position: absolute; right: 27px; top:15px;"></span>
242
 						<span class="caret" style="position: absolute; right: 27px; top:15px;"></span>
243
 						<div id="menusTreeView" class="hidden"></div>
243
 						<div id="menusTreeView" class="hidden"></div>
244
-
244
+						<input type="text" id="menusName" hidden="hidden"/>
245
 					</div>
245
 					</div>
246
 				</div>
246
 				</div>
247
 				<div class="form-group">
247
 				<div class="form-group">
744
 						repairman: $("#formComplainedUnit").val(), // 是	string	报修人
744
 						repairman: $("#formComplainedUnit").val(), // 是	string	报修人
745
 						contactway: $('#contactway').val(), //		是	string	联系方式
745
 						contactway: $('#contactway').val(), //		是	string	联系方式
746
 						faultdescripe:  $("#menus").val() && $("#menus").val().split('-')[0], // $('#faultdescripe').val(), //	否	string	故障说明
746
 						faultdescripe:  $("#menus").val() && $("#menus").val().split('-')[0], // $('#faultdescripe').val(), //	否	string	故障说明
747
-						assignman:  $("#menus").val() && $("#menus").val().split('-')[1], // $('#faultdescripe').val(), //	否	string	故障说明
747
+						assignman:  $("#menusName").val(), // $('#faultdescripe').val(), //	否	string	故障说明
748
 						ispd: $('#ispd').find('input[type="radio"]:checked').val(), //  $(".ispd").val()
748
 						ispd: $('#ispd').find('input[type="radio"]:checked').val(), //  $(".ispd").val()
749
 //						assignman: $(".assignman").val(),
749
 //						assignman: $(".assignman").val(),
750
 						faultpic: imageArr0 //		故障图片,上传的json
750
 						faultpic: imageArr0 //		故障图片,上传的json

+ 1 - 1
equipmentOperationManage/template/assignEquipmentRepair.html

14
 		<link rel="stylesheet" type="text/css" href="../../css/Table/table1.css" />
14
 		<link rel="stylesheet" type="text/css" href="../../css/Table/table1.css" />
15
 		<link href="../../js/bootstrap-select/css/bootstrap-select.css" rel="stylesheet" />
15
 		<link href="../../js/bootstrap-select/css/bootstrap-select.css" rel="stylesheet" />
16
 		<link rel="stylesheet" href="../../css/webuploader.css" />
16
 		<link rel="stylesheet" href="../../css/webuploader.css" />
17
-		<title>设备维修派单</title>
17
+		<title>故障维修派单</title>
18
 		<style>
18
 		<style>
19
 			.btnn {
19
 			.btnn {
20
 				background: #2f4050;
20
 				background: #2f4050;

+ 1 - 1
equipmentOperationManage/template/seeEquipmentRepair.html

3
 
3
 
4
 	<head>
4
 	<head>
5
 		<meta charset="UTF-8">
5
 		<meta charset="UTF-8">
6
-		<title>设备维修详情</title>
6
+		<title>故障维修详情</title>
7
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
7
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
8
 		<script src="../../Script/Common/huayi.load.js"></script>
8
 		<script src="../../Script/Common/huayi.load.js"></script>
9
 		<script src="../../Script/Common/huayi.config.js"></script>
9
 		<script src="../../Script/Common/huayi.config.js"></script>