Главная Обзор Помощь
Регистрация Войти
duhongyu
/
ShuangHui_UI
Следить 1
В избранное 0
Ответвить 0
Код Обсуждения 0 Запросы на слияние 0 Коммиты 237 Релизы 0 Вики
Просмотр исходного кода

添加待审核工单

miaofuhao месяцев назад: 3
Родитель
caaec48a04
Сommit
a300d28343
25 измененных файлов с 1277 добавлено и 166 удалено
Разделённый вид Показать статистику Diff
  1. 7 0
      CallCenterWeb.UI/DDindex.html
  2. 11 11
      CallCenterWeb.UI/Script/Common/huayi.config.js
  3. 130 79
      CallCenterWeb.UI/WorkOrder/WorkOrderReturn.html
  4. 286 0
      CallCenterWeb.UI/WorkOrder/WorkOrderReview.html
  5. 19 1
      CallCenterWeb.UI/js/WorkOrder/WorkOrder.js
  6. 0 43
      CallCenterWeb.UI/js/WorkOrder/WorkOrderReturn.js
  7. 1 1
      CallCenterWeb.UI/js/contabs.min.js
  8. 2 2
      双汇APP-andriod/js/huayi.config.js
  9. 2 2
      双汇APP-andriod/manifest.json
  10. 10 0
      双汇APP-andriod/personal.html
  11. 227 0
      双汇APP-andriod/workOrder/Work-review.html
  12. 3 1
      双汇APP-andriod/workOrder/js/Work-list.js
  13. 33 6
      双汇APP-andriod/workOrder/js/detail.js
  14. 10 2
      双汇APP-h5/index.html
  15. 4 3
      双汇APP-h5/js/huayi.config.js
  16. 1 1
      双汇APP-h5/js/personal.js
  17. 241 0
      双汇APP-h5/workOrder/Work-review.html
  18. 3 1
      双汇APP-h5/workOrder/js/Work-list.js
  19. 14 5
      双汇APP-h5/workOrder/js/detail.js
  20. 1 1
      双汇APP/js/huayi.config.js
  21. 2 2
      双汇APP/manifest.json
  22. 9 0
      双汇APP/personal.html
  23. 227 0
      双汇APP/workOrder/Work-review.html
  24. 3 1
      双汇APP/workOrder/js/Work-list.js
  25. 31 4
      双汇APP/workOrder/js/detail.js

+ 7 - 0
CallCenterWeb.UI/DDindex.html
Просмотреть файл 

@@ -37,6 +37,13 @@
37 37 
 	                        if (data.state == "success") {
38 38 
 	                            $.cookie("token", data.data.token, { expires: 7 });
39 39 
 	                            window.location.href = "index.html";
40 
+//	                            console.log(wid)
41 
+//	                            if(wid){
42 
+//	                            	 window.location.href = "./WorkOrder/WorkOrderDetails.html?id="+wid
43 
+//	                            } else {
44 
+//	                            	window.location.href = "index.html";
45 
+//	                            }
46 
+
40 47 
 	                        } else {
41 48 
 	                            layer.msg("登录失败");
42 49 
 	                        }

+ 11 - 11
CallCenterWeb.UI/Script/Common/huayi.config.js
Просмотреть файл 

@@ -1,15 +1,15 @@
1 
-if (huayi == undefined) {
2 
-    var huayi = {};
1 
+if(huayi == undefined) {
2 
+	var huayi = {};
3 3 
 }
4 4 
 huayi.config = {
5 
-   //callcenter_url: "http://localhost:7456/",//生产环境 前端Web站IP和端口
6 
-   // callcenter_url: "http://192.168.4.18:4687/",//生产环境 前端Web站IP和端口
7 
-    callcenter_url: "http://192.168.8.9:1001/",//生产环境 前端Web站IP和端口
8 
-//  callcenter_url: "http://oa.shuanghui.net:8046/",//生产环境 前端Web站IP和端口
9 
-
10 
-    socket_ip: "192.168.8.7",//WebSocket通讯ip 121.196.219.217
11 
-    socket_port: "8081",    //WebSocket通讯端口
12 
-    menuworktime: 1000 * 60,    //菜单工单数量刷新间隔
13 
-    indextime: 1000 * 60 * 2         //首页报表刷新间隔
5 
+	//callcenter_url: "http://localhost:7456/",//生产环境 前端Web站IP和端口
6 
+	// callcenter_url: "http://192.168.4.18:4687/",//生产环境 前端Web站IP和端口
7 
+	callcenter_url: "http://192.168.8.9:1001/", //生产环境 前端Web站IP和端口
8 
+	//  callcenter_url: "http://oa.shuanghui.net:8046/",//生产环境 前端Web站IP和端口
9 
+
10 
+	socket_ip: "192.168.8.7", //WebSocket通讯ip 121.196.219.217
11 
+	socket_port: "8081", //WebSocket通讯端口
12 
+	menuworktime: 1000 * 60, //菜单工单数量刷新间隔
13 
+	indextime: 1000 * 60 * 2 //首页报表刷新间隔
14 14
15 15 
 };

+ 130 - 79
CallCenterWeb.UI/WorkOrder/WorkOrderReturn.html
Просмотреть файл 

@@ -1,87 +1,138 @@
1 1 
 <!DOCTYPE html>
2 2 
 <html>
3 3
4 
-<head>
5 
-    <meta charset="UTF-8">
6 
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
7 
-    <link href="../css/init.css" rel="stylesheet" />
8 
-    <script src="../Script/Common/huayi.load.js"></script>
9 
-    <script src="../Script/Common/huayi.config.js"></script>
10 
-    <link href="../css/WorkOrder/Search.css" rel="stylesheet">
11 
-    <link rel="stylesheet" href="../js/zTree/zTreeStyle.css" />
12 
-    <link href="../js/bootstrap-select/css/bootstrap-select.css" rel="stylesheet" />
13 
-    <link rel="stylesheet" href="../css/WorkOrder/jquery.editable-select.css" />
14 
-    <link rel="stylesheet" href="../js/comboSelect/combo.select.css" />
15 
-    <link rel="stylesheet" href="../css/init.css" />
16 
-    <title>退单</title>
17 
-    <style>
18 
-        ul li {
19 
-            float: initial;
20 
-            list-style: none;
21 
-        }
22 
-        .wrapper-content{
23 
-        	padding-top: 20px;
24 
-        }
25 
-        .common {
26 
-            width: 100%;
27 
-            text-align: center;
28 
-            padding: 1% 8% 0 0;
29 
-        }
4 
+	<head>
5 
+		<meta charset="UTF-8">
6 
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
7 
+		<link href="../css/init.css" rel="stylesheet" />
8 
+		<script src="../Script/Common/huayi.load.js"></script>
9 
+		<script src="../Script/Common/huayi.config.js"></script>
10 
+		<link href="../css/WorkOrder/Search.css" rel="stylesheet">
11 
+		<link rel="stylesheet" href="../js/zTree/zTreeStyle.css" />
12 
+		<link href="../js/bootstrap-select/css/bootstrap-select.css" rel="stylesheet" />
13 
+		<link rel="stylesheet" href="../css/WorkOrder/jquery.editable-select.css" />
14 
+		<link rel="stylesheet" href="../js/comboSelect/combo.select.css" />
15 
+		<link rel="stylesheet" href="../css/init.css" />
16 
+		<title>工单审核</title>
17 
+		<style>
18 
+			ul li {
19 
+				float: initial;
20 
+				list-style: none;
21 
+			}
22 
+
23 
+			.wrapper-content {
24 
+				padding-top: 20px;
25 
+			}
26 
+
27 
+			.common {
28 
+				width: 100%;
29 
+				text-align: center;
30 
+				padding: 1% 8% 0 0;
31 
+			}
32 
+
33 
+			.common table {
34 
+				width: 100%;
35 
+			}
36 
+
37 
+			.common table th {
38 
+				padding: 5px 8px 5px 0;
39 
+				text-align: center;
40 
+			}
41 
+
42 
+			.common table td {
43 
+				padding: 6px 0 5px 10px;
44 
+				text-align: left;
45 
+				color: #717171;
46 
+				line-height: 200%;
47 
+			}
48 
+
49 
+			.common table td textarea {
50 
+				width: 100%;
51 
+				vertical-align: middle;
52 
+				resize: none;
53 
+				outline: none;
54 
+			}
55 
+		</style>
56 
+	</head>
30 57
31 
-        .common table {
32 
-            width: 100%;
33 
-        }
58 
+	<body class="gray-bg">
59 
+		<div class="clearfix wrapper wrapper-content animated fadeInRight">
60 
+			<div class="common">
61 
+				<table class="customerService">
62 
+					<tbody>
63 
+						<tr>
64 
+							<th>是否同意:</th>
65 
+							<td colspan="3">
66 
+								<select class="form-control" id="state">
67 
+									<option value="1">同意</option>
68 
+									<option value="2">拒绝</option>
69 
+								</select>
70 
+							</td>
71 
+						</tr>
72 
+						<tr>
73 
+							<th>审核内容:</th>
74 
+							<td colspan="7">
75 
+								<textarea name="" rows="5" cols="" placeholder="" id="cont" style="margin-top:10px;"></textarea>
76 
+							</td>
77 
+						</tr>
78 
+						<tr>
79 
+							<td colspan="8" style="text-align: center;">
80 
+								<button class="btns customerSubmit">确&nbsp;定</button>
81 
+							</td>
82 
+						</tr>
83 
+					</tbody>
84 
+				</table>
85 
+			</div>
86 
+		</div>
34 87
35 
-        .common table th {
36 
-            padding: 5px 8px 5px 0;
37 
-            text-align: center;
38 
-            /* width: 20%;*/
39 
-        }
88 
+		<script src="../js/zTree/jquery.ztree.core.js"></script>
89 
+		<script src="../js/bootstrap-select/js/bootstrap-select.js"></script>
90 
+		<script src="../js/WorkOrder/jquery.editable-select.js"></script>
91 
+		<script src="../js/comboSelect/jquery.combo.select.js"></script>
92 
+		<script src="../js/laydate/laydate.js"></script>
93 
+		<script>
94 
+			var id = helper.request.queryString("id");
95 
+			$(document).ready(function() {
96 
+				//保存
97 
+				$('.customerSubmit').click(function() {
98 
+					saveCustomer();
99 
+				});
100 
+			})
40 101
41 
-        .common table td {
42 
-            padding: 6px 0 5px 10px;
43 
-            text-align: left;
44 
-            color: #717171;
45 
-            line-height: 200%;
46 
-        }
102 
+			//保存
103 
+			function saveCustomer() {
104 
+				$.ajax({
105 
+					type: "post",
106 
+					url: huayi.config.callcenter_url + "WorkOrder/ReviewWorkOrder",
107 
+					dataType: 'json',
108 
+					async: true,
109 
+					beforeSend: function() { //触发ajax请求开始时执行
110 
+						$('.customerSubmit').attr("disabled", true);
111 
+						$('.customerSubmit').text('确定中...');
112 
+					},
113 
+					data: {
114 
+						token: $.cookie("token"),
115 
+						id: id,
116 
+						state:$('#state').val(),
117 
+						cont: $('#cont').val(), //提交内容
118 
+					},
119 
+					success: function(data) {
120 
+						if(data.state.toLowerCase() == 'success') {
121 
+							$('.customerSubmit').attr("disabled", false);
122 
+							$('.customerSubmit').text('确定');
123 
+							var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
124 
+							parent.layer.close(index); //再执行关闭
125 
+							parent.layer.msg("保存成功！");
126 
+							parent.initTable();
127 
+						} else {
128 
+							$('.customerSubmit').attr("disabled", false);
129 
+							$('.customerSubmit').text('确定');
130 
+						}
131 
+					}
132 
+				});
47 133
48 
-        .common table td textarea {
49 
-            width: 100%;
50 
-            vertical-align: middle;
51 
-            resize: none;
52 
-            outline: none;
53 
-        }
134 
+			}
135 
+		</script>
136 
+	</body>
54 137
55 
-    </style>
56 
-</head>
57 
-
58 
-<body class="gray-bg">
59 
-    <div class="clearfix wrapper wrapper-content animated fadeInRight">
60 
-        <div class="common">
61 
-            <table class="customerService">
62 
-            	<tbody>
63 
-					<tr>
64 
-                        <th>退单内容:</th>
65 
-                        <td colspan="7">
66 
-                            <textarea name="" rows="5" cols="" placeholder="" id="cont" style="margin-top:10px;"></textarea>
67 
-                        </td>
68 
-                    </tr>
69 
-                    <tr>
70 
-                        <td colspan="8" style="text-align: center;">
71 
-                            <button class="btns customerSubmit">确&nbsp;定</button>
72 
-                        </td>
73 
-                    </tr>
74 
-                </tbody>
75 
-            </table>
76 
-        </div>
77 
-    </div>
78 
-
79 
-    <script src="../js/zTree/jquery.ztree.core.js"></script>
80 
-    <script src="../js/bootstrap-select/js/bootstrap-select.js"></script>
81 
-    <script src="../js/WorkOrder/jquery.editable-select.js"></script>
82 
-    <script src="../js/comboSelect/jquery.combo.select.js"></script>
83 
-    <script src="../js/laydate/laydate.js"></script>
84 
-    <script src="../js/WorkOrder/WorkOrderReturn.js"></script>
85 
-</body>
86 
-
87 
-</html>
138 
+</html>

+ 286 - 0
CallCenterWeb.UI/WorkOrder/WorkOrderReview.html
Просмотреть файл 

@@ -0,0 +1,286 @@
1 
+<!DOCTYPE html>
2 
+<html>
3 
+
4 
+	<head>
5 
+		<meta charset="UTF-8">
6 
+		<title>已办待审核工单</title>
7 
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
8 
+		<script src="../Script/Common/huayi.load.js"></script>
9 
+		<script src="../Script/Common/huayi.config.js"></script>
10 
+		<link rel="stylesheet" href="../js/comboSelect/combo.select.css" />
11 
+		<link href="../css/init.css" rel="stylesheet" />
12 
+		<link href="../css/WorkOrder/Search.css" rel="stylesheet">
13 
+		<link rel="stylesheet" href="../js/zTree/zTreeStyle.css" />
14 
+		<style>
15 
+			.toolBox{
16 
+				padding-top: 15px;
17 
+			}
18 
+
19 
+			.toolBox .form-inline .form-group{
20 
+				margin-bottom: 10px;
21 
+			}
22 
+
23 
+			.time-box {
24 
+				display: inline-block;
25 
+				position: relative;
26 
+			}
27 
+		</style>
28 
+
29 
+	</head>
30 
+
31 
+	<body class="gray-bg">
32 
+		<div class="daoHang clearfix">
33 
+			<div class="dhLeft">
34 
+				<sapn><i class="syIcon"></i>位置：
35 
+					<a href="javaScript:;" id="ReIndex">首页</a>&gt;
36 
+					<a href="javaScript:;">工单管理</a>&gt;
37 
+					<a href="" class="nowPosition">已办待审核</a>
38 
+				</sapn>
39 
+			</div>
40 
+			<div class="dhRight">
41 
+				<a href="#" title="刷新"><i class="fa fa-refresh"></i></a>
42 
+			</div>
43 
+		</div>
44 
+		<div class="wrapper wrapper-content animated fadeInRight">
45 
+			<div class="toolBox clearfix">
46 
+				<div class="pull-left">
47 
+					<div class="form-inline clearfix">
48 
+						<div class="form-group">
49 
+							<input class="form-control" type="text" id="searchCode" placeholder="请输入工单编号">
50 
+						</div>
51 
+						<div class="form-group" style="position: relative;">
52 
+							<input class="form-control inps search-ztree-name" id="searchRegionName" type="text" autocomplete="off" readonly="readonly" placeholder="请选择大区办事处" />
53 
+							<input id="searchRegionId" type="hidden" />
54 
+							<input id="searchOfficeId" type="hidden" />
55 
+							<i class="xl"></i>
56 
+							<!-- <b class="delect-icon">X</b> -->
57 
+							<div class="addTree">
58 
+								<ul id="selectRegionZtree" class="ztree">
59 
+								</ul>
60 
+							</div>
61 
+						</div>
62 
+						<div class="time-box form-group">
63 
+							<i class="tub fa fa-calendar"></i>
64 
+							<input class="form-control search_time" type="text" id="greetingTimes" placeholder="请选择投诉时间" autocomplete="off" />
65 
+						</div>
66 
+						<div class="form-group">
67 
+							<input class="form-control" type="text" id="searchKeywords" placeholder="关键字">
68 
+						</div>
69 
+						<div class="form-group">
70 
+							<select class="form-control" id="searchProductType">
71 
+								<option value="">请选择产品代码</option>
72 
+							</select>
73 
+						</div>
74 
+						<div class="form-group">
75 
+							<input class="form-control" type="text" id="searchProductName" placeholder="产品名称">
76 
+						</div>
77 
+						<div class="form-group">
78 
+							<input class="form-control" type="text" id="searchProductDate" placeholder="生产日期(YYYY.MM.DD)">
79 
+						</div>
80 
+						<div class="form-group">
81 
+							<input class="form-control" type="text" id="searchBatchNumber" placeholder="产品编码">
82 
+						</div>
83 
+						<div class="form-group" style="position: relative;">
84 
+							<input class="form-control inps search-ztree-name" id="searchManufacturerName" type="text" autocomplete="off" readonly="readonly" placeholder="请选择生产厂家" />
85 
+							<input id="searchManufacturerId" type="hidden" />
86 
+							<i class="xl"></i>
87 
+							<div class="addTree">
88 
+								<ul id="selectManufacturerZtree" class="ztree">
89 
+								</ul>
90 
+							</div>
91 
+						</div>
92 
+						<div class="form-group" style="position: relative;">
93 
+							<input class="form-control inps search-ztree-name" id="searchProblemCodeName" type="text" autocomplete="off" readonly="readonly" placeholder="请选择问题代码" />
94 
+							<input id="searchProblemCodeId" type="hidden" />
95 
+							<i class="xl"></i>
96 
+							<div class="addTree">
97 
+								<ul id="searchProblemCodeZtree" class="ztree">
98 
+								</ul>
99 
+							</div>
100 
+						</div>
101 
+						<div class="form-group">
102 
+							<select class="form-control" id="searchOrderType">
103 
+								<option value="">请选择工单类别</option>
104 
+								<!-- <option value="1">咨询</option> -->
105 
+								<option value="2">投诉</option>
106 
+								<option value="3">重复</option>
107 
+								<!--<option value="5">生鲜品</option>
108 
+								<option value="6">禽产品</option>
109 
+								<option value="7">综合事业部</option>
110 
+								<option value="8">餐饮事业部</option>
111 
+								<option value="9">400热线接听</option>
112 
+								<option value="10">线上投诉</option>
113 
+								<option value="11">市场监管局投诉</option>
114 
+								<option value="12">电商投诉</option>-->
115 
+							</select>
116 
+						</div>
117 
+						<div class="form-group">
118 
+							<select class="form-control" id="searchDealTimely">
119 
+								<option value="">请选择工单级别</option>
120 
+							</select>
121 
+						</div>
122 
+						<!--<div class="form-group">
123 
+							<select class="form-control" id="searchOrderSource">
124 
+								<option value="">请选择工单来源</option>
125 
+								<option value="1">PC</option>
126 
+								<option value="2">APP</option>
127 
+								<option value="3">微信</option>
128 
+							</select>
129 
+						</div>-->
130 
+						<div class="form-group">
131 
+							<select class="form-control" id="searchSee">
132 
+								<option value="">查看负责区域单子</option>
133 
+								<option value="0">所有</option>
134 
+								<option value="1">管理区域</option>
135 
+							</select>
136 
+						</div>
137 
+						<div class="time-box form-group">
138 
+							<i class="tub fa fa-calendar"></i>
139 
+							<input class="form-control search_time" type="text" id="duplicateTime" placeholder="请选择重复投诉时间" autocomplete="off">
140 
+						</div>
141 
+						<div class="form-group">
142 
+							<select class="form-control" id="searchReminder">
143 
+								<option value="">请选择是否催单</option>
144 
+								<option value="0">是</option>
145 
+								<option value="1">否</option>
146 
+							</select>
147 
+						</div>
148 
+						<div class="form-group">
149 
+							<select class="form-control" id="searchComplete">
150 
+								<option value="">请选择是否完善</option>
151 
+								<option value="0">是</option>
152 
+								<option value="1">否</option>
153 
+							</select>
154 
+						</div>
155 
+						<div class="form-group btn-position">
156 
+							<button class="btns ss">搜索</button>
157 
+							<button class="btns export">导出</button>
158 
+						</div>
159 
+					</div>
160 
+				</div>
161 
+			</div>
162 
+			<div style="width: 100%; padding: 10px; position: relative;" id="ces">
163 
+				<table id="workorderlist" class="market" data-row-style="rowStyle" data-query-params="queryParams" data-pagination="true">
164 
+					<thead>
165 
+						<tr>
166 
+							<th data-field="F_WorkOrderId" data-class="W160" data-formatter="View" data-align="center">工单编号</th>
167 
+							<th data-field="F_AreaName" data-class="W60" data-align="center">大区</th>
168 
+							<th data-field="F_OfficName" data-class="W80" data-align="center">办事处</th>
169 
+							<th data-field="F_CreateTime" data-class="W190" data-formatter="formatterCharacter25" data-align="center">投诉时间</th>
170 
+							<th data-field="F_SerialNumber" data-class="W60" data-align="center">序号</th>
171 
+							<th data-field="F_CusName" data-class="W100" data-align="center">姓名</th>
172 
+							<th data-field="F_AddRess" data-class="W240" data-formatter="formatterCharacter15" data-align="center">地址</th>
173 
+							<th data-field="F_CusPhone" data-class="W140" data-formatter="formatterCharacter15" data-align="center">联系电话</th>
174 
+							<th data-field="F_ProductType" data-class="W80" data-align="center">产品代码</th>
175 
+							<th data-field="F_ProductName" data-class="W180" data-formatter="formatterCharacter10" data-align="center">产品名称</th>
176 
+							<th data-field="F_Specifications" data-class="W80" data-formatter="formatterCharacter8" data-align="center">规格</th>
177 
+							<th data-field="F_ProductDate" data-class="W100" data-align="center">生产日期</th>
178 
+							<th data-field="F_BatchNumber" data-class="W120" data-formatter="formatterCharacter12" data-align="center">产品编码</th>
179 
+							<th data-field="F_Manufacturer" data-class="W100" data-formatter="formatterCharacter8" data-align="center">生产厂家</th>
180 
+							<th data-field="F_ProblemCode" data-class="W80" data-align="center">问题代码</th>
181 
+							<th data-field="F_QualityProblem" data-class="W180" data-formatter="formatterCharacter10" data-align="center">质量问题</th>
182 
+							<th data-field="F_Notifications" data-class="W180" data-align="center">通知人</th>
183 
+							<th data-field="F_ReceivingPerson" data-class="W80" data-align="center">接听人</th>
184 
+							<th data-field="F_DealResult" data-class="W240" data-formatter="formatterDealResult" data-align="center">落实情况</th>
185 
+							<th data-field="F_State" data-class="W100" data-formatter="workOrderStateJudge" data-align="center">处理进度</th>
186 
+							<th data-field="F_Type" data-class="W60margin partyType" data-formatter="workOrderTypeJudge">工单类别</th>
187 
+							<th data-field="F_WorkOrderId" data-class="workOprate workOprate6 W200" data-formatter="formatterReview"  data-align="center">操作</th>
188 
+						</tr>
189 
+					</thead>
190 
+				</table>
191 
+				<div class="dealResultContentWrapper" style="display: none;"></div>
192 
+			</div>
193 
+		</div>
194 
+
195 
+		<script src="../js/zTree/jquery.ztree.core.js"></script>
196 
+		<script src="../js/kindeditor/kindeditor.js"></script>
197 
+		<script src="../js/kindeditor/lang/zh_CN.js"></script>
198 
+		<script src="../js/WorkOrder/WorkOrder.js"></script>
199 
+		<script src="../js/laydate/laydate.js"></script>
200 
+		<script src="../js/comboSelect/jquery.combo.select.js"></script>
201 
+		<script src="../js/zTree/jquery.ztree.core.js"></script>
202 
+		<script src="../js/zTree/jquery.ztree.excheck.min.js"></script>
203 
+
204 
+		<script>
205 
+			$(document).ready(function() {
206 
+				laydate.render({
207 
+					elem: '#greetingTimes',
208 
+					range: '~',
209 
+					theme: '#1ab394',
210 
+				});
211 
+				laydate.render({
212 
+					elem: '#duplicateTime',
213 
+					range: '~',
214 
+					theme: '#1ab394',
215 
+				});
216 
+
217 
+				// 导出
218 
+				$('.export').click(function() {
219 
+					var state = 10; //处理进度
220 
+					dcexcel(state);
221 
+				});
222 
+			})
223 
+
224 
+			function initTable() {
225 
+				//先销毁表格
226 
+				$('#workorderlist').bootstrapTable('destroy');
227 
+				//初始化表格,动态从服务器加载数据
228 
+				$("#workorderlist").bootstrapTable({
229 
+					method: "post", //使用get请求到服务器获取数据
230 
+					url: huayi.config.callcenter_url + "WorkOrder/GetList", //获取数据的Servlet地址
231 
+					contentType: 'application/x-www-form-urlencoded',
232 
+					striped: true, //表格显示条纹
233 
+					pagination: true, //启动分页
234 
+					pageSize: 10, //每页显示的记录数
235 
+					pageNumber: 1, //当前第几页
236 
+					pageList: [10, 20, 50, 100], //记录数可选列表
237 
+					search: false, //是否启用查询
238 
+					showColumns: false, //显示下拉框勾选要显示的列
239 
+					showRefresh: false, //显示刷新按钮
240 
+					sidePagination: "server", //表示服务端请求
241 
+					fixedColumns: true,
242 
+                	fixedNumber: 14,
243 
+					//设置为undefined可以获取pageNumber，pageSize，searchText，sortName，sortOrder
244 
+					//设置为limit可以获取limit, offset, search, sort, order
245 
+					queryParamsType: "undefined",
246 
+					queryParams: function queryParams(params) { //设置查询参数
247 
+						var param = {
248 
+							state: 12, //处理进度
249 
+							token: $.cookie("token"),
250 
+							code: $("#searchCode").val(), //工单编号
251 
+							area: $("#searchRegionId").val(), //大区
252 
+							office: $("#searchOfficeId").val(), //办事处
253 
+							starttime: $('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[0], //开始时间
254 
+							endtime: $('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[1], //结束时间
255 
+							keywords: $("#searchKeywords").val(),//关键字
256 
+							productType: $("#searchProductType").val(), //产品代码
257 
+							productName: $("#searchProductName").val(), //产品名称
258 
+							productDate: $("#searchProductDate").val(), //生产日期
259 
+							batchNumber: $("#searchBatchNumber").val(), //产品编码
260 
+							manufacturer: $("#searchManufacturerName").val(), //生产厂家
261 
+							problemCode: $("#searchProblemCodeName").val(), //问题代码
262 
+							type: $("#searchOrderType").val(), //工单类别
263 
+							dealTimely: $("#searchDealTimely").val(), // 工单级别
264 
+							see: $("#searchSee").val(), //	处理专员是否只查看负责区域单子
265 
+							duplicatetime: $('#duplicateTime').val() && $('#duplicateTime').val().split(' ~ ')[0], //重复投诉开始时间
266 
+							endduplicatetime: $('#duplicateTime').val() && $('#duplicateTime').val().split(' ~ ')[1], //重复投诉结束时间
267 
+							reminder: $("#searchReminder").val(), //是否催单
268 
+							incomplete: $("#searchComplete").val(), //是否完善
269 
+							pageindex: params.pageNumber, //页码
270 
+							pagesize: params.pageSize, //条数
271 
+						};
272 
+						return param;
273 
+					},
274 
+					onLoadSuccess: function() { //加载成功时执行
275 
+						//layer.msg("加载成功");
276 
+						getLoginPersonNow();
277 
+					},
278 
+					onLoadError: function() { //加载失败时执行
279 
+						//layer.msg("加载数据失败", { time: 1500, icon: 2 });
280 
+					}
281 
+				});
282 
+			}
283 
+		</script>
284 
+	</body>
285 
+
286 
+</html>

+ 19 - 1
CallCenterWeb.UI/js/WorkOrder/WorkOrder.js
Просмотреть файл 

@@ -510,6 +510,14 @@ function formatterOprateDispose(val, row) {
510 510 
 		'</ul>';
511 511 
 }
512 512
513 
+//格式化操作 （已办待审核）
514 
+function formatterReview(val,row){
515 
+	return '<ul class="tool_downs">' +
516 
+		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_return_' + row.F_Id + '" onclick="btn_review(\'' + row.F_Id + '\')" title="审核">审核</a></li>' +
517 
+		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_reminder_' + row.F_Id + '" onclick="btn_reminder(\'' + row.F_Id + '\', 2)" title="完善">完善</a></li>' +
518 
+		'</ul>';
519 
+}
520 
+
513 521 
 //格式化操作 （已处理）
514 522 
 function formatterProcessed(val, row) {
515 523 
 	return '<ul class="tool_downs">' +
 
@@ -677,7 +685,7 @@ function btn_dealWith(id, type) {
677 685 
 	});
678 686 
 }
679 687
680 
-//退单
688 
+	//	退单
681 689 
 function btn_return(id){
682 690 
 	layer.open({
683 691 
 		type: 2,
 
@@ -687,6 +695,16 @@ function btn_return(id){
687 695 
 		content: "../WorkOrder/WorkOrderReturn.html?id=" + id
688 696 
 	});
689 697 
 }
698 
+	//	审核
699 
+function btn_review(id){
700 
+	layer.open({
701 
+		type: 2,
702 
+		title: '审核',
703 
+		maxmin: true, //开启最大化最小化按钮
704 
+		area: ['40%', '40%'],
705 
+		content: "../WorkOrder/WorkOrderReturn.html?id=" + id
706 
+	});
707 
+}
690 708
691 709 
 //减免工单
692 710 
 function btn_reduction(id){

+ 0 - 43
CallCenterWeb.UI/js/WorkOrder/WorkOrderReturn.js
Просмотреть файл 

@@ -1,43 +0,0 @@
1 
-var id = helper.request.queryString("id");
2 
-$(document).ready(function () {
3 
-    //保存
4 
-    $('.customerSubmit').click(function() {
5 
-        saveCustomer();
6 
-    });
7 
-})
8 
-
9 
-//保存
10 
-function saveCustomer() {
11 
-    $.ajax({
12 
-        type: "post",
13 
-        url: huayi.config.callcenter_url + "WorkOrder/Return",
14 
-        dataType: 'json',
15 
-        async: true,
16 
-        beforeSend: function() { //触发ajax请求开始时执行
17 
-            $('.customerSubmit').attr("disabled", true);
18 
-            $('.customerSubmit').text('确定中...');
19 
-        },
20 
-        data: {
21 
-            token: $.cookie("token"),
22 
-            id: id,
23 
-            cont: $('#cont').val(), //提交内容
24 
-        },
25 
-        success: function(data) {
26 
-            if (data.state.toLowerCase() == 'success') {
27 
-                $('.customerSubmit').attr("disabled", false);
28 
-	            $('.customerSubmit').text('确定');
29 
-            	var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
30 
-				parent.layer.close(index); //再执行关闭
31 
-				parent.layer.msg("保存成功！");
32 
-//				parent.$('#workorderlist').bootstrapTable('refresh');
33 
-//				parent.$('#workorderlist_').bootstrapTable('refresh');
34 
-//				parent.$('#orderlist').bootstrapTable('refresh');
35 
-				parent.initTable();
36 
-            } else {
37 
-            	$('.customerSubmit').attr("disabled", false);
38 
-	            $('.customerSubmit').text('确定');
39 
-            }
40 
-        }
41 
-    });
42 
-
43 
-}

+ 1 - 1
CallCenterWeb.UI/js/contabs.min.js
Просмотреть файл 

@@ -302,7 +302,7 @@ var p = '<a href="javascript:;" class="active J_menuTab" data-id="' + o + '">' +
302 302
303 303 
 function closeScreen() {
304 304 
 		var _this
305 
-		debugger
305 
+
306 306 
 		$(".J_menuTabs  .J_menuTab").each(function(e){
307 307 
 			console.log()
308 308 
 			if($(".J_menuTabs  .J_menuTab").eq(e).hasClass("active")){

+ 2 - 2
双汇APP-andriod/js/huayi.config.js
Просмотреть файл 

@@ -2,9 +2,9 @@ if(huayi == undefined) {
2 2 
 	var huayi = {};
3 3 
 }
4 4 
 huayi.config = {
5 
-	 callcenter_url: "http://oa.shuanghui.net:8046/",//生产环境
5 
+	 // callcenter_url: "https://shouhouapi.shuanghui.net/",//生产环境
6 6 
 	//callcenter_url: "http://121.196.219.217:8046/",//生产环境
7 
-	// callcenter_url: "http://192.168.8.9:1001/",//生产环境
7 
+	callcenter_url: "http://192.168.8.9:1001/",//生产环境
8 8 
 	socket_ip: "222.143.137.63", //ip
9 9 
 	socket_port: "8081", //端口
10 10 
 	indexOutTime: 2000, //菜单工单数量刷新间隔

+ 2 - 2
双汇APP-andriod/manifest.json
Просмотреть файл 

@@ -3,8 +3,8 @@
3 3 
     "id" : "H5B42FA92", /*应用的标识，创建应用时自动生成，勿手动修改*/
4 4 
     "name" : "双汇售后服务平台", /*应用名称，程序桌面图标名称*/
5 5 
     "version" : {
6 
-        "name" : "1.8.7", /*应用版本名称*/
7 
-        "code" : 87
6 
+        "name" : "1.8.9", /*应用版本名称*/
7 
+        "code" : 89
8 8 
     },
9 9 
     "description" : "", /*应用描述信息*/
10 10 
     "icons" : {

+ 10 - 0
双汇APP-andriod/personal.html
Просмотреть файл 

@@ -91,6 +91,15 @@
91 91 
 					<div class="stateIcon CLZ"></div>
92 92 
 				</li>
93 93 
 				<li class="mui-table-view-cell mui-media mui-col-xs-4 mui-col-sm-4">
94 
+					<a href="javascript:;" class="work-list" index="12">
95 
+						<div class="Icon icon-1">
96 
+							<img src="img/icon-8.png" />
97 
+							</i>
98 
+						</div>
99 
+						<div class="mui-media-body font-weight-bold">已办待审核</div>
100 
+					</a>
101 
+				</li>
102 
+				<li class="mui-table-view-cell mui-media mui-col-xs-4 mui-col-sm-4">
94 103 
 					<a href="javascript:;" class="work-list" index="5">
95 104 
 						<div class="Icon icon-5">
96 105 
 							<img src="img/icon-5.png" />
 
@@ -367,6 +376,7 @@
367 376 
 					</a>
368 377 
 				</li>
369 378 
 			</ul>
379 
+
370 380 
 			<div class='Content orderClass'>
371 381 
 				<div class="Content-title">
372 382 
 					<h5>

+ 227 - 0
双汇APP-andriod/workOrder/Work-review.html
Просмотреть файл 

@@ -0,0 +1,227 @@
1 
+<!doctype html>
2 
+<html lang="en" class="feedback">
3 
+
4 
+	<head>
5 
+		<meta charset="UTF-8" />
6 
+		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
7 
+		<title>工单处理</title>
8 
+		<link rel="stylesheet" type="text/css" href="../css/mui.min.css" />
9 
+		<link rel="stylesheet" type="text/css" href="../css/feedback.css" />
10 
+		<link rel="stylesheet" type="text/css" href="../css/mui.picker.min.css" />
11 
+		<link href="../css/feedback-page.css" rel="stylesheet" />
12 
+		<style>
13 
+			p {
14 
+				font-size: 16px;
15 
+				color: #fe6604;
16 
+			}
17 
+
18 
+			.mui-bar-nav {
19 
+				background: #cd0000 !important;
20 
+				color: #fff!important;
21 
+			}
22 
+
23 
+			.mui-bar-popover {
24 
+				width: 30%;
25 
+			}
26 
+
27 
+			.mui-popover.mui-bar-popover .mui-table-view {
28 
+				width: 100%;
29 
+			}
30 
+
31 
+			.mui-table-view .mui-table-view-cell>a:not(.mui-btn) {
32 
+				text-align: center;
33 
+			}
34 
+
35 
+			.mui-table-view-cell {
36 
+				padding: 1px 15px!important;
37 
+			}
38 
+
39 
+			.san {
40 
+				font-size: 14px;
41 
+				margin-right: 5px
42 
+			}
43 
+
44 
+			.nav_a {
45 
+				border-right: 1px solid #ccc;
46 
+			}
47 
+
48 
+			.radio_box {
49 
+				display: inline-block;
50 
+			}
51 
+
52 
+			.mui-radio input[type=radio]:before {
53 
+				font-size: 20px;
54 
+				vertical-align: middle;
55 
+			}
56 
+
57 
+			.mui-radio.mui-left input[type=radio] {
58 
+				line-height: 24px!important;
59 
+			}
60 
+
61 
+			.mui-radio.mui-left label {
62 
+				padding-right: 1px!important;
63 
+				padding-left: 51px!important;
64 
+			}
65 
+
66 
+			.ztext {
67 
+				width: 100%;
68 
+				margin: 0;
69 
+				border: 0;
70 
+			}
71 
+
72 
+			.action {
73 
+				padding: 5px 15px;
74 
+			}
75 
+
76 
+			.type_down {
77 
+				float: right!important;
78 
+				display: inline-block!important;
79 
+				vertical-align: middle!important;
80 
+				line-height: 42px;
81 
+			}
82 
+
83 
+			.type_con {
84 
+				width: 55%!important;
85 
+				float: left!important;
86 
+				vertical-align: middle!important;
87 
+				display: inline-block!important;
88 
+				padding: 10px 0!important;
89 
+			}
90 
+
91 
+			.label {
92 
+				width: 30%!important;
93 
+				padding: 11px 0px!important;
94 
+			}
95 
+
96 
+			.get_yzm {
97 
+				padding: 5px!important;
98 
+				width: auto!important;
99 
+			}
100 
+
101 
+			.yzm_con {
102 
+				float: left!important;
103 
+				width: 40%!important;
104 
+			}
105 
+
106 
+			.mui-bar-nav {
107 
+				background-color: #00a1cb;
108 
+			}
109 
+
110 
+			.mui-input-row label {
111 
+				text-align: -webkit-right;
112 
+			}
113 
+
114 
+			.mui-btn-block {
115 
+				padding: 10px;
116 
+				width: 100%;
117 
+			}
118 
+			.labels {
119 
+				color: #fe6604;
120 
+			}
121 
+			#imgs {
122 
+				overflow: hidden;
123 
+			}
124 
+			#imgs li{
125 
+				margin: 5px;
126 
+				width: 80px;
127 
+				float: left;
128 
+			}
129 
+			#imgs li .img_div {
130 
+				height: 100px;
131 
+			}
132 
+
133 
+			#imgs li .img_div img {
134 
+				width: 70px;
135 
+				height: 70px;
136 
+				display: block;
137 
+			}
138 
+
139 
+			#imgs li .img_div span {
140 
+				display: block;
141 
+			}
142 
+		</style>
143 
+	</head>
144 
+
145 
+	<body>
146 
+		<header class="mui-bar mui-bar-nav" style="">
147 
+			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left" style="color: #fff;"></a>
148 
+			<h1 class="mui-title" style="color: #fff;">工单审核</h1>
149 
+		</header>
150 
+		<div class="mui-content">
151 
+			<ul class="mui-table-view">
152 
+				<li class="mui-table-view-cell" >
153 
+					<div class="mui-input-row">
154 
+						<label class="label labels">是否同意：</label>
155 
+						<div class="mui-input-row mui-radio mui-left radio_box">
156 
+							<label>是</label>
157 
+							<input type="radio" name="secret" checked="checked" value="1" />
158 
+						</div>
159 
+						<div class="mui-input-row mui-radio mui-left radio_box">
160 
+							<label>否</label>
161 
+							<input type="radio" name="secret" value="0" />
162 
+						</div>
163 
+					</div>
164 
+				</li>
165 
+				<li class="mui-table-view-cell">
166 
+					<div class="mui-input-row">
167 
+						<label class="label labels">处理内容：</label>
168 
+						<textarea class="ztext content" name="" id="result" rows="3" cols="" placeholder="请详细描述您的问题和建议..."></textarea>
169 
+					</div>
170 
+				</li>
171 
+			</ul>
172 
+
173 
+			<div class="" style="padding: 10px;">
174 
+				<br />
175 
+				<button id="submit" type="button" class="mui-btn mui-btn-block mui-btn-danger submit">保存</button>
176 
+			</div>
177 
+		</div>
178 
+		<script src="../js/huayi.config.js"></script>
179 
+		<script src="../js/zepto.js"></script>
180 
+		<script src="../js/mui.min.js"></script>
181 
+		<script src="../js/mui.picker.min.js"></script>
182 
+		<script type="text/javascript">
183 
+			mui.init();
184 
+			mui.plusReady(function() {
185 
+				var urlParams = plus.webview.currentWebview();
186 
+			    var vText = urlParams.name;
187 
+				var orderState = urlParams.orderState; // 普通工单
188 
+				var token = urlParams.token;　
189 
+
190 
+				document.getElementById("submit").addEventListener('tap', function() {
191 
+
192 
+					if(!$("#result").val()) {
193 
+						mui.alert('输入处理内容');
194 
+					} else {
195 
+						$.ajax({
196 
+							url:huayi.config.callcenter_url + 'WorkorderApp/ReviewWorkOrder',
197 
+							data: {
198 
+								id: vText,
199 
+								cont: $("#result").val(), //处理结果
200 
+								state: $('input[name="secret"]:checked').val(),
201 
+								token: token
202 
+							},
203 
+							dataType: 'json', //服务器返回json格式数据
204 
+							type: 'post', //HTTP请求类型
205 
+							timeout: 10000, //超时时间设置为10秒；
206 
+							success: function(data) {
207 
+								if(data.state == "success") {
208 
+									mui.toast('处理成功');
209 
+									$("#result").val('');
210 
+									var wobj = plus.webview.getWebviewById("Work-list");
211 
+									wobj.reload(true);
212 
+								} else {
213 
+									mui.alert(data.message);
214 
+								}
215 
+							},
216 
+							error: function(xhr, type, errorThrown) {
217 
+								mui.alert('失败');
218 
+							}
219 
+						});
220 
+
221 
+					}
222 
+				})
223 
+			})
224 
+		</script>
225 
+	</body>
226 
+
227 
+</html>

+ 3 - 1
双汇APP-andriod/workOrder/js/Work-list.js
Просмотреть файл 

@@ -35,7 +35,9 @@ window.onload = function() {
35 35 
 			$(".Totle-box").text('已处理')
36 36 
 		} else if(index == 11) {
37 37 
 			$(".Totle-box").text('咨询')
38 
-		}else if(index == -1) {
38 
+		} else if(index == 12) {
39 
+			$(".Totle-box").text('已办待审核')
40 
+		} else if(index == -1) {
39 41 
 			$(".Totle-box").text('查询')
40 42 
 			comprehensive = 0
41 43 
 		}else if(index == 99) {

+ 33 - 6
双汇APP-andriod/workOrder/js/detail.js
Просмотреть файл 

@@ -48,6 +48,8 @@ mui.plusReady(function() {
48 48 
 				States="退回待提交"
49 49 
 			}else if (Data[0].F_State==10) {
50 50 
 				States="已处理"
51 
+			}else if (Data[0].F_State==11) {
52 
+				States="已办待审核"
51 53 
 			}
52 54 
 			orderState=Data[0].F_State;
53 55 
 			document.getElementById("F_State").innerHTML = States; //工单状态
 
@@ -212,9 +214,11 @@ mui.plusReady(function() {
212 214 
 						signFun(); //标记
213 215 
 					} else if(a == 9) {
214 216 
 						remind(); //标记
215 
-					}else if(a == 10) {
216 
-            completeFun()
217 
-          }
217 
+					} else if(a == 10) {
218 
+						completeFun()
219 
+					} else if(a == 11) {
220 
+						reviewFun()
221 
+					}
218 222 
 				})
219 223 
 			}
220 224 
 //			if (classImport) {
 
@@ -328,7 +332,7 @@ mui.plusReady(function() {
328 332 
 			}
329 333 
 		});
330 334 
 	}
331 
-//	指派
335 
+	//	指派
332 336 
 	function appointFun() {
333 337 
 		mui.openWindow({
334 338 
 			id: 'Work-appoint',
 
@@ -350,7 +354,7 @@ mui.plusReady(function() {
350 354 
 			}
351 355 
 		});
352 356 
 	}
353 
-//	处理
357 
+	//	处理
354 358 
 	function disposeFun() {
355 359 
 		mui.openWindow({
356 360 
 			id: 'Work-dispose',
 
@@ -372,8 +376,31 @@ mui.plusReady(function() {
372 376 
 				token: token
373 377 
 			}
374 378 
 		});
379 
+	}
380 
+	//	审核
381 
+	function reviewFun() {
382 
+		mui.openWindow({
383 
+			id: 'Work-review',
384 
+			url: 'Work-review.html',
385 
+			createNew:true,
386 
+			show: {
387 
+				aniShow: 'pop-in'
388 
+			},
389 
+			styles: {
390 
+				popGesture: 'hide'
391 
+			},
392 
+			waiting: {
393 
+				autoShow: true
394 
+			},
395 
+			extras: {
396 
+				name: vText,
397 
+				classImport: classImport, //区分工单等级列表参数
398 
+				orderState:orderState,
399 
+				token: token
400 
+			}
401 
+		});
375 402 
 	}
376 
-//	标记
403 
+	//	标记
377 404 
 	function signFun() {
378 405 
 		mui.openWindow({
379 406 
 			id: 'Work-sign',

+ 10 - 2
双汇APP-h5/index.html
Просмотреть файл 

@@ -94,6 +94,15 @@
94 94 
 					<div class="stateIcon CLZ"></div>
95 95 
 				</li>
96 96 
 				<li class="mui-table-view-cell mui-media mui-col-xs-4 mui-col-sm-4">
97 
+					<a href="javascript:;" class="work-list" index="12">
98 
+						<div class="Icon icon-1">
99 
+							<img src="img/icon-8.png" />
100 
+							</i>
101 
+						</div>
102 
+						<div class="mui-media-body font-weight-bold">已办待审核</div>
103 
+					</a>
104 
+				</li>
105 
+				<li class="mui-table-view-cell mui-media mui-col-xs-4 mui-col-sm-4">
97 106 
 					<a href="javascript:;" class="work-list" index="5">
98 107 
 						<div class="Icon icon-5">
99 108 
 							<img src="img/icon-5.png" />
 
@@ -153,7 +162,6 @@
153 162 
 					</a>
154 163 
 				</li>
155 164 
 			</ul>
156 
-
157 165 
 			<!--客服-->
158 166 
 			<ul class="mui-table-view mui-grid-view mui-grid-9 Common-box RoleCode_1" style="display:none;">
159 167 
 				<li class="mui-table-view-cell mui-media mui-col-xs-4 mui-col-sm-4">
 
@@ -273,7 +281,7 @@
273 281 
 					</a>
274 282 
 				</li>
275 283 
 			</ul>
276 
-			<!--业务员-->
284 
+			<!-- -->
277 285 
 			<ul class="mui-table-view mui-grid-view mui-grid-9 Common-box RoleCode_3" style="display:none;">
278 286 
 				<li class="mui-table-view-cell mui-media mui-col-xs-4 mui-col-sm-4">
279 287 
 					<a href="javascript:;" class="work-list" index="3">

+ 4 - 3
双汇APP-h5/js/huayi.config.js
Просмотреть файл 

@@ -2,9 +2,10 @@ if(huayi == undefined) {
2 2 
 	var huayi = {};
3 3 
 }
4 4 
 huayi.config = {
5 
-	  callcenter_url: "http://oa.shuanghui.net:8046/",//生产环境
6 
-	//callcenter_url: "http://121.196.219.217:8046/",//生产环境
7 
-	// callcenter_url: "http://192.168.8.9:1001/",//生产环境
5 
+	// callcenter_url: "https://shouhouapi.shuanghui.net/",//生产环境
6 
+	// callcenter_url: "http://oa.shuanghui.net:8046/",//生产环境
7 
+	// callcenter_url: "http://121.196.219.217:8046/",//生产环境
8 
+	callcenter_url: "http://192.168.8.9:1001/",//生产环境
8 9 
 	socket_ip: "222.143.137.63", //ip
9 10 
 	socket_port: "8081", //端口
10 11 
 	indexOutTime: 2000, //菜单工单数量刷新间隔

+ 1 - 1
双汇APP-h5/js/personal.js
Просмотреть файл 

@@ -67,7 +67,7 @@ $.ajax({
67 67 
 			}
68 68
69 69
70 
-			if (['XTGLY', 'ZR','CLZY'].includes(role)) {
70 
+			if (['XTGLY', 'ZR','CLZY','DQJL','BSCJL','DQYWZG'].includes(role)) {
71 71 
 				console.log(role, 'RoleCode')
72 72 
 				$('.statics-icon').css('display', '')
73 73 
 			}

+ 241 - 0
双汇APP-h5/workOrder/Work-review.html
Просмотреть файл 

@@ -0,0 +1,241 @@
1 
+<!doctype html>
2 
+<html lang="en" class="feedback">
3 
+
4 
+	<head>
5 
+		<meta charset="UTF-8" />
6 
+		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
7 
+		<title>工单处理</title>
8 
+		<link rel="stylesheet" type="text/css" href="../css/mui.min.css" />
9 
+		<link rel="stylesheet" type="text/css" href="../css/feedback.css" />
10 
+		<link rel="stylesheet" type="text/css" href="../css/mui.picker.min.css" />
11 
+		<link href="../css/feedback-page.css" rel="stylesheet" />
12 
+		<style>
13 
+			p {
14 
+				font-size: 16px;
15 
+				color: #fe6604;
16 
+			}
17 
+
18 
+			.mui-bar-nav {
19 
+				background: #cd0000 !important;
20 
+				color: #fff!important;
21 
+			}
22 
+
23 
+			.mui-bar-popover {
24 
+				width: 30%;
25 
+			}
26 
+
27 
+			.mui-popover.mui-bar-popover .mui-table-view {
28 
+				width: 100%;
29 
+			}
30 
+
31 
+			.mui-table-view .mui-table-view-cell>a:not(.mui-btn) {
32 
+				text-align: center;
33 
+			}
34 
+
35 
+			.mui-table-view-cell {
36 
+				padding: 1px 15px!important;
37 
+			}
38 
+
39 
+			.san {
40 
+				font-size: 14px;
41 
+				margin-right: 5px
42 
+			}
43 
+
44 
+			.nav_a {
45 
+				border-right: 1px solid #ccc;
46 
+			}
47 
+
48 
+			.radio_box {
49 
+				display: inline-block;
50 
+			}
51 
+
52 
+			.mui-radio input[type=radio]:before {
53 
+				font-size: 20px;
54 
+				vertical-align: middle;
55 
+			}
56 
+
57 
+			.mui-radio.mui-left input[type=radio] {
58 
+				line-height: 24px!important;
59 
+			}
60 
+
61 
+			.mui-radio.mui-left label {
62 
+				padding-right: 1px!important;
63 
+				padding-left: 51px!important;
64 
+			}
65 
+
66 
+			.ztext {
67 
+				width: 100%;
68 
+				margin: 0;
69 
+				border: 0;
70 
+			}
71 
+
72 
+			.action {
73 
+				padding: 5px 15px;
74 
+			}
75 
+
76 
+			.type_down {
77 
+				float: right!important;
78 
+				display: inline-block!important;
79 
+				vertical-align: middle!important;
80 
+				line-height: 42px;
81 
+			}
82 
+
83 
+			.type_con {
84 
+				width: 55%!important;
85 
+				float: left!important;
86 
+				vertical-align: middle!important;
87 
+				display: inline-block!important;
88 
+				padding: 10px 0!important;
89 
+			}
90 
+
91 
+			.label {
92 
+				width: 30%!important;
93 
+				padding: 11px 0px!important;
94 
+			}
95 
+
96 
+			.get_yzm {
97 
+				padding: 5px!important;
98 
+				width: auto!important;
99 
+			}
100 
+
101 
+			.yzm_con {
102 
+				float: left!important;
103 
+				width: 40%!important;
104 
+			}
105 
+
106 
+			.mui-bar-nav {
107 
+				background-color: #00a1cb;
108 
+			}
109 
+
110 
+			.mui-input-row label {
111 
+				text-align: -webkit-right;
112 
+			}
113 
+
114 
+			.mui-btn-block {
115 
+				padding: 10px;
116 
+				width: 100%;
117 
+			}
118 
+			.labels {
119 
+				color: #fe6604;
120 
+			}
121 
+			#imgs {
122 
+				overflow: hidden;
123 
+			}
124 
+			#imgs li{
125 
+				margin: 5px;
126 
+				width: 80px;
127 
+				float: left;
128 
+			}
129 
+			#imgs li .img_div {
130 
+				height: 100px;
131 
+			}
132 
+
133 
+			#imgs li .img_div img {
134 
+				width: 70px;
135 
+				height: 70px;
136 
+				display: block;
137 
+			}
138 
+
139 
+			#imgs li .img_div span {
140 
+				display: block;
141 
+			}
142 
+		</style>
143 
+	</head>
144 
+
145 
+	<body>
146 
+		<header class="mui-bar mui-bar-nav" style="">
147 
+			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left" style="color: #fff;"></a>
148 
+			<h1 class="mui-title" style="color: #fff;">工单审核</h1>
149 
+		</header>
150 
+		<div class="mui-content">
151 
+			<ul class="mui-table-view">
152 
+				<li class="mui-table-view-cell" >
153 
+					<div class="mui-input-row">
154 
+						<label class="label labels">是否同意：</label>
155 
+						<div class="mui-input-row mui-radio mui-left radio_box">
156 
+							<label>是</label>
157 
+							<input type="radio" name="secret" checked="checked" value="1" />
158 
+						</div>
159 
+						<div class="mui-input-row mui-radio mui-left radio_box">
160 
+							<label>否</label>
161 
+							<input type="radio" name="secret" value="0" />
162 
+						</div>
163 
+					</div>
164 
+				</li>
165 
+				<li class="mui-table-view-cell">
166 
+					<div class="mui-input-row">
167 
+						<label class="label labels">处理内容：</label>
168 
+						<textarea class="ztext content" name="" id="result" rows="3" cols="" placeholder="请详细描述您的问题和建议..."></textarea>
169 
+					</div>
170 
+				</li>
171 
+
172 
+			</ul>
173 
+
174 
+
175 
+			<div class="" style="padding: 10px;">
176 
+				<br />
177 
+				<button id="submit" type="button" class="mui-btn mui-btn-block mui-btn-danger submit">保存</button>
178 
+
179 
+			</div>
180 
+		</div>
181 
+		<script src="../js/huayi.config.js"></script>
182 
+		<script src="../js/zepto.js"></script>
183 
+		<script src="../js/mui.min.js"></script>
184 
+		<script src="../js/mui.picker.min.js"></script>
185 
+		<script type="text/javascript">
186 
+			mui.init();
187 
+			mui.ready(function() {
188 
+				var urlParams = new URLSearchParams(window.location.search);
189 
+			    var vText = urlParams.get('name');
190 
+				var orderState = urlParams.get('index'); // 普通工单
191 
+				var token = localStorage.getItem("token");　
192 
+
193 
+				document.getElementById("submit").addEventListener('tap', function() {
194 
+
195 
+					if(!$("#result").val()) {
196 
+						mui.alert('输入处理内容');
197 
+					} else {
198 
+						$.ajax({
199 
+							url:huayi.config.callcenter_url + 'WorkorderApp/ReviewWorkOrder',
200 
+							data: {
201 
+								id: vText,
202 
+								cont: $("#result").val(), //处理结果
203 
+								state: $('input[name="secret"]:checked').val(),
204 
+								token: token
205 
+							},
206 
+							dataType: 'json', //服务器返回json格式数据
207 
+							type: 'post', //HTTP请求类型
208 
+							timeout: 10000, //超时时间设置为10秒；
209 
+							success: function(data) {
210 
+								if(data.state == "success") {
211 
+									mui.toast('处理成功');
212 
+									$("#result").val('');
213 
+									var resultId = ''
214 
+									var resultUrl = ''
215 
+									if (orderState) {
216 
+										resultId = 'Work-list'
217 
+										resultUrl = 'Work-list.html?index='+orderState
218 
+									}
219 
+
220 
+									mui.openWindow({
221 
+										id: resultId,
222 
+										url: resultUrl,
223 
+										createNew:true,
224 
+									});
225 
+									// wobj.reload(true);
226 
+								} else {
227 
+									mui.alert(data.message);
228 
+								}
229 
+							},
230 
+							error: function(xhr, type, errorThrown) {
231 
+								mui.alert('失败');
232 
+							}
233 
+						});
234 
+
235 
+					}
236 
+				})
237 
+			})
238 
+		</script>
239 
+	</body>
240 
+
241 
+</html>

+ 3 - 1
双汇APP-h5/workOrder/js/Work-list.js
Просмотреть файл 

@@ -35,7 +35,9 @@ window.onload = function() {
35 35 
 			$(".Totle-box").text('已处理')
36 36 
 		} else if(index == 11) {
37 37 
 			$(".Totle-box").text('咨询')
38 
-		}else if(index == -1) {
38 
+		} else if(index == 12) {
39 
+			$(".Totle-box").text('已办待审核')
40 
+		} else if(index == -1) {
39 41 
 			$(".Totle-box").text('查询')
40 42 
 			comprehensive = 0
41 43 
 		}else if(index == 99) {

+ 14 - 5
双汇APP-h5/workOrder/js/detail.js
Просмотреть файл 

@@ -57,6 +57,8 @@ mui.ready(function() {
57 57 
 				States="退回待提交"
58 58 
 			}else if (Data[0].F_State==10) {
59 59 
 				States="已处理"
60 
+			}else if (Data[0].F_State==11) {
61 
+				States="已办待审核"
60 62 
 			}
61 63 
 			orderState=Data[0].F_State;
62 64 
 			document.getElementById("F_State").innerHTML = States; //工单状态
 
@@ -222,9 +224,12 @@ mui.ready(function() {
222 224 
 						signFun(); //标记
223 225 
 					} else if(a == 9) {
224 226 
 						remind(); //标记
225 
-					}else if(a == 10) {
227 
+					} else if(a == 10) {
226 228 
 						completeFun()
229 
+					} else if(a == 11) {
230 
+						reviewFun()
227 231 
 					}
232 
+
228 233 
 				})
229 234 
 			}
230 235 
 //			if (importClass) {
 
@@ -281,6 +286,7 @@ mui.ready(function() {
281 286 
 			}
282 287 
 		})
283 288 
 	}
289 
+
284 290 
 	function getTargetUrl(url){
285 291 
 		var resultUrl = ''
286 292 
 		if(importClass){
 
@@ -307,17 +313,20 @@ mui.ready(function() {
307 313 
 	function submitFun() {
308 314 
 		getTargetUrl('Work-assign')
309 315 
 	}
310 
-//	指派
316 
+	//	指派
311 317 
 	function appointFun() {
312 318 
 		getTargetUrl('Work-appoint')
313 319
314 320 
 	}
315 
-//	处理
321 
+	//	处理
316 322 
 	function disposeFun() {
317 323 
 		getTargetUrl('Work-dispose')
318 
-
319 324 
 	}
320 
-//	标记
325 
+	//	审核
326 
+	function reviewFun() {
327 
+		getTargetUrl('Work-review')
328 
+	}
329 
+	//	标记
321 330 
 	function signFun() {
322 331 
 		getTargetUrl('Work-sign')
323 332 
 	}

+ 1 - 1
双汇APP/js/huayi.config.js
Просмотреть файл 

@@ -2,7 +2,7 @@ if(huayi == undefined) {
2 2 
 	var huayi = {};
3 3 
 }
4 4 
 huayi.config = {
5 
-	callcenter_url: "http://oa.shuanghui.net:8046/",//生产环境
5 
+	callcenter_url: "https://shouhouapi.shuanghui.net/",//生产环境
6 6 
 	// callcenter_url: "http://121.196.219.217:8046/",//生产环境
7 7 
 	// callcenter_url: "http://192.168.8.9:1001/",//生产环境
8 8 
 	socket_ip: "222.143.137.63", //ip

+ 2 - 2
双汇APP/manifest.json
Просмотреть файл 

@@ -3,8 +3,8 @@
3 3 
     "id" : "H5BFC9619", /*应用的标识，创建应用时自动生成，勿手动修改*/
4 4 
     "name" : "双汇售后服务平台", /*应用名称，程序桌面图标名称*/
5 5 
     "version" : {
6 
-        "name" : "1.8.7", /*应用版本名称*/
7 
-        "code" : 87
6 
+        "name" : "1.8.8", /*应用版本名称*/
7 
+        "code" : 88
8 8 
     },
9 9 
     "description" : "", /*应用描述信息*/
10 10 
     "icons" : {

+ 9 - 0
双汇APP/personal.html
Просмотреть файл 

@@ -89,6 +89,15 @@
89 89 
 					<div class="stateIcon CLZ"></div>
90 90 
 				</li>
91 91 
 				<li class="mui-table-view-cell mui-media mui-col-xs-4 mui-col-sm-4">
92 
+					<a href="javascript:;" class="work-list" index="12">
93 
+						<div class="Icon icon-1">
94 
+							<img src="img/icon-8.png" />
95 
+							</i>
96 
+						</div>
97 
+						<div class="mui-media-body font-weight-bold">已办待审核</div>
98 
+					</a>
99 
+				</li>
100 
+				<li class="mui-table-view-cell mui-media mui-col-xs-4 mui-col-sm-4">
92 101 
 					<a href="javascript:;" class="work-list" index="5">
93 102 
 						<div class="Icon icon-5">
94 103 
 							<img src="img/icon-5.png" />

+ 227 - 0
双汇APP/workOrder/Work-review.html
Просмотреть файл 

@@ -0,0 +1,227 @@
1 
+<!doctype html>
2 
+<html lang="en" class="feedback">
3 
+
4 
+	<head>
5 
+		<meta charset="UTF-8" />
6 
+		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
7 
+		<title>工单处理</title>
8 
+		<link rel="stylesheet" type="text/css" href="../css/mui.min.css" />
9 
+		<link rel="stylesheet" type="text/css" href="../css/feedback.css" />
10 
+		<link rel="stylesheet" type="text/css" href="../css/mui.picker.min.css" />
11 
+		<link href="../css/feedback-page.css" rel="stylesheet" />
12 
+		<style>
13 
+			p {
14 
+				font-size: 16px;
15 
+				color: #fe6604;
16 
+			}
17 
+
18 
+			.mui-bar-nav {
19 
+				background: #cd0000 !important;
20 
+				color: #fff!important;
21 
+			}
22 
+
23 
+			.mui-bar-popover {
24 
+				width: 30%;
25 
+			}
26 
+
27 
+			.mui-popover.mui-bar-popover .mui-table-view {
28 
+				width: 100%;
29 
+			}
30 
+
31 
+			.mui-table-view .mui-table-view-cell>a:not(.mui-btn) {
32 
+				text-align: center;
33 
+			}
34 
+
35 
+			.mui-table-view-cell {
36 
+				padding: 1px 15px!important;
37 
+			}
38 
+
39 
+			.san {
40 
+				font-size: 14px;
41 
+				margin-right: 5px
42 
+			}
43 
+
44 
+			.nav_a {
45 
+				border-right: 1px solid #ccc;
46 
+			}
47 
+
48 
+			.radio_box {
49 
+				display: inline-block;
50 
+			}
51 
+
52 
+			.mui-radio input[type=radio]:before {
53 
+				font-size: 20px;
54 
+				vertical-align: middle;
55 
+			}
56 
+
57 
+			.mui-radio.mui-left input[type=radio] {
58 
+				line-height: 24px!important;
59 
+			}
60 
+
61 
+			.mui-radio.mui-left label {
62 
+				padding-right: 1px!important;
63 
+				padding-left: 51px!important;
64 
+			}
65 
+
66 
+			.ztext {
67 
+				width: 100%;
68 
+				margin: 0;
69 
+				border: 0;
70 
+			}
71 
+
72 
+			.action {
73 
+				padding: 5px 15px;
74 
+			}
75 
+
76 
+			.type_down {
77 
+				float: right!important;
78 
+				display: inline-block!important;
79 
+				vertical-align: middle!important;
80 
+				line-height: 42px;
81 
+			}
82 
+
83 
+			.type_con {
84 
+				width: 55%!important;
85 
+				float: left!important;
86 
+				vertical-align: middle!important;
87 
+				display: inline-block!important;
88 
+				padding: 10px 0!important;
89 
+			}
90 
+
91 
+			.label {
92 
+				width: 30%!important;
93 
+				padding: 11px 0px!important;
94 
+			}
95 
+
96 
+			.get_yzm {
97 
+				padding: 5px!important;
98 
+				width: auto!important;
99 
+			}
100 
+
101 
+			.yzm_con {
102 
+				float: left!important;
103 
+				width: 40%!important;
104 
+			}
105 
+
106 
+			.mui-bar-nav {
107 
+				background-color: #00a1cb;
108 
+			}
109 
+
110 
+			.mui-input-row label {
111 
+				text-align: -webkit-right;
112 
+			}
113 
+
114 
+			.mui-btn-block {
115 
+				padding: 10px;
116 
+				width: 100%;
117 
+			}
118 
+			.labels {
119 
+				color: #fe6604;
120 
+			}
121 
+			#imgs {
122 
+				overflow: hidden;
123 
+			}
124 
+			#imgs li{
125 
+				margin: 5px;
126 
+				width: 80px;
127 
+				float: left;
128 
+			}
129 
+			#imgs li .img_div {
130 
+				height: 100px;
131 
+			}
132 
+
133 
+			#imgs li .img_div img {
134 
+				width: 70px;
135 
+				height: 70px;
136 
+				display: block;
137 
+			}
138 
+
139 
+			#imgs li .img_div span {
140 
+				display: block;
141 
+			}
142 
+		</style>
143 
+	</head>
144 
+
145 
+	<body>
146 
+		<header class="mui-bar mui-bar-nav" style="">
147 
+			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left" style="color: #fff;"></a>
148 
+			<h1 class="mui-title" style="color: #fff;">工单审核</h1>
149 
+		</header>
150 
+		<div class="mui-content">
151 
+			<ul class="mui-table-view">
152 
+				<li class="mui-table-view-cell" >
153 
+					<div class="mui-input-row">
154 
+						<label class="label labels">是否同意：</label>
155 
+						<div class="mui-input-row mui-radio mui-left radio_box">
156 
+							<label>是</label>
157 
+							<input type="radio" name="secret" checked="checked" value="1" />
158 
+						</div>
159 
+						<div class="mui-input-row mui-radio mui-left radio_box">
160 
+							<label>否</label>
161 
+							<input type="radio" name="secret" value="0" />
162 
+						</div>
163 
+					</div>
164 
+				</li>
165 
+				<li class="mui-table-view-cell">
166 
+					<div class="mui-input-row">
167 
+						<label class="label labels">处理内容：</label>
168 
+						<textarea class="ztext content" name="" id="result" rows="3" cols="" placeholder="请详细描述您的问题和建议..."></textarea>
169 
+					</div>
170 
+				</li>
171 
+			</ul>
172 
+
173 
+			<div class="" style="padding: 10px;">
174 
+				<br />
175 
+				<button id="submit" type="button" class="mui-btn mui-btn-block mui-btn-danger submit">保存</button>
176 
+			</div>
177 
+		</div>
178 
+		<script src="../js/huayi.config.js"></script>
179 
+		<script src="../js/zepto.js"></script>
180 
+		<script src="../js/mui.min.js"></script>
181 
+		<script src="../js/mui.picker.min.js"></script>
182 
+		<script type="text/javascript">
183 
+			mui.init();
184 
+			mui.plusReady(function() {
185 
+				var urlParams = plus.webview.currentWebview();
186 
+			    var vText = urlParams.name;
187 
+				var orderState = urlParams.orderState; // 普通工单
188 
+				var token = urlParams.token;　
189 
+
190 
+				document.getElementById("submit").addEventListener('tap', function() {
191 
+
192 
+					if(!$("#result").val()) {
193 
+						mui.alert('输入处理内容');
194 
+					} else {
195 
+						$.ajax({
196 
+							url:huayi.config.callcenter_url + 'WorkorderApp/ReviewWorkOrder',
197 
+							data: {
198 
+								id: vText,
199 
+								cont: $("#result").val(), //处理结果
200 
+								state: $('input[name="secret"]:checked').val(),
201 
+								token: token
202 
+							},
203 
+							dataType: 'json', //服务器返回json格式数据
204 
+							type: 'post', //HTTP请求类型
205 
+							timeout: 10000, //超时时间设置为10秒；
206 
+							success: function(data) {
207 
+								if(data.state == "success") {
208 
+									mui.toast('处理成功');
209 
+									$("#result").val('');
210 
+									var wobj = plus.webview.getWebviewById("Work-list");
211 
+									wobj.reload(true);
212 
+								} else {
213 
+									mui.alert(data.message);
214 
+								}
215 
+							},
216 
+							error: function(xhr, type, errorThrown) {
217 
+								mui.alert('失败');
218 
+							}
219 
+						});
220 
+
221 
+					}
222 
+				})
223 
+			})
224 
+		</script>
225 
+	</body>
226 
+
227 
+</html>

+ 3 - 1
双汇APP/workOrder/js/Work-list.js
Просмотреть файл 

@@ -33,7 +33,9 @@ window.onload = function() {
33 33 
 			$(".Totle-box").text('已处理')
34 34 
 		} else if(index == 11) {
35 35 
 			$(".Totle-box").text('咨询')
36 
-		}else if(index == -1) {
36 
+		} else if(index == 12) {
37 
+			$(".Totle-box").text('已办待审核')
38 
+		} else if(index == -1) {
37 39 
 			$(".Totle-box").text('查询')
38 40 
 			comprehensive = 0
39 41 
 		}else if(index == 99) {

+ 31 - 4
双汇APP/workOrder/js/detail.js
Просмотреть файл 

@@ -45,6 +45,8 @@ mui.plusReady(function() {
45 45 
 				States="退回待提交"
46 46 
 			}else if (Data[0].F_State==10) {
47 47 
 				States="已处理"
48 
+			}else if (Data[0].F_State==11) {
49 
+				States="已办待审核"
48 50 
 			}
49 51 
 			orderState=Data[0].F_State;
50 52 
 			document.getElementById("F_State").innerHTML = States; //工单状态
 
@@ -208,9 +210,11 @@ mui.plusReady(function() {
208 210 
 						signFun(); //标记
209 211 
 					} else if(a == 9) {
210 212 
 						remind(); //标记
211 
-					}else if(a == 10) {
212 
-            completeFun()
213 
-          }
213 
+					} else if(a == 10) {
214 
+						completeFun()
215 
+					}  else if(a == 11) {
216 
+						reviewFun()
217 
+					}
214 218 
 				})
215 219 
 			}
216 220 
 //			if (classImport) {
 
@@ -365,8 +369,31 @@ mui.plusReady(function() {
365 369 
 				token: token
366 370 
 			}
367 371 
 		});
372 
+	}
373 
+	//	审核
374 
+	function reviewFun() {
375 
+		mui.openWindow({
376 
+			id: 'Work-review',
377 
+			url: 'Work-review.html',
378 
+			createNew:true,
379 
+			show: {
380 
+				aniShow: 'pop-in'
381 
+			},
382 
+			styles: {
383 
+				popGesture: 'hide'
384 
+			},
385 
+			waiting: {
386 
+				autoShow: true
387 
+			},
388 
+			extras: {
389 
+				name: vText,
390 
+				classImport: classImport, //区分工单等级列表参数
391 
+				orderState:orderState,
392 
+				token: token
393 
+			}
394 
+		});
368 395 
 	}
369 
-//	标记
396 
+	//	标记
370 397 
 	function signFun() {
371 398 
 		mui.openWindow({
372 399 
 			id: 'Work-sign',