xieruidong il y a 2 ans
Parent
commit
68ebb5b40f

+ 2 - 3
application/admin/controller/OrderInfoRefund.php

@@ -55,14 +55,13 @@ class OrderInfoRefund extends Backend
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 
             $list = $this->model
-                    
+                ->with(['order_info','user'])
                     ->where($where)
                     ->order($sort, $order)
                     ->paginate($limit);
 
             foreach ($list as $row) {
-                $row->visible(['id','refund_status','refund_type','refund_by','reason1','reason2','num','amount','create_time']);
-                
+
             }
 
             $result = array("total" => $list->total(), "rows" => $list->items());

+ 4 - 1
application/admin/model/Refund.php

@@ -10,6 +10,9 @@ use think\Model;
 class Refund Extends \app\common\model\Refund
 {
     public function orderInfo(){
-        return $this->hasOne(OrderInfo::class);
+        return $this->hasOne(OrderInfo::class,'refund_id')->setEagerlyType(0);
+    }
+    public function user(){
+        return $this->belongsTo(User::class)->setEagerlyType(0);
     }
 }

+ 7 - 2
application/admin/view/order_info_refund/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('order_info_refund/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+<!--                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('order_info_refund/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('order_info_refund/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('order_info_refund/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('order_info_refund/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>
@@ -18,13 +18,14 @@
                                 <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>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
                            data-operate-edit="{:$auth->check('order_info_refund/edit')}" 
                            data-operate-del="{:$auth->check('order_info_refund/del')}" 
+                           data-operate-audit="{:$auth->check('order_info_refund/audit')}"
                            width="100%">
                     </table>
                 </div>
@@ -33,3 +34,7 @@
         </div>
     </div>
 </div>
+<script>
+    let refundTypes={:json_encode($refund_types)};
+    let status={:json_encode($status)};
+</script>

+ 30 - 5
public/assets/js/backend/order_info_refund.js

@@ -24,16 +24,41 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 sortName: 'id',
                 columns: [
                     [
-                        {checkbox: true},
+                        //{checkbox: true},
                         {field: 'refund_status', title: __('Refund_status')},
-                        {field: 'refund_type', title: __('Refund_type')},
+                        {field: 'refund_type', title: __('申请类型'),searchList:refundTypes,formatter:Table.api.formatter.label},
                         {field: 'refund_by', title: __('Refund_by')},
-                        {field: 'reason1', title: __('Reason1')},
-                        {field: 'reason2', title: __('Reason2')},
+                        {field: 'reason1', title: __('退款退货原因')},
+                        {field: 'reason2', title: __('退款退货原因'),formatter: Table.api.formatter.content,width:200},
                         {field: 'num', title: __('Num')},
                         {field: 'amount', title: __('Amount'), operate:'BETWEEN'},
                         {field: 'create_time', title: __('Create_time')},
-                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                        //{field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                        {
+                            field: 'operate',
+                            title: '操作',
+                            table:table,
+                            events:Table.api.event.operate,
+                            formatter:Table.api.event.buttons,
+                            buttons:[
+                                {
+                                    name: 'edit',
+                                    text: __('审核'),
+                                    title: __('审核'),
+                                    classname: 'btn btn-xs btn-info btn-dialog',
+                                    icon: 'fa',
+                                    url: 'audit',
+                                    callback: function (data) {
+                                        //Layer.alert("接收到回传数据:" + JSON.stringify(data), {title: "回传数据"});
+                                        $('.btn-refresh').trigger('click')
+                                    },
+                                    visible: function (row) {
+                                        //返回true时按钮显示,返回false隐藏
+                                        return row.status===5 && table.data('operate-audit');
+                                    }
+                                },
+                            ]
+                        }
                     ]
                 ]
             });