巩义BUG修复

WebUI/CallCenterWeb.UI/Business/LeaderDSHTH.html

@@ -127,7 +127,6 @@
                                 <th>审核状态</th>
                             	<td>
                             		<select name="" id="state" class="select" style="width: 50%;">
-                                    <option selected="selected" value="">请选择</option>
                                         <option value="0">待退回审核</option>
                                         <option value="1">退回审核同意</option>
                                         <option value="2">退回审核拒绝</option>

WebUI/CallCenterWeb.UI/Business/WorkYSSH.html

@@ -61,7 +61,6 @@
 									<th>延时审核状态：</th>
 									<td>
 										<select name="" id="state" class="select_">
-											<option selected="selected" value="">请选择</option>
 											<option value="0">待延时审核</option>
 											<option value="1">延时审核通过</option>
 											<option value="2">延时审核拒绝</option>

WebUI/CallCenterWeb.UI/CommonHtml/jiaoban.html

@@ -329,19 +329,8 @@
             	redeployAPI ='WorkOrder/TurnSendWorkOrder'
             } else{
             	redeployAPI ='WorkOrder/AssignWorkOrderNew'
-            }
+            }           
             
-            $(".dropdown").on("focus"," .bs-searchbox input",function () {
-            	alert("!")
-            })
-            document.onkeydown = function(e){ 
-			    var ev = document.all ? window.event : e;
-			    if(ev.keyCode==13) {
-					$(".open  .dropdown-menu").css("display","none")
-			     }
-			    
-			}
-//          .open .dropdown-menu
             //保存
             $('.BC').click(function () {
             	
@@ -386,7 +375,6 @@
                 result = JSON.parse(result);
                 if (result.state.toLowerCase() == "success") {
                     var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
-                    //console.log(index);
                     parent.layer.close(index); //再执行关闭
                     parent.$('#orderlist').bootstrapTable('refresh');
                     var savemsgs = State == 0 ? '保存成功' : '交办成功';
@@ -418,7 +406,6 @@
 	        }, function (result) {
 	            if (result.state.toLowerCase() == "success") {
 	                var content = result.data;
-	                //console.log( content);
 	                if (content.data[0].F_OldWorkOrderId) {
 	                    $(".caseNumber").text(content.data[0].F_OldWorkOrderId); //工单
 	                } else {

WebUI/CallCenterWeb.UI/CommonHtml/updatingFiles.html

@@ -96,7 +96,7 @@
     <div class="Common">
         <table>
             <tr class="files-wrappper">
-                <th class="Importent">上传扫描件：</th>
+                <th class="Importent updatingFiles">上传扫描件：</th>
                 <td colspan="5">
                     <div class="fileBox">
                     </div>
@@ -119,7 +119,18 @@
     <script src="../js/adjustHeight.js"></script>
     <script>
         var wid = helper.request.queryString("wid");
+        var fileType  = helper.request.queryString("fileType"); 
+        console.log(fileType)
         $(document).ready(function () {
+        	if (fileType =="2") {
+        		getFiles()
+        	} else if(fileType =="1"){
+        		$(".updatingFiles").text("上传附件")
+        		getFile()
+        	}else{
+        		getFiles()
+        	}
+        	
             //上传附件
             $("#scwj").click(function () {
                 $("#upFile").trigger("click");
@@ -129,7 +140,14 @@
             })
 
             $(".btns_save").click(function () {
-                JA();
+            	if (fileType =="2") {
+            		JA();
+            	}else if(fileType =="1"){
+            		JAs()
+            	}else{
+            		JA()
+            	}
+                
             });
         })
         function JA(bUnits) {
@@ -142,11 +160,74 @@
                 if (result.state.toLowerCase() == "success") {
                     var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
                     parent.layer.close(index); //再执行关闭
-                    parent.$('#orderlist').bootstrapTable('refresh');
+                    if (fileType) {
+                    	parent.load()
+                    }else{
+                    	parent.$('#orderlist').bootstrapTable('refresh');
+                    }
+                    
                     parent.layer.msg("上传成功");
                 }
             })
         }
+        function JAs(bUnits) {
+            $.post(huayi.config.callcenter_url + 'WorkOrder/saveFile', {
+                fid: wid,
+                file: $("#file").val(),
+                token: $.cookie("token"),
+            }, function (result) {
+                result = JSON.parse(result);
+                if (result.state.toLowerCase() == "success") {
+                    var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
+                    parent.layer.close(index); //再执行关闭
+                    if (fileType) {
+                    	parent.load()
+                    }else{
+                    	parent.$('#orderlist').bootstrapTable('refresh');
+                    }
+                    parent.layer.msg("上传成功");
+                }
+            })
+        }
+//      WorkOrder/getFile
+        function getFiles(){
+        	$.ajax({
+        		type:"get",
+        		url:huayi.config.callcenter_url+"WorkOrder/getFiles",
+        		dataType:"json",
+        		async:true,
+        		data:{
+        			workorderid:wid,
+        			token: $.cookie("token")
+        		},
+        		success:function(res){
+        			if (res.state.toLowerCase() ==="success") {
+        				var dataFile = res.data[0].Files
+        				console.log(dataFile)
+        				getDataFile(dataFile)
+        			}
+        		}
+        	});
+        }
+        function getFile(){
+        	$.ajax({
+        		type:"get",
+        		url:huayi.config.callcenter_url+"WorkOrder/getFile",
+        		dataType:"json",
+        		async:true,
+        		data:{
+        			fid:wid,
+        			token: $.cookie("token")
+        		},
+        		success:function(res){
+        			if (res.state.toLowerCase() ==="success") {
+        				var dataFile = res.data[0].File
+        				console.log(dataFile)
+        				getDataFile(dataFile)
+        			}
+        		}
+        	});
+        }
         //上传文件
         function upload() {
             var Files = document.getElementById("upFile").files;
@@ -179,16 +260,8 @@
 	                        var r = $.parseJSON(result);
 	                        if (r.state.toLowerCase() == "success") {
 	                            $(".fjnr").text(r.data[0].F_FileName);
-	                            var a = r.data;
-	                            $(a).each(function (i, n) {
-	                                var strs = '<span class="files" fiel-num="' + n.F_FileId + '">' + n.F_FileName.substring(19) + '<i class="fa fa-remove del_file"></i></span>'
-	                                $(strs).appendTo($('.fileBox')).find('.del_file').click(function (event) {
-	                                    event.stopPropagation();
-	                                    $(this).parent().remove();
-	                                    file_num()
-	                                })
-	                            })
-	                            file_num();
+	                            var fileData =r.data
+	                            getDataFile(fileData)
 	                        }
 	                    }
 	                });
@@ -213,6 +286,18 @@
             })
             $("#file").val(Str);
         }
+        
+        function getDataFile(getDataFile){
+        	$(getDataFile).each(function (i, n) {
+                var strs = '<span class="files" fiel-num="' + n.F_FileId + '">' + n.F_FileName.substring(19) + '<i class="fa fa-remove del_file"></i></span>'
+                $(strs).appendTo($('.fileBox')).find('.del_file').click(function (event) {
+                    event.stopPropagation();
+                    $(this).parent().remove();
+                    file_num()
+                })
+            })
+        	file_num()
+        }
     </script>
 </body>
 

WebUI/CallCenterWeb.UI/widgets.html

@@ -638,7 +638,7 @@
 				myChart1 = echarts.init(document.getElementById('barbox1'));
 				myChart2 = echarts.init(document.getElementById('barbox2'));
 				initChart(561,myChart1);
-				initChart(571,myChart2);
+				initChart(570,myChart2);
 				
 				laydate.render({
 					elem: '#starttime', //指定元素
@@ -648,7 +648,7 @@
 						stime = value.split(' ~ ')[0]
 						etime = value.split(' ~ ')[1]
 						initChart(561,myChart1,stime,etime);
-						initChart(571,myChart2,stime,etime);
+						initChart(570,myChart2,stime,etime);
 				     }
 				});
 				DL();
@@ -702,6 +702,9 @@
 					title: {
 						text: ''
 					},
+					grid: {
+						y2:85
+					},
 					xAxis: {
 						type: 'category',
 						data: nameArr,