Browse Source

套餐订单

lizhen_gitee 1 year ago
parent
commit
1d848eba40

+ 3 - 2
application/admin/lang/zh-cn/packageorder.php

@@ -26,10 +26,11 @@ return [
     'Notice_status 1' => '一月通知',
     'Notice_status 2' => '两周通知',
     'Notice_status 3' => '一周通知',
+    'Remark'          => '备注',
     'User.firstname'  => '名',
     'User.lastname'   => '姓',
-    'Package.name'    => '标题',
-    'Package.name_en' => '标题(en)',
+    'Package.name'    => '套餐标题',
+    'Package.name_en' => '套餐标题(en)',
     'Lesson.name'     => '课程标题',
     'Lesson.name_en'  => '课程标题(en)'
 ];

+ 1 - 1
application/admin/model/Packageorder.php

@@ -119,7 +119,7 @@ class Packageorder extends Model
 
     public function package()
     {
-        return $this->belongsTo('app\admin\model\lesson\Package', 'package_id', 'id', [], 'LEFT')->setEagerlyType(0);
+        return $this->belongsTo('Lessonpackage', 'package_id', 'id', [], 'LEFT')->setEagerlyType(0);
     }
 
 

+ 13 - 13
application/admin/view/packageorder/edit.html

@@ -3,43 +3,43 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Order_no')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-order_no" data-rule="required" class="form-control" name="row[order_no]" type="text" value="{$row.order_no|htmlentities}">
+            <input id="c-order_no" disabled data-rule="required" class="form-control" name="row[order_no]" type="text" value="{$row.order_no|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
+            <input id="c-user_id" disabled data-rule="required"   class="form-control" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Package_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-package_id" data-rule="required" data-source="package/index" class="form-control selectpage" name="row[package_id]" type="text" value="{$row.package_id|htmlentities}">
+            <input id="c-package_id" disabled data-rule="required" data-source="lessonpackage/index" class="form-control selectpage" name="row[package_id]" type="text" value="{$row.package_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Lesson_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-lesson_id" data-rule="required" data-source="lesson/index" class="form-control selectpage" name="row[lesson_id]" type="text" value="{$row.lesson_id|htmlentities}">
+            <input id="c-lesson_id" disabled data-rule="required" data-source="lesson/index" class="form-control selectpage" name="row[lesson_id]" type="text" value="{$row.lesson_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Sessions')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-sessions" data-rule="required" class="form-control" name="row[sessions]" type="number" value="{$row.sessions|htmlentities}">
+            <input id="c-sessions" disabled data-rule="required" class="form-control" name="row[sessions]" type="number" value="{$row.sessions|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Starttime')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-starttime" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[starttime]" type="text" value="{:$row.starttime?datetime($row.starttime):''}">
+            <input id="c-starttime" disabled data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[starttime]" type="text" value="{:$row.starttime?datetime($row.starttime):''}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Days')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-days" data-rule="required" class="form-control" name="row[days]" type="number" value="{$row.days|htmlentities}">
+            <input id="c-days" disabled data-rule="required" class="form-control" name="row[days]" type="number" value="{$row.days|htmlentities}">
         </div>
     </div>
     <div class="form-group">
@@ -51,7 +51,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-price" data-rule="required" class="form-control" step="0.01" name="row[price]" type="number" value="{$row.price|htmlentities}">
+            <input id="c-price" disabled data-rule="required" class="form-control" step="0.01" name="row[price]" type="number" value="{$row.price|htmlentities}">
         </div>
     </div>
     <div class="form-group">
@@ -66,7 +66,7 @@
             
             <div class="radio">
             {foreach name="orderStatusList" item="vo"}
-            <label for="row[order_status]-{$key}"><input id="row[order_status]-{$key}" name="row[order_status]" type="radio" value="{$key}" {in name="key" value="$row.order_status"}checked{/in} /> {$vo}</label> 
+            <label for="row[order_status]-{$key}"><input disabled id="row[order_status]-{$key}" name="row[order_status]" type="radio" value="{$key}" {in name="key" value="$row.order_status"}checked{/in} /> {$vo}</label>
             {/foreach}
             </div>
 
@@ -75,14 +75,14 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Paytime')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-paytime" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[paytime]" type="text" value="{:$row.paytime?datetime($row.paytime):''}">
+            <input id="c-paytime" disabled data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[paytime]" type="text" value="{:$row.paytime?datetime($row.paytime):''}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Is_gift')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
-            <select  id="c-is_gift" data-rule="required" class="form-control selectpicker" name="row[is_gift]">
+            <select  id="c-is_gift" disabled data-rule="required" class="form-control selectpicker" name="row[is_gift]">
                 {foreach name="isGiftList" item="vo"}
                     <option value="{$key}" {in name="key" value="$row.is_gift"}selected{/in}>{$vo}</option>
                 {/foreach}
@@ -90,7 +90,7 @@
 
         </div>
     </div>
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Notice_status')}:</label>
         <div class="col-xs-12 col-sm-8">
             
@@ -101,7 +101,7 @@
             </div>
 
         </div>
-    </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">

+ 2 - 2
application/admin/view/packageorder/index.html

@@ -7,7 +7,7 @@
                 <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('packageorder/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+                        <!--<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('packageorder/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('packageorder/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('packageorder/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         
@@ -18,7 +18,7 @@
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
                             </ul>
-                        </div>
+                        </div>-->
 
                         
                     </div>

+ 12 - 8
public/assets/js/backend/packageorder.js

@@ -8,7 +8,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     index_url: 'packageorder/index' + location.search,
                     add_url: 'packageorder/add',
                     edit_url: 'packageorder/edit',
-                    del_url: 'packageorder/del',
+//                    del_url: 'packageorder/del',
                     multi_url: 'packageorder/multi',
                     import_url: 'packageorder/import',
                     table: 'package_order',
@@ -30,8 +30,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'id', title: __('Id')},
                         {field: 'order_no', title: __('Order_no'), operate: 'LIKE'},
                         {field: 'user_id', title: __('User_id')},
+                        {field: 'user.firstname', title: __('User.firstname'), operate: 'LIKE'},
+                        {field: 'user.lastname', title: __('User.lastname'), operate: 'LIKE'},
                         {field: 'package_id', title: __('Package_id')},
+                        {field: 'package.name', title: __('Package.name'), operate: 'LIKE'},
+                        {field: 'package.name_en', title: __('Package.name_en'), operate: 'LIKE'},
                         {field: 'lesson_id', title: __('Lesson_id')},
+                        {field: 'lesson.name', title: __('Lesson.name'), operate: 'LIKE'},
+                        {field: 'lesson.name_en', title: __('Lesson.name_en'), operate: 'LIKE'},
                         {field: 'sessions', title: __('Sessions')},
                         {field: 'starttime', title: __('Starttime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'days', title: __('Days')},
@@ -43,13 +49,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {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},
                         {field: 'is_gift', title: __('Is_gift'), searchList: {"0":__('Is_gift 0'),"1":__('Is_gift 1')}, formatter: Table.api.formatter.normal},
-                        {field: 'notice_status', title: __('Notice_status'), searchList: {"0":__('Notice_status 0'),"1":__('Notice_status 1'),"2":__('Notice_status 2'),"3":__('Notice_status 3')}, formatter: Table.api.formatter.status},
-                        {field: 'user.firstname', title: __('User.firstname'), operate: 'LIKE'},
-                        {field: 'user.lastname', title: __('User.lastname'), operate: 'LIKE'},
-                        {field: 'package.name', title: __('Package.name'), operate: 'LIKE'},
-                        {field: 'package.name_en', title: __('Package.name_en'), operate: 'LIKE'},
-                        {field: 'lesson.name', title: __('Lesson.name'), operate: 'LIKE'},
-                        {field: 'lesson.name_en', title: __('Lesson.name_en'), operate: 'LIKE'},
+//                        {field: 'notice_status', title: __('Notice_status'), searchList: {"0":__('Notice_status 0'),"1":__('Notice_status 1'),"2":__('Notice_status 2'),"3":__('Notice_status 3')}, formatter: Table.api.formatter.status},
+                        {field: 'remark', title: __('Remark'),operate:false},
+
+
+
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]