Bladeren bron

详情状 默认值

liuzhihui 3 jaren geleden
bovenliggende
commit
3d73673eb6

+ 3 - 3
CallCenterWeb.UI/WorkOrder/WorkOrderAppoint.html

@@ -75,7 +75,7 @@
75 75
 						<tr>
76 76
 							<th data-field="F_WorkOrderCode" data-formatter="formatterOrderId" data-align="center">工单编号</th>
77 77
 							<th data-field="F_State" data-formatter="formatterState" data-align="center">外线工单状态</th>
78
-							<th data-field="F_State2" data-formatter="formatterState" data-align="center">内线工单状态</th>
78
+							<th data-field="F_State2" data-formatter="formatterState2" data-align="center">内线工单状态</th>
79 79
 							<th data-field="F_Source" data-align="center" data-formatter="formatter">工单来源</th>
80 80
 							<th data-field="F_Type" data-align="center"  data-formatter="order">工单类型</th>
81 81
 							<th data-field="F_QuestionType" data-align="center">问题类别</th>
@@ -105,7 +105,7 @@
105 105
 		<script src="./js/orderOperation.js"></script>
106 106
 		<script type="text/javascript">
107 107
 			$(document).ready(function() {				
108
-				initTable(16)				
108
+				initTable(16)	
109 109
 			})
110 110
 			$("#sc_btns").click(function() {
111 111
 				initTable(16);
@@ -120,7 +120,7 @@
120 120
 					'</ul>';
121 121
 				}else{
122 122
 					return '<ul class="tool_downs">' +
123
-					'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_edit_' + row.ID + '" onclick="btn_edit(\'' + row.F_ID + '\')" title="修改">修改</a></li>' +
123
+					'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_edit_' + row.ID + '" onclick="btn_edit(\'' + row.F_ID + '\',1)" title="修改">修改</a></li>' +
124 124
 					'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_back_' + row.ID + '" onclick="btn_zhuei(\'' + row.F_ID + '\')" title="注解">注解</a></li>' +
125 125
 					'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_abnorm' + row.ID + '" onclick="btn_send(\'' + row.F_ID + '\')" title="抄送">抄送</a></li>' +									
126 126
 					'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_delete_' + row.ID + '" onclick="btn_delete(\'' + row.F_ID + '\')" title="删除">删除</a></li>' +

+ 1 - 1
CallCenterWeb.UI/WorkOrder/WorkOrderApproved.html

@@ -76,7 +76,7 @@
76 76
 						<tr>
77 77
 							<th data-field="F_WorkOrderCode" data-formatter="formatterOrderId" data-align="center">工单编号</th>
78 78
 							<th data-field="F_State" data-formatter="formatterState" data-align="center">外线工单状态</th>
79
-							<th data-field="F_State2" data-formatter="formatterState" data-align="center">内线工单状态</th>
79
+							<th data-field="F_State2" data-formatter="formatterState2" data-align="center">内线工单状态</th>
80 80
 							<th data-field="F_Source" data-align="center" data-formatter="formatter">工单来源</th>
81 81
 							<th data-field="F_Type" data-align="center" data-formatter="order">工单类型</th>
82 82
 							<th data-field="F_CusName" data-align="center">客户姓名</th>

+ 1 - 1
CallCenterWeb.UI/WorkOrder/WorkOrderChargeback.html

@@ -76,7 +76,7 @@
76 76
 						<tr>
77 77
 							<th data-field="F_WorkOrderCode" data-formatter="formatterOrderId" data-align="center">工单编号</th>
78 78
 							<th data-field="F_State" data-formatter="formatterState" data-align="center">外线工单状态</th>
79
-							<th data-field="F_State2" data-formatter="formatterState" data-align="center">内线工单状态</th>	
79
+							<th data-field="F_State2" data-formatter="formatterState2" data-align="center">内线工单状态</th>	
80 80
 							<th data-field="F_Source" data-align="center" data-formatter="formatter">工单来源</th>
81 81
 							<th data-field="F_Type" data-align="center" data-formatter="order">工单类型</th>
82 82
 							<th data-field="TypeClassName" data-align="center">业务办理</th>

+ 1 - 1
CallCenterWeb.UI/WorkOrder/WorkOrderClient.html

@@ -76,7 +76,7 @@
76 76
 						<tr>
77 77
 							<th data-field="F_WorkOrderCode" data-formatter="formatterOrderId" data-align="center">工单编号</th>
78 78
 							<th data-field="F_State" data-formatter="formatterState" data-align="center" id="daijie">外线工单状态</th>
79
-							<th data-field="F_State2" data-formatter="formatterState" data-align="center" id="daijie">内线工单状态</th>	
79
+							<th data-field="F_State2" data-formatter="formatterState2" data-align="center" id="daijie">内线工单状态</th>	
80 80
 							<th data-field="F_TypeName" data-align="center">工单类型</th>
81 81
 							<th data-field="F_CusName" data-align="center">姓名</th>
82 82
 							<th data-field="F_CusPhone" data-formatter="helper.filter.cutTel" data-align="center">客户电话</th>

+ 93 - 47
CallCenterWeb.UI/WorkOrder/WorkOrderDispose.html

@@ -91,7 +91,7 @@
91 91
 						<tr>
92 92
 							<th data-field="F_WorkOrderCode" data-formatter="formatterOrderId" data-align="center">工单编号</th>
93 93
 							<th data-field="F_State" data-formatter="formatterState" data-align="center">外线工单状态</th>
94
-							<th data-field="F_State2" data-formatter="formatterState" data-align="center">内线工单状态</th>
94
+							<th data-field="F_State2" data-formatter="formatterState2" data-align="center">内线工单状态</th>
95 95
 							<th data-field="F_Source" data-align="center" data-formatter="formatter">工单来源</th>
96 96
 							<th data-field="F_Type" data-align="center" data-formatter="order">工单类型</th>
97 97
 							<th data-field="F_CusName" data-align="center">客户姓名</th>
@@ -131,16 +131,16 @@
131 131
 			var deptarr = ['12', '36', '37', '57', '74', '88', '268', '295', '339', '422', '245']
132 132
 			$(document).ready(function() {
133 133
 				initTable(2)
134
-//				if($.cookie('userRoleCode') != 'JDYPTZX' && $.cookie('userRoleCode') != 'JDYBZZX' && $.cookie('userRoleCode') != 'XTGLY' && deptarr.indexOf($.cookie('userDeptId')) == -1) {
135
-//					if($.cookie('userFlag') == 1) {
136
-//						$('#workorderlist').bootstrapTable('hideColumn', 'F_State2');
137
-//						$('#workorderlist').bootstrapTable('hideColumn', 'F_DealContent2');
138
-//					}
139
-//					if($.cookie('userFlag') == 2) {
140
-//						$('#workorderlist').bootstrapTable('hideColumn', 'F_State');
141
-//						$('#workorderlist').bootstrapTable('hideColumn', 'F_DealContent');
142
-//					}
143
-//				}
134
+				//				if($.cookie('userRoleCode') != 'JDYPTZX' && $.cookie('userRoleCode') != 'JDYBZZX' && $.cookie('userRoleCode') != 'XTGLY' && deptarr.indexOf($.cookie('userDeptId')) == -1) {
135
+				//					if($.cookie('userFlag') == 1) {
136
+				//						$('#workorderlist').bootstrapTable('hideColumn', 'F_State2');
137
+				//						$('#workorderlist').bootstrapTable('hideColumn', 'F_DealContent2');
138
+				//					}
139
+				//					if($.cookie('userFlag') == 2) {
140
+				//						$('#workorderlist').bootstrapTable('hideColumn', 'F_State');
141
+				//						$('#workorderlist').bootstrapTable('hideColumn', 'F_DealContent');
142
+				//					}
143
+				//				}
144 144
 
145 145
 			})
146 146
 			$("#sc_btns").click(function() {
@@ -156,49 +156,95 @@
156 156
 				initTable()
157 157
 			})
158 158
 			//格式化操作 (待处理)
159
-
160 159
 			function formatterOprateDispose(val, row) {
161
-				if((row.F_State == 1 && row.F_State2 == 1) || (row.F_State == 1 && row.F_State2 == 10) || (row.F_State == 10 && row.F_State2 == 1)) {
162
-					if(deptarr.indexOf($.cookie('userDeptId')) == -1) {
163
-						return '<ul class="tool_downs">' +
164
-							'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_transfer_' + row.ID + '" onclick="btn_withdraw(\'' + row.F_ID + '\', false)" title="撤回">撤回</a></li>' +
165
-							//'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_end_' + row.ID + '" onclick="btn_end(\'' + row.F_ID + '\', false)" title="申请结单">申请结单</a></li>' +
166
-							'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_abnormal_back_' + row.ID + '" onclick="btn_abnormal_back(\'' + row.F_ID + '\')" title="异常退回">异常退回</a></li>' +
167
-							'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_abnorm' + row.ID + '" onclick="btn_bacd(\'' + row.F_ID + '\')" title="申请延期">申请延期</a></li>' +
168
-							'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_back_' + row.ID + '" onclick="btn_zhuei(\'' + row.F_ID + '\')" title="注解">注解</a></li>' +
169
-							'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_abnorm' + row.ID + '" onclick="btn_send(\'' + row.F_ID + '\')" title="抄送">抄送</a></li>' +
170
-							'</ul>';
160
+				var ustr = '<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_abnormal_back_' + row.ID + '" onclick="btn_abnormal_back(\'' + row.F_ID + '\')" title="异常退回">异常退回</a></li>' +
161
+					'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_abnorm' + row.ID + '" onclick="btn_bacd(\'' + row.F_ID + '\')" title="申请延期">申请延期</a></li>' +
162
+					'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_back_' + row.ID + '" onclick="btn_zhuei(\'' + row.F_ID + '\')" title="注解">注解</a></li>' +
163
+					'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_abnorm' + row.ID + '" onclick="btn_send(\'' + row.F_ID + '\')" title="抄送">抄送</a></li>' +
164
+					'</ul>';
165
+				if(row.woflag == 9) {
166
+					if((row.F_State == 1 && row.F_State2 == 1) || (row.F_State == 1 && row.F_State2 == 10) || (row.F_State == 10 && row.F_State2 == 1)) {
167
+						if(deptarr.indexOf($.cookie('userDeptId')) == -1) {
168
+							return '<ul class="tool_downs">' +
169
+								'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_transfer_' + row.ID + '" onclick="btn_withdraw(\'' + row.F_ID + '\', false)" title="撤回">撤回</a></li>' +
170
+								//'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_end_' + row.ID + '" onclick="btn_end(\'' + row.F_ID + '\', false)" title="申请结单">申请结单</a></li>' +
171
+								ustr
172
+						} else {
173
+							return '<ul class="tool_downs">' +
174
+								'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_transfer_' + row.ID + '" onclick="btn_withdraw(\'' + row.F_ID + '\', false)" title="撤回">撤回</a></li>' +
175
+								'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_end_' + row.ID + '" onclick="btn_end(\'' + row.F_ID + '\', false)" title="申请结单">申请结单</a></li>' +
176
+								ustr
177
+						}
171 178
 					} else {
172
-						return '<ul class="tool_downs">' +
173
-							'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_transfer_' + row.ID + '" onclick="btn_withdraw(\'' + row.F_ID + '\', false)" title="撤回">撤回</a></li>' +
174
-							'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_end_' + row.ID + '" onclick="btn_end(\'' + row.F_ID + '\', false)" title="申请结单">申请结单</a></li>' +
175
-							'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_abnormal_back_' + row.ID + '" onclick="btn_abnormal_back(\'' + row.F_ID + '\')" title="异常退回">异常退回</a></li>' +
176
-							'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_abnorm' + row.ID + '" onclick="btn_bacd(\'' + row.F_ID + '\')" title="申请延期">申请延期</a></li>' +
177
-							'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_back_' + row.ID + '" onclick="btn_zhuei(\'' + row.F_ID + '\')" title="注解">注解</a></li>' +
178
-							'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_abnorm' + row.ID + '" onclick="btn_send(\'' + row.F_ID + '\')" title="抄送">抄送</a></li>' +
179
-							'</ul>';
179
+						if(deptarr.indexOf($.cookie('userDeptId')) == -1) {
180
+							return '<ul class="tool_downs">' +
181
+								'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_transfer_' + row.ID + '" onclick="btn_transfer(\'' + row.F_ID + '\', false, \'' + row.IsAdminSend + '\')" title="处理">处理</a></li>' +
182
+								//'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_end_' + row.ID + '" onclick="btn_end(\'' + row.F_ID + '\', false)" title="申请结单">申请结单</a></li>' +
183
+								ustr
184
+						} else {
185
+							return '<ul class="tool_downs">' +
186
+								'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_transfer_' + row.ID + '" onclick="btn_transfer(\'' + row.F_ID + '\', false, \'' + row.IsAdminSend + '\')" title="处理">处理</a></li>' +
187
+								'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_end_' + row.ID + '" onclick="btn_end(\'' + row.F_ID + '\', false)" title="申请结单">申请结单</a></li>' +
188
+								ustr
189
+						}
180 190
 					}
181 191
 				} else {
182
-					if(deptarr.indexOf($.cookie('userDeptId')) == -1) {
183
-						return '<ul class="tool_downs">' +
184
-							'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_transfer_' + row.ID + '" onclick="btn_transfer(\'' + row.F_ID + '\', false, \'' + row.IsAdminSend + '\')" title="处理">处理</a></li>' +
185
-							//'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_end_' + row.ID + '" onclick="btn_end(\'' + row.F_ID + '\', false)" title="申请结单">申请结单</a></li>' +
186
-							'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_abnormal_back_' + row.ID + '" onclick="btn_abnormal_back(\'' + row.F_ID + '\')" title="异常退回">异常退回</a></li>' +
187
-							'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_abnorm' + row.ID + '" onclick="btn_bacd(\'' + row.F_ID + '\')" title="申请延期">申请延期</a></li>' +
188
-							'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_back_' + row.ID + '" onclick="btn_zhuei(\'' + row.F_ID + '\')" title="注解">注解</a></li>' +
189
-							'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_abnorm' + row.ID + '" onclick="btn_send(\'' + row.F_ID + '\')" title="抄送">抄送</a></li>' +
190
-							'</ul>';
192
+					if(row.inout == 0 || row.inout == 1 || row.inout == 3) {
193
+						if(row.F_State == 1) {
194
+							if(deptarr.indexOf($.cookie('userDeptId')) == -1) {
195
+								return '<ul class="tool_downs">' +
196
+									'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_transfer_' + row.ID + '" onclick="btn_withdraw(\'' + row.F_ID + '\', false)" title="撤回">撤回</a></li>' +
197
+									//'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_end_' + row.ID + '" onclick="btn_end(\'' + row.F_ID + '\', false)" title="申请结单">申请结单</a></li>' +
198
+									ustr
199
+							} else {
200
+								return '<ul class="tool_downs">' +
201
+									'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_transfer_' + row.ID + '" onclick="btn_withdraw(\'' + row.F_ID + '\', false)" title="撤回">撤回</a></li>' +
202
+									'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_end_' + row.ID + '" onclick="btn_end(\'' + row.F_ID + '\', false)" title="申请结单">申请结单</a></li>' +
203
+									ustr
204
+							}
205
+						} else {
206
+							if(deptarr.indexOf($.cookie('userDeptId')) == -1) {
207
+								return '<ul class="tool_downs">' +
208
+									'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_transfer_' + row.ID + '" onclick="btn_transfer(\'' + row.F_ID + '\', false, \'' + row.IsAdminSend + '\')" title="处理">处理</a></li>' +
209
+									//'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_end_' + row.ID + '" onclick="btn_end(\'' + row.F_ID + '\', false)" title="申请结单">申请结单</a></li>' +
210
+									ustr
211
+							} else {
212
+								return '<ul class="tool_downs">' +
213
+									'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_transfer_' + row.ID + '" onclick="btn_transfer(\'' + row.F_ID + '\', false, \'' + row.IsAdminSend + '\')" title="处理">处理</a></li>' +
214
+									'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_end_' + row.ID + '" onclick="btn_end(\'' + row.F_ID + '\', false)" title="申请结单">申请结单</a></li>' +
215
+									ustr
216
+							}
217
+						}
191 218
 					} else {
192
-						return '<ul class="tool_downs">' +
193
-							'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_transfer_' + row.ID + '" onclick="btn_transfer(\'' + row.F_ID + '\', false, \'' + row.IsAdminSend + '\')" title="处理">处理</a></li>' +
194
-							'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_end_' + row.ID + '" onclick="btn_end(\'' + row.F_ID + '\', false)" title="申请结单">申请结单</a></li>' +
195
-							'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_abnormal_back_' + row.ID + '" onclick="btn_abnormal_back(\'' + row.F_ID + '\')" title="异常退回">异常退回</a></li>' +
196
-							'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_abnorm' + row.ID + '" onclick="btn_bacd(\'' + row.F_ID + '\')" title="申请延期">申请延期</a></li>' +
197
-							'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_back_' + row.ID + '" onclick="btn_zhuei(\'' + row.F_ID + '\')" title="注解">注解</a></li>' +
198
-							'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_abnorm' + row.ID + '" onclick="btn_send(\'' + row.F_ID + '\')" title="抄送">抄送</a></li>' +
199
-							'</ul>';
219
+						if(row.F_State2 == 1) {
220
+							if(deptarr.indexOf($.cookie('userDeptId')) == -1) {
221
+								return '<ul class="tool_downs">' +
222
+									'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_transfer_' + row.ID + '" onclick="btn_withdraw(\'' + row.F_ID + '\', false)" title="撤回">撤回</a></li>' +
223
+									//'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_end_' + row.ID + '" onclick="btn_end(\'' + row.F_ID + '\', false)" title="申请结单">申请结单</a></li>' +
224
+									ustr
225
+							} else {
226
+								return '<ul class="tool_downs">' +
227
+									'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_transfer_' + row.ID + '" onclick="btn_withdraw(\'' + row.F_ID + '\', false)" title="撤回">撤回</a></li>' +
228
+									'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_end_' + row.ID + '" onclick="btn_end(\'' + row.F_ID + '\', false)" title="申请结单">申请结单</a></li>' +
229
+									ustr
230
+							}
231
+						} else {
232
+							if(deptarr.indexOf($.cookie('userDeptId')) == -1) {
233
+								return '<ul class="tool_downs">' +
234
+									'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_transfer_' + row.ID + '" onclick="btn_transfer(\'' + row.F_ID + '\', false, \'' + row.IsAdminSend + '\')" title="处理">处理</a></li>' +
235
+									//'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_end_' + row.ID + '" onclick="btn_end(\'' + row.F_ID + '\', false)" title="申请结单">申请结单</a></li>' +
236
+									ustr
237
+							} else {
238
+								return '<ul class="tool_downs">' +
239
+									'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_transfer_' + row.ID + '" onclick="btn_transfer(\'' + row.F_ID + '\', false, \'' + row.IsAdminSend + '\')" title="处理">处理</a></li>' +
240
+									'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_end_' + row.ID + '" onclick="btn_end(\'' + row.F_ID + '\', false)" title="申请结单">申请结单</a></li>' +
241
+									ustr
242
+							}
243
+						}
244
+
200 245
 					}
201 246
 				}
247
+
202 248
 			}
203 249
 		</script>
204 250
 	</body>

+ 1 - 1
CallCenterWeb.UI/WorkOrder/WorkOrderEmployees.html

@@ -74,7 +74,7 @@
74 74
 						<tr>
75 75
 							<th data-field="F_WorkOrderCode" data-formatter="formatterOrderId" data-align="center">工单编号</th>
76 76
 							<th data-field="F_State" data-formatter="formatterState" data-align="center" id="daijie">外线工单状态</th>
77
-							<th data-field="F_State2" data-formatter="formatterState" data-align="center" id="daijie">内线工单状态</th>	
77
+							<th data-field="F_State2" data-formatter="formatterState2" data-align="center" id="daijie">内线工单状态</th>	
78 78
 							<th data-field="F_TypeName" data-align="center">工单类型</th>
79 79
 							<th data-field="F_CusName" data-align="center">姓名</th>
80 80
 							<th data-field="F_CusPhone" data-formatter="helper.filter.cutTel" data-align="center">客户电话</th>

+ 1 - 1
CallCenterWeb.UI/WorkOrder/WorkOrderExpedite.html

@@ -75,7 +75,7 @@
75 75
 						<tr>
76 76
 							<th data-field="F_WorkOrderCode" data-formatter="formatterOrderId" data-align="center">工单编号</th>
77 77
 							<th data-field="F_State" data-formatter="formatterState" data-align="center">外线工单状态</th>
78
-							<th data-field="F_State2" data-formatter="formatterState" data-align="center">内线工单状态</th>														
78
+							<th data-field="F_State2" data-formatter="formatterState2" data-align="center">内线工单状态</th>														
79 79
 							<th data-field="F_Source" data-align="center" data-formatter="formatter">工单来源</th>
80 80
 							<th data-field="F_Type" data-align="center" data-formatter="order">工单类型</th>
81 81
 							<th data-field="F_CusName" data-align="center">姓名</th>

+ 1 - 1
CallCenterWeb.UI/WorkOrder/WorkOrderOverdue.html

@@ -101,7 +101,7 @@
101 101
 						<tr>
102 102
 							<th data-field="F_WorkOrderCode" data-formatter="formatterOrderId" data-align="center">工单编号</th>
103 103
 							<th data-field="F_State" data-formatter="formatterState" data-align="center">外线工单状态</th>
104
-							<th data-field="F_State2" data-formatter="formatterState" data-align="center">内线工单状态</th>
104
+							<th data-field="F_State2" data-formatter="formatterState2" data-align="center">内线工单状态</th>
105 105
 							<th data-field="F_Source" data-align="center" data-formatter="formatter">工单来源</th>
106 106
 							<th data-field="F_Type" data-align="center" data-formatter="order">工单类型</th>
107 107
 							<th data-field="F_CusName" data-align="center">姓名</th>

+ 1 - 1
CallCenterWeb.UI/WorkOrder/WorkOrderPartake.html

@@ -85,7 +85,7 @@
85 85
 						<tr>
86 86
 							<th data-field="F_WorkOrderCode" data-formatter="formatterOrderId" data-align="center">工单编号</th>
87 87
 							<th data-field="F_State" data-formatter="formatterState" data-align="center">外线工单状态</th>
88
-							<th data-field="F_State2" data-formatter="formatterState" data-align="center">内线工单状态</th>
88
+							<th data-field="F_State2" data-formatter="formatterState2" data-align="center">内线工单状态</th>
89 89
 							<th data-field="F_Source" data-align="center" data-formatter="formatter">工单来源</th>
90 90
 							<th data-field="F_Type" data-align="center" data-formatter="order">工单类型</th>
91 91
 							<th data-field="F_CusName" data-align="center">姓名</th>

+ 1 - 1
CallCenterWeb.UI/WorkOrder/WorkOrderParty.html

@@ -76,7 +76,7 @@
76 76
 						<tr>
77 77
 							<th data-field="F_WorkOrderCode" data-formatter="formatterOrderId" data-align="center">工单编号</th>
78 78
 							<th data-field="F_State" data-formatter="formatterState" data-align="center">外线工单状态</th>
79
-							<th data-field="F_State2" data-formatter="formatterState" data-align="center">内线工单状态</th>
79
+							<th data-field="F_State2" data-formatter="formatterState2" data-align="center">内线工单状态</th>
80 80
 							<th data-field="F_Source" data-align="center" data-formatter="formatter">工单来源</th>
81 81
 							<th data-field="F_Type" data-align="center" data-formatter="order">工单类型</th>
82 82
 							<th data-field="F_CusName" data-align="center">姓名</th>

+ 1 - 1
CallCenterWeb.UI/WorkOrder/WorkOrderPending.html

@@ -75,7 +75,7 @@
75 75
 						<tr>
76 76
 							<th data-field="F_WorkOrderCode" data-formatter="formatterOrderId" data-align="center">工单编号</th>
77 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_State2" data-formatter="formatterState2" data-align="center" id="daijie">内线工单状态</th>	
79 79
 							<th data-field="F_Source" data-align="center" data-formatter="formatter">工单来源</th>
80 80
 							<th data-field="F_Type" data-align="center" data-formatter="order">工单类型</th>
81 81
 							<th data-field="F_Salesman" data-align="center">业务员</th>

+ 1 - 1
CallCenterWeb.UI/WorkOrder/WorkOrderPostpone.html

@@ -77,7 +77,7 @@
77 77
 						<tr>
78 78
 							<th data-field="F_WorkOrderCode" data-formatter="formatterOrderId" data-align="center">工单编号</th>
79 79
 							<th data-field="F_State" data-formatter="formatterState" data-align="center">外线工单状态</th>
80
-							<th data-field="F_State2" data-formatter="formatterState" data-align="center">内线工单状态</th>
80
+							<th data-field="F_State2" data-formatter="formatterState2" data-align="center">内线工单状态</th>
81 81
 							<th data-field="F_Source" data-align="center" data-formatter="formatter">工单来源</th>
82 82
 							<th data-field="F_Type" data-align="center" data-formatter="order">工单类型</th>
83 83
 							<th data-field="F_CusName" data-align="center">客户姓名</th>

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

@@ -74,7 +74,7 @@
74 74
 						<tr>
75 75
 							<th data-field="F_WorkOrderCode" data-formatter="formatterOrderId" data-align="center">工单编号</th>
76 76
 							<th data-field="F_State" data-formatter="formatterState" data-align="center" id="daijie">外线工单状态</th>
77
-							<th data-field="F_State2" data-formatter="formatterState" data-align="center" id="daijie">内线工单状态</th>
77
+							<th data-field="F_State2" data-formatter="formatterState2" data-align="center" id="daijie">内线工单状态</th>
78 78
 							<th data-field="F_Source" data-align="center" data-formatter="formatter">工单来源</th>
79 79
 							<th data-field="F_Type" data-align="center" data-formatter="order">工单类型</th>
80 80
 							<th data-field="F_Salesman" data-align="center">业务员</th>

+ 1 - 1
CallCenterWeb.UI/WorkOrder/WorkOrderSearch.html

@@ -120,7 +120,7 @@
120 120
 						<tr>
121 121
 							<th data-field="F_WorkOrderCode" data-formatter="formatterOrderId" data-align="center">工单编号</th>
122 122
 							<th data-field="F_State" data-formatter="formatterState" data-align="center">外线工单状态</th>
123
-							<th data-field="F_State2" data-formatter="formatterState" data-align="center">内线工单状态</th>
123
+							<th data-field="F_State2" data-formatter="formatterState2" data-align="center">内线工单状态</th>
124 124
 							<th data-field="F_Source" data-align="center" data-formatter="formatter">工单来源</th>
125 125
 							<th data-field="F_Type" data-align="center" data-formatter="order">工单类型</th>
126 126
 							<th data-field="F_CusName" data-align="center">姓名</th>

+ 1 - 1
CallCenterWeb.UI/WorkOrder/WorkOrderSendCopy.html

@@ -74,7 +74,7 @@
74 74
 						<tr>
75 75
 							<th data-field="F_WorkOrderCode" data-formatter="formatterOrderId" data-align="center">工单编号</th>
76 76
 							<th data-field="F_State" data-formatter="formatterState" data-align="center">外线工单状态</th>
77
-							<th data-field="F_State2" data-formatter="formatterState" data-align="center">内线工单状态</th>	
77
+							<th data-field="F_State2" data-formatter="formatterState2" data-align="center">内线工单状态</th>	
78 78
 							<th data-field="F_Source" data-align="center" data-formatter="formatter">工单来源</th>
79 79
 							<th data-field="F_Type" data-align="center" data-formatter="order">工单类型</th>
80 80
 							<th data-field="F_QuestionType" data-align="center">问题类别</th>

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

@@ -79,7 +79,7 @@
79 79
 						<tr>
80 80
 							<th data-field="F_WorkOrderCode" data-formatter="formatterOrderId" data-align="center">工单编号</th>
81 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_State2" data-formatter="formatterState2" data-align="center">内线工单状态</th>
83 83
 							<th data-field="F_Source" data-align="center" data-formatter="formatter">工单来源</th>
84 84
 							<th data-field="F_Type" data-align="center" data-formatter="order">工单类型</th>
85 85
 							<th data-field="F_QuestionType" data-align="center">问题类别</th>

+ 1 - 1
CallCenterWeb.UI/WorkOrder/WorkOrderWXapprove.html

@@ -77,7 +77,7 @@
77 77
 						<tr>
78 78
 							<th data-field="F_WorkOrderCode" data-formatter="formatterOrderId" data-align="center">工单编号</th>
79 79
 							<th data-field="F_State" data-formatter="formatterState" data-align="center">外线工单状态</th>
80
-							<th data-field="F_State2" data-formatter="formatterState" data-align="center">内线工单状态</th>	
80
+							<th data-field="F_State2" data-formatter="formatterState2" data-align="center">内线工单状态</th>	
81 81
 							<th data-field="F_Source" data-align="center" data-formatter="formatter">工单来源</th>
82 82
 							<th data-field="F_Type" data-align="center" data-formatter="order">工单类型</th>
83 83
 							<th data-field="TypeClassName" data-align="center">业务办理</th>

+ 1 - 1
CallCenterWeb.UI/WorkOrder/approval_list.html

@@ -78,7 +78,7 @@
78 78
 						<tr>
79 79
 							<th data-field="F_WorkOrderCode" data-formatter="formatterOrderId" data-align="center">工单编号</th>
80 80
 							<th data-field="F_State" data-formatter="formatterState" data-align="center">外线工单状态</th>
81
-							<th data-field="F_State2" data-formatter="formatterState" data-align="center">内线工单状态</th>							
81
+							<th data-field="F_State2" data-formatter="formatterState2" data-align="center">内线工单状态</th>							
82 82
 							<th data-field="F_Source" data-align="center" data-formatter="formatter">工单来源</th>
83 83
 							<th data-field="F_Type" data-align="center" data-formatter="order">工单类型</th>
84 84
 							<th data-field="F_Salesman" data-align="center">业务员</th>

+ 5 - 0
CallCenterWeb.UI/WorkOrder/commonHtml/js/LookMessage.js

@@ -15,6 +15,11 @@ $(document).ready(function() {
15 15
 			calloutopt($("#visit_tel").text());
16 16
 		}
17 17
 	});
18
+	$('#npscore').val(10)
19
+	$('#qualityscore').val(10)
20
+	$('#resultscore').val(10)
21
+	$('#servicescore').val(10)
22
+	$('#effectscore').val(10)
18 23
 });
19 24
 
20 25
 //外呼

+ 7 - 6
CallCenterWeb.UI/WorkOrder/commonHtml/js/WorkOrderTransfer.js

@@ -1108,12 +1108,13 @@ function dealWorkOrder(oid) {
1108 1108
 	var flag;
1109 1109
 	if($("#clbm").val() && $("#clbm2").val()) {
1110 1110
 		flag = 3
1111
-		layer.confirm('确定要双线流转吗?', {
1112
-			icon: 7,
1113
-			btn: ['是', '否'] //按钮
1114
-		}, function() {
1115
-			Assign(oid, flag)
1116
-		})
1111
+		Assign(oid, flag)	
1112
+//		layer.confirm('确定要双线流转吗?', {
1113
+//			icon: 7,
1114
+//			btn: ['是', '否'] //按钮
1115
+//		}, function() {
1116
+//			Assign(oid, flag)
1117
+//		})
1117 1118
 	} else if($("#clbm").val() && $("#clbm2").val('')) {
1118 1119
 		flag = 1
1119 1120
 		Assign(oid, flag)

+ 2 - 0
CallCenterWeb.UI/WorkOrder/commonHtml/js/orderDetail.js

@@ -73,6 +73,8 @@ function getWorkOrderDetails() {
73 73
 				$("#spot_unit").text(data.F_CJ_TestUnit); //化验单位
74 74
 				$("#spot_cihao").text(data.F_BatchNumber); //生产批次号
75 75
 				$("#spot_cihicon").text(data.F_CJ_Outlay); //公关费用
76
+				$("#Odd_Numbers").text(data.F_MailingNumber); //单号
77
+				$("#Courier_Services").text(data.F_ExpressName); //快递公司
76 78
 				// 客户编号 物料编号模块
77 79
 				$("#client_ciont").text(data.F_CustomerID); //客户编号 ........
78 80
 				$("#client_wich").text(data.F_Salesman); //业务员

+ 10 - 2
CallCenterWeb.UI/WorkOrder/commonHtml/orderDetails.html

@@ -180,6 +180,14 @@
180 180
 							<td>
181 181
 								<span id="spot_cihicon"></span>
182 182
 							</td>
183
+							<th>邮寄单号:</th>
184
+							<td>
185
+								<span id="Odd_Numbers"></span>
186
+							</td>
187
+							<th>快递公司:</th>
188
+							<td>
189
+								<span id="Courier_Services"></span>
190
+							</td>
183 191
 						</tr>
184 192
 						<!-- 客户编号 物料编号模块 -->
185 193
 						<tr style="display: none;" class="bianhao1">
@@ -336,10 +344,10 @@
336 344
 							<td class="ncs">
337 345
 								<span id="eventres2"></span>
338 346
 							</td>
339
-							<th class="surplusText2 ncs" style="color: #122B66;">超时时间(内):</th>
347
+							<!--<th class="surplusText2 ncs" style="color: #122B66;">超时时间(内):</th>
340 348
 							<td class="ncs">
341 349
 								<span id="surplus2"></span>
342
-							</td>
350
+							</td>-->
343 351
 						</tr>
344 352
 						<tr>
345 353
 							<th style="color: #000000;">超时时限:</th>

+ 72 - 1
CallCenterWeb.UI/WorkOrder/js/WorkOrder.js

@@ -186,7 +186,78 @@ function formatterState(val, row) {
186 186
 			state = '已处理';
187 187
 			break;
188 188
 		case 11:
189
-			state = '已回访';
189
+			state = '外线已完结';
190
+			break;
191
+		case 12:
192
+			state = '已退回';
193
+			break;
194
+		case 13:
195
+			state = '导入工单';
196
+			break;
197
+		case 14:
198
+			state = '待办理';
199
+			break;
200
+		case 15:
201
+			state = '微信未通过';
202
+			break;
203
+		case 16:
204
+			state = '待办理';
205
+			break;
206
+		case 17:
207
+			state = '已撤回待指派';
208
+			break;
209
+		default:
210
+			break;
211
+	}
212
+	if(row.F_IsOver == 3) {
213
+		return '<div class="' + 'audit_termination' + '">' + state + '</div>';
214
+	}
215
+	if(row.F_IsOver == 1 || row.F_IsOver == 2) {
216
+		return '<div class="' + 'audit_revoke' + '">' + state + '</div>';
217
+	}
218
+	return state;
219
+}
220
+//格式化 工单状态
221
+function formatterState2(val, row) {
222
+	// 0新工单待指派,1已指派待接单,2已接单待处理,3已退回待处理,4异常退回待处理,5处理中,10已完结
223
+	var state = '-';
224
+	//	var stateClass = 'audit_revoke';	
225
+	switch(val) {
226
+		case 0:
227
+			state = '待指派';
228
+			break;
229
+		case 1:
230
+			state = '待接单';
231
+			break;
232
+		case 2:
233
+			state = '待处理';
234
+			break;
235
+		case 3:
236
+			state = '已退回';
237
+			break;
238
+		case 4:
239
+			state = '异常退回';
240
+			break;
241
+		case 5:
242
+			state = '处理中';
243
+			break;
244
+		case 4:
245
+			state = '异常退回';
246
+			break;
247
+		case 5:
248
+			state = '处理中';
249
+			break;
250
+		case 6:
251
+			state = '待回访';
252
+			break;
253
+		case 7:
254
+			state = '待完结';
255
+			break;
256
+		case 10:
257
+			state = '已处理';
258
+			break;
259
+		case 11:
260
+			state = '内线已完结';
190 261
 			break;
191 262
 		case 12:
192 263
 			state = '已退回';