11111

application/admin/controller/CfChannelInfo.php

@@ -35,6 +35,48 @@ class CfChannelInfo extends Backend
      * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
      * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
      */
-    
 
+
+    /**
+     * 查看
+     */
+    public function index()
+    {
+        //设置过滤方法
+        $this->request->filter(['strip_tags', 'trim']);
+        if ($this->request->isAjax()) {
+            //如果发送的来源是Selectpage，则转发到Selectpage
+            if ($this->request->request('keyField')) {
+                return $this->selectpage();
+            }
+            list($where, $sort, $order, $offset, $limit) = $this->buildparams();
+
+            $list = $this->model
+                ->where($where)
+                ->order($sort, $order)
+                ->paginate($limit);
+
+            $result = array("total" => $list->total(), "rows" => $list->items());
+
+            return json($result);
+        }
+        return $this->view->fetch();
+    }
+
+
+    public function getList(){
+        $name=$this->request->post('name');
+        $keyValue=$this->request->post('keyValue');
+        $this->model->field('id,channel_name as name');
+        if($keyValue){
+            $this->model->where(['id'=>$keyValue]);
+        }elseif($name){
+            $this->model->where(['channel_name'=>['like','%'.$name.'%']]);
+        }
+        $result= $this->model->select();
+        if($keyValue){
+            return json(['list' => $result]);
+        }
+        return json(['list' => $result]);
+    }
 }

application/admin/controller/OrderMain.php

@@ -2,7 +2,11 @@
 
 namespace app\admin\controller;
 
+use app\admin\model\Area;
 use app\common\controller\Backend;
+use think\Db;
+use think\exception\PDOException;
+use think\exception\ValidateException;
 
 /**
  * 订单主管理
@@ -35,6 +39,91 @@ class OrderMain extends Backend
      * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
      * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
      */
-    
+
+
+    /**
+     * 查看
+     */
+    public function index()
+    {
+        //设置过滤方法
+        $this->request->filter(['strip_tags', 'trim']);
+        if ($this->request->isAjax()) {
+            //如果发送的来源是Selectpage，则转发到Selectpage
+            if ($this->request->request('keyField')) {
+                return $this->selectpage();
+            }
+            list($where, $sort, $order, $offset, $limit) = $this->buildparams();
+            $group_id=$this->auth->getGroupId();
+            $list = $this->model
+                ->alias("a")
+                ->join('hbp_cf_channel_info b','a.channel_id = b.id','left')
+                ->join('hbp_admin c','a.create_id = c.id','left')
+                ->field("a.*,b.channel_name,c.nickname")
+                ->where($where);
+            if ($group_id){
+                $list = $list
+                    ->where("group_id","=",$group_id)
+                    ->order($sort, $order)
+                    ->paginate($limit);
+            }else{
+                $list = $list
+                    ->order($sort, $order)
+                    ->paginate($limit);
+            }
+            $result = array("total" => $list->total(), "rows" => $list->items());
+            return json($result);
+        }
+        return $this->view->fetch();
+    }
+
+
+    /**
+     * 添加
+     */
+    public function add()
+    {
+        if ($this->request->isPost()) {
+
+            $params = $this->request->post("row/a");
+            if ($params) {
+                $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(true)->validate($validate);
+                    }
+                    $params['create_id']=$this->auth->id;
+                    $params['group_id']=$this->auth->getGroupId();
+                    $result = $this->model->allowField(true)->save($params);
+                    Db::commit();
+                } catch (ValidateException $e) {
+                    Db::rollback();
+                    $this->error($e->getMessage());
+                } catch (PDOException $e) {
+                    Db::rollback();
+                    $this->error($e->getMessage());
+                } catch (Exception $e) {
+                    Db::rollback();
+                    $this->error($e->getMessage());
+                }
+                if ($result !== false) {
+                    $this->success();
+                } else {
+                    $this->error(__('No rows were inserted'));
+                }
+            }
+            $this->error(__('Parameter %s can not be empty', ''));
+        }
+        return $this->view->fetch();
+    }
 
 }

application/admin/lang/zh-cn/cf_channel_info.php

@@ -6,6 +6,6 @@ return [
     'Commission_rate' => '佣金比例',
     'Memo'            => '介绍',
     'Del_flag'        => '是否删除',
-    'Create_time'     => '创建时间-下单时间',
+    'Create_time'     => '创建时间',
     'Update_time'     => '更新时间'
 ];

application/admin/lang/zh-cn/cf_suplier_info.php

@@ -5,6 +5,6 @@ return [
     'Supplier_name' => '供应商名称',
     'Memo'          => '介绍',
     'Del_flag'      => '是否删除',
-    'Create_time'   => '创建时间-下单时间',
+    'Create_time'   => '创建时间',
     'Update_time'   => '更新时间'
 ];

application/admin/lang/zh-cn/order_hotel.php

@@ -24,7 +24,7 @@ return [
     'Profit'         => '利润',
     'Log'            => '日志',
     'Del_flag'       => '是否删除',
-    'Create_time'    => '创建时间-下单时间',
+    'Create_time'    => '创建时间',
     'Update_time'    => '更新时间',
     'Confirm_status' => '资源单状态 1、未发单/ 2已发单、3已确认、4已取消',
     'Confirm_no'     => '确认单号'

application/admin/lang/zh-cn/order_item.php

@@ -19,7 +19,7 @@ return [
     'City_name'      => '城市名称',
     'Detail_address' => '详细地址',
     'Del_flag'       => '是否删除',
-    'Create_time'    => '创建时间-下单时间',
+    'Create_time'    => '创建时间',
     'Update_time'    => '更新时间',
     'Confirm_status' => '资源单状态 1、未发单/ 2已发单、3已确认、4已取消',
     'Confirm_no'     => '确认单号'

application/admin/lang/zh-cn/order_main.php

@@ -18,6 +18,6 @@ return [
     'Cancel_time'      => '订单取消时间',
     'Success_time'     => '订单完成时间',
     'Del_flag'         => '是否删除',
-    'Create_time'      => '创建时间-下单时间',
+    'Create_time'      => '创建时间',
     'Update_time'      => '更新时间'
 ];

application/admin/view/cf_channel_info/add.html

@@ -18,24 +18,6 @@
             <input id="c-memo" data-rule="required" class="form-control" name="row[memo]" type="text" value="">
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Del_flag')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-del_flag" data-rule="required" class="form-control" name="row[del_flag]" type="number" value="0">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Create_time')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-create_time" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[create_time]" type="text" value="{:date('Y-m-d H:i:s')}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Update_time')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-update_time" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[update_time]" 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">

application/admin/view/cf_channel_info/edit.html

@@ -18,24 +18,6 @@
             <input id="c-memo" data-rule="required" class="form-control" name="row[memo]" type="text" value="{$row.memo|htmlentities}">
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Del_flag')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-del_flag" data-rule="required" class="form-control" name="row[del_flag]" type="number" value="{$row.del_flag|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Create_time')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-create_time" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[create_time]" type="text" value="{:$row.create_time?datetime($row.create_time):''}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Update_time')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-update_time" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[update_time]" type="text" value="{:$row.update_time?datetime($row.update_time):''}">
-        </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">

application/admin/view/cf_suplier_info/add.html

@@ -12,24 +12,6 @@
             <input id="c-memo" data-rule="required" class="form-control" name="row[memo]" type="text" value="">
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Del_flag')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-del_flag" data-rule="required" class="form-control" name="row[del_flag]" type="number" value="0">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Create_time')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-create_time" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[create_time]" type="text" value="{:date('Y-m-d H:i:s')}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Update_time')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-update_time" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[update_time]" 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">

application/admin/view/cf_suplier_info/edit.html

@@ -12,24 +12,6 @@
             <input id="c-memo" data-rule="required" class="form-control" name="row[memo]" type="text" value="{$row.memo|htmlentities}">
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Del_flag')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-del_flag" data-rule="required" class="form-control" name="row[del_flag]" type="number" value="{$row.del_flag|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Create_time')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-create_time" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[create_time]" type="text" value="{:$row.create_time?datetime($row.create_time):''}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Update_time')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-update_time" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[update_time]" type="text" value="{:$row.update_time?datetime($row.update_time):''}">
-        </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">

application/admin/view/order_main/add.html

@@ -1,81 +1,51 @@
 <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">{:__('Create_user_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-create_user_id" data-rule="required" data-source="create/user/index" class="form-control selectpage" name="row[create_user_id]" type="text" value="">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Group_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-group_id" data-rule="required" data-source="group/index" class="form-control selectpage" name="row[group_id]" type="text" value="">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Commissioner')}:</label>
-        <div class="col-xs-12 col-sm-8">
+        <label class="control-label col-xs-12 col-sm-2">{:__('订单专员')}:</label>
+        <div class="col-xs-4 col-sm-4">
             <input id="c-commissioner" data-rule="required" class="form-control" name="row[commissioner]" type="text" value="">
         </div>
+        <label class="control-label col-xs-12 col-sm-2">{:__('User_phone')}:</label>
+        <div class="col-xs-4 col-sm-4">
+            <input id="c-user_phone" data-rule="required" class="form-control" name="row[user_phone]" type="text" value="">
+        </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Channel_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-channel_id" data-rule="required" data-source="channel/index" class="form-control selectpage" name="row[channel_id]" type="text" value="">
+        <div class="col-xs-6 col-sm-4">
+            <input id="c-channel_id" data-rule="required" data-source="cf_channel_info/getList" class="form-control selectpage" name="row[channel_id]" type="text" value="">
         </div>
-    </div>
-    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Channel_order_no')}:</label>
-        <div class="col-xs-12 col-sm-8">
+        <div class="col-xs-6 col-sm-4">
             <input id="c-channel_order_no" data-rule="required" class="form-control" name="row[channel_order_no]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('User_name')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-user_name" data-rule="required" class="form-control" name="row[user_name]" type="text" value="">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('User_phone')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-user_phone" data-rule="required" class="form-control" name="row[user_phone]" type="text" value="">
-        </div>
-    </div>
-    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Total_amount')}:</label>
-        <div class="col-xs-12 col-sm-8">
+        <div class="col-xs-3 col-sm-3">
             <input id="c-total_amount" data-rule="required" class="form-control" step="0.01" name="row[total_amount]" type="number" value="0.00">
+
         </div>
-    </div>
-    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Cost_amount')}:</label>
-        <div class="col-xs-12 col-sm-8">
+        <div class="col-xs-3 col-sm-3">
             <input id="c-cost_amount" data-rule="required" class="form-control" step="0.01" name="row[cost_amount]" type="number" value="0.00">
         </div>
+
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Profit_amount')}:</label>
-        <div class="col-xs-12 col-sm-8">
+        <div class="col-xs-3 col-sm-3">
             <input id="c-profit_amount" data-rule="required" class="form-control" step="0.01" name="row[profit_amount]" type="number" value="0.00">
         </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Order_status')}:</label>
-        <div class="col-xs-12 col-sm-8">
+        <label class="control-label col-xs-12 col-sm-2">{:__('订单状态')}:</label>
+        <div class="col-xs-3 col-sm-3">
             <input id="c-order_status" data-rule="required" class="form-control" name="row[order_status]" type="number" value="0">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Order_memo')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-order_memo" data-rule="required" class="form-control" name="row[order_memo]" type="text" value="">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Log')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-log" data-rule="required" class="form-control" name="row[log]" type="text" value="">
+            <textarea id="c-order_memo" data-rule="required" class="form-control " rows="5" name="row[order_memo]" cols="30"></textarea>
         </div>
     </div>
     <div class="form-group">
@@ -91,23 +61,11 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Del_flag')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-del_flag" data-rule="required" class="form-control" name="row[del_flag]" type="number" value="0">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Create_time')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('下单时间')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-create_time" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[create_time]" type="text" value="{:date('Y-m-d H:i:s')}">
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Update_time')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-update_time" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[update_time]" 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">

public/assets/js/backend/cf_channel_info.js

@@ -29,7 +29,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'channel_name', title: __('Channel_name'), operate: 'LIKE'},
                         {field: 'commission_rate', title: __('Commission_rate'), operate:'BETWEEN'},
                         {field: 'memo', title: __('Memo'), operate: 'LIKE'},
-                        {field: 'del_flag', title: __('Del_flag'), formatter: Table.api.formatter.flag},
                         {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}

public/assets/js/backend/cf_suplier_info.js

@@ -28,7 +28,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'id', title: __('Id')},
                         {field: 'supplier_name', title: __('Supplier_name'), operate: 'LIKE'},
                         {field: 'memo', title: __('Memo'), operate: 'LIKE'},
-                        {field: 'del_flag', title: __('Del_flag'), formatter: Table.api.formatter.flag},
                         {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}

public/assets/js/backend/order_main.js

@@ -24,26 +24,19 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 sortName: 'id',
                 columns: [
                     [
-                        {checkbox: true},
                         {field: 'id', title: __('Id')},
-                        {field: 'create_user_id', title: __('Create_user_id')},
-                        {field: 'group_id', title: __('Group_id')},
                         {field: 'commissioner', title: __('Commissioner'), operate: 'LIKE'},
-                        {field: 'channel_id', title: __('Channel_id'), operate: 'LIKE'},
+                        {field: 'channel_name', title: __('下单渠道'), operate: 'LIKE'},
                         {field: 'channel_order_no', title: __('Channel_order_no'), operate: 'LIKE'},
-                        {field: 'user_name', title: __('User_name'), operate: 'LIKE'},
+                        {field: 'nickname', title: __('下单用户'), operate: 'LIKE'},
                         {field: 'user_phone', title: __('User_phone'), operate: 'LIKE'},
                         {field: 'total_amount', title: __('Total_amount'), operate:'BETWEEN'},
                         {field: 'cost_amount', title: __('Cost_amount'), operate:'BETWEEN'},
                         {field: 'profit_amount', title: __('Profit_amount'), operate:'BETWEEN'},
-                        {field: 'order_status', title: __('Order_status')},
+                        {field: 'order_status', title: __('订单状态')},
                         {field: 'order_memo', title: __('Order_memo'), operate: 'LIKE'},
-                        {field: 'log', title: __('Log'), operate: 'LIKE'},
-                        {field: 'cancel_time', title: __('Cancel_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'success_time', title: __('Success_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'del_flag', title: __('Del_flag'), formatter: Table.api.formatter.flag},
-                        {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'create_time', title: __('下单时间'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]