diff --git a/application/admin/controller/salary/CustomDetail.php b/application/admin/controller/salary/CustomDetail.php index 27ccd36..52bde3c 100644 --- a/application/admin/controller/salary/CustomDetail.php +++ b/application/admin/controller/salary/CustomDetail.php @@ -418,7 +418,7 @@ class CustomDetail extends Backend Db::name('salary_status') ->where('salary_month', $month) ->where('target_admin_id', $targetAdminId) - ->save([ + ->update([ 'settle_status' => 1, ]); $this->success(); diff --git a/public/assets/js/backend/salary/custom_detail.js b/public/assets/js/backend/salary/custom_detail.js index 84477ab..5cf3091 100644 --- a/public/assets/js/backend/salary/custom_detail.js +++ b/public/assets/js/backend/salary/custom_detail.js @@ -81,15 +81,15 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin } }, { - name: 'complete', - text:"结算", - title:"结算", + name: 'settle', + text: '结算', + title: '结算', extend: 'data-toggle="tooltip" data-container="body"', classname: 'btn btn-xs btn-success btn-magic btn-ajax', icon: 'fa fa-cny', url: function (row) { // 注意这里拼接 admin_id 和 month - return 'salary/detail/settle?target_admin_id=' + row.target_admin_id + '&month=' + row.month; + return 'salary/custom_detail/settle?target_admin_id=' + row.target_admin_id + '&month=' + row.month; }, confirm: '确认结算?', refresh: true,