Merge pull request '优化绩效确认' (#497) from feature/statement_warning_change into master

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/497
master
廖金灵 3 years ago
commit 59c5a28746

@ -519,16 +519,16 @@ class MarketPercentageController extends ThinkController
unset($_GET['is_get']);
$data = $_GET;
$if_coefficientSave = M("market_altogether", "tab_")
->where([
'pay_time' => $pay_time,
'market_check' => 1
])
->find();
// $if_coefficientSave = M("market_altogether", "tab_")
// ->where([
// 'pay_time' => $pay_time,
// 'market_check' => 1
// ])
// ->find();
if ($if_coefficientSave) {
$this->ajaxReturn(['status' => 0, 'msg' => "市场部已确认,绩效系数再不可修改"]);
}
// if ($if_coefficientSave) {
// $this->ajaxReturn(['status' => 0, 'msg' => "市场部已确认,绩效系数再不可修改"]);
// }
$admin = $_SESSION['onethink_admin']['user_auth']['username'];
$coefficient_check_detail = "已审批({$admin}<br>" . date("Y-m-d H:i:s", time());
@ -583,9 +583,19 @@ class MarketPercentageController extends ThinkController
} else {
$uids = M("market_altogether", "tab_")
->where([
'pay_time' => $pay_time,
'market_check' => 0
])
->getField('admin_id',true);
if($uids){
$uids = implode(",",$uids);
$map['_string'] = "sys_auth_group_access.uid in ({$uids})";
}
$map['sys_auth_group_access.uid'] =['in',$this->MarketEvent->getAdminidByLeaderid()];
$map['auth.id'] =['in',$this->MarketEvent->getNoLeaderMarketGroupId()];
$data = M("auth_group_access")
->field("sys_member.nickname,sys_member.real_name,sys_member.uid,sys_auth_group_access.group_id,IF(coefficient is not NULL, coefficient, 100) coefficient,sys_ucenter_member.leave_time")
->join("left join sys_auth_group auth on auth.id = sys_auth_group_access.group_id")

@ -103,9 +103,11 @@
<tbody id="statementShow">
<if condition = "empty($list_data)">
<tr>
<td colspan="16" class="text-center">aOh! 暂时还没有内容!</td>
<td colspan="16" class="text-center">aOh! 暂时无需要确认的绩效!</td>
</tr>
</if>
</tbody>
</table>
<else />
<volist name="list_data" id="data">
<tr <if condition = "$data.is_hide eq 1"> style="display:none;" </if>>
<td >{$data['real_name']}</td>
@ -117,6 +119,8 @@
<div class="jssearch fr cf search_list" style="width: 100%;">
<a class="sch-btn" id="confimBtn" url="{:U('coefficientSave')}" style="width: 120px;margin-top: 20px;margin-right: 20px;float: right;">提交保存</a>
</div>
</if>
</form>
</div>
</div>

@ -227,7 +227,7 @@
<tbody>
<if condition = "empty($list_data)">
<tr>
<td colspan="16" class="text-center">aOh! 暂时还没有内容!</td>
<td colspan="16" class="text-center">aOh! 暂时无需要确认数据。</td>
</tr>
</if>
<notemtpy name = "list_data">

Loading…
Cancel
Save