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

Junjie

2023-09-14 2a8710c50e2f7c4dd0e333dcf650a2dff960fff4

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

@@ -32,7 +32,7 @@
                                <option value="2">报价流程</option>
                                <option value="3">报销流程</option>
<!--                                <option value="4">出差流程</option>-->
<!--                                <option value="5">合同审批</option>-->
                                <option value="7">合同管理</option>
                            </select>
                        </div>
                    </div>
@@ -158,34 +158,35 @@
<!--                        <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">1-1</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 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="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="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">