diff --git a/WebContent/Tenwa/Comm/DocList/DocListInfo.jsp b/WebContent/Tenwa/Comm/DocList/DocListInfo.jsp
index 019ffd7fa..a9e43411e 100644
--- a/WebContent/Tenwa/Comm/DocList/DocListInfo.jsp
+++ b/WebContent/Tenwa/Comm/DocList/DocListInfo.jsp
@@ -44,7 +44,6 @@
var o = document.forms["myiframe0"];
var sFileName = o.FILE2.value;
var nameArr = sFileName.split("\\");
-
setItemValue(0,0,"FileName",encodeURI(nameArr[nameArr.length-1]));
$("#FILENAMEX").val(encodeURI(nameArr[nameArr.length-1]));
o.REMARK2.value= encodeURI(getItemValue(0,0,"REMARK"));
@@ -77,7 +76,15 @@
return o.submit();
}
function CheckStr(filename){
- var s="jpg,jpeg,png,bmp,gif,pdf,doc,docx,xls,xlsx";
+ var s="";
+ var fileName =getItemValue(0,0,"DOC_NAME");
+ if("车辆视频"==fileName){
+ s="mp4,mov,m4v,avi,3gp,rm,rmvb,wmv,asf,mkv,vob";
+ }else if("其他"==fileName){
+ s="mp4,mov,m4v,avi,3gp,rm,rmvb,wmv,asf,mkv,vob,jpg,jpeg,png,bmp,gif,pdf,doc,docx,xls,xlsx";
+ }else{
+ s="jpg,jpeg,png,bmp,gif,pdf,doc,docx,xls,xlsx";
+ }
var flag="false";
var s2=s.split(",");
var filenamelast = filename.lastIndexOf(".");
diff --git a/WebContent/Tenwa/Comm/DocList/PayDocList.jsp b/WebContent/Tenwa/Comm/DocList/PayDocList.jsp
index 1bd50b353..a05f4a991 100644
--- a/WebContent/Tenwa/Comm/DocList/PayDocList.jsp
+++ b/WebContent/Tenwa/Comm/DocList/PayDocList.jsp
@@ -115,6 +115,7 @@ function selectFile(){
}
function saveRecord(){
as_save("myiframe0","heping()");
+ location.reload();
}
//在加载完表格后调用
function afterSearch(){
diff --git a/WebContent/Tenwa/Lease/Flow/FileManager/fileList/fileList.jsp b/WebContent/Tenwa/Lease/Flow/FileManager/fileList/fileList.jsp
new file mode 100644
index 000000000..7ae735a6e
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/FileManager/fileList/fileList.jsp
@@ -0,0 +1,38 @@
+<%@page import="jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
+ /*
+ Author: undefined 2018-07-16
+ Content:
+ History Log:
+ */
+ ASObjectModel doTemp = new ASObjectModel("FileList");
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+ dwTemp.Style="1"; //--设置为Grid风格--
+// dwTemp.ReadOnly = "1"; //只读模式
+ dwTemp.setPageSize(10);
+ dwTemp.genHTMLObjectWindow("");
+
+ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
+ String sButtons[][] = {
+ {"true","All","Button","新增","新增一条记录","newRecord()","","","","btn_icon_add"},
+ {"true","All","Button","修改","查看/修改详情","viewAndEdit()","","","","btn_icon_edit"},
+ {"true","","Button","详情","查看/修改详情","view()","","","","btn_icon_detail"},
+ };
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/src_tenwa/com/tenwa/lease/flow/contract/contractapproval/ContractTemplateCache.java b/src_tenwa/com/tenwa/lease/flow/contract/contractapproval/ContractTemplateCache.java
index 61eb62d78..2a45570e2 100644
--- a/src_tenwa/com/tenwa/lease/flow/contract/contractapproval/ContractTemplateCache.java
+++ b/src_tenwa/com/tenwa/lease/flow/contract/contractapproval/ContractTemplateCache.java
@@ -5,6 +5,7 @@ import java.util.List;
import java.util.Map;
import com.amarsoft.app.util.StringUtil;
+import com.amarsoft.are.jbo.JBOException;
import com.amarsoft.are.jbo.JBOFactory;
import com.amarsoft.are.jbo.JBOTransaction;
import com.tenwa.comm.util.jboutil.DataOperatorUtil;
@@ -117,4 +118,21 @@ public static String getLibrariId(String id) throws Exception{
return library_id;
}
+ public static String getdelectStatus(String id) throws Exception{
+ String sql = "select DELETEED from LB_DOCATTRIBUTE where id=:id";
+ Map map=new HashMap();
+ map.put("id", id);
+ JBOTransaction tx = null;
+ String DELETEED="";
+ tx=JBOFactory.createJBOTransaction();
+ List