思念bug修改

CallCenterWeb.UI/callScreen/callScreen.html

@@ -370,6 +370,54 @@
 			#old_endTime {
 				width: 128px!important;
 			}
+			.treeList {
+				top: 34px!important;
+				border: 1px solid #e5e6e7!important;
+				border-top: 0;
+				height: auto!important;
+			}
+			
+			#TreeDemo li {
+				float: initial;
+			}
+			
+			#typeclass {
+				background: #fff;
+			}
+			.treeList1 {
+				top: 34px!important;
+				border: 1px solid #e5e6e7!important;
+				border-top: 0;
+				height: auto!important;
+			}
+			
+			#TreeDemo1 li {
+				float: initial;
+			}
+			#typeclass1 {
+				/*background: #fff;*/
+			}
+			#typeclass_market1 {
+				background: #fff;
+			}
+			.addTree1 {
+			    background: #fff;
+			    position: absolute;
+			    width: 100%;
+			    border: 1px solid darkgrey;
+			    right: 0;
+			    top: 26px;
+			    z-index: 10;
+			    display: none;
+			    height: 100px;
+			    overflow-y: auto;
+			}
+			.inps2,.inps3,.inps4{
+				display: none;
+			}
+			.time-box{
+				display: none;
+			}
 		</style>
 		<script>
 			function clearInter() {
@@ -377,6 +425,7 @@
 			}
 			//通话中执行变化
 			var timer, n = 0;
+
 			function calling() {
 				$(".td-call").show();
 				n = 0;
@@ -388,6 +437,7 @@
 					$(".thsc").text(toDub(m) + ":" + toDub(s));
 				}, 1000);
 			}
+
 			function toDub(i) {
 				return i < 10 ? "0" + i : "" + i;
 			}
@@ -460,15 +510,26 @@
 						<tr>
 							<th>姓名：</th>
 							<td>
-								<input type="text" value="" class="ldname khmc" /><input type="hidden" value="" id="khid" />
+								<input type="text" value="" class="ldname khmc" />
+								<input type="hidden" value="" id="khid" />
 							</td>
 						</tr>
 						<tr>
 							<th>省份：</th>
 							<td>
-								<select id="testInput1">
-
-								</select>
+								<input type="text" value="" class="countryName" autocomplete="off"/>
+								<!--<select id="testInput1"></select>-->
+								<div class="time-box" style="position: relative;">
+									<input class="form-control" type="text" id="typeclass1" readonly="readonly" autocomplete="off">
+									<input type="text" class="inps2">
+									<input type="text" class="inps3">
+									<input type="text" class="inps4">
+									<input type="hidden" id="typeclassId1" />
+									<div class="addTree1 treeList1">
+										<ul id="TreeDemo1" class="ztree">
+										</ul>
+									</div>
+								</div>
 							</td>
 						</tr>
 						<tr>
@@ -476,13 +537,6 @@
 							<td><input type="text" value="" class="ldtel1" /></td>
 							<input type="hidden" id="fkdep" />
 						</tr>
-						<tr style="display: none;">
-							<th>来电单位：</th>
-							<td>
-								<select id="testInput2">
-								</select>
-							</td>
-						</tr>
 						<tr>
 							<th>来电时间：</th>
 							<td><span class="ldtime" style="padding-left: 5px;"></span></td>
@@ -514,9 +568,7 @@
 										<thead>
 											<tr>
 												<th data-field="CallNumber">电话号码</th>
-												<th data-field="CusDepName" data-align="center">来电单位</th>
 												<th data-field="CallState" data-formatter="GetCallState">呼叫状态</th>
-												<!--<th data-field="IsDeal" data-formatter="GetDealState">是否处理</th>-->
 												<th data-field="DealType" data-formatter="formatterDealType" data-align="center">处理方式</th>
 												<th data-field="UserCode">坐席工号</th>
 												<th data-field="UserName">坐席姓名</th>
@@ -545,20 +597,15 @@
 									<table id="orderlist" data-row-style="rowStyle" data-query-params="queryParams" data-pagination="true">
 										<thead>
 											<tr>
-												<th data-field="WorkOrderID">工单编号</th>
-												<th data-field="State" data-formatter="GetStateName">工单状态</th>
-												<th data-field="Address" data-align="center">来电单位</th>
-												<th data-field="Source" data-align="center">反馈单位</th>
-												<th data-field="TypeClassName" data-align="center">工单类型</th>
-												<th data-field="Customer" data-align="center">姓名</th>
-												<th data-field="CustomerTel" data-align="center">客户电话</th>
-												<th data-field="CreateTime" data-align="center">创建时间</th>
-												<th data-field="CreateUserNameRel" data-align="center">受理人</th>
-												<th data-field="Detail" data-align="center" data-formatter="Detail">反馈内容及处理结果</th>
-												<!--<th data-field="Files" data-align="center" data-formatter="Detail">快递信息</th>
-												<th data-field="County" data-align="center" data-formatter="Detail">备注一</th>
-												<th data-field="Province" data-align="center" data-formatter="Detail">备注二</th>
-												<th data-field="City" data-align="center" data-formatter="Detail">备注三</th>-->
+												<th data-field="F_WorkOrderId" data-align="center">工单编号</th>
+												<th data-field="F_State" data-formatter="GetStateName" data-align="center">工单状态</th>
+												<th data-field="SourceName" data-align="center">工单来源</th>
+												<th data-field="TypeName" data-align="center">工单类型</th>
+												<th data-field="F_CusName" data-align="center" data-class="E73">姓名</th>
+												<th data-field="F_CusPhone" data-align="center">客户电话</th>
+												<th data-field="F_DealUser" data-align="center">受理人</th>
+												<th data-field="F_CreateTime" data-align="center">创建时间</th>
+												<th data-field="F_Content" data-align="center" data-formatter="Detail" style="width:500px;">反馈内容及处理结果</th>
 											</tr>
 										</thead>
 										<tbody class="list"></tbody>
@@ -568,90 +615,42 @@
 							<div class="Pre-second second-con addgd" style="display:none;">
 								<form>
 									<div class="form-group clearfix">
-										<!--<span class="col-sm-1">
-                                    投诉类型:
-                                </span>
-                                <span class="col-sm-3">
-                                    <select id="tslx">
-                                        <option selected="selected" value=""></option>
-                                    </select>
-                                </span>-->
 										<span class="col-sm-1">
-                                    姓名:
-                                </span>
+                                    		姓名:
+                                		</span>
 										<span class="col-sm-3">
-                                    <input type="text" id="marketName" class="form-control" readonly="readonly" />
-                                </span>
+		                                    <input type="text" id="marketName" class="form-control" readonly="readonly" />
+		                                </span>
 										<span class="col-sm-1">
-                                    电话:
-                                </span>
+		                                    	电话:
+		                                </span>
 										<span class="col-sm-3">
-                                    <input type="text" id="marketTel" class="form-control" readonly="readonly" />
-                                </span>
+		                                    <input type="text" id="marketTel" class="form-control" readonly="readonly" />
+		                                </span>
 									</div>
 									<div class="form-group clearfix">
 										<span class="col-sm-1">
-                                    来电单位:
-                                </span>
+		                                    	工单来源:
+		                                </span>
 										<span class="col-sm-3">
-                                    <input type="text" class="form-control" id="lddepr" readonly="readonly"/>
-                                    <!--<select class="form-control selectpicker" id="lddep_market" data-live-search="true">
-										<option value="">请选择来电单位</option>
-									</select>-->
-                                </span>
+		                                    <select name="" class="form-control" id="DicValueList_market" style="width: 100%;">
+		                                    </select>
+		                                </span>
 										<span class="col-sm-1">
-                                    反馈单位:
-                                </span>
+		                                    	工单类型:
+		                                </span>
 										<span class="col-sm-3">
-                                    <!--<input type="text" id="fkdep" />
-                                    <div class="box" id="box">
-           							  <ul>
-
-          							  </ul>
-        							</div>-->
-        							<select  id="testInput_markfkdep">
-        								<!--<option value="">请选择反馈单位</option>-->
-									</select>
-									<!--<input type="text" id="testInput1_" class="ld-sercon form-control " />
-								<ul class="testInput-list">
-									<li></li>-->
-                                </span>
-									</div>
-
-									<div class="form-group clearfix">
-										<span class="col-sm-1">
-                                    工单来源:
-                                </span>
-										<span class="col-sm-3">
-                                    <select name="" class="form-control" id="DicValueList_market" style="width: 100%;">
-                                    </select>
-                                </span>
-										<span class="col-sm-1">
-                                    工单类型:
-                                </span>
-										<span class="col-sm-3">
-                                    <div class="inpBox" id="organizer_market">
-										<input id="citySel_market" class="inps form-control"  autocomplete="off" style="width: 100%;"/>
-										<input type="hidden" id="OPID_market" />
-										<i class="xl xl_one" id="xl_one_market"></i>
-										<div id="menuContent_market" class="menuContent_market" style="display: none; position: absolute;  z-index: 100;">
-											<ul id="treeDemo_market" class="ztree"></ul>
-										</div>
-									</div>
-                                </span>
+											<select name="" class="form-control orderType1" style="width: 100%;">
+		                                    </select>
+		                                </span>
 									</div>
 
 									<div class="form-group clearfix">
 										<span class="col-sm-1">反馈内容及处理结果:</span>
 										<span class="col-sm-11">
-                                    <textarea rows="5" id="fkcont_market" style="resize: none;" class="form-control"></textarea>
-                                </span>
+		                                    <textarea rows="5" id="fkcont_market" style="resize: none;" class="form-control"></textarea>
+		                                </span>
 									</div>
-
-									<!--<div class="form-group" style="padding-left: 15px;">
-                                <span>解答内容:</span>
-                                <textarea rows="5"></textarea>
-                            </div>-->
 									<div class="form-group text-center">
 										<button type="button" class="bton btn addts">创建</button>
 									</div>
@@ -661,109 +660,79 @@
 								<form>
 									<div class="form-group clearfix">
 										<span class="col-sm-1">
-                                    姓名:
-                                </span>
+		                                    	姓名:
+		                                </span>
 										<span class="col-sm-3">
-                                    <input type="text" class="form-control"  id="callCustomer" readonly="readonly" style="width: 100%;" />
-                                </span>
+		                                    <input type="text" class="form-control"  id="callCustomer"  style="width: 100%;" />
+		                                </span>
 										<span class="col-sm-1">
-                                    电话:
-                                </span>
+		                                    	电话:
+		                                </span>
 										<span class="col-sm-3">
-                                    <input type="text" class="form-control" id="Tel"  readonly="readonly" style="width: 100%;"/>
-                                </span>
-
+		                                    <input type="text" class="form-control" id="Tel"  readonly="readonly" style="width: 100%;"/>
+		                                </span>
 									</div>
 									<div class="form-group clearfix">
 										<span class="col-sm-1">
-                                    来电单位:
-                                </span>
+		                                    	工单来源:
+		                                </span>
 										<span class="col-sm-3">
-                                    <input type="text" class="form-control" id="lddep" readonly="readonly" style="width: 100%;"/>
-                                </span>
+		                                    <select name="" class="form-control" id="DicValueList" style="width: 100%;">
+		                                    </select>
+		                                </span>
 										<span class="col-sm-1">
-                                    反馈单位:
-                                </span>
+		                                    	工单类型:
+		                                </span>
 										<span class="col-sm-3">
-                                    <!--<input type="text" id="fkdep" />
-                                    <div class="box" id="box">
-           							  <ul>
-
-          							  </ul>
-        							</div>-->
-        							<!--<select class="form-control selectpicker" id="fkdep" data-live-search="true">
-										<option value="">请选择反馈单位</option>
-									</select>-->
-									<!--<input type="text" id="testInput_" class="ld-sercon form-control " style="width: 100%;" />
-								<ul class="testInput-list" style="width: 98%;">
-									<li></li>
-								</ul>-->
-								<select name="" id="testInput_cusfkdep">
-									<!--<option value="">请选择反馈单位</option>-->
-								</select>
-                                </span>
+		                                    <div class="inpBox" id="organizer">
+												<input id="citySel" class="inps form-control"  autocomplete="off" style="width: 100%;"/>
+												<input type="hidden" id="OPID" />
+												<i class="xl xl_one" id="xl_one"></i>
+												<div id="menuContent" class="menuContent" style="display: none; position: absolute;  z-index: 100;">
+													<ul id="treeDemo" class="ztree"></ul>
+												</div>
+											</div>
+		                                </span>
 									</div>
 									<div class="form-group clearfix">
 										<span class="col-sm-1">
-                                    工单来源:
-                                </span>
+		                                   	 工单状态:
+		                                </span>
 										<span class="col-sm-3">
-                                    <select name="" class="form-control" id="DicValueList" style="width: 100%;">
-                                    </select>
-                                </span>
-										<span class="col-sm-1">
-                                    工单类型:
-                                </span>
-										<span class="col-sm-3">
-                                    <div class="inpBox" id="organizer">
-										<input id="citySel" class="inps form-control"  autocomplete="off" style="width: 100%;"/>
-										<input type="hidden" id="OPID" />
-										<i class="xl xl_one" id="xl_one"></i>
-										<div id="menuContent" class="menuContent" style="display: none; position: absolute;  z-index: 100;">
-											<ul id="treeDemo" class="ztree"></ul>
-										</div>
-									</div>
-                                </span>
-									</div>
-									<div class="form-group clearfix">
-										<span class="col-sm-1">
-                                    工单状态:
-                                </span>
-										<span class="col-sm-3">
-                                    <select name="" id="State" class="form-control" style="width: 100%;">
-                                    	
-                                    </select>
-                                </span>
+		                                    <select name="" id="State" class="form-control" style="width: 100%;">
+		                                    	
+		                                    </select>
+		                                </span>
 									</div>
 									<div class="form-group clearfix">
 										<span class="col-sm-1">反馈内容及处理结果:</span>
 										<span class="col-sm-11">
-                                    <textarea rows="5" id="fkcont" style="resize: none;" class="form-control"></textarea>
-                                </span>
+		                                    <textarea rows="5" id="fkcont" style="resize: none;" class="form-control"></textarea>
+		                                </span>
 									</div>
 									<div class="form-group clearfix">
 										<span class="col-sm-1">快递信息:</span>
 										<span class="col-sm-11">
-                                    <textarea rows="2" id="sendmsg" style="resize: none;" id="clnr_" class="form-control"></textarea>
-                                </span>
+		                                    <textarea rows="2" id="sendmsg" style="resize: none;" id="clnr_" class="form-control"></textarea>
+		                                </span>
 									</div>
 									<div class="form-group clearfix">
 										<span class="col-sm-1">备注一:</span>
 										<span class="col-sm-11">
-                                    <textarea rows="2" class="form-control" id="note1" style="resize: none;"id="cont"></textarea>
-                                </span>
+		                                    <textarea rows="2" class="form-control" id="note1" style="resize: none;"id="cont"></textarea>
+		                                </span>
 									</div>
 									<div class="form-group clearfix">
 										<span class="col-sm-1">备注二:</span>
 										<span class="col-sm-11">
-                                    <textarea rows="2" class="form-control" id="note2" style="resize: none;"id="cont"></textarea>
-                                </span>
+		                                    <textarea rows="2" class="form-control" id="note2" style="resize: none;"id="cont"></textarea>
+		                                </span>
 									</div>
 									<div class="form-group clearfix">
 										<span class="col-sm-1">备注三:</span>
 										<span class="col-sm-11">
-                                    <textarea rows="2" class="form-control" id="note3"  style="resize: none;"id="cont"></textarea>
-                                </span>
+		                                    <textarea rows="2" class="form-control" id="note3"  style="resize: none;"id="cont"></textarea>
+		                                </span>
 									</div>
 									<div class="form-group text-center">
 										<button type="button" class="bton btn add_">创建</button>
@@ -808,5 +777,4 @@
 		<script src="./../js/main.js?v=1.5"></script>
 		<script src="call.js"></script>
 	</body>
-
 </html>

CallCenterWeb.UI/index.html

@@ -18,7 +18,7 @@
     <link href="./css/plugins/cropper/cropper.min.css" rel="stylesheet">
     <link href="./css/plugins/jasny/jasny-bootstrap.min.css" rel="stylesheet">
     <link href="./js/bootstrap-select/css/bootstrap-select.css" rel="stylesheet" />
-        <script src="./js/jquery.select.js"></script>
+    <script src="./js/jquery.select.js"></script>
     <style>
             @font-face {
                 font-family: 'iconfont';

CallCenterWeb.UI/js/WorkOrder/AddWorkOrder.js

@@ -34,9 +34,6 @@ $(document).ready(function() {
 		elem: '.userDate',
 		theme: '#1ab394',
 		calendar: 'true'
-		//type: 'datetime',
-		//max : 31,
-		//min: 0,
 	});
 	laydate.render({
 		elem: '.buyDate',
@@ -260,11 +257,6 @@ function getOrderSource(obj) {
 //客诉专员
 function ComplaintVip() {
 	var customerType;
-	if(ns==1){
-		customerType=2
-	}else if(ns==2){
-		customerType=1
-	}
 	$.ajax({
 		type: "get",
 		url: huayi.config.callcenter_url + "Customer/GetAllList",
@@ -272,7 +264,7 @@ function ComplaintVip() {
 		async: true,
 		data: {
 			token: $.cookie("token"),
-			type: customerType
+			type: 2
 		},
 		success: function(data) {
 			

CallCenterWeb.UI/regionalManagement/proManagement.html

@@ -74,7 +74,7 @@
 
 					<p style="margin-top: 30px;"><button class="btns sure">确定</button>
 						<button class="btns return">取消</button></p>
-					<p style="color: red;">注：若该分类下包含知识库内容会一并删除</p>
+					<p style="color: red;">注：若该分类下包含区域内容会一并删除</p>
 				</div>
 
 			</div>