get

application/admin/controller/Cars.php

@@ -236,6 +236,7 @@ class Cars extends Backend
             'title' => $params['title'],
             'price' => $params['price'],
             'desc' => $params['desc'],
+            'count' => $params['count'],
             're_price' => $params['re_price'],
             'cover_image' => $params['cover_image'],
             'contact_id' => $params['contact_id'] ?? $this->auth->id,

application/admin/controller/car/Sales.php

@@ -0,0 +1,141 @@
+<?php
+
+namespace app\admin\controller\car;
+
+use app\admin\model\Cars;
+use app\common\controller\Backend;
+use think\Db;
+use think\exception\DbException;
+use think\exception\PDOException;
+use think\exception\ValidateException;
+
+/**
+ * 车辆销售/租赁记录管理
+ *
+ * @icon fa fa-circle-o
+ */
+class Sales extends Backend
+{
+
+    /**
+     * Sales模型对象
+     * @var \app\admin\model\car\Sales
+     */
+    protected $model = null;
+
+    public function _initialize()
+    {
+        parent::_initialize();
+        $this->model = new \app\admin\model\car\Sales;
+
+    }
+
+
+
+    /**
+     * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
+     * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
+     * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
+     */
+
+    /**
+     * 添加
+     *
+     * @return string
+     * @throws \think\Exception
+     */
+    public function add($ids = null)
+    {
+        if (false === $this->request->isPost()) {
+            $car = Cars::where('id',$ids)->with([
+                    'brand' =>function ($q) {
+                        $q->field('id,name');
+                    },
+                    'series' =>function ($q) {
+                        $q->field('id,name');
+                    },
+                ]
+            )->select()[0] ?? null;
+            $this->view->assign('car',$car);
+            return $this->view->fetch();
+        }
+        $params = $this->request->post('row/a');
+        if (empty($params)) {
+            $this->error(__('Parameter %s can not be empty', ''));
+        }
+        $params = $this->preExcludeFields($params);
+
+        if ($this->dataLimit && $this->dataLimitFieldAutoFill) {
+            $params[$this->dataLimitField] = $this->auth->id;
+        }
+        $result = false;
+        Db::startTrans();
+        try {
+            //是否采用模型验证
+            if ($this->modelValidate) {
+                $name = str_replace("\\model\\", "\\validate\\", get_class($this->model));
+                $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.add' : $name) : $this->modelValidate;
+                $this->model->validateFailException()->validate($validate);
+            }
+            $result = $this->model->allowField(true)->save($params);
+            Db::commit();
+        } catch (ValidateException|PDOException|Exception $e) {
+            Db::rollback();
+            $this->error($e->getMessage());
+        }
+        if ($result === false) {
+            $this->error(__('No rows were inserted'));
+        }
+        $this->success();
+    }
+
+    /**
+     * 编辑
+     *
+     * @param $ids
+     * @return string
+     * @throws DbException
+     * @throws \think\Exception
+     */
+    public function edit($ids = null)
+    {
+        $row = $this->model->get($ids);
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+        $adminIds = $this->getDataLimitAdminIds();
+        if (is_array($adminIds) && !in_array($row[$this->dataLimitField], $adminIds)) {
+            $this->error(__('You have no permission'));
+        }
+        if (false === $this->request->isPost()) {
+            $this->view->assign('row', $row);
+            return $this->view->fetch();
+        }
+        $params = $this->request->post('row/a');
+        if (empty($params)) {
+            $this->error(__('Parameter %s can not be empty', ''));
+        }
+        $params = $this->preExcludeFields($params);
+        $result = false;
+        Db::startTrans();
+        try {
+            //是否采用模型验证
+            if ($this->modelValidate) {
+                $name = str_replace("\\model\\", "\\validate\\", get_class($this->model));
+                $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate;
+                $row->validateFailException()->validate($validate);
+            }
+            $result = $row->allowField(true)->save($params);
+            Db::commit();
+        } catch (ValidateException|PDOException|Exception $e) {
+            Db::rollback();
+            $this->error($e->getMessage());
+        }
+        if (false === $result) {
+            $this->error(__('No rows were updated'));
+        }
+        $this->success();
+    }
+
+
+}

application/admin/lang/zh-cn/car/sales.php

@@ -0,0 +1,15 @@
+<?php
+
+return [
+    'Cart_id'        => '车 id',
+    'Saler_id'       => '销售 id',
+    'Brand'          => '品牌',
+    'Model'          => '型号',
+    'Start_date'     => '销售日期/租赁开始日期',
+    'End_date'       => '租赁结束日期（销售则等于开始日期）',
+    'Daily_price'    => '日租金（销售则为单价）',
+    'Total_price'    => '总金额',
+    'Customer_name'  => '客户姓名',
+    'Customer_phone' => '客户电话',
+    'Remark'         => '备注信息'
+];

application/admin/model/car/Sales.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace app\admin\model\car;
+
+use think\Model;
+
+
+class Sales extends Model
+{
+
+    
+
+    
+
+    // 表名
+    protected $table = 'car_sales';
+    
+    // 自动写入时间戳字段
+    protected $autoWriteTimestamp = false;
+
+    // 定义时间戳字段名
+    protected $createTime = false;
+    protected $updateTime = false;
+    protected $deleteTime = false;
+
+    // 追加属性
+    protected $append = [
+
+    ];
+    
+
+    
+
+
+
+
+
+
+
+}

application/admin/validate/car/Sales.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace app\admin\validate\car;
+
+use think\Validate;
+
+class Sales extends Validate
+{
+    /**
+     * 验证规则
+     */
+    protected $rule = [
+    ];
+    /**
+     * 提示消息
+     */
+    protected $message = [
+    ];
+    /**
+     * 验证场景
+     */
+    protected $scene = [
+        'add'  => [],
+        'edit' => [],
+    ];
+    
+}

application/admin/view/car/sales/add.html

@@ -0,0 +1,88 @@
+<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">名称:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-cart_id" data-rule="required" disabled  class="form-control" value="{$car.title}">
+        </div>
+    </div>
+
+    <input style="display: none" hidden data-rule="required" class="form-control" name="row[cart_id]" type="text" value="{$car.id}">
+
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">销售人员:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-saler_id" data-rule="required"  class="form-control" name="row[saler_id]" type="text" value="">
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">品牌:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-brand" data-rule="required" disabled
+                   class="form-control" name="row[brand]" value="{$car.brand.name}" type="text">
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">型号:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-model" data-rule="required" disabled class="form-control" value="{$car.series.name}" name="row[model]" type="text">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Start_date')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-start_date" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD" data-use-current="true" name="row[start_date]" type="text" value="{:date('Y-m-d')}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('End_date')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-end_date" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD" data-use-current="true" name="row[end_date]" type="text" value="{:date('Y-m-d')}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Daily_price')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-daily_price" data-rule="required" class="form-control" step="0.01" name="row[daily_price]" type="number" value="0.00">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Total_price')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-total_price" data-rule="required" class="form-control" step="0.01" name="row[total_price]" type="number">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Customer_name')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-customer_name" class="form-control" name="row[customer_name]" type="text">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Customer_phone')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-customer_phone" class="form-control" name="row[customer_phone]" type="text">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Remark')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <textarea id="c-remark" class="form-control " rows="5" name="row[remark]" cols="50"></textarea>
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Created_at')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-created_at" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[created_at]" type="text" value="{:date('Y-m-d H:i:s')}">
+        </div>
+    </div>
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+        </div>
+    </div>
+</form>

application/admin/view/car/sales/edit.html

@@ -0,0 +1,81 @@
+<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Cart_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-cart_id" data-rule="required" data-source="cart/index" class="form-control selectpage" name="row[cart_id]" type="text" value="{$row.cart_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Saler_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-saler_id" data-rule="required" data-source="saler/index" class="form-control selectpage" name="row[saler_id]" type="text" value="{$row.saler_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Brand')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-brand" data-rule="required" class="form-control" name="row[brand]" type="text" value="{$row.brand|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Model')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-model" data-rule="required" class="form-control" name="row[model]" type="text" value="{$row.model|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Start_date')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-start_date" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD" data-use-current="true" name="row[start_date]" type="text" value="{$row.start_date}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('End_date')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-end_date" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD" data-use-current="true" name="row[end_date]" type="text" value="{$row.end_date}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Daily_price')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-daily_price" data-rule="required" class="form-control" step="0.01" name="row[daily_price]" type="number" value="{$row.daily_price|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Total_price')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-total_price" data-rule="required" class="form-control" step="0.01" name="row[total_price]" type="number" value="{$row.total_price|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Customer_name')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-customer_name" class="form-control" name="row[customer_name]" type="text" value="{$row.customer_name|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Customer_phone')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-customer_phone" class="form-control" name="row[customer_phone]" type="text" value="{$row.customer_phone|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Remark')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <textarea id="c-remark" class="form-control " rows="5" name="row[remark]" cols="50">{$row.remark|htmlentities}</textarea>
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Created_at')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-created_at" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[created_at]" type="text" value="{:$row.created_at?datetime($row.created_at):''}">
+        </div>
+    </div>
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+        </div>
+    </div>
+</form>

application/admin/view/car/sales/index.html

@@ -0,0 +1,29 @@
+<div class="panel panel-default panel-intro">
+    {:build_heading()}
+
+    <div class="panel-body">
+        <div id="myTabContent" class="tab-content">
+            <div class="tab-pane fade active in" id="one">
+                <div class="widget-body no-padding">
+                    <div id="toolbar" class="toolbar">
+                        <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
+                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('car/sales/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('car/sales/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
+                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('car/sales/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+                        
+
+                        
+
+                        
+                    </div>
+                    <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-edit="{:$auth->check('car/sales/edit')}"
+                           data-operate-del="{:$auth->check('car/sales/del')}"
+                           width="100%">
+                    </table>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>

application/admin/view/cars/add.html

@@ -23,6 +23,12 @@
                 <input id="c-series_id_value" data-rule="required"  class="form-control" name="row[series_id]" type="hidden" value="">
             </div>
         </div>
+        <div class="form-group">
+            <label class="control-label col-xs-12 col-sm-2">库存:</label>
+            <div class="col-xs-12 col-sm-8">
+                <input id="c-count" data-rule="required" class="form-control" name="row[count]" type="number">
+            </div>
+        </div>
         <div class="form-group">
             <label class="control-label col-xs-12 col-sm-2">售价/日租价格:</label>
             <div class="col-xs-12 col-sm-8">

application/admin/view/cars/edit.html

@@ -25,6 +25,12 @@
                 <input id="c-series_id_value" data-rule="required"  class="form-control" name="row[series_id]"  type="hidden" value="{$row.series_id}">
             </div>
         </div>
+        <div class="form-group">
+            <label class="control-label col-xs-12 col-sm-2">库存:</label>
+            <div class="col-xs-12 col-sm-8">
+                <input id="c-count" data-rule="required" class="form-control" name="row[count]" value="{$row.count}" type="number">
+            </div>
+        </div>
         <div class="form-group">
             <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
             <div class="col-xs-12 col-sm-8">

public/assets/js/backend/car/sales.js

@@ -0,0 +1,63 @@
+define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+
+    var Controller = {
+        index: function () {
+            // 初始化表格参数配置
+            Table.api.init({
+                extend: {
+                    index_url: 'car/sales/index' + location.search,
+                    add_url: 'car/sales/add',
+                    edit_url: 'car/sales/edit',
+                    del_url: 'car/sales/del',
+                    multi_url: 'car/sales/multi',
+                    import_url: 'car/sales/import',
+                    table: 'car_sales',
+                }
+            });
+
+            var table = $("#table");
+
+            // 初始化表格
+            table.bootstrapTable({
+                url: $.fn.bootstrapTable.defaults.extend.index_url,
+                pk: 'id',
+                sortName: 'id',
+                fixedColumns: true,
+                fixedRightNumber: 1,
+                columns: [
+                    [
+                        {checkbox: true},
+                        {field: 'id', title: __('Id')},
+                        {field: 'cart_id', title: __('Cart_id')},
+                        {field: 'saler_id', title: __('Saler_id')},
+                        {field: 'brand', title: __('Brand'), operate: 'LIKE'},
+                        {field: 'model', title: __('Model'), operate: 'LIKE'},
+                        {field: 'start_date', title: __('Start_date'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
+                        {field: 'end_date', title: __('End_date'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
+                        {field: 'daily_price', title: __('Daily_price'), operate:'BETWEEN'},
+                        {field: 'total_price', title: __('Total_price'), operate:'BETWEEN'},
+                        {field: 'customer_name', title: __('Customer_name'), operate: 'LIKE'},
+                        {field: 'customer_phone', title: __('Customer_phone'), operate: 'LIKE'},
+                        {field: 'created_at', title: __('Created_at')},
+                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                    ]
+                ]
+            });
+
+            // 为表格绑定事件
+            Table.api.bindevent(table);
+        },
+        add: function () {
+            Controller.api.bindevent();
+        },
+        edit: function () {
+            Controller.api.bindevent();
+        },
+        api: {
+            bindevent: function () {
+                Form.api.bindevent($("form[role=form]"));
+            }
+        }
+    };
+    return Controller;
+});

public/assets/js/backend/cars.js

@@ -45,6 +45,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function
                             formatter: Table.api.formatter.status},
                         {field: 'brand.name', title: __('Brand_id'), operate: false},
                         {field: 'series.name', title: __('Series_id'), operate: false},
+                        {field: 'count', title: '库存', operate: false},
                         {field: 'price', title: __('Price'), operate: 'BETWEEN'},
                         {field: 're_price', title: '现价(万元)', operate: 'BETWEEN'},
                         {
@@ -84,7 +85,36 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function
                             title: __('Operate'),
                             table: table,
                             events: Table.api.events.operate,
-                            formatter: Table.api.formatter.operate
+                            formatter: Table.api.formatter.operate,
+                            buttons: [
+                                {
+                                    name: 'edit',
+                                    text: "修改",
+                                    icon: 'fa fa-pencil',
+                                    title: __('Edit'),
+                                    extend: 'data-toggle="tooltip" data-container="body"',
+                                    classname: 'btn btn-xs btn-info btn-editone',
+                                },
+                                {
+                                    name: 'sale',
+                                    icon: 'fa fa-copy',
+                                    title: '售出',
+                                    text: "售出",
+                                    url: function (row) {
+                                        return 'car/sales/add/ids/' + row.id;
+                                    },
+                                    extend: 'data-toggle="tooltip" data-container="body"',
+                                    classname: 'btn btn-xs btn-info btn-dialog',
+                                },
+                                {
+                                    name: 'del',
+                                    text: "删除",
+                                    icon: 'fa fa-trash',
+                                    title: __('Delete'),
+                                    extend: 'data-toggle="tooltip"',
+                                    classname: 'btn btn-xs btn-danger btn-delone',
+                                },
+                            ],
                         }
                     ]
                 ]