接收、退回

CallCenterWeb.UI/registrationManagement/registrationList/js/detail.js

@@ -36,7 +36,7 @@ function getRegisterDetail() {
             $("#detailCreateOn").text(con.F_CreateOn); //登记时间
             $("#detailComplainedUnitOffice").text(con.F_UnitOffice); //投诉单位办事处
             $("#detailComplaintUndertaker").text(con.F_CaseParty); //投诉案件承办人
-            $("#detailQuestionLevel").text(con.F_CaseParty); //咨询问题级别
+            $("#detailQuestionLevel").text(con.F_ProblemType); //咨询问题级别
             $("#detailQuestionType").text(con.F_ProblemTypeB); //咨询问题类型
             $("#detailCitizenClassification").text(con.F_CitizensType); //市民分类
             $("#detailPutRecord").text(con.F_PutRecord); //是否立案
@@ -70,7 +70,7 @@ function getRegisterDetailByCallId() {
             $("#detailCreateOn").text(con.F_CreateOn); //登记时间
             $("#detailComplainedUnitOffice").text(con.F_UnitOffice); //投诉单位办事处
             $("#detailComplaintUndertaker").text(con.F_CaseParty); //投诉案件承办人
-            $("#detailQuestionLevel").text(con.F_CaseParty); //咨询问题级别
+            $("#detailQuestionLevel").text(con.F_ProblemType); //咨询问题级别
             $("#detailQuestionType").text(con.F_ProblemTypeB); //咨询问题类型
             $("#detailCitizenClassification").text(con.F_CitizensType); //市民分类
             $("#detailPutRecord").text(con.F_PutRecord); //是否立案

CallCenterWeb.UI/registrationManagement/registrationList/js/receive.js

@@ -1,24 +0,0 @@
-var id = helper.request.queryString("ids");
-var depId; //部门id
-var depName = ''; //部门name
-$(document).ready(function() {
-    getDepartmentTree()
-})
-
-//保存按钮
-$('.customerSubmit').click(function() {
-    $.post(huayi.config.callcenter_url + 'ATheChangeLog/AddBTheChangeLog', {
-		"token": $.cookie("token"),
-        token: $.cookie("token"),
-		ATheChangeLogid: id,
-    }, function(result) {
-        result = $.parseJSON(result);
-        if(result.state.toLowerCase() == "success") {
-            $("#activess").val(result.data);
-            var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
-            parent.layer.close(index); //再执行关闭
-            parent.layer.msg("保存成功！");
-            parent.$("#registerList").bootstrapTable('refresh');
-        }
-    })
-})

CallCenterWeb.UI/registrationManagement/registrationList/js/registrationList.js

@@ -86,17 +86,18 @@ function formatterOperating(val, row) {
 		'</ul>';
 }
 
-//转移登记
-function formatterOperatingTransfer(val, row) {
+//待接收登记
+function formatterOperatingWaitingReceive(val, row) {
     return '<ul class="tool_downs">' +
-		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_transfer_' + row.F_ID + '" onclick="btn_transfer(\'' + row.F_ID + '\')" title="转移">转移</a></li>' +
+        '<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_receive_' + row.F_ID + '" onclick="btn_receive(\'' + row.F_ID + '\')" title="接收">接收</a></li>' +
+		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_return_' + row.F_ID + '" onclick="btn_return(\'' + row.F_ID + '\')" title="退回">退回</a></li>' +
 		'</ul>';
 }
 
-//接收登记
+//已接收登记
 function formatterOperatingReceive(val, row) {
     return '<ul class="tool_downs">' +
-		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_receive_' + row.F_ID + '" onclick="btn_receive(\'' + row.F_ID + '\')" title="接收">接收</a></li>' +
+        '<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_receive_' + row.F_ID + '" onclick="btn_receive(\'' + row.F_ID + '\')" title="接收">接收</a></li>' +
 		'</ul>';
 }
 
@@ -167,6 +168,32 @@ function btn_receive (id) {
     });
 }
 
+function btn_return (id) {
+    var laye = layer.confirm('您确定要退回吗？', {
+        btn: ['确定', '取消'] //可以无限个按钮
+    }, function () {
+        //按钮【按钮一】的回调
+        $.ajax({
+            type: "post",
+            url: huayi.config.callcenter_url + "ATheChangeLog/BackChangeLog",
+            async: true,
+            dataType: "json",
+            data: {
+                token: $.cookie("token"),
+                ATheChangeLogid: id
+            },
+            success: function (data) {
+                if (data.state.toLowerCase() == 'success') {
+                    layer.msg("退回成功！");
+                    $("#registerList").bootstrapTable('refresh');
+                }
+            }
+        });
+    }, function (index) {
+        //按钮【按钮二】的回调
+        layer.close(laye)
+    });
+}
 
 function btn_delete (id) {
     var laye = layer.confirm('您确定要删除吗？', {

CallCenterWeb.UI/registrationManagement/registrationList/print.html

@@ -4,7 +4,7 @@
 	<head>
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
-		<title>登记人情况</title>
+		<title>登记信息</title>
 		<!--[if lt IE 9]>
 	    <meta http-equiv="refresh" content="0;ie.html" />
 	    <![endif]-->
@@ -212,57 +212,61 @@
 	                            </div>
 	                            <table id="weeklist" class="alignC" border="1" cellpadding="4" cellspacing="0" bordercolor="#cbcbcb">
 									<tr>
-										<td width="20%" height="50px">登记编号</td>
+										<td width="20%" height="80px">登记编号</td>
                                         <td width="30%" id="printRegisterCode"></td>
                                         <td width="20%">登记类型</td>
 										<td width="30%" id="printType"></td>
 									</tr>
 									<tr>
-										<td>姓名</td>
+										<td height="80px">姓名</td>
 										<td id="printName"></td>
+										<td>性别</td>
+										<td id="printSex"></td>
 									</tr>
 									<tr>
-										<td height="50px">性别</td>
-										<td id="printSex"></td>
-										<td>省</td>
+										<td height="80px">省</td>
 										<td id="printProvince"></td>
 										<td>市</td>
 										<td id="printCity"></td>
 									</tr>
 									<tr>
-                                        <td height="50px">县/区</td>
+                                        <td height="80px">县/区</td>
 										<td id="printCounty"></td>
 										<td>详细地址</td>
                                         <td id="printAddress"></td>
-										<td>被投诉单位</td>
-										<td id="printComplained"></td>
 									</tr>
 									<tr>
-                                        <td height="50px">被投诉单位所属办事处</td>
+										<td height="80px">被投诉单位</td>
+										<td id="printComplained"></td>
+										<td >被投诉单位所属办事处</td>
 										<td id="printComplainedUnitOffice"></td>
-										<td>投诉案件承办人</td>
+									</tr>
+									<tr>
+										<td height="80px">投诉案件承办人</td>
                                         <td id="printComplaintUndertaker"></td>
                                         <td>咨询问题级别</td>
                                         <td id="printQuestionLevel"></td>
 									</tr>
 									<tr>
-										<td height="50px">咨询问题类型</td>
+										<td height="80px">咨询问题类型</td>
 										<td id="printQuestionType"></td>
                                         <td>市民分类</td>
 										<td id="printCitizenClassification"></td>
-										<td>是否立案</td>
-                                        <td id="printPutRecord"></td>
 									</tr>
 									<tr>
-										<td height="50px">登记内容/投诉事项</td>
+										<td height="80px">是否立案</td>
+										<td id="printPutRecord"></td>
+										<td >登记内容/投诉事项</td>
 										<td id="printContent"></td>
-										<td >来电备注</td>
-                                        <td id="printRemark"></td>
-                                        <td>登记人</td>
+									</tr>
+									<tr>
+										<td height="80px">来电备注</td>
+										<td id="printRemark"></td>
+										<td>登记人</td>
 										<td id="printCreateBy"></td>
 									</tr>
 									<tr>
-										<td height="50px">登记时间</td>
+										<td height="80px">登记时间</td>
 										<td id="printCreateOn"></td>
 									</tr>
 	                            </table>
@@ -306,7 +310,7 @@
 						$("#printCreateOn").text(con.F_CreateOn); //登记时间
 						$("#printComplainedUnitOffice").text(con.F_UnitOffice); //投诉单位办事处
 						$("#printComplaintUndertaker").text(con.F_CaseParty); //投诉案件承办人
-						$("#printQuestionLevel").text(con.F_CaseParty); //咨询问题级别
+						$("#printQuestionLevel").text(con.F_ProblemType); //咨询问题级别
 						$("#printQuestionType").text(con.F_ProblemTypeB); //咨询问题类型
 						$("#printCitizenClassification").text(con.F_CitizensType); //市民分类
 						$("#printPutRecord").text(con.F_PutRecord); //是否立案

CallCenterWeb.UI/registrationManagement/registrationList/receive.html

@@ -1,133 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <script src="../../Script/Common/huayi.load.js"></script>
-    <script src="../../Script/Common/huayi.config.js"></script>
-    <link rel="stylesheet" href="../../js/zTree/zTreeStyle.css" />
-    <link rel="stylesheet" href="../../css/init.css" />
-    <link rel="stylesheet" href="./css/registrationList.css">
-    <title>编辑</title>
-    <style>
-        ul li {
-            float: initial;
-            list-style: none;
-        }
-        .wrapper-content{
-            padding-right: 60px;
-        }
-        .common {
-            width: 100%;
-            text-align: center;
-            padding: 10px 15px;
-        }
-        .common table {
-            width: 100%;
-        }
-        .common table th {
-            padding: 5px 8px 5px 0;
-            text-align: right;
-        }
-	    .common table td {
-            padding: 6px 0 5px 10px;
-            text-align: left;
-            color: #717171;
-            line-height: 200%;
-        }
-        .common table td textarea {
-            width: 100%;
-            vertical-align: middle;
-            resize: none;
-            outline: none;
-        }
-        .form-group {
-            margin-bottom: 0;
-        }
-        .dropDownTree {
-            border: 1px solid #a9a9a9;
-            height: 27px;
-            width: 55%;
-            display: inline-block;
-            position: relative;
-            vertical-align: middle;
-        }
-        .dropDownTreeInput {
-            width: 100%;
-            height: 24px;
-            outline: none;
-            border: 0;
-            border-image-width: 0;
-            padding: 0;
-            padding-left: 3px;
-        }
-        .dropDownThreeIcon {
-            display: inline-block;
-            background: url(../../img/dropDown.png) no-repeat;
-            height: 100%;
-            background-position: center center;
-            width: 20px;
-            position: absolute;
-            right: 0;
-            top: 0px;
-            background-color: #f7bc8b;
-            cursor: pointer;
-        }
-        
-        .dropDownThreeIcon:hover {
-            background-color: #e6d523;
-        }
-        
-        .dropDownThree {
-            background: #fff;
-            position: absolute;
-            width: 100%;
-            border: 1px solid darkgrey;
-            right: 0;
-            top: 26px;
-            display: none;
-            height: 220px;
-            overflow-y: auto;
-            z-index: 99;
-        }
-    </style>
-</head>
-
-<body class="gray-bg">
-    <div class="clearfix wrapper wrapper-content animated fadeInRight">
-        <div class="common">
-            <table class="customerService">
-            	<tbody>
-                    <tr>
-                        <th>所属部门：</th>
-                        <td>
-                            <div class="dropDownTree">
-                                <input type="text" class="dropDownTreeInput" id="departmentTreeValue"  readonly="readonly"/>
-                                <i class="dropDownThreeIcon dropDownThreeIconDepartment"></i>
-                                <div class="dropDownThree dropDownThreeListDepartment">
-                                    <ul id="departmentTree" class="ztree">
-                                        
-                                    </ul>
-                                </div>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td colspan="8" style="text-align: center;">
-                            <button class="btns customerSubmit">保&nbsp;存</button>
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-        </div>
-    </div>
-
-    <script src="../../js/zTree/jquery.ztree.core.js"></script>
-    <script src="../../js/bootstrap-select/js/bootstrap-select.js"></script>
-    <script src="../../js/comboSelect/jquery.combo.select.js"></script>
-    <script src="../../js/laydate/laydate.js"></script>
-    <script src="./js/transfer.js"></script>
-</body>
-
-</html>

CallCenterWeb.UI/registrationManagement/registrationList/registrationListReceive.html

@@ -110,7 +110,7 @@
                             <th data-field="CreateByName" data-align="center">创建人</th>
 							<th data-field="F_Remark" data-align="center">备注</th>
 							<th data-field="F_CreateOn" data-align="center">创建时间</th>
-							<th data-field="" data-align="center" data-formatter="formatterOperatingReceive">操作</th>
+							<!-- <th data-field="" data-align="center" data-formatter="formatterOperatingReceive">操作</th> -->
 						</tr>
 					</thead>
 				</table>

CallCenterWeb.UI/registrationManagement/registrationList/registrationListTransfer.html

@@ -110,7 +110,7 @@
                             <th data-field="CreateByName" data-align="center">创建人</th>
 							<th data-field="F_Remark" data-align="center">备注</th>
 							<th data-field="F_CreateOn" data-align="center">创建时间</th>
-							<th data-field="" data-align="center" data-formatter="formatterOperatingTransfer">操作</th>
+							<th data-field="" data-align="center" data-formatter="formatterOperatingWaitingReceive">操作</th>
 						</tr>
 					</thead>
 				</table>