商品分类

application/api/controller/Common.php

@@ -224,7 +224,7 @@ class Common extends Base
         }
 
         if ($module == CommonConstant::MODULE_4) {
-            $category_first_list = GoodsCategoryService::get_list([['name', 'in', array_keys($category_first_data)]]);
+            $category_first_list = GoodsCategoryService::get_list([['name', 'in', array_keys($category_first_data)]],1);
             $category_first_object = $category_first_list ? array_column($category_first_list->toArray(), null, 'name') : [];
 
             $msg = '导入的物品：';

application/api/controller/Goodscategory.php

@@ -35,7 +35,7 @@ class Goodscategory extends Base
      */
     public function get_list()
     {
-        $data = GoodsCategoryService::get_list();
+        $data = GoodsCategoryService::get_list([],1);
         $this->success('商品分类列表', $data);
     }
 

application/approve/controller/ApproveInfo.php

@@ -143,4 +143,48 @@ class ApproveInfo extends Controller
         }
     }
 
+    /**
+     * 列表数据处理
+     * @param array $data
+     * @throws \Exception
+     */
+    protected function _index_page_filter(&$data)
+    {
+        foreach ($data as &$value) {
+
+        }
+    }
+
+    /**
+     * 编辑
+     * @auth true
+     * @throws \think\Exception
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     * @throws \think\exception\PDOException
+     */
+    public function edit()
+    {
+        $this->title = '详情';
+        $this->_form($this->table, 'form');
+    }
+
+    /**
+     * 表单处理
+     * @param array $data
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    protected function _form_filter(&$data)
+    {
+        if ($this->request->isGet()) {
+
+        }
+        if ($this->request->isPost()) {
+
+        }
+    }
+
 }

application/approve/controller/Goods.php

@@ -0,0 +1,133 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | ThinkAdmin
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://demo.thinkadmin.top
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
+// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
+// +----------------------------------------------------------------------
+
+namespace app\approve\controller;
+
+use app\common\constant\CommonConstant;
+use app\common\constant\MaintainConstant;
+use library\Controller;
+
+/**
+ * 商品
+ */
+class Goods extends Controller
+{
+    /**
+     * 绑定数据表
+     * @var string
+     */
+    protected $table = 'Goods';
+
+    /**
+     * 控制器初始化
+     */
+    protected function initialize()
+    {
+        $this->get_type_title_list = MaintainConstant::get_type_title_list();
+    }
+
+    /**
+     * 列表
+     * @auth true
+     * @menu true
+     * @throws \think\Exception
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function index()
+    {
+        $this->title = '维修人员列表';
+        $query = $this->_query($this->table)
+            ->field('is_deleted', true)
+            ->where('is_deleted', CommonConstant::IS_DELETED_0)
+            ->like('name,mobile');
+        $query->page();
+    }
+
+    /**
+     * 列表数据处理
+     * @param array $data
+     * @throws \Exception
+     */
+    protected function _index_page_filter(&$data)
+    {
+        foreach ($data as &$value) {
+
+        }
+    }
+
+
+    /**
+     * 添加
+     * @auth true
+     * @throws \think\Exception
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     * @throws \think\exception\PDOException
+     */
+    public function add()
+    {
+        $this->title = '添加';
+        $this->_form($this->table, 'form');
+    }
+
+    /**
+     * 编辑
+     * @auth true
+     * @throws \think\Exception
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     * @throws \think\exception\PDOException
+     */
+    public function edit()
+    {
+        $this->title = '编辑';
+        $this->_form($this->table, 'form');
+    }
+
+    /**
+     * 表单处理
+     * @param array $data
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    protected function _form_filter(&$data)
+    {
+        if ($this->request->isGet()) {
+
+        }
+        if ($this->request->isPost()) {
+
+        }
+    }
+
+
+    /**
+     * 删除
+     * @auth true
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
+     */
+    public function remove()
+    {
+        $this->applyCsrfToken();
+        $this->_delete($this->table);
+    }
+
+}

application/approve/controller/GoodsCategory.php

@@ -0,0 +1,138 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | ThinkAdmin
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://demo.thinkadmin.top
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
+// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
+// +----------------------------------------------------------------------
+
+namespace app\approve\controller;
+
+use app\common\constant\CommonConstant;
+use app\common\constant\MaintainConstant;
+use app\common\service\GoodsCategoryService;
+use library\Controller;
+use library\tools\Data;
+
+/**
+ * 商品分类
+ */
+class GoodsCategory extends Controller
+{
+    /**
+     * 绑定数据表
+     * @var string
+     */
+    protected $table = 'GoodsCategory';
+
+    /**
+     * 控制器初始化
+     */
+    protected function initialize()
+    {
+        $this->get_type_title_list = MaintainConstant::get_type_title_list();
+    }
+
+    /**
+     * 列表
+     * @auth true
+     * @menu true
+     * @throws \think\Exception
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function index()
+    {
+        $this->title = '商品分类列表';
+        $query = $this->_query($this->table)
+            ->field('is_deleted', true)
+            ->where('is_deleted',CommonConstant::IS_DELETED_0)
+            ->order('sort desc,id asc');
+        $query->page(false);
+    }
+
+    /**
+     * 列表数据处理
+     * @param array $data
+     * @throws \Exception
+     */
+    protected function _index_page_filter(&$data)
+    {
+        if($data) {
+            foreach ($data as &$vo) {
+                $vo['ids'] = join(',', Data::getArrSubIds($data, $vo['id']));
+            }
+            $data = Data::arr2table($data);
+        }
+    }
+
+
+    /**
+     * 添加
+     * @auth true
+     * @throws \think\Exception
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     * @throws \think\exception\PDOException
+     */
+    public function add()
+    {
+        $this->title = '添加';
+        $this->_form($this->table, 'form');
+    }
+
+    /**
+     * 编辑
+     * @auth true
+     * @throws \think\Exception
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     * @throws \think\exception\PDOException
+     */
+    public function edit()
+    {
+        $this->title = '编辑';
+        $this->_form($this->table, 'form');
+    }
+
+    /**
+     * 表单处理
+     * @param array $data
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    protected function _form_filter(&$data)
+    {
+        if ($this->request->isGet()) {
+            $this->cate_list = GoodsCategoryService::get_list([]);
+        }
+        if ($this->request->isPost()) {
+
+        }
+    }
+
+
+    /**
+     * 删除
+     * @auth true
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
+     */
+    public function remove()
+    {
+        $this->applyCsrfToken();
+        $this->_delete($this->table);
+    }
+
+}

application/approve/view/approve_info/form.html

@@ -2,93 +2,127 @@
 
 {block name="button"}
 
-<button class="layui-btn layui-btn-sm layui-btn-primary" type='button' onclick="javascript:history.back()">返回</button>
+<button class="layui-btn layui-btn-sm layui-btn-primary" type='button' data-open="{:url('index')}">返回</button>
 
 {/block}
 
 {block name="content"}
 <div class="think-box-shadow">
     <form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
-        <div class="layui-card-body">
+        <div class="layui-tab layui-tab-card think-bg-white">
+            <ul class="layui-tab-title notselect">
+                <li data-type="store-config-type-sms1">个人信息</li>
+            </ul>
+            <div class="layui-tab-content">
 
-            {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
-            <input type='hidden' value='{$get_user_type_list_json}' id='get_user_type_list_json'>
-            <input type='hidden' value='{$user_list_json}' id='user_list_json'>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label color-green font-w7">模块</label>
-                <div class="layui-input-block">
-                    <input name="" placeholder="" value="{$get_module_list[$vo.module]}" class="layui-input layui-bg-gray" disabled>
-                    <p class="help-block"></p>
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label color-green font-w7">审批流类型</label>
-                <div class="layui-input-block">
-                    <input name="" placeholder="" value="{$get_type_list[$vo.flow_type]}" class="layui-input layui-bg-gray" disabled>
-                    <p class="help-block"></p>
-                </div>
-            </div>
-
-            {eq name='vo.flow_item' value='0' }
-            {else}
-            <div class="layui-form-item">
-                <label class="layui-form-label color-green font-w7">审批流项</label>
-                <div class="layui-input-block">
-                    <input name="" placeholder="" value="{$get_item_list[$vo.flow_item]}" class="layui-input layui-bg-gray" disabled>
-                    <p class="help-block"></p>
-                </div>
-            </div>
-            {/eq}
-
-            <div class="layui-form-item">
-                <label class="layui-form-label color-green font-w7">审批层级</label>
-                <div class="layui-input-block"></div>
-            </div>
-            <div class="paramsData">
-                {foreach name="vo.user_data_text" item="val" key="key"}
-                <div class="layui-form-item paramsItem{$key}">
-                    <label class="layui-form-label">第{$key+1}级：</label>
-                    <div class="layui-input-block">
-                        <div class="layui-input-inline">
-                            <select class="layui-select select1" name="user_data[{$key}][user_type]"
-                                    id="c-user_type-{$key}" lay-filter="user_type">
-                                {foreach $get_user_type_list as $kk=>$vv}
-                                {eq name='val.user_type' value='$kk.""'}
-                                <option selected value="{$kk}">{$vv}</option>
-                                {else}
-                                <option value="{$kk}">{$vv}</option>
-                                {/eq}
-                                {/foreach}
-                            </select>
+                <div class="layui-card-body">
+                    <input type='hidden' value='{$vo.id}' name='id'>
+                    <div class="layui-form-item">
+                        <label class="layui-form-label color-green font-w7">头像</label>
+                        <div class="layui-input-block">
+                            <img data-tips-image src="{$vo.avatar}" style="width: 100px;height: 100px;vertical-align:top">
+                            <p class="help-block"></p>
+                        </div>
+                    </div>
+<!--                    <div class="layui-row margin-bottom-15">-->
+<!--                        <label class="layui-col-xs2 think-form-label">标题</label>-->
+<!--                        <label class="layui-col-xs10">-->
+<!--                            <input name="title" required value='{$vo.title|default=""}' placeholder="请输入标题" class="layui-input">-->
+<!--                        </label>-->
+<!--                    </div>-->
+                    <div class="layui-form-item">
+                        <label class="layui-form-label color-green font-w7">昵称</label>
+                        <div class="layui-input-block">
+                            <input name="" placeholder="" value="{$vo.nickname}" class="layui-input layui-bg-gray" disabled>
+                            <p class="help-block"></p>
+                        </div>
+                    </div>
+                    <div class="layui-form-item">
+                        <label class="layui-form-label color-green font-w7">用户姓名</label>
+                        <div class="layui-input-block">
+                            <input name="" placeholder="" value="{$vo.name}" class="layui-input layui-bg-gray" disabled>
+                            <p class="help-block"></p>
+                        </div>
+                    </div>
+                    <div class="layui-form-item">
+                        <label class="layui-form-label color-green font-w7">手机号码</label>
+                        <div class="layui-input-block">
+                            <input name="" placeholder="" value="{$vo.mobile}" class="layui-input layui-bg-gray" disabled>
+                            <p class="help-block"></p>
                         </div>
-                        <div class="layui-input-inline paramsItemvalue paramsItemvalue{$key}" {eq name='val.user_type' value='1'}style="display:none" {/eq}>
-                            <select class="layui-select select2" name="user_data[{$key}][userid]" id="c-userid-{$key}">
-                                <option value="">请选择员工</option>
+                    </div>
+                    <div class="layui-form-item">
+                        <label class="layui-form-label color-green font-w7">职位</label>
+                        <div class="layui-input-block">
+                            <input name="title" placeholder="请输入职位" value="{$vo.title}" class="layui-input">
+                            <p class="help-block"></p>
+                        </div>
+                    </div>
+                    <div class="layui-form-item">
+                        <label class="layui-form-label color-green font-w7">所在部门</label>
+                        <div class="layui-input-block">
+                            <input name="" placeholder="" value="{$vo.department_text}" class="layui-input layui-bg-gray" disabled>
+                            <p class="help-block"></p>
+                        </div>
+                    </div>
+                    <div class="layui-form-item">
+                        <label class="layui-form-label color-green font-w7">直属主管</label>
+                        <div class="layui-input-block">
+                            <select class="layui-select" name="manager_userid" id="manager_userid">
+                                <option value="">请选择</option>
                                 {foreach $user_list as $k=>$v}
-                                {eq name='val.userid' value='$v.userid.""'}
+                                {eq name='vo.manager_userid' value='$v.userid.""'}
                                 <option selected value="{$v.userid}">{$v.name}</option>
                                 {else}
                                 <option value="{$v.userid}">{$v.name}</option>
                                 {/eq}
                                 {/foreach}
                             </select>
-                        </div>
-                        <div class="layui-input-inline">
-                            <button type="button" class="layui-btn layui-btn-sm layui-btn-danger" onclick="delParams('{$key}');">删除</button>
+                            <p class="help-block"></p>
                         </div>
                     </div>
                 </div>
-                {/foreach}
+
             </div>
-            <div class="layui-form-item">
-                <label class="layui-form-label color-green font-w7"></label>
-                <div class="layui-input-block">
-                    <button type="button" class="layui-btn layui-btn-sm layui-btn-primary" onclick="addParams();">+ 添加审批层级</button>
+        </div>
+
+        {eq name='vo.signature_status' value='1'}
+        {else/}
+        <div class="layui-tab layui-tab-card think-bg-white">
+            <ul class="layui-tab-title notselect">
+                <li data-type="store-config-type-sms1">个人签名</li>
+            </ul>
+            <div class="layui-tab-content">
+
+                <div class="layui-card-body">
+                    <div class="layui-form-item">
+                        <label class="layui-form-label color-green font-w7">个人签名</label>
+                        <div class="layui-input-block">
+                            <img data-tips-image src="{$vo.signature}" style="height: 300px;vertical-align:top">
+                            <p class="help-block"></p>
+                        </div>
+                    </div>
+                    <div class="layui-form-item">
+                        <label class="layui-form-label color-green font-w7">签名状态</label>
+                        <div class="layui-input-block">
+                            {eq name='vo.signature_status' value='2'}
+                            <select class="layui-select" name="signature_status" id="signature_status">
+                                <option value="">请选择</option>
+                                <option value="3">审核通过</option>
+                                <option value="4">审核驳回</option>
+                            </select>
+                            {else/}
+                            <input name="" placeholder="" value="{$get_signature_status_list[$vo.signature_status]}" class="layui-input layui-bg-gray" disabled>
+                            {/eq}
+                            <p class="help-block"></p>
+                        </div>
+                    </div>
                 </div>
+
             </div>
         </div>
+        {/eq}
+
         <div class="hr-line-dashed"></div>
         <div class="layui-form-item text-center">
             <button class="layui-btn" type='submit'>保存数据</button>
@@ -102,96 +136,5 @@
 {/block}
 {block name="style"}{/block}
 {block name='script'}
-<script>
-
-    form.on('select(user_type)', function(data){
-        var str = data.elem.id;
-        var arr = str.split("-");
-        var key = arr[2];
-        console.log(arr);
-        if(data.value == 1){
-            $('.paramsItemvalue'+key).hide();
-        } else{
-            $('.paramsItemvalue'+key).show();
-        }
-    });
-
-    function addParams() {
-        var length = $('.paramsData').children().length;
-        var key = length;
-        var count = length+1;
-        var get_user_type_list_json = $.parseJSON($("#get_user_type_list_json").val());
-        var get_user_type_list_html = "";
-        var get_user_type_list_html2 = "";
-        var get_user_list_json = $.parseJSON($("#user_list_json").val());
-        var get_user_list_html = "";
-        var get_user_list_html2 = "";
-        $.each(get_user_type_list_json,function (index,element) {
-            get_user_type_list_html += '<option value='+index+'>'+element+'</option>';
-            if(index == 1){
-                get_user_type_list_html2 += '<dd lay-value='+index+' class="layui-this">'+element+'</dd>';
-            } else{
-                get_user_type_list_html2 += '<dd lay-value='+index+' class="">'+element+'</dd>';
-            }
-        })
-        $.each(get_user_list_json,function (index,element) {
-            get_user_list_html += '<option value='+element.userid+'>'+element.name+'</option>';
-            get_user_list_html2 += '<dd lay-value='+element.userid+' class="">'+element.name+'</dd>';
-        })
-        var html = '<div class="layui-form-item paramsItem'+key+'"> ' +
-            '<label class="layui-form-label">第'+count+'级：</label> ' +
-            '<div class="layui-input-block"> ' +
-            '<div class="layui-input-inline"> ' +
-            '<select class="layui-select select1" name="user_data['+key+'][user_type]" id="c-user_type-'+key+'" lay-filter="user_type">'+get_user_type_list_html+'</select> ' +
-            '<div class="layui-unselect layui-form-select">' +
-            '<div class="layui-select-title">' +
-            '<input type="text" placeholder="请选择" value="负责人主管" readonly="" class="layui-input layui-unselect">' +
-            '<i class="layui-edge"></i>' +
-            '</div> ' +
-            '<dl class="layui-anim layui-anim-upbit">'+get_user_type_list_html2+'</dl>' +
-            '</div>'+
-            '</div> ' +
-            '<div class="layui-input-inline paramsItemvalue paramsItemvalue'+key+'" style="display:none"> ' +
-            '<select class="layui-select select2" name="user_data['+key+'][userid]" id="c-userid-'+key+'"><option value="">请选择员工</option> ' +get_user_list_html+' </select> ' +
-            '<div class="layui-unselect layui-form-select">' +
-            '<div class="layui-select-title">' +
-            '<input type="text" placeholder="请选择员工" value="" readonly="" class="layui-input layui-unselect">' +
-            '<i class="layui-edge"></i>' +
-            '</div> ' +
-            '<dl class="layui-anim layui-anim-upbit">'+get_user_list_html2+'</dl>' +
-            '</div>'+
-            '</div> ' +
-            '<div class="layui-input-inline"> ' +
-            '<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" onclick="delParams('+key+');">删除</button> ' +
-            '</div> ' +
-            '</div> ' +
-            '</div>';
-        $(".paramsData").append(html);
-        form.render();
-    }
-    
-    function delParams(key) {
-        var length = $('.paramsData').children().length;
-        var count = length-1;
-        console.log(length);
-        if(key > 0 && key == count){
-            //删除的是最后一步(不是唯一一步)
-            $(".paramsItem" + key).remove();
-        } else{
-            //删除的是中间的一步，所有步骤序号重新排列
-            $(".paramsItem" + key).remove();
-            for(var i=key;i < length;i++){
-                var ii = i-1;
-                $(".paramsData .layui-form-item").eq(ii).attr("class","layui-form-item paramsItem"+ii);
-                $(".paramsData .layui-form-item").eq(ii).find(".layui-form-label").html("第"+i+"级：");
-                $(".paramsData .layui-form-item").eq(ii).find(".select1").attr("id","c-user_type-"+ii);
-                $(".paramsData .layui-form-item").eq(ii).find(".select1").attr('name',"user_data["+ii+"][user_type]");
-                $(".paramsData .layui-form-item").eq(ii).find(".select2").attr("id","c-userid-"+ii);
-                $(".paramsData .layui-form-item").eq(ii).find(".select2").attr('name',"user_data["+ii+"][userid]");
-                $(".paramsData .layui-form-item").eq(ii).find(".paramsItemvalue").attr("class","layui-input-inline paramsItemvalue paramsItemvalue"+ii);
-                $(".paramsData .layui-form-item").eq(ii).find(".layui-btn-danger").attr("onclick","delParams("+ii+");");
-            }
-        }
-    }
-</script>
+<script></script>
 {/block}

application/approve/view/approve_info/index_search_1.html

@@ -64,7 +64,6 @@
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
             <button type="button" data-export-list class="layui-btn layui-btn-primary layui-hide"><i class="layui-icon layui-icon-export"></i> 导 出</button>
-            <button type="button" class="layui-btn layui-btn-primary" data-reload >刷 新</button>
         </div>
     </form>
     <script>

application/approve/view/approve_info/index_search_10.html

@@ -55,7 +55,6 @@
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
             <button type="button" data-export-list class="layui-btn layui-btn-primary layui-hide"><i class="layui-icon layui-icon-export"></i> 导 出</button>
-            <button type="button" class="layui-btn layui-btn-primary" data-reload >刷 新</button>
         </div>
     </form>
     <script>

application/approve/view/approve_info/index_search_11.html

@@ -64,7 +64,6 @@
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
             <button type="button" data-export-list class="layui-btn layui-btn-primary layui-hide"><i class="layui-icon layui-icon-export"></i> 导 出</button>
-            <button type="button" class="layui-btn layui-btn-primary" data-reload >刷 新</button>
         </div>
     </form>
     <script>

application/approve/view/approve_info/index_search_2.html

@@ -79,7 +79,6 @@
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
             <button type="button" data-export-list class="layui-btn layui-btn-primary layui-hide"><i class="layui-icon layui-icon-export"></i> 导 出</button>
-            <button type="button" class="layui-btn layui-btn-primary" data-reload >刷 新</button>
         </div>
     </form>
     <script>

application/approve/view/approve_info/index_search_3.html

@@ -43,7 +43,6 @@
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
             <button type="button" data-export-list class="layui-btn layui-btn-primary layui-hide"><i class="layui-icon layui-icon-export"></i> 导 出</button>
-            <button type="button" class="layui-btn layui-btn-primary" data-reload >刷 新</button>
         </div>
     </form>
     <script>

application/approve/view/approve_info/index_search_4.html

@@ -49,7 +49,6 @@
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
             <button type="button" data-export-list class="layui-btn layui-btn-primary layui-hide"><i class="layui-icon layui-icon-export"></i> 导 出</button>
-            <button type="button" class="layui-btn layui-btn-primary" data-reload >刷 新</button>
         </div>
     </form>
     <script>

application/approve/view/approve_info/index_search_5.html

@@ -64,7 +64,6 @@
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
             <button type="button" data-export-list class="layui-btn layui-btn-primary layui-hide"><i class="layui-icon layui-icon-export"></i> 导 出</button>
-            <button type="button" class="layui-btn layui-btn-primary" data-reload >刷 新</button>
         </div>
     </form>
     <script>

application/approve/view/approve_info/index_search_6.html

@@ -64,7 +64,6 @@
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
             <button type="button" data-export-list class="layui-btn layui-btn-primary layui-hide"><i class="layui-icon layui-icon-export"></i> 导 出</button>
-            <button type="button" class="layui-btn layui-btn-primary" data-reload >刷 新</button>
         </div>
     </form>
     <script>

application/approve/view/approve_info/index_search_7.html

@@ -49,7 +49,6 @@
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
             <button type="button" data-export-list class="layui-btn layui-btn-primary layui-hide"><i class="layui-icon layui-icon-export"></i> 导 出</button>
-            <button type="button" class="layui-btn layui-btn-primary" data-reload >刷 新</button>
         </div>
     </form>
     <script>

application/approve/view/approve_info/index_search_8.html

@@ -64,7 +64,6 @@
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
             <button type="button" data-export-list class="layui-btn layui-btn-primary layui-hide"><i class="layui-icon layui-icon-export"></i> 导 出</button>
-            <button type="button" class="layui-btn layui-btn-primary" data-reload >刷 新</button>
         </div>
     </form>
     <script>

application/approve/view/approve_info/index_search_9.html

@@ -64,7 +64,6 @@
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
             <button type="button" data-export-list class="layui-btn layui-btn-primary layui-hide"><i class="layui-icon layui-icon-export"></i> 导 出</button>
-            <button type="button" class="layui-btn layui-btn-primary" data-reload >刷 新</button>
         </div>
     </form>
     <script>

application/approve/view/goods_category/form.html

@@ -0,0 +1,72 @@
+{extend name='admin@main'}
+
+{block name="button"}{/block}
+
+{block name="content"}
+<div class="think-box-shadow">
+    <form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
+        <div class="layui-card-body">
+            {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
+
+            {notempty name='vo.id'}
+            <div class="layui-form-item">
+                <label class="layui-form-label color-green font-w7">上级分类</label>
+                <div class="layui-input-block">
+                    <select class="layui-select" name="pid" required>
+                        <option value="">请选择</option>
+                        {foreach $cate_list as $k=>$v}
+                        {eq name='vo.pid' value='$v.id.""'}
+                        <option selected value="{$v.id}">{$v.name}</option>
+                        {else}
+                        <option value="{$v.id}">{$v.name}</option>
+                        {/eq}
+                        {/foreach}
+                    </select>
+                    <p class="help-block"></p>
+                </div>
+            </div>
+            {else/}
+            <div class="layui-form-item">
+                <label class="layui-form-label color-green font-w7">上级分类</label>
+                <div class="layui-input-block">
+                    <select class="layui-select" name="pid" required>
+                        {foreach $cate_list as $k=>$v}
+                        <option value="{$v.id}">{$v.name}</option>
+                        {/foreach}
+                    </select>
+                    <p class="help-block"></p>
+                </div>
+            </div>
+            {/notempty}
+
+            <div class="layui-form-item">
+                <label class="layui-form-label color-green font-w7">名称</label>
+                <div class="layui-input-block">
+                    <input type="text" name="name" placeholder="请输入名称" value="{$vo.name|default=''}" class="layui-input" required>
+                    <p class="help-block"></p>
+                </div>
+            </div>
+            <div class="layui-form-item">
+                <label class="layui-form-label color-green font-w7">权重</label>
+                <div class="layui-input-block">
+                    <input type="number" name="sort" placeholder="请输入数字" value="{$vo.sort|default='10'}"
+                           class="layui-input" min="0" required>
+                    <p class="help-block"></p>
+                </div>
+            </div>
+        </div>
+        <div class="hr-line-dashed"></div>
+        <div class="layui-form-item text-center">
+            <button class="layui-btn" type='submit'>保存数据</button>
+            <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>
+        </div>
+    </form>
+<script>
+    window.form.render();
+</script>
+</div>
+{/block}
+{block name="style"}{/block}
+{block name='script'}
+<script></script>
+{/block}

application/approve/view/goods_category/index.html

@@ -0,0 +1,58 @@
+{extend name='admin@main'}
+
+{block name="button"}
+
+{if auth("add")}
+<button class='layui-btn layui-btn-sm layui-btn-primary' data-modal='{:url("add")}'>添 加</button>
+{/if}
+
+{if auth("remove")}
+<button class="layui-btn layui-btn-sm layui-btn-primary" data-confirm="确定要删除吗？" data-action="{:url('remove')}" data-rule="id#{key}" data-csrf="{:systoken('remove')}">删 除</button>
+{/if}
+
+{/block}
+
+{block name="content"}
+<div class="think-box-shadow">
+    {include file='goods_category/index_search'}
+    <table class="layui-table margin-top-10" lay-skin="line">
+        {notempty name='list'}
+        <thead>
+        <tr>
+            <th class='list-table-check-td think-checkbox'>
+                <input data-auto-none data-check-target='.list-check-box' type='checkbox'>
+            </th>
+            <th class='text-left nowrap'>名称</th>
+            <th class='text-left nowrap'>权重</th>
+            <th class="text-left nowrap">操作</th>
+        </tr>
+        </thead>
+        {/notempty}
+        <tbody>
+        {foreach $list as $key=>$vo}
+        <tr>
+            <td class='list-table-check-td think-checkbox'>
+                <input class="list-check-box" value='{$vo.id}' type='checkbox'>
+            </td>
+            <td class="text-left nowrap"><span class="color-desc">{$vo.spl|raw}</span>{$vo.name|default='--'}</td>
+            <td class='list-table-sort-td'>
+                <input data-action-blur="{:request()->url()}" data-value="id#{$vo.id};action#sort;sort#{value}" data-loading="false" value="{$vo.sort}" class="list-sort-input">
+            </td>
+            <td class='text-left nowrap'>
+
+                {if auth("edit")}
+                <a class="layui-btn layui-btn-xs" data-modal="{:url('edit')}?id={$vo.id}">编 辑</a>
+                {/if}
+
+                {if auth("remove")}
+                <a class="layui-btn layui-btn-xs layui-btn-danger" data-confirm="确定要删除该用户吗？" data-action="{:url('remove')}" data-value="id#{$vo.id}" data-csrf="{:systoken('remove')}">删 除</a>
+                {/if}
+
+            </td>
+        </tr>
+        {/foreach}
+        </tbody>
+    </table>
+    {empty name='list'}<span class="notdata">没 有 记 录 哦！</span>{else}{$pagehtml|raw|default=''}{/empty}
+</div>
+{/block}

application/common/service/ApproveInfoService.php

@@ -433,7 +433,7 @@ class ApproveInfoService
 
         // 批量导入
         if ($category_first_data) {
-            $category_first_list = GoodsCategoryService::get_list([['name', 'in', array_keys($category_first_data)]]);
+            $category_first_list = GoodsCategoryService::get_list([['name', 'in', array_keys($category_first_data)]],1);
             $category_first_object = $category_first_list ? array_column($category_first_list->toArray(), null, 'name') : [];
             foreach ($category_first_data as $key => $value) {
                 if (array_key_exists($key, $category_first_object)) {

application/common/service/GoodsCategoryService.php

@@ -15,23 +15,24 @@ class GoodsCategoryService
      * 商品分类列表
      *
      * @param array $where
+     * @param integer $child 0=一级,1=二级
      **/
-    public static function get_list($where = [])
+    public static function get_list($where = [], $child = 0)
     {
 
-        $field = 'id,pid,name';
-        $list = GoodsCategory::field($field)
+        $list = GoodsCategory::field('is_deleted,create_at', true)
             ->where('is_deleted', CommonConstant::IS_DELETED_0)
             ->where('pid', 0)
-            ->where($where)
-            ->with([
-                'childlist' => function ($query) use ($field) {
-                    $query->field($field);
+            ->where($where);
+        if ($child == 1) {
+            $list->with([
+                'childlist' => function ($query) {
+                    $query->field('is_deleted,create_at', true);
                 }
-            ])
-            ->order('weigh desc,id asc')
+            ]);
+        }
+        $list = $list->order('sort desc,id asc')
             ->select();
         return $list;
     }
-
 }