心连修改

CallCenterWeb.UI/ReportForm/SalesBase_list.html

@@ -212,6 +212,12 @@
 									width: '',
 								},
 								{
+									field: 'cheyong',
+									title: '车用尿素',
+									align: 'center',
+									width: '',
+								},
+								{
 									field: 'total',
 									title: '合计',
 									align: 'center',

CallCenterWeb.UI/ReportForm/feedback.html

@@ -5,11 +5,7 @@
 
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
-
 		<title>反馈类型明细表</title>
-		<!--[if lt IE 9]>
-	    <meta http-equiv="refresh" content="0;ie.html" />
-	    <![endif]-->
 		<script src="../Script/Common/huayi.load.js"></script>
 		<script src="../Script/Common/huayi.config.js"></script>
 		<link rel="stylesheet" href="../js/layui/css/layui.css" />
@@ -65,18 +61,6 @@
 							<i class="tub fa fa-calendar"></i>
 							<input class="form-control" type="text" id="startTime" placeholder="请选择起止时间" style="width: 228px;">
 						</div>
-						<!-- <div class="time-box form-group">
-							销售基地：
-							<select id="bumen">
-								<option value="">请选择</option>
-							</select>
-						</div>
-						<div class="time-box form-group">
-							渠道类型：
-							<select id="channel">
-								<option value="">请选择</option>
-							</select>
-						</div> -->
 						<div class="form-group tool_bars pull-right">
 							<button class="btns sear">搜索</button>
 							<a class="btns export">导出</a>
@@ -115,20 +99,12 @@
 				getTableDataList(); //获取表格数据
 				//搜索事件
 				$(".sear").click(function() {
-					// dpt = $('#bumen').val();
-					// channel = $('#channel').val();
-					// dpt = dpt === null ? '' : dpt;
-					// channel = channel === null ? '' : channel;
 					stime = $('#startTime').val() && $('#startTime').val().split(' ~ ')[0];
 					endtime = $('#startTime').val() && $('#startTime').val().split(' ~ ')[1];
 					getTableDataList(); //获取表格数据
 				});
 				//导出
 				$('.export').click(function() {
-					// dpt = $('#bumen').val();
-					// channel = $('#channel').val();
-					//dpt = dpt === null ? '' : dpt;
-					//channel = channel === null ? '' : channel;
 					stime = $('#startTime').val() && $('#startTime').val().split(' ~ ')[0];
 					endtime = $('#startTime').val() && $('#startTime').val().split(' ~ ')[1];
 					dcexcel(this);
@@ -173,14 +149,6 @@
 					   	page:true,
 						cols: [
 							[
-								// {
-								// 	field: 'CreatOn',
-								// 	title: '时间',
-								// 	align: 'center',
-								// 	fixed: true,
-								// 	//sort: true,
-								// 	width: 150,
-								// }, 
 								{
 									field: 'typename',
 									title: '反馈类型',
@@ -212,6 +180,12 @@
 									width: '',
 								},
 								{
+									field: 'cheyongniaosu',
+									title: '车用尿素',
+									align: 'center',
+									width: '',
+								},
+								{
 									field: 'immediate',
 									title: '即时办结率',
 									align: 'center',

CallCenterWeb.UI/WorkOrder/AddKehuOrder.html

@@ -246,12 +246,14 @@
 						<div class="form-group col-md-4">
 							<label for="order_handle">您的姓名：</label>
 							<input type="text" class="form-control input-sm" id="kehuxing" placeholder="请输入姓名">
+							<span style="color: #FF0000;">*</span>
 						</div>
 					</div>
 					<div class="form-group col-md-12">
 						<div class="form-group col-md-4">
 							<label for="order_handle">您的电话：</label>
 							<input type="text" class="form-control input-sm" id="kehudian" placeholder="请输入电话" maxlength="11" onkeyup="this.value=this.value.replace(/\D/g,'')">
+							<span style="color: #FF0000;">*</span>
 						</div>
 					</div>
 					<div class="form-group col-md-12">
@@ -266,12 +268,14 @@
 						<div class="form-group col-md-8">
 							<label for="order_tel">详细地址：</label>
 							<textarea id="xiangxi" rows="3" cols="20" class="form-control" placeholder="请输入详细地址"></textarea>
+							<span style="color: #FF0000;">*</span>
 						</div>
 					</div>
 					<div class="form-group col-md-12">
 						<div class="form-group col-md-8">
 							<label for="order_reception">问题描述：</label>
 							<textarea id="reception" rows="3" cols="20" class="form-control" placeholder="请输入问题描述"></textarea>
+							<span style="color: #FF0000;">*</span>
 						</div>	
 					</div>
 					<div class=" form-group col-md-12">

CallCenterWeb.UI/WorkOrder/AddWorkOrder.html

@@ -354,23 +354,21 @@
 						<label class="col-md-1">工单类型：</label>
 						<div id="order_isover" class="col-md-6 r_order_type">
 							<label class="radio-inline">
-											   <input type="radio" name="type" value="1" checked="checked"> 咨询
-											</label>
+							   <input type="radio" name="type" value="1" checked="checked"> 咨询
+							</label>
 							<label class="radio-inline">
-											   <input type="radio" name="type" value="2" > 投诉
-											</label>
+							   <input type="radio" name="type" value="2" > 投诉
+							</label>
 							<label class="radio-inline">
-											   <input type="radio" name="type" value="3" > 抽检
-											</label>
+							   <input type="radio" name="type" value="3" > 抽检
+							</label>
 							<label class="radio-inline">
-									           <input type="radio" name="type" value="4" > 建议及其他
-									        </label>
+					           <input type="radio" name="type" value="4" > 建议及其他
+					        </label>
 						</div>
 					</div>
-
 					<!-- //咨询模块 -->
 					<div class="form-group col-md-12" id="PageArrival" style="border-bottom:1px dashed #00A1CB;">
-
 						<div id="zixunlb">
 							<div class="form-group col-md-4" id="">
 								<label for="order_handle">问题类别：</label>
@@ -453,28 +451,9 @@
 							</select>
 						</div>
 						<div id="" class="form-group col-md-12" style="border-bottom: 1px dashed #00A1CB;"></div>
-						<!-- <div class="form-group col-md-4">
-											<label for="order_tel">配方：</label>
-											<input type="text" class="form-control input-sm" id="formula" placeholder="请输入配方">
-										</div> -->
 					</div>
 					<!-- //抽检模块 -->
 					<div class="form-group col-md-12" id="Depth">
-
-						<!-- <div id=""class="form-group col-md-12">
-												<label class="col-md-1" for="order_handle">问题类别：</label>
-												<div id="checked" class="col-md-3  r_order_type">
-													<label class="radio-inline">
-													   <input type="radio" name="type_go" value="养分" checked="checked">养分
-													</label>
-													<label class="radio-inline">
-													   <input type="radio" name="type_go" value="标识" > 标识
-													</label>
-													<label class="radio-inline">
-													   <input type="radio" name="type_go" value="公关" > 公关
-													</label>
-												</div>
-											</div> -->
 						<div class="form-group col-md-4">
 							<label for="order_handle">问题类别：</label>
 							<select class="form-control input-sm " id="chou_wtlb">
@@ -625,37 +604,15 @@
 									<option selected="selected" value="">请选择</option>
 								</select>
 							</div>
-
 							<div class="form-group col-md-4">
 								<label for="order_tel">经营品牌：</label>
 								<input type="text" class="form-control input-sm" id="manage" placeholder="请输入经营品牌">
 							</div>
+							<div class="form-group col-md-4">
+								<label for="order_tel">公司名称：</label>
+								<input type="text" class="form-control input-sm" id="F_CompanyName" placeholder="请输入公司名称">
+							</div>
 						</div>
-						<!-- <div id="client" style="display: none;">
-							     		<div class="form-group col-md-4">
-							     			<label for="order_tel">业务员：</label>
-							     			<span id="xinyong"></span>
-							     		</div>
-							     		<div class="form-group col-md-4">
-							     			<label for="order_tel">电话：</label>
-							     			<span id="jingying"></span>
-							     
-							     		</div>
-							     		<div class="form-group col-md-4">
-							     			<label for="order_tel">大区：</label>
-							     			<span id="daquu"></span>
-							     
-							     		</div>
-							     		<div class="form-group col-md-4">
-							     			<label for="order_tel">分公司：</label>
-							     			<span id="fengong"></span>
-							     
-							     		</div>
-							     		<div class="form-group col-md-4">
-							     			<label for="order_tel">经营品牌：</label>
-							     			<span id="gement"></span>
-							     		</div>
-							     	</div> -->
 					</div>
 
 					<div id="wlmcc" class="form-group col-md-12" style="border-bottom:1px dashed #00A1CB; display: none;">
@@ -766,10 +723,6 @@
 							<label for="order_handle">客户电话：</label>
 							<input type="text" class="form-control input-sm" id="kehudian" placeholder="请输入电话" maxlength="11" onkeyup="this.value=this.value.replace(/\D/g,'')">
 						</div>
-						<!-- <div class="form-group col-md-4" id="">
-										<label for="order_handle">公司名称：</label>
-										<input type="text" class="form-control input-sm" id="gonsi" placeholder="请输入公司名称">
-									</div> -->
 					</div>
 
 					<div class="form-group col-md-12" id="" style="border-bottom:1px dashed #00A1CB;">
@@ -825,14 +778,13 @@
 						<label class="col-md-2">是否指派：</label>
 						<div id="designate" class="col-md-6 r_order_type">
 							<label class="radio-inline">
-											   <input type="radio" name="nate" value="指派" checked="checked"> 指派
-											</label>
+							   <input type="radio" name="nate" value="指派" checked="checked"> 指派
+							</label>
 							<label class="radio-inline">
-											   <input type="radio" name="nate" value="不指派" > 不指派
-											</label>
+							   <input type="radio" name="nate" value="不指派" > 不指派
+							</label>
 						</div>
 					</div>
-
 					<div id="appoint" class="codeDiv">
 						<div class="form-group col-md-12 clearfix">
 							<label class="col-md-2">超时时限：</label>

CallCenterWeb.UI/WorkOrder/template/orderDetails.html

@@ -164,6 +164,10 @@
 					<td>
 						<span id="client_tyicu"></span>
 					</td>
+					<th>公司名称：</th>
+					<td>
+						<span id="F_CompanyName"></span>
+					</td>
 				</tr>
 				<tr style="display: none;" class="bianhao1">
 					<th>物料编码：</th>

CallCenterWeb.UI/callScreen/call.js

@@ -247,20 +247,11 @@ function getCustomer() {
 					$("#laixiang").find("option:selected").text(customerBase.F_AddressTownship); //县
 					$("#channel").find("option:selected").text(customerBase.F_Channel); //乡镇
 					$("#company_name").find("option:selected").text(customerBase.F_CompanyName); //乡镇
+					$("#company_name_add").val(customerBase.F_CompanyName); //公司名称
 					$("#laixiangxi").val(customerBase.F_AddressFull); //详细地址
-
 					$("#kehuxing").val(customerBase.F_Legal)
-					// $('input[name="sexxx"][value="' + customerBase.F_Gender + '"]').prop("checked", "checked");//男女
 					$("#kehudian").val(customerBase.F_LegalPhone)
 					$('#head_form_customer_id').val(customerBase.F_CustomerId); //客户id  CustomerBase
-					//					$("#sheng").text(customerBase.F_AddressProvince); //省
-					//					$("#shi").find("option:selected").text(customerBase.F_AddressCity); //市
-					//					$("#quxian").find("option:selected").text(customerBase.F_AddressCountry); //区
-					//					$("#xiang").find("option:selected").text(customerBase.F_AddressTownship); //县
-					//					$("#channel").find("option:selected").text(customerBase.F_Channel); //乡镇
-					//					$("#company_name").find("option:selected").text(customerBase.F_CompanyName); //乡镇
-					//					$("#qdlxin").find("option:selected").text(customerBase.F_Channel); //渠道类型
-
 					$("#xiangxi").val(customerBase.F_AddressFull); //详细地址
 
 					//获取对应的联系人信息
@@ -393,7 +384,6 @@ function getCustomerLists(paramPage, cid) {
 //清空head_form
 function headFormClean() {
 	//左侧信息清空；
-	// $('#head_form_customer_id').val('');
 	$('.head_form').find('.form-control').val('');
 	$('#head_form_tel').val(phoneNumber);
 }
@@ -407,14 +397,6 @@ function headFormSave() {
 		});
 		return;
 	}
-	// 	if(!regexs.phone.test($.trim($('#head_form_tel').val()))) {
-	// 		layer.confirm('请输入正确的电话！', {
-	// 			icon: 2,
-	// 			btn: ['确定']
-	// 		});
-	// 		return;
-	// 	}
-
 	$.post(huayi.config.callcenter_url + 'CustomerNew/AddContact', {
 		F_CustomerId: $('#head_form_customer_id').val(), // int客户id
 		F_Name: $('#head_form_name').val(), //string 联系人姓名
@@ -434,10 +416,8 @@ function headFormSave() {
 //知识库查询
 $(".searIcon").click(function() {
 	otext=$(".search").val();
-	
 	loadZSK();
 });
-//
 //回车搜索
 $('.search').on('keypress',function(event){
 	if(event.keyCode == 13){
@@ -445,24 +425,6 @@ $('.search').on('keypress',function(event){
 		loadZSK();
 	}
 })
-//$(".detail-con ul").on('mouseover mouseout','li',function(){
-//	if(event.type == "mouseover"){
-//		console.log(otext)
-//		$(this).children(".explancon").show()
-//		if (otext) {
-//			var regExp = new RegExp(otext, 'g'); 
-//			$('.explancon').each(function() 
-//				{
-//				var html = $(this).html();
-//				var newHtml = html.replace(regExp, '<a class="highlight" >' + otext + '</a>'); 
-//
-//				$(this).html(newHtml); 
-//			});
-//		}
-// 	}else if(event.type == "mouseout"){
-// 		$(this).children(".explancon").hide()
-// 	}
-//})
 
 //获取知识库
 function loadZSK() {
@@ -550,6 +512,7 @@ function getCustomerDetail() {
 			if(cusBase) {
 				$('#customer_code').text(cusBase.F_CustomerCode); //string 客户编号
 				$('#customer_companyname').text(cusBase.F_CompanyName); //string 公司名称
+				$("#company_name_add").val(cusBase.F_CompanyName); //公司名称
 				$('#customer_comaddress').text(cusBase.F_CompanyAddress); //string 公司地址
 				$('#customer_legalName').text(cusBase.F_LegalName); //string 法人姓名
 				if(cusBase.F_LegalTel) {
@@ -903,51 +866,6 @@ function formatterAuditUser(val) {
 	}
 }
 
-//新建工单 保存
-function orderSave() {
-	// if(!regexs.userNameReg.test($.trim($('#order_name').val()))) {
-	// 	layer.confirm('请输入有效的客户姓名（2-20位汉字可以包含·•）！', {
-	// 		icon: 2,
-	// 		btn: ['确定']
-	// 	});
-	// 	return;
-	// }
-	// 
-	var order_handle = $('#order_handles').is(':visible') ? $('#order_handle').val() : 0,
-		order_transfer_dept = $('#order_transfer_dept').attr('data-id'), //int 接收部门
-		order_receiveUser = $('#order_receiveUser').val(); //int 接收人
-	if($('#order_isover').find('input[type="radio"]:checked').val() === '1') {
-		order_transfer_dept = 0;
-		order_receiveUser = 0;
-	}
-	$.post(huayi.config.callcenter_url + 'CallInScreen/AddWorkOrder', {
-		callid: CallID, //string； -此参数可根据来电弹屏时的客户绑定
-		customerid: $('#head_form_customer_id').attr('data-cid'), //int 客户id； -此参数可根据来电弹屏时的客户绑定
-		source: $('#order_source').val(), //int 工单来源-下拉，数据来源：数据字典GDLY；
-		gdlx: $('#order_type').find('input[type="radio"]:checked').val(), //int 工单类型-单选，数据来源：数据字典GDLX；
-		ywlx: order_handle, //int 业务办理-下拉，工单类型选择“业务办理”时数据来源：数据字典GDLX，工单类型选择“投诉”时数据是投诉，传值ID与工单类型一致
-		callCustomer: $('#order_name').val(), //string 客户姓名； -此参数可根据来电弹屏时的客户绑定
-		tel: phoneNumber, //string 联系电话 ； -此参数可根据来电弹屏时的客户绑定
-		company: $('#order_company').val(), // 公司名称
-		fkcont: $('#order_reception').val(), //string 反馈内容；
-		iseffective: $('#order_iseffective').find('input[type="radio"]:checked').val(), //int 是否有效工单项(0有效，1无效)；
-		note: $('#order_note').val(), //string 无效工单必填备注；
-		clbm: order_transfer_dept, //int 接收部门；
-		clid: order_receiveUser, //int 接收人；
-		auditusercode: $('#order_audit').val(), //string 办理人工号；
-		isover: $('#order_isover').find('input[type="radio"]:checked').val(), //int 是否立即处理（默认为0，立即处理为1，立即处理的工单无法指派接收人和接受部门）
-		token: $.cookie("token")
-	}, function(result) {
-		result = $.parseJSON(result);
-		if(result.state.toLowerCase() === "success") {
-			cleanOrderForm(); //清空新增工单的数据
-			$('.ld-service').find('li.KF').trigger('click'); //进入历史工单页面
-			top.workcount();
-			layer.msg("保存成功");
-		}
-	})
-}
-
 //来电弹屏输入清空
 function cleanOrde() {
 	$('#head_form_custom').val(''); //客户姓名
@@ -1243,7 +1161,7 @@ function orderSave() {
 		//公共字段
 		F_CusName: $('#kehuxing').val(), //客户姓名
 		F_CusPhone: $('#kehudian').val(), //客户电话
-		F_CompanyName: $('#gonsi').val(), //公司名称
+		F_CompanyName: $('#company_name_add').val(), //公司名称
 		F_IncidentProvince: $('#sheng').val(), //string 省
 		F_IncidentCity: $('#shi').val(), // 市
 		F_IncidentCountry: $('#quxian').val(), //区/县

CallCenterWeb.UI/callScreen/callScreen.html

@@ -217,6 +217,7 @@
 										</select>
 									</div>
 								</div>
+								
 								<div class="form-group">
 									<label for=" telephone" class="col-sm-4 control-label">年销量</label>
 									<div class="col-sm-8">
@@ -561,6 +562,11 @@
 												<label for="order_tel">经营品牌：</label>
 												<input type="text" class="form-control input-sm" id="manage" placeholder="请输入经营品牌">
 											</div>
+											<div class="form-group col-md-4">
+												<label for="order_tel">公司名称：</label>
+												<input type="text" class="form-control input-sm" id="company_name_add" placeholder="请输入公司名称">
+											</div>
+											
 										</div>
 										<!-- <div id="client" style="display: none;">
 							     		<div class="form-group col-md-4">
@@ -697,10 +703,7 @@
 											<label for="order_handle">客户电话：</label>
 											<input type="text" class="form-control input-sm" id="kehudian" placeholder="请输入电话" maxlength="11" onkeyup="this.value=this.value.replace(/\D/g,'')">
 										</div>
-										<div class="form-group col-md-4" id="gioncti" style="display: none;">
-											<label for="order_handle">公司名称：</label>
-											<input type="text" class="form-control input-sm" id="gonsi" placeholder="请输入公司名称">
-										</div>
+										
 									</div>
 
 									<div class="form-group col-md-12" id="" style="border-bottom:1px dashed #00A1CB;">

CallCenterWeb.UI/commonTpl/addOrEditWorkOrder.html

@@ -15,7 +15,6 @@
 					display: none;
 				}
 			</style>
-		</head>
 	</head>
 
 	<body>
@@ -324,32 +323,12 @@
 				     			<label for="order_tel">经营品牌：</label>
 				     			<input type="text" class="form-control input-sm" id="manage" placeholder="请输入经营品牌">
 				     		</div>
-				     	</div>
-				     	<!-- <div id="client" style="display: none;">
-				     		<div class="form-group col-md-4">
-				     			<label for="order_tel">业务员：</label>
-				     			<span id="xinyong"></span>
-				     		</div>
-				     		<div class="form-group col-md-4">
-				     			<label for="order_tel">电话：</label>
-				     			<span id="jingying"></span>
-				     
-				     		</div>
 				     		<div class="form-group col-md-4">
-				     			<label for="order_tel">大区：</label>
-				     			<span id="daquu"></span>
-				     
+				     			<label for="order_tel">公司名称：</label>
+				     			<input type="text" class="form-control input-sm" id="order_company" placeholder="请输入公司名称">
 				     		</div>
-				     		<div class="form-group col-md-4">
-				     			<label for="order_tel">分公司：</label>
-				     			<span id="fengong"></span>
-				     
-				     		</div>
-				     		<div class="form-group col-md-4">
-				     			<label for="order_tel">经营品牌：</label>
-				     			<span id="gement"></span>
-				     		</div>
-				     	</div> -->
+				     		
+				     	</div>
 				     </div>
 				     
 				     <div id="wlmcc" class="form-group col-md-12" style="border-bottom:1px dashed #00A1CB; display: none;">
@@ -504,8 +483,6 @@
 						<textarea id="reception" rows="3" cols="20" class="form-control" placeholder="请输入问题描述"></textarea>
 					</div>
 					
-					
-				
 					<div class="form-group text-center col-sm-12">
 						<button type="button" class="btn btn-primary btn-sm" id="save_order">保存</button>
 					</div>
@@ -520,7 +497,6 @@
 		<script src="../js/bootstrap-treeview/bootstrap-treeview.min.js"></script>
 		<script src="../Script/Common/regexs.js"></script>
 		<script src="../js/WorkOrder/addOrEditWorkOrder.js"></script>
-		<!--<script src="../js/WorkOrder/addOrEdit.js"></script>-->
 	</body>
 
 </html>

CallCenterWeb.UI/js/WorkOrder/AddWorkOrder.js

@@ -128,6 +128,7 @@ function orderSave() {
 				           F_BranchName: $('#chfen').val(),//分公司
 				           F_Brands: $('#manage').val(),//经营品牌
 							 F_WorkerBrand: $('#about_brand').val(),//品牌
+							 F_CompanyName: $('#F_CompanyName').val(),//公司名称
 					       
 					         F_MaterialID: $('#Code').val(),//客户编号
 					         F_CustomerID: $('#number').val(),//客户编号

CallCenterWeb.UI/js/WorkOrder/WorkOrder.js

@@ -1164,10 +1164,10 @@ function getWorkOrderDetails() {
 		        $("#client_ciont").text(data.F_CustomerID); //客户编号 ........
 				$("#client_wich").text(data.F_Salesman); //业务员
 				$("#client_bnum").text(data.F_SalesPhone); //电话
-				$("#client_xlx").text(data.client_xlx); //经营品牌
+				$("#client_xlx").text(data.F_Brands); //经营品牌
 				$("#client_uict").text(data.F_AreaName); //大区
 				$("#client_tyicu").text(data.F_BranchName); //分公司
-				
+				$("#F_CompanyName").text(data.F_CompanyName); //公司
 				$("#client_citon").text(data.F_MaterialID); //物料编码
 				$("#client_ituec").text(data.F_MaterialName); //物料名称
 				$("#client_uitio").text(data.F_Model); //型号

CallCenterWeb.UI/js/WorkOrder/addOrEditWorkOrder.js

@@ -14,10 +14,6 @@ $(function() {
 				getWorkOrderDetails(oid); //获取工单信息
 			}
 		});
-
-	// 	//新增工单创建
-	// 	$('#save_order').on('click', orderSave);
-	// 
 });
 //**所有input去掉自动填充
 $(function(){                               
@@ -153,7 +149,7 @@ function orderSave() {
 		F_ID: oid, //int 工单id；
 		F_Source: $('#godanlx').val(), // 工单来源
 		F_WorkOrderCode: $('#gdbian').val(), // 工单编号
-		// F_CompanyName: $('#order_company').val(),// 公司名称  
+		F_CompanyName: $('#order_company').val(),// 公司名称  
 		F_Type: $('#order_isover').find('input[type="radio"]:checked').val(), //工单类型
 		//公共字段
 		F_CusName: $('#kehuxing').val(), //客户姓名
@@ -306,8 +302,7 @@ function getWorkOrderDetails(oid) {
 				$('#enter_formula').val(data.F_TS_Formula); //配方
 				$('#kehuxing').val(data.F_CusName); //客户姓名
 				$('#kehudian').val(data.F_CusPhone); //客户电话
-				$('#gonsi').val(data.F_CompanyName), //公司名称
-					//$("#sheng").val(data.F_IncidentProvince);// 省
+				$('#order_company').val(data.F_CompanyName), //公司名称
 				$("#sheng option:selected").text(data.F_IncidentProvince); // 省
 				$("#sheng option:selected").val(data.F_IncidentProvince); // 省
 				$("#shi option:selected").val(data.F_IncidentCity); // 市

CallCenterWeb.UI/keHuManager/customerInfo.html

@@ -34,10 +34,6 @@
 			<div class="toolBox clearfix">
 				<div class="pull-left">
 					<div class="form-inline">
-						<!-- <div class="time-box form-group">
-							<i class="tub fa fa-calendar"></i>
-							<input class="form-control search_time" type="text" id="sc_time" placeholder="请选择起止时间">
-						</div> -->
 						<div class="form-group">
 							<select class="form-control" id="customer_comaddress"></select>
 						</div>
@@ -73,45 +69,8 @@
 						<div class="form-group">
 							<input type="text" class="form-control" id="sc_layer" placeholder="请输入电话" />
 						</div>
-						<!-- <div class="form-group">
-							<input type="text" class="form-control" id="sc_key" placeholder="请输入关键词" />
-						</div>
-						<div class="form-group">
-							<input type="text" class="form-control" id="sc_code" placeholder="请输入客户编号" />
-						</div>
-						<div class="form-group">
-							<input type="text" class="form-control" id="sc_cmpname" placeholder="请输入公司名称" />
-						</div>
-						<div class="form-group">
-							<input type="text" class="form-control" id="sc_compaddress" placeholder="请输入公司地址" />
-						</div>
-						<div class="form-group">
-							<input type="text" class="form-control" id="sc_legname" placeholder="请输入法人姓名" />
-						</div>
-						<div class="form-group">
-							<input type="text" class="form-control" id="sc_legtel" placeholder="请输入法人电话" />
-						</div>
-						<div class="form-group">
-							<input type="text" class="form-control" id="sc_bedept" placeholder="请输入客户归属部门" />
-						</div>
-						<div class="form-group">
-							<input type="text" class="form-control" id="sc_berelacc" placeholder="请输入归属涉税会计" />
-						</div>
-						<div class="form-group">
-							<input type="text" class="form-control" id="sc_beaudacc" placeholder="请输入归属办理会计" />
-						</div>
-						<div class="form-group">
-							<input type="text" class="form-control" id="sc_bemakeacc" placeholder="请输入归属做账会计" />
-						</div>
-						<div class="form-group">
-							<input type="text" class="form-control" id="sc_conname" placeholder="请输入联系人姓名" />
-						</div>
-						<div class="form-group">
-							<input type="text" class="form-control" id="sc_contel" placeholder="请输入联系人电话" />
-						</div> -->
 					</div>
 				</div>
-
 				<div class="pull-right tool_bars">
 					<button class="btns" id="sc_btns">搜索</button>
 					<button class="btns" id="btn_add">添加</button>

CallCenterWeb.UI/login.html

@@ -12,9 +12,6 @@
 		<link href="./css/bootstrap.min14ed.css?v=3.3.6" rel="stylesheet" type="text/css">
 		<link href="./css/animate.min.css" rel="stylesheet" type="text/css" />
 		<link href="./css/login.min.css" rel="stylesheet">
-		<!--[if lt IE 9]>
-    		<meta http-equiv="refresh" content="0;ie.html" />
-    	<![endif]-->
 		<style>
 			.login_panel_footer .footer_text::before{width:50px;}
 			.login_panel_footer .footer_text::after{width:50px;}
@@ -70,13 +67,7 @@
 		</div>
 		
 		<div class="footer text-center">
-			<p>
-				<!-- <a href="ExeWork/LeCallCenterSetup.exe" rel="nofollow" title="下载客户端">下载客户端</a> | 
-				<a href="ExeWork/Microsoft.NET4.0.exe" rel="nofollow" title="下载安装环境">下载安装环境</a> | 
-				<a href="ExeWork/vcredist_x86.exe" rel="nofollow" title="安装异常补充包">安装异常补充包</a> | -->
-				<!--技术服务热线：0371-88888517-->
-			</p>
-			<!--<p class="copyright">Copyright &copy; 2010-2020  华谊科技 版权所有</p>-->
+			<p></p>
 		</div>
 		<script src="Script/Common/huayi.config.js"></script>
 		<script language="javascript" type="text/javascript" src="./js/jquery.min.js?v=2.1.4"></script>

CallCenterWeb.UI/zhiShiKu/js/zhiShiKuManger.js

@@ -128,6 +128,7 @@ function setCode(val, row, index) {
 
 //点击标题 内容查看详情
 function btn_detail(seeid) {
+	var otext = $('.searCon').val();
 	layer.open({
 		type: 2,
 		title: '查看知识库',
@@ -139,7 +140,7 @@ function btn_detail(seeid) {
 		moveOut: false, //拖拽到窗口外
 		//resize: true,//是否允许拉伸
 		area: ['70%', '90%'],
-		content: 'template/seeDetail.html?changeGetid=' + seeid
+		content: 'template/seeDetail.html?changeGetid=' + seeid+'&otext='+otext
 	});
 }
 

CallCenterWeb.UI/zhiShiKu/zhiShiKuChaXun.html

@@ -98,7 +98,6 @@
 					<table id="table1" data-row-style="rowStyle" data-query-params="queryParams" data-pagination="true">
 						<thead>
 							<tr>
-								<!--<th data-field="state" data-checkbox="true" data-align="center"></th>-->
 								<th data-align="center" data-formatter="setCode">编号</th>
 								<th data-field="F_Title" data-align="left" data-formatter="oper">标题</th>
 								<th data-field="F_Content" data-align="left" data-formatter="oper">内容</th>
@@ -148,10 +147,10 @@
 					onClick: zTreeOnClick
 				}
 			};
-
 			initTable();
 			/*获取选中行对象*/
 			table.on("click-row.bs.table", function(e, row, ele) {
+				var otext = $('.searCon').val();
 				$('.success').removeClass('success'); //去除之前选中的行的，选中样式
 				$(ele).addClass('success'); //添加当前选中的 success样式用于区别
 				var seeid = row.F_RepositoryId;
@@ -166,7 +165,7 @@
 					moveOut: true, //拖拽到窗口外
 					//resize: true,//是否允许拉伸
 					area: ['70%', '90%'],
-					content: 'template/seeDetail.html?changeGetid=' + seeid + ''
+					content: 'template/seeDetail.html?changeGetid=' + seeid + ''+'&otext='+otext
 				});
 			});
 
@@ -182,7 +181,6 @@
 					});
 					return;
 				}
-
 			});
 
 		});

CallCenterWeb.UI/zhiShiKu/zhiShiKuManger.html

@@ -56,7 +56,6 @@
 							<tr>
 								<th data-field="state" data-checkbox="true" data-align="center"></th>
 								<th data-align="center" data-formatter="setCode">编号</th>
-								<!--<th data-align="center" data-field="id" data-formatter="setCode"></th>-->
 								<th data-field="F_Title" data-formatter="formatterTitle" data-align="left">标题</th>
 								<th data-field="F_Description" data-align="left" data-formatter="oper">内容</th>
 								<th data-field="F_KeyWords" data-formatter="formatterKey" data-align="center">关键字</th>

WebChartNewEdit/Script/Common/huayi.config.js

@@ -2,7 +2,9 @@
     var huayi = {};
 }
 huayi.config = {
-    callcenter_url: "http://192.168.4.18:4673/",//生产环境
+	
+	callcenter_url: "http://101.200.123.179:8889/",//生产环境
+    //callcenter_url: "http://192.168.4.18:4673/",//生产环境
     //callcenter_url: "http://101.200.123.179:8889/",//生产环境
     //callcenter_url: "http://121.196.219.217:8040/",//生产环境
     //callcenter_data: "http://192.168.4.18:4032/",//市县选择