报销申请分页总数异常 和 添加管理员修改

src/main/resources/mappings/modules/workreimbursement/WorkReimbursementDao.xml

@@ -196,6 +196,9 @@
 			<if test="id != null and id != ''">
 				AND a.id = #{id}
 			</if>
+			<if test="number != null and number != ''">
+				AND a.number like concat('%',#{number},'%')
+			</if>
 			<if test="reimbursementType != null and reimbursementType != ''">
 				AND a.reimbursement_type = #{reimbursementType}
 			</if>

src/main/webapp/webpage/modules/workreimbursement/workReimbursementList.jsp

@@ -319,7 +319,7 @@
     ]
 
     var bottomView = [
-        {align:'center', title: '操作', width:130, templet:function(d){
+        {align:'center', title: '操作', width:150, templet:function(d){
                 var xml = "<div class=\"layui-btn-group\">";
                 if (d.notifyFlag != undefined && d.notifyFlag !=null && d.notifyFlag == 1) {
                     xml += "<a href=\"#\" onclick=\"notifyDialogre('报销审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=reimbursement&pageFlag=all','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" >审批</a>";
@@ -348,9 +348,13 @@
                 if (d.candelete != undefined && d.candelete == "1") {
                     xml += "<a href=\"${ctx}/workreimbursement/workReimbursement/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该报销单吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\">删除</a>";
                 }
-                if (<%=admin%> && d.status == "5") {
+                if (<%=admin%>) {
                     xml += "<a href=\"javascript:void(0)\" onclick=\"openDialogreAdminModify('管理员修改报销单', '${ctx}/workReimbursementNew/workReimbursementNew/form?id="+ d.id + "','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" >修改</a>";
                 }
+
+                <%--if (<%=admin%> && d.status == "5") {--%>
+                <%--    xml += "<a href=\"javascript:void(0)\" onclick=\"openDialogreAdminModify('管理员修改报销单', '${ctx}/workReimbursementNew/workReimbursementNew/form?id="+ d.id + "','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" >修改</a>";--%>
+                <%--}--%>
                 xml += "</div>";
                 return xml;
             }}