1

application/admin/common.php

@@ -231,6 +231,7 @@ if(!function_exists('is_sys_admin'))
 {
     function is_sys_admin()
     {
+
         $admin = session('admin');
         if($admin['cid']>0)
         {

application/admin/controller/general/Attachment.php

@@ -62,9 +62,9 @@ class Attachment extends Backend
             $this->request->get(['filter' => json_encode($filterArr)]);
 
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
-
+            $where1  = is_sys_admin();
             $list = $this->model
-                ->where($mimetypeQuery)
+                ->where($mimetypeQuery)->where($where1)
                 ->where($where)
                 ->order($sort, $order)
                 ->paginate($limit);

application/admin/controller/institution/Ade.php

@@ -29,6 +29,34 @@ class Ade extends Backend
     {
         parent::import();
     }
+    public function index()
+    {
+        //设置过滤方法
+        $this->request->filter(['strip_tags', 'trim']);
+        if ($this->request->isAjax()) {
+            //如果发送的来源是Selectpage，则转发到Selectpage
+            if ($this->request->request('keyField')) {
+                $data = $this->selectpage()->getData();
+                return $data;
+            }
+            list($where, $sort, $order, $offset, $limit) = $this->buildparams();
+            /**
+             * 获取企业信息
+             */
+            $where1  = is_sys_admin();
+            $list = $this->model
+                ->where($where)->where($where1)
+                ->order($sort, $order)
+                ->paginate($limit);
+            foreach ($list as $k => $v) {
+
+            }
+            $result = array("total" => $list->total(), "rows" => $list->items());
+
+            return json($result);
+        }
+        return $this->view->fetch();
+    }
 
     /**
      * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法

application/admin/controller/institution/AidStation.php

@@ -29,6 +29,34 @@ class AidStation extends Backend
     {
         parent::import();
     }
+    public function index()
+    {
+        //设置过滤方法
+        $this->request->filter(['strip_tags', 'trim']);
+        if ($this->request->isAjax()) {
+            //如果发送的来源是Selectpage，则转发到Selectpage
+            if ($this->request->request('keyField')) {
+                $data = $this->selectpage()->getData();
+                return $data;
+            }
+            list($where, $sort, $order, $offset, $limit) = $this->buildparams();
+            /**
+             * 获取企业信息
+             */
+            $where1  = is_sys_admin();
+            $list = $this->model
+                ->where($where)->where($where1)
+                ->order($sort, $order)
+                ->paginate($limit);
+            foreach ($list as $k => $v) {
+
+            }
+            $result = array("total" => $list->total(), "rows" => $list->items());
+
+            return json($result);
+        }
+        return $this->view->fetch();
+    }
 
     /**
      * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法

application/admin/controller/institution/Institution.php

@@ -29,6 +29,34 @@ class Institution extends Backend
     {
         parent::import();
     }
+    public function index()
+    {
+        //设置过滤方法
+        $this->request->filter(['strip_tags', 'trim']);
+        if ($this->request->isAjax()) {
+            //如果发送的来源是Selectpage，则转发到Selectpage
+            if ($this->request->request('keyField')) {
+                $data = $this->selectpage()->getData();
+                return $data;
+            }
+            list($where, $sort, $order, $offset, $limit) = $this->buildparams();
+            /**
+             * 获取企业信息
+             */
+            $where1  = is_sys_admin();
+            $list = $this->model
+                ->where($where)->where($where1)
+                ->order($sort, $order)
+                ->paginate($limit);
+            foreach ($list as $k => $v) {
+
+            }
+            $result = array("total" => $list->total(), "rows" => $list->items());
+
+            return json($result);
+        }
+        return $this->view->fetch();
+    }
 
     /**
      * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法

application/admin/controller/user/User.php

@@ -39,7 +39,9 @@ class User extends Backend
             //如果发送的来源是Selectpage，则转发到Selectpage
             if ($this->request->request('keyField')) {
                 $data = $this->selectpage()->getData();
-                $data['list'] = array_merge([['id'=>0,'nickname'=>'无','pid'=>0]],$data['list']);
+                if(!$this->request->request('keyValue'))
+                    $data['list'] = array_merge([['id'=>0,'nickname'=>'无','pid'=>0]],$data['list']);
+
                 $data['total'] ++;
                 return $data;
             }

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

@@ -16,6 +16,7 @@ return [
     'Activity_end'   => '活动结束时间',
     'Content'        => '活动内容',
     'Number'         => '报名人数',
+    'MaxNumber'      => '最大报名人数',
     'Status'         => '状态',
     'Status 0'       => '待审核',
     'Status 1'       => '同意',

application/admin/view/auth/admin/add.html

@@ -33,7 +33,7 @@
     <div class="form-group">
         <label for="password" class="control-label col-xs-12 col-sm-2">{:__('Company')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input type="text" data-source="company/company/index" data-field="company_name" class="form-control selectpage" id="cid" name="row[cid]" autocomplete="new-password" value="" data-rule="required" />
+            <input type="text" data-source="company" data-field="company_name" class="form-control selectpage" id="cid" name="row[cid]" autocomplete="new-password" value="" data-rule="required" />
         </div>
     </div>
     <div class="form-group">

application/admin/view/auth/admin/edit.html

@@ -33,7 +33,7 @@
     <div class="form-group">
         <label for="password" class="control-label col-xs-12 col-sm-2">{:__('Company')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input type="text" data-source="company/company/index" data-field="company_name" value="{$row.cid|htmlentities}" class="form-control selectpage" id="cid" name="row[cid]" autocomplete="new-password" value="" data-rule="required" />
+            <input type="text" data-source="company" data-field="company_name" value="{$row.cid|htmlentities}" class="form-control selectpage" id="cid" name="row[cid]" autocomplete="new-password" value="" data-rule="required" />
         </div>
     </div>
     <div class="form-group">

application/admin/view/institution/ade/add.html

@@ -1,11 +1,15 @@
 <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 
-   <div class="form-group">
+    {eq name="admin.cid" value="0"}
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Cid')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-cid" data-rule="required" data-source="Company" data-field="company_name" class="form-control selectpage" name="row[cid]" type="text" value="0">
+            <input id="c-cid" data-rule="required" data-source="Company" data-field="company_name" class="form-control selectpage" name="row[cid]" type="text" >
         </div>
     </div>
+    {else/}
+    <input id="c-cid"  name="row[cid]" type="hidden" value="{$admin.cid}">
+    {/eq}
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -39,8 +43,14 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Longitude')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-longitude" class="form-control" name="row[longitude]" type="text">
+            <div class="input-group">
+                <input id="c-longitude" class="form-control" size="50" name="row[longitude]" type="text">
+                <div class="input-group-addon no-border no-padding">
+                    <a target="_blank" href="https://lbs.qq.com/getPoint/"><button type="button" class="btn btn-primary" ><i class="fa fa-list"></i>选择地址</button></a>
+                </div>
+            </div>
         </div>
+
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Images')}:</label>

application/admin/view/institution/ade/edit.html

@@ -1,11 +1,15 @@
 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 
+    {eq name="admin.cid" value="0"}
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Cid')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-cid" data-rule="required" data-source="Company" data-field="company_name" class="form-control selectpage" name="row[cid]" type="text" value="{$row.cid}">
         </div>
     </div>
+    {else/}
+    <input id="c-cid"  name="row[cid]" type="hidden" value="{$admin.cid}">
+    {/eq}
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/lave/add.html

@@ -1,11 +1,15 @@
 <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 
+    {eq name="admin.cid" value="0"}
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Cid')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-cid" data-rule="required" data-source="Company" data-field="company_name" class="form-control selectpage" name="row[cid]" type="text" value="0">
+            <input id="c-cid" data-rule="required" data-source="Company" data-field="company_name" class="form-control selectpage" name="row[cid]" type="text" >
         </div>
     </div>
+    {else/}
+    <input id="c-cid"  name="row[cid]" type="hidden" value="{$admin.cid}">
+    {/eq}
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -15,7 +19,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Order_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-order_id" data-rule="required" data-source="order/index" class="form-control selectpage" name="row[order_id]" type="text" value="">
+            <input id="c-order_id" data-rule="required" data-source="order/index" class="form-control" name="row[order_id]" type="text" value="">
         </div>
     </div>
     <div class="form-group">

application/admin/view/lave/edit.html

@@ -1,21 +1,24 @@
 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
-
+    {eq name="admin.cid" value="0"}
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Cid')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-cid" data-rule="required" data-source="Company" data-field="company_name" class="form-control selectpage" name="row[cid]" type="text" value="{$row.cid}">
         </div>
     </div>
+    {else/}
+    <input id="c-cid"  name="row[cid]" type="hidden" value="{$admin.cid}">
+    {/eq}
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
+            <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname"  class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Order_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-order_id" data-rule="required" data-source="order/index" class="form-control selectpage" name="row[order_id]" type="text" value="{$row.order_id|htmlentities}">
+            <input id="c-order_id" data-rule="required" data-source="order/index" disabled class="form-control" name="row[order_id]" type="text" value="{$row.order_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">
@@ -64,7 +67,7 @@
         <label class="control-label col-xs-12 col-sm-2">{:__('Is_open')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
-            <select  id="c-is_open" class="form-control selectpicker" name="row[is_open]">
+            <select  id="c-is_open" class="form-control selectpicker" disabled name="row[is_open]">
                 {foreach name="isOpenList" item="vo"}
                     <option value="{$key}" {in name="key" value="$row.is_open"}selected{/in}>{$vo}</option>
                 {/foreach}
@@ -76,7 +79,7 @@
         <label class="control-label col-xs-12 col-sm-2">{:__('Is_ticket')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
-            <select  id="c-is_ticket" class="form-control selectpicker" name="row[is_ticket]">
+            <select  id="c-is_ticket" class="form-control selectpicker" disabled name="row[is_ticket]">
                 {foreach name="isTicketList" item="vo"}
                     <option value="{$key}" {in name="key" value="$row.is_ticket"}selected{/in}>{$vo}</option>
                 {/foreach}
@@ -88,7 +91,7 @@
         <label class="control-label col-xs-12 col-sm-2">{:__('Paid')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
-            <select  id="c-paid" class="form-control selectpicker" name="row[paid]">
+            <select  id="c-paid" class="form-control selectpicker" disabled name="row[paid]">
                 {foreach name="paidList" item="vo"}
                     <option value="{$key}" {in name="key" value="$row.paid"}selected{/in}>{$vo}</option>
                 {/foreach}
@@ -100,9 +103,9 @@
         <label class="control-label col-xs-12 col-sm-2">{:__('Pay_type')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
-            <select  id="c-pay_type" class="form-control selectpicker" name="row[pay_type]">
+            <select  id="c-pay_type" class="form-control selectpicker" disabled  name="row[pay_type]">
                 {foreach name="payTypeList" item="vo"}
-                    <option value="{$key}" {in name="key" value="$row.pay_type"}selected{/in}>{$vo}</option>
+                    <option  value="{$key}" {in name="key" value="$row.pay_type"}selected{/in}>{$vo}</option>
                 {/foreach}
             </select>
 
@@ -111,20 +114,20 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Paytime')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-paytime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[paytime]" type="text" value="{:$row.paytime?datetime($row.paytime):''}">
+            <input id="c-paytime" class="form-control datetimepicker" disabled data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[paytime]" type="text" value="{:$row.paytime?datetime($row.paytime):''}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Sn')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-SN" class="form-control" name="row[SN]" type="text" value="{$row.SN|htmlentities}">
+            <input id="c-SN" class="form-control"  disabled name="row[SN]" type="text" value="{$row.SN|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
-            <select  id="c-type" class="form-control selectpicker" name="row[type]">
+            <select  id="c-type" class="form-control selectpicker" disabled name="row[type]">
                 {foreach name="typeList" item="vo"}
                     <option value="{$key}" {in name="key" value="$row.type"}selected{/in}>{$vo}</option>
                 {/foreach}

application/admin/view/training/training/add.html

@@ -87,9 +87,9 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Number')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('MaxNumber')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-number" class="form-control" name="row[number]" type="number" value="0">
+            <input id="c-max_number" class="form-control" name="row[max_number]" type="number" value="0">
         </div>
     </div>
     <div class="form-group">

application/admin/view/training/training/edit.html

@@ -86,10 +86,16 @@
             <textarea id="c-content" data-rule="required" class="form-control editor" rows="5" name="row[content]" cols="50">{$row.content|htmlentities}</textarea>
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('MaxNumber')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-max_number" class="form-control" name="row[max_number]" type="number" value="{$row.max_number|htmlentities}">
+        </div>
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Number')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-number" class="form-control" name="row[number]" type="number" value="{$row.number|htmlentities}">
+            <input id="c-number" disabled class="form-control" name="row[number]" type="number" value="{$row.number|htmlentities}">
         </div>
     </div>
     <div class="form-group">

application/common/library/Upload.php

@@ -361,6 +361,7 @@ class Upload
         $auth = Auth::instance();
         $params = array(
             'admin_id'    => (int)session('admin.id'),
+            'cid'         =>  (int)session('admin.cid'),
             'user_id'     => (int)$auth->id,
             'filename'    => mb_substr(htmlspecialchars(strip_tags($this->fileInfo['name'])), 0, 100),
             'category'    => $category,

public/assets/js/backend/training/training.js

@@ -37,6 +37,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'reg_end', title: __('Reg_end'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
                         {field: 'activity_start', title: __('Activity_start'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
                         {field: 'activity_end', title: __('Activity_end'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
+                        {field: 'max_number', title: __('MaxNumber')},
                         {field: 'number', title: __('Number')},
                         {field: 'status', title: __('Status'), searchList: {"0":__('Status 0'),"1":__('Status 1'),"-1":__('Status -1')}, formatter: Table.api.formatter.status},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}