Browse Source

后台配套下单,销售前台

lizhen_gitee 6 months ago
parent
commit
adb50668b5

+ 1 - 0
application/admin/controller/Packageorder.php

@@ -184,6 +184,7 @@ class Packageorder extends Backend
             'updatetime'  => time(),
             'is_gift'     => 0,
             'remark'      => input('remark',''),
+            'seller'      => input('seller',''),
         ];
 
         //如果有赠品,赠品订单

+ 1 - 0
application/admin/lang/zh-cn/packageorder.php

@@ -37,6 +37,7 @@ return [
     'Notice_status 2'     => '两周通知',
     'Notice_status 3'     => '一周通知',
     'Remark'              => '备注',
+    'Seller'              => '销售前台',
     'Buy_notice_status'   => '购买通知计划任务',
     'Buy_notice_status 0' => '未通知',
     'Buy_notice_status 1' => '已通知',

+ 6 - 0
application/admin/view/packageorder/add.html

@@ -20,6 +20,12 @@
             <input id="c-remark" class="form-control" name="remark" type="text" value="">
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Seller')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-seller" class="form-control" name="seller" type="text" value="">
+        </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">

+ 6 - 1
public/assets/js/backend/packageorder.js

@@ -24,11 +24,15 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 sortName: 'id',
                 fixedColumns: true,
                 fixedRightNumber: 1,
+                exportTypes: ['excel'],
+                exportOptions: {
+                    ignoreColumn: ['id','user_id','package_id','price','operate']
+                },
                 columns: [
                     [
 //                        {checkbox: true},
                         {field: 'id', title: __('Id')},
-                        {field: 'order_no', title: __('Order_no'), operate: 'LIKE'},
+                        {field: 'order_no', title: __('Order_no')},
                         {field: 'use_status', title: __('Use_status'), searchList: {"0":__('Use_status 0'),"1":__('Use_status 1')}, formatter: Table.api.formatter.status},
                         {field: 'user_id', title: __('User_id')},
                         {field: 'user.firstname', title: __('User.firstname'), operate: 'LIKE'},
@@ -47,6 +51,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'order_status', title: __('Order_status'), searchList: {"0":__('Order_status 0'),"1":__('Order_status 1'),"10":__('Order_status 10')}, formatter: Table.api.formatter.status},
                         {field: 'pay_type', title: __('Pay_type'), searchList: {"1":__('Pay_type 1'),"2":__('Pay_type 2')}, formatter: Table.api.formatter.normal},
                         {field: 'remark', title: __('Remark'), operate: false},
+                        {field: 'seller', title: __('Seller')},
                         {field: 'paytime', title: __('Paytime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
 //                        {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
 //                        {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},