lizhen_gitee 9 місяців тому
батько
коміт
c382d4e4c9

+ 1 - 1
application/admin/model/Usertrain.php

@@ -59,7 +59,7 @@ class Usertrain extends Model
 
     public function active()
     {
-        return $this->belongsTo('app\admin\model\train\Active', 'train_id', 'id', [], 'LEFT')->setEagerlyType(0);
+        return $this->belongsTo('Trainactive', 'train_id', 'id', [], 'LEFT')->setEagerlyType(0);
     }
 
 

+ 2 - 2
application/admin/view/trainactive/add.html

@@ -148,7 +148,7 @@
             <ul class="row list-inline faupload-preview" id="p-files"></ul>
         </div>
     </div>
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Pingjia')}:</label>
         <div class="col-xs-12 col-sm-8">
             <textarea id="c-pingjia" class="form-control " rows="5" name="row[pingjia]" cols="50"></textarea>
@@ -173,7 +173,7 @@
         <div class="col-xs-12 col-sm-8">
             <input id="c-pingjia_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[pingjia_time]" type="text" value="{:date('Y-m-d H:i:s')}">
         </div>
-    </div>
+    </div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Pingjia_uid')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 1 - 1
application/admin/view/usertrain/add.html

@@ -3,7 +3,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Train_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-train_id" data-rule="required" data-source="train/active/index" class="form-control selectpage" name="row[train_id]" type="text" value="">
+            <input id="c-train_id" data-rule="required" data-source="trainactive/index" class="form-control selectpage" name="row[train_id]" type="text" value="">
         </div>
     </div>
     <div class="form-group">

+ 1 - 1
application/admin/view/usertrain/edit.html

@@ -3,7 +3,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Train_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-train_id" data-rule="required" data-source="train/active/index" class="form-control selectpage" name="row[train_id]" type="text" value="{$row.train_id|htmlentities}">
+            <input id="c-train_id" data-rule="required" data-source="trainactive/index" class="form-control selectpage" name="row[train_id]" type="text" value="{$row.train_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">

+ 9 - 6
public/assets/js/backend/trainactive.js

@@ -39,15 +39,21 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'department', title: __('Department'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'wenjianstatus', title: __('Wenjianstatus'), operate: 'LIKE', formatter: Table.api.formatter.status},
                         {field: 'name', title: __('Name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'cate_id', title: __('Cate_id')},
-                        {field: 'level_id', title: __('Level_id')},
+//                        {field: 'cate_id', title: __('Cate_id')},
+                        {field: 'cate.name', title: __('Cate.name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+
+//                        {field: 'level_id', title: __('Level_id')},
+                        {field: 'level.name', title: __('Level.name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+
                         {field: 'fangshi', title: __('Fangshi'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'starttime', title: __('Starttime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'endtime', title: __('Endtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'address', title: __('Address'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'zhuchiren', title: __('Zhuchiren'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'zhujiangren', title: __('Zhujiangren'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'type_id', title: __('Type_id')},
+//                        {field: 'type_id', title: __('Type_id')},
+                        {field: 'type.name', title: __('Type.name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+
                         {field: 'info', title: __('Info'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'files', title: __('Files'), operate: false, formatter: Table.api.formatter.files},
                         {field: 'pingjia_image', title: __('Pingjia_image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
@@ -59,9 +65,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"0":__('Status 0')}, formatter: Table.api.formatter.status},
                         {field: 'usercount', title: __('Usercount')},
                         {field: 'userauth_status', title: __('Userauth_status'), searchList: {"0":__('Userauth_status 0'),"1":__('Userauth_status 1')}, formatter: Table.api.formatter.status},
-                        {field: 'cate.name', title: __('Cate.name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'level.name', title: __('Level.name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'type.name', title: __('Type.name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]