master
yulingwei 5 years ago
parent 1e3533720b
commit fa41426908

@ -176,7 +176,7 @@ class WorkOrderController extends ThinkController
case 2:
$data = array_merge(I('feedback'), $data);
$user = M('user', 'tab_')->where(['account'=>$data['user_account']])->find();
if (empty($user)) $this->error("账号不存在");
if (empty($user)) $this->error("账号不存在23123{$data['user_account']}");
$log = $this->modifyProcessLog($info, $data);
if ($log) {
$process_log = json_decode($info['process_log'], true) ?: [];
@ -295,10 +295,10 @@ class WorkOrderController extends ThinkController
if (empty($info)) $this->error('未找到该资源');
if (IS_POST) {
if (empty(I('evaluate_content'))) $this->error('请填写评价内容');
$data['evaluate'] = I('evaluate', 5);
$data['score'] = I('evaluate', 5);
if($info['type'] == 2) {
$info['process_log'] = json_decode($info['process_log'], true);
$log = [['type'=>3, 'title'=>sprintf('%s于 %s 评价了工单%s为%s分工单状态%s', get_admin_name(is_login()), date('Y-m-d H:i:s'), $info['order_no'], $data['evaluate'], $this->getOrderStatus($info['status'])), 'detail'=>I('evaluate_content')]];
$log = [['type'=>3, 'title'=>sprintf('%s于 %s 评价了工单%s为%s分工单状态%s', get_admin_name(is_login()), date('Y-m-d H:i:s'), $info['order_no'], $data['score'], $this->getOrderStatus($info['status'])), 'detail'=>I('evaluate_content')]];
$data['process_log'] = json_encode(array_merge($info['process_log'], $log));
$upt = M('work_order_info', 'tab_')->where(['id'=>$id])->save($data);
return $upt ? $this->success('评价成功', U('WorkOrder/list')) : $this->error('评价失败');

@ -10,23 +10,6 @@
<script type="text/javascript" src="__STATIC__/provincecityarea/AreaData_min.js"></script>
<script type="text/javascript" src="__STATIC__/provincecityarea/jquery-1.7.min.js"></script>
<script type="text/javascript" src="__JS__/jquery.mousewheel.js"></script>
<style>
.tabcon1711 td {
text-decoration: none;
text-align: center!important;
padding-left: 55px;
padding-right: 55px;
width: 0;
}
.tabcon1711 td:first-child {
padding-left: 55px;
margin-right: 55px;
width: 0;
}
.tabcon1711 input {
width: 100%;
}
</style>
<style>
.data_list table td {
@ -58,66 +41,80 @@
<!-- 标签页导航 -->
<div class="data_list">
<div style="display: flex;">
<form method="post" action="{:U('evaluate')}" enctype="multipart/form-data" id="form1" action="javascript:;" class="form-horizontal" style="width: 600px;">
<ul class="form_info" style="margin-top: 10px;" id='feedback-form' >
<li>
<label>玩家账号</label>
<form method="post" action="{:U('evaluate')}" id="form1" action="javascript:;" class="form-horizontal" style="width: 600px;">
<div class="tab-content tabcon1711 tabcon17112" style="margin-top: 10px;" id='feedback-form' <?php if ($data['type'] == 1):?>hidden<?php endif;?> >
<table border="0" cellspacing="0" cellpadding="0">
<tbody>
<tr>
<td class="l noticeinfo">玩家账号</td>
<td class="r table_radio">
<label>{$data.user_account}</label>
</li>
<li>
<label>角色名称</label>
</td>
</tr>
<tr>
<td class="l noticeinfo">角色名称</td>
<td class="r table_radio">
<label>{$data.role_name}</label>
</li>
<li>
<label>反馈原因</label>
</td>
</tr>
<tr>
<td class="l noticeinfo">反馈原因</td>
<td class="r table_radio">
<label>{$data.feedback}</label>
</li>
<li>
<label>创单人员</label>
</td>
</tr>
<tr>
<td class="l noticeinfo">创单人员</td>
<td class="r table_radio">
<label>{:get_admin_name($data['creator_id'])}</label>
</li>
<li>
<label>处理人</label>
</td>
</tr>
<tr>
<td class="l noticeinfo">处理人</td>
<td class="r table_radio">
<label>{:get_admin_name($data['handler_id'])}</label>
</li>
<li>
<label>备注</label>
</td>
</tr>
<tr>
<td class="l noticeinfo">备注</td>
<td class="r table_radio">
<label>{$data.remark}</label>
</li>
<li <?php if (empty($data['attachment_url'])):?>hidden<?php endif;?>>
<label>附件</label>
</td>
</tr>
<tr <?php if (empty($data['attachment_url'])):?>hidden<?php endif;?>>
<td class="l noticeinfo">附件</td>
<td class="r table_radio">
<label><a href="{$data.attachment_url}" target="_blank">下载</a></label>
</li>
<input type="hidden" name="id" value="{$data.id}">
<li>
<label>分数</label>
<select id="evaluate" name="evaluate" class="select_gallery">
</td>
</tr>
<tr>
<td class="l noticeinfo">分数</td>
<td class="r table_radio">
<span class="form_select"><select id="evaluate" name="evaluate" >
<option value="1" >1</option>
<option value="2" >2</option>
<option value="3" >3</option>
<option value="4" >4</option>
<option value="5" selected >5</option>
</select>
</li>
<li>
<label>评价</label>
<textarea name="evaluate_content" class="" placeholder="" ></textarea>
</li>
</ul>
<div class="form-item cf" style="margin-top: 10px;">
<button class="submit_btn ajax-post " id="submit" type="submit" target-form="form-horizontal" style="margin-left:10px;">
保存
</button>
</select></span>
</td>
</tr>
<tr>
<td class="l noticeinfo">评价</td>
<td class="r table_radio">
<textarea name="evaluate_content"></textarea>
</td>
</tr>
</tbody>
</table>
<div class="form-item">
<input type="hidden" name="id" value="{$data.id|default=''}">
<button class="submit_btn ajax-post mlspacing" id="submit" type="submit" target-form="form-horizontal">确 定</button>
<button class="submit_btn " onclick="javascript:history.back(-1);return false;">返 回</button>
</div>
</form>
</div>
</form>
</div>
<div class="common_settings">
<span class="plus_icon"><span><img src="__IMG__/zwmimages/icon_jia.png"></span></span>

@ -10,23 +10,6 @@
<script type="text/javascript" src="__STATIC__/provincecityarea/AreaData_min.js"></script>
<script type="text/javascript" src="__STATIC__/provincecityarea/jquery-1.7.min.js"></script>
<script type="text/javascript" src="__JS__/jquery.mousewheel.js"></script>
<style>
.tabcon1711 td {
text-decoration: none;
text-align: center!important;
padding-left: 55px;
padding-right: 55px;
width: 0;
}
.tabcon1711 td:first-child {
padding-left: 55px;
margin-right: 55px;
width: 0;
}
.tabcon1711 input {
width: 100%;
}
</style>
<style>
.data_list table td {
@ -56,55 +39,71 @@
<h3 class="page_title">更新反馈进度</h3>
</div>
<!-- 标签页导航 -->
<div class="data_list">
<div style="display: flex;">
<form method="post" action="{:U('feedbackProcessLogStore')}" enctype="multipart/form-data" id="form1" action="javascript:;" class="form-horizontal" style="width: 600px;">
<ul class="form_info" style="margin-top: 10px;" id='feedback-form' >
<li>
<label>玩家账号</label>
<form method="post" action="{:U('feedbackProcessLogStore')}" id="form1" action="javascript:;" class="form-horizontal" style="width: 600px;">
<div class="tab-content tabcon1711 tabcon17112" style="margin-top: 10px;" id='feedback-form' <?php if ($data['type'] == 1):?>hidden<?php endif;?> >
<table border="0" cellspacing="0" cellpadding="0">
<tbody>
<tr>
<td class="l noticeinfo">玩家账号</td>
<td class="r table_radio">
<label>{$data.user_account}</label>
</li>
<li>
<label>角色名称</label>
</td>
</tr>
<tr>
<td class="l noticeinfo">角色名称</td>
<td class="r table_radio">
<label>{$data.role_name}</label>
</li>
<li>
<label>反馈原因</label>
</td>
</tr>
<tr>
<td class="l noticeinfo">反馈原因</td>
<td class="r table_radio">
<label>{$data.feedback}</label>
</li>
<li>
<label>创单人员</label>
</td>
</tr>
<tr>
<td class="l noticeinfo">创单人员</td>
<td class="r table_radio">
<label>{:get_admin_name($data['creator_id'])}</label>
</li>
<li>
<label>处理人</label>
</td>
</tr>
<tr>
<td class="l noticeinfo">处理人</td>
<td class="r table_radio">
<label>{:get_admin_name($data['handler_id'])}</label>
</li>
<li>
<label>备注</label>
</td>
</tr>
<tr>
<td class="l noticeinfo">备注</td>
<td class="r table_radio">
<label>{$data.remark}</label>
</li>
<input type="hidden" name="id" value="{$data.id}">
<li>
<label>更新进度</label>
<textarea name="process_log" class="" placeholder="" ></textarea>
</li>
</ul>
<div class="form-item cf" style="margin-top: 10px;">
<button class="submit_btn ajax-post " id="submit" type="submit" target-form="form-horizontal" style="margin-left:10px;">
保存
</button>
</td>
</tr>
<tr <?php if (empty($data['attachment_url'])):?>hidden<?php endif;?>>
<td class="l noticeinfo">附件</td>
<td class="r table_radio">
<label><a href="{$data.attachment_url}" target="_blank">下载</a></label>
</td>
</tr>
<tr>
<td class="l noticeinfo">更新进度</td>
<td class="r table_radio">
<textarea name="process_log"></textarea>
</td>
</tr>
</tbody>
</table>
<div class="form-item">
<input type="hidden" name="id" value="{$data.id|default=''}">
<button class="submit_btn ajax-post mlspacing" id="submit" type="submit" target-form="form-horizontal">确 定</button>
<button class="submit_btn " onclick="javascript:history.back(-1);return false;">返 回</button>
</div>
</div>
</form>
<span style="width: 0.5px;background-color: gray; margin-left: 50px;margin-right: 50px;" <?php if (empty($data['process_log']) || $data['type'] == 1):?>hidden<?php endif;?>></span>
<span style="width: 0.5px;background-color: gray; margin-left: 50px;margin-right: 50px;" <?php if (empty($data['process_log'])):?>hidden<?php endif;?>></span>
<div <?php if (empty($data['process_log'])):?>hidden<?php endif;?></div>
<div <?php if (empty($data['process_log']) || $data['type'] == 1):?>hidden<?php endif;?> >
<div style="font-size:large;">工单进度</div>
<div style="width: 600px;border: 0.5px solid #000;height: 100%;padding-top: 20px;padding-right: 50px;padding-left: 50px;margin-bottom: 50px;">
<?php foreach($data['process_log'] as $index => $log):?>
@ -120,7 +119,6 @@
</div>
</div>
</div>
</div>
<div class="common_settings">
<span class="plus_icon"><span><img src="__IMG__/zwmimages/icon_jia.png"></span></span>
<form class="addShortcutIcon">

@ -65,7 +65,7 @@
<!-- 标签页导航 -->
<div class="data_list">
<div style="display: flex;">
<form method="post" action="{:U('modify')}" enctype="multipart/form-data" id="form1" action="javascript:;" class="form-horizontal">
<div class="cf top_nav_list">
@ -119,6 +119,7 @@
<?php endif;?>
</div>
</div>
<div class="data_list">
<div class="tab-content tabcon1711" id='resource-form' <?php if ($data['type'] == 2 || ($data['type']==1 && !empty($data['attachment_url']))):?>hidden<?php endif;?>>
<table class="table">
<!-- 表头 -->
@ -166,48 +167,69 @@
</table>
</div>
<ul class="form_info" style="margin-top: 10px;" id='feedback-form' <?php if ($data['type'] == 1):?>hidden<?php endif;?> >
<li>
<label>玩家账号</label>
<input type="text" name='feedback[user_account]' value="{$data.user_account}">
</li>
<li>
<label>角色名称</label>
<input type="text" name='feedback[role_name]' value="{$data.role_name}">
</li>
<li>
<label>反馈原因</label>
<textarea name="feedback[feedback]" class="" placeholder="" >{$data.feedback}</textarea>
</li>
<li>
<label>状态</label>
<select id="status" name="feedback[status]" class="select_gallery">
</div>
<div class="tab-content tabcon1711 tabcon17112" style="margin-top: 10px;" id='feedback-form' <?php if ($data['type'] == 1):?>hidden<?php endif;?> >
<table border="0" cellspacing="0" cellpadding="0">
<tbody>
<tr>
<td class="l noticeinfo">玩家账号</td>
<td class="r table_radio">
<input type="text" class="" name="feedback[user_account]" value="{$data.user_account}" placeholder="请输入玩家账号">
</td>
</tr>
<tr>
<td class="l noticeinfo">角色名称</td>
<td class="r table_radio">
<input type="text" class="" name="feedback[role_name]" value="{$data.role_name}" placeholder="请输入角色名称">
</td>
</tr>
<tr>
<td class="l noticeinfo">反馈原因</td>
<td class="r table_radio">
<textarea name="feedback[feedback]">{$data.feedback}</textarea>
</td>
</tr>
<tr>
<td class="l noticeinfo">状态</td>
<td class="r table_radio">
<span class="form_select"><select name="feedback[status]" id="status">
<option value="3" <?php if($data['status'] == 3):?>selected<?php endif;?> >处理中</option>
<option value="1" <?php if($data['status'] == 1):?>selected<?php endif;?> >完成</option>
</select>
</li>
<li>
<label>创单人员</label>
<label>{:get_admin_name(is_login())}</label>
</li>
<li>
<label>处理人</label>
<select id="handler_id" name="feedback[handler_id]" class="select_gallery">
</select></span>
</td>
</tr>
<tr>
<td class="l noticeinfo">创单人员</td>
<td class="r table_radio">
<label>{:get_admin_name($data['creator_id'])}</label>
</td>
</tr>
<tr>
<td class="l noticeinfo">处理人</td>
<td class="r table_radio">
<span class="form_select"><select name="feedback[handler_id]" id="handler_id">
<?php foreach ($admin_users as $user):?>
<option value="{$user['uid']}"<?php if ($user['uid'] == $data['handler_id']):?>selected<?php endif;?> >{$user.nickname}</option>
<?php endforeach;?>
</select>
</li>
<li>
<label>备注</label>
<textarea name="feedback[remark]" class="" placeholder="" >{$data.remark}</textarea>
</li>
</ul>
</select></span>
</td>
</tr>
<tr>
<td class="l noticeinfo">备注</td>
<td class="r table_radio">
<textarea name="feedback[remark]">{$data.remark}</textarea>
</td>
</tr>
</tbody>
</table>
</div>
<div class="form-item cf" style="margin-top: 10px;">
<button class="submit_btn ajax-post " id="submit" type="submit" target-form="form-horizontal" style="margin-left:10px;">
保存
</button>
<button class="submit_btn " onclick="javascript:history.back(-1);return false;">返 回</button>
</div>
</form>
@ -229,7 +251,6 @@
</div>
</div>
</div>
</div>
<div class="common_settings">
<span class="plus_icon"><span><img src="__IMG__/zwmimages/icon_jia.png"></span></span>
<form class="addShortcutIcon">

@ -41,6 +41,10 @@
line-height:0px;
}
.tabcon1711 input~.notice-text {
width: unset;
}
.bnt_add,.bnt_remove,.bnt_save{
height: 30px;
width: 20px;
@ -64,9 +68,6 @@
<h3 class="page_title">新增工单</h3>
</div>
<!-- 标签页导航 -->
<div class="data_list">
<div style="display: flex;">
<form method="post" action="{:U('store')}" enctype="multipart/form-data" id="form1" action="javascript:;" class="form-horizontal">
<div class="cf top_nav_list">
@ -117,6 +118,7 @@
</div>
</div>
<div class="data_list">
<div class="tab-content tabcon1711" id='resource-form' >
<table class="table">
<!-- 表头 -->
@ -171,42 +173,59 @@
</table>
</div>
<ul class="form_info" style="margin-top: 10px;" id='feedback-form' hidden >
<input type="hidden" name="id" value="{$auth_group.id}" />
<li>
<label>玩家账号</label>
<input type="text" name='user_account'>
</li>
<li>
<label>角色名称</label>
<input type="text" name='role_name'>
</li>
<li>
<label>反馈原因</label>
<textarea name="feedback" class="" placeholder="" ></textarea>
</li>
<li>
<label>创单人员</label>
</div>
<div class="tab-content tabcon1711 tabcon17112" style="margin-top: 10px;" id='feedback-form' hidden >
<table border="0" cellspacing="0" cellpadding="0">
<tbody>
<tr>
<td class="l noticeinfo">玩家账号</td>
<td class="r table_radio">
<input type="text" class="" name="user_account" value="" placeholder="请输入玩家账号">
</td>
</tr>
<tr>
<td class="l noticeinfo">角色名称</td>
<td class="r table_radio">
<input type="text" class="" name="role_name" value="" placeholder="请输入角色名称">
</td>
</tr>
<tr>
<td class="l noticeinfo">反馈原因</td>
<td class="r table_radio">
<textarea name="feedback"></textarea>
</td>
</tr>
<tr>
<td class="l noticeinfo">创单人员</td>
<td class="r table_radio">
<label>{:get_admin_name(is_login())}</label>
</li>
<li>
<label>处理人</label>
<select id="handler_id" name="handler_id" class="select_gallery">
</td>
</tr>
<tr>
<td class="l noticeinfo">处理人</td>
<td class="r table_radio">
<span class="form_select"><select name="handler_id" id="handler_id">
<?php foreach ($admin_users as $user):?>
<option value="{$user['uid']}" >{$user.nickname}</option>
<?php endforeach;?>
</select>
</li>
<li>
<label>备注</label>
<textarea name="remark" class="" placeholder="" ></textarea>
</li>
</ul>
</select></span>
</td>
</tr>
<tr>
<td class="l noticeinfo">备注</td>
<td class="r table_radio">
<textarea name="remark"></textarea>
</td>
</tr>
</tbody>
</table>
</div>
<div class="form-item cf" style="margin-top: 10px;">
<button class="submit_btn ajax-post " id="submit" type="submit" target-form="form-horizontal" style="margin-left:10px;">
保存
</button>
<button class="submit_btn " onclick="javascript:history.back(-1);return false;">返 回</button>
</div>
</form>
@ -219,7 +238,6 @@
</div>
</div>
</div>
</div>
<div class="common_settings">
<span class="plus_icon"><span><img src="__IMG__/zwmimages/icon_jia.png"></span></span>

Loading…
Cancel
Save