liuzhihui 3 anni fa
parent
commit
6cabc08d21

+ 10 - 1
CallCenterWeb.UI/WorkOrder/WorkOrderReceive.html

74
 					<thead>
74
 					<thead>
75
 						<tr>
75
 						<tr>
76
 							<th data-field="F_WorkOrderCode" data-formatter="formatterOrderId" data-align="center">工单编号</th>
76
 							<th data-field="F_WorkOrderCode" data-formatter="formatterOrderId" data-align="center">工单编号</th>
77
-							<th data-field="F_State" data-formatter="formatterState" data-align="center" id="daijie">工单状态</th>
77
+							<th data-field="F_State" data-formatter="formatterState" data-align="center" id="daijie">外线工单状态</th>
78
+							<th data-field="F_State2" data-formatter="formatterState" data-align="center" id="daijie">内线工单状态</th>
78
 							<th data-field="F_Source" data-align="center" data-formatter="formatter">工单来源</th>
79
 							<th data-field="F_Source" data-align="center" data-formatter="formatter">工单来源</th>
79
 							<th data-field="F_Type" data-align="center" data-formatter="order">工单类型</th>
80
 							<th data-field="F_Type" data-align="center" data-formatter="order">工单类型</th>
80
 							<th data-field="F_Salesman" data-align="center">业务员</th>
81
 							<th data-field="F_Salesman" data-align="center">业务员</th>
110
 
111
 
111
 			$(document).ready(function() {
112
 			$(document).ready(function() {
112
 				initTable(1)
113
 				initTable(1)
114
+				if($.cookie('userRoleCode') != 'JDYPTZX' && $.cookie('userRoleCode') != 'JDYBZZX' && $.cookie('userRoleCode') != 'XTGLY') {
115
+					if($.cookie('userFlag') == 1) {
116
+						$('#workorderlist').bootstrapTable('hideColumn', 'F_State2');
117
+					}
118
+					if($.cookie('userFlag') == 2) {
119
+						$('#workorderlist').bootstrapTable('hideColumn', 'F_State');
120
+					}
121
+				}
113
 			})
122
 			})
114
 			$("#sc_btns").click(function() {
123
 			$("#sc_btns").click(function() {
115
 				initTable(1);
124
 				initTable(1);

+ 1 - 0
CallCenterWeb.UI/WorkOrder/WorkOrderTobeass.html

79
 						<tr>
79
 						<tr>
80
 							<th data-field="F_WorkOrderCode" data-formatter="formatterOrderId" data-align="center">工单编号</th>
80
 							<th data-field="F_WorkOrderCode" data-formatter="formatterOrderId" data-align="center">工单编号</th>
81
 							<th data-field="F_State" data-formatter="formatterState" data-align="center">工单状态</th>
81
 							<th data-field="F_State" data-formatter="formatterState" data-align="center">工单状态</th>
82
+							<!--<th data-field="F_State2" data-formatter="formatterState" data-align="center">工单状态</th>-->						
82
 							<th data-field="F_Source" data-align="center" data-formatter="formatter">工单来源</th>
83
 							<th data-field="F_Source" data-align="center" data-formatter="formatter">工单来源</th>
83
 							<th data-field="F_Type" data-align="center" data-formatter="order">工单类型</th>
84
 							<th data-field="F_Type" data-align="center" data-formatter="order">工单类型</th>
84
 							<th data-field="F_QuestionType" data-align="center">问题类别</th>
85
 							<th data-field="F_QuestionType" data-align="center">问题类别</th>

+ 2 - 2
CallCenterWeb.UI/WorkOrder/js/AddWorkOrder.js

555
 			F_Pipeline: $('#product_line').val(), //产品线
555
 			F_Pipeline: $('#product_line').val(), //产品线
556
 			F_Craft: $('#process').val(), //工艺
556
 			F_Craft: $('#process').val(), //工艺
557
 			WorkmanShip:$("#process").val(),
557
 			WorkmanShip:$("#process").val(),
558
-			Manufacturers:$("#ylcj").val(),
559
-			ProductionNum:$("#scsl").val(),
558
+			F_Manufacturers:$("#ylcj").val(),
559
+			F_ProductionNum:$("#scsl").val(),
560
 			F_MailingNumber: $("#mailnum").val(),
560
 			F_MailingNumber: $("#mailnum").val(),
561
 			F_ExpressName:$("#mailname").val(),
561
 			F_ExpressName:$("#mailname").val(),
562
 
562
 

+ 1 - 1
CallCenterWeb.UI/visit/js/visitList.js

337
 
337
 
338
 // 回访结果
338
 // 回访结果
339
 function formatterScore(val) {
339
 function formatterScore(val) {
340
-	console.log(val)
340
+//	console.log(val)
341
 	//	return val
341
 	//	return val
342
 	if(val || val == 0) {
342
 	if(val || val == 0) {
343
 		if(val == 9 || val == 10) {
343
 		if(val == 9 || val == 10) {