首頁 探索 說明
註冊 登入
zhengbingbing
/
XinXiangXLX_UI
關註 1
讚好 0
複刻 0
代碼 問題管理 0 合併請求 0 提交歷史 734 版本發佈 0 Wiki
瀏覽代碼

Merge branch 'master' of http://192.168.1.222:3000/zhengbingbing/XinXiangXLX_UI

miaofuhao 6 年之前
父節點
404ef960a3 ef00057705
當前提交
448ecacf4e
共有 11 個文件被更改，包括 112 次插入 和 62 次删除
分割檢視 顯示文件統計
  1. 2 2
      CallCenterWeb.UI/WorkOrder/WorkOrderClient.html
  2. 2 2
      CallCenterWeb.UI/WorkOrder/WorkOrderDispose.html
  3. 2 2
      CallCenterWeb.UI/WorkOrder/WorkOrderEmployees.html
  4. 2 2
      CallCenterWeb.UI/WorkOrder/WorkOrderPending.html
  5. 2 2
      CallCenterWeb.UI/WorkOrder/WorkOrderReceive.html
  6. 2 2
      CallCenterWeb.UI/WorkOrder/WorkOrderWchartList.html
  7. 14 14
      CallCenterWeb.UI/WorkOrder/template/orderDetails.html
  8. 2 4
      CallCenterWeb.UI/commonTpl/AppExtension.html
  9. 1 1
      CallCenterWeb.UI/commonTpl/WorkOrderTransfer.html
  10. 7 1
      CallCenterWeb.UI/js/WorkOrder/AppExtension.js
  11. 76 30
      CallCenterWeb.UI/js/WorkOrder/WorkOrder.js

+ 2 - 2
CallCenterWeb.UI/WorkOrder/WorkOrderClient.html
查看文件 

@@ -1,4 +1,4 @@
1 
-<!DOCTYPE html>
1 
+<!DOCTYPE html>
2 2 
 <html>
3 3
4 4 
 	<head>
 
@@ -82,7 +82,7 @@
82 82 
 							<th data-field="F_SalesBase" data-align="center">销售基地</th>
83 83 
 							<th data-field="F_AreaName" data-align="center">大区</th>
84 84 
 							<th data-field="F_BranchName" data-align="center">分公司</th>
85 
-							<th data-field="F_ZX_ProName" data-align="center">产品名称</th>
85 
+							<th data-field="F_TS_Category" data-align="center">产品名称</th><!--F_ZX_ProName-->
86 86 
 							<th data-field="F_Brand" data-align="center">品牌</th>
87 87 
 							<th data-field="F_Craft" data-align="center">工艺</th>
88 88

+ 2 - 2
CallCenterWeb.UI/WorkOrder/WorkOrderDispose.html
查看文件 

@@ -1,4 +1,4 @@
1 
-<!DOCTYPE html>
1 
+<!DOCTYPE html>
2 2 
 <html>
3 3
4 4 
 	<head>
 
@@ -79,7 +79,7 @@
79 79 
 							<th data-field="TypeClassName" data-align="center">业务办理</th>
80 80 
 							<th data-field="F_CusName" data-align="center">客户姓名</th>
81 81 
 							<th data-field="F_CusPhone" data-formatter="helper.filter.cutTel" data-align="center">客户电话</th>
82 
-							<th data-field="F_Brands" data-align="center">产品名称</th>
82 
+							<th data-field="F_TS_Category" data-align="center">产品名称</th>
83 83 
 							<th data-field="F_DealContent" data-align="center">处理详情</th>
84 84 
 							<th data-field="F_UserName" data-align="center">指派人</th>
85 85 
 							<th data-field="F_UserCode" data-align="center">工号</th>

+ 2 - 2
CallCenterWeb.UI/WorkOrder/WorkOrderEmployees.html
查看文件 

@@ -1,4 +1,4 @@
1 
-<!DOCTYPE html>
1 
+<!DOCTYPE html>
2 2 
 <html>
3 3
4 4 
 	<head>
 
@@ -82,7 +82,7 @@
82 82 
 							<th data-field="F_SalesBase" data-align="center">销售基地</th>
83 83 
 							<th data-field="F_AreaName" data-align="center">大区</th>
84 84 
 							<th data-field="F_BranchName" data-align="center">分公司</th>
85 
-							<th data-field="F_ZX_ProName" data-align="center">产品名称</th>
85 
+							<th data-field="F_TS_Category" data-align="center">产品名称</th><!--F_ZX_ProName-->
86 86 
 							<th data-field="F_Brand" data-align="center">品牌</th>
87 87 
 							<th data-field="F_Craft" data-align="center">工艺</th>
88 88

+ 2 - 2
CallCenterWeb.UI/WorkOrder/WorkOrderPending.html
查看文件 

@@ -1,4 +1,4 @@
1 
-<!DOCTYPE html>
1 
+<!DOCTYPE html>
2 2 
 <html>
3 3
4 4 
 	<head>
 
@@ -79,7 +79,7 @@
79 79 
 							<th data-field="F_Salesman" data-align="center">业务员</th>
80 80 
 							<th data-field="F_CusName" data-align="center">客户姓名</th>
81 81 
 							<th data-field="F_CusPhone" data-formatter="helper.filter.cutTel" data-align="center">客户电话</th>
82 
-							<th data-field="F_ZX_ProName" data-align="center">产品名称</th>
82 
+							<th data-field="F_TS_Category" data-align="center">产品名称</th><!--F_ZX_ProName-->
83 83 
 							<th data-field="F_Brand" data-align="center">品牌</th>
84 84 
 							<th data-field="F_Craft" data-align="center">工艺</th>
85 85 
 							<th data-field="F_AreaName" data-align="center">大区</th>

+ 2 - 2
CallCenterWeb.UI/WorkOrder/WorkOrderReceive.html
查看文件 

@@ -1,4 +1,4 @@
1 
-<!DOCTYPE html>
1 
+<!DOCTYPE html>
2 2 
 <html>
3 3
4 4 
 	<head>
 
@@ -79,7 +79,7 @@
79 79 
 							<th data-field="F_Salesman" data-align="center">业务员</th>
80 80 
 							<th data-field="F_CusName" data-align="center">客户姓名</th>
81 81 
 							<th data-field="F_CusPhone" data-formatter="helper.filter.cutTel" data-align="center">客户电话</th>
82 
-							<th data-field="F_ZX_ProName" data-align="center">产品名称</th>
82 
+							<th data-field="F_TS_Category" data-align="center">产品名称</th><!--F_ZX_ProName-->
83 83 
 							<th data-field="F_Brand" data-align="center">品牌</th>
84 84 
 							<th data-field="F_Craft" data-align="center">工艺</th>
85 85 
 							<th data-field="F_AreaName" data-align="center">大区</th>

+ 2 - 2
CallCenterWeb.UI/WorkOrder/WorkOrderWchartList.html
查看文件 

@@ -1,4 +1,4 @@
1 
-<!DOCTYPE html>
1 
+<!DOCTYPE html>
2 2 
 <html>
3 3
4 4 
 	<head>
 
@@ -82,7 +82,7 @@
82 82 
 							<th data-field="F_SalesBase" data-align="center">销售基地</th>
83 83 
 							<th data-field="F_AreaName" data-align="center">大区</th>
84 84 
 							<th data-field="F_BranchName" data-align="center">分公司</th>
85 
-							<th data-field="F_ZX_ProName" data-align="center">产品名称</th>
85 
+							<th data-field="F_TS_Category" data-align="center">产品名称</th><!--F_ZX_ProName-->
86 86 
 							<th data-field="F_Brand" data-align="center">品牌</th>
87 87 
 							<th data-field="F_Craft" data-align="center">工艺</th>
88 88

+ 14 - 14
CallCenterWeb.UI/WorkOrder/template/orderDetails.html
查看文件 

@@ -3,7 +3,7 @@
3 3 
 	<li class="Active">工单详情</li>
4 4 
 	<li>处理记录</li>
5 5 
 	<li>催办记录</li>
6 
-	<li class="hidden">评论记录</li>
6 
+	<li><!--评论-->回访记录</li>
7 7 
 	<li>修改记录</li>
8 8 
 	<span class="Closed">×</span>
9 9 
 </ul>
 
@@ -405,10 +405,10 @@
405 405 
 	<table id="itemTableList2" data-row-style="rowStyle" data-query-params="queryParams" data-pagination="true">
406 406 
 		<thead>
407 407 
 			<tr>
408 
-				<th data-field="F_CreateUserName" data-width="6%" data-align="center">催办人</th>
409 
-				<th data-field="F_NextDeptName" data-width="6%" data-align="center">被催办部门</th>
410 
-				<th data-field="F_NextUserName" data-width="6%" data-align="center">被催办人</th>
411 
-				<th data-field="F_OptContent">催办详情</th>
408 
+				<th data-field="F_CreateUser" data-width="6%" data-align="center">催办人</th>
409 
+				<th data-field="F_NextDept" data-width="6%" data-align="center">被催办部门</th>
410 
+				<th data-field="F_NextUser" data-width="6%" data-align="center">被催办人</th>
411 
+				<th data-field="F_OptContent" data-align="left">催办详情</th>
412 412 
 				<th data-field="F_CreateTime" data-width="10%" data-align="center">创建时间</th>
413 413 
 			</tr>
414 414 
 		</thead>
 
@@ -418,9 +418,9 @@
418 418 
 	<table id="itemTableList3" data-row-style="rowStyle" data-query-params="queryParams" data-pagination="true">
419 419 
 		<thead>
420 420 
 			<tr>
421 
-				<th data-field="CreateUserName" data-width="15%" data-align="center">评论人</th>
422 
-				<th data-field="Detail" data-width="" data-align="left">评论详情</th>
423 
-				<th data-field="CreateTime" data-width="10%" data-align="center">创建时间</th>
421 
+				<th data-field="F_CreateUser" data-width="15%" data-align="center"><!--评论-->回访人</th>
422 
+				<th data-field="F_OptContent" data-width="" data-align="left">回访详情</th>
423 
+				<th data-field="F_CreateTime" data-width="10%" data-align="center">创建时间</th>
424 424 
 			</tr>
425 425 
 		</thead>
426 426 
 	</table>
 
@@ -429,11 +429,10 @@
429 429 
 	<table id="itemTableList4" data-row-style="rowStyle" data-query-params="queryParams" data-pagination="true">
430 430 
 		<thead>
431 431 
 			<tr>
432 
-				<th data-field="WorkOrderID" data-align="center">工单编号</th>
433 
-				<th data-field="BeforeContent" data-align="center">反馈内容修改前</th>
434 
-				<th data-field="UpdateContent" data-align="center">反馈内容修改后</th>
435 
-				<th data-field="UserCode" data-align="center">修改人</th>
436 
-				<th data-field="AddTime" data-width="180" data-align="center">修改时间</th>
432 
+				<th data-field="F_WoID" data-align="center">工单编号</th>
433 
+				<th data-field="F_OptContent" data-align="left">修改内容</th>
434 
+				<th data-field="F_CreateUser" data-align="center">修改人</th>
435 
+				<th data-field="F_CreateTime" data-width="180" data-align="center">修改时间</th>
437 436 
 				<!-- <th data-field="Id" data-class="workOprate" data-width="80" data-formatter="formatterOprateLogs" data-align="center">操作</th> -->
438 437 
 			</tr>
439 438 
 		</thead>
 
@@ -443,7 +442,8 @@
443 442 
 	<table id="itemTableList5" data-row-style="rowStyle" data-query-params="queryParams" data-pagination="true">
444 443 
 		<thead>
445 444 
 			<tr>
446 
-				<th data-field="WorkOrderID" data-align="center">工单编号</th>
445 
+				<!--<th data-field="WorkOrderID" data-align="center">工单编号</th>-->
446 
+                <th data-field="F_WoID" data-align="center">工单编号</th>
447 447 
 			</tr>
448 448 
 		</thead>
449 449 
 	</table>

+ 2 - 4
CallCenterWeb.UI/commonTpl/AppExtension.html
查看文件 

@@ -1,4 +1,4 @@
1 
-<!DOCTYPE html>
1 
+<!DOCTYPE html>
2 2 
 <html>
3 3 
 	<head>
4 4 
 		<meta charset="utf-8">
 
@@ -19,7 +19,6 @@
19 19
20 20 
 		<div class="clearfix wrapper wrapper-content animated fadeInRight">
21 21 
 			<div class="order_form">
22 
-
23 22 
 					<div class="form-group col-md-12 clearfix">
24 23 
 						<!-- <label class="col-md-2">工单类型：</label> -->
25 24 
 						<div id="order_isover" class="col-md-6  form-group">	
@@ -42,9 +41,8 @@
42 41 
 					</div>
43 42 
 					<div class="form-group text-center col-sm-12">
44 43 
 						<button type="button" class="btn btn-primary btn-sm" id="save_order">确定</button>
45 
-						<button type="button" class="btn btn-primary btn-sm" onclick="cleanOrderForm()">取消</button>
44 
+						<button type="button" class="btn btn-sm" onclick="close_win()">取消</button><!--cleanOrderForm()-->
46 45 
 					</div>
47 
-				</form>
48 46 
 			</div>
49 47 
 		<script src="../js/autosize/autosize.js"></script>
50 48 
 		<script src="../js/zTree/jquery.ztree.core.js"></script>

+ 1 - 1
CallCenterWeb.UI/commonTpl/WorkOrderTransfer.html
查看文件 

@@ -1,4 +1,4 @@
1 
-<!DOCTYPE html>
1 
+<!DOCTYPE html>
2 2 
 <html>
3 3
4 4 
 	<head>

+ 7 - 1
CallCenterWeb.UI/js/WorkOrder/AppExtension.js
查看文件 

@@ -28,8 +28,14 @@ function addedit(editId) {
28 28 
 					 top.workcount();
29 29 
 				}
30 30 
 			})
31 
-		}
31 
+}
32 32
33 
+// 关闭 - 申请延期
34 
+function close_win() {
35 
+    $("#yuanyin").val("");
36 
+    var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
37 
+    parent.layer.close(index); //再执行关闭
38 
+}
33 39
34 40
35 41 
 $('#order_isover').find('input[type="radio"]').on('change', function() {

+ 76 - 30
CallCenterWeb.UI/js/WorkOrder/WorkOrder.js
查看文件 

@@ -1088,38 +1088,84 @@ function getItemList(type) {
1088 1088 
 }
1089 1089
1090 1090 
 //格式化处理详情
1091 
+//0 创建
1092 
+//1 指派
1093 
+//2 接单
1094 
+//3 处理
1095 
+//4 退回
1096 
+//5 异常退回
1097 
+//6 催办
1098 
+//7 处理完结
1099 
+//8评价
1100 
+//9 修改
1101 
+//10 删除
1102 
+//11 待审核
1103 
+//12 已审核
1104 
+//13 回访
1105 
+//14 延期
1091 1106 
 function formatterDealDetail(val, row) {
1092 
-	var str = '';
1093 
-	if(!row.IsLast && !row.DealTime && !row.SureUserName && !row.ToDeptName){
1094 
-		str = str + formatterUserName(row.F_CreateName, row.F_CreateUser) + " 创建了工单。" + "<br>";
1095 
-	}
1096 
-	if(row.IsLast) {
1097 
-		str = str + formatterUserName(row.F_CreateName, row.F_CreateUser) + " 完结工单。" + "<br>";
1098 
-	}
1099 
-	if(row.DealTime) {
1100 
-		str = str + formatterUserName(row.F_CreateName, row.F_CreateUser) + " 处理工单：" + "<br>";
1101 
-		str = str + row.Detail + "<br>";
1102 
-	}
1103 
-	if(row.SureUserName) {
1104 
-		str = str + formatterUserName(row.F_CreateName, row.F_CreateUser) + " 接单。" + "<br>";
1105 
-	}
1106 
-
1107 
-	if(row.ToDeptName) {
1108 
-		if(row.State != 6){
1109 
-			str = str + formatterUserName(row.CreateUser, row.CreateUserName) + " 指派工单给 " + row.ToDeptName + "：";
1110 
-			if(row.ToUserName) {
1111 
-				str = str + formatterUserName(row.ToUser, row.ToUserName);
1112 
-			}
1113 
-		}
1114 
-		if(row.State === 6){
1115 
-			str = str +  row.ToDeptName + "：" + formatterUserName(row.ToUser, row.ToUserName)  + " 将工单退回给 " + formatterUserName(row.CreateUser, row.CreateUserName);
1116 
-		}
1117 
-		str = str + "<br>";
1118 
-	}
1107 
+    var str = '';
1108 
+    if (row.F_OptType == 0)
1109 
+        str = str + row.F_CreateUser + " 创建工单" + "<br>"; //formatterUserName(row.F_CreateName, row.F_CreateUser)
1110 
+    if (row.F_OptType == 1)
1111 
+        str = str + row.F_CreateUser + " 指派工单";
1112 
+    if (row.F_OptType == 2)
1113 
+        str = str + row.F_CreateUser + " 接单" + "<br>";
1114 
+    if (row.F_OptType == 3)
1115 
+        str = str + row.F_CreateUser + " 处理工单";
1116 
+    if (row.F_OptType == 4)
1117 
+        str = str + row.F_CreateUser + " 退回工单";
1118 
+    if (row.F_OptType == 5)
1119 
+        str = str + row.F_CreateUser + " 异常退回";
1120 
+    if (row.F_OptType == 6)
1121 
+        str = str + row.F_CreateUser + " 催办工单";
1122 
+    if (row.F_OptType == 7)
1123 
+        str = str + row.F_CreateUser + " 完结工单";
1124 
+    if (row.F_OptType == 8)
1125 
+        str = str + row.F_CreateUser + " 评价工单";
1126 
+    if (row.F_OptType == 9)
1127 
+        str = str + row.F_CreateUser + " 修改工单";
1128 
+    if (row.F_OptType == 10)
1129 
+        str = str + row.F_CreateUser + " 删除工单";
1130 
+    if (row.F_OptType == 11)
1131 
+        str = str + row.F_CreateUser + " 待审批工单";
1132 
+    if (row.F_OptType == 12)
1133 
+        str = str + row.F_CreateUser + " 审批工单";
1134 
+    if (row.F_OptType == 13)
1135 
+        str = str + row.F_CreateUser + " 回访工单";
1136 
+    if (row.F_OptType == 14)
1137 
+        str = str + row.F_CreateUser + " 延期工单";
1138 
+
1139 
+
1140 
+	//if(!row.IsLast && !row.DealTime && !row.SureUserName && !row.ToDeptName){
1141 
+	//	str = str + formatterUserName(row.F_CreateName, row.F_CreateUser) + " 创建了工单。" + "<br>";
1142 
+	//}
1143 
+	//if(row.IsLast) {
1144 
+	//	str = str + formatterUserName(row.F_CreateName, row.F_CreateUser) + " 完结工单。" + "<br>";
1145 
+	//}
1146 
+	//if(row.DealTime) {
1147 
+	//	str = str + formatterUserName(row.F_CreateName, row.F_CreateUser) + " 处理工单：" + "<br>";
1148 
+	//	str = str + row.Detail + "<br>";
1149 
+	//}
1150 
+	//if(row.SureUserName) {
1151 
+	//	str = str + formatterUserName(row.F_CreateName, row.F_CreateUser) + " 接单。" + "<br>";
1152 
+	//}
1119 1153
1120 
-	if(row.IsStart) {
1121 
-		str = str + formatterUserName(row.CreateUser, row.CreateUserName) + " 重新开启工单。" + "<br>";
1122 
-	}
1154 
+	//if(row.ToDeptName) {
1155 
+	//	if(row.State != 6){
1156 
+	//		str = str + formatterUserName(row.CreateUser, row.CreateUserName) + " 指派工单给 " + row.ToDeptName + "：";
1157 
+	//		if(row.ToUserName) {
1158 
+	//			str = str + formatterUserName(row.ToUser, row.ToUserName);
1159 
+	//		}
1160 
+	//	}
1161 
+	//	if(row.State === 6){
1162 
+	//		str = str +  row.ToDeptName + "：" + formatterUserName(row.ToUser, row.ToUserName)  + " 将工单退回给 " + formatterUserName(row.CreateUser, row.CreateUserName);
1163 
+	//	}
1164 
+	//	str = str + "<br>";
1165 
+	//}
1166 
+	//if(row.IsStart) {
1167 
+	//	str = str + formatterUserName(row.CreateUser, row.CreateUserName) + " 重新开启工单。" + "<br>";
1168 
+	//}
1123 1169 
 	return str;
1124 1170 
 }
1125 1171