Authored by mali

Merge branch 'test6.8.4' of http://git.yoho.cn/ufo/ufo-platform into test6.8.4

... ... @@ -128,14 +128,14 @@
<hr>
<table id="operateRecordTable"></table>
</div>
<div title="回访记录" style="overflow:auto;padding:20px;display:none;">
<div title="服务记录" style="overflow:auto;padding:20px;display:none;">
<div class="easyui-layout">
<form id="feedbackRecordSubmitForm" method="post">
<div style="margin-top: 20px;margin-left: 30px;margin-right: 30px">
<table border="0" style="width:99%;">
<tr style="height: 60px">
<td width="100%">
<input class="easyui-textbox" id="feedbackContent" name="feedbackContent" data-options="prompt:'请输入回访内容...'" style="width: 100%;height: 100%;" />
<input class="easyui-textbox" id="feedbackContent" name="feedbackContent" data-options="prompt:'请输入服务记录...'" style="width: 100%;height: 100%;" />
</td>
</tr>
</table>
... ... @@ -201,7 +201,7 @@ $(function() {
getFeedbackRecord(orderCode);
window.self.$.messager.show({
title : "提示",
msg : "提交回访记录成功!"
msg : "提交服务记录成功!"
});
$('#feedbackRecordSubmitForm').form('clear');
}else {
... ... @@ -630,7 +630,7 @@ function getFeedbackRecord(orderCode){
},
columns: [[{
title: "回访内容",
title: "服务记录",
field: "content",
width: 100
}, {
... ... @@ -648,7 +648,7 @@ function getFeedbackRecord(orderCode){
singleSelect: true,
onLoadSuccess: function (data) {
if (data.total == 0) {
$(this).datagrid('appendRow', { type: '<div style="text-align:center;color:red">没有数据!</div>' }).datagrid('mergeCells', { index: 0, field: 'id', colspan: 4 })
$(this).datagrid('appendRow', { type: '<div style="text-align:center;color:red">没有数据!</div>' }).datagrid('mergeCells', { index: 0, field: 'content', colspan: 3 })
}
}
});
... ...