Merge remote-tracking branch 'origin/develop' into feature/hant

2025-03-06 21:03:17 +08:00 · 2025-03-06 21:03:17 +08:00 · 60d4baae4e
commit 60d4baae4e
parent 4f289c00d5 dbe39286a3
10 changed files with 45 additions and 64 deletions
--- a/application/admin/controller/Order.php
+++ b/application/admin/controller/Order.php
@ -26,8 +26,8 @@ class Order extends Backend
        parent::_initialize();
        $this->model = new \app\admin\model\Order;
        $this->view->assign("statusList", $this->model->getStatusList());
-        $this->view->assign("collectList", $this->model->getCollectList());
-        $this->view->assign("dispatchTypeList", $this->model->getDispatchTypeList());
+        //$this->view->assign("collectList", $this->model->getCollectList());
+        //$this->view->assign("dispatchTypeList", $this->model->getDispatchTypeList());
    }


--- a/application/admin/controller/finances/Auditorder.php
+++ b/application/admin/controller/finances/Auditorder.php
@ -1,6 +1,6 @@
 <?php

-namespace app\admin\controller\finances;
+namespace app\admin\controller\orders;

 use app\admin\model\Order;
 use app\common\controller\Backend;
@ -15,14 +15,14 @@ class Auditorder extends Backend

    /**
     * Auditorder模型对象
-     * @var \app\admin\model\Auditorder
+     * @var \app\admin\model\Order
     */
    protected $model = null;

    public function _initialize()
    {
        parent::_initialize();
-        $this->model = new \app\admin\model\Order;
+        $this->model = new \app\admin\model\Order();
        $this->view->assign("statusList", $this->model->getStatusList());
    }

@ -51,8 +51,10 @@ class Auditorder extends Backend
            }
            list($where, $sort, $order, $offset, $limit) = $this->buildparams();

+
            $list = $this->model
-                    ->scope('tag',Order::TAB_AUDIT)
+                ->scope('tab',Order::TAB_AUDIT)
+                ->alias('order')
                    ->with(['admin'])
                    ->where($where)
                    ->order($sort, $order)
--- a/application/admin/controller/orders/Revisitorder.php
+++ b/application/admin/controller/orders/Revisitorder.php
@ -57,7 +57,7 @@ class Revisitorder extends Backend
        }
        [$where, $sort, $order, $offset, $limit] = $this->buildparams();
        $list = $this->model
-            ->scope('tag',Order::TAB_REVIEW)
+            ->scope('tab',Order::TAB_REVIEW)
            ->where($where)
            ->order($sort, $order)
            ->paginate($limit);
--- a/application/admin/lang/zh-cn/finances/auditorder.php
+++ b/application/admin/lang/zh-cn/finances/auditorder.php
@ -2,6 +2,7 @@

 return [
    'Id'                 => 'ID',
+    'User_id'            => '用户ID',
    'Order_no'           => '订单号',
    'Customer'           => '客户姓名',
    'Tel'                => '客户电话',
--- a/application/admin/model/Order.php
+++ b/application/admin/model/Order.php
@ -42,15 +42,12 @@ class Order extends Model
    const TAB_REVIEW = 'review';           //回访


+
    public function getStatusList()
    {
        return ['10' => __('Status 10'), '20' => __('Status 20'), '30' => __('Status 30'), '40' => __('Status 40'), '41' => __('Status 41'), '50' => __('Status 50'), '60' => __('Status 60'), '-10' => __('Status -10')];
    }

-    public function getCollectList()
-    {
-        return ['0' => __('Collect 0'), '1' => __('Collect 1')];
-    }

    public function getDispatchTypeList()
    {
@ -69,7 +66,7 @@ class Order extends Model
    public function getCollectTextAttr($value, $data)
    {
        $value = $value ?: ($data['collect'] ?? '');
-        $list = $this->getCollectList();
+        //$list = $this->getCollectList();
        return $list[$value] ?? '';
    }

@ -86,11 +83,12 @@ class Order extends Model
    {
        $status = $this->tabStatus($tab);
        if(!empty($status)){
-            $query->whereIn('order.status', $status);
+            $query->whereIn('fa_order.status', $status);
        }
+        return $query;
    }

-    private function tabStatus($tab){
+    public function tabStatus($tab){
        $tabStatus = [
            self::TAB_DISPATCH        =>  [10],                    //派单管理状态
            self::TAB_PENDING         =>  [20,30,40,41],           //订单跟进状态
@ -99,4 +97,9 @@ class Order extends Model
        ];
        return $tabStatus[$tab] ?? [];
    }
+
+
+    public function admin(){
+        return $this->belongsTo(Admin::class,'audit_admin_id',);
+    }
 }
--- a/application/admin/validate/Auditorder.php
+++ b/application/admin/validate/Auditorder.php
@ -1,27 +0,0 @@
-<?php
-
-namespace app\admin\validate;
-
-use think\Validate;
-
-class Auditorder extends Validate
-{
-    /**
-     * 验证规则
-     */
-    protected $rule = [
-    ];
-    /**
-     * 提示消息
-     */
-    protected $message = [
-    ];
-    /**
-     * 验证场景
-     */
-    protected $scene = [
-        'add'  => [],
-        'edit' => [],
-    ];
-    
-}
--- a/application/admin/view/finances/auditorder/add.html
+++ b/application/admin/view/finances/auditorder/add.html
@ -1,5 +1,11 @@
 <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">{:__('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="">
+        </div>
+    </div>
    <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">
--- a/application/admin/view/finances/auditorder/edit.html
+++ b/application/admin/view/finances/auditorder/edit.html
@ -1,5 +1,11 @@
 <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">{:__('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}">
+        </div>
+    </div>
    <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">
--- a/application/admin/view/finances/auditorder/index.html
+++ b/application/admin/view/finances/auditorder/index.html
@ -1,15 +1,4 @@
 <div class="panel panel-default panel-intro">
-    
-    <div class="panel-heading">
-        {:build_heading(null,FALSE)}
-        <ul class="nav nav-tabs" data-field="status">
-            <li class="{:$Think.get.status === null ? 'active' : ''}"><a href="#t-all" data-value="" data-toggle="tab">{:__('All')}</a></li>
-            {foreach name="statusList" item="vo"}
-            <li class="{:$Think.get.status === (string)$key ? 'active' : ''}"><a href="#t-{$key}" data-value="{$key}" data-toggle="tab">{$vo}</a></li>
-            {/foreach}
-        </ul>
-    </div>
-

    <div class="panel-body">
        <div id="myTabContent" class="tab-content">
@ -17,12 +6,12 @@
                <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('finances/auditorder/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('finances/auditorder/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('finances/auditorder/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('orders/auditorder/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('orders/auditorder/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('orders/auditorder/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                        

-                        <div class="dropdown btn-group {:$auth->check('finances/auditorder/multi')?'':'hide'}">
+                        <div class="dropdown btn-group {:$auth->check('orders/auditorder/multi')?'':'hide'}">
                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
                            <ul class="dropdown-menu text-left" role="menu">
                                {foreach name="statusList" item="vo"}
@ -34,8 +23,8 @@
                        
                    </div>
                    <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
-                           data-operate-edit="{:$auth->check('finances/auditorder/edit')}"
-                           data-operate-del="{:$auth->check('finances/auditorder/del')}"
+                           data-operate-edit="{:$auth->check('orders/auditorder/edit')}"
+                           data-operate-del="{:$auth->check('orders/auditorder/del')}"
                           width="100%">
                    </table>
                </div>
--- a/public/assets/js/backend/finances/auditorder.js
+++ b/public/assets/js/backend/finances/auditorder.js
@ -5,12 +5,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
            // 初始化表格参数配置
            Table.api.init({
                extend: {
-                    index_url: 'finances/auditorder/index' + location.search,
-                    add_url: 'finances/auditorder/add',
-                    edit_url: 'finances/auditorder/edit',
-                    del_url: 'finances/auditorder/del',
-                    multi_url: 'finances/auditorder/multi',
-                    import_url: 'finances/auditorder/import',
+                    index_url: 'orders/auditorder/index' + location.search,
+                    add_url: 'orders/auditorder/add',
+                    edit_url: 'orders/auditorder/edit',
+                    del_url: 'orders/auditorder/del',
+                    multi_url: 'orders/auditorder/multi',
+                    import_url: 'orders/auditorder/import',
                    table: 'order',
                }
            });
@ -28,6 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                    [
                        {checkbox: true},
                        {field: 'id', title: __('Id')},
+                        {field: 'user_id', title: __('User_id')},
                        {field: 'order_no', title: __('Order_no'), operate: 'LIKE'},
                        {field: 'customer', title: __('Customer'), operate: 'LIKE'},
                        {field: 'tel', title: __('Tel'), operate: 'LIKE'},