郭文星 / wyc.tenyes.cn · 提交

转到一个项目

作者 郭文星
提交 650851d6eeae9c0c5b0e1aea5bfbd3dc5a682810 1 个父辈 41fbac37

123

内嵌 并排对比
正在显示 5 个修改的文件 包含 1 行增加 和 25 行删除
@@ -58,7 +58,7 @@ class Driver extends Backend @@ -58,7 +58,7 @@ class Driver extends Backend
58 ->paginate($limit); 58 ->paginate($limit);
59 59
60 foreach ($list as $row) { 60 foreach ($list as $row) {
61 - $row->visible(['id','name','car_fleet','phone','is_work','scheduling_type']); 61 + $row->visible(['id','name','car_fleet','phone','scheduling_type']);
62 $row->visible(['user']); 62 $row->visible(['user']);
63 $row->getRelation('user')->visible(['username']); 63 $row->getRelation('user')->visible(['username']);
64 } 64 }
@@ -24,18 +24,7 @@ @@ -24,18 +24,7 @@
24 <input id="c-car_fleet" class="form-control" name="row[car_fleet]" type="text"> 24 <input id="c-car_fleet" class="form-control" name="row[car_fleet]" type="text">
25 </div> 25 </div>
26 </div> 26 </div>
27 - <div class="form-group">  
28 - <label class="control-label col-xs-12 col-sm-2">{:__('Is_work')}:</label>  
29 - <div class="col-xs-12 col-sm-8">  
30 27
31 - <select id="c-is_work" class="form-control selectpicker" name="row[is_work]">  
32 - {foreach name="isWorkList" item="vo"}  
33 - <option value="{$key}" {in name="key" value="1"}selected{/in}>{$vo}</option>  
34 - {/foreach}  
35 - </select>  
36 -  
37 - </div>  
38 - </div>  
39 <div class="form-group"> 28 <div class="form-group">
40 <label class="control-label col-xs-12 col-sm-2">{:__('Scheduling_type')}:</label> 29 <label class="control-label col-xs-12 col-sm-2">{:__('Scheduling_type')}:</label>
41 <div class="col-xs-12 col-sm-8"> 30 <div class="col-xs-12 col-sm-8">
@@ -24,18 +24,7 @@ @@ -24,18 +24,7 @@
24 <input id="c-car_fleet" class="form-control" name="row[car_fleet]" type="text" value="{$row.car_fleet|htmlentities}"> 24 <input id="c-car_fleet" class="form-control" name="row[car_fleet]" type="text" value="{$row.car_fleet|htmlentities}">
25 </div> 25 </div>
26 </div> 26 </div>
27 - <div class="form-group">  
28 - <label class="control-label col-xs-12 col-sm-2">{:__('Is_work')}:</label>  
29 - <div class="col-xs-12 col-sm-8">  
30 27
31 - <select id="c-is_work" class="form-control selectpicker" name="row[is_work]">  
32 - {foreach name="isWorkList" item="vo"}  
33 - <option value="{$key}" {in name="key" value="$row.is_work"}selected{/in}>{$vo}</option>  
34 - {/foreach}  
35 - </select>  
36 -  
37 - </div>  
38 - </div>  
39 <div class="form-group"> 28 <div class="form-group">
40 <label class="control-label col-xs-12 col-sm-2">{:__('Scheduling_type')}:</label> 29 <label class="control-label col-xs-12 col-sm-2">{:__('Scheduling_type')}:</label>
41 <div class="col-xs-12 col-sm-8"> 30 <div class="col-xs-12 col-sm-8">
@@ -204,7 +204,6 @@ class Car extends Base @@ -204,7 +204,6 @@ class Car extends Base
204 if($car){ 204 if($car){
205 $res['license_plate']=$car['license_plate']; 205 $res['license_plate']=$car['license_plate'];
206 $res['car_model']=$car['car_model']; 206 $res['car_model']=$car['car_model'];
207 - $res['car_fleet']=$car['car_fleet'];  
208 }else{ 207 }else{
209 return $this->error("请求失败"); 208 return $this->error("请求失败");
210 } 209 }
@@ -29,7 +29,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -29,7 +29,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
29 {field: 'name', title: __('Name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, 29 {field: 'name', title: __('Name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
30 {field: 'phone', title: __('Phone'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, 30 {field: 'phone', title: __('Phone'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
31 {field: 'car_fleet', title: __('Car_fleet'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, 31 {field: 'car_fleet', title: __('Car_fleet'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
32 - {field: 'is_work', title: __('Is_work'), searchList: {"1":__('Is_work 1'),"2":__('Is_work 2')}, formatter: Table.api.formatter.normal},  
33 {field: 'scheduling_type', title: __('Scheduling_type'), searchList: {"1":__('Scheduling_type 1'),"2":__('Scheduling_type 2')}, formatter: Table.api.formatter.normal}, 32 {field: 'scheduling_type', title: __('Scheduling_type'), searchList: {"1":__('Scheduling_type 1'),"2":__('Scheduling_type 2')}, formatter: Table.api.formatter.normal},
34 {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} 33 {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
35 ] 34 ]