1

application/admin/view/project/project_donation_info/edit.html

@@ -13,13 +13,19 @@
     <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">
-            <input id="c-pro_id" data-rule="required" data-source="project/ProjectDonation" data-field="title"  class="form-control selectpage" name="row[pro_id]" type="text" value="{$row.pro_id|htmlentities}">
+            <input id="c-pro_id" data-rule="required" data-source="project/Project_donation" data-field="title"  class="form-control selectpage" name="row[pro_id]" type="text" value="{$row.pro_id|htmlentities}">
         </div>
     </div>
+    <!--<div class="form-group">-->
+    <!--    <label class="control-label col-xs-12 col-sm-2">{:__('Project_donation_id')}:</label>-->
+    <!--    <div class="col-xs-12 col-sm-8">-->
+    <!--        <input id="c-project_donation_id" data-rule="required" data-source="Category" data-params='{"custom[type]":"project"}'  data-field="name" class="form-control selectpage" name="row[project_donation_id]" type="text" value="{$row.project_donation_id|htmlentities}">-->
+    <!--    </div>-->
+    <!--</div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Project_donation_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-project_donation_id" data-rule="required" data-source="Category" data-params='{"custom[type]":"project"}'  data-field="name" class="form-control selectpage" name="row[project_donation_id]" type="text" value="{$row.project_donation_id|htmlentities}">
+            <input id="c-project_donation_id" data-rule="required" data-source="Category" data-params='{"type":"project"}'  data-field="name"  class="form-control selectpage" name="row[project_donation_id]" type="text" value="{$row.project_donation_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">

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

@@ -13,7 +13,7 @@
     <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">
-            <input id="c-training_id" data-rule="required" data-source="training/index" class="form-control selectpage" name="row[training_id]" type="text" value="{$row.training_id|htmlentities}">
+            <input id="c-training_id" data-rule="required" data-source="training.training/index" class="form-control selectpage" data-field="title" name="row[training_id]" type="text" value="{$row.training_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">

application/api/controller/Lave.php

@@ -42,10 +42,10 @@ class Lave extends Api
                 ['contact',''],
                 ['tel',0],
                 ['address',''],
-                ['is_open',0],
-                ['is_ticket',0],
-                ['pay_type',0],
-                ['type',0],
+                ['is_open','0'],
+                ['is_ticket','0'],
+                ['pay_type','0'],
+                ['type','0'],
                 ['help_id',0],
                 ['from','weixin'],
             ],$request

application/api/controller/Training.php

@@ -19,6 +19,7 @@ class Training extends Api
                 ['user_id',$this->auth->getUserinfo()['id']],
             ]
         );
+        $where['cid'] = $this->cid;
         return $this->success('获取成功',TrainingModel::lst($where));
     }
     public function apply(Request $request)

application/common/model/training/TrainingInfo.php

@@ -62,6 +62,10 @@ class TrainingInfo extends Model
         if(isset($where['user_id']) && $where['user_id']>0) $model->where('user_id',$where['user_id']);
         if(isset($where['training_id']) && $where['training_id']>0) $model->where('training_id',$where['training_id']);
         $data = $model->order('id desc')->page($where['page'],$where['limit'])->select();
+        foreach ($data as &$v)
+        {
+            $v['training'] = Training::where('id',$v['training_id'])->find();
+        }
         return $data;
     }
 

public/assets/js/backend/lave.js

@@ -53,9 +53,15 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             Table.api.bindevent(table);
         },
         add: function () {
+            $("#c-user_id").data("params", function (obj) {
+                return {custom: {cid: $("#c-cid").val()}};
+            });
             Controller.api.bindevent();
         },
         edit: function () {
+            $("#c-user_id").data("params", function (obj) {
+                return {custom: {cid: $("#c-cid").val()}};
+            });
             Controller.api.bindevent();
         },
         api: {

public/assets/js/backend/project/project_donation_order_info.js

@@ -43,9 +43,15 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             Table.api.bindevent(table);
         },
         add: function () {
+            $("#c-project_id").data("params", function (obj) {
+                return {custom: {cid: $("#c-cid").val()}};
+            });
             Controller.api.bindevent();
         },
         edit: function () {
+            $("#c-project_id").data("params", function (obj) {
+                return {custom: {cid: $("#c-cid").val()}};
+            });
             Controller.api.bindevent();
         },
         api: {

public/assets/js/backend/sos/rescue.js

@@ -53,9 +53,15 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             Table.api.bindevent(table);
         },
         add: function () {
+             $("#c-user_id").data("params", function (obj) {
+                return {custom: {cid: $("#c-cid").val()}};
+            });
             Controller.api.bindevent();
         },
         edit: function () {
+             $("#c-user_id").data("params", function (obj) {
+                return {custom: {cid: $("#c-cid").val()}};
+            });
             Controller.api.bindevent();
         },
         api: {

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

@@ -45,9 +45,15 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             Table.api.bindevent(table);
         },
         add: function () {
+            $("#c-training_id").data("params", function (obj) {
+                return {custom: {cid: $("#c-cid").val()}};
+            });
             Controller.api.bindevent();
         },
         edit: function () {
+            $("#c-training_id").data("params", function (obj) {
+                return {custom: {cid: $("#c-cid").val()}};
+            });
             Controller.api.bindevent();
         },
         api: {

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

@@ -60,9 +60,15 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             Table.api.bindevent(table);
         },
         add: function () {
+            $("#c-user_id").data("params", function (obj) {
+                return {custom: {cid: $("#c-cid").val()}};
+            });
             Controller.api.bindevent();
         },
         edit: function () {
+            $("#c-user_id").data("params", function (obj) {
+                return {custom: {cid: $("#c-cid").val()}};
+            });
             Controller.api.bindevent();
         },
         api: {