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

Junjie

2023-11-08 7f9d058a0e632be6a3daf6f46d26b69742db0720

 src/main/webapp/views/processPermissions/processPermissions.html

@@ -18,9 +18,54 @@
            <div class="layui-form toolbar" id="search-box">
                <div class="layui-form-item">
                    <div class="layui-inline">
                        <label class="layui-form-label">编号:</label>
                        <label class="layui-form-label">姓名:</label>
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="id" placeholder="编号" autocomplete="off">
                            <input class="layui-input" type="text" name="user_name" placeholder="姓名" autocomplete="off">
                        </div>
                    </div>
<!--                    <div class="layui-inline">-->
<!--                        <label class="layui-form-label">权限类型: </label>-->
<!--                        <div class="layui-input-inline cool-auto-complete">-->
<!--                            <input id="process_memo" class="layui-input" name="process_memo" type="text" placeholder="请选择权限类型" autocomplete="off" style="display: none" >-->
<!--                            <input id="processMemo1$" name="process_memo" 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="processPermissionsProcessMemoQueryBywrkSts" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
<!--                                <select class="cool-auto-complete-window-select" data-key="processPermissionsProcessMemoQueryBywrkStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
<!--                                </select>-->
<!--                            </div>-->
<!--                        </div>-->
<!--                    </div>-->
                    <div class="layui-inline">
                        <label class="layui-form-label">权限类型: </label>
                        <div class="layui-input-block">
                            <select name="process_memo">
                                <option value="">请选择状态</option>
                                <option value="1">规划流程</option>
                                <option value="2">报价流程</option>
                                <option value="3">报销流程</option>
                                <option value="4">集成核价流程</option>
                                <option value="5">货架核价流程</option>
                                <option value="7">合同管理</option>
                                <option value="101">其它规划员</option>
                            </select>
                        </div>
                    </div>
                    <div class="layui-inline">
                        <label class="layui-form-label">权限节点: </label>
                        <div class="layui-input-block">
                            <select name="process">
                                <option value="">请选择状态</option>
                                <option value="1-1">1-1</option>
                                <option value="1-2">1-2</option>
                                <option value="2-1">2-1</option>
                                <option value="2-2">2-2</option>
                                <option value="3-1">3-1</option>
                                <option value="3-2">3-2</option>
                                <option value="4-1">4-1</option>
                                <option value="5-1">5-1</option>
                                <option value="6-1">6-1</option>
<!--                                <option value="7-1">7-1</option>-->
                            </select>
                        </div>
                    </div>
                    <div class="layui-inline">&emsp;
@@ -40,15 +85,15 @@

<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button>
        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">删除</button>
        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">导出</button>
<!--        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button>-->
<!--        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">删除</button>-->
<!--        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">导出</button>-->
    </div>
</script>

<script type="text/html" id="operate">
    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">修改</a>
    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</a>
<!--    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</a>-->
</script>

<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
@@ -64,7 +109,7 @@
        <div class="layui-row">
            <div class="layui-col-md12">
                <div class="layui-form-item">
                    <label class="layui-form-label">员工姓名: </label>
                    <label class="layui-form-label layui-form-required">员工姓名: </label>
                    <div class="layui-input-inline cool-auto-complete">
                        <input id="userName" class="layui-input" name="userName" type="text" placeholder="请选择员工" autocomplete="off" style="display: none"  lay-verify="required">
                        <input id="userName$" name="userName" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="员工姓名" onfocus=this.blur()>
@@ -129,33 +174,49 @@
<!--                        <input class="layui-input" name="standby6" placeholder="请输入备用字段6">-->
<!--                    </div>-->
<!--                </div>-->
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">权限类型: </label>
                    <div class="layui-input-block">
                        <select name="processMemo" lay-vertype="tips" lay-verify="required">
                            <option value="">请选择状态</option>
                            <option value="1">核价流程</option>
                            <option value="2">报价流程</option>
                            <option value="3">报销流程</option>
                            <option value="4">出差流程</option>
                        </select>
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">权限节点: </label>
                    <div class="layui-input-block">
                        <select name="process" lay-vertype="tips" lay-verify="required">
                            <option value="">请选择状态</option>
                            <option value="1">1</option>
                            <option value="2">2</option>
                            <option value="3">3</option>
                            <option value="4">4</option>
                            <option value="5">5</option>
                            <option value="6">6</option>
                            <option value="7">7</option>
                        </select>
                    </div>
                </div>
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label">权限类型: </label>-->
<!--                    <div class="layui-input-inline cool-auto-complete">-->
<!--                        <input class="layui-input" name="processMemo" type="text" placeholder="请选择权限类型" autocomplete="off" style="display: none"  lay-verify="required">-->
<!--                        <input name="processMemo" 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="processPermissionsProcessMemoQueryBywrkSts" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
<!--                            <select class="cool-auto-complete-window-select" data-key="processPermissionsProcessMemoQueryBywrkStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
<!--                            </select>-->
<!--                        </div>-->
<!--                    </div>-->
<!--                </div>-->
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label layui-form-required">权限类型: </label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <select name="processMemo" lay-vertype="tips" lay-verify="required">-->
<!--                            <option value="">请选择状态</option>-->
<!--                            <option value="1">核价流程</option>-->
<!--                            <option value="2">报价流程</option>-->
<!--                            <option value="3">报销流程</option>-->
<!--                            <option value="4">出差流程</option>-->
<!--                            <option value="5">核价流程</option>-->
<!--                            <option value="7">合同管理</option>-->
<!--                        </select>-->
<!--                    </div>-->
<!--                </div>-->
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label layui-form-required">权限节点: </label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <select name="process" lay-vertype="tips" lay-verify="required">-->
<!--                            <option value="">请选择状态</option>-->
<!--                            <option value="1-1">1-1</option>-->
<!--                            <option value="1-2">1-2</option>-->
<!--                            <option value="2-1">2-1</option>-->
<!--                            <option value="3-1">3-1</option>-->
<!--                            <option value="3-2">3-2</option>-->
<!--                            <option value="4-1">4-1</option>-->
<!--                            <option value="5-1">5-1</option>-->
<!--                            <option value="6-1">6-1</option>-->
<!--                            <option value="7-1">7-1</option>-->
<!--                        </select>-->
<!--                    </div>-->
<!--                </div>-->
                <div class="layui-form-item">
                    <label class="layui-form-label">备注: </label>
                    <div class="layui-input-block">