调整审核界面的意见录入添加权限控制

xinyb_

2021-06-21 10e9972ca6cd6d55d1a5564c9d1f613112a7cd5a

调整审核界面的意见录入添加权限控制

 WebRoot/general/approval.jsp

@@ -99,12 +99,14 @@
                            }
                                  %>                         
                            </div>
<%--                             <div class="layui-form-item yc-padding">--%>
<%--                                 <label class="layui-form-label text-left">备注</label>--%>
<%--                                 <div class="layui-input-block">--%>
<%--                                     <input type="text" id="<%=but.get(1) %>" name="<%=but.get(1) %>" placeholder="备注信息" class="layui-input">--%>
<%--                                 </div>--%>
<%--                             </div>--%>
                             <%if((Integer) but.get(5)==1){%>
                             <div class="layui-form-item yc-padding">
                                 <label class="layui-form-label text-left">意见录入</label>
                                 <div class="layui-input-block">
                                     <input type="text" id="<%=but.get(1) %>" name="<%=but.get(1) %>" placeholder="意见录入" class="layui-input">
                                 </div>
                             </div>
                             <%}%>
                             <%
                              if(Integer.parseInt(but.get(3).toString())==1){
                             %>

 WebRoot/style/icons/oash.ico

Binary files differ

 src/com/yc/service/panel/PanelManageImpl.java

@@ -563,7 +563,7 @@
                List<Map<String, Object>> listbut = sqlDBHelperIfc.getHashMapObj(sql);
                if (listbut != null && listbut.size() > 0) {
                    // 组装
                    lMap = getButList(oList, listbut.get(0), listInfo.get(0), request);
                    lMap = getButList(oList, listbut.get(0), listInfo.get(0), request,DBHelper.getValueInt(sysMap, "isshowmemowhenapprovals"));
                }
                return lMap;
            } else {
@@ -583,7 +583,7 @@
     * @return
     */
    private List<Object> getButList(List<List<Map<String, Object>>> oList,Map<String, Object> mapbut, Map<String, Object> mapInfo,
            HttpServletRequest request) throws SQLException {
            HttpServletRequest request,Integer isshowmemowhenapprovals) throws SQLException {
        try {
            String userCode = (String) request.getSession().getAttribute(SessionKey.USERCODE);
            List<Object> buttons = new ArrayList<>();
@@ -694,6 +694,7 @@
                }
                if (clickList != null && clickList.size() > 0) {
                    clickList.add(but);
                    clickList.add(isshowmemowhenapprovals);//审核时显示意见录入框
                    oaButList.add(clickList);
                }
                if (date != null && date.size() > 0) {

 src/com/yc/service/panel/SystemSettingsImpl.java

@@ -228,7 +228,8 @@

    @Override
    public Map<String, Object> getFormIdInTable(int formId) {
    String sql = "select hdtable,dttable,formname from  gform where formid=?";
        //这里加多一个isShowMemoWhenApprovals字段（审核时显示意见录入框），添加人xin 2021-6-21 15:00:38
    String sql = "select hdtable,dttable,formname,isshowmemowhenapprovals from  gform where formid=?";
    return jdbcTemplate.queryForMap(sql, new Object[] { formId });
    }