Home Explore Help
Register Sign In
duhongyu
/
ShuangHui_UI
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Commits 237 Releases 0 Wiki
Browse Source

审核功能

miaofuhao 2 months ago
parent
9092189320
commit
e9d6e9b2e5
22 changed files with 691 additions and 82 deletions
Split View Show Diff Stats
  1. 11 2
      CallCenterWeb.UI/WorkOrder/WorkOrderReview.html
  2. 138 0
      CallCenterWeb.UI/WorkOrder/WorkOrderAudit.html
  3. 295 0
      CallCenterWeb.UI/WorkOrder/WorkOrderAuditRejection.html
  4. 1 0
      CallCenterWeb.UI/WorkOrder/WorkOrderComplaintTracking.html
  5. 16 1
      CallCenterWeb.UI/WorkOrder/WorkOrderParty.html
  6. 1 0
      CallCenterWeb.UI/WorkOrder/WorkOrderSearch.html
  7. 33 9
      CallCenterWeb.UI/js/WorkOrder/WorkOrder.js
  8. 2 0
      双汇APP-andriod/js/personal.js
  9. 2 2
      双汇APP-andriod/manifest.json
  10. 18 9
      双汇APP-andriod/personal.html
  11. 1 1
      双汇APP-andriod/workOrder/Work-review.html
  12. 41 18
      双汇APP-andriod/workOrder/js/Work-list.js
  13. 2 2
      双汇APP-andriod/workOrder/js/detail.js
  14. 19 9
      双汇APP-h5/index.html
  15. 11 1
      双汇APP-h5/js/personal.js
  16. 6 2
      双汇APP-h5/workOrder/Work-review.html
  17. 36 8
      双汇APP-h5/workOrder/js/Work-list.js
  18. 9 3
      双汇APP-h5/workOrder/js/detail.js
  19. 2 0
      双汇APP/js/personal.js
  20. 18 10
      双汇APP/personal.html
  21. 1 1
      双汇APP/workOrder/Work-review.html
  22. 28 4
      双汇APP/workOrder/js/Work-list.js

+ 11 - 2
CallCenterWeb.UI/WorkOrder/WorkOrderReview.html
View File 

@@ -34,7 +34,7 @@
34 34 
 				<sapn><i class="syIcon"></i>位置：
35 35 
 					<a href="javaScript:;" id="ReIndex">首页</a>&gt;
36 36 
 					<a href="javaScript:;">工单管理</a>&gt;
37 
-					<a href="" class="nowPosition">已办待审核</a>
37 
+					<a href="" class="nowPosition">审核通过</a>
38 38 
 				</sapn>
39 39 
 			</div>
40 40 
 			<div class="dhRight">
 
@@ -152,6 +152,9 @@
152 152 
 								<option value="1">否</option>
153 153 
 							</select>
154 154 
 						</div>
155 
+						<div class="form-group">
156 
+							<input class="form-control" type="text" id="reviewNotes" placeholder="请输入审核内容">
157 
+						</div>
155 158 
 						<div class="form-group btn-position">
156 159 
 							<button class="btns ss">搜索</button>
157 160 
 							<button class="btns export">导出</button>
 
@@ -183,8 +186,12 @@
183 186 
 							<th data-field="F_ReceivingPerson" data-class="W80" data-align="center">接听人</th>
184 187 
 							<th data-field="F_DealResult" data-class="W240" data-formatter="formatterDealResult" data-align="center">落实情况</th>
185 188 
 							<th data-field="F_State" data-class="W100" data-formatter="workOrderStateJudge" data-align="center">处理进度</th>
189 
+
190 
+							<th data-field="F_ReviewStatus" data-class="W100" data-formatter="reviewStatusFormatter" data-align="center">审核状态</th>
191 
+							<th data-field="F_ReviewNotes" data-class="W240" data-formatter="reviewNotesFormatter" data-align="center">审核内容</th>
192 
+
186 193 
 							<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>
194 
+							<th data-field="F_WorkOrderId" data-class="workOprate workOprate6 W200" data-formatter="formatterProcessed"  data-align="center">操作</th>
188 195 
 						</tr>
189 196 
 					</thead>
190 197 
 				</table>
 
@@ -266,6 +273,8 @@
266 273 
 							endduplicatetime: $('#duplicateTime').val() && $('#duplicateTime').val().split(' ~ ')[1], //重复投诉结束时间
267 274 
 							reminder: $("#searchReminder").val(), //是否催单
268 275 
 							incomplete: $("#searchComplete").val(), //是否完善
276 
+							reviewStatus: 1,
277 
+							reviewNotes: $("#reviewNotes").val(),
269 278 
 							pageindex: params.pageNumber, //页码
270 279 
 							pagesize: params.pageSize, //条数
271 280 
 						};

+ 138 - 0
CallCenterWeb.UI/WorkOrder/WorkOrderAudit.html
View File 

@@ -0,0 +1,138 @@
1 
+<!DOCTYPE html>
2 
+<html>
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 
+
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>
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="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>
87 
+
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 
+			})
101 
+
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 
+				});
133 
+
134 
+			}
135 
+		</script>
136 
+	</body>
137 
+
138 
+</html>

+ 295 - 0
CallCenterWeb.UI/WorkOrder/WorkOrderAuditRejection.html
View File 

@@ -0,0 +1,295 @@
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">
156 
+							<input class="form-control" type="text" id="reviewNotes" placeholder="请输入审核内容">
157 
+						</div>
158 
+						<div class="form-group btn-position">
159 
+							<button class="btns ss">搜索</button>
160 
+							<button class="btns export">导出</button>
161 
+						</div>
162 
+					</div>
163 
+				</div>
164 
+			</div>
165 
+			<div style="width: 100%; padding: 10px; position: relative;" id="ces">
166 
+				<table id="workorderlist" class="market" data-row-style="rowStyle" data-query-params="queryParams" data-pagination="true">
167 
+					<thead>
168 
+						<tr>
169 
+							<th data-field="F_WorkOrderId" data-class="W160" data-formatter="View" data-align="center">工单编号</th>
170 
+							<th data-field="F_AreaName" data-class="W60" data-align="center">大区</th>
171 
+							<th data-field="F_OfficName" data-class="W80" data-align="center">办事处</th>
172 
+							<th data-field="F_CreateTime" data-class="W190" data-formatter="formatterCharacter25" data-align="center">投诉时间</th>
173 
+							<th data-field="F_SerialNumber" data-class="W60" data-align="center">序号</th>
174 
+							<th data-field="F_CusName" data-class="W100" data-align="center">姓名</th>
175 
+							<th data-field="F_AddRess" data-class="W240" data-formatter="formatterCharacter15" data-align="center">地址</th>
176 
+							<th data-field="F_CusPhone" data-class="W140" data-formatter="formatterCharacter15" data-align="center">联系电话</th>
177 
+							<th data-field="F_ProductType" data-class="W80" data-align="center">产品代码</th>
178 
+							<th data-field="F_ProductName" data-class="W180" data-formatter="formatterCharacter10" data-align="center">产品名称</th>
179 
+							<th data-field="F_Specifications" data-class="W80" data-formatter="formatterCharacter8" data-align="center">规格</th>
180 
+							<th data-field="F_ProductDate" data-class="W100" data-align="center">生产日期</th>
181 
+							<th data-field="F_BatchNumber" data-class="W120" data-formatter="formatterCharacter12" data-align="center">产品编码</th>
182 
+							<th data-field="F_Manufacturer" data-class="W100" data-formatter="formatterCharacter8" data-align="center">生产厂家</th>
183 
+							<th data-field="F_ProblemCode" data-class="W80" data-align="center">问题代码</th>
184 
+							<th data-field="F_QualityProblem" data-class="W180" data-formatter="formatterCharacter10" data-align="center">质量问题</th>
185 
+							<th data-field="F_Notifications" data-class="W180" data-align="center">通知人</th>
186 
+							<th data-field="F_ReceivingPerson" data-class="W80" data-align="center">接听人</th>
187 
+							<th data-field="F_DealResult" data-class="W240" data-formatter="formatterDealResult" data-align="center">落实情况</th>
188 
+							<th data-field="F_State" data-class="W100" data-formatter="workOrderStateJudge" data-align="center">处理进度</th>
189 
+
190 
+							<th data-field="F_ReviewStatus" data-class="W100" data-formatter="reviewStatusFormatter" data-align="center">审核状态</th>
191 
+							<th data-field="F_ReviewNotes" data-class="W240" data-formatter="reviewNotesFormatter" data-align="center">审核内容</th>
192 
+
193 
+							<th data-field="F_Type" data-class="W60margin partyType" data-formatter="workOrderTypeJudge">工单类别</th>
194 
+							<th data-field="F_WorkOrderId" data-class="workOprate workOprate6 W200" data-formatter="formatterProcessed"  data-align="center">操作</th>
195 
+						</tr>
196 
+					</thead>
197 
+				</table>
198 
+				<div class="dealResultContentWrapper" style="display: none;"></div>
199 
+			</div>
200 
+		</div>
201 
+
202 
+		<script src="../js/zTree/jquery.ztree.core.js"></script>
203 
+		<script src="../js/kindeditor/kindeditor.js"></script>
204 
+		<script src="../js/kindeditor/lang/zh_CN.js"></script>
205 
+		<script src="../js/WorkOrder/WorkOrder.js"></script>
206 
+		<script src="../js/laydate/laydate.js"></script>
207 
+		<script src="../js/comboSelect/jquery.combo.select.js"></script>
208 
+		<script src="../js/zTree/jquery.ztree.core.js"></script>
209 
+		<script src="../js/zTree/jquery.ztree.excheck.min.js"></script>
210 
+
211 
+		<script>
212 
+			$(document).ready(function() {
213 
+				laydate.render({
214 
+					elem: '#greetingTimes',
215 
+					range: '~',
216 
+					theme: '#1ab394',
217 
+				});
218 
+				laydate.render({
219 
+					elem: '#duplicateTime',
220 
+					range: '~',
221 
+					theme: '#1ab394',
222 
+				});
223 
+
224 
+				// 导出
225 
+				$('.export').click(function() {
226 
+					var state = 10; //处理进度
227 
+					dcexcel(state);
228 
+				});
229 
+			})
230 
+
231 
+			function initTable() {
232 
+				//先销毁表格
233 
+				$('#workorderlist').bootstrapTable('destroy');
234 
+				//初始化表格,动态从服务器加载数据
235 
+				$("#workorderlist").bootstrapTable({
236 
+					method: "post", //使用get请求到服务器获取数据
237 
+					url: huayi.config.callcenter_url + "WorkOrder/GetList", //获取数据的Servlet地址
238 
+					contentType: 'application/x-www-form-urlencoded',
239 
+					striped: true, //表格显示条纹
240 
+					pagination: true, //启动分页
241 
+					pageSize: 10, //每页显示的记录数
242 
+					pageNumber: 1, //当前第几页
243 
+					pageList: [10, 20, 50, 100], //记录数可选列表
244 
+					search: false, //是否启用查询
245 
+					showColumns: false, //显示下拉框勾选要显示的列
246 
+					showRefresh: false, //显示刷新按钮
247 
+					sidePagination: "server", //表示服务端请求
248 
+					fixedColumns: true,
249 
+                	fixedNumber: 14,
250 
+					//设置为undefined可以获取pageNumber，pageSize，searchText，sortName，sortOrder
251 
+					//设置为limit可以获取limit, offset, search, sort, order
252 
+					queryParamsType: "undefined",
253 
+					queryParams: function queryParams(params) { //设置查询参数
254 
+						var param = {
255 
+							state: 12, //处理进度
256 
+							token: $.cookie("token"),
257 
+							code: $("#searchCode").val(), //工单编号
258 
+							area: $("#searchRegionId").val(), //大区
259 
+							office: $("#searchOfficeId").val(), //办事处
260 
+							starttime: $('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[0], //开始时间
261 
+							endtime: $('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[1], //结束时间
262 
+							keywords: $("#searchKeywords").val(),//关键字
263 
+							productType: $("#searchProductType").val(), //产品代码
264 
+							productName: $("#searchProductName").val(), //产品名称
265 
+							productDate: $("#searchProductDate").val(), //生产日期
266 
+							batchNumber: $("#searchBatchNumber").val(), //产品编码
267 
+							manufacturer: $("#searchManufacturerName").val(), //生产厂家
268 
+							problemCode: $("#searchProblemCodeName").val(), //问题代码
269 
+							type: $("#searchOrderType").val(), //工单类别
270 
+							dealTimely: $("#searchDealTimely").val(), // 工单级别
271 
+							see: $("#searchSee").val(), //	处理专员是否只查看负责区域单子
272 
+							duplicatetime: $('#duplicateTime').val() && $('#duplicateTime').val().split(' ~ ')[0], //重复投诉开始时间
273 
+							endduplicatetime: $('#duplicateTime').val() && $('#duplicateTime').val().split(' ~ ')[1], //重复投诉结束时间
274 
+							reminder: $("#searchReminder").val(), //是否催单
275 
+							incomplete: $("#searchComplete").val(), //是否完善
276 
+							reviewStatus: 2,
277 
+							reviewNotes :$("#reviewNotes").val(),
278 
+							pageindex: params.pageNumber, //页码
279 
+							pagesize: params.pageSize, //条数
280 
+						};
281 
+						return param;
282 
+					},
283 
+					onLoadSuccess: function() { //加载成功时执行
284 
+						//layer.msg("加载成功");
285 
+						getLoginPersonNow();
286 
+					},
287 
+					onLoadError: function() { //加载失败时执行
288 
+						//layer.msg("加载数据失败", { time: 1500, icon: 2 });
289 
+					}
290 
+				});
291 
+			}
292 
+		</script>
293 
+	</body>
294 
+
295 
+</html>

+ 1 - 0
CallCenterWeb.UI/WorkOrder/WorkOrderComplaintTracking.html
View File 

@@ -111,6 +111,7 @@
111 111 
 								<option value="0">待提交</option>
112 112 
 								<option value="1">待分派</option>
113 113 
 								<option value="3">待处理</option>
114 
+								<option value="12">待审核</option>
114 115 
 								<option value="4">处理中</option>
115 116 
 								<option value="5">退回待分派</option>
116 117 
 								<option value="6">退回待提交</option>

+ 16 - 1
CallCenterWeb.UI/WorkOrder/WorkOrderParty.html
View File 

@@ -11,7 +11,6 @@
11 11 
 		<link href="../css/init.css" rel="stylesheet" />
12 12 
 		<link href="../css/WorkOrder/Search.css" rel="stylesheet">
13 13 
 		<link rel="stylesheet" href="../js/zTree/zTreeStyle.css" />
14 
-
15 14 
 		<style>
16 15 
 			.toolBox{
17 16 
 				padding-top: 15px;	
@@ -153,6 +152,16 @@
153 152 
 								<option value="1">否</option>
154 153 
 							</select>
155 154 
 						</div>
155 
+						<div class="form-group">
156 
+							<select class="form-control" id="reviewStatus">
157 
+								<option value="">请选择审核状态</option>
158 
+								<option value="1">审核通过</option>
159 
+								<option value="2">审核拒绝</option>
160 
+							</select>
161 
+						</div>
162 
+						<div class="form-group">
163 
+							<input class="form-control" type="text" id="reviewNotes" placeholder="请输入审核内容">
164 
+						</div>
156 165 
 						<div class="form-group btn-position">
157 166 
 							<button class="btns ss">搜索</button>
158 167 
 							<button class="btns export">导出</button>
 
@@ -184,6 +193,10 @@
184 193 
 							<th data-field="F_ReceivingPerson" data-class="W80" data-align="center">接听人</th>
185 194 
 							<th data-field="F_DealResult" data-class="W240" data-formatter="formatterDealResult" data-align="center">落实情况</th>
186 195 
 							<th data-field="F_State" data-class="W100" data-formatter="workOrderStateJudge" data-align="center">处理进度</th>
196 
+
197 
+							<th data-field="F_ReviewStatus" data-class="W100" data-formatter="reviewStatusFormatter" data-align="center">审核状态</th>
198 
+							<th data-field="F_ReviewNotes" data-class="W240" data-formatter="reviewNotesFormatter" data-align="center">审核内容</th>
199 
+
187 200 
 							<th data-field="F_Type" data-class="W60margin partyType" data-formatter="workOrderTypeJudge">工单类别</th>
188 201 
 							<th data-field="F_WorkOrderId" data-class="workOprate workOprate6 W200" data-formatter="formatterProcessed"  data-align="center">操作</th>
189 202 
 						</tr>
 
@@ -267,6 +280,8 @@
267 280 
 							endduplicatetime: $('#duplicateTime').val() && $('#duplicateTime').val().split(' ~ ')[1], //重复投诉结束时间
268 281 
 							reminder: $("#searchReminder").val(), //是否催单
269 282 
 							incomplete: $("#searchComplete").val(), //是否完善
283 
+							reviewStatus: $("#reviewStatus").val(),
284 
+							reviewNotes: $("#reviewNotes").val(),
270 285 
 							pageindex: params.pageNumber, //页码
271 286 
 							pagesize: params.pageSize, //条数
272 287 
 						};

+ 1 - 0
CallCenterWeb.UI/WorkOrder/WorkOrderSearch.html
View File 

@@ -120,6 +120,7 @@
120 120 
 								<option value="0">待提交</option>
121 121 
 								<option value="1">待分派</option>
122 122 
 								<option value="3">待处理</option>
123 
+								<option value="12">待审核</option>
123 124 
 								<option value="4">处理中</option>
124 125 
 								<option value="5">退回待分派</option>
125 126 
 								<option value="6">退回待提交</option>

+ 33 - 9
CallCenterWeb.UI/js/WorkOrder/WorkOrder.js
View File 

@@ -129,11 +129,34 @@ function workOrderStateJudge (val, row) {
129 129 
 		return '<div>退回待提交</div>';
130 130 
 	} else if (val === 10) {
131 131 
 		return '<div>已完成</div>';
132 
+	}else if (val === 11) {
133 
+		return '<div>待审核</div>';
132 134 
 	} else {
133 135 
 		return '<div></div>';
134 136 
 	}
135 137 
 }
136 
-
138 
+// 审核状态
139 
+function reviewStatusFormatter(val, row) {
140 
+	console.log(val)
141 
+	if (val === 1) {
142 
+		return '<div>审核通过</div>';
143 
+	} else if (val === 2) {
144 
+		return '<div>审核拒绝</div>';
145 
+	}
146 
+}
147 
+// 审核内容
148 
+function reviewNotesFormatter(val, row) {
149 
+	if(val) {
150 
+		var character = val.replace(/[\r\n]/g,"");
151 
+		var valCharacter = val.replace(/[\r\n]/g,"");
152 
+		if (character.length > 15) {
153 
+			character = character.substring(0, 15) + '...';
154 
+			return '<div class="dealResultDetail" id="dealResultDetail' + row.F_Id + '" onclick="dealResultDetailFun(\'' + valCharacter + '\',  ' + '\'' + row.F_Id +'\')" >' + character + '</div>';
155 
+		} else {
156 
+			return '<div>' + character + '</div>'
157 
+		}
158 
+	}
159 
+}
137 160 
 //格式化 落实情况
138 161 
 function formatterDealResult(val, row) {
139 162 
 	if(val) {
 
@@ -511,17 +534,18 @@ function formatterOprateDispose(val, row) {
511 534 
 }
512 535
513 536 
 //格式化操作 （已办待审核）
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 
-}
537 
+//function formatterReview(val,row){
538 
+//	return '<ul class="tool_downs">' +
539 
+//		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_return_' + row.F_Id + '" onclick="btn_review(\'' + row.F_Id + '\')" title="审核">审核</a></li>' +
540 
+//		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_reminder_' + row.F_Id + '" onclick="btn_reminder(\'' + row.F_Id + '\', 2)" title="完善">完善</a></li>' +
541 
+//		'</ul>';
542 
+//}
520 543
521 544 
 //格式化操作 （已处理）
522 545 
 function formatterProcessed(val, row) {
523 546 
 	return '<ul class="tool_downs">' +
524 547 
 //		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_delete_' + row.F_Id + '" onclick="btn_deleteid(\'' + row.F_Id + '\')" title="删除">删除</a></li>' +
548 
+		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_return_' + row.F_Id + '" onclick="btn_review(\'' + row.F_Id + '\')" title="审核">审核</a></li>' +
525 549 
 		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_return_' + row.F_Id + '" onclick="btn_return(\'' + row.F_Id + '\')" title="退单">退单</a></li>' +
526 550 
 		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_reminder_' + row.F_Id + '" onclick="btn_reminder(\'' + row.F_Id + '\', 2)" title="完善">完善</a></li>' +
527 551 
 		'</ul>';
 
@@ -701,8 +725,8 @@ function btn_review(id){
701 725 
 		type: 2,
702 726 
 		title: '审核',
703 727 
 		maxmin: true, //开启最大化最小化按钮
704 
-		area: ['40%', '40%'],
705 
-		content: "../WorkOrder/WorkOrderReturn.html?id=" + id
728 
+		area: ['60%', '60%'],
729 
+		content: "../WorkOrder/WorkOrderAudit.html?id=" + id
706 730 
 	});
707 731 
 }
708 732

+ 2 - 0
双汇APP-andriod/js/personal.js
View File 

@@ -198,6 +198,7 @@ function ajaxRefresh() {
198 198 
 //一级查看-待处理列表
199 199 
 $(".work-list").on('tap', function() {
200 200 
 	var index = $(this).attr('index');
201 
+	var reviewStatus =  $(this).attr('reviewStatus');
201 202 
 	mui.openWindow({
202 203 
 		id: 'Work-list',
203 204 
 		url: 'workOrder/Work-list.html',
 
@@ -210,6 +211,7 @@ $(".work-list").on('tap', function() {
210 211 
 		},
211 212 
 		extras: {
212 213 
 			index: index,
214 
+			reviewStatus:reviewStatus
213 215 
 		}
214 216 
 	});
215 217 
 })

+ 2 - 2
双汇APP-andriod/manifest.json
View File 

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

+ 18 - 9
双汇APP-andriod/personal.html
View File 

@@ -91,15 +91,6 @@
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">
103 94 
 					<a href="javascript:;" class="work-list" index="5">
104 95 
 						<div class="Icon icon-5">
105 96 
 							<img src="img/icon-5.png" />
 
@@ -126,6 +117,24 @@
126 117 
 					</a>
127 118 
 				</li>
128 119 
 				<li class="mui-table-view-cell mui-media mui-col-xs-4 mui-col-sm-4">
120 
+					<a href="javascript:;" class="work-list" index="10" reviewStatus="1">
121 
+						<div class="Icon icon-1">
122 
+							<img src="img/icon-8.png" />
123 
+							</i>
124 
+						</div>
125 
+						<div class="mui-media-body font-weight-bold">审核通过</div>
126 
+					</a>
127 
+				</li>
128 
+				<li class="mui-table-view-cell mui-media mui-col-xs-4 mui-col-sm-4">
129 
+					<a href="javascript:;" class="work-list" index="10" reviewStatus="2">
130 
+						<div class="Icon icon-1">
131 
+							<img src="img/icon-8.png" />
132 
+							</i>
133 
+						</div>
134 
+						<div class="mui-media-body font-weight-bold">审核拒绝</div>
135 
+					</a>
136 
+				</li>
137 
+				<li class="mui-table-view-cell mui-media mui-col-xs-4 mui-col-sm-4">
129 138 
 					<a href="javascript:;" class="work-CJ" choujian="1">
130 139 
 						<div class="Icon icon-8">
131 140 
 							<img src="img/icon-8.png" />

+ 1 - 1
双汇APP-andriod/workOrder/Work-review.html
View File 

@@ -158,7 +158,7 @@
158 158 
 						</div>
159 159 
 						<div class="mui-input-row mui-radio mui-left radio_box">
160 160 
 							<label>否</label>
161 
-							<input type="radio" name="secret" value="0" />
161 
+							<input type="radio" name="secret" value="2" />
162 162 
 						</div>
163 163 
 					</div>
164 164 
 				</li>

+ 41 - 18
双汇APP-andriod/workOrder/js/Work-list.js
View File 

@@ -13,9 +13,9 @@ window.onload = function() {
13 13 
 		var wv = plus.webview.currentWebview();
14 14 
 		var index = wv.index; //交办条件
15 15 
 		var importClass = wv.importClass; //工单等级
16 
-		var keyw="";
16 
+		var keyw="";
17 
+		var reviewStatus = wv.reviewStatus;
17 18 
 		plus.nativeUI.closeWaiting();
18 
-		console.log(index)
19 19 
 		//显示当前页面
20 20 
 		mui.currentWebview.show();
21 21 
 		
@@ -32,7 +32,12 @@ window.onload = function() {
32 32 
 		} else if(index == 6) {
33 33 
 			$(".Totle-box").text('退回待提交')
34 34 
 		} else if(index == 10) {
35 
-			$(".Totle-box").text('已处理')
35 
+			$(".Totle-box").text('已处理')
36 
+			if(reviewStatus == 1){
37 
+				$(".Totle-box").text('审核通过')
38 
+			} else if(reviewStatus == 2){
39 
+				$(".Totle-box").text('审核拒绝')
40 
+			}
36 41 
 		} else if(index == 11) {
37 42 
 			$(".Totle-box").text('咨询')
38 43 
 		} else if(index == 12) {

@@ -63,7 +68,7 @@ window.onload = function() {
63 68 
 		 	$("#DW").css('display', 'block')
64 69 
 		 } else{
65 70 
 		 	$("#DW").css('display', 'none')
66 
-		 }
71 
+		 }
67 72 
 		Ajax();
68 73 
 		$('.go_search').on('input focus', function() {
69 74 
 			keyw = $(this).val();
 
@@ -98,7 +103,8 @@ window.onload = function() {
98 103 
 						token: token,
99 104 
 						isManager:index=='99'?1:'',
100 105 
 						state: index!='99'?index:'',
101 
-						dealTimely: classImport,
106 
+						dealTimely: classImport,
107 
+						reviewStatus:reviewStatus,
102 108 
 						area:areaId,
103 109 
 						offce:officeId,
104 110 
 						extensionphone: 1,
 
@@ -116,7 +122,8 @@ window.onload = function() {
116 122 
 					success: function(data) {
117 123 
 						console.log(JSON.stringify(data), 'data')
118 124 
 						var total = data.total;
119 
-						var imgnum;
125 
+						var imgnum;
126 
+						var reviewStatus = ''
120 127 
 						for(var i = 0; i < data.rows.length; i++) {
121 128 
 							var a = data.rows[i].F_Content;
122 129 
 							var c = data.rows[i].F_WorkState;
 
@@ -129,6 +136,13 @@ window.onload = function() {
129 136 
 								imgnum = '<img src="../img/class-img3.png"/>';
130 137 
 							} else {
131 138 
 								imgnum = "";
139 
+							}
140 
+							if (data.rows[i].F_ReviewStatus == 1){
141 
+								reviewStatus = '已通过'
142 
+							} else if (data.rows[i].F_ReviewStatus==2){
143 
+								reviewStatus = '已拒绝'
144 
+							} else {
145 
+								reviewStatus = ''
132 146 
 							}
133 147 
 							var areaOffice;
134 148 
 							if (!data.rows[i].F_AreaName) {
 
@@ -148,9 +162,9 @@ window.onload = function() {
148 162 
 								'<span class="time">投诉时间：' + time + '</span>' +
149 163 
 								' </p>' +
150 164 
 								' </div>' +
151 
-								'</div>' +
152 
-								'<div class="class-icon">'+ imgnum  +
153 
-								'</div>' +
165 
+								'</div>' +
166 
+								'<div style="position: absolute; top: 10px; right: 40px; margin-right:15px">'+ reviewStatus  +'</div>' +
167 
+								'<div class="class-icon">'+ imgnum  + '</div>' +
154 168 
 								'<button class="mui-btn mui-btn-block mui-btn-danger mui-btn-submit" data-index="' + data.rows[i].F_Id +'" index="' + index + '"></button>' +
155 169 
 								'</li>').appendTo('#order_list');
156 170 
 							if(classImport) {
 
@@ -212,7 +226,6 @@ window.onload = function() {
212 226 
 			$(".orderLi").remove();
213 227 
 			page=1;
214 228 
 			pageSize=10;
215 
-			console.log(comprehensive)
216 229 
 			mui.ajax(huayi.config.callcenter_url + 'WorkorderApp/GetList', {
217 230 
 				data: {
218 231 
 					token: token, 
@@ -220,7 +233,8 @@ window.onload = function() {
220 233 
 					state: index!='99'?index:'',
221 234 
 					area:areaId,
222 235 
 					offce:officeId,
223 
-					dealTimely: classImport,
236 
+					dealTimely: classImport,
237 
+					reviewStatus:reviewStatus,
224 238 
 					extensionphone: 1,
225 239 
 					keywords:keyw,
226 240 
 					page:1,
 
@@ -239,14 +253,16 @@ window.onload = function() {
239 253 
 						total = 0;
240 254 
 						$(".noWork").show();
241 255 
 					}
242 
-					var imgnum;
256 
+					var imgnum;
257 
+					var reviewStatus = ''
243 258 
 					$(".class-icon img").hide();
244 259 
 					$(".Totle").text('(' + total + ')');
245 260 
 					for(var i = 0; i < data.rows.length; i++) {
246 261 
 						var a = data.rows[i].F_Content;
247 262 
 						var c = data.rows[i].F_WorkState;
248 263 
 						var time = data.rows[i].F_CreateTime;
249 
-						var areaOffice;
264 
+						var areaOffice;
265 
+
250 266 
 						if (!data.rows[i].F_AreaName) {
251 267 
 							areaOffice='';
252 268 
 						}else{
 
@@ -262,6 +278,13 @@ window.onload = function() {
262 278 
 							imgnum = '<img src="../img/class-img3.png"/>';
263 279 
 						} else {
264 280 
 							imgnum = "";
281 
+						}
282 
+						if (data.rows[i].F_ReviewStatus == 1){
283 
+							reviewStatus = '已通过'
284 
+						} else if (data.rows[i].F_ReviewStatus==2){
285 
+							reviewStatus = '已拒绝'
286 
+						} else {
287 
+							reviewStatus = ''
265 288 
 						}
266 289 
 						$('<li class="mui-table-view-cell orderLi">' +
267 290 
 							'<div class="mui-table order" data-index="' + data.rows[i].F_Id + '">' +
 
@@ -271,9 +294,9 @@ window.onload = function() {
271 294 
 							'<span class="advice">' + a + '</span>' +
272 295 
 							' </p>'+areaOffice+'<p class="mui-h6 mui-ellipsis">' +
273 296 
 							'<span class="time">投诉时间：' + time + '</span>' +
274 
-							' </p></div></div>' +
275 
-							'<div class="class-icon">' + imgnum +
276 
-							'</div>' +
297 
+							' </p></div></div>' +
298 
+							'<div style="position: absolute; top: 10px; right: 40px; margin-right:15px">'+ reviewStatus  +'</div>' +
299 
+							'<div class="class-icon">' + imgnum + '</div>' +
277 300 
 							'<button class="mui-btn mui-btn-block mui-btn-danger mui-btn-submit" data-index="'+data.rows[i].F_Id +'" index="' + index + '"></button>' +
278 301 
 							'</li>').appendTo('#order_list');
279 302 
 						if(classImport) {
 
@@ -332,7 +355,7 @@ window.onload = function() {
332 355
333 356
334 357 
 		$('#order_list').on('tap', '.order', function() {
335 
-			var id = $(this).attr('data-index');
358 
+			var id = $(this).attr('data-index');
336 359 
 			mui.openWindow({
337 360 
 				id: 'WorkDetails',
338 361 
 				url: 'WorkDetails.html',
 
@@ -349,7 +372,7 @@ window.onload = function() {
349 372 
 				extras: {
350 373 
 					name: id,
351 374 
 					index:index,
352 
-					classImport: classImport,
375 
+					classImport: classImport,
353 376 
 					token: token
354 377 
 				}
355 378 
 			});

+ 2 - 2
双汇APP-andriod/workOrder/js/detail.js
View File 

@@ -12,7 +12,7 @@ mui.plusReady(function() {
12 12 
 	var ID = vText;
13 13 
 	var token = localStorage.getItem("token");
14 14 
 	var classImport = wv.classImport;
15 
-	var listIndex = wv.index;
15 
+	var listIndex = wv.index;
16 16 
 	var orderState;
17 17 
 	if(listIndex == 99){
18 18 
 		$(".listIndex").hide()

@@ -283,7 +283,7 @@ mui.plusReady(function() {
283 283 
 			},
284 284 
 			extras: {
285 285 
 				name: vText,
286 
-				classImport: classImport, //区分工单等级列表参数
286 
+				classImport: classImport, //区分工单等级列表参数
287 287 
 				token: token
288 288 
 			}
289 289 
 		});

+ 19 - 9
双汇APP-h5/index.html
View File 

@@ -93,15 +93,7 @@
93 93 
 					</a>
94 94 
 					<div class="stateIcon CLZ"></div>
95 95 
 				</li>
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>
96 
+
105 97 
 				<li class="mui-table-view-cell mui-media mui-col-xs-4 mui-col-sm-4">
106 98 
 					<a href="javascript:;" class="work-list" index="5">
107 99 
 						<div class="Icon icon-5">
 
@@ -129,6 +121,24 @@
129 121 
 					</a>
130 122 
 				</li>
131 123 
 				<li class="mui-table-view-cell mui-media mui-col-xs-4 mui-col-sm-4">
124 
+					<a href="javascript:;" class="work-list" index="10" reviewStatus="1">
125 
+						<div class="Icon icon-1">
126 
+							<img src="img/icon-8.png" />
127 
+							</i>
128 
+						</div>
129 
+						<div class="mui-media-body font-weight-bold">审核通过</div>
130 
+					</a>
131 
+				</li>
132 
+				<li class="mui-table-view-cell mui-media mui-col-xs-4 mui-col-sm-4">
133 
+					<a href="javascript:;" class="work-list" index="10" reviewStatus="2">
134 
+						<div class="Icon icon-1">
135 
+							<img src="img/icon-8.png" />
136 
+							</i>
137 
+						</div>
138 
+						<div class="mui-media-body font-weight-bold">审核拒绝</div>
139 
+					</a>
140 
+				</li>
141 
+				<li class="mui-table-view-cell mui-media mui-col-xs-4 mui-col-sm-4">
132 142 
 					<a href="javascript:;" class="work-CJ" choujian="1">
133 143 
 						<div class="Icon icon-8">
134 144 
 							<img src="img/icon-8.png" />

+ 11 - 1
双汇APP-h5/js/personal.js
View File 

@@ -212,9 +212,19 @@ function ajaxRefresh() {
212 212 
 //一级查看-待处理列表
213 213 
 $(".work-list").on('tap', function() {
214 214 
 	var index = $(this).attr('index');
215 
+	var reviewStatus = $(this).attr('reviewStatus');
216 
+	var url
217 
+	if(index){
218 
+		url = 'workOrder/Work-list.html?index='+ index
219 
+		if (reviewStatus){
220 
+			url += '&reviewStatus='+reviewStatus
221 
+		}
222 
+	}
223 
+
224 
+
215 225 
 	mui.openWindow({
216 226 
 		id: 'Work-list',
217 
-		url: 'workOrder/Work-list.html?index='+index,
227 
+		url,
218 228 
 		createNew: true,
219 229 
 	});
220 230 
 })

+ 6 - 2
双汇APP-h5/workOrder/Work-review.html
View File 

@@ -158,13 +158,13 @@
158 158 
 						</div>
159 159 
 						<div class="mui-input-row mui-radio mui-left radio_box">
160 160 
 							<label>否</label>
161 
-							<input type="radio" name="secret" value="0" />
161 
+							<input type="radio" name="secret" value="2" />
162 162 
 						</div>
163 163 
 					</div>
164 164 
 				</li>
165 165 
 				<li class="mui-table-view-cell">
166 166 
 					<div class="mui-input-row">
167 
-						<label class="label labels">处理内容：</label>
167 
+						<label class="label labels">审核内容：</label>
168 168 
 						<textarea class="ztext content" name="" id="result" rows="3" cols="" placeholder="请详细描述您的问题和建议..."></textarea>
169 169 
 					</div>
170 170 
 				</li>
 
@@ -189,6 +189,7 @@
189 189 
 			    var vText = urlParams.get('name');
190 190 
 				var orderState = urlParams.get('index'); // 普通工单
191 191 
 				var token = localStorage.getItem("token");　
192 
+				var reviewStatus = urlParams.get('reviewStatus');
192 193
193 194 
 				document.getElementById("submit").addEventListener('tap', function() {
194 195 
 
@@ -215,6 +216,9 @@
215 216 
 									if (orderState) {
216 217 
 										resultId = 'Work-list'
217 218 
 										resultUrl = 'Work-list.html?index='+orderState
219 
+										if (reviewStatus) {
220 
+											resultUrl = 'Work-list.html?index='+orderState + '&reviewStatus='+reviewStatus
221 
+										}
218 222 
 									}
219 223
220 224 
 									mui.openWindow({

+ 36 - 8
双汇APP-h5/workOrder/js/Work-list.js
View File 

@@ -8,9 +8,10 @@ window.onload = function() {
8 8 
 		var isManager
9 9 
 		var urlParams = new URLSearchParams(window.location.search);
10 10 
 	    var param1 = urlParams.get('index');
11 
+		var reviewStatus = urlParams.get('reviewStatus');
11 12
12 13 
 	    var wv = {
13 
-			index: param1,
14 
+			index: param1
14 15 
 		}
15 16 
 		var classImport
16 17 
 		var page = 1; //页数

@@ -33,10 +34,14 @@ window.onload = function() {
33 34 
 			$(".Totle-box").text('退回待提交')
34 35 
 		} else if(index == 10) {
35 36 
 			$(".Totle-box").text('已处理')
37 
+			if(reviewStatus == 1){
38 
+				$(".Totle-box").text('审核通过')
39 
+			} else if(reviewStatus == 2){
40 
+				$(".Totle-box").text('审核拒绝')
41 
+			}
42 
+
36 43 
 		} else if(index == 11) {
37 44 
 			$(".Totle-box").text('咨询')
38 
-		} else if(index == 12) {
39 
-			$(".Totle-box").text('已办待审核')
40 45 
 		} else if(index == -1) {
41 46 
 			$(".Totle-box").text('查询')
42 47 
 			comprehensive = 0

@@ -79,6 +84,7 @@ window.onload = function() {
79 84 
 						token: token,
80 85 
 						isManager:index=='99'?1:'',
81 86 
 						state: index!='99'?index:'',
87 
+						reviewStatus:reviewStatus,
82 88 
 						dealTimely: classImport,
83 89 
 						area:areaId,
84 90 
 						offce:officeId,

@@ -98,6 +104,7 @@ window.onload = function() {
98 104 
 						console.log(JSON.stringify(data), 'data')
99 105 
 						var total = data.total;
100 106 
 						var imgnum;
107 
+						var reviewStatus = ''
101 108 
 						for(var i = 0; i < data.rows.length; i++) {
102 109 
 							var a = data.rows[i].F_Content;
103 110 
 							var c = data.rows[i].F_WorkState;

@@ -111,6 +118,13 @@ window.onload = function() {
111 118 
 							} else {
112 119 
 								imgnum = "";
113 120 
 							}
121 
+							if (data.rows[i].F_ReviewStatus == 1){
122 
+								reviewStatus = '已通过'
123 
+							} else if (data.rows[i].F_ReviewStatus==2){
124 
+								reviewStatus = '已拒绝'
125 
+							} else {
126 
+								reviewStatus = ''
127 
+							}
114 128 
 							var areaOffice;
115 129 
 							if (!data.rows[i].F_AreaName) {
116 130 
 								areaOffice='';

@@ -130,8 +144,8 @@ window.onload = function() {
130 144 
 								' </p>' +
131 145 
 								' </div>' +
132 146 
 								'</div>' +
133 
-								'<div class="class-icon">'+ imgnum  +
134 
-								'</div>' +
147 
+								'<div style="position: absolute; top: 10px; right: 40px; margin-right:15px">'+ reviewStatus  +'</div>' +
148 
+								'<div class="class-icon">'+ imgnum  +'</div>' +
135 149 
 								'<button class="mui-btn mui-btn-block mui-btn-danger mui-btn-submit" data-index="' + data.rows[i].F_Id +'" index="' + index + '"></button>' +
136 150 
 								'</li>').appendTo('#order_list');
137 151 
 							if(classImport) {

@@ -144,6 +158,7 @@ window.onload = function() {
144 158 
 							} else if(data.rows[i].F_DealTimely = "普通工单"||data.rows[i].F_DealTimely =="3类问题") {
145 159 
 								$(".class-icon img").eq(2).show()
146 160 
 							}
161 
+
147 162 
 							if (F_RoleId==49||F_RoleId==56 || F_See==6) {
148 163 
 								$(".mui-btn-submit").hide()
149 164 
 							}else{

@@ -200,6 +215,7 @@ window.onload = function() {
200 215 
 					token: token,
201 216 
 					isManager:index=='99'?1:'',
202 217 
 					state: index!='99'?index:'',
218 
+					reviewStatus:reviewStatus,
203 219 
 					area:areaId,
204 220 
 					offce:officeId,
205 221 
 					dealTimely: classImport,

@@ -223,6 +239,7 @@ window.onload = function() {
223 239 
 						$(".noWork").show();
224 240 
 					}
225 241 
 					var imgnum;
242 
+					var reviewStatus = ''
226 243 
 					$(".class-icon img").hide();
227 244 
 					$(".Totle").text('(' + total + ')');
228 245 
 					for(var i = 0; i < data.rows.length; i++) {

@@ -246,6 +263,13 @@ window.onload = function() {
246 263 
 						} else {
247 264 
 							imgnum = "";
248 265 
 						}
266 
+						if (data.rows[i].F_ReviewStatus == 1){
267 
+							reviewStatus = '已通过'
268 
+						} else if (data.rows[i].F_ReviewStatus==2){
269 
+							reviewStatus = '已拒绝'
270 
+						} else {
271 
+							reviewStatus = ''
272 
+						}
249 273 
 						$('<li class="mui-table-view-cell orderLi">' +
250 274 
 							'<div class="mui-table order" data-index="' + data.rows[i].F_Id + '">' +
251 275 
 							'<div class="mui-table-cell mui-col-xs-12">' +

@@ -255,8 +279,8 @@ window.onload = function() {
255 279 
 							' </p>'+areaOffice+'<p class="mui-h6 mui-ellipsis">' +
256 280 
 							'<span class="time">投诉时间：' + time + '</span>' +
257 281 
 							' </p></div></div>' +
258 
-							'<div class="class-icon">' + imgnum +
259 
-							'</div>' +
282 
+							'<div style="position: absolute; top: 10px; right: 40px; margin-right:15px">'+ reviewStatus  +'</div>' +
283 
+							'<div class="class-icon">'+ imgnum  +'</div>' +
260 284 
 							'<button class="mui-btn mui-btn-block mui-btn-danger mui-btn-submit" data-index="'+data.rows[i].F_Id +'" index="' + index + '"></button>' +
261 285 
 							'</li>').appendTo('#order_list');
262 286 
 						if(classImport) {

@@ -316,9 +340,13 @@ window.onload = function() {
316 340
317 341 
 		$('#order_list').on('tap', '.order', function() {
318 342 
 			var id = $(this).attr('data-index');
343 
+			var url = 'WorkDetails.html?name=' + id + '&index=' + index
344 
+			if(reviewStatus){
345 
+				url += '&reviewStatus=' + reviewStatus
346 
+			}
319 347 
 			mui.openWindow({
320 348 
 				id: 'WorkDetails',
321 
-				url: 'WorkDetails.html?name=' + id + '&index=' + index,
349 
+				url,
322 350 
 				createNew: true,
323 351
324 352 
 			});

+ 9 - 3
双汇APP-h5/workOrder/js/detail.js
View File 

@@ -11,6 +11,7 @@ mui.ready(function() {
11 11 
     var param1 = urlParams.get('name');
12 12 
     var param2 = urlParams.get('importClass');
13 13 
 	var listIndex = urlParams.get('index');
14 
+	var reviewStatus = urlParams.get('reviewStatus')
14 15 
     var States;
15 16 
 	var wv = {
16 17 
 		name: param1,
 
@@ -288,11 +289,16 @@ mui.ready(function() {
288 289 
 	}
289 290
290 291 
 	function getTargetUrl(url){
291 
-		var resultUrl = ''
292 
+		var resultUrl = url+ '.html?name=' + vText
293 
+
292 294 
 		if(importClass){
293 
-			resultUrl = url+ '.html?name=' + vText + '&importClass=' +importClass
295 
+			resultUrl += '&importClass=' +importClass
294 296 
 		} else{
295 
-			resultUrl = url+ '.html?name=' + vText + '&index=' +orderState
297 
+			resultUrl += '&index=' +orderState
298 
+			if(reviewStatus){
299 
+				resultUrl += '&reviewStatus=' +reviewStatus
300 
+			}
301 
+
296 302 
 		}
297 303 
 		mui.openWindow({
298 304 
 			id: url,

+ 2 - 0
双汇APP/js/personal.js
View File 

@@ -193,6 +193,7 @@ function ajaxRefresh() {
193 193 
 //一级查看-待处理列表
194 194 
 $(".work-list").on('tap', function() {
195 195 
 	var index = $(this).attr('index');
196 
+	var reviewStatus =  $(this).attr('reviewStatus');
196 197 
 	mui.openWindow({
197 198 
 		id: 'Work-list',
198 199 
 		url: 'workOrder/Work-list.html',
 
@@ -205,6 +206,7 @@ $(".work-list").on('tap', function() {
205 206 
 		},
206 207 
 		extras: {
207 208 
 			index: index,
209 
+			reviewStatus:reviewStatus
208 210 
 		}
209 211 
 	});
210 212 
 })

+ 18 - 10
双汇APP/personal.html
View File 

@@ -89,15 +89,6 @@
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">
101 92 
 					<a href="javascript:;" class="work-list" index="5">
102 93 
 						<div class="Icon icon-5">
103 94 
 							<img src="img/icon-5.png" />
 
@@ -122,7 +113,24 @@
122 113 
 						</div>
123 114 
 						<div class="mui-media-body font-weight-bold">已处理</div>
124 115 
 					</a>
125 
-
116 
+				</li>
117 
+				<li class="mui-table-view-cell mui-media mui-col-xs-4 mui-col-sm-4">
118 
+					<a href="javascript:;" class="work-list" index="10" reviewStatus="1">
119 
+						<div class="Icon icon-1">
120 
+							<img src="img/icon-8.png" />
121 
+							</i>
122 
+						</div>
123 
+						<div class="mui-media-body font-weight-bold">审核通过</div>
124 
+					</a>
125 
+				</li>
126 
+				<li class="mui-table-view-cell mui-media mui-col-xs-4 mui-col-sm-4">
127 
+					<a href="javascript:;" class="work-list" index="10" reviewStatus="2">
128 
+						<div class="Icon icon-1">
129 
+							<img src="img/icon-8.png" />
130 
+							</i>
131 
+						</div>
132 
+						<div class="mui-media-body font-weight-bold">审核拒绝</div>
133 
+					</a>
126 134 
 				</li>
127 135 
 				<li class="mui-table-view-cell mui-media mui-col-xs-4 mui-col-sm-4">
128 136 
 					<a href="javascript:;" class="work-CJ" choujian="1">

+ 1 - 1
双汇APP/workOrder/Work-review.html
View File 

@@ -158,7 +158,7 @@
158 158 
 						</div>
159 159 
 						<div class="mui-input-row mui-radio mui-left radio_box">
160 160 
 							<label>否</label>
161 
-							<input type="radio" name="secret" value="0" />
161 
+							<input type="radio" name="secret" value="2" />
162 162 
 						</div>
163 163 
 					</div>
164 164 
 				</li>

+ 28 - 4
双汇APP/workOrder/js/Work-list.js
View File 

@@ -12,6 +12,7 @@ window.onload = function() {
12 12 
 		var wv = plus.webview.currentWebview();
13 13 
 		var index = wv.index; //交办条件
14 14 
 		var importClass = wv.importClass; //工单等级
15 
+		var reviewStatus = wv.reviewStatus;
15 16 
 		var keyw="";
16 17 
 		plus.nativeUI.closeWaiting();
17 18 
 		//显示当前页面
 
@@ -31,6 +32,11 @@ window.onload = function() {
31 32 
 			$(".Totle-box").text('退回待提交')
32 33 
 		} else if(index == 10) {
33 34 
 			$(".Totle-box").text('已处理')
35 
+			if(reviewStatus == 1){
36 
+				$(".Totle-box").text('审核通过')
37 
+			} else if(reviewStatus == 2){
38 
+				$(".Totle-box").text('审核拒绝')
39 
+			}
34 40 
 		} else if(index == 11) {
35 41 
 			$(".Totle-box").text('咨询')
36 42 
 		} else if(index == 12) {
 
@@ -97,6 +103,7 @@ window.onload = function() {
97 103 
 						isManager:index=='99'?1:'',
98 104 
 						state: index!='99'?index:'',
99 105 
 						dealTimely: classImport,
106 
+						reviewStatus:reviewStatus,
100 107 
 						area:areaId,
101 108 
 						offce:officeId,
102 109 
 						extensionphone: 1,
 
@@ -113,6 +120,7 @@ window.onload = function() {
113 120 
 					success: function(data) {
114 121 
 						var total = data.total;
115 122 
 						var imgnum;
123 
+						var reviewStatus = ''
116 124 
 						for(var i = 0; i < data.rows.length; i++) {
117 125 
 							var a = data.rows[i].F_Content;
118 126 
 							var c = data.rows[i].F_WorkState;
 
@@ -126,6 +134,13 @@ window.onload = function() {
126 134 
 							} else {
127 135 
 								imgnum = "";
128 136 
 							}
137 
+							if (data.rows[i].F_ReviewStatus == 1){
138 
+								reviewStatus = '已通过'
139 
+							} else if (data.rows[i].F_ReviewStatus==2){
140 
+								reviewStatus = '已拒绝'
141 
+							} else {
142 
+								reviewStatus = ''
143 
+							}
129 144 
 							var areaOffice;
130 145 
 							if (!data.rows[i].F_AreaName) {
131 146 
 								areaOffice='';
 
@@ -145,8 +160,8 @@ window.onload = function() {
145 160 
 								' </p>' +
146 161 
 								' </div>' +
147 162 
 								'</div>' +
148 
-								'<div class="class-icon">'+ imgnum  +
149 
-								'</div>' +
163 
+								'<div style="position: absolute; top: 10px; right: 40px; margin-right:15px">'+ reviewStatus  +'</div>' +
164 
+								'<div class="class-icon">'+ imgnum  + '</div>' +
150 165 
 								'<button class="mui-btn mui-btn-block mui-btn-danger mui-btn-submit" data-index="' +data.rows[i].F_Id +'" index="' + index + '"></button>' +
151 166 
 								'</li>').appendTo('#order_list');
152 167 
 							if(classImport) {
 
@@ -216,6 +231,7 @@ window.onload = function() {
216 231 
 					area:areaId,
217 232 
 					offce:officeId,
218 233 
 					dealTimely: classImport,
234 
+					reviewStatus:reviewStatus,
219 235 
 					extensionphone: 1,
220 236 
 					keywords:keyw,
221 237 
 					page:1,
 
@@ -235,6 +251,7 @@ window.onload = function() {
235 251 
 						$(".noWork").show();
236 252 
 					}
237 253 
 					var imgnum;
254 
+					var reviewStatus = ''
238 255 
 					$(".class-icon img").hide();
239 256 
 					$(".Totle").text('(' + total + ')');
240 257 
 					console.log(data.message)
 
@@ -259,6 +276,13 @@ window.onload = function() {
259 276 
 						} else {
260 277 
 							imgnum = "";
261 278 
 						}
279 
+						if (data.rows[i].F_ReviewStatus == 1){
280 
+							reviewStatus = '已通过'
281 
+						} else if (data.rows[i].F_ReviewStatus==2){
282 
+							reviewStatus = '已拒绝'
283 
+						} else {
284 
+							reviewStatus = ''
285 
+						}
262 286 
 						$('<li class="mui-table-view-cell orderLi">' +
263 287 
 							'<div class="mui-table order" data-index="' + data.rows[i].F_Id + '">' +
264 288 
 							'<div class="mui-table-cell mui-col-xs-12">' +
 
@@ -268,8 +292,8 @@ window.onload = function() {
268 292 
 							' </p>'+areaOffice+'<p class="mui-h6 mui-ellipsis">' +
269 293 
 							'<span class="time">投诉时间：' + time + '</span>' +
270 294 
 							' </p></div></div>' +
271 
-							'<div class="class-icon">' + imgnum +
272 
-							'</div>' +
295 
+							'<div style="position: absolute; top: 10px; right: 40px; margin-right:15px">'+ reviewStatus  +'</div>' +
296 
+							'<div class="class-icon">' + imgnum + '</div>' +
273 297 
 							'<button class="mui-btn mui-btn-block mui-btn-danger mui-btn-submit" data-index="'+data.rows[i].F_Id +'" index="' + index + '"></button>' +
274 298 
 							'</li>').appendTo('#order_list');
275 299 
 						if(classImport) {