Accept Merge Request #103: (feature/zy -> develop)

Merge Request: feature: salary menu

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/103

application/admin/controller/salary/CustomDetail.php

@@ -78,7 +78,7 @@ class CustomDetail extends Backend
 
             $res = [];
 
-            if (!$this->auth->isSuperAdmin()) {
+            if (!$this->auth->check('salary/custom_detail/edit')) {
                 $admins = Db::name('admin')->where('id', $this->auth->id)->field('id,nickname')->select();
             } else{
                 $admins = Db::name('admin')->field('id,nickname')->select();
@@ -233,7 +233,7 @@ class CustomDetail extends Backend
     }
 
 
-    public function edit()
+    public function edit($ids = null)
     {
 
         if (false === $this->request->isPost()) {

application/admin/lang/zh-cn/salary/custom_detail.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'Id'              => 'ID',
+    'Admin_id'        => '创建人',
+    'Target_admin_id' => '工资归属人',
+    'Item_id'         => '指标id',
+    'Item_value'      => '值',
+    'Salary_month'    => '工资月份',
+    'Create_time'     => '创建时间',
+    'Update_time'     => '编辑时间'
+];

public/assets/js/backend/salary/custom_detail.js

@@ -45,7 +45,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 table: table,
                 buttons: [
                     {
-                        name: 'edit',
+                        name: 'myedit',
                         text: '编辑',
                         title: '编辑',
                         classname: 'btn btn-xs btn-success btn-dialog',