2.1.9

CallCenterWeb.UI/.project

@@ -33,5 +33,14 @@
 				<arguments>1.0-name-matches-false-false-node_modules</arguments>
 			</matcher>
 		</filter>
+		<filter>
+			<id>1662709930781</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
+			</matcher>
+		</filter>
 	</filteredResources>
 </projectDescription>

CallCenterWeb.UI/TelCall/CallRecord.html

@@ -323,6 +323,7 @@
 							<!--<th data-field="IsDeal" data-formatter="isDeal" data-align="center">是否处理</th>-->
 							<th data-field="UserCode" data-align="center">坐席工号</th>
 							<th data-field="UserName" data-align="center">坐席姓名</th>
+							<th data-field="RingLongTime" data-formatter="setLongTime" data-align="center">响铃时长（S）</th>							
 							<th data-field="BeginTime" data-align="center">开始时间</th>
 							<th data-field="TalkStartTime" data-align="center">通话开始时间</th>
 							<th data-field="TalkEndTime" data-align="center">通话结束时间</th>
@@ -507,6 +508,13 @@
 					return '';
 				}
 			}
+			function setLongTime(val,row){
+				if(val==-1){
+					return '-'
+				}else{
+					return row.RingLongTime
+				}
+			}
 			//编号
 			function Code(val, row, index) {
 				return index + 1;

CallCenterWeb.UI/WorkOrder/WorkOrderDeal.html

@@ -210,6 +210,7 @@
 			</div>
 			<div class="clearfix wh_btn">
 				<input type="button" value="确定" class=" btns" id="clgd" />
+				<input type="button" value="保存" class=" btns" id="bcgd" />
 			</div>
 		</div>
 		<script src="../js/autosize/autosize.js"></script>

CallCenterWeb.UI/js/WorkOrder/WorkDeal.js

@@ -2,6 +2,7 @@
  * 工单处理
  * */
 
+var buttontype = '';
 $(document).ready(function() {
 	var deptId = '';
 	var ID = helper.request.queryString("str");
@@ -29,6 +30,12 @@ $(document).ready(function() {
 	// 	});
 	//点击确定
 	$("#clgd").click(function() {
+		buttontype = ''
+		dealWorkOrder(ID);
+	});
+	//点击保存
+	$("#bcgd").click(function() {
+		buttontype = 1
 		dealWorkOrder(ID);
 	});
 
@@ -75,8 +82,8 @@ function getWorkOrderInfo(oid) {
 				$("#t_remarks").val(Str[0].Remark); //string 否 备注
 				$('#xl_box').val(Str[0].InfoTypeID); //问题分类
 				$(".xl_boxs").val(Str[0].Unit); //交办单位
-
 				$('#clbmname').val(Str[0].UnitID); //部门
+				$("#cont").val(Str[0].clcontent);
 				deptId = Str[0].UnitID
 				if (deptId) {
 					getUserListByDepartment($('#clidname'), deptId, con.data.item[0].ToUser)
@@ -171,6 +178,7 @@ function dealWorkOrder(oid) {
 		infotypedetailid: $('#xq_rdwt').val(),
 		clbm: $("#clbmname").val(), //string	否	处理部门
 		clgh: $("#clidname").val(), //string	否	处理人
+		buttontype:buttontype,
 
 		token: $.cookie("token")
 	}, function(result) {

CallCenterWeb.UI/js/WorkOrder/WorkOrder.js

@@ -411,7 +411,7 @@ function getRY(obj, deptid) {
 }
 
 function Appoint(val, row) {
-	return czhtml(val, row, "处理");
+	return czhtml(val, row, "处理","删除");
 }
 
 function Dispose(val, row) {
@@ -430,8 +430,9 @@ function Comment(val, row) {
 	return czhtmls(val, row, "评论");
 }
 
-function czhtml(val, row, str) {
-	return '<div class="imgs" ><a class="xg" itemstr=\'' + JSON.stringify(row) + '\' onclick= oper("' + val + '",this) >' + str + '</a></div>';
+function czhtml(val, row, str,strs) {
+	return '<div class="imgs" ><a class="xg" itemstr=\'' + JSON.stringify(row) + '\' onclick= oper("' + val + '",this) >' + str + '</a></div>'+
+	'<div class="imgs" ><a class="xg" itemstr=\'' + JSON.stringify(row) + '\' onclick= deleteOrder("' + row.ID + '",this) >' + strs + '</a></div>';
 }
 
 function czhtmls(val, row, str) {
@@ -447,6 +448,28 @@ function oper(val, obj) {
 	})
 
 }
+//删除
+function deleteOrder(val,obj) {
+	layer.confirm('您确定要删除吗？', {
+		btn: ['是', '否'] //按钮
+	}, function() {
+		/*发送请求*/
+		$.ajax({
+			type: "post",
+			url: huayi.config.callcenter_url + "WorkOrder/DelWorkOrder",
+			dataType: 'json',
+			data: {
+				id: val,
+				token: $.cookie("token")
+			},
+			async: true,
+			success: function(data) {
+				layer.msg("删除成功");
+				initTable();
+			}
+		});
+	});
+}
 //导出pdf
 function export2pdf(wid) {
 	layer.open({