zxhxx 3 éve
szülő
commit
f2654af8f2
51 módosított fájl, 302 hozzáadás és 44 törlés
  1. 31 0
      application/admin/controller/Lave.php
  2. 1 0
      application/admin/lang/zh-cn.php
  3. 5 1
      application/admin/view/ads/add.html
  4. 4 0
      application/admin/view/ads/edit.html
  5. 10 0
      application/admin/view/auth/group/add.html
  6. 5 1
      application/admin/view/donate/add.html
  7. 5 1
      application/admin/view/donate/edit.html
  8. 6 2
      application/admin/view/help/family/add.html
  9. 4 0
      application/admin/view/help/family/edit.html
  10. 5 1
      application/admin/view/help/help/add.html
  11. 5 1
      application/admin/view/help/help/edit.html
  12. 5 1
      application/admin/view/help/help_ext/add.html
  13. 4 0
      application/admin/view/help/help_ext/edit.html
  14. 6 2
      application/admin/view/institution/aid_station/add.html
  15. 4 0
      application/admin/view/institution/aid_station/edit.html
  16. 5 1
      application/admin/view/institution/institution/add.html
  17. 4 0
      application/admin/view/institution/institution/edit.html
  18. 5 1
      application/admin/view/menu/add.html
  19. 4 0
      application/admin/view/menu/edit.html
  20. 6 2
      application/admin/view/project/project_donation/add.html
  21. 4 0
      application/admin/view/project/project_donation/edit.html
  22. 6 2
      application/admin/view/project/project_donation_info/add.html
  23. 4 0
      application/admin/view/project/project_donation_info/edit.html
  24. 5 1
      application/admin/view/project/project_donation_order/add.html
  25. 5 1
      application/admin/view/project/project_donation_order/edit.html
  26. 5 1
      application/admin/view/project/project_donation_order_info/add.html
  27. 4 0
      application/admin/view/project/project_donation_order_info/edit.html
  28. 6 2
      application/admin/view/project/project_donation_rocord/add.html
  29. 4 0
      application/admin/view/project/project_donation_rocord/edit.html
  30. 6 2
      application/admin/view/project/project_donation_user/add.html
  31. 5 1
      application/admin/view/project/project_donation_user/edit.html
  32. 5 1
      application/admin/view/sos/rescue/add.html
  33. 4 0
      application/admin/view/sos/rescue/edit.html
  34. 6 2
      application/admin/view/sos/sos/add.html
  35. 4 0
      application/admin/view/sos/sos/edit.html
  36. 6 2
      application/admin/view/sos/sos_bill/add.html
  37. 11 0
      application/admin/view/sos/sos_bill/edit.html
  38. 5 1
      application/admin/view/training/training/add.html
  39. 5 1
      application/admin/view/training/training/edit.html
  40. 5 1
      application/admin/view/training/training_info/add.html
  41. 5 1
      application/admin/view/training/training_info/edit.html
  42. 6 2
      application/admin/view/training/volunteer/add.html
  43. 5 1
      application/admin/view/training/volunteer/edit.html
  44. 10 0
      application/admin/view/user/group/add.html
  45. 10 0
      application/admin/view/user/group/edit.html
  46. 10 0
      application/admin/view/user/user/edit.html
  47. 5 1
      application/admin/view/user/user_ext/add.html
  48. 10 1
      application/admin/view/user/user_ext/edit.html
  49. 5 1
      application/admin/view/user_relation/add.html
  50. 5 1
      application/admin/view/user_relation/edit.html
  51. 2 4
      application/api/controller/Project.php

+ 31 - 0
application/admin/controller/Lave.php

@@ -33,6 +33,37 @@ class Lave 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();
+            /**
+             * 获取企业信息
+             */
+            if(is_array(is_sys_admin()))
+            {
+                $where[] = is_sys_admin();
+            }
+            $list = $this->model
+                ->where($where)
+                ->order($sort, $order)
+                ->paginate($limit);
+            foreach ($list as $k => $v) {
+                $v->hidden(['password', 'salt']);
+            }
+            $result = array("total" => $list->total(), "rows" => $list->items());
+
+            return json($result);
+        }
+        return $this->view->fetch();
+    }
 
     /**
      * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法

+ 1 - 0
application/admin/lang/zh-cn.php

@@ -222,5 +222,6 @@ return [
     'project'                                               => '物资捐赠',
     'ads'                                                   => '广告',
     'menu'                                                  => '菜单',
+    'Cid'                                                   => '企业编号',
 
 ];

+ 5 - 1
application/admin/view/ads/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">{:__('Category_id')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 4 - 0
application/admin/view/ads/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">{:__('Category_id')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 10 - 0
application/admin/view/auth/group/add.html

@@ -1,6 +1,16 @@
 <form id="add-form" class="form-horizontal form-ajax" role="form" data-toggle="validator" method="POST" action="">
     {:token()}
     <input type="hidden" name="row[rules]" value="" />
+    {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" >
+        </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">{:__('Parent')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 5 - 1
application/admin/view/donate/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">

+ 5 - 1
application/admin/view/donate/edit.html

@@ -1,11 +1,15 @@
 <form id="edit-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="{$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">

+ 6 - 2
application/admin/view/help/family/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">{:__('Help_id')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 4 - 0
application/admin/view/help/family/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">{:__('Help_id')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 5 - 1
application/admin/view/help/help/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">{:__('Category_id')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 5 - 1
application/admin/view/help/help/edit.html

@@ -1,11 +1,15 @@
 <form id="edit-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="{$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">{:__('Category_id')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 5 - 1
application/admin/view/help/help_ext/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" class="form-control" name="row[cid]" type="number" 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">{:__('Help_id')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 4 - 0
application/admin/view/help/help_ext/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">{:__('Help_id')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 6 - 2
application/admin/view/institution/aid_station/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">{:__('Image')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 4 - 0
application/admin/view/institution/aid_station/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">{:__('Image')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 5 - 1
application/admin/view/institution/institution/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">{:__('Image')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 4 - 0
application/admin/view/institution/institution/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">{:__('Image')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 5 - 1
application/admin/view/menu/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">{:__('Category_id')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 4 - 0
application/admin/view/menu/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">{:__('Category_id')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 6 - 2
application/admin/view/project/project_donation/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">{:__('Title')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 4 - 0
application/admin/view/project/project_donation/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">{:__('Title')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 6 - 2
application/admin/view/project/project_donation_info/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">{:__('Pro_id')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 4 - 0
application/admin/view/project/project_donation_info/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">{:__('Pro_id')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 5 - 1
application/admin/view/project/project_donation_order/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">{:__('Uid')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 5 - 1
application/admin/view/project/project_donation_order/edit.html

@@ -1,11 +1,15 @@
 <form id="edit-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="{$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">{:__('Uid')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 5 - 1
application/admin/view/project/project_donation_order_info/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">{:__('Project_id')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 4 - 0
application/admin/view/project/project_donation_order_info/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">{:__('Project_id')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 6 - 2
application/admin/view/project/project_donation_rocord/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">{:__('Project_id')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 4 - 0
application/admin/view/project/project_donation_rocord/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">{:__('Project_id')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 6 - 2
application/admin/view/project/project_donation_user/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">{:__('Uid')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 5 - 1
application/admin/view/project/project_donation_user/edit.html

@@ -1,11 +1,15 @@
 <form id="edit-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="{$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">{:__('Uid')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 5 - 1
application/admin/view/sos/rescue/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">

+ 4 - 0
application/admin/view/sos/rescue/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">{:__('User_id')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 6 - 2
application/admin/view/sos/sos/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">{:__('User_id')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 4 - 0
application/admin/view/sos/sos/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">{:__('User_id')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 6 - 2
application/admin/view/sos/sos_bill/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">{:__('Sos_id')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Cid')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-sos_id" data-rule="required" data-source="sos/index" class="form-control selectpage" name="row[sos_id]" type="text" value="">
+            <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">

+ 11 - 0
application/admin/view/sos/sos_bill/edit.html

@@ -1,5 +1,16 @@
 <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">{:__('Sos_id')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 5 - 1
application/admin/view/training/training/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">{:__('Title')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 5 - 1
application/admin/view/training/training/edit.html

@@ -1,11 +1,15 @@
 <form id="edit-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="{$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">{:__('Title')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 5 - 1
application/admin/view/training/training_info/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">{:__('Training_id')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 5 - 1
application/admin/view/training/training_info/edit.html

@@ -1,11 +1,15 @@
 <form id="edit-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="{$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">{:__('Training_id')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 6 - 2
application/admin/view/training/volunteer/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">{:__('User_id')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 5 - 1
application/admin/view/training/volunteer/edit.html

@@ -1,11 +1,15 @@
 <form id="edit-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="{$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">

+ 10 - 0
application/admin/view/user/group/add.html

@@ -1,6 +1,16 @@
 <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
     {:token()}
     <input type="hidden" name="row[rules]" />
+    {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" >
+        </div>
+    </div>
+    {else/}
+    <input id="c-cid"  name="row[cid]" type="hidden" value="{$admin.cid}">
+    {/eq}
     <div class="form-group">
         <label for="c-name" class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 10 - 0
application/admin/view/user/group/edit.html

@@ -1,6 +1,16 @@
 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
     {:token()}
     <input type="hidden" name="row[rules]" value="{$row.rules}" />
+    {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 for="c-name" class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 10 - 0
application/admin/view/user/user/edit.html

@@ -1,6 +1,16 @@
 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
     {:token()}
     <input type="hidden" name="row[id]" value="{$row.id}">
+    {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 for="c-group_id" class="control-label col-xs-12 col-sm-2">{:__('Group')}:</label>
         <div class="col-xs-12 col-sm-4">

+ 5 - 1
application/admin/view/user/user_ext/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" class="form-control" name="row[cid]" type="number">
+            <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">

+ 10 - 1
application/admin/view/user/user_ext/edit.html

@@ -1,5 +1,14 @@
 <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">{:__('Cid')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 5 - 1
application/admin/view/user_relation/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" class="form-control" name="row[cid]" type="number">
+            <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">{:__('Unionid')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 5 - 1
application/admin/view/user_relation/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" class="form-control" name="row[cid]" type="number" value="{$row.cid|htmlentities}">
+            <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">{:__('Unionid')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 2 - 4
application/api/controller/Project.php

@@ -145,6 +145,7 @@ class Project extends Api
             ['invoice',0],
             ['user_type',0],
             ['logistics',''],
+            ['cid',$this->cid],
         ],$request);
         $where['uid'] = $this->auth->getUserinfo()['id'];
         $id = input('id',0);
@@ -177,11 +178,8 @@ class Project extends Api
      */
     public function user_list(Request $request)
     {
-        $where = UtilService::getMore([
-            ['type',0],
-        ],$request);
         $where['uid'] = $this->auth->getUserinfo()['id'];
-        return  $this->success('获取成功',ProjectDonationUser::where($where)->select());
+        return  $this->success('获取成功',ProjectDonationUser::where($where)->order("id DESC")->select());
     }
     public  function Donation_info()
     {