用户重建

application/admin/lang/zh-cn/user/user.php

@@ -32,6 +32,6 @@ return [
     'Idcard_status 1'  => '审核通过',
     'Idcard_status 2'  => '审核驳回',
     'Mini_openid'      => '微信小程序openid',
-    'Gangwei.name'     => '组名',
-    'Jigou.name'       => '组名'
+    'Gangwei.name'     => '岗位',
+    'Jigou.name'       => '机构'
 ];

application/admin/view/user/user/edit.html

@@ -3,19 +3,19 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Gangwei_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-gangwei_id" min="0" data-rule="required" data-source="user/gangwei/index" class="form-control selectpage" name="row[gangwei_id]" type="text" value="{$row.gangwei_id|htmlentities}">
+            <input id="c-gangwei_id" min="0" data-rule="required" data-source="usergangwei/index" class="form-control selectpage" name="row[gangwei_id]" type="text" value="{$row.gangwei_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Jigou_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-jigou_id" data-rule="required" data-source="user/jigou/index" class="form-control selectpage" name="row[jigou_id]" type="text" value="{$row.jigou_id|htmlentities}">
+            <input id="c-jigou_id" data-rule="required" data-source="userjigou/index" class="form-control selectpage" name="row[jigou_id]" type="text" value="{$row.jigou_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Username')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-username" class="form-control" name="row[username]" type="text" value="{$row.username|htmlentities}">
+            <input id="c-username" disabled class="form-control" name="row[username]" type="text" value="{$row.username|htmlentities}">
         </div>
     </div>
     <div class="form-group">
@@ -44,7 +44,7 @@
             <ul class="row list-inline faupload-preview" id="p-avatar"></ul>
         </div>
     </div>
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Gender')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
@@ -91,7 +91,7 @@
         <div class="col-xs-12 col-sm-8">
             <input id="c-token" class="form-control" name="row[token]" type="text" value="{$row.token|htmlentities}">
         </div>
-    </div>
+    </div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -104,7 +104,7 @@
 
         </div>
     </div>
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Idcard_status')}:</label>
         <div class="col-xs-12 col-sm-8">
             
@@ -121,7 +121,7 @@
         <div class="col-xs-12 col-sm-8">
             <input id="c-mini_openid" class="form-control" name="row[mini_openid]" type="text" value="{$row.mini_openid|htmlentities}">
         </div>
-    </div>
+    </div>-->
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/user/user/index.html

@@ -17,7 +17,7 @@
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('user/user/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+                        <!--<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('user/user/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
                         <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('user/user/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('user/user/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         
@@ -29,7 +29,7 @@
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:" data-params="status={$key}">{:__('Set status to ' . $key)}</a></li>
                                 {/foreach}
                             </ul>
-                        </div>
+                        </div>-->
 
                         
                     </div>

public/assets/js/backend/user/user.js

@@ -8,7 +8,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     index_url: 'user/user/index' + location.search,
                     add_url: 'user/user/add',
                     edit_url: 'user/user/edit',
-                    del_url: 'user/user/del',
+//                    del_url: 'user/user/del',
                     multi_url: 'user/user/multi',
                     import_url: 'user/user/import',
                     table: 'user',
@@ -17,6 +17,16 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 
             var table = $("#table");
 
+            //在普通搜索渲染后
+            table.on('post-common-search.bs.table', function (event, table) {
+                var form = $("form", table.$commonsearch);
+                $("input[name='gangwei_id']", form).addClass("selectpage").data("source", "usergangwei/index").data("primaryKey", "id").data("field", "name").data("orderBy", "weigt desc");
+                $("input[name='jigou_id']", form).addClass("selectpage").data("source", "userjigou/index").data("primaryKey", "id").data("field", "name").data("orderBy", "weigt desc");
+
+                Form.events.cxselect(form);
+                Form.events.selectpage(form);
+            });
+
             // 初始化表格
             table.bootstrapTable({
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
@@ -24,30 +34,33 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 sortName: 'id',
                 fixedColumns: true,
                 fixedRightNumber: 1,
+                search:false,    //搜索id
                 columns: [
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
                         {field: 'gangwei_id', title: __('Gangwei_id')},
+                        {field: 'gangwei.name', title: __('Gangwei.name'), operate: 'LIKE'},
                         {field: 'jigou_id', title: __('Jigou_id')},
+                        {field: 'jigou.name', title: __('Jigou.name'), operate: 'LIKE'},
                         {field: 'username', title: __('Username'), operate: 'LIKE'},
                         {field: 'nickname', title: __('Nickname'), operate: 'LIKE'},
                         {field: 'mobile', title: __('Mobile'), operate: 'LIKE'},
                         {field: 'avatar', title: __('Avatar'), operate: 'LIKE', events: Table.api.events.image, formatter: Table.api.formatter.image},
-                        {field: 'gender', title: __('Gender'), searchList: {"1":__('Gender 1'),"0":__('Gender 0')}, formatter: Table.api.formatter.normal},
-                        {field: 'prevtime', title: __('Prevtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'logintime', title: __('Logintime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'loginip', title: __('Loginip'), operate: 'LIKE'},
-                        {field: 'joinip', title: __('Joinip'), operate: 'LIKE'},
-                        {field: 'jointime', title: __('Jointime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'token', title: __('Token'), operate: 'LIKE'},
+//                        {field: 'gender', title: __('Gender'), searchList: {"1":__('Gender 1'),"0":__('Gender 0')}, formatter: Table.api.formatter.normal},
+//                        {field: 'prevtime', title: __('Prevtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+//                        {field: 'logintime', title: __('Logintime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+//                        {field: 'loginip', title: __('Loginip'), operate: 'LIKE'},
+//                        {field: 'joinip', title: __('Joinip'), operate: 'LIKE'},
+//                        {field: 'jointime', title: __('Jointime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+//                        {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+//                        {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+//                        {field: 'token', title: __('Token'), operate: 'LIKE'},
                         {field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"0":__('Status 0'),"-1":__('Status -1')}, formatter: Table.api.formatter.status},
                         {field: 'idcard_status', title: __('Idcard_status'), searchList: {"-1":__('Idcard_status -1'),"0":__('Idcard_status 0'),"1":__('Idcard_status 1'),"2":__('Idcard_status 2')}, formatter: Table.api.formatter.status},
-                        {field: 'mini_openid', title: __('Mini_openid'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'gangwei.name', title: __('Gangwei.name'), operate: 'LIKE'},
-                        {field: 'jigou.name', title: __('Jigou.name'), operate: 'LIKE'},
+//                        {field: 'mini_openid', title: __('Mini_openid'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+
+
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]