Merge remote-tracking branch 'origin/bfasrs' into bfasrs

LSH

2022-10-31 ea77ba7aab1402fea6e68c9be172bf43a007d675

 src/main/webapp/views/permission/permission_detail.html

@@ -33,28 +33,28 @@
                <input id="action" class="layui-input" type="text" placeholder="接口地址" lay-verify="required" >
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">所属菜单：</label>
            <div class="layui-input-inline cool-auto-complete">
                <input id="resourceId" class="layui-input" type="text" placeholder="所属菜单" style="display: none">
                <input id="resourceName" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="所属菜单" onfocus=this.blur()>
                <div class="cool-auto-complete-window">
                    <input class="cool-auto-complete-window-input" data-key="resourceQuery" onkeyup="autoLoad(this.getAttribute('data-key'))">
                    <select class="cool-auto-complete-window-select" data-key="resourceQuerySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                    </select>
                </div>
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label"><span class="not-null">*</span>状　　态：</label>
            <div class="layui-input-inline">
                <select id="status" lay-verify="required">
                    <option value="" style="display: none"></option>
                    <option value="1">正常</option>
                    <option value="0">禁用</option>
                </select>
            </div>
        </div>
<!--        <div class="layui-inline"  style="width:31%;">-->
<!--            <label class="layui-form-label">所属菜单：</label>-->
<!--            <div class="layui-input-inline cool-auto-complete">-->
<!--                <input id="resourceId" class="layui-input" type="text" placeholder="所属菜单" style="display: none">-->
<!--                <input id="resourceName" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="所属菜单" onfocus=this.blur()>-->
<!--                <div class="cool-auto-complete-window">-->
<!--                    <input class="cool-auto-complete-window-input" data-key="resourceQuery" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
<!--                    <select class="cool-auto-complete-window-select" data-key="resourceQuerySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
<!--                    </select>-->
<!--                </div>-->
<!--            </div>-->
<!--        </div>-->
<!--        <div class="layui-inline"  style="width:31%;">-->
<!--            <label class="layui-form-label"><span class="not-null">*</span>状　　态：</label>-->
<!--            <div class="layui-input-inline">-->
<!--                <select id="status" lay-verify="required">-->
<!--                    <option value="" style="display: none"></option>-->
<!--                    <option value="1">正常</option>-->
<!--                    <option value="0">禁用</option>-->
<!--                </select>-->
<!--            </div>-->
<!--        </div>-->


        <hr class="layui-bg-gray">