From 1a57bc63d1387f6c2da0f6a7fd0731c2756df23a Mon Sep 17 00:00:00 2001
From: xinyb_ <xin0322>
Date: 星期六, 13 三月 2021 14:03:05 +0800
Subject: [PATCH] 完善新的OA审核界面
---
WebRoot/general/approval.jsp | 14 +++++++-------
src/com/yc/service/panel/PanelManageImpl.java | 41 ++++++++++++++++++++++++++---------------
2 files changed, 33 insertions(+), 22 deletions(-)
diff --git a/WebRoot/general/approval.jsp b/WebRoot/general/approval.jsp
index c711a24..828136a 100644
--- a/WebRoot/general/approval.jsp
+++ b/WebRoot/general/approval.jsp
@@ -89,12 +89,12 @@
}
%>
</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>
+<%-- <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>--%>
<div class="layui-form-item yc-padding">
<label class="layui-form-label text-left">鎶勯��</label>
<div class="layui-input-block">
@@ -210,7 +210,7 @@
}else{//涓嶉殣钘忔椂鍊欒祴鍊�
window.parent.$("#"+user).val(value).trigger('change');
}
- window.parent.$("#"+id).val($("#"+id).val());
+ // window.parent.$("#"+id).val($("#"+id).val());
}
</script>
</body>
diff --git a/src/com/yc/service/panel/PanelManageImpl.java b/src/com/yc/service/panel/PanelManageImpl.java
index 5eac527..14162e4 100644
--- a/src/com/yc/service/panel/PanelManageImpl.java
+++ b/src/com/yc/service/panel/PanelManageImpl.java
@@ -621,7 +621,7 @@
parMap.put("click",
"getccusercodes('"+id+"','" + ccusercodes + "');window.parent.setOa('" + par + "');" + onclick);
parMap.put("butname", DBHelper.getValue(buttonMap, "ButtonName"));
- parMap.put("iocn", getIocnText(DBHelper.getValueInt(buttonMap, "docitem")));
+ parMap.put("iocn", getIocnText(DBHelper.getValue(buttonMap, "ButtonName")));
parMap.put("id", DBHelper.getValueInt(buttonMap, "buttonID"));
but.add(parMap);
}
@@ -671,27 +671,38 @@
* @param docitem
* @return
*/
- private String getIocnText(int docitem) {
+ private String getIocnText(String docitem) {
String iocn = "";
- switch (docitem) {
- case 10:
+ if(docitem.contains("閫氳繃")){
iocn="icon-tongguo";//閫氳繃
- break;
- case 20:
+ }else if(docitem.contains("椹冲洖")){
iocn="icon-bohui";//椹冲洖
- break;
- case 30:
+ }else if(docitem.contains("椹冲洖涓�")){
iocn="icon-bohuidao";//椹冲洖涓婁竴绾�
- break;
- case 40:
+ }else if(docitem.contains("鎾ら攢")){
iocn="icon-chexiao";//鎾ら攢
- break;
- case 50:
+ }else if(docitem.contains("淇濆瓨")){
iocn="icon-baocun";//淇濆瓨
- break;
- default:
- break;
}
+// switch (docitem) {
+// case 10:
+// iocn="icon-tongguo";//閫氳繃
+// break;
+// case 20:
+// iocn="icon-bohui";//椹冲洖
+// break;
+// case 30:
+// iocn="icon-bohuidao";//椹冲洖涓婁竴绾�
+// break;
+// case 40:
+// iocn="icon-chexiao";//鎾ら攢
+// break;
+// case 50:
+// iocn="icon-baocun";//淇濆瓨
+// break;
+// default:
+// break;
+// }
return iocn;
}
}
--
Gitblit v1.8.0