瀏覽代碼

修改order 表

pengchanglu 3 年之前
父節點
當前提交
07a38cc112

+ 0 - 3
application/admin/lang/zh-cn/pig/order.php

@@ -9,9 +9,6 @@ return [
     'Customer_id'         => '客户',
     'Customer_id'         => '客户',
     'Num'                 => '码个数',
     'Num'                 => '码个数',
     'Code'                => '码段',
     'Code'                => '码段',
-    'Car'                 => '车辆',
-    'Driver'              => '司机',
-    'Arrivetime'          => '到厂时间',
     'Leavetime'           => '出厂时间',
     'Leavetime'           => '出厂时间',
     'Province_id'         => '销售省份',
     'Province_id'         => '销售省份',
     'Images'              => '图片',
     'Images'              => '图片',

+ 0 - 13
application/admin/model/pig/Order.php

@@ -25,7 +25,6 @@ class Order extends Model
 
 
     // 追加属性
     // 追加属性
     protected $append = [
     protected $append = [
-        'arrivetime_text',
         'leavetime_text',
         'leavetime_text',
         'status_text'
         'status_text'
     ];
     ];
@@ -38,13 +37,6 @@ class Order extends Model
     }
     }
 
 
 
 
-    public function getArrivetimeTextAttr($value, $data)
-    {
-        $value = $value ? $value : (isset($data['arrivetime']) ? $data['arrivetime'] : '');
-        return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
-    }
-
-
     public function getLeavetimeTextAttr($value, $data)
     public function getLeavetimeTextAttr($value, $data)
     {
     {
         $value = $value ? $value : (isset($data['leavetime']) ? $data['leavetime'] : '');
         $value = $value ? $value : (isset($data['leavetime']) ? $data['leavetime'] : '');
@@ -59,11 +51,6 @@ class Order extends Model
         return isset($list[$value]) ? $list[$value] : '';
         return isset($list[$value]) ? $list[$value] : '';
     }
     }
 
 
-    protected function setArrivetimeAttr($value)
-    {
-        return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
-    }
-
     protected function setLeavetimeAttr($value)
     protected function setLeavetimeAttr($value)
     {
     {
         return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
         return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);

+ 4 - 15
application/admin/view/pig/order/add.html

@@ -1,4 +1,5 @@
 <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+
     <div class="form-group">
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
         <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
         <div class="col-xs-12 col-sm-8">
         <div class="col-xs-12 col-sm-8">
@@ -24,21 +25,9 @@
         </div>
         </div>
     </div>
     </div>
     <div class="form-group">
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Car')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-car" class="form-control" name="row[car]" type="text" value="">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Driver')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-driver" class="form-control" name="row[driver]" type="text" value="">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Arrivetime')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Code')}:</label>
         <div class="col-xs-12 col-sm-8">
         <div class="col-xs-12 col-sm-8">
-            <input id="c-arrivetime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[arrivetime]" type="text" value="{:date('Y-m-d H:i:s')}">
+            <input id="c-code" class="form-control" name="row[code]" type="text" value="">
         </div>
         </div>
     </div>
     </div>
     <div class="form-group">
     <div class="form-group">
@@ -50,7 +39,7 @@
     <div class="form-group">
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Province_id')}:</label>
         <label class="control-label col-xs-12 col-sm-2">{:__('Province_id')}:</label>
         <div class="col-xs-12 col-sm-8">
         <div class="col-xs-12 col-sm-8">
-            <input id="c-province_id" data-rule="required" data-source="general/province/index" class="form-control selectpage" name="row[province_id]" type="text" value="2">
+            <input id="c-province_id" data-rule="required" data-source="province/index" class="form-control selectpage" name="row[province_id]" type="text" value="">
         </div>
         </div>
     </div>
     </div>
     <div class="form-group">
     <div class="form-group">

+ 4 - 16
application/admin/view/pig/order/edit.html

@@ -22,26 +22,14 @@
     <div class="form-group">
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Num')}:</label>
         <label class="control-label col-xs-12 col-sm-2">{:__('Num')}:</label>
         <div class="col-xs-12 col-sm-8">
         <div class="col-xs-12 col-sm-8">
-            <input id="c-num" class="form-control" disabled name="row[num]" type="number" value="{$row.num|htmlentities}">
+            <input id="c-num" class="form-control" name="row[num]" type="number" value="{$row.num|htmlentities}">
         </div>
         </div>
     </div>
     </div>
 -->
 -->
     <div class="form-group">
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Car')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Code')}:</label>
         <div class="col-xs-12 col-sm-8">
         <div class="col-xs-12 col-sm-8">
-            <input id="c-car" class="form-control" name="row[car]" type="text" value="{$row.car|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Driver')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-driver" class="form-control" name="row[driver]" type="text" value="{$row.driver|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Arrivetime')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-arrivetime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[arrivetime]" type="text" value="{:$row.arrivetime?datetime($row.arrivetime):''}">
+            <input id="c-code" class="form-control" name="row[code]" type="text" value="{$row.code|htmlentities}">
         </div>
         </div>
     </div>
     </div>
     <div class="form-group">
     <div class="form-group">
@@ -53,7 +41,7 @@
     <div class="form-group">
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Province_id')}:</label>
         <label class="control-label col-xs-12 col-sm-2">{:__('Province_id')}:</label>
         <div class="col-xs-12 col-sm-8">
         <div class="col-xs-12 col-sm-8">
-            <input id="c-province_id" data-rule="required" data-source="general/province/index" class="form-control selectpage" name="row[province_id]" type="text" value="{$row.province_id|htmlentities}">
+            <input id="c-province_id" data-rule="required" data-source="province/index" class="form-control selectpage" name="row[province_id]" type="text" value="{$row.province_id|htmlentities}">
         </div>
         </div>
     </div>
     </div>
     <div class="form-group">
     <div class="form-group">

+ 0 - 3
public/assets/js/backend/pig/order.js

@@ -35,9 +35,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         //{field: 'customer_id', title: __('Customer_id')},
                         //{field: 'customer_id', title: __('Customer_id')},
                         {field: 'num', title: __('Num')},
                         {field: 'num', title: __('Num')},
                         {field: 'code', title: __('Code'), operate: 'LIKE'},
                         {field: 'code', title: __('Code'), operate: 'LIKE'},
-                        {field: 'car', title: __('Car'), operate: 'LIKE'},
-                        {field: 'driver', title: __('Driver'), operate: 'LIKE'},
-                        {field: 'arrivetime', title: __('Arrivetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'leavetime', title: __('Leavetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'leavetime', title: __('Leavetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         //{field: 'province_id', title: __('Province_id')},
                         //{field: 'province_id', title: __('Province_id')},
                         {field: 'images', title: __('Images'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images},
                         {field: 'images', title: __('Images'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images},