后台

application/admin/view/company/index.html

@@ -31,7 +31,7 @@
                             </ul>
                         </div>
 
-                        <!--<a class="btn btn-success btn-recyclebin btn-dialog {:$auth->check('company/recyclebin')?'':'hide'}" href="company/recyclebin" title="{:__('Recycle bin')}"><i class="fa fa-recycle"></i> {:__('Recycle bin')}</a>-->
+                        <a class="btn btn-success btn-recyclebin btn-dialog {:$auth->check('company/recyclebin')?'':'hide'}" href="company/recyclebin" title="{:__('Recycle bin')}"><i class="fa fa-recycle"></i> {:__('Recycle bin')}</a>
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
                            data-operate-edit="{:$auth->check('company/edit')}"

application/admin/view/company/recyclebin.html

@@ -7,11 +7,11 @@
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         {:build_toolbar('refresh')}
-                        <a class="btn btn-info btn-multi btn-disabled disabled {:$auth->check('company/restore')?'':'hide'}" href="javascript:;" data-url="company/restore" data-action="restore"><i class="fa fa-rotate-left"></i> {:__('Restore')}</a>
+                        <!--<a class="btn btn-info btn-multi btn-disabled disabled {:$auth->check('company/restore')?'':'hide'}" href="javascript:;" data-url="company/restore" data-action="restore"><i class="fa fa-rotate-left"></i> {:__('Restore')}</a>
                         <a class="btn btn-danger btn-multi btn-disabled disabled {:$auth->check('company/destroy')?'':'hide'}" href="javascript:;" data-url="company/destroy" data-action="destroy"><i class="fa fa-times"></i> {:__('Destroy')}</a>
                         <a class="btn btn-success btn-restoreall {:$auth->check('company/restore')?'':'hide'}" href="javascript:;" data-url="company/restore" title="{:__('Restore all')}"><i class="fa fa-rotate-left"></i> {:__('Restore all')}</a>
                         <a class="btn btn-danger btn-destroyall {:$auth->check('company/destroy')?'':'hide'}" href="javascript:;" data-url="company/destroy" title="{:__('Destroy all')}"><i class="fa fa-times"></i> {:__('Destroy all')}</a>
-                    </div>
+             -->       </div>
                     <table id="table" class="table table-striped table-bordered table-hover"
                            data-operate-restore="{:$auth->check('company/restore')}"
                            data-operate-destroy="{:$auth->check('company/destroy')}"

application/admin/view/worker/add.html

@@ -3,7 +3,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Company_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-company_id" data-rule="required" data-source="company/index" class="form-control selectpage" name="row[company_id]" type="text" value="">
+            <input id="c-company_id" data-rule="required" data-source="company/index" data-field="companyname" class="form-control selectpage" name="row[company_id]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
@@ -56,7 +56,7 @@
 
         </div>
     </div>
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Prevtime')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-prevtime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[prevtime]" type="text" value="{:date('Y-m-d H:i:s')}">
@@ -73,7 +73,7 @@
         <div class="col-xs-12 col-sm-8">
             <input id="c-loginip" class="form-control" name="row[loginip]" type="text" value="">
         </div>
-    </div>
+    </div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Idcard_z_image')}:</label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/worker/edit.html

@@ -3,7 +3,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Company_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-company_id" data-rule="required" data-source="company/index" class="form-control selectpage" name="row[company_id]" type="text" value="{$row.company_id|htmlentities}">
+            <input id="c-company_id" data-rule="required" data-source="company/index" data-field="companyname" class="form-control selectpage" name="row[company_id]" type="text" value="{$row.company_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">
@@ -56,7 +56,7 @@
 
         </div>
     </div>
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Prevtime')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-prevtime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[prevtime]" type="text" value="{:$row.prevtime?datetime($row.prevtime):''}">
@@ -73,7 +73,7 @@
         <div class="col-xs-12 col-sm-8">
             <input id="c-loginip" class="form-control" name="row[loginip]" type="text" value="{$row.loginip|htmlentities}">
         </div>
-    </div>
+    </div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Idcard_z_image')}:</label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/worker/recyclebin.html

@@ -7,11 +7,11 @@
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         {:build_toolbar('refresh')}
-                        <a class="btn btn-info btn-multi btn-disabled disabled {:$auth->check('worker/restore')?'':'hide'}" href="javascript:;" data-url="worker/restore" data-action="restore"><i class="fa fa-rotate-left"></i> {:__('Restore')}</a>
+                        <!--<a class="btn btn-info btn-multi btn-disabled disabled {:$auth->check('worker/restore')?'':'hide'}" href="javascript:;" data-url="worker/restore" data-action="restore"><i class="fa fa-rotate-left"></i> {:__('Restore')}</a>
                         <a class="btn btn-danger btn-multi btn-disabled disabled {:$auth->check('worker/destroy')?'':'hide'}" href="javascript:;" data-url="worker/destroy" data-action="destroy"><i class="fa fa-times"></i> {:__('Destroy')}</a>
                         <a class="btn btn-success btn-restoreall {:$auth->check('worker/restore')?'':'hide'}" href="javascript:;" data-url="worker/restore" title="{:__('Restore all')}"><i class="fa fa-rotate-left"></i> {:__('Restore all')}</a>
                         <a class="btn btn-danger btn-destroyall {:$auth->check('worker/destroy')?'':'hide'}" href="javascript:;" data-url="worker/destroy" title="{:__('Destroy all')}"><i class="fa fa-times"></i> {:__('Destroy all')}</a>
-                    </div>
+              -->      </div>
                     <table id="table" class="table table-striped table-bordered table-hover"
                            data-operate-restore="{:$auth->check('worker/restore')}"
                            data-operate-destroy="{:$auth->check('worker/destroy')}"

public/assets/js/backend/company.js

@@ -56,6 +56,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
+                        {field: 'companyname', title: __('Companyname'), operate: 'LIKE'},
                         {
                             field: 'deletetime',
                             title: __('Deletetime'),
@@ -78,14 +79,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                     url: 'company/restore',
                                     refresh: true
                                 },
-                                {
+                                /*{
                                     name: 'Destroy',
                                     text: __('Destroy'),
                                     classname: 'btn btn-xs btn-danger btn-ajax btn-destroyit',
                                     icon: 'fa fa-times',
                                     url: 'company/destroy',
                                     refresh: true
-                                }
+                                }*/
                             ],
                             formatter: Table.api.formatter.operate
                         }

public/assets/js/backend/worker.js

@@ -29,6 +29,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
                         {field: 'company_id', title: __('Company_id')},
+                        {field: 'company.companyname', title: __('Company.companyname'), operate: 'LIKE'},
+
                         {field: 'avatar', title: __('Avatar'), operate: 'LIKE', events: Table.api.events.image, formatter: Table.api.formatter.image},
                         {field: 'truename', title: __('Truename'), operate: 'LIKE'},
                         {field: 'gonghao', title: __('Gonghao'), operate: 'LIKE'},
@@ -41,7 +43,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'idcard_z_image', title: __('Idcard_z_image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
                         {field: 'idcard_f_image', title: __('Idcard_f_image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
                         {field: 'jineng_image', title: __('Jineng_image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
-                        {field: 'company.companyname', title: __('Company.companyname'), operate: 'LIKE'},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]
@@ -69,6 +70,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
+                        {field: 'company_id', title: __('Company_id')},
+                        {field: 'truename', title: __('Truename'), operate: 'LIKE'},
+
+                        {field: 'mobile', title: __('Mobile'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {
                             field: 'deletetime',
                             title: __('Deletetime'),
@@ -91,14 +96,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                     url: 'worker/restore',
                                     refresh: true
                                 },
-                                {
+                                /*{
                                     name: 'Destroy',
                                     text: __('Destroy'),
                                     classname: 'btn btn-xs btn-danger btn-ajax btn-destroyit',
                                     icon: 'fa fa-times',
                                     url: 'worker/destroy',
                                     refresh: true
-                                }
+                                }*/
                             ],
                             formatter: Table.api.formatter.operate
                         }

public/assets/js/backend/zhengce.js

@@ -27,11 +27,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
                         {field: 'company_id', title: __('Company_id')},
+                        {field: 'company.companyname', title: __('Company.companyname'), operate: 'LIKE'},
+
                         {field: 'title', title: __('Title'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
                         {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: 'company.companyname', title: __('Company.companyname'), operate: 'LIKE'},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]