diff --git a/WebContent/AppConfig/AppFlow/AppFlowCatalogList.jsp b/WebContent/AppConfig/AppFlow/AppFlowCatalogList.jsp
deleted file mode 100644
index 04bcae831..000000000
--- a/WebContent/AppConfig/AppFlow/AppFlowCatalogList.jsp
+++ /dev/null
@@ -1,56 +0,0 @@
- <%@ page contentType="text/html; charset=GBK"%><%@
- include file="/Frame/resources/include/include_begin_list.jspf"%><%
- ASObjectModel doTemp = new ASObjectModel("APP_FLOW_LIST");
- doTemp.setLockCount(2); //锁定两列
- ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
-
- dwTemp.Style="1"; //设置为Grid风格
- dwTemp.ReadOnly = "1";//编辑模式
- dwTemp.setPageSize(10);
- dwTemp.ConvertCode2Title = "1";
- dwTemp.genHTMLObjectWindow("");
-
- String sButtons[][] = {
- {"true","","Button","导入新流程","导入新流程","importNewFlow()","","","","btn_icon_add"},
- {"true","","Button","取消流程","取消流程","delFlow()","","","","btn_icon_delete"},
- {"true","","Button","流程配置","流程配置","configureFlow()","","","","btn_icon_workflow"},
- };
-%>
-<%@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/WebContent/AppConfig/AppFlow/CatalogInfo.jsp b/WebContent/AppConfig/AppFlow/CatalogInfo.jsp
deleted file mode 100644
index 46759e044..000000000
--- a/WebContent/AppConfig/AppFlow/CatalogInfo.jsp
+++ /dev/null
@@ -1,50 +0,0 @@
-<%@ page contentType="text/html; charset=GBK"%><%@
- include file="/Frame/resources/include/include_begin_info.jspf"%><%
- //获得参数
- String flowNo = CurPage.getParameter("flowNo");
- String phaseNo = CurPage.getParameter("phaseNo");
- if (flowNo == null) flowNo = "";
- if (phaseNo == null) phaseNo = "";
-
- String id = CurPage.getParameter("id");
- if (id == null) id = "";
-
- String sUserID = CurPage.getParameter("UserID");
- if (sUserID == null) sUserID = "";
-
- java.util.Date dateNow = new java.util.Date();
- SimpleDateFormat sdfTemp = new SimpleDateFormat("yyyy/MM/dd");
- String date = sdfTemp.format(dateNow);
-
- ASObjectModel doTemp = new ASObjectModel("APP_PRD_CATALOG_INFO");
-
- doTemp.setDefaultValue("FLOWNO", flowNo);
- doTemp.setReadOnly("FLOWNO", true);
-
- if (!"".equals(phaseNo)) {
- doTemp.setReadOnly("PHASENO", true);
- } else {
- doTemp.setReadOnly("PHASENO", false);
- }
-
- ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
- dwTemp.Style = "2"; //设置DW风格 1:Grid 2:Freeform
- dwTemp.ReadOnly = "0"; //设置是否只读 1:只读 0:可写
- dwTemp.genHTMLObjectWindow(id);
-
- String sButtons[][] = {
- {"true", "All", "Button", "保存","保存所有修改", "saveRecord()", "", "", "", "btn_icon_save"},
- {"true", "All", "Button", "关闭","关闭", "goBack()", "", "", "", "btn_icon_close"},
- };
- %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
-
-<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/AppConfig/AppFlow/CatalogList.jsp b/WebContent/AppConfig/AppFlow/CatalogList.jsp
deleted file mode 100644
index 9b81e6d41..000000000
--- a/WebContent/AppConfig/AppFlow/CatalogList.jsp
+++ /dev/null
@@ -1,63 +0,0 @@
- <%@ page contentType="text/html; charset=GBK"%><%@
- include file="/Frame/resources/include/include_begin_list.jspf"%><%
- String flowNo = CurPage.getParameter("flowNo");
- if (null == flowNo) flowNo = "";
- ASObjectModel doTemp = new ASObjectModel("APP_PRD_CATALOG_LIST");
- doTemp.setLockCount(2); //锁定两列
- ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
-
- dwTemp.Style="1"; //设置为Grid风格
- dwTemp.ReadOnly = "1";//编辑模式
- dwTemp.setPageSize(10);
- dwTemp.ConvertCode2Title = "1";
- dwTemp.genHTMLObjectWindow(flowNo);
-
- String sButtons[][] = {
- {"true","","Button","新增阶段","新增阶段","newRecord()","","","","btn_icon_add"},
- {"true","","Button","取消阶段","取消阶段",
- "if(confirm('确实要删除吗?'))as_delete(0,'')","","","","btn_icon_delete"},
- {"true","","Button","编辑阶段","编辑阶段","viewAndEdit()","","","","btn_icon_edit"},
- {"true","","Button","页签配置","页签配置","middleConfig()","","","","btn_icon_workflow"},
- };
-%><%@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/WebContent/AppConfig/AppFlow/MiddleInfo.jsp b/WebContent/AppConfig/AppFlow/MiddleInfo.jsp
deleted file mode 100644
index a73af8036..000000000
--- a/WebContent/AppConfig/AppFlow/MiddleInfo.jsp
+++ /dev/null
@@ -1,39 +0,0 @@
- <%@ page contentType="text/html; charset=GBK"%><%@
- include file="/Frame/resources/include/include_begin_info.jspf"%><%
- //获得参数
- String catalogId = CurPage.getParameter("catalogId");
- String libraryId = CurPage.getParameter("libraryId");
- if (catalogId == null) catalogId = "";
- if (libraryId == null) libraryId = "";
-
- String sUserID = CurPage.getParameter("UserID");
- if (sUserID == null) sUserID = "";
-
- java.util.Date dateNow = new java.util.Date();
- SimpleDateFormat sdfTemp = new SimpleDateFormat("yyyy/MM/dd");
- String date = sdfTemp.format(dateNow);
-
- ASObjectModel doTemp = new ASObjectModel("APP_MIDDLE_INFO");
- if (!"".equals(catalogId)) doTemp.setDefaultValue("APP_NODE_CATALOG_ID", catalogId);
- if (!"".equals(libraryId)) doTemp.setDefaultValue("APP_NODE_LIBRARY_ID", libraryId);
-
- ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
- dwTemp.Style = "2"; //设置DW风格 1:Grid 2:Freeform
- dwTemp.ReadOnly = "0"; //设置是否只读 1:只读 0:可写
- dwTemp.genHTMLObjectWindow(catalogId+","+libraryId);
-
- String sButtons[][] = {
- {"true", "All", "Button", "保存","保存所有修改", "saveRecord()", "", "", "", "btn_icon_save"}
- };
-%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
-
-<%@ include file="/Frame/resources/include/include_end.jspf"%>
diff --git a/WebContent/AppConfig/AppFlow/MiddleList.jsp b/WebContent/AppConfig/AppFlow/MiddleList.jsp
deleted file mode 100644
index 607aa6e06..000000000
--- a/WebContent/AppConfig/AppFlow/MiddleList.jsp
+++ /dev/null
@@ -1,68 +0,0 @@
- <%@ page contentType="text/html; charset=GBK"%><%@
- include file="/Frame/resources/include/include_begin_list.jspf"%><%
- String id = CurPage.getParameter("id");
- String flowNo = CurPage.getParameter("flowNo");
- String phaseNo = CurPage.getParameter("phaseNo");
-
- if (id == null) id = "";
- if (null == flowNo) flowNo = "";
- if (phaseNo == null) phaseNo = "";
-
- String sUserID = CurPage.getParameter("UserID");
- if (sUserID == null) sUserID = "";
-
- ASObjectModel doTemp = new ASObjectModel("APP_MIDDLE_LIST");
- doTemp.setLockCount(2); //锁定两列
- ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
-
- dwTemp.Style="1"; //设置为Grid风格
- dwTemp.ReadOnly = "1";//编辑模式
- dwTemp.setPageSize(10);
- dwTemp.ConvertCode2Title = "1";
- dwTemp.genHTMLObjectWindow(id);
-
- String sButtons[][] = {
- {"true","","Button","新增页签","新增页签","newRecord()","","","","btn_icon_add"},
- {"true","","Button","取消页签","取消页签",
- "if(confirm('确实要删除吗?'))as_delete(0,'')","","","","btn_icon_delete"},
- {"true","","Button","编辑页签","编辑页签","viewAndEdit()","","","","btn_icon_edit"}
- };
-%><%@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/WebContent/AppConfig/AppPage/AppLibraryAdd.jsp b/WebContent/AppFresh/AppPage/AppLibraryAdd.jsp
similarity index 100%
rename from WebContent/AppConfig/AppPage/AppLibraryAdd.jsp
rename to WebContent/AppFresh/AppPage/AppLibraryAdd.jsp
diff --git a/WebContent/AppConfig/AppPage/AppLibraryGroupInfo.jsp b/WebContent/AppFresh/AppPage/AppLibraryGroupInfo.jsp
similarity index 92%
rename from WebContent/AppConfig/AppPage/AppLibraryGroupInfo.jsp
rename to WebContent/AppFresh/AppPage/AppLibraryGroupInfo.jsp
index 08deb6314..189c7ef06 100644
--- a/WebContent/AppConfig/AppPage/AppLibraryGroupInfo.jsp
+++ b/WebContent/AppFresh/AppPage/AppLibraryGroupInfo.jsp
@@ -1,6 +1,6 @@
<%@page import="jbo.awe.AWE_DO_CATALOG"%>
<%@ page contentType="text/html; charset=GBK"%><%@
- include file="/Frame/resources/include/include_begin_list.jspf"%><%
+ include file="/Frame/resources/include/include_begin_info.jspf"%><%
//获得参数
String dono = CurPage.getParameter("dono");
diff --git a/WebContent/AppConfig/AppPage/AppLibraryGroupList.jsp b/WebContent/AppFresh/AppPage/AppLibraryGroupList.jsp
similarity index 88%
rename from WebContent/AppConfig/AppPage/AppLibraryGroupList.jsp
rename to WebContent/AppFresh/AppPage/AppLibraryGroupList.jsp
index 1dbf4b40a..f397044fa 100644
--- a/WebContent/AppConfig/AppPage/AppLibraryGroupList.jsp
+++ b/WebContent/AppFresh/AppPage/AppLibraryGroupList.jsp
@@ -19,7 +19,7 @@
%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
diff --git a/WebContent/AppConfig/AppPage/AppLibraryTemplateInfo.jsp b/WebContent/AppFresh/AppPage/AppLibraryTemplateInfo.jsp
similarity index 93%
rename from WebContent/AppConfig/AppPage/AppLibraryTemplateInfo.jsp
rename to WebContent/AppFresh/AppPage/AppLibraryTemplateInfo.jsp
index b2254121b..b6233f7a6 100644
--- a/WebContent/AppConfig/AppPage/AppLibraryTemplateInfo.jsp
+++ b/WebContent/AppFresh/AppPage/AppLibraryTemplateInfo.jsp
@@ -1,6 +1,6 @@
<%@page import="jbo.awe.AWE_DO_CATALOG"%>
<%@ page contentType="text/html; charset=GBK"%><%@
- include file="/Frame/resources/include/include_begin_list.jspf"%><%
+ include file="/Frame/resources/include/include_begin_info.jspf"%><%
//获得参数
String GROUP_CODE = CurPage.getParameter("GROUP_CODE");
if (GROUP_CODE == null) GROUP_CODE = "";
diff --git a/WebContent/AppConfig/AppPage/AppLibraryTemplateList.jsp b/WebContent/AppFresh/AppPage/AppLibraryTemplateList.jsp
similarity index 87%
rename from WebContent/AppConfig/AppPage/AppLibraryTemplateList.jsp
rename to WebContent/AppFresh/AppPage/AppLibraryTemplateList.jsp
index a9574974f..21765e072 100644
--- a/WebContent/AppConfig/AppPage/AppLibraryTemplateList.jsp
+++ b/WebContent/AppFresh/AppPage/AppLibraryTemplateList.jsp
@@ -24,7 +24,7 @@
function newRecord() {
var GROUP_CODE = getItemValue(0, getRow(0), 'GROUP_CODE');
- var sUrl = "/AppConfig/AppPage/AppLibraryTemplateInfo.jsp";
+ var sUrl = "/AppFresh/AppPage/AppLibraryTemplateInfo.jsp";
AsDialog.PopView(sUrl,"GROUP_CODE="+GROUP_CODE,
"dialogWidth=600px;dialogHeight=450px;", function(message) {
@@ -33,7 +33,7 @@
}
function viewAndEdit() {
- var sUrl = "/AppConfig/AppPage/AppLibraryTemplateInfo.jsp";
+ var sUrl = "/AppFresh/AppPage/AppLibraryTemplateInfo.jsp";
var GROUP_CODE = getItemValue(0, getRow(0), 'GROUP_CODE');
var DATA_CODE = getItemValue(0, getRow(0), 'DATA_CODE');
alert(DATA_CODE);
@@ -56,7 +56,7 @@
}
var flowNo = getItemValue(0, getRow(0), 'flowno');
var phaseNo = getItemValue(0, getRow(0), 'phaseno');
- var sUrl = "/AppConfig/AppFlow/MiddleList.jsp";
+ var sUrl = "/AppFresh/AppFlow/MiddleList.jsp";
AsControl.OpenTab(sUrl,"id="+id + "&flowNo="+flowNo+"&phaseNo="+phaseNo, {title:"流程页签配置"});
}
diff --git a/WebContent/AppConfig/AppPage/AppNodeInfo.jsp b/WebContent/AppFresh/AppPage/AppNodeInfo.jsp
similarity index 100%
rename from WebContent/AppConfig/AppPage/AppNodeInfo.jsp
rename to WebContent/AppFresh/AppPage/AppNodeInfo.jsp
diff --git a/WebContent/AppConfig/AppPage/AppNodeList.jsp b/WebContent/AppFresh/AppPage/AppNodeList.jsp
similarity index 88%
rename from WebContent/AppConfig/AppPage/AppNodeList.jsp
rename to WebContent/AppFresh/AppPage/AppNodeList.jsp
index a83439c96..e92e26071 100644
--- a/WebContent/AppConfig/AppPage/AppNodeList.jsp
+++ b/WebContent/AppFresh/AppPage/AppNodeList.jsp
@@ -31,7 +31,7 @@
var param = "GROUP_CODE="+GROUP_CODE;
//alert(param);
- var sUrl = "/AppConfig/AppPage/AppNodeInfo.jsp";
+ var sUrl = "/AppFresh/AppPage/AppNodeInfo.jsp";
AsDialog.PopView(sUrl, param, "dialogWidth=800px;dialogHeight=650px;",
function(message) {
reloadSelf();
@@ -42,7 +42,7 @@
function viewAndEdit() {
debugger;
- var sUrl = "/AppConfig/AppPage/AppNodeInfo.jsp";
+ var sUrl = "/AppFresh/AppPage/AppNodeInfo.jsp";
var id = getItemValue(0, getRow(0), 'id');
if (id == "" || typeof (id) == "undefined") {