Merge branch 'master' of http://192.168.1.222:3000/zhoufan/12345_Base_Web

WebUI/CallCenterWeb.UI/Appeal/AddAppeal.html

@@ -104,8 +104,11 @@
 						<tr>
 							<th>附件上传:</th>
 							<td colspan="7">
+								<div class="fileBox">
+									<!--<span class="files">文件1<i class="fa fa-remove"></i></span>-->
+								</div>
 								<!--<input type="text" placeholder="输入附件详情" style="width:66%" />-->
-								<span class="fjnr"></span>
+								<!--<span class="fjnr"></span>-->
 								<input class="input" type="file" name="upFile" id="upFile" multiple="multiple" style="display: none;">
 								<input class="input" type="button" value="上传" id="scwj" />
 								<input class="input" type="button" value="删除附件" id="scfj" style="display:none;" />
@@ -183,11 +186,8 @@
 					}else{
 						$(".Nows_box").hide();
 					}
-					
 				})
-				
 				$(".BC").click(function() {
-
 					submit = 0;
 					Add();
 				})
@@ -203,8 +203,8 @@
 					upload();
 				})
 				$("#scfj").click(function() {
-					$(".fjnr").text("");
-					$("#scfj").hide();
+//					$(".fjnr").text("");
+//					$("#scfj").hide();
 				})
 			});
 
@@ -228,7 +228,6 @@
 				    layer.msg("请输入直办内容");
 
 				} else {
-
 					$.ajax({
 						type: "post",
 						url: huayi.config.callcenter_url + "/WorkOrder/AddWorkOrder",
@@ -258,8 +257,8 @@
 						},
 						success: function(data) {
 							Clean();
+							$('.fileBox').html('');
 							layer.msg("创建工单成功");
-
 						}
 					});
 				}
@@ -294,19 +293,17 @@
 							});
 							var r = $.parseJSON(result);
 							if(r.state.toLowerCase() == "success") {
-								$(".fjnr").text(r.data[0].F_FileName);
+//								$(".fjnr").text(r.data[0].F_FileName);
 								var a = r.data;
-								var str = '';
-								var Str;
-
 								$(a).each(function(i, n) {
-									console.log(n.F_FileId);
-									str += n.F_FileId + ",";
-									Str = (str.substring(str.length - 1) == ',') ? str.substring(0, str.length - 1) : str;
-									console.log(Str);
+								var strs='<span class="files" fiel-num="'+ n.F_FileId +'">'+ n.F_FileName +'<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").val(Str);
-								$("#scfj").show();
+							file_num()
 							}
 						}
 					});
@@ -316,6 +313,18 @@
 					});
 				}
 			}
+			//上传文件隐藏域值
+			function file_num(){
+				var str = '';
+				var Str;
+				$('.fileBox .files').each(function(j,m){
+					var aa=$(m).attr("fiel-num")
+					console.log(aa);
+					str += aa + ",";
+					Str = (str.substring(str.length - 1) == ',') ? str.substring(0, str.length - 1) : str;
+				})
+				$("#file").val(Str);	
+			}
 			//来源
 			function LY(obj) {
 				obj.empty();

WebUI/CallCenterWeb.UI/Appeal/Lawsuit.html

@@ -658,7 +658,7 @@
 				layer.open({
 					type: 2,
 					content: "../CommonHtml/shizhang.html?wid=" + str, //iframe的url，no代表不显示滚动条
-					title: '领导批示',
+					title: '市长批示',
 					area: ['60%', '80%'], //宽高
 				});
 			}

WebUI/CallCenterWeb.UI/CommonHtml/AddAppeal.html

@@ -91,8 +91,10 @@
 						<tr>
 							<th>附件上传:</th>
 							<td colspan="7">
-								<!--<input type="text" placeholder="输入附件详情" style="width:66%" />-->
-								<span class="fjnr"></span>
+								<div class="fileBox">
+									
+								</div>
+								<!--<span class="fjnr"></span>-->
 								<input class="input" type="file" name="upFile" id="upFile" multiple="multiple" style="display: none;">
 								<input class="input" type="button" value="上传" id="scwj" />
 								<input class="input" type="button" value="删除附件" id="scfj" style="display:none;" />
@@ -185,10 +187,10 @@
 				$("#upFile").change(function() {
 					upload();
 				})
-				$("#scfj").click(function() {
-					$(".fjnr").text("");
-					$("#scfj").hide();
-				})
+//				$("#scfj").click(function() {
+//					$(".fjnr").text("");
+//					$("#scfj").hide();
+//				})
 				$(".SavedSubmit").click(function() {
 					submit = 1;
 					Add()
@@ -227,8 +229,15 @@
 							$(' input[name="banli"][value="' + Data[0].F_IsResult + '"]').prop("checked", "checked");
 							$('#sourceaddress').val(Data[0].F_SourceAddress);
 							$('.F_FinalOpinion').val(Data[0].F_FinalOpinion);
-							console.log(Data);
-
+							$(Data[0].File).each(function(k,q){
+								var strs='<span class="files" fiel-num="'+ q.F_FileId +'">'+ q.F_FileName +'<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()
+							})
 						}
 					})
 
@@ -291,12 +300,25 @@
 								parent.layer.close(index); //再执行关闭
 								parent.load();
 								parent.layer.msg(data.message);
+								$('.fileBox').html('');
 							}
 
 						}
 					});
 				}
 			}
+				//上传文件隐藏域值
+			function file_num(){
+				var str = '';
+				var Str;
+				$('.fileBox .files').each(function(j,m){
+					var aa=$(m).attr("fiel-num")
+					console.log(aa);
+					str += aa + ",";
+					Str = (str.substring(str.length - 1) == ',') ? str.substring(0, str.length - 1) : str;
+				})
+				$("#file").val(Str);	
+			}
 			//来源
 			function LY(obj) {
 				obj.empty();
@@ -387,19 +409,18 @@
 							});
 							var r = $.parseJSON(result);
 							if(r.state.toLowerCase() == "success") {
-								$(".fjnr").text(r.data[0].F_FileName);
 								var a = r.data;
-								var str = '';
-								var Str;
-
 								$(a).each(function(i, n) {
-									console.log(n.F_FileId);
-									str += n.F_FileId + ",";
-									Str = (str.substring(str.length - 1) == ',') ? str.substring(0, str.length - 1) : str;
-									console.log(Str);
+									var strs='<span class="files" fiel-num="'+ n.F_FileId +'">'+ n.F_FileName +'<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").val(Str);
-								$("#scfj").show();
+//								$("#file").val(Str);
+//								$("#scfj").show();
+									file_num()
 							}
 						}
 					});

WebUI/CallCenterWeb.UI/CommonHtml/AddAppeals.html

@@ -98,11 +98,14 @@
 						<tr>
 							<th>附件上传:</th>
 							<td colspan="7">
+								<div class="fileBox">
+									
+								</div>
 								<!--<input type="text" placeholder="输入附件详情" style="width:66%" />-->
-								<span class="fjnr"></span>
+								<!--<span class="fjnr"></span>-->
 								<input class="input" type="file" name="upFile" id="upFile" multiple="multiple" style="display: none;">
 								<input class="input" type="button" value="上传" id="scwj" />
-								<input class="input" type="button" value="删除附件" id="scfj" style="display:none;" />
+								<!--<input class="input" type="button" value="删除附件" id="scfj" style="display:none;" />-->
 								<input type="hidden" id="file" />
 							</td>
 						</tr>
@@ -192,10 +195,10 @@
 				$("#upFile").change(function() {
 					upload();
 				})
-				$("#scfj").click(function() {
-					$(".fjnr").text("");
-					$("#scfj").hide();
-				})
+//				$("#scfj").click(function() {
+//					$(".fjnr").text("");
+//					$("#scfj").hide();
+//				})
 				$(".SavedSubmit").click(function() {
 					submit = 1;
 					Add()
@@ -235,8 +238,15 @@
 							$(' input[name="mj"][value="' + Data[0].F_IsProtect + '"]').prop("checked", "checked");
 							$('.F_SourceAddress').val(Data[0].F_SourceAddress);
 							$('.F_FinalOpinion').val(Data[0].F_FinalOpinion);
-							console.log(Data);
-
+							$(Data[0].File).each(function(k,q){
+								var strs='<span class="files" fiel-num="'+ q.F_FileId +'">'+ q.F_FileName +'<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()
+							})
 						}
 					})
 
@@ -301,6 +311,7 @@
 								parent.layer.close(index); //再执行关闭
 								parent.load();
 								parent.layer.msg(data.message);
+									$('.fileBox').html('');
 							}
 
 						}
@@ -397,19 +408,17 @@
 							});
 							var r = $.parseJSON(result);
 							if(r.state.toLowerCase() == "success") {
-								$(".fjnr").text(r.data[0].F_FileName);
+//								$(".fjnr").text(r.data[0].F_FileName);
 								var a = r.data;
-								var str = '';
-								var Str;
-
 								$(a).each(function(i, n) {
-									console.log(n.F_FileId);
-									str += n.F_FileId + ",";
-									Str = (str.substring(str.length - 1) == ',') ? str.substring(0, str.length - 1) : str;
-									console.log(Str);
+									var strs='<span class="files" fiel-num="'+ n.F_FileId +'">'+ n.F_FileName +'<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").val(Str);
-								$("#scfj").show();
+								file_num();
 							}
 						}
 					});
@@ -419,6 +428,18 @@
 					});
 				}
 			}
+					//上传文件隐藏域值
+			function file_num(){
+				var str = '';
+				var Str;
+				$('.fileBox .files').each(function(j,m){
+					var aa=$(m).attr("fiel-num")
+					console.log(aa);
+					str += aa + ",";
+					Str = (str.substring(str.length - 1) == ',') ? str.substring(0, str.length - 1) : str;
+				})
+				$("#file").val(Str);	
+			}
 		</script>
 	</body>
 

WebUI/CallCenterWeb.UI/CommonHtml/Leader.html

@@ -39,10 +39,13 @@
 				<tr>
 					<th>附件上传:</th>
 					<td colspan="7">
-						<span class="fjnr"></span>
+						<!--<span class="fjnr"></span>-->
+							<div class="fileBox">
+							
+						</div>
 								<input class="input" type="file" name="upFile" id="upFile" multiple="multiple" style="display: none;">
 								<input class="input" type="button" value="上传" id="scwj" />
-								<input class="input" type="button" value="删除附件" id="scfj" style="display:none;" />
+								<!--<input class="input" type="button" value="删除附件" id="scfj" style="display:none;" />-->
 								<input type="hidden" id="file" />
 					</td>
 				</tr>
@@ -63,10 +66,10 @@
 				$("#upFile").change(function() {
 					upload();
 				})
-				$("#scfj").click(function() {
-					$(".fjnr").text("");
-					$("#scfj").hide();
-				})
+//				$("#scfj").click(function() {
+//					$(".fjnr").text("");
+//					$("#scfj").hide();
+//				})
 				$(".btns").click(function(){
 					JA();
 				})
@@ -88,6 +91,7 @@
                     parent.layer.close(index); //再执行关闭
 						  parent.load();
 						  parent.layer.msg("操作成功");
+						  $('.fileBox').html('');
                   	
 					}
 				})
@@ -120,19 +124,16 @@
 							});
 							var r = $.parseJSON(result);
 							if(r.state.toLowerCase() == "success") {
-								$(".fjnr").text(r.data[0].F_FileName);
 								var a = r.data;
-								var str = '';
-								var Str;
-
 								$(a).each(function(i, n) {
-									console.log(n.F_FileId);
-									str += n.F_FileId + ",";
-									Str = (str.substring(str.length - 1) == ',') ? str.substring(0, str.length - 1) : str;
-									console.log(Str);
+									var strs='<span class="files" fiel-num="'+ n.F_FileId +'">'+ n.F_FileName +'<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").val(Str);
-								$("#scfj").show();
+								file_num();
 							}
 						}
 					});
@@ -142,6 +143,22 @@
 					});
 				}
 			}
+			
+			
+			//上传文件隐藏域值
+			function file_num(){
+				var str = '';
+				var Str;
+				$('.fileBox .files').each(function(j,m){
+					var aa=$(m).attr("fiel-num")
+					console.log(aa);
+					str += aa + ",";
+					Str = (str.substring(str.length - 1) == ',') ? str.substring(0, str.length - 1) : str;
+				})
+				$("#file").val(Str);	
+			}
+			
+			
 		</script>
 	</body>
 

WebUI/CallCenterWeb.UI/CommonHtml/Supervision_.html

@@ -35,11 +35,14 @@
 				<tr>
 					<th>附件上传:</th>
 					<td colspan="7">
-						<span class="fjnr"></span>
-								<input class="input" type="file" name="upFile" id="upFile" multiple="multiple" style="display: none;">
-								<input class="input" type="button" value="上传" id="scwj" />
-								<input class="input" type="button" value="删除附件" id="scfj" style="display:none;" />
-								<input type="hidden" id="file" />
+						<!--<span class="fjnr"></span>-->
+						<div class="fileBox">
+									<!--<span class="files">文件1<i class="fa fa-remove"></i></span>-->
+						</div>
+						<input class="input" type="file" name="upFile" id="upFile" multiple="multiple" style="display: none;">
+						<input class="input" type="button" value="上传" id="scwj" />
+						<input class="input" type="button" value="删除附件" id="scfj" style="display:none;" />
+						<input type="hidden" id="file" />
 					</td>
 				</tr>
 			</table>
@@ -83,10 +86,10 @@
 				$("#upFile").change(function() {
 					upload();
 				})
-				$("#scfj").click(function() {
-					$(".fjnr").text("");
-					$("#scfj").hide();
-				})
+//				$("#scfj").click(function() {
+//					$(".fjnr").text("");
+//					$("#scfj").hide();
+//				})
 			})
 			//督察
 			function JA() {
@@ -104,7 +107,7 @@
 						parent.layer.close(index); //再执行关闭
 						parent.load();
 						parent.layer.msg("操作成功");
-
+							$('.fileBox').html('');
 					}
 				})
 			}
@@ -139,17 +142,18 @@
 							if(r.state.toLowerCase() == "success") {
 								$(".fjnr").text(r.data[0].F_FileName);
 								var a = r.data;
-								var str = '';
-								var Str;
+//								var str = '';
+//								var Str;
 
 								$(a).each(function(i, n) {
-									console.log(n.F_FileId);
-									str += n.F_FileId + ",";
-									Str = (str.substring(str.length - 1) == ',') ? str.substring(0, str.length - 1) : str;
-									console.log(Str);
+									var strs='<span class="files" fiel-num="'+ n.F_FileId +'">'+ n.F_FileName +'<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").val(Str);
-								$("#scfj").show();
+								file_num();
 							}
 						}
 					});
@@ -159,6 +163,19 @@
 					});
 				}
 			}
+			
+				//上传文件隐藏域值
+			function file_num(){
+				var str = '';
+				var Str;
+				$('.fileBox .files').each(function(j,m){
+					var aa=$(m).attr("fiel-num")
+					console.log(aa);
+					str += aa + ",";
+					Str = (str.substring(str.length - 1) == ',') ? str.substring(0, str.length - 1) : str;
+				})
+				$("#file").val(Str);	
+			}
 		</script>
 	</body>
 

WebUI/CallCenterWeb.UI/CommonHtml/XGwordel.html

@@ -91,11 +91,14 @@
 						<tr>
 							<th>附件上传:</th>
 							<td colspan="7">
+								<div class="fileBox">
+									
+								</div>
 								<!--<input type="text" placeholder="输入附件详情" style="width:66%" />-->
-								<span class="fjnr"></span>
+								<!--<span class="fjnr"></span>-->
 								<input class="input" type="file" name="upFile" id="upFile" multiple="multiple" style="display: none;">
 								<input class="input" type="button" value="上传" id="scwj" />
-								<input class="input" type="button" value="删除附件" id="scfj" style="display:none;" />
+								<!--<input class="input" type="button" value="删除附件" id="scfj" style="display:none;" />-->
 								<input type="hidden" id="file" />
 							</td>
 						</tr>
@@ -173,10 +176,10 @@
 				$("#upFile").change(function() {
 					upload();
 				})
-				$("#scfj").click(function() {
-					$(".fjnr").text("");
-					$("#scfj").hide();
-				})
+//				$("#scfj").click(function() {
+//					$(".fjnr").text("");
+//					$("#scfj").hide();
+//				})
 				$(".SavedSubmit").click(function() {
 					submit = 1;
 					Add()
@@ -215,8 +218,15 @@
 							
 							$('#sourceaddress').val(Data[0].F_SourceAddress);
 							$('.F_FinalOpinion').val(Data[0].F_FinalOpinion);
-							console.log(Data);
-
+							$(Data[0].File).each(function(k,q){
+								var strs='<span class="files" fiel-num="'+ q.F_FileId +'">'+ q.F_FileName +'<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()
+							})
 						}
 					})
 
@@ -274,6 +284,8 @@
 								parent.layer.close(index); //再执行关闭
 								parent.load();
 								parent.layer.msg(data.message);
+								$('.fileBox').html('');
+								
 							}
 
 						}
@@ -370,19 +382,16 @@
 							});
 							var r = $.parseJSON(result);
 							if(r.state.toLowerCase() == "success") {
-								$(".fjnr").text(r.data[0].F_FileName);
 								var a = r.data;
-								var str = '';
-								var Str;
-
 								$(a).each(function(i, n) {
-									console.log(n.F_FileId);
-									str += n.F_FileId + ",";
-									Str = (str.substring(str.length - 1) == ',') ? str.substring(0, str.length - 1) : str;
-									console.log(Str);
+									var strs='<span class="files" fiel-num="'+ n.F_FileId +'">'+ n.F_FileName +'<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").val(Str);
-								$("#scfj").show();
+									file_num();
 							}
 						}
 					});
@@ -392,6 +401,18 @@
 					});
 				}
 			}
+					//上传文件隐藏域值
+			function file_num(){
+				var str = '';
+				var Str;
+				$('.fileBox .files').each(function(j,m){
+					var aa=$(m).attr("fiel-num")
+					console.log(aa);
+					str += aa + ",";
+					Str = (str.substring(str.length - 1) == ',') ? str.substring(0, str.length - 1) : str;
+				})
+				$("#file").val(Str);	
+			}
 		</script>
 	</body>
 

WebUI/CallCenterWeb.UI/CommonHtml/shizhang.html

@@ -35,7 +35,9 @@
 				<tr>
 					<th class="Importent">附件:</th>
 					<td> 
-						<span class="fjnr"></span>
+						<div class="fileBox">
+							
+						</div>
 								<input class="input" type="file" name="upFile" id="upFile" multiple="multiple" style="display: none;">
 								<input class="input" type="button" value="上传" id="scwj" />
 								<input class="input" type="button" value="删除附件" id="scfj" style="display:none;" />
@@ -63,10 +65,10 @@
 				$("#upFile").change(function() {
 					upload();
 				})
-				$("#scfj").click(function() {
-					$(".fjnr").text("");
-					$("#scfj").hide();
-				})
+//				$("#scfj").click(function() {
+//					$(".fjnr").text("");
+//					$("#scfj").hide();
+//				})
 				$(".btns").click(function(){
 					if($("#superopinion").val()==''){
 						layer.msg("意见不能为空");
@@ -92,7 +94,7 @@
                     parent.layer.close(index); //再执行关闭
 						  parent.load();
 						  parent.layer.msg("操作成功");
-                  	
+						  $('.fileBox').html('');
 					}
 				})
 			}
@@ -125,19 +127,16 @@
 							});
 							var r = $.parseJSON(result);
 							if(r.state.toLowerCase() == "success") {
-								$(".fjnr").text(r.data[0].F_FileName);
 								var a = r.data;
-								var str = '';
-								var Str;
-
 								$(a).each(function(i, n) {
-									console.log(n.F_FileId);
-									str += n.F_FileId + ",";
-									Str = (str.substring(str.length - 1) == ',') ? str.substring(0, str.length - 1) : str;
-									console.log(Str);
+									var strs='<span class="files" fiel-num="'+ n.F_FileId +'">'+ n.F_FileName +'<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").val(Str);
-								$("#scfj").show();
+							file_num();
 							}
 						}
 					});
@@ -147,6 +146,19 @@
 					});
 				}
 			}
+			
+				//上传文件隐藏域值
+			function file_num(){
+				var str = '';
+				var Str;
+				$('.fileBox .files').each(function(j,m){
+					var aa=$(m).attr("fiel-num")
+					console.log(aa);
+					str += aa + ",";
+					Str = (str.substring(str.length - 1) == ',') ? str.substring(0, str.length - 1) : str;
+				})
+				$("#file").val(Str);	
+			}
 		</script>
 	</body>
 

WebUI/CallCenterWeb.UI/YeWu/businessBrief.html

@@ -10,6 +10,7 @@
     <link href="../css/init.css" rel="stylesheet" />
     <script src="../js/laydate/laydate.js"></script>
     <script src="../js/jquery.table2excel.js"></script>
+    <!--<script src="../js/excellentexport.js"></script>-->
     <style>
         .Shows {
             display: block !important;
@@ -211,6 +212,7 @@
                                 <span class="time-box"><i class="tub fa fa-calendar"></i><input class="photo x-color inputs laydate-icon" type="text" id="endTimes_1" /></span>
                                 <button class="btns search_1">查询</button>
                                 <button class="btns export_1">导出</button>
+                                <!--<a id="export_1" class="btns export_1" href="">导出</a>-->
                             </div>
                         </div>
                         <!--startprint1-->
@@ -539,6 +541,7 @@
                                 <span class="time-box"><i class="tub fa fa-calendar"></i><input class="photo x-color inputs laydate-icon" type="text" id="monthDateTimes" /></span>
                                 <button class="btns search_2">查询</button>
                                 <button class="btns export_2">导出</button>
+                                <!--<a id="export_2" class="btns export_2" href="">导出</a>-->
                             </div>
                         </div>
                         <!--startprint2-->
@@ -994,6 +997,22 @@
             initTableBrief(briefIndex);
         });
         $(".export_1").click(function () {
+
+            //var url = huayi.config.callcenter_url + "DataAnalysis/GetSimpleReport?token=" + $.cookie("token");
+            //url += "&html=" + encodeURIComponent($("#weeklist").html()) + "&isdc=1";
+            //$(".export_1").attr('href', url);
+
+            //return ExcellentExport.convert({
+            //    anchor: 'export_1',
+            //    filename: '业务简报周报',
+            //    format: 'xlsx'
+            //}, [{
+            //    name: 'Sheet',
+            //    from: {
+            //        table: 'weeklist'
+            //    }
+            //}]);
+
             $("#weeklist").table2excel({
                 exclude: ".noExl",
                 name: "业务简报周报",
@@ -1004,6 +1023,16 @@
             });
         });
         $(".export_2").click(function () {
+            //return ExcellentExport.convert({
+            //    anchor: 'export_2',
+            //    filename: '业务简报月报',
+            //    format: 'xlsx'
+            //}, [{
+            //    name: 'Sheet',
+            //    from: {
+            //        table: 'monthlist'
+            //    }
+            //}]);
             $("#monthlist").table2excel({
                 exclude: ".noExl",
                 name: "业务简报月报",

WebUI/CallCenterWeb.UI/css/init.css

@@ -280,11 +280,44 @@
 	background-color: #00A1CB;
 }
 .Reds{
-				color:#ed5565;
-			}
-			.Greens{
-				color: #46be8a;
-			}
-			.Yellows{
-				color: #FF9800;
-			}
+		color:#ed5565;
+	}
+	.Greens{
+		color: #46be8a;
+	}
+	.Yellows{
+		color: #FF9800;
+	}
+	/*工单上传附件*/
+	.files{
+			display: inline-block;
+			background: #666;
+		    color: #fff!important;
+		    font-size: 12px;
+		    padding: 0 5px!important;
+			border: 0!important;
+			margin-left: 8px!important;
+			    margin-bottom: 3px;
+		}
+		.files i{
+			margin-left: 3px;
+			color: #a9a5a5;
+			cursor: pointer;
+		}
+		.files:hover i{
+			color: #fff;
+		}
+		#scwj{
+			padding: 0 12px!important;
+			outline: none;
+		}
+		#scwj:hover{
+			background: #03a0cb;
+			color: #fff;
+			transition: .25s;
+		}
+		.fileBox{
+			display: inline-block;
+		}
+
+

WebUI/CallCenterWeb.UI/css/wh.css

@@ -85,7 +85,6 @@ body {
     display: none !important;
    
 }
-
 .img {
     display: block;
     width: 27px;
@@ -95,11 +94,9 @@ body {
     right: 0;
     top: 15px;
 }
-
 .WH_Itop {
     position: relative;
 }
-
     .WH_Itop input {
         width: 100%;
         font-size: 30px;

WebUI/CallCenterWeb.UI/index.html

@@ -1185,7 +1185,7 @@
 						<li><span style="font-size: 20px;" class="khgsd"></span></li>
 						<!-- <li class="nikeName"><i></i><span class="ldname">未知</span><i></i></li>-->
 						<li style="color: #4cd964;">当前通话时长：<span class="thsc">00:00</span></li>
-						<li class="lahei">
+						<li class="lahei" style="display: none;">
 							<div class="la-before"><i class="push"></i> 移至黑名单</div>
 							<div class="la-after" style="display: none;">
 								<p class="la-time">拉黑时间：<span class="lhtime"></span></p>

WebUI/CallCenterWeb.UI/js/main.js

@@ -1494,15 +1494,31 @@ function loadZSK() {
 		if(result.state.toLowerCase() == "success") {
 			$(".ldcr-bottom .detail-con ul").empty();
 			$(result.data).each(function(i, n) {
-				var html = '<li>' +
+				var key_w=$(".search").val();
+			 		if(key_w){
+			 			var after_w=n.F_Title.replace(key_w,'<span style="color:red;">'+ key_w +'</span>');
+			 			var html = '<li>' +
 					'   <div class="zhishi-title clearfix">' +
-					'	    <a href="javascript:void(0);" >' + n.F_Title + '</a>' +
+					'	    <a href="javascript:void(0);" class="titless" >' + after_w+ '</a>'+
 					'	    <em >' + n.F_CreateOn + '</em>' +
 					'   </div>' +
 					'   <div class="explancon">' +
 					n.F_Content +
 					'   </div>' +
 					'</li>';
+			 		}else{
+			 			var html = '<li>' +
+					'   <div class="zhishi-title clearfix">' +
+					'	    <a href="javascript:void(0);" class="titless" >' + n.F_Title+ '</a>'+
+					'	    <em >' + n.F_CreateOn + '</em>' +
+					'   </div>' +
+					'   <div class="explancon">' +
+					n.F_Content +
+					'   </div>' +
+					'</li>';
+			 		}
+
+					
 				$(html).appendTo($(".ldcr-bottom .detail-con ul")).find(".zhishi-title").click(function(event) {
 					event.stopPropagation();
 					if($(this).hasClass("active")) {
@@ -1514,9 +1530,9 @@ function loadZSK() {
 				})
 			})
 		}
+		
 	})
 }
-
 //外呼弹屏
 function whtp() {
 	$("#Result").val("");