Accept Merge Request #8: (feature/hant -> develop)

Merge Request: 黑明单管理

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/8

application/admin/controller/Blacklist.php

@@ -0,0 +1,144 @@
+<?php
+
+namespace app\admin\controller;
+
+use app\common\controller\Backend;
+use think\Db;
+use think\exception\PDOException;
+use think\exception\ValidateException;
+
+/**
+ * 
+ *
+ * @icon fa fa-circle-o
+ */
+class Blacklist extends Backend
+{
+
+    /**
+     * Blacklist模型对象
+     * @var \app\admin\model\Blacklist
+     */
+    protected $model = null;
+
+    public function _initialize()
+    {
+        parent::_initialize();
+        $this->model = new \app\admin\model\Blacklist;
+        $this->view->assign("statusList", $this->model->getStatusList());
+    }
+
+
+
+    /**
+     * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
+     * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
+     * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
+     */
+
+    public function index()
+    {
+        //设置过滤方法
+        $this->request->filter(['strip_tags', 'trim']);
+        if (false === $this->request->isAjax()) {
+            return $this->view->fetch();
+        }
+        //如果发送的来源是 Selectpage，则转发到 Selectpage
+        if ($this->request->request('keyField')) {
+            return $this->selectpage();
+        }
+        [$where, $sort, $order, $offset, $limit] = $this->buildparams();
+        $list = $this->model
+            ->where($where)
+            ->with(['user' => function($q){
+                $q->field('id,nickname');
+            }])
+            ->order($sort, $order)
+            ->paginate($limit);
+        $result = ['total' => $list->total(), 'rows' => $list->items()];
+        return json($result);
+    }
+
+    public function add()
+    {
+        if (false === $this->request->isPost()) {
+            return $this->view->fetch();
+        }
+        $params = $this->request->post('row/a');
+        if (empty($params)) {
+            $this->error(__('Parameter %s can not be empty', ''));
+        }
+        $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()->validate($validate);
+            }
+
+            $params['status'] = 'active';
+            $params['user_id'] = $this->auth->id;
+            $params['added_time'] = date('Y-m-d H:i:s');
+
+            $result = $this->model->allowField(true)->save($params);
+            Db::commit();
+        } catch (ValidateException|PDOException|Exception $e) {
+            Db::rollback();
+            $this->error($e->getMessage());
+        }
+        if ($result === false) {
+            $this->error(__('No rows were inserted'));
+        }
+        $this->success();
+    }
+
+    public function edit($ids = null)
+    {
+        if (!$ids) {
+            if (request()->isPost()){
+                $ids = input('id');
+                if (!$ids){
+                    $this->error('缺少订单ID');
+                }
+            }else{
+                $this->error('缺少订单ID');
+            }
+        }
+
+        // 获取当前ID对应的订单信息
+        $order = $this->model->get($ids);
+        if (!$order) {
+            $this->error('订单不存在');
+        }
+
+        // 判断是否为POST请求，进行更新操作
+        if (request()->isPost()) {
+            // 获取表单提交的数据
+            $data = input('post.row/a');
+
+            if ($data['status'] == 'removed'){
+                $data['removed_time'] = date('Y-m-d H:i:s');
+            }else{
+                $data['removed_time'] = null;
+            }
+
+            // 更新订单信息
+            $order->save($data);
+
+            // 返回成功信息
+            $this->success('更新成功', 'index');
+        }
+        // 将订单数据传递到视图
+        $this->assign('row', $order);
+
+        // 渲染编辑页面
+        return $this->fetch();
+    }
+}

application/admin/controller/Order.php

@@ -233,7 +233,7 @@ class Order extends Backend
         }
         $area = new \app\admin\model\Area();
         $area_name = $area->getNameByCode($order->area_id);
-        $order->area_name = $area_name;
+        $order->area_name = str_replace(',','/',$area_name);
 //        dd($area_name);
         // 将订单数据传递到视图
         $this->assign('row', $order);
@@ -258,7 +258,7 @@ class Order extends Backend
 
         $area = new \app\admin\model\Area();
         $area_name = $area->getNameByCode($order->area_id);
-        $order->area_name = $area_name;
+        $order->area_name = str_replace(',','/',$area_name);
 
         // 将订单数据传递到视图
         $this->assign('row', $order);

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

@@ -0,0 +1,13 @@
+<?php
+
+return [
+    'User_id' => '账号',
+    'Username' => '用户名',
+//    'Username' => '用户名',
+    'Added_time' => '加入时间',
+    'Removed_time' => '移除时间',
+    'Reason' => '原因',
+    'Active' => '生效',
+    'Removed' => '移除',
+    'Remarks' => '备注'
+];

application/admin/model/Blacklist.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace app\admin\model;
+
+use think\Model;
+
+
+class Blacklist extends Model
+{
+
+    
+
+    
+
+    // 表名
+    protected $table = 'fa_blacklist';
+    
+    // 自动写入时间戳字段
+    protected $autoWriteTimestamp = false;
+
+    // 定义时间戳字段名
+    protected $createTime = false;
+    protected $updateTime = false;
+    protected $deleteTime = false;
+
+    // 追加属性
+    protected $append = [
+        'status_text'
+    ];
+    
+
+    
+    public function getStatusList()
+    {
+        return ['active' => __('Active'), 'removed' => __('Removed')];
+    }
+
+
+    public function getStatusTextAttr($value, $data)
+    {
+        $value = $value ?: ($data['status'] ?? '');
+        $list = $this->getStatusList();
+        return $list[$value] ?? '';
+    }
+
+
+    public function user(){
+        return $this->belongsTo(Admin::class,'user_id');
+    }
+
+
+
+
+}

application/admin/validate/Blacklist.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace app\admin\validate;
+
+use think\Validate;
+
+class Blacklist extends Validate
+{
+    /**
+     * 验证规则
+     */
+    protected $rule = [
+    ];
+    /**
+     * 提示消息
+     */
+    protected $message = [
+    ];
+    /**
+     * 验证场景
+     */
+    protected $scene = [
+        'add'  => [],
+        'edit' => [],
+    ];
+    
+}

application/admin/view/blacklist/add.html

@@ -0,0 +1,27 @@
+<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">{:__('Username')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-username" class="form-control" name="row[username]" type="text">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Reason')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <textarea id="c-reason" class="form-control " rows="5" name="row[reason]" cols="50"></textarea>
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Remarks')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <textarea id="c-remarks" class="form-control " rows="5" name="row[remarks]" cols="50"></textarea>
+        </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">
+            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+        </div>
+    </div>
+</form>

application/admin/view/blacklist/edit.html

@@ -0,0 +1,39 @@
+<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">{:__('Username')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-username" class="form-control" name="row[username]" type="text" value="{$row.username|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Reason')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <textarea id="c-reason" class="form-control " rows="5" name="row[reason]" cols="50">{$row.reason|htmlentities}</textarea>
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            
+            <div class="radio">
+            {foreach name="statusList" item="vo"}
+            <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="$row.status"}checked{/in} /> {$vo}</label> 
+            {/foreach}
+            </div>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Remarks')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <textarea id="c-remarks" class="form-control " rows="5" name="row[remarks]" cols="50">{$row.remarks|htmlentities}</textarea>
+        </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">
+            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+        </div>
+    </div>
+</form>

application/admin/view/blacklist/index.html

@@ -0,0 +1,46 @@
+<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">
+            <div class="tab-pane fade active in" id="one">
+                <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('blacklist/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('blacklist/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('blacklist/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+                        
+
+                        <div class="dropdown btn-group {:$auth->check('blacklist/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"}
+                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:" data-params="status={$key}">{:__('Set status to ' . $key)}</a></li>
+                                {/foreach}
+                            </ul>
+                        </div>
+
+                        
+                    </div>
+                    <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-edit="{:$auth->check('blacklist/edit')}"
+                           data-operate-del="{:$auth->check('blacklist/del')}"
+                           width="100%">
+                    </table>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>

application/admin/view/order/add.html

@@ -12,7 +12,7 @@
                         <div class="form-group">
                             <label class="control-label col-xs-12 col-sm-3">{:__('Customer')}:</label>
                             <div class="col-xs-12 col-sm-8">
-                                <input id="c-customer" class="form-control" name="row[customer]" type="text">
+                                <input id="c-customer" data-rule="required"  class="form-control" name="row[customer]" type="text">
                             </div>
                         </div>
                         <div class="form-group">
@@ -24,13 +24,10 @@
                         <div class="form-group">
                             <label class="control-label col-xs-12 col-sm-3">{:__('Area_id')}:</label>
                             <div class='col-xs-12 col-sm-8'>
-                                <input id="c-area_id" class="form-control"  type="text" value="" />
+                                <div class="col-xs-12 col-sm-8">
-                                <!-- 选项下拉框 -->
+                                    <input id="c-city" data-rule="required"  class="form-control" data-toggle="city-picker" name="row[address]" type="text" value="" />
-                                <ul id="address-list" class="dropdown-menu" style="display: none;"></ul>
+                                    <input id="area_id" style="display: none" class="form-control" name="row[area_id]" hidden type="text" value="" />
-
+                                </div>
-                                <!-- 存储选择的 area_code -->
-                                <input type="hidden" id="selected-area-code"  name="row[area_id]">
-
                             </div>
                         </div>
                         <div class="form-group">
@@ -116,8 +113,8 @@
                         <div class="form-group layer-footer">
                             <label class="control-label col-xs-12 col-sm-3"></label>
                             <div class="col-xs-12 col-sm-8">
-                                <button type="submit" data-id="submit" class="btn btn-primary btn-embossed disabled">录入</button>
+                                <button type="submit" data-id="submit" class="btn btn-primary btn-embossed disabled">录入并清空</button>
-                                <button type="submit" data-id="submit_save" class="btn btn-primary btn-embossed disabled">录入并保留基本信息</button>
+                                <button  id="mybuttom" class="btn btn-primary btn-embossed">录入并保留信息</button>
                             </div>
                         </div>
                     </form>

application/admin/view/order/copy.html

@@ -22,12 +22,8 @@
                         <div class="form-group">
                             <label class="control-label col-xs-12 col-sm-3">{:__('Area_id')}:</label>
                             <div class='col-xs-12 col-sm-8'>
-                                <input id="c-area_id" data-rule="required" class="form-control" type="text" value="{$row.area_name}" />
+                                <input id="c-city" data-rule="required"  class="form-control" data-toggle="city-picker" value="{$row.area_name}" type="text" name="row[address]" />
-                                <!-- 选项下拉框 -->
+                                <input id="area_id" style="display: none" class="form-control" name="row[area_id]" hidden type="text" value="{$row.area_id}" />
-                                <ul id="address-list" class="dropdown-menu" style="display: none;"></ul>
-
-                                <!-- 存储选择的 area_code -->
-                                <input type="hidden" id="selected-area-code" name="row[area_id]" value="{$row.area_id}">
                             </div>
                         </div>
                         <div class="form-group">

application/admin/view/order/edit.html

@@ -25,12 +25,8 @@
                         <div class="form-group">
                             <label class="control-label col-xs-12 col-sm-3">{:__('Area_id')}:</label>
                             <div class='col-xs-12 col-sm-8'>
-                                <input id="c-area_id" data-rule="required" class="form-control" type="text" value="{$row.area_name}" />
+                                <input id="c-city" data-rule="required"  class="form-control" data-toggle="city-picker" value="{$row.area_name}" type="text" name="row[address]" />
-                                <!-- 选项下拉框 -->
+                                <input id="area_id" style="display: none" class="form-control" name="row[area_id]" hidden type="text" value="{$row.area_id}" />
-                                <ul id="address-list" class="dropdown-menu" style="display: none;"></ul>
-
-                                <!-- 存储选择的 area_code -->
-                                <input type="hidden" id="selected-area-code" name="row[area_id]" value="{$row.area_id}">
                             </div>
                         </div>
                         <div class="form-group">

public/assets/js/backend/blacklist.js

@@ -0,0 +1,55 @@
+define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+
+    var Controller = {
+        index: function () {
+            // 初始化表格参数配置
+            Table.api.init({
+                extend: {
+                    index_url: 'blacklist/index' + location.search,
+                    add_url: 'blacklist/add',
+                    edit_url: 'blacklist/edit',
+                    del_url: 'blacklist/del',
+                    multi_url: 'blacklist/multi',
+                    import_url: 'blacklist/import',
+                    table: 'blacklist',
+                }
+            });
+
+            var table = $("#table");
+
+            // 初始化表格
+            table.bootstrapTable({
+                url: $.fn.bootstrapTable.defaults.extend.index_url,
+                pk: 'id',
+                sortName: 'id',
+                columns: [
+                    [
+                        {checkbox: true},
+                        {field: 'id', title: __('Id')},
+                        {field: 'user.nickname', title: __('User_id')},
+                        {field: 'username', title: __('Username'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        {field: 'added_time', title: __('Added_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'removed_time', title: __('Removed_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'status', title: __('Status'), searchList: {"active":__('Active'),"removed":__('Removed')}, formatter: Table.api.formatter.status},
+                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                    ]
+                ]
+            });
+
+            // 为表格绑定事件
+            Table.api.bindevent(table);
+        },
+        add: function () {
+            Controller.api.bindevent();
+        },
+        edit: function () {
+            Controller.api.bindevent();
+        },
+        api: {
+            bindevent: function () {
+                Form.api.bindevent($("form[role=form]"));
+            }
+        }
+    };
+    return Controller;
+});

public/assets/js/backend/order.js

@@ -1,5 +1,11 @@
 define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
 
+    function clearInfo() {
+        $('[name^="row["]').val('');
+        $("#c-city").citypicker('reset');
+        $(".selectpicker").val('').selectpicker('refresh');
+    }
+
     var Controller = {
         index: function () {
             // 初始化表格参数配置
@@ -177,7 +183,15 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             Table.api.bindevent(table);
         },
         add: function () {
-            console.log(1);
+            $("#c-city").on("cp:updated", function() {
+                var citypicker = $(this).data("citypicker");
+                var code = citypicker.getCode("district") || citypicker.getCode("city") || citypicker.getCode("province");
+                $("#area_id").val(code);
+            });
+            $("#c-city").on("click", function() {
+                Form.api.submit($("form[role=form]"),);
+                return false;
+            });
             Controller.api.bindevent();
         },
         edit: function () {
@@ -189,8 +203,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
         api: {
             bindevent: function () {
                 Form.api.bindevent($("form[role=form]"),function (success,ret) {
-                    console.log(success);
+                    clearInfo();
-                });
+                    return false;
+                },);
             }
         }
     };
@@ -199,71 +214,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
         // 获取左侧输入框的内容
     }
 
-    let $input = $("#c-area_id");
-    let $dropdown = $("#address-list");
-    let $hiddenField = $("#selected-area-code");
-    let timer = null; // 定义定时器
-    // 监听输入框
-    $input.on("input", function () {
-        clearTimeout(timer); // 清除上次的定时器
-        let keyword = $(this).val().trim();
-
-        if (keyword.length === 0) {
-            $dropdown.hide();
-            return;
-        }
-
-        // 延迟 500 毫秒后执行 AJAX 查询（防止过快触发）
-        timer = setTimeout(() => {
-            $.ajax({
-                url: "/admin/area/search",  // 你的 API 地址
-                type: "GET",
-                data: {keyword: keyword},
-                dataType: "json",
-                success: function (data) {
-                    renderDropdown(data.data);
-                },
-                error: function () {
-                    console.error("请求失败");
-                }
-            });
-        }, 200); // 500 毫秒防抖
-    });
-
-    // 渲染城市下拉选项
-    function renderDropdown(data) {
-        $dropdown.empty(); // 清空列表
-        if (data.length === 0) {
-            let $option = $("<li class='dropdown-item'></li>")
-                .text('未搜索到结果')
-                .attr("data-value", 0);
-            $dropdown.append($option);
-        } else {
-            data.forEach(item => {
-                let $option = $("<li class='dropdown-item'></li>")
-                    .text(item.merge_name)
-                    .attr("data-value", item.area_code)  // 绑定 area_code
-                    .on("click", function () {
-                        $input.val(item.merge_name);  // 选中后填充输入框
-                        $hiddenField.val($(this).attr("data-value")); // 存储 area_code
-                        $dropdown.hide();
-                    });
-
-                $dropdown.append($option);
-            });
-        }
-
-
-        $dropdown.show(); // 显示下拉框
-    }
-
-
-    // 点击外部隐藏下拉框
-    $(document).on("click", function (e) {
-        if (!$(e.target).closest("#c-address, #address-list").length) {
-            $dropdown.hide();
-        }
-    });
     return Controller;
 
 });