禅道bug修改

CallCenterWeb.UI/SystemManager/js/jueSeQuanXian.js

@@ -8,6 +8,12 @@ $('.search').click(function() {
 	console.log(jsname);
 	initTable(token, jsname)
 })
+$('.searJsz').keypress(function(e){
+	if(e.keyCode==13){
+		jsname = $('.searJsz').val()
+		initTable(token, jsname)
+	}
+})
 //========================添加功能开始=========================
 $('.add').click(function() {
 	$('.addModel').css('display', 'block');

CallCenterWeb.UI/SystemManager/js/yongHuManger.js

@@ -444,7 +444,7 @@ function move(userid) {
 		data: {
 			token: token,
 			ids: userid,
-			state:1
+			state:2
 		},
 		success: function(data) {
 			if(data.state.toLowerCase() == "success") {

CallCenterWeb.UI/TelCall/BlackList.html

@@ -49,8 +49,8 @@
 						<ul>
 							<li>电话号码：<input class="photo x-color" type="text" id="tel" /></li>
 							<li>开始时间：<input class="laydate-icon photo x-color " type="text" id="settime" /></li>
-							<li>
-								<a class="sc_btn  Block" id="sc_btns ">搜索</a>
+							<li id="sc_btns">
+								<a class="sc_btn  Block" >搜索</a>
 							</li>
 						</ul>
 					</div>
@@ -113,6 +113,12 @@
 				$("#sc_btns").click(function() {
 					initTable();
 				})
+				/*回车搜索*/
+				$('#tel').keypress(function(e){
+					if(e.keyCode==13){
+						initTable();
+					}
+				})
 				/*删除内容*/
 				$(".remove").click(function() {
 					var ids = $.map($('#list').bootstrapTable('getSelections'),

CallCenterWeb.UI/TelCall/CallRecord.html

@@ -249,6 +249,13 @@
                 stype = 1;
                 initTable();
             });
+            //回车搜索
+            $('#tel').keypress('onkeyup',function(e){
+            	if(e.keyCode==13){
+            		stype = 1;
+                	initTable();
+            	}
+            })
             //高级搜索s
             $(".Gj").click(function () {
                 var a = "WdatePicker()";

CallCenterWeb.UI/WebSite/Editor.html

@@ -179,6 +179,7 @@
                         </tr>-->
                         <tr>
                             <th>交办单位：</th>
+                            <input type="hidden" name="Departmentid" id="Departmentid" value="" />
                             <td>
                                 区域：
                                 <select name="" id="JArea" class="select">
@@ -285,7 +286,7 @@
                     "token": $.cookie("token")
                 }, function (result) {
                     if (result.state.toLowerCase() == "success") {
-                        var content = result.data;
+                        var content = result.data[0];
                         $("#slzt").val(content.F_ReleaseState);
                         $("#slrq").val(content.F_AcceptTime);
                         $("#fkrq").val(content.F_FeedbackTime);
@@ -293,7 +294,13 @@
                         $('#cljg').val(content.F_Result);
                         $("#fbrq").val(content.F_ReleaseTime); //发布时间
                         $("#hidxxlb").val(content.F_WorkSort);
-                        $("#xxlb").val(content.TypeName3);
+                        $("#xxfl option").text(content.TypeName3);
+                        $("#tsdl option").text(content.TypeName2);
+                        $("#tsxl option").text(content.TypeName1);
+                        $("#JArea option").text(content.F_Deptment3);
+                        $("#Jtype option").text(content.F_Deptment2);
+                        $("#Department option").text(content.F_Deptment1);
+                        $("#Departmentid").val(content.F_Department);
                     }
                 });
             }
@@ -333,6 +340,9 @@
                 $("#tsdl").change(function () {
                     loadDic($("#tsxl"), $("#tsdl").val());
                 });
+                $('#tsxl').change(function(){
+                	$('#hidxxlb').val('')
+                })
             });
             loadArea($("#FArea"));
             loadArea($("#JArea"));
@@ -398,6 +408,9 @@
             $("#FArea").change(function () {
                 $("#sfdz").val($("#FArea").find("option:selected").text());
             })
+            $('#Department').change(function(){
+            	$('#Departmentid').val('')
+            })
             $(".min_select").each(function () {
                 $(this).empty();
                 for (var i = 1; i <= 10; i++) {
@@ -448,12 +461,12 @@
         $("#BaoC").click(function () {
             var workorderid = wid;
             var state = $("#slzt").val();
-            var smalltype = $("#hidxxlb").val();
+            var smalltype = $("#hidxxlb").val()==''?$("#tsxl").val():$("#hidxxlb").val();
             var acceptime = $("#slrq").val();
             var backtime = $("#fkrq").val();
+            var deptid = $("#Departmentid").val()==''?$("#Department").val():$("#Departmentid").val();
             var result = $('#cljg').val();
             var fbtime = $("#fbrq").val();
-
             var obj = $("input[name='jiaoban']:checked");
             var opitionid = obj.val();
             var day = obj.parent().find("select").val();
@@ -467,7 +480,7 @@
             }
 
             $.post(huayi.config.callcenter_url + 'Web/EditRelease', {
-                workorderid: wid, state: state, smalltype: smalltype, acceptime: acceptime,
+                workorderid: wid, state: state, smalltype: smalltype, acceptime: acceptime,deptid:deptid,
                 backtime: backtime, result: result, day: day, opitionid: opitionid, assignedopinion: assignedopinion, "token": $.cookie("token")
             }, function (result) {
                 result = $.parseJSON(result);

CallCenterWeb.UI/WorkOrder/WorkOrderEdit.html

@@ -291,7 +291,7 @@
                         </span>
 						</div>
 
-						<div class="form-group clearfix" style="margin-top:5px;">
+						<!--<div class="form-group clearfix" style="margin-top:5px;">
 							<span class="col-sm-1">
                             备注:
                         </span>
@@ -300,7 +300,7 @@
 									<textarea id="remark"></textarea>
 								</div>
 							</div>
-						</div>
+						</div>-->
 					</div>
 				</div>
 				<div style="margin-top: 10px;">

CallCenterWeb.UI/js/index.js

@@ -262,6 +262,12 @@ $(document).ready(function () {
     $(".searIcon").click(function () {
         loadZSK();
     })
+    //回车搜索
+    $('.search').keypress('onkeyup',function(e){
+    	if(e.keyCode==13){
+    		loadZSK();
+    	}
+    })
     //历史记录查询
     $(".searchbtn").click(function () {
         loadOld();

CallCenterWeb.UI/keHuManager/js/keHuManger.js

@@ -9,6 +9,11 @@
 	$('.search').click(function() {
 		initTable(token);
 	})
+	$('.czName').keypress(function(e){
+		if(e.keyCode==13){
+			initTable(token);
+		}
+	})
 	//==================添加功能开始================================
 	$('.add').click(function() {
 		$('.addModel').css('display', 'block');

CallCenterWeb.UI/zhiShiKu/zhiShiKuManger.html

@@ -372,7 +372,12 @@
             $('.searchGo').click(function () {
                 initTable();
             })
-
+			//回车搜索
+			$('.searCon').keypress(function(e){
+				if(e.keyCode==13){
+					initTable();
+				}
+			})
             //添加按钮
             $('.add').click(function () {
                 $('.addModel').css('display', 'block');