详情添加注解

CallCenterWeb.UI/WorkOrder/WorkOrderDispose.html

@@ -92,7 +92,6 @@
 							<th data-field="F_AddressFull" data-align="center">详细地址</th> -->
 							<th data-field="F_AreaName" data-align="center">大区</th>
 							<th data-field="F_BranchName" data-align="center">分公司</th>
-							<th data-field="F_Annotation" data-align="center">注解</th>
 							<!-- <th data-field="Detail" data-align="center" data-formatter="formatterDetail">反馈内容</th> -->
 							<!-- <th data-field="ResponDeptName" data-formatter="" data-align="center">接收部门</th> -->
 							<!-- <th data-field="AuditUserNameRel" data-formatter="formatterAuditUser" data-align="center">接收人</th> -->

CallCenterWeb.UI/WorkOrder/WorkOrderEmployees.html

@@ -85,7 +85,6 @@
 							<th data-field="F_TS_Category" data-align="center">产品名称</th><!--F_ZX_ProName-->
 							<th data-field="F_Brand" data-align="center">品牌</th>
 							<th data-field="F_Craft" data-align="center">工艺</th>
-							
 							<!-- <th data-field="County" data-align="center">公司名称</th> -->
 							<!-- <th data-field="Detail" data-align="center" data-formatter="formatterDetail">反馈内容</th> -->
 							<!-- <th data-field="ResponDeptName" data-formatter="" data-align="center">接收部门</th> -->

CallCenterWeb.UI/WorkOrder/WorkOrderExpedite.html

@@ -99,7 +99,6 @@
 							<!-- <th data-field="Detail" data-align="center" data-formatter="formatterDetail">反馈内容</th> -->
 							<th data-field="ResponDeptName" data-formatter="" data-align="center">接收部门</th>
 							<th data-field="F_DealBy" data-formatter="formatterAuditUser" data-align="center">处理人</th>
-							<th data-field="F_Annotation" data-align="center">注解</th>
 							<!-- <th data-field="CBCount" data-align="center">催办</th> -->
 							<!-- <th data-field="CreateUserNameRel" data-align="center">创建人</th> -->
 							<!-- <th data-field="F_CreateTime" data-align="center">创建时间</th> -->

CallCenterWeb.UI/WorkOrder/WorkOrderOverdue.html

@@ -116,7 +116,6 @@
 							<!-- <th data-field="Detail" data-align="center" data-formatter="formatterDetail">反馈内容</th> -->
 							<!-- <th data-field="ResponDeptName" data-formatter="" data-align="center">接收部门</th> -->
 							<th data-field="F_DealBy" data-formatter="formatterAuditUser" data-align="center">接收人</th>
-							<th data-field="F_Annotation" data-align="center">注解</th>
 							
 							<th data-field="ID" data-class="workOprate workOprate4" data-formatter="formatterOprateExpedite" data-align="center">操作工单</th>
 						</tr>

CallCenterWeb.UI/WorkOrder/WorkOrderPartake.html

@@ -107,8 +107,6 @@
 							<th data-field="F_TS_Category" data-align="center">产品名称</th>
 							<th data-field="F_Description" data-align="center">问题描述</th>
 							<th data-field="F_DealContent" data-align="center">指派说明</th>
-							<th data-field="F_DealBy" data-formatter="formatterAuditUser" data-align="center">接收人</th>
-							<th data-field="F_Annotation" data-align="center">注解</th>
 							<!-- <th data-field="CBCount" data-align="center">催办</th> -->
 							<!-- <th data-field="CreateUserNameRel" data-align="center">创建人</th> -->
 							<th data-field="F_CreateOn" data-align="center">创建时间</th>

CallCenterWeb.UI/WorkOrder/WorkOrderPostpone.html

@@ -89,7 +89,6 @@
 							<th data-field="DelayTimename" data-align="center">申请部门</th>
 							<th data-field="F_AreaName" data-align="center">大区</th>
 							<th data-field="F_BranchName" data-align="center">分公司</th>
-							<th data-field="F_Annotation" data-align="center">注解</th>
 							<!-- <th data-field="Detail" data-align="center" data-formatter="formatterDetail">反馈内容</th> -->
 							<!-- <th data-field="ResponDeptName" data-formatter="" data-align="center">接收部门</th> -->
 							<!-- <th data-field="AuditUserNameRel" data-formatter="formatterAuditUser" data-align="center">接收人</th> -->

CallCenterWeb.UI/WorkOrder/WorkOrderSearch.html

@@ -132,7 +132,6 @@
 							<!-- <th data-field="Detail" data-align="center" data-formatter="formatterDetail">反馈内容</th> -->
 							<!-- <th data-field="ResponDeptName" data-formatter="" data-align="center">接收部门</th> -->
 							<th data-field="F_DealBy" data-formatter="formatterAuditUser" data-align="center">接收人</th>
-							<th data-field="F_Annotation" data-align="center">注解</th>
 							<!-- <th data-field="CreateUserNameRel" data-align="center">创建人</th> -->
 							<!-- <th data-field="CreateTime" data-align="center">创建时间</th> -->
 							<!-- <th data-field="ID" data-class="workOprate workOprate7" data-formatter="formatterOprate" data-align="center">操作工单</th> -->

CallCenterWeb.UI/WorkOrder/template/orderDetails.html

@@ -267,7 +267,10 @@
 					</td>
 				</tr>
 				<tr >
-					
+					<th>注解：</th>
+					<td>
+						<span id="xq_zhujie"></span>
+					</td>
 				</tr>
 			<!-- <tr>
 				<th>省：</th>

CallCenterWeb.UI/js/WorkOrder/WorkOrder.js

@@ -439,6 +439,7 @@ function formatterDesig(val, row) {
 		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_end_' + row.ID + '" onclick="btn_receiv(\'' + row.F_ID + '\', false)" title="完结">完结</a></li>' +
 		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_end_' + row.ID + '" onclick="btn_visit(\'' + row.F_ID + '\', false)" title="回访">回访</a></li>' +
 		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_delete_' + row.ID + '" onclick="btn_deleteid(\'' + row.F_ID + '\')" title="删除">删除</a></li>' +
+		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_back_' + row.ID + '" onclick="btn_zhuei(\'' + row.F_ID + '\')" title="注解">注解</a></li>' +
 		'</ul>';
 }
 //格式化操作 （待接单）
@@ -811,7 +812,7 @@ function btn_zhuei(oid) {
 	layer.prompt({
 		formType: 2,
 		value: '',
-		title: '请输入退回原因',
+		title: '请输入注解原因',
 		area: ['800px', '240px'] //自定义文本域宽高
 	}, function(value, index, elem) {
 		$.post(huayi.config.callcenter_url + 'WorkOrderNew/Annotation', {
@@ -1173,6 +1174,7 @@ function getWorkOrderDetails() {
 				$("#xq_suggestion").text(data.SuperiorOpinion); //上级处理意见
 				$("#xq_details").text(data.F_DealContent);//处理详情
 				$("#xq_bitye").text(data.F_VisitRemarks); //备注
+				$("#xq_zhujie").text(data.F_Annotation); //注解
 				
 		        if($("#xq_gdzt").text()=="咨询"){
 					$('.zixun1').show();//咨询模块

CallCenterWeb.UI/visit/awaitVist.html

@@ -88,7 +88,6 @@
 							<th data-field="F_DealResult" data-align="center">处理意见</th>
 							<th data-field="F_VisitBy" data-align="center">回访人</th>
 							<th data-field="F_VisitOn" data-width="150" data-align="center">回访时间</th>
-							<th data-field="F_Annotation" data-align="center">注解</th>
 							<th data-field="F_ID" data-formatter="formatterOprateT" data-align="center">操作</th>
 						</tr>
 					</thead>
@@ -360,6 +359,12 @@
 										<span id="xq_details"></span>
 									</td>
 								</tr>
+								<tr >
+									<th>注解：</th>
+									<td>
+										<span id="xq_zhujie"></span>
+									</td>
+								</tr>
 							</tbody>
 						</table>
 					</div>

CallCenterWeb.UI/visit/js/visitList.js

@@ -434,6 +434,7 @@ function getWorkOrderDetails() {
 				$("#xq_suggestion").text(data.SuperiorOpinion); //上级处理意见
 				$("#xq_details").text(data.F_DealContent);//处理详情
 				$("#xq_bitye").text(data.F_VisitRemarks); //品牌
+				$("#xq_zhujie").text(data.F_Annotation); //注解
 				
 				if($("#xq_gdzt").text()=="咨询"){
 					$('.zixun1').show();//咨询模块