Inicio Explorar Ayuda
Registro Iniciar sesión
duhongyu
/
ShuangHui_UI
Seguir 1
Destacar 0
Fork 0
Código Incidencias 0 Pull Requests 0 Commits 237 Releases 0 Wiki
Explorar el Código

通讯录

liuyifan %!s(int64=6) %!d(string=hace) años
padre
23eb79198b
commit
d5f77ca35c
Se han modificado 14 ficheros con 461 adiciones y 42 borrados
Dividir vista Mostrar estadísticas de diff
  1. 5 5
      CallCenterWeb.UI/OnDuty/SeatsMessage.html
  2. 4 1
      CallCenterWeb.UI/SystemManager/dengLuRiZhi.html
  3. 3 3
      CallCenterWeb.UI/SystemManager/jueSeQuanXian.html
  4. 25 6
      CallCenterWeb.UI/TelCall/contacts_add.html
  5. 64 12
      CallCenterWeb.UI/TelCall/contacts_modify.html
  6. 2 2
      CallCenterWeb.UI/TelCall/js/contacts.js
  7. 90 1
      CallCenterWeb.UI/TelCall/js/contacts_add.js
  8. 242 0
      CallCenterWeb.UI/TelCall/js/contacts_modify.js
  9. 1 1
      CallCenterWeb.UI/WorkOrder/WorkOrderDealWith.html
  10. 2 2
      CallCenterWeb.UI/WorkOrder/WorkOrderTransfer.html
  11. 0 1
      CallCenterWeb.UI/equipment_management/equipment_management.html
  12. 13 8
      CallCenterWeb.UI/js/WorkOrder/WorkOrder.js
  13. 7 0
      CallCenterWeb.UI/js/WorkOrder/WorkOrderTransfer.js
  14. 3 0
      CallCenterWeb.UI/js/WorkOrder/xgWork.js

+ 5 - 5
CallCenterWeb.UI/OnDuty/SeatsMessage.html
Ver fichero 

@@ -3,7 +3,7 @@
3 3
4 4 
 	<head>
5 5 
 		<meta charset="UTF-8">
6 
-		<title>座席组管理</title>
6 
+		<title>坐席组管理</title>
7 7 
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
8 8 
 		<script src="../Script/Common/huayi.load.js"></script>
9 9 
 		<script src="../Script/Common/huayi.config.js"></script>
 
@@ -43,7 +43,7 @@
43 43 
 					<sapn><i class="syIcon"></i>位置：
44 44 
 						<a href="javaScript:;" id="ReIndex">首页</a>&gt;
45 45 
 						<a href="javaScript:;">话务管理</a>&gt;
46 
-						<a href="" style="color: #000;">座席组管理</a>
46 
+						<a href="" style="color: #000;">坐席组管理</a>
47 47 
 					</sapn>
48 48 
 				</div>
49 49 
 				<div class="dhRight">
 
@@ -72,11 +72,11 @@
72 72 
 						<tr>
73 73 
 							<th data-field="state" data-checkbox="true"></th>
74 74 
 							<th data-field="F_ZXZCode" data-align="center">坐席组编号</th>
75 
-							<th data-field="F_ZXZName" data-align="center">座席组名称</th>
75 
+							<th data-field="F_ZXZName" data-align="center">坐席组名称</th>
76 76 
 							<!--<th data-field="F_IVRKey" data-align="center">IVR按键</th>-->
77 77 
 							<th data-field="F_WHBDKey" data-align="center">外呼本地前缀</th>
78 78 
 							<th data-field="F_WHWDKey" data-align="center">外呼外地前缀</th>
79 
-							<th data-field="F_ZXAtt" data-align="center">座席归属地</th>
79 
+							<th data-field="F_ZXAtt" data-align="center">坐席归属地</th>
80 80 
 							<th data-field="F_Des" data-align="center">描述说明</th>
81 81 
 						</tr>
82 82 
 					</thead>
 
@@ -218,7 +218,7 @@
218 218 
 					tc = layer.open({
219 219 
 						type: 1,
220 220 
 						content: html, //iframe的url，no代表不显示滚动条
221 
-						title: '添加座席组',
221 
+						title: '添加坐席组',
222 222 
 						area: ['45%', '60%'], //宽高
223 223 
 					});
224 224 
 				});

+ 4 - 1
CallCenterWeb.UI/SystemManager/dengLuRiZhi.html
Ver fichero 

@@ -9,6 +9,9 @@
9 9 
 		<link rel="stylesheet" href="../js/zTree/zTreeStyle.css" />
10 10 
 		<link rel="stylesheet" href="../css/init.css" />
11 11 
 		<title>系统管理-->登录日志</title>
12 
+		<style type="text/css">
13 
+
14 
+		</style>
12 15 
 	</head>
13 16
14 17 
 	<body>
 
@@ -20,7 +23,7 @@
20 23 
 			</div>
21 24 
 			<div class="toolBar clearfix">
22 25 
 				<!--<button class="btns del">批量删除</button>-->
23 
-				<div class="toolRight" style="float: right;">
26 
+				<div class="toolRight" style="float: right; margin-right: 50px">
24 27 
 					<span>操作人名称：<input type="text" class="czName" /></span>
25 28 
 					<span>登录时间：<input type="text" class="laydate-icon loginTime" id="startTime"/></span>
26 29 
 					<button class="btns search">搜索</button>

+ 3 - 3
CallCenterWeb.UI/SystemManager/jueSeQuanXian.html
Ver fichero 

@@ -96,7 +96,7 @@
96 96 
 						<thead>
97 97 
 							<tr>
98 98 
 								<th data-align="center" data-field="id" data-formatter="setCode">编号</th>
99 
-								<th data-field="F_RoleName" data-align="center">角色值</th>
99 
+								<th data-field="F_RoleName" data-align="center">角色名称</th>
100 100
101 101 
 							</tr>
102 102 
 						</thead>
 
@@ -124,7 +124,7 @@
124 124 
 					<table>
125 125 
 						<tbody>
126 126 
 							<tr>
127 
-								<th style="color: red;">角色值：</th>
127 
+								<th style="color: red;">角色名称：</th>
128 128 
 								<td colspan="3"><input type="text" class="add_jsz" /><span class="kong addJsz_kong" style="color: red;">*角色值不允许为空</span></td>
129 129 
 							</tr>
130 130 
 							<tr>
 
@@ -149,7 +149,7 @@
149 149 
 					<table>
150 150 
 						<tbody>
151 151 
 							<tr>
152 
-								<th style="color: red;">角色值：</th>
152 
+								<th style="color: red;">角色名称：</th>
153 153 
 								<td colspan="3"><input type="text" class="change_jsz" /><span class="kong change_kong" style="color: red;">*角色值不允许为空</span></td>
154 154 
 							</tr>
155 155 
 							<tr>

+ 25 - 6
CallCenterWeb.UI/TelCall/contacts_add.html
Ver fichero 

@@ -32,20 +32,39 @@
32 32 
                         </td>
33 33 
 					</tr>
34 34 
 					<tr>
35 
-						<th>地址:</th>
36 
-                        <td>
35 
+						<th>省:</th>
36 
+                    	<td style="position: relative;">
37 
+                    		<div class="form-group">
38 
+								<select class="form-control" id="source">
39 
+	       							<option value ="">请选择</option>
40 
+								</select>
41 
+							</div>
42 
+                        </td>
43 
+                        <th>市:</th>
44 
+                        <td style="position: relative;">
45 
+                        	<div class="form-group">
46 
+								<select class="form-control" id="type">
47 
+	       							<option value ="">请选择</option>
48 
+								</select>
49 
+							</div>
50 
+                        </td>
51 
+                        <th>区/县:</th>
52 
+                        <td style="position: relative;">
37 53 
                         	<div class="form-group">
38 
-                                <input type="text" class="form-control" id="addAddress" />
54 
+								<select class="form-control" id="keyid">
55 
+	       							<option value ="">请选择</option>
56 
+								</select>
39 57 
 							</div>
40 58 
                         </td>
59 
+					</tr>
60 
+					<tr>
41 61 
                         <th>内线电话:</th>
42 62 
                         <td>
43 63 
                         	<div class="form-group">
44 64 
                                 <input type="text" class="form-control" id="addTelephone" onkeyup="this.value=this.value.replace(/\D/g,'')" />
45 65 
 							</div>
46 66 
                         </td>
47 
-					</tr>
48 
-					<tr>
67 
+
49 68 
 						<th>手机:</th>
50 69 
                         <td>
51 70 
                         	<div class="form-group">
 
@@ -60,7 +79,7 @@
60 79 
                         </td>
61 80 
 					</tr>
62 81 
 					<tr>
63 
-						<th style="color: darkred;">部门：</th>
82 
+						<th>部门：</th>
64 83 
 						<td>
65 84 
 							<div class="inpBox form-group">
66 85 
 								<input type="text" class="inps inps2"  readonly="readonly"/>

+ 64 - 12
CallCenterWeb.UI/TelCall/contacts_modify.html
Ver fichero 

@@ -6,9 +6,10 @@
6 6 
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
7 7 
     <script src="../Script/Common/huayi.load.js"></script>
8 8 
     <script src="../Script/Common/huayi.config.js"></script>
9 
+	<link rel="stylesheet" href="../js/zTree/zTreeStyle.css" />
9 10 
     <link rel="stylesheet" href="../css/init.css" />
10 11 
     <link rel="stylesheet" type="text/css" href="./css/contacts_add_modify.css">
11 
-    <title>设备管理修改</title>
12 
+    <title>设备管理添加</title>
12 13 
 </head>
13 14
14 15 
 <body class="gray-bg">
 
@@ -17,41 +18,91 @@
17 18 
             <table class="customerService">
18 19 
             	<tbody>
19 20 
             		<tr>
20 
-						<th>生产单位:</th>
21 
+						<th>用户姓名:</th>
21 22 
                         <td>
22 23 
                         	<div class="form-group">
23 
-                                <input type="text" class="form-control" id="addProduction" />
24 
+                                <input type="text" class="form-control" id="addUserName" />
24 25 
 							</div>
25 26 
                         </td>
26 
-                        <th>工厂代码:</th>
27 
+                        <th>性别:</th>
27 28 
                         <td>
28 29 
                         	<div class="form-group">
29 
-                                <input type="text" class="form-control" id="addFactoryCode" />
30 
+                                <input type="text" class="form-control" id="addSex" />
30 31 
 							</div>
31 32 
                         </td>
32 33 
 					</tr>
33 34 
 					<tr>
34 
-						<th>结扎机编号:</th>
35 
+						<th>省:</th>
36 
+                    	<td style="position: relative;">
37 
+                    		<div class="form-group">
38 
+								<select class="form-control" id="source">
39 
+	       							<option value ="">请选择</option>
40 
+								</select>
41 
+							</div>
42 
+                        </td>
43 
+                        <th>市:</th>
44 
+                        <td style="position: relative;">
45 
+                        	<div class="form-group">
46 
+								<select class="form-control" id="type">
47 
+	       							<option value ="">请选择</option>
48 
+								</select>
49 
+							</div>
50 
+                        </td>
51 
+                        <th>区/县:</th>
52 
+                        <td style="position: relative;">
53 
+                        	<div class="form-group">
54 
+								<select class="form-control" id="keyid">
55 
+	       							<option value ="">请选择</option>
56 
+								</select>
57 
+							</div>
58 
+                        </td>
59 
+					</tr>
60 
+					<tr>
61 
+                        <th>内线电话:</th>
35 62 
                         <td>
36 63 
                         	<div class="form-group">
37 
-                                <input type="text" class="form-control" id="addLigatureMachineCode" />
64 
+                                <input type="text" class="form-control" id="addTelephone" onkeyup="this.value=this.value.replace(/\D/g,'')" />
38 65 
 							</div>
39 66 
                         </td>
40 
-                        <th>拉伸膜包装机编号:</th>
67 
+
68 
+						<th>手机:</th>
41 69 
                         <td>
42 70 
                         	<div class="form-group">
43 
-                                <input type="text" class="form-control" id="addStretchFilmCode" />
71 
+                                <input type="text" class="form-control" id="addMobile" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
72 
+							</div>
73 
+                        </td>
74 
+                        <th>其他号码:</th>
75 
+                        <td>
76 
+                        	<div class="form-group">
77 
+                                <input type="text" class="form-control" id="addElseMobile" onkeyup="this.value=this.value.replace(/\D/g,'')" />
44 78 
 							</div>
45 79 
                         </td>
46 80 
 					</tr>
47 81 
 					<tr>
48 
-						<th>品管员代码:</th>
82 
+						<th>部门：</th>
83 
+						<td>
84 
+							<div class="inpBox form-group">
85 
+								<input type="text" class="inps inps2"  readonly="readonly"/>
86 
+								<i class="drop-down"></i>
87 
+								<div class="add-tree">
88 
+									<ul id="departmentTree" class="ztree">
89 
+									</ul>
90 
+								</div>
91 
+							</div>
92 
+						</td>
93 
+                        <th>职位:</th>
49 94 
                         <td>
50 95 
                         	<div class="form-group">
51 
-                                <input type="text" class="form-control" id="addQCStaffCode" />
96 
+                                <input type="text" class="form-control" id="addPosition" />
52 97 
 							</div>
53 98 
                         </td>
54 99 
 					</tr>
100 
+					<tr>
101 
+						<th>备注:</th>
102 
+                    	<td colspan="6">
103 
+                        	<textarea rows="4" cols="" id="addNote" style="margin-top:10px;"></textarea>
104 
+                    	</td>
105 
+					</tr>
55 106 
                     <tr>
56 107 
                         <td colspan="8" style="text-align: center;">
57 108 
                             <button class="btns customerSubmit">确&nbsp;定</button>
 
@@ -62,7 +113,8 @@
62 113 
         </div>
63 114 
     </div>
64 115
65 
-    <script src="./js/equipment_management_modify.js"></script>
116 
+	<script src="../js/zTree/jquery.ztree.core.js"></script>
117 
+    <script src="./js/contacts_modify.js"></script>
66 118 
 </body>
67 119
68 120 
 </html>

+ 2 - 2
CallCenterWeb.UI/TelCall/js/contacts.js
Ver fichero 

@@ -83,7 +83,7 @@ function btnModify () {
83 83 
 			title: '修改',
84 84 
 			maxmin: true, //开启最大化最小化按钮
85 85 
 			area: ['80%', '90%'],
86 
-			content: "./equipment_management_modify.html?id=" + id,
86 
+			content: "./contacts_modify.html?id=" + id,
87 87 
 		});
88 88 
     }
89 89 
 }
 
@@ -106,7 +106,7 @@ $('.delete').click(function () {
106 106 
             //按钮【按钮一】的回调
107 107 
             $.ajax({
108 108 
                 type: "post",
109 
-                url: huayi.config.callcenter_url + "EquipmentNumber/DelEquipment",
109 
+                url: huayi.config.callcenter_url + "AddressBook/DelAddressBook",
110 110 
                 async: true,
111 111 
                 dataType: "json",
112 112 
                 data: {

+ 90 - 1
CallCenterWeb.UI/TelCall/js/contacts_add.js
Ver fichero 

@@ -7,6 +7,8 @@ $(document).ready(function () {
7 7 
     });
8 8 
     //获取部门
9 9 
     getDepartment();
10 
+    //获取省份
11 
+    getProvince($("#source"));
10 12 
 })
11 13
12 14 
 //下拉框
 
@@ -63,6 +65,93 @@ function getDepartment() {
63 65 
 	});
64 66 
 }
65 67
68 
+/*
69 
+ * 省
70 
+ * 市
71 
+ * 区/县
72 
+ */
73 
+
74 
+ //省
75 
+function getProvince(obj) {
76 
+	obj.empty();
77 
+	obj.append('<option selected="selected" value="">请选择</option>');
78 
+	$.getJSON(huayi.config.callcenter_url + "RegionCategory/GetCountyList", {
79 
+		"token": $.cookie("token"),
80 
+		pid: 0,
81 
+	}, function (data) {
82 
+		if (data.state.toLowerCase() == "success") {
83 
+			var content = data.data;
84 
+			$(content).each(function (i, n) {
85 
+				$("<option value='" + n.F_RegionId + "'>" + n.F_RegionName + "</option>").appendTo(obj);
86 
+			})
87 
+		}
88 
+	})
89 
+}
90 
+//市
91 
+function getCity(obj) {
92 
+	obj.empty();
93 
+	obj.append('<option selected="selected" value="">请选择</option>');
94 
+	$.getJSON(huayi.config.callcenter_url + "RegionCategory/GetCountyList", {
95 
+		"token": $.cookie("token"),
96 
+		pid:$('#source').val(),
97 
+	}, function (data) {
98 
+		if (data.state.toLowerCase() == "success") {
99 
+			var content = data.data;
100 
+			$(content).each(function (i, n) {
101 
+				$("<option value='" + n.F_RegionId + "'>" + n.F_RegionName + "</option>").appendTo(obj);
102 
+			})
103 
+		}
104 
+
105 
+	})
106 
+}
107 
+//区/县
108 
+function getCounty(obj) {
109 
+	obj.empty();
110 
+	obj.append('<option selected="selected" value="">请选择</option>');
111 
+	$.getJSON(huayi.config.callcenter_url + "RegionCategory/GetCountyList", {
112 
+		"token": $.cookie("token"),
113 
+		pid:$('#type').val(),
114 
+	}, function (data) {
115 
+		if (data.state.toLowerCase() == "success") {
116 
+			var content = data.data;
117 
+			$(content).each(function (i, n) {
118 
+				$("<option value='" + n.F_RegionId + "'>" + n.F_RegionName + "</option>").appendTo(obj);
119 
+			})
120 
+		}
121 
+	})
122 
+}
123 
+
124 
+//通过省获取市
125 
+$('#source').on('change',function(){
126 
+	getCity($("#type"));
127 
+});
128 
+//通过市获取区/县
129 
+$('#type').on('change',function(){
130 
+	getCounty($("#keyid"));
131 
+});
132 
+
133 
+// 地址（省+市+区/县）
134 
+function detailedAddress() {
135 
+	if($('#source').val() === ""){
136 
+		var province = '';
137 
+	} else {
138 
+		var province = $('#source').find("option:selected").text()
139 
+	}
140 
+	if($('#type').val() === ""){
141 
+		var city = '';
142 
+	} else {
143 
+		var city = $('#type').find("option:selected").text()
144 
+	}
145 
+	if($('#keyid').val() === ""){
146 
+		var county = '';
147 
+	} else {
148 
+		var county = $('#keyid').find("option:selected").text()
149 
+	}
150 
+	var address = province + '-' + city + '-' + county;
151 
+	return address;
152 
+}
153 
+
154 
+
66 155 
 //保存
67 156 
 function saveCustomer() {
68 157 
     $.ajax({
 
@@ -78,7 +167,7 @@ function saveCustomer() {
78 167 
             token: $.cookie("token"),
79 168 
             F_Name: $("#addUserName").val(), //用户姓名
80 169 
             F_Sex: $("#addSex").val(), //性别
81 
-            F_Address: $("#addAddress").val(), //地址
170 
+            F_Address: detailedAddress(), //地址
82 171 
             F_Telephone: $("#addTelephone").val(), //内线电话
83 172 
             F_Mobile: $("#addMobile").val(), //手机
84 173 
             F_ElseMobile: $("#addElseMobile").val(), //其他号码

+ 242 - 0
CallCenterWeb.UI/TelCall/js/contacts_modify.js
Ver fichero 

@@ -0,0 +1,242 @@
1 
+var userId = helper.request.queryString("id"); //用户id
2 
+$(document).ready(function () {
3 
+    //保存
4 
+    $('.customerSubmit').click(function() {
5 
+        saveCustomer();
6 
+    });
7 
+    //获取部门
8 
+    getDepartment();
9 
+    //获取省份
10 
+    getProvince($("#source"));
11 
+    //获取详情
12 
+    getDetails();
13 
+})
14 
+
15 
+//下拉框
16 
+$('.inps').focus(function() {
17 
+	$(this).siblings('.add-tree').css('display', 'block');
18 
+})
19 
+
20 
+$('.drop-down').click(function() {
21 
+	var dropDown = $(this).siblings('.add-tree');
22 
+	if(dropDown.css('display') == 'block') {
23 
+		dropDown.css('display', 'none')
24 
+	} else {
25 
+		dropDown.css('display', 'block')
26 
+	}
27 
+})
28 
+
29 
+$('.add-tree').mouseleave(function() {
30 
+	$(this).css('display', 'none')
31 
+})
32 
+
33 
+//获取所属部门
34 
+var setting = {
35 
+	data: {
36 
+		key: {
37 
+			name: "text"
38 
+		},
39 
+		simpleData: {
40 
+			enable: true,
41 
+			idKey: "id",
42 
+			rootPId: 0
43 
+		}
44 
+	},
45 
+	callback: {
46 
+		onClick: ztreeDep
47 
+	}
48 
+};
49 
+
50 
+var departmentId; //部门id
51 
+var departmentName; //部门name
52 
+function ztreeDep(event, treeId, treeNode) {
53 
+	departmentId = treeNode.id;
54 
+	departmentName = treeNode.text;
55 
+	$('.inps2').val(departmentName);
56 
+};
57 
+
58 
+//获取部门
59 
+function getDepartment() {
60 
+	$.get(huayi.config.callcenter_url + "Department/GetDeptList", {
61 
+		"token": $.cookie("token"),
62 
+		"pid": "",
63 
+	}, function(result) {
64 
+		result = $.parseJSON(result);
65 
+		$.fn.zTree.init($("#departmentTree"), setting, result.data); //实例化树形图
66 
+	});
67 
+}
68 
+
69 
+/*
70 
+ * 省
71 
+ * 市
72 
+ * 区/县
73 
+ */
74 
+
75 
+ //省
76 
+function getProvince(obj) {
77 
+	obj.empty();
78 
+	obj.append('<option selected="selected" value="">请选择</option>');
79 
+	$.getJSON(huayi.config.callcenter_url + "RegionCategory/GetCountyList", {
80 
+		"token": $.cookie("token"),
81 
+		pid: 0,
82 
+	}, function (data) {
83 
+		if (data.state.toLowerCase() == "success") {
84 
+			var content = data.data;
85 
+			$(content).each(function (i, n) {
86 
+				$("<option value='" + n.F_RegionId + "'>" + n.F_RegionName + "</option>").appendTo(obj);
87 
+			})
88 
+		}
89 
+	})
90 
+}
91 
+//市
92 
+function getCity(obj) {
93 
+	obj.empty();
94 
+	obj.append('<option selected="selected" value="">请选择</option>');
95 
+	$.getJSON(huayi.config.callcenter_url + "RegionCategory/GetCountyList", {
96 
+		"token": $.cookie("token"),
97 
+		pid:$('#source').val(),
98 
+	}, function (data) {
99 
+		if (data.state.toLowerCase() == "success") {
100 
+			var content = data.data;
101 
+			$(content).each(function (i, n) {
102 
+				$("<option value='" + n.F_RegionId + "'>" + n.F_RegionName + "</option>").appendTo(obj);
103 
+			})
104 
+		}
105 
+
106 
+	})
107 
+}
108 
+//区/县
109 
+function getCounty(obj) {
110 
+	obj.empty();
111 
+	obj.append('<option selected="selected" value="">请选择</option>');
112 
+	$.getJSON(huayi.config.callcenter_url + "RegionCategory/GetCountyList", {
113 
+		"token": $.cookie("token"),
114 
+		pid:$('#type').val(),
115 
+	}, function (data) {
116 
+		if (data.state.toLowerCase() == "success") {
117 
+			var content = data.data;
118 
+			$(content).each(function (i, n) {
119 
+				$("<option value='" + n.F_RegionId + "'>" + n.F_RegionName + "</option>").appendTo(obj);
120 
+			})
121 
+		}
122 
+	})
123 
+}
124 
+
125 
+//通过省获取市
126 
+$('#source').on('change',function(){
127 
+	getCity($("#type"));
128 
+});
129 
+//通过市获取区/县
130 
+$('#type').on('change',function(){
131 
+	getCounty($("#keyid"));
132 
+});
133 
+
134 
+// 地址（省+市+区/县）
135 
+function detailedAddress() {
136 
+	if($('#source').val() === ""){
137 
+		var province = '';
138 
+	} else {
139 
+		var province = $('#source').find("option:selected").text()
140 
+	}
141 
+	if($('#type').val() === ""){
142 
+		var city = '';
143 
+	} else {
144 
+		var city = $('#type').find("option:selected").text()
145 
+	}
146 
+	if($('#keyid').val() === ""){
147 
+		var county = '';
148 
+	} else {
149 
+		var county = $('#keyid').find("option:selected").text()
150 
+	}
151 
+	var address = province + '-' + city + '-' + county;
152 
+	return address;
153 
+}
154 
+
155 
+//获取详情
156 
+function getDetails() {
157 
+	$.ajax({
158 
+		type: "get",
159 
+		url: huayi.config.callcenter_url + "AddressBook/GetInfo",
160 
+		dataType: "json",
161 
+		async: true,
162 
+		data: {
163 
+			token: $.cookie("token"),
164 
+			infoid: userId,
165 
+		},
166 
+		success: function(data){
167 
+			if (data.state.toLowerCase() == "success") {
168 
+				var data = data.data;
169 
+				displayDetails(data);
170 
+			}
171 
+		}
172 
+	})
173 
+}
174 
+
175 
+//回显
176 
+function displayDetails(data) {
177 
+	$("#addUserName").val(data.F_Name); //用户姓名
178 
+	$("#addSex").val(data.F_Sex); //性别
179 
+	provinceCity(data)//地址
180 
+	$("#addTelephone").val(data.F_Telephone); //内线电话
181 
+	$("#addMobile").val(data.F_Mobile); //手机
182 
+	$("#addElseMobile").val(data.F_ElseMobile); //其他号码
183 
+	$(".inps2").val(data.F_Department)//部门
184 
+	$('.inps2').attr('data_id', data.F_DepartmentId);
185 
+	$("#addPosition").val(data.F_Position); //职位
186 
+	$("#addNote").val(data.F_Note); //备注
187 
+	//原部门id
188 
+	departmentId = $('.inps2').attr('data_id');
189 
+
190 
+}
191 
+
192 
+//省市县回显
193 
+function provinceCity(data){
194 
+	var provinceCityArr = data.F_Address.split("-");
195 
+	$("#source option:selected").text(provinceCityArr[0]);
196 
+	$("#source option:selected").val(provinceCityArr[0]);
197 
+	$("#type option:selected").text(provinceCityArr[1]);
198 
+	$("#type option:selected").val(provinceCityArr[1]);
199 
+	$("#keyid option:selected").text(provinceCityArr[2]);
200 
+	$("#keyid option:selected").val(provinceCityArr[2]);
201 
+}
202 
+
203 
+//保存
204 
+function saveCustomer() {
205 
+    $.ajax({
206 
+        type: "post",
207 
+        url: huayi.config.callcenter_url + "AddressBook/Add",
208 
+        dataType: 'json',
209 
+        async: true,
210 
+        beforeSend: function() { //触发ajax请求开始时执行
211 
+            $('.customerSubmit').attr("disabled", true);
212 
+            $('.customerSubmit').text('确定中...');
213 
+        },
214 
+        data: {
215 
+        	id: userId,//用户id
216 
+            token: $.cookie("token"),
217 
+            F_Name: $("#addUserName").val(), //用户姓名
218 
+            F_Sex: $("#addSex").val(), //性别
219 
+            F_Address: detailedAddress(), //地址
220 
+            F_Telephone: $("#addTelephone").val(), //内线电话
221 
+            F_Mobile: $("#addMobile").val(), //手机
222 
+            F_ElseMobile: $("#addElseMobile").val(), //其他号码
223 
+//          F_Departmentid: $("#addDepartmentid").val(), //部门ID
224 
+            F_Departmentid: departmentId, //部门ID
225 
+            F_Position: $("#addPosition").val(), //职位
226 
+            F_Note: $("#addNote").val(), //备注
227 
+        },
228 
+        success: function(data) {
229 
+            if (data.state.toLowerCase() == 'success') {
230 
+                $('.customerSubmit').attr("disabled", false);
231 
+	            $('.customerSubmit').text('确定');
232 
+            	var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
233 
+				parent.layer.close(index); //再执行关闭
234 
+				parent.layer.msg("保存成功！");
235 
+				parent.initTable();
236 
+            } else {
237 
+            	$('.customerSubmit').attr("disabled", false);
238 
+	            $('.customerSubmit').text('确定');
239 
+            }
240 
+        }
241 
+    });
242 
+}

+ 1 - 1
CallCenterWeb.UI/WorkOrder/WorkOrderDealWith.html
Ver fichero 

@@ -95,7 +95,7 @@
95 95 
 	                    </td>
96 96 
 					</tr>
97 97 
 					<tr>
98 
-                        <th>提交内容:</th>
98 
+                        <th>处理内容:</th>
99 99 
                         <td colspan="7">
100 100 
                             <textarea name="" rows="5" cols="" placeholder="" id="cont" style="margin-top:10px;"></textarea>
101 101 
                         </td>

+ 2 - 2
CallCenterWeb.UI/WorkOrder/WorkOrderTransfer.html
Ver fichero 

@@ -73,7 +73,7 @@
73 73 
 								</select>
74 74 
 							</div>
75 75 
 	                    </td>
76 
-	                    <th class="submitterTitle">提交人:</th>
76 
+	                    <th class="submitterTitle"></th>
77 77 
 	                	<td style="position: relative;" class="submitterSelect">
78 78 
 	                		<div class="form-group">
79 79 
 								<select class="form-control" id="customer_submitter">
 
@@ -83,7 +83,7 @@
83 83 
 	                    </td>
84 84 
 					</tr>
85 85 
 					<tr>
86 
-                        <th>提交内容:</th>
86 
+                        <th class="contentTitle"></th>
87 87 
                         <td colspan="7">
88 88 
                             <textarea name="" rows="5" cols="" placeholder="" id="cont" style="margin-top:10px;"></textarea>
89 89 
                         </td>

+ 0 - 1
CallCenterWeb.UI/equipment_management/equipment_management.html
Ver fichero 

@@ -51,7 +51,6 @@
51 51 
 						<th data-field="F_QCStaffCode">品管员代码</th>
52 52 
 						<th data-field="F_CreationTime">创建时间</th>
53 53 
 						<th data-field="F_CreatUser">创建人</th>
54 
-						<th data-field="F_IsDelete"></th>
55 54 
 					</tr>
56 55 
                 </thead>
57 56 
             </table>

+ 13 - 8
CallCenterWeb.UI/js/WorkOrder/WorkOrder.js
Ver fichero 

@@ -463,7 +463,7 @@ function authorizeOperateButton(userRoleCode) {
463 463 
 //格式化操作 （待提交）
464 464 
 function formatterSubmit(val, row) {
465 465 
 	return '<ul class="tool_downs">' +
466 
-		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_submit_' + row.F_Id + '" onclick="btn_transfer(\'' + row.F_Id + '\', 1)" title="指派">提交</a></li>' +
466 
+		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_submit_' + row.F_Id + '" onclick="btn_transfer(\'' + row.F_Id + '\', 1)" title="提交">提交</a></li>' +
467 467 
 		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_mark_' + row.F_Id + '" onclick="btn_mark(\'' + row.F_Id + '\')" title="标记">标记</a></li>' +
468 468 
 		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_edit_' + row.F_Id + '" onclick="btn_edit(\'' + row.F_Id + '\')" title="修改">修改</a></li>' +
469 469 
 		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_delete_' + row.F_Id + '" onclick="btn_deleteid(\'' + row.F_Id + '\')" title="删除">删除</a></li>' +
 
@@ -527,13 +527,18 @@ function formatterReceive(val,row) {
527 527 
 		'</ul>';
528 528 
 	}
529 529
530 
-//指派工单
530 
+//指派工单，提交工单
531 531 
 function btn_transfer(id, type) {
532 
+	if (type === 1) {
533 
+		var title = "提交工单"
534 
+	} else if (type === 2) {
535 
+		var title = "指派工单"
536 
+	}
532 537 
 	layer.open({
533 538 
 		type: 2,
534 
-		title: '指派工单',
539 
+		title: title,
535 540 
 		maxmin: true, //开启最大化最小化按钮
536 
-		area: ['80%', '90%'],
541 
+		area: ['50%', '50%'],
537 542 
 		content: "../WorkOrder/WorkOrderTransfer.html?id=" + id + "&type=" + type,
538 543 
 	});
539 544 
 }
 
@@ -556,9 +561,9 @@ function btn_mark(val) {
556 561 
 	var id = val;
557 562 
 	layer.open({
558 563 
 		type: 2,
559 
-		title: '修改工单',
564 
+		title: '标记工单',
560 565 
 		maxmin: true, //开启最大化最小化按钮
561 
-		area: ['80%', '90%'],
566 
+		area: ['70%', '40%'],
562 567 
 		content: '../WorkOrder/WorkOrderMark.html?id=' + id
563 568 
 	});
564 569 
 }
 
@@ -587,7 +592,7 @@ function btn_dealWith(id) {
587 592 
 		type: 2,
588 593 
 		title: '处理工单',
589 594 
 		maxmin: true, //开启最大化最小化按钮
590 
-		area: ['80%', '90%'],
595 
+		area: ['50%', '50%'],
591 596 
 		content: "../WorkOrder/WorkOrderDealWith.html?id=" + id
592 597 
 	});
593 598 
 }
 
@@ -598,7 +603,7 @@ function btn_return(id){
598 603 
 		type: 2,
599 604 
 		title: '退回工单',
600 605 
 		maxmin: true, //开启最大化最小化按钮
601 
-		area: ['80%', '90%'],
606 
+		area: ['50%', '40%'],
602 607 
 		content: "../WorkOrder/WorkOrderReturn.html?id=" + id
603 608 
 	});
604 609 
 }

+ 7 - 0
CallCenterWeb.UI/js/WorkOrder/WorkOrderTransfer.js
Ver fichero 

@@ -9,10 +9,17 @@ $(document).ready(function () {
9 9 
 		$('#customer_department').on('change',function(){
10 10 
 			getManager($('#customer_submitter'));
11 11 
 		});
12 
+		//修改文本
13 
+		$(".submitterTitle").text("提交人:");
14 
+		$(".contentTitle").text("提交内容:")
12 15 
 	} else if (type === "2"){
13 16 
 		getSalesman($('#customer_submitter'));
14 17 
 		$(".comaddressTitle").hide();
15 18 
 		$(".comaddressSelect").hide();
19 
+		//修改文本
20 
+		$(".submitterTitle").text("指派人:");
21 
+		$(".contentTitle").text("指派内容:")
22 
+
16 23 
 	}
17 24
18 25 
     //保存

+ 3 - 0
CallCenterWeb.UI/js/WorkOrder/xgWork.js
Ver fichero 

@@ -145,8 +145,11 @@ function workOrderSourceDisplay(data) {
145 145 
 function provinceCity(data){
146 146 
 	var provinceCityArr = data.F_AddRess.split("-");
147 147 
 	$("#source option:selected").text(provinceCityArr[0]);
148 
+	$("#source option:selected").val(provinceCityArr[0]);
148 149 
 	$("#type option:selected").text(provinceCityArr[1]);
150 
+	$("#type option:selected").val(provinceCityArr[1]);
149 151 
 	$("#keyid option:selected").text(provinceCityArr[2]);
152 
+	$("#keyid option:selected").val(provinceCityArr[2]);
150 153 
 }
151 154
152 155 
 //省 市 区/县