合并

.project

@@ -124,7 +124,11 @@
 			</matcher>
 		</filter>
 		<filter>
+<<<<<<< HEAD
 			<id>1709534682738</id>
+=======
+			<id>1709518648059</id>
+>>>>>>> ee750815a3115b28b68abc6f72f6e1a1c2dd6d20
 			<name></name>
 			<type>26</type>
 			<matcher>

Script/Common/regexs.js

@@ -44,9 +44,9 @@ var regexs = {
 	 * */
 	accountReg: /^[\da-zA-Z_\u4e00-\u9f5a]{4,20}$/,
 	/**
-	 * 登录账号： 4-20个字符只能是字母、下划线、数字
+	 * 登录账号： 只能是字母、下划线、数字
 	 * */
-	userReg: /^[\da-zA-Z_]{4,20}$/,
+	userReg: /^[A-Za-z0-9_]+$/,
 	/**
 	 * 密码： 6-32个字符只能是字母、下划线、数字
 	 * */

SystemManager/js/addOrEditUserManage.js

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

SystemManager/js/addUserManage.js

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

equipmentMaintenance/js/equipmentRepair.js

@@ -663,7 +663,7 @@ function btn_add() {
 	layer.open({
 		type: 2,
 		content: "template/addEquipmentRepair.html",
-		title: '添加设备维修',
+		title: '添加故障维修',
 		area: ['70%', '80%'], //宽高
 	});
 }
@@ -672,7 +672,7 @@ function btn_edit(ids) {
 	layer.open({
 		type: 2,
 		content: "template/addEquipmentRepair.html?ids=" + ids,
-		title: '修改设备维修',
+		title: '修改故障维修',
 		area: ['70%', '80%'], //宽高
 	});
 }
@@ -692,7 +692,7 @@ function btn_details(ids) {
 	layer.open({
 		type: 2,
 		content: "template/seeEquipmentRepair.html?ids=" + ids,
-		title: '设备维修详情',
+		title: '故障维修详情',
 		area: ['70%', '80%'], //宽高
 	});
 }
@@ -702,7 +702,7 @@ function btn_assign(proId, wocode) {
 	layer.open({
 		type: 2,
 		content: "template/assignEquipmentRepair.html?&proId=" + proId + "&code=" + wocode,
-		title: '设备维修派单',
+		title: '故障维修派单',
 		area: ['70%', '80%'], //宽高
 	});
 }

equipmentMaintenance/js/notSingleRepair.js

@@ -453,7 +453,7 @@ function btn_add() {
 	layer.open({
 		type: 2,
 		content: "template/addEquipmentRepair.html",
-		title: '添加设备维修',
+		title: '添加故障维修',
 		area: ['70%', '80%'], //宽高
 	});
 }
@@ -463,7 +463,7 @@ function btn_handle(code, floorId, sysId) {
 	layer.open({
 		type: 2,
 		content: "template/HandleEquipmentRepair.html?code=" + code + "&floorId=" + floorId,
-		title: '设备维修处理',
+		title: '故障维修处理',
 		area: ['70%', '80%'], //宽高
 	});
 }
@@ -483,7 +483,7 @@ function btn_details(ids) {
 	layer.open({
 		type: 2,
 		content: "template/seeEquipmentRepair.html?ids=" + ids,
-		title: '设备维修详情',
+		title: '故障维修详情',
 		area: ['70%', '80%'], //宽高
 	});
 }
@@ -493,7 +493,7 @@ function btn_assign(proId, wocode) {
 	layer.open({
 		type: 2,
 		content: "template/assignEquipmentRepair.html?&proId=" + proId + "&code=" + wocode,
-		title: '设备维修派单',
+		title: '故障维修派单',
 		area: ['70%', '80%'], //宽高
 	});
 }

equipmentOperationManage/equipmentRepair.html

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

equipmentOperationManage/js/addEquipmentRepair.js

@@ -215,6 +215,7 @@ function getMenuLists() {
 					$sTree.treeview('clearSearch');
 					console.log(event, node)
 					$('#menus').val(node.text);
+					$('#menusName').val(node.name);
 					$('#menus').attr('data-id', node.id);
 					$('#menusTreeView').removeClass('show').addClass('hidden');
 				},
@@ -246,8 +247,10 @@ function getTreeData (data) {
 		newData.push({
             id: ele.id,
             parentid: ele.pid,
-            text: ele.wxcenter +'-'+ ele.name,
-            children: (ele.child && ele.child.length > 0) ? getTreeData(ele.child) : []
+//          text: ele.wxcenter +'-'+ ele.name,
+			name: ele.name,
+			text: ele.wxcenter,
+			children: (ele.child && ele.child.length > 0) ? getTreeData(ele.child) : []
        })
 	})
 	return newData

equipmentOperationManage/js/equipmentRepair.js

@@ -848,7 +848,7 @@ function btn_edit(ids) {
 	layer.open({
 		type: 2,
 		content: "template/addEquipmentRepair.html?ids=" + ids,
-		title: '修改设备维修',
+		title: '修改故障维修',
 		area: ['70%', '80%'], //宽高
 	});
 }
@@ -858,7 +858,7 @@ function btn_handle(code, floorId, sysId) {
 	layer.open({
 		type: 2,
 		content: "template/HandleEquipmentRepair.html?code=" + code + "&floorId=" + floorId,
-		title: '设备维修处理',
+		title: '故障维修处理',
 		area: ['70%', '80%'], //宽高
 	});
 }
@@ -867,7 +867,7 @@ function btn_Return(code, floorId, sysId) {
 	layer.open({
 		type: 2,
 		content: "template/HandleReturnRepair.html?code=" + code + "&floorId=" + floorId,
-		title: '设备维修处理',
+		title: '故障维修处理',
 		area: ['70%', '80%'], //宽高
 	});
 }
@@ -876,7 +876,7 @@ function btn_details(ids) {
 	layer.open({
 		type: 2,
 		content: "template/seeEquipmentRepair.html?ids=" + ids,
-		title: '设备维修详情',
+		title: '故障维修详情',
 		area: ['70%', '80%'], //宽高
 	});
 }
@@ -886,7 +886,7 @@ function btn_assign(proId, wocode) {
 	layer.open({
 		type: 2,
 		content: "template/assignEquipmentRepair.html?&proId=" + proId + "&code=" + wocode,
-		title: '设备维修派单',
+		title: '故障维修派单',
 		area: ['70%', '80%'], //宽高
 	});
 }

equipmentOperationManage/js/notSingleRepair.js

@@ -492,7 +492,7 @@ function btn_add() {
 	layer.open({
 		type: 2,
 		content: "template/addEquipmentRepair.html",
-		title: '添加设备维修',
+		title: '添加故障维修',
 		area: ['70%', '80%'], //宽高
 	});
 }
@@ -502,7 +502,7 @@ function btn_handle(code, floorId, sysId) {
 	layer.open({
 		type: 2,
 		content: "template/HandleEquipmentRepair.html?code=" + code + "&floorId=" + floorId,
-		title: '设备维修处理',
+		title: '故障维修处理',
 		area: ['70%', '80%'], //宽高
 	});
 }
@@ -522,7 +522,7 @@ function btn_details(ids) {
 	layer.open({
 		type: 2,
 		content: "template/seeEquipmentRepair.html?ids=" + ids,
-		title: '设备维修详情',
+		title: '故障维修详情',
 		area: ['70%', '80%'], //宽高
 	});
 }
@@ -532,7 +532,7 @@ function btn_assign(proId, wocode) {
 	layer.open({
 		type: 2,
 		content: "template/assignEquipmentRepair.html?&proId=" + proId + "&code=" + wocode,
-		title: '设备维修派单',
+		title: '故障维修派单',
 		area: ['70%', '80%'], //宽高
 	});
 }

equipmentOperationManage/js/warrantyWorkOrder.js

@@ -190,7 +190,7 @@ function btn_add() {
 	layer.open({
 		type: 2,
 		content: "template/addEquipmentRepair.html",
-		title: '添加设备维修',
+		title: '添加故障维修',
 		area: ['70%', '80%'], //宽高
 	});
 }
@@ -200,7 +200,7 @@ function btn_handle(code, floorId, sysId) {
 	layer.open({
 		type: 2,
 		content: "template/HandleEquipmentRepair.html?code=" + code + "&floorId=" + floorId,
-		title: '设备维修处理',
+		title: '故障维修处理',
 		area: ['70%', '80%'], //宽高
 	});
 }
@@ -210,7 +210,7 @@ function btn_details(ids) {
 	layer.open({
 		type: 2,
 		content: "template/seeEquipmentRepair.html?ids=" + ids,
-		title: '设备维修详情',
+		title: '故障维修详情',
 		area: ['70%', '80%'], //宽高
 	});
 }
@@ -220,7 +220,7 @@ function btn_assign(proId, wocode) {
 	layer.open({
 		type: 2,
 		content: "template/assignEquipmentRepair.html?&proId=" + proId + "&code=" + wocode,
-		title: '设备维修派单',
+		title: '故障维修派单',
 		area: ['70%', '80%'], //宽高
 	});
 }

equipmentOperationManage/template/EvaluateEquipmentRepair.html

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

equipmentOperationManage/template/HandleEquipmentRepair.html

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

equipmentOperationManage/template/HandleReturnRepair.html

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

equipmentOperationManage/template/addEquipmentRepair.html

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

equipmentOperationManage/template/assignEquipmentRepair.html

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

equipmentOperationManage/template/seeEquipmentRepair.html

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