544782275@qq.com 4 years ago
parent
commit
1354804740

+ 42 - 155
app/county/controller/School.php

@@ -41,196 +41,83 @@ class School extends Controller
      */
     public function index()
     {
-        $this->title = '学校管理';
-        $query = $this->_query($this->table);
-        $query->equal('status')->dateBetween('login_at,create_at');
-        $query->like('name,contact_phone#phone,contact_mail#mail');
-        // 加载对应数据列表
-        $this->type = input('type', 'all');
-        if ($this->type === 'all') {
-            $query->where(['is_deleted' => 0, 'status' => 1]);
-        } elseif ($this->type = 'recycle') {
-            $query->where(['is_deleted' => 0, 'status' => 0]);
-        }
-        // 列表排序并显示
-        $query->order('sort desc,id desc')->page();
+        $this->title = '学校信息管理';
+        $county_id = session('user.county_id');
+        $query = $this->_query($this->table)->where('county_id',$county_id)->where('is_deleted',0)->like('name')->equal('school_code,office_phone,type');
+        $query->order('id desc')->page();
     }
 
     /**
-     * 添加学校
-     * @auth true
+     * 数据列表处理
+     * @param array $data
      * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
      */
-    public function add()
+    protected function _index_page_filter(&$data)
     {
-        $this->_applyFormToken();
-        $this->_form($this->table, 'form');
-    }
+        foreach ($data as &$value){
 
-    /**
-     * 编辑学校
-     * @auth true
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function edit()
-    {
-        $this->_applyFormToken();
-        $this->_form($this->table, 'form');
-    }
-
-    /**
-     * 修改用户密码
-     * @auth true
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function pass()
-    {
-        $this->_applyFormToken();
-        if ($this->request->isGet()) {
-            $this->verify = false;
-            $this->_form($this->table, 'pass');
-        } else {
-            $data = $this->_vali([
-                'id.require'                  => '用户ID不能为空!',
-                'password.require'            => '登录密码不能为空!',
-                'repassword.require'          => '重复密码不能为空!',
-                'repassword.confirm:password' => '两次输入的密码不一致!',
-            ]);
-            if (data_save('system_user', ['id' => $data['id'], 'password' => md5($data['password'])], 'id')) {
-                sysoplog('学校管理', "修改用户[{$data['id']}]密码成功");
-                $this->success('密码修改成功,请使用新密码登录!', '');
-            } else {
-                $this->error('密码修改失败,请稍候再试!');
-            }
         }
+        $this->type_arr = array('1'=>'幼儿园','2'=>'小学','3'=>'初中','4'=>'高中','5'=>'特教','6'=>'工读','7'=>'中职');
+        $this->county_list = $this->app->db->name('county_list')->column('name','id');
     }
+    protected function _form_filter(&$data){
+        if($this->request->isGet()) {
 
-    /**
-     * 表单数据处理
-     * @param array $data
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    protected function _form_filter(array &$data)
-    {
-        if ($this->request->isPost()) {
+        }elseif ($this->request->isPost()){
             if (isset($data['id']) && $data['id'] > 0) {
-                unset($data['username']);
-            } else {
-                // 检查登录账号是否出现重复
-                if (empty($data['username'])) $this->error('登录账号不能为空!');
-                $where = ['username' => $data['username'], 'is_deleted' => 0];
-                if ($this->app->db->name('system_user')->where($where)->count() > 0) {
-                    $this->error("账号已经存在,请使用其它账号!");
+                $is_set = $this->app->db->name('school2')->where('username',$data['username'])->where('id','<>',$data['id'])->find();
+                if($is_set){
+                    $this->error('不能设置重复的账号');
                 }
-                // 新添加的用户密码与账号相同
-               // $data['password'] = md5($data['username']);
+                $data['password'] = md5($data['visible_password']);
             }
-            // 账号权限绑定处理
-           // $data['authorize'] = arr2str($data['authorize'] ?? []);
-        } else {
-            /*$data['authorize'] = str2arr($data['authorize'] ?? '');
-            $query = $this->app->db->name('SystemAuth')->where(['status' => 1]);
-            $this->authorizes = $query->order('sort desc,id desc')->select()->toArray();*/
         }
     }
-
     /**
-     * 修改用户状态
+     * 编辑学校
      * @auth true
-     * @throws \think\db\exception\DbException
+     * @throws \think\Exception
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     * @throws \think\exception\PDOException
      */
-    public function state()
+    public function edit()
     {
-        $this->_checkInput();
-        $this->_applyFormToken();
-        $this->_save($this->table, $this->_vali([
-            'status.in:0,1'  => '状态值范围异常!',
-            'status.require' => '状态值不能为空!',
-        ]));
+        $this->title = '编辑';
+        $this->_form($this->table, 'form');
     }
-
     /**
      * 删除学校
      * @auth true
-     * @throws \think\db\exception\DbException
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
      */
     public function remove()
     {
-        $this->_checkInput();
-        $this->_applyFormToken();
-        $this->_delete($this->table);
+        $this->_save($this->table, ['is_deleted' => '1']);
     }
-
-    /**
-     * 检查输入变量
-     */
-    private function _checkInput()
-    {
-        if (in_array('10000', str2arr(input('id', '')))) {
-            $this->error('系统超级账号禁止删除!');
-        }
-    }
-
     /**
-     * 表单结果处理
-     * @param bool $result
-     */
-    protected function _add_form_result(bool $result)
-    {
-        if ($result) {
-            $id = $this->app->db->name($this->table)->getLastInsID();
-            $res=$this->app->db->name($this->table)->where('id',$id)->find();
-            $data['username']=$res['username'];
-            $data['authorize']=1;
-            $data['nickname']='学校管理员';
-            $data['is_shcool']=1;
-            $admin_id=$this->app->db->name('system_user')->insertGetId($data);
-            $this->app->db->name($this->table)->where('id',$id)->update(['admin_id'=>$admin_id]);
-        }
-    }
-
-    /**
-     * 表单结果处理
-     * @param boolean $result
-     */
-    protected function _edit_form_result(bool $result)
-    {
-        if ($result) {
-            $id = input('id') ?: 0;
-            sysoplog('学校管理', "修改学校[{$id}]成功");
-        }
-    }
-
-    /**
-     * 状态结果处理
-     * @param boolean $result
+     * 禁用学校
+     * @auth true
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
      */
-    protected function _state_save_result(bool $result)
+    public function forbid()
     {
-        if ($result) {
-            [$id, $state] = [input('id'), input('status')];
-            sysoplog('学校管理', ($state ? '激活' : '禁用') . "学校[{$id}]成功");
-        }
+        $this->_save($this->table, ['status' => '0']);
     }
-
     /**
-     * 删除结果处理
-     * @param boolean $result
+     * 启用学校
+     * @auth true
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
      */
-    protected function _remove_delete_result(bool $result)
+    public function resume()
     {
-        if ($result) {
-            $id = input('id') ?: 0;
-            sysoplog('学校管理', "删除学校[{$id}]成功");
-        }
+        $this->_save($this->table, ['status' => '1']);
     }
 
 }

+ 109 - 29
app/county/view/school/form.html

@@ -11,54 +11,139 @@
                     <span class="help-block">用户显示的账号别名,请尽量保持不要重复</span>
                 </label>
             </div>
-            <div class="layui-col-xs5">
+            <div class="layui-col-xs5" style="width: 26%;">
                 <label class="block relative">
                     <span class="color-green font-w7">登录账号</span>
                     <span class="color-desc margin-left-5">User Name</span>
-                    {if isset($vo) and isset($vo.contact_mail)}
-                    <input disabled value='{$vo.username|default=""}' class="layui-input layui-bg-gray">
-                    {else}
                     <input name="username" value='{$vo.username|default=""}' required placeholder="请输入登录账号" class="layui-input">
-                    {/if}
-                    <span class="help-block">登录账号不能重复,账号创建后不能再次修改</span>
+                    <span class="help-block">登录账号不能重复</span>
                 </label>
             </div>
 
+            <div class="layui-col-xs5" style="width: 32%;">
+                <label class="block relative">
+                    <span class="color-green font-w7">登录密码</span>
+                    <span class="color-desc margin-left-5">Password</span>
+                    <input name="visible_password" style="width: 150px" value='{$vo.visible_password|default=""}' required placeholder="请输入登录密码" class="layui-input">
+                    <span class="help-block">请填写新的密码</span>
+                </label>
+            </div>
         </div>
 
         <div class="hr-line-dashed margin-top-10 margin-bottom-10"></div>
         <div class="layui-row layui-col-space15">
             <div class="layui-col-xs4">
                 <label class="relative block">
-                    <span class="color-green font-w7">联系邮箱</span><span class="color-desc margin-left-5">Contact Email</span>
-                    <input name="contact_mail" pattern="^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$" value='{$vo.contact_mail|default=""}' placeholder="请输入联系电子邮箱" class="layui-input">
-                    <span class="color-desc">可选,请填写常用的电子邮箱</span>
+                    <span class="color-green font-w7">办学类型</span><span class="color-desc margin-left-5">School Type</span>
+                    <input name="school_type" value='{$vo.school_type|default=""}' required placeholder="请输入办学类型" class="layui-input">
+                    <span class="color-desc">请填写办学类型(例如:职业高等学校)</span>
                 </label>
             </div>
             <div class="layui-col-xs4">
                 <label class="relative block">
-                    <span class="color-green font-w7">联系手机</span><span class="color-desc margin-left-5">Contact Mobile</span>
-                    <input type="tel" maxlength="11" name="contact_phone" value='{$vo.contact_phone|default=""}' pattern="^1[3-9][0-9]{9}$" placeholder="请输入用户联系手机" class="layui-input">
-                    <span class="color-desc">可选,请填写常用的联系手机号</span>
+                    <span class="color-green font-w7">办学类型代码</span><span class="color-desc margin-left-5">School Type Code</span>
+                    <input name="school_type_code" value='{$vo.school_type_code|default=""}' required placeholder="请输入对用的办学类型代码" class="layui-input">
+                    <span class="color-desc">请填写办学类型对应的办学类型代码</span>
                 </label>
             </div>
             <div class="layui-col-xs4">
                 <label class="relative block">
-                    <span class="color-green font-w7">联系QQ</span><span class="color-desc margin-left-5">Contact QQ</span>
-                    <input name="contact_qq" pattern="^\d{6,}$" value='{$vo.contact_qq|default=""}' placeholder="请输入常用的联系QQ" class="layui-input">
-                    <span class="color-desc">可选,请填写常用的联系QQ号</span>
+                    <span class="color-green font-w7">社会信用代码</span><span class="color-desc margin-left-5">Social Credit Code</span>
+                    <input name="social_credit_code" value='{$vo.social_credit_code|default=""}' placeholder="请输入社会信用代码" class="layui-input">
+                    <span class="color-desc">选填,法人和其他组织统一社会信用代码</span>
                 </label>
             </div>
         </div>
 
+        <div class="hr-line-dashed margin-top-10 margin-bottom-10"></div>
+        <div class="layui-row layui-col-space15">
+
+            <div class="layui-col-xs5">
+                <label class="block relative">
+                    <span class="color-green font-w7">党政负责人姓名</span>
+                    <span class="color-desc margin-left-5">Dz Leader Name</span>
+                    <input name="dz_leader_name" value='{$vo.dz_leader_name|default=""}' placeholder="请输入党政负责人姓名" class="layui-input">
+                    <span class="help-block">可选,请填写党政负责人姓名</span>
+                </label>
+            </div>
 
-        <div class="layui-col-xs12 relative block">
-            <span class="color-green font-w7 label-required-prev">所在地</span>
-            <span class="color-desc margin-left-5">(原地点:{$vo.province|default='--'} - {$vo.city|default=''} - {$vo.area|default=''} )</span>
-            <div class="layui-row layui-col-space10">
-                <label class="layui-col-xs4"><select class="layui-select block full-width" lay-ignore name="province"></select></label>
-                <label class="layui-col-xs4"><select class="layui-select block full-width" lay-ignore name="city"></select></label>
-                <label class="layui-col-xs4"><select class="layui-select block full-width" lay-ignore name="area"></select></label>
+            <div class="layui-col-xs5">
+                <label class="block relative">
+                    <span class="color-green font-w7">党政负责人职务</span>
+                    <span class="color-desc margin-left-5">Dz Leader Position</span>
+                    <input name="dz_leader_position" value='{$vo.dz_leader_position|default=""}' placeholder="请输入党政负责人职务" class="layui-input">
+                    <span class="help-block">可选,请填写党政负责人职务</span>
+                </label>
+            </div>
+        </div>
+
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-xs5">
+                <label class="block relative">
+                    <span class="color-green font-w7">行政负责人姓名</span>
+                    <span class="color-desc margin-left-5">Xz Leader Name</span>
+                    <input name="xz_leader_name" value='{$vo.xz_leader_name|default=""}' placeholder="请输入行政负责人姓名" class="layui-input">
+                    <span class="help-block">可选,请填写行政负责人姓名</span>
+                </label>
+            </div>
+
+            <div class="layui-col-xs5">
+                <label class="block relative">
+                    <span class="color-green font-w7">行政负责人职务</span>
+                    <span class="color-desc margin-left-5">Xz Leader Position</span>
+                    <input name="xz_leader_position" value='{$vo.xz_leader_position|default=""}' placeholder="请输入行政负责人职务" class="layui-input">
+                    <span class="help-block">可选,请填写行政负责人职务</span>
+                </label>
+            </div>
+        </div>
+
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-xs4">
+                <label class="relative block">
+                    <span class="color-green font-w7">业务负责人姓名</span><span class="color-desc margin-left-5">Yw Leader Name</span>
+                    <input name="yw_leader_name" value='{$vo.yw_leader_name|default=""}' placeholder="请输入业务负责人姓名" class="layui-input">
+                    <span class="color-desc">可选,请填写业务负责人姓名</span>
+                </label>
+            </div>
+            <div class="layui-col-xs4">
+                <label class="relative block">
+                    <span class="color-green font-w7">业务负责人职务</span><span class="color-desc margin-left-5">Yw Leader Position</span>
+                    <input name="yw_leader_position" value='{$vo.yw_leader_position|default=""}' placeholder="请输入业务负责人职务" class="layui-input">
+                    <span class="color-desc">可选,请填写业务负责人职务</span>
+                </label>
+            </div>
+            <div class="layui-col-xs4">
+                <label class="relative block">
+                    <span class="color-green font-w7">业务负责人电话</span><span class="color-desc margin-left-5">Yw Leader Phone</span>
+                    <input type="tel" maxlength="11" name="yw_leader_phone" value='{$vo.yw_leader_phone|default=""}' pattern="^1[1-9][0-9]{9}$" placeholder="请输入业务负责人电话" class="layui-input">
+                    <span class="color-desc">可选,请填写业务负责人电话号</span>
+                </label>
+            </div>
+        </div>
+
+
+        <div class="hr-line-dashed margin-top-10 margin-bottom-10"></div>
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-xs4">
+                <label class="relative block">
+                    <span class="color-green font-w7">电子邮箱</span><span class="color-desc margin-left-5">Email</span>
+                    <input name="email" pattern="^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$" value='{$vo.email|default=""}' placeholder="请输入联系电子邮箱" class="layui-input">
+                    <span class="color-desc">可选,请填写常用的电子邮箱</span>
+                </label>
+            </div>
+            <div class="layui-col-xs4">
+                <label class="relative block">
+                    <span class="color-green font-w7">办公电话</span><span class="color-desc margin-left-5">Office Phone</span>
+                    <input type="office_phone" maxlength="11" name="contact_phone" value='{$vo.office_phone|default=""}' placeholder="请输入办公电话" class="layui-input">
+                    <span class="color-desc">可选,请填写常用的办公电话</span>
+                </label>
+            </div>
+            <div class="layui-col-xs4">
+                <label class="relative block">
+                    <span class="color-green font-w7">填报人</span><span class="color-desc margin-left-5">Fill In One</span>
+                    <input name="fill_in_one" value='{$vo.fill_in_one|default=""}' required placeholder="请输入填报人" class="layui-input">
+                    <span class="color-desc">请填写填报人</span>
+                </label>
             </div>
         </div>
 
@@ -72,12 +157,7 @@
     </div>
 
     <script>
-        require(['pcasunzips'], function () {
-            (function (province, city, area) {
-                new PCAS("province", "city", "area", province, city, area);
-                window.form.render();
-            })('{$vo.province|default=""}', '{$vo.city|default=""}', '{$vo.area|default=""}');
-        });
+
 
     </script>
-</form>
+</form>

+ 56 - 97
app/county/view/school/index.html

@@ -1,104 +1,63 @@
 {extend name='main'}
 
-{block name="button"}
-{if isset($type) and $type eq 'all'}
-<!--{if auth("add")}-->
-<button data-modal='{:url("add")}' data-title="添加学校" class='layui-btn layui-btn-sm layui-btn-primary'>添加学校</button>
-<!--{/if}-->
-<!--{if auth("state")}-->
-<a data-confirm="确定要启用该学校吗?" data-action="{:url('state')}" data-rule="id#{key};status#0" data-csrf="{:systoken('state')}" class='layui-btn layui-btn-sm layui-btn-primary'>批量禁用</a>
-<!--{/if}-->
-{else}
-<!--{if auth("state")}-->
-<a data-confirm="确定要恢复这些账号吗?" data-action="{:url('state')}" data-rule="id#{key};status#1" data-csrf="{:systoken('state')}" class='layui-btn layui-btn-sm layui-btn-primary'>批量恢复</a>
-<!--{/if}-->
-<!--{if auth("remove")}-->
-<a data-confirm="确定要永久删除这些账号吗?" data-action='{:url("remove")}' data-rule="id#{key}" data-csrf="{:systoken('remove')}" class='layui-btn layui-btn-sm layui-btn-primary'>批量删除</a>
-<!--{/if}-->
-{/if}
-{/block}
-
 {block name="content"}
-<div class="layui-tab layui-tab-card think-bg-white table-block">
-    <ul class="layui-tab-title">
-        {foreach ['all'=>'系统学校','recycle'=>'回 收 站'] as $k=>$v}
-        {if isset($type) and $type eq $k}
-        <li data-open="{:url('index')}?type={$k}" class="layui-this">{$v}</li>
-        {else}
-        <li data-open="{:url('index')}?type={$k}">{$v}</li>
-        {/if}{/foreach}
-    </ul>
-    <div class="layui-tab-content think-box-shadow table-block table-block">
-        {include file='school/index_search'}
-        <table class="layui-table margin-top-10" lay-skin="line">
-            {notempty name='list'}
-            <thead>
-            <tr>
-                <th class='list-table-check-td think-checkbox'>
-                    <label><input data-auto-none data-check-target='.list-check-box' type='checkbox'></label>
-                </th>
-                <th class='list-table-sort-td'>
-                    <button type="button" data-reload class="layui-btn layui-btn-xs">刷 新</button>
-                </th>
-                <th class='text-left nowrap'></th>
-                <th class='text-left nowrap'></th>
-                <th class='text-left nowrap'></th>
-                <th></th>
-            </tr>
-            </thead>
-            {/notempty}
-            <tbody>
-            {foreach $list as $key=>$vo}
-            <tr data-dbclick>
-                <td class='list-table-check-td think-checkbox'>
-                    <label><input class="list-check-box" value='{$vo.id}' type='checkbox'></label>
-                </td>
-                <td class='list-table-sort-td'>
-                    <label><input data-action-blur="{:request()->url()}" data-value="id#{$vo.id};action#sort;sort#{value}" data-loading="false" value="{$vo.sort}" class="list-sort-input"></label>
-                </td>
-                <td class='text-left nowrap'>
-                    <div class="headimg" data-tips-image data-lazy-src="{$vo.headimg|default=''}"></div>
-                    <div class="inline-block sub-span-blue">
-                        登录账号:<span><b>{$vo.username|default=''}</b></span><br>
-                        学校昵称:<span><b>{$vo.name|default='-'}</b></span><br>
-                    </div>
-                </td>
-                <td class='text-left nowrap'>
-                    联系手机:<span class="color-blue">{$vo.contact_phone|default='<i class="color-desc">未配置手机</i>'|raw}</span><br>
-                    联系邮箱:<span class="color-blue">{$vo.contact_mail|default='<i class="color-desc">未配置邮箱</i>'|raw}</span><br>
-                </td>
-                <td class='text-left nowrap'>
-                    创建时间:<span class="color-blue">{$vo.create_at|format_datetime}</span>( {eq name='vo.status' value='0'}<span class="color-red">已禁用</span>{else}<span class="color-green">已激活</span>{/eq} )<br>
+<div class="think-box-shadow">
+    {include file='school/index_search'}
+    <table class="layui-table margin-top-10" lay-skin="line">
+        {notempty name='list'}
+        <thead>
+        <tr>
+            <th class='text-left nowrap' width="7%">学校代码</th>
+            <th class='text-left nowrap' width="15%">学校名称</th>
+            <th class='text-left nowrap' width="5%">学校类型</th>
+            <th class='text-left nowrap' width="5%">行政负责人姓名</th>
+            <th class='text-left nowrap' width="5%">业务负责人姓名</th>
+            <th class='text-left nowrap' width="7%">业务负责人电话</th>
+            <th class='text-left nowrap' width="14%">学校地址</th>
+            <th class='text-left nowrap' width="7%">办公电话</th>
+            <th class='text-left nowrap' width="5%">状态</th>
+            <th class="text-left" width="15%">操作</th>
+        </tr>
+        </thead>
+        {/notempty}
+        <tbody>
+        {foreach $list as $key=>$vo}
+        <tr>
+            <td><div class="inline-block">{$vo.school_code|default='--'}</div></td>
+            <td><div class="inline-block">{$vo.name|default='--'}</div></td>
+            <td class='text-left'>{$type_arr[$vo.type]|default='--'}</td>
+            <td class='text-left'>{$vo.xz_leader_name|default='--'}</td>
+            <td class='text-left'>{$vo.yw_leader_name|default='--'}</td>
+            <td class='text-left'>{$vo.yw_leader_phone|default='--'}</td>
+            <td class='text-left'>{$vo.address|default='--'}</td>
+            <td class='text-left'>{$vo.office_phone|default='--'}</td>
+            <td class='text-left nowrap'>
+                {eq name='vo.status' value='0'}
+                <span class="layui-badge">已禁用</span>{else}<span class="layui-badge layui-bg-green">使用中</span>
+                {/eq}
+            </td>
+            <td class='text-left nowrap'>
+                <div style="margin-bottom: 10px">
+                    {if auth("admin/school/edit")}
+                    <a data-title="编辑" class="layui-btn layui-btn-sm" data-modal='{:url("edit")}?id={$vo.id}'>编 辑</a>
+                    {/if}
+                    <!--<a data-title="学生列表" class="layui-btn layui-btn-sm layui-btn-normal" data-open='{:url("admin/student/index")}?school_id={$vo.id}'>学生列表</a>
 
-                </td>
-                <td class='text-left nowrap'>
-                    {if isset($type) and $type eq 'all'}
-                    <!--{if auth("pass")}-->
-                    <a class="layui-btn layui-btn-sm layui-btn-normal" data-title="设置密码" data-modal='{:url("pass")}?id={$vo.admin_id}'>密 码</a>
-                    <!--{/if}-->
-                    <!--{if auth("edit")}-->
-                    <a data-dbclick class="layui-btn layui-btn-sm" data-title="编辑学校" data-modal='{:url("edit")}?id={$vo.id}'>编 辑</a>
-                    <!--{/if}-->
-                    <!--{if auth("state") and $vo.status eq 1}-->
-                    <a class="layui-btn layui-btn-sm layui-btn-warm" data-confirm="确定要禁用该禁用账号吗?" data-action="{:url('state')}" data-value="id#{$vo.id};status#0" data-csrf="{:systoken('state')}">禁 用</a>
-                    <!--{/if}-->
-                    {else}
-                    <!--{if auth("edit")}-->
-                    <a data-dbclick class="layui-btn layui-btn-sm" data-title="编辑学校" data-modal='{:url("edit")}?id={$vo.id}'>编 辑</a>
-                    <!--{/if}-->
-                    <!--{if auth("state") and $vo.status eq 0}-->
-                    <a class="layui-btn layui-btn-sm layui-btn-warm" data-confirm="确定要恢复该账号吗?" data-action="{:url('state')}" data-value="id#{$vo.id};status#1" data-csrf="{:systoken('state')}">恢 复</a>
-                    <!--{/if}-->
-                    <!--{if auth("remove")}-->
-                    <a class="layui-btn layui-btn-sm layui-btn-danger" data-confirm="确定要永久删除此账号吗?" data-action="{:url('remove')}" data-value="id#{$vo.id}" data-csrf="{:systoken('remove')}">删 除</a>
-                    <!--{/if}-->
+                    <a data-title="教师列表" class="layui-btn layui-btn-sm layui-btn-normal" data-open='{:url("admin/teacher/index")}?school_id={$vo.id}'>教师列表</a>-->
+
+                    {if $vo.status eq 1 and auth("forbid")}
+                    <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('forbid')}" data-value="id#{$vo.id};status#0">禁 用</a>
+                    {elseif auth("resume")}
+                    <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('resume')}" data-value="id#{$vo.id};status#1">启 用</a>
+                    {/if}
+                    {if auth("admin/school/remove")}
+                    <a class="layui-btn layui-btn-sm layui-btn-danger" data-confirm="确定要删除该学校吗?" data-action="{:url('remove')}" data-value="id#{$vo.id}">删 除</a>
                     {/if}
-                </td>
-            </tr>
-            {/foreach}
-            </tbody>
-        </table>
-        {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
-    </div>
+            </td>
+        </tr>
+        {/foreach}
+        </tbody>
+    </table>
+    {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
 </div>
 {/block}

+ 29 - 1
app/county/view/school/index_search.html

@@ -1,6 +1,14 @@
 <fieldset>
     <legend>条件搜索</legend>
     <form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get" autocomplete="off">
+
+        <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">学校代码</label>
+            <label class="layui-input-inline">
+                <input name="school_code" value="{:input('get.school_code')}" placeholder="请输入学校代码" class="layui-input">
+            </label>
+        </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">学校名称</label>
             <label class="layui-input-inline">
@@ -8,8 +16,28 @@
             </label>
         </div>
 
+        <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">办公电话</label>
+            <label class="layui-input-inline">
+                <input name="office_phone" value="{:input('get.office_phone')}" placeholder="请输入办公电话" class="layui-input">
+            </label>
+        </div>
 
-
+        <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">学校类型</label>
+            <div class="layui-input-inline">
+                <select class="layui-select" name="type">
+                    <option value="">- 全部代理 -</option>
+                    {foreach $type_arr as $k=>$v}
+                    {if input('get.type') eq $k}
+                    <option selected value="{$k}">{$v}</option>
+                    {else}
+                    <option value="{$k}">{$v}</option>
+                    {/if}
+                    {/foreach}
+                </select>
+            </div>
+        </div>
 
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>

+ 0 - 53
app/county/view/school/pass.html

@@ -1,53 +0,0 @@
-<form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
-    <div class="layui-card-body padding-left-40">
-        <div class="layui-form-item">
-            <label class="relative block">
-                <span class="color-green font-w7">登录用户账号</span>
-                <span class="color-desc margin-left-5">Username</span>
-                <!--{if isset($vo) and isset($vo.username)}-->
-                <input disabled value='{$vo.username|default=""}' class="layui-input layui-bg-gray">
-                <!--{else}-->
-                <input name="username" value='{$vo.username|default=""}' required pattern="^.{4,}$" placeholder="请输入4位及以上字符登录用户账号" class="layui-input">
-                <!--{/if}-->
-            </label>
-            <p class="help-block">登录用户账号创建后,不允许再次修改。</p>
-        </div>
-
-        <!--{if $verify}-->
-        <div class="layui-form-item">
-            <label class="relative block">
-                <span class="color-green font-w7">旧的登录密码</span>
-                <span class="color-desc margin-left-5">Old Password</span>
-                <input type="password" autofocus name="oldpassword" value='' pattern="^\S{1,}$" required placeholder="请输入旧的登录密码" class="layui-input">
-            </label>
-            <p class="color-desc">请输入旧密码来验证修改权限,旧密码不限制格式。</p>
-        </div>
-        <!--{/if}-->
-
-        <div class="layui-form-item">
-            <label class="relative block">
-                <span class="color-green font-w7">新的登录密码</span>
-                <span class="color-desc margin-left-5">New Password</span>
-                <input type="password" name="password" maxlength="32" pattern="^(?![\d]+$)(?![a-zA-Z]+$)(?![^\da-zA-Z]+$).{6,32}$" required placeholder="请输入新的登录密码" class="layui-input">
-            </label>
-            <p class="color-desc">密码必需包含大小写字母、数字、符号的任意两者组合。</p>
-        </div>
-
-        <div class="layui-form-item">
-            <label class="relative block">
-                <span class="color-green font-w7">重复登录密码</span>
-                <span class="color-desc margin-left-5">Repeat Password</span>
-                <input type="password" name="repassword" maxlength="32" pattern="^(?![\d]+$)(?![a-zA-Z]+$)(?![^\da-zA-Z]+$).{6,32}$" required placeholder="请重复输入登录密码" class="layui-input">
-            </label>
-            <p class="color-desc">密码必需包含大小写字母、数字、符号的任意两者组合。</p>
-        </div>
-    </div>
-
-    <div class="hr-line-dashed"></div>
-    {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
-
-    <div class="layui-form-item text-center">
-        <button class="layui-btn" type='submit'>保存数据</button>
-        <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗?" data-close>取消编辑</button>
-    </div>
-</form>