tony001 发布系统代码 [后台服务，演示应用]

app_Web/src/locale/lanres/entities/ibizsample0021/ibizsample0021_BO_CN_base.ts

@@ -97,12 +97,10 @@ function getLocaleResourceBase(){
 			uiactions: {
 			},
 		},
-		main_form: {
+		start001_form: {
 			details: {
 				group1: commonLogic.appcommonhandle("订单基本信息",null), 
 				formpage1: commonLogic.appcommonhandle("基本信息",null), 
-				group2: commonLogic.appcommonhandle("操作信息",null), 
-				formpage2: commonLogic.appcommonhandle("其它",null), 
 				srfupdatedate: commonLogic.appcommonhandle("更新时间",null), 
 				srforikey: commonLogic.appcommonhandle("",null), 
 				srfkey: commonLogic.appcommonhandle("订单标识",null), 
@@ -111,26 +109,15 @@ function getLocaleResourceBase(){
 				srfuf: commonLogic.appcommonhandle("",null), 
 				srfdeid: commonLogic.appcommonhandle("",null), 
 				srfsourcekey: commonLogic.appcommonhandle("",null), 
-				ibizsample0021name: commonLogic.appcommonhandle("订单名称",null), 
-				ordertime: commonLogic.appcommonhandle("订单时间",null), 
-				memo: commonLogic.appcommonhandle("备注",null), 
-				curorgid: commonLogic.appcommonhandle("CURORGID",null), 
-				curdeptid: commonLogic.appcommonhandle("CURDEPTID",null), 
-				createman: commonLogic.appcommonhandle("建立人",null), 
-				createdate: commonLogic.appcommonhandle("建立时间",null), 
-				updateman: commonLogic.appcommonhandle("更新人",null), 
-				updatedate: commonLogic.appcommonhandle("更新时间",null), 
+				deptheads: commonLogic.appcommonhandle("部门领导",null), 
 				ibizsample0021id: commonLogic.appcommonhandle("订单标识",null), 
 			},
 			uiactions: {
 			},
 		},
-		usr1114284368_form: {
+		refuseform_form: {
 			details: {
-				group1: commonLogic.appcommonhandle("订单基本信息",null), 
 				formpage1: commonLogic.appcommonhandle("基本信息",null), 
-				group2: commonLogic.appcommonhandle("操作信息",null), 
-				formpage2: commonLogic.appcommonhandle("其它",null), 
 				srfupdatedate: commonLogic.appcommonhandle("更新时间",null), 
 				srforikey: commonLogic.appcommonhandle("",null), 
 				srfkey: commonLogic.appcommonhandle("订单标识",null), 
@@ -139,17 +126,13 @@ function getLocaleResourceBase(){
 				srfuf: commonLogic.appcommonhandle("",null), 
 				srfdeid: commonLogic.appcommonhandle("",null), 
 				srfsourcekey: commonLogic.appcommonhandle("",null), 
-				ibizsample0021name: commonLogic.appcommonhandle("订单名称",null), 
-				createman: commonLogic.appcommonhandle("建立人",null), 
-				createdate: commonLogic.appcommonhandle("建立时间",null), 
-				updateman: commonLogic.appcommonhandle("更新人",null), 
-				updatedate: commonLogic.appcommonhandle("更新时间",null), 
+				returnopinions: commonLogic.appcommonhandle("驳回意见",null), 
 				ibizsample0021id: commonLogic.appcommonhandle("订单标识",null), 
 			},
 			uiactions: {
 			},
 		},
-		usr1114790802_form: {
+		main_form: {
 			details: {
 				group1: commonLogic.appcommonhandle("订单基本信息",null), 
 				formpage1: commonLogic.appcommonhandle("基本信息",null), 
@@ -164,6 +147,10 @@ function getLocaleResourceBase(){
 				srfdeid: commonLogic.appcommonhandle("",null), 
 				srfsourcekey: commonLogic.appcommonhandle("",null), 
 				ibizsample0021name: commonLogic.appcommonhandle("订单名称",null), 
+				ordertime: commonLogic.appcommonhandle("订单时间",null), 
+				memo: commonLogic.appcommonhandle("备注",null), 
+				curorgid: commonLogic.appcommonhandle("CURORGID",null), 
+				curdeptid: commonLogic.appcommonhandle("CURDEPTID",null), 
 				createman: commonLogic.appcommonhandle("建立人",null), 
 				createdate: commonLogic.appcommonhandle("建立时间",null), 
 				updateman: commonLogic.appcommonhandle("更新人",null), 
@@ -173,7 +160,7 @@ function getLocaleResourceBase(){
 			uiactions: {
 			},
 		},
-		usr1116681664_form: {
+		usr1114284368_form: {
 			details: {
 				group1: commonLogic.appcommonhandle("订单基本信息",null), 
 				formpage1: commonLogic.appcommonhandle("基本信息",null), 
@@ -197,7 +184,7 @@ function getLocaleResourceBase(){
 			uiactions: {
 			},
 		},
-		usr1116895321_form: {
+		usr1114790802_form: {
 			details: {
 				group1: commonLogic.appcommonhandle("订单基本信息",null), 
 				formpage1: commonLogic.appcommonhandle("基本信息",null), 
@@ -221,7 +208,7 @@ function getLocaleResourceBase(){
 			uiactions: {
 			},
 		},
-		main2_form: {
+		usr1116681664_form: {
 			details: {
 				group1: commonLogic.appcommonhandle("订单基本信息",null), 
 				formpage1: commonLogic.appcommonhandle("基本信息",null), 
@@ -236,9 +223,6 @@ function getLocaleResourceBase(){
 				srfdeid: commonLogic.appcommonhandle("",null), 
 				srfsourcekey: commonLogic.appcommonhandle("",null), 
 				ibizsample0021name: commonLogic.appcommonhandle("订单名称",null), 
-				ordertime: commonLogic.appcommonhandle("订单时间",null), 
-				curorgid: commonLogic.appcommonhandle("CURORGID",null), 
-				curdeptid: commonLogic.appcommonhandle("CURDEPTID",null), 
 				createman: commonLogic.appcommonhandle("建立人",null), 
 				createdate: commonLogic.appcommonhandle("建立时间",null), 
 				updateman: commonLogic.appcommonhandle("更新人",null), 
@@ -248,10 +232,12 @@ function getLocaleResourceBase(){
 			uiactions: {
 			},
 		},
-		usr1116421859_form: {
+		usr1116895321_form: {
 			details: {
 				group1: commonLogic.appcommonhandle("订单基本信息",null), 
 				formpage1: commonLogic.appcommonhandle("基本信息",null), 
+				group2: commonLogic.appcommonhandle("操作信息",null), 
+				formpage2: commonLogic.appcommonhandle("其它",null), 
 				srfupdatedate: commonLogic.appcommonhandle("更新时间",null), 
 				srforikey: commonLogic.appcommonhandle("",null), 
 				srfkey: commonLogic.appcommonhandle("订单标识",null), 
@@ -260,17 +246,22 @@ function getLocaleResourceBase(){
 				srfuf: commonLogic.appcommonhandle("",null), 
 				srfdeid: commonLogic.appcommonhandle("",null), 
 				srfsourcekey: commonLogic.appcommonhandle("",null), 
-				srfip_amount: commonLogic.appcommonhandle("",null), 
-				memo: commonLogic.appcommonhandle("备注",null), 
-				amount: commonLogic.appcommonhandle("总计",null), 
+				ibizsample0021name: commonLogic.appcommonhandle("订单名称",null), 
+				createman: commonLogic.appcommonhandle("建立人",null), 
+				createdate: commonLogic.appcommonhandle("建立时间",null), 
+				updateman: commonLogic.appcommonhandle("更新人",null), 
+				updatedate: commonLogic.appcommonhandle("更新时间",null), 
 				ibizsample0021id: commonLogic.appcommonhandle("订单标识",null), 
 			},
 			uiactions: {
 			},
 		},
-		refuseform_form: {
+		main2_form: {
 			details: {
+				group1: commonLogic.appcommonhandle("订单基本信息",null), 
 				formpage1: commonLogic.appcommonhandle("基本信息",null), 
+				group2: commonLogic.appcommonhandle("操作信息",null), 
+				formpage2: commonLogic.appcommonhandle("其它",null), 
 				srfupdatedate: commonLogic.appcommonhandle("更新时间",null), 
 				srforikey: commonLogic.appcommonhandle("",null), 
 				srfkey: commonLogic.appcommonhandle("订单标识",null), 
@@ -279,7 +270,14 @@ function getLocaleResourceBase(){
 				srfuf: commonLogic.appcommonhandle("",null), 
 				srfdeid: commonLogic.appcommonhandle("",null), 
 				srfsourcekey: commonLogic.appcommonhandle("",null), 
-				returnopinions: commonLogic.appcommonhandle("驳回意见",null), 
+				ibizsample0021name: commonLogic.appcommonhandle("订单名称",null), 
+				ordertime: commonLogic.appcommonhandle("订单时间",null), 
+				curorgid: commonLogic.appcommonhandle("CURORGID",null), 
+				curdeptid: commonLogic.appcommonhandle("CURDEPTID",null), 
+				createman: commonLogic.appcommonhandle("建立人",null), 
+				createdate: commonLogic.appcommonhandle("建立时间",null), 
+				updateman: commonLogic.appcommonhandle("更新人",null), 
+				updatedate: commonLogic.appcommonhandle("更新时间",null), 
 				ibizsample0021id: commonLogic.appcommonhandle("订单标识",null), 
 			},
 			uiactions: {

app_Web/src/locale/lanres/entities/ibizsample0021/ibizsample0021_en_US_base.ts

@@ -97,12 +97,10 @@ function getLocaleResourceBase(){
 			uiactions: {
 			},
 		},
-		main_form: {
+		start001_form: {
 			details: {
 				group1: commonLogic.appcommonhandle("订单基本信息",null), 
 				formpage1: commonLogic.appcommonhandle("基本信息",null), 
-				group2: commonLogic.appcommonhandle("操作信息",null), 
-				formpage2: commonLogic.appcommonhandle("其它",null), 
 				srfupdatedate: commonLogic.appcommonhandle("更新时间",null), 
 				srforikey: commonLogic.appcommonhandle("",null), 
 				srfkey: commonLogic.appcommonhandle("订单标识",null), 
@@ -111,26 +109,15 @@ function getLocaleResourceBase(){
 				srfuf: commonLogic.appcommonhandle("",null), 
 				srfdeid: commonLogic.appcommonhandle("",null), 
 				srfsourcekey: commonLogic.appcommonhandle("",null), 
-				ibizsample0021name: commonLogic.appcommonhandle("订单名称",null), 
-				ordertime: commonLogic.appcommonhandle("订单时间",null), 
-				memo: commonLogic.appcommonhandle("备注",null), 
-				curorgid: commonLogic.appcommonhandle("CURORGID",null), 
-				curdeptid: commonLogic.appcommonhandle("CURDEPTID",null), 
-				createman: commonLogic.appcommonhandle("建立人",null), 
-				createdate: commonLogic.appcommonhandle("建立时间",null), 
-				updateman: commonLogic.appcommonhandle("更新人",null), 
-				updatedate: commonLogic.appcommonhandle("更新时间",null), 
+				deptheads: commonLogic.appcommonhandle("部门领导",null), 
 				ibizsample0021id: commonLogic.appcommonhandle("订单标识",null), 
 			},
 			uiactions: {
 			},
 		},
-		usr1114284368_form: {
+		refuseform_form: {
 			details: {
-				group1: commonLogic.appcommonhandle("订单基本信息",null), 
 				formpage1: commonLogic.appcommonhandle("基本信息",null), 
-				group2: commonLogic.appcommonhandle("操作信息",null), 
-				formpage2: commonLogic.appcommonhandle("其它",null), 
 				srfupdatedate: commonLogic.appcommonhandle("更新时间",null), 
 				srforikey: commonLogic.appcommonhandle("",null), 
 				srfkey: commonLogic.appcommonhandle("订单标识",null), 
@@ -139,17 +126,13 @@ function getLocaleResourceBase(){
 				srfuf: commonLogic.appcommonhandle("",null), 
 				srfdeid: commonLogic.appcommonhandle("",null), 
 				srfsourcekey: commonLogic.appcommonhandle("",null), 
-				ibizsample0021name: commonLogic.appcommonhandle("订单名称",null), 
-				createman: commonLogic.appcommonhandle("建立人",null), 
-				createdate: commonLogic.appcommonhandle("建立时间",null), 
-				updateman: commonLogic.appcommonhandle("更新人",null), 
-				updatedate: commonLogic.appcommonhandle("更新时间",null), 
+				returnopinions: commonLogic.appcommonhandle("驳回意见",null), 
 				ibizsample0021id: commonLogic.appcommonhandle("订单标识",null), 
 			},
 			uiactions: {
 			},
 		},
-		usr1114790802_form: {
+		main_form: {
 			details: {
 				group1: commonLogic.appcommonhandle("订单基本信息",null), 
 				formpage1: commonLogic.appcommonhandle("基本信息",null), 
@@ -164,6 +147,10 @@ function getLocaleResourceBase(){
 				srfdeid: commonLogic.appcommonhandle("",null), 
 				srfsourcekey: commonLogic.appcommonhandle("",null), 
 				ibizsample0021name: commonLogic.appcommonhandle("订单名称",null), 
+				ordertime: commonLogic.appcommonhandle("订单时间",null), 
+				memo: commonLogic.appcommonhandle("备注",null), 
+				curorgid: commonLogic.appcommonhandle("CURORGID",null), 
+				curdeptid: commonLogic.appcommonhandle("CURDEPTID",null), 
 				createman: commonLogic.appcommonhandle("建立人",null), 
 				createdate: commonLogic.appcommonhandle("建立时间",null), 
 				updateman: commonLogic.appcommonhandle("更新人",null), 
@@ -173,7 +160,7 @@ function getLocaleResourceBase(){
 			uiactions: {
 			},
 		},
-		usr1116681664_form: {
+		usr1114284368_form: {
 			details: {
 				group1: commonLogic.appcommonhandle("订单基本信息",null), 
 				formpage1: commonLogic.appcommonhandle("基本信息",null), 
@@ -197,7 +184,7 @@ function getLocaleResourceBase(){
 			uiactions: {
 			},
 		},
-		usr1116895321_form: {
+		usr1114790802_form: {
 			details: {
 				group1: commonLogic.appcommonhandle("订单基本信息",null), 
 				formpage1: commonLogic.appcommonhandle("基本信息",null), 
@@ -221,7 +208,7 @@ function getLocaleResourceBase(){
 			uiactions: {
 			},
 		},
-		main2_form: {
+		usr1116681664_form: {
 			details: {
 				group1: commonLogic.appcommonhandle("订单基本信息",null), 
 				formpage1: commonLogic.appcommonhandle("基本信息",null), 
@@ -236,9 +223,6 @@ function getLocaleResourceBase(){
 				srfdeid: commonLogic.appcommonhandle("",null), 
 				srfsourcekey: commonLogic.appcommonhandle("",null), 
 				ibizsample0021name: commonLogic.appcommonhandle("订单名称",null), 
-				ordertime: commonLogic.appcommonhandle("订单时间",null), 
-				curorgid: commonLogic.appcommonhandle("CURORGID",null), 
-				curdeptid: commonLogic.appcommonhandle("CURDEPTID",null), 
 				createman: commonLogic.appcommonhandle("建立人",null), 
 				createdate: commonLogic.appcommonhandle("建立时间",null), 
 				updateman: commonLogic.appcommonhandle("更新人",null), 
@@ -248,10 +232,12 @@ function getLocaleResourceBase(){
 			uiactions: {
 			},
 		},
-		usr1116421859_form: {
+		usr1116895321_form: {
 			details: {
 				group1: commonLogic.appcommonhandle("订单基本信息",null), 
 				formpage1: commonLogic.appcommonhandle("基本信息",null), 
+				group2: commonLogic.appcommonhandle("操作信息",null), 
+				formpage2: commonLogic.appcommonhandle("其它",null), 
 				srfupdatedate: commonLogic.appcommonhandle("更新时间",null), 
 				srforikey: commonLogic.appcommonhandle("",null), 
 				srfkey: commonLogic.appcommonhandle("订单标识",null), 
@@ -260,17 +246,22 @@ function getLocaleResourceBase(){
 				srfuf: commonLogic.appcommonhandle("",null), 
 				srfdeid: commonLogic.appcommonhandle("",null), 
 				srfsourcekey: commonLogic.appcommonhandle("",null), 
-				srfip_amount: commonLogic.appcommonhandle("",null), 
-				memo: commonLogic.appcommonhandle("备注",null), 
-				amount: commonLogic.appcommonhandle("总计",null), 
+				ibizsample0021name: commonLogic.appcommonhandle("订单名称",null), 
+				createman: commonLogic.appcommonhandle("建立人",null), 
+				createdate: commonLogic.appcommonhandle("建立时间",null), 
+				updateman: commonLogic.appcommonhandle("更新人",null), 
+				updatedate: commonLogic.appcommonhandle("更新时间",null), 
 				ibizsample0021id: commonLogic.appcommonhandle("订单标识",null), 
 			},
 			uiactions: {
 			},
 		},
-		refuseform_form: {
+		main2_form: {
 			details: {
+				group1: commonLogic.appcommonhandle("订单基本信息",null), 
 				formpage1: commonLogic.appcommonhandle("基本信息",null), 
+				group2: commonLogic.appcommonhandle("操作信息",null), 
+				formpage2: commonLogic.appcommonhandle("其它",null), 
 				srfupdatedate: commonLogic.appcommonhandle("更新时间",null), 
 				srforikey: commonLogic.appcommonhandle("",null), 
 				srfkey: commonLogic.appcommonhandle("订单标识",null), 
@@ -279,7 +270,14 @@ function getLocaleResourceBase(){
 				srfuf: commonLogic.appcommonhandle("",null), 
 				srfdeid: commonLogic.appcommonhandle("",null), 
 				srfsourcekey: commonLogic.appcommonhandle("",null), 
-				returnopinions: commonLogic.appcommonhandle("驳回意见",null), 
+				ibizsample0021name: commonLogic.appcommonhandle("订单名称",null), 
+				ordertime: commonLogic.appcommonhandle("订单时间",null), 
+				curorgid: commonLogic.appcommonhandle("CURORGID",null), 
+				curdeptid: commonLogic.appcommonhandle("CURDEPTID",null), 
+				createman: commonLogic.appcommonhandle("建立人",null), 
+				createdate: commonLogic.appcommonhandle("建立时间",null), 
+				updateman: commonLogic.appcommonhandle("更新人",null), 
+				updatedate: commonLogic.appcommonhandle("更新时间",null), 
 				ibizsample0021id: commonLogic.appcommonhandle("订单标识",null), 
 			},
 			uiactions: {

app_Web/src/locale/lanres/entities/ibizsample0021/ibizsample0021_zh_CN_base.ts

@@ -97,12 +97,10 @@ function getLocaleResourceBase(){
 			uiactions: {
 			},
 		},
-		main_form: {
+		start001_form: {
 			details: {
 				group1: commonLogic.appcommonhandle("订单基本信息",null), 
 				formpage1: commonLogic.appcommonhandle("基本信息",null), 
-				group2: commonLogic.appcommonhandle("操作信息",null), 
-				formpage2: commonLogic.appcommonhandle("其它",null), 
 				srfupdatedate: commonLogic.appcommonhandle("更新时间",null), 
 				srforikey: commonLogic.appcommonhandle("",null), 
 				srfkey: commonLogic.appcommonhandle("订单标识",null), 
@@ -111,26 +109,15 @@ function getLocaleResourceBase(){
 				srfuf: commonLogic.appcommonhandle("",null), 
 				srfdeid: commonLogic.appcommonhandle("",null), 
 				srfsourcekey: commonLogic.appcommonhandle("",null), 
-				ibizsample0021name: commonLogic.appcommonhandle("订单名称",null), 
-				ordertime: commonLogic.appcommonhandle("订单时间",null), 
-				memo: commonLogic.appcommonhandle("备注",null), 
-				curorgid: commonLogic.appcommonhandle("CURORGID",null), 
-				curdeptid: commonLogic.appcommonhandle("CURDEPTID",null), 
-				createman: commonLogic.appcommonhandle("建立人",null), 
-				createdate: commonLogic.appcommonhandle("建立时间",null), 
-				updateman: commonLogic.appcommonhandle("更新人",null), 
-				updatedate: commonLogic.appcommonhandle("更新时间",null), 
+				deptheads: commonLogic.appcommonhandle("部门领导",null), 
 				ibizsample0021id: commonLogic.appcommonhandle("订单标识",null), 
 			},
 			uiactions: {
 			},
 		},
-		usr1114284368_form: {
+		refuseform_form: {
 			details: {
-				group1: commonLogic.appcommonhandle("订单基本信息",null), 
 				formpage1: commonLogic.appcommonhandle("基本信息",null), 
-				group2: commonLogic.appcommonhandle("操作信息",null), 
-				formpage2: commonLogic.appcommonhandle("其它",null), 
 				srfupdatedate: commonLogic.appcommonhandle("更新时间",null), 
 				srforikey: commonLogic.appcommonhandle("",null), 
 				srfkey: commonLogic.appcommonhandle("订单标识",null), 
@@ -139,17 +126,13 @@ function getLocaleResourceBase(){
 				srfuf: commonLogic.appcommonhandle("",null), 
 				srfdeid: commonLogic.appcommonhandle("",null), 
 				srfsourcekey: commonLogic.appcommonhandle("",null), 
-				ibizsample0021name: commonLogic.appcommonhandle("订单名称",null), 
-				createman: commonLogic.appcommonhandle("建立人",null), 
-				createdate: commonLogic.appcommonhandle("建立时间",null), 
-				updateman: commonLogic.appcommonhandle("更新人",null), 
-				updatedate: commonLogic.appcommonhandle("更新时间",null), 
+				returnopinions: commonLogic.appcommonhandle("驳回意见",null), 
 				ibizsample0021id: commonLogic.appcommonhandle("订单标识",null), 
 			},
 			uiactions: {
 			},
 		},
-		usr1114790802_form: {
+		main_form: {
 			details: {
 				group1: commonLogic.appcommonhandle("订单基本信息",null), 
 				formpage1: commonLogic.appcommonhandle("基本信息",null), 
@@ -164,6 +147,10 @@ function getLocaleResourceBase(){
 				srfdeid: commonLogic.appcommonhandle("",null), 
 				srfsourcekey: commonLogic.appcommonhandle("",null), 
 				ibizsample0021name: commonLogic.appcommonhandle("订单名称",null), 
+				ordertime: commonLogic.appcommonhandle("订单时间",null), 
+				memo: commonLogic.appcommonhandle("备注",null), 
+				curorgid: commonLogic.appcommonhandle("CURORGID",null), 
+				curdeptid: commonLogic.appcommonhandle("CURDEPTID",null), 
 				createman: commonLogic.appcommonhandle("建立人",null), 
 				createdate: commonLogic.appcommonhandle("建立时间",null), 
 				updateman: commonLogic.appcommonhandle("更新人",null), 
@@ -173,7 +160,7 @@ function getLocaleResourceBase(){
 			uiactions: {
 			},
 		},
-		usr1116681664_form: {
+		usr1114284368_form: {
 			details: {
 				group1: commonLogic.appcommonhandle("订单基本信息",null), 
 				formpage1: commonLogic.appcommonhandle("基本信息",null), 
@@ -197,7 +184,7 @@ function getLocaleResourceBase(){
 			uiactions: {
 			},
 		},
-		usr1116895321_form: {
+		usr1114790802_form: {
 			details: {
 				group1: commonLogic.appcommonhandle("订单基本信息",null), 
 				formpage1: commonLogic.appcommonhandle("基本信息",null), 
@@ -221,7 +208,7 @@ function getLocaleResourceBase(){
 			uiactions: {
 			},
 		},
-		main2_form: {
+		usr1116681664_form: {
 			details: {
 				group1: commonLogic.appcommonhandle("订单基本信息",null), 
 				formpage1: commonLogic.appcommonhandle("基本信息",null), 
@@ -236,9 +223,6 @@ function getLocaleResourceBase(){
 				srfdeid: commonLogic.appcommonhandle("",null), 
 				srfsourcekey: commonLogic.appcommonhandle("",null), 
 				ibizsample0021name: commonLogic.appcommonhandle("订单名称",null), 
-				ordertime: commonLogic.appcommonhandle("订单时间",null), 
-				curorgid: commonLogic.appcommonhandle("CURORGID",null), 
-				curdeptid: commonLogic.appcommonhandle("CURDEPTID",null), 
 				createman: commonLogic.appcommonhandle("建立人",null), 
 				createdate: commonLogic.appcommonhandle("建立时间",null), 
 				updateman: commonLogic.appcommonhandle("更新人",null), 
@@ -248,10 +232,12 @@ function getLocaleResourceBase(){
 			uiactions: {
 			},
 		},
-		usr1116421859_form: {
+		usr1116895321_form: {
 			details: {
 				group1: commonLogic.appcommonhandle("订单基本信息",null), 
 				formpage1: commonLogic.appcommonhandle("基本信息",null), 
+				group2: commonLogic.appcommonhandle("操作信息",null), 
+				formpage2: commonLogic.appcommonhandle("其它",null), 
 				srfupdatedate: commonLogic.appcommonhandle("更新时间",null), 
 				srforikey: commonLogic.appcommonhandle("",null), 
 				srfkey: commonLogic.appcommonhandle("订单标识",null), 
@@ -260,17 +246,22 @@ function getLocaleResourceBase(){
 				srfuf: commonLogic.appcommonhandle("",null), 
 				srfdeid: commonLogic.appcommonhandle("",null), 
 				srfsourcekey: commonLogic.appcommonhandle("",null), 
-				srfip_amount: commonLogic.appcommonhandle("",null), 
-				memo: commonLogic.appcommonhandle("备注",null), 
-				amount: commonLogic.appcommonhandle("总计",null), 
+				ibizsample0021name: commonLogic.appcommonhandle("订单名称",null), 
+				createman: commonLogic.appcommonhandle("建立人",null), 
+				createdate: commonLogic.appcommonhandle("建立时间",null), 
+				updateman: commonLogic.appcommonhandle("更新人",null), 
+				updatedate: commonLogic.appcommonhandle("更新时间",null), 
 				ibizsample0021id: commonLogic.appcommonhandle("订单标识",null), 
 			},
 			uiactions: {
 			},
 		},
-		refuseform_form: {
+		main2_form: {
 			details: {
+				group1: commonLogic.appcommonhandle("订单基本信息",null), 
 				formpage1: commonLogic.appcommonhandle("基本信息",null), 
+				group2: commonLogic.appcommonhandle("操作信息",null), 
+				formpage2: commonLogic.appcommonhandle("其它",null), 
 				srfupdatedate: commonLogic.appcommonhandle("更新时间",null), 
 				srforikey: commonLogic.appcommonhandle("",null), 
 				srfkey: commonLogic.appcommonhandle("订单标识",null), 
@@ -279,7 +270,14 @@ function getLocaleResourceBase(){
 				srfuf: commonLogic.appcommonhandle("",null), 
 				srfdeid: commonLogic.appcommonhandle("",null), 
 				srfsourcekey: commonLogic.appcommonhandle("",null), 
-				returnopinions: commonLogic.appcommonhandle("驳回意见",null), 
+				ibizsample0021name: commonLogic.appcommonhandle("订单名称",null), 
+				ordertime: commonLogic.appcommonhandle("订单时间",null), 
+				curorgid: commonLogic.appcommonhandle("CURORGID",null), 
+				curdeptid: commonLogic.appcommonhandle("CURDEPTID",null), 
+				createman: commonLogic.appcommonhandle("建立人",null), 
+				createdate: commonLogic.appcommonhandle("建立时间",null), 
+				updateman: commonLogic.appcommonhandle("更新人",null), 
+				updatedate: commonLogic.appcommonhandle("更新时间",null), 
 				ibizsample0021id: commonLogic.appcommonhandle("订单标识",null), 
 			},
 			uiactions: {

app_Web/src/pages/sample/ibizsample0021-usr1114433946-wfdyna-edit-view/ibizsample0021-usr1114433946-wfdyna-edit-view-base.vue

@@ -930,7 +930,7 @@ export default class IBIZSample0021Usr1114433946WFDynaEditViewBase extends Vue {
             return;
         }
         let tempContext: any = Util.deepCopy(this.context);
-         Object.assign(tempContext,{ibizsample0021:datas && datas[0].srfkey});
+         Object.assign(tempContext,{ibizsample0021:data && data[0].srfkey});
         let tempViewParam: any = { actionForm: linkItem.sequenceflowform };
         const appmodal = this.$appmodal.openModal({ viewname: targetView.viewname, title: (this.$t(targetView.title) as string), height: targetView.height, width: targetView.width }, tempContext, tempViewParam);
         appmodal.subscribe((result: any) => {

app_Web/src/pages/sample/ibizsample0021-usr1116491232-wfdyna-start-view/ibizsample0021-usr1116491232-wfdyna-start-view-base.vue

@@ -216,6 +216,7 @@ export default class IBIZSample0021Usr1116491232WFDynaStartViewBase extends Vue
     public containerModel: any = {
         view_form: { name: 'form', type: 'FORM' },
         view_wfform_refuseform: { name: 'wfform_refuseform', type: 'FORM' },
+        view_wfform_start001: { name: 'wfform_start001', type: 'FORM' },
         wflinks: [],
     };
 
@@ -703,7 +704,8 @@ export default class IBIZSample0021Usr1116491232WFDynaStartViewBase extends Vue
      */
     public allForm: any = {
         "form":{name:"view_form",autosave:"false",showBusyIndicator:"true",updateAction:"Update",removeAction:"Remove",loaddraftAction:"GetDraft",loadAction:"Get",createAction:"Create",WFSubmitAction:"",WFStartAction:""},
-        "wfform_refuseform":{name:"view_wfform_refuseform",autosave:"false",showBusyIndicator:"true",updateAction:"Update",removeAction:"Remove",loaddraftAction:"GetDraft",loadAction:"Get",createAction:"Create",WFSubmitAction:"",WFStartAction:""}
+        "wfform_refuseform":{name:"view_wfform_refuseform",autosave:"false",showBusyIndicator:"true",updateAction:"Update",removeAction:"Remove",loaddraftAction:"GetDraft",loadAction:"Get",createAction:"Create",WFSubmitAction:"",WFStartAction:""},
+        "wfform_start001":{name:"view_wfform_start001",autosave:"false",showBusyIndicator:"true",updateAction:"Update",removeAction:"Remove",loaddraftAction:"GetDraft",loadAction:"Get",createAction:"Create",WFSubmitAction:"",WFStartAction:""}
     };
 
     /**

app_Web/src/pages/sample/ibizsample0021-usr1116491232-wfdyna-start-view/ibizsample0021-usr1116491232-wfdyna-start-view.vue

@@ -2,13 +2,15 @@
 import { Component } from 'vue-property-decorator';
 import IBIZSample0021Usr1116491232WFDynaStartViewBase from './ibizsample0021-usr1116491232-wfdyna-start-view-base.vue';
 
-import view_form from '@widgets/ibizsample0021/usr1116421859-form/usr1116421859-form.vue';
+import view_form from '@widgets/ibizsample0021/start001-form/start001-form.vue';
 import view_wfform_refuseform from '@widgets/ibizsample0021/refuse-form-form/refuse-form-form.vue';
+import view_wfform_start001 from '@widgets/ibizsample0021/start001-form/start001-form.vue';
 // 基于 @VIEW/@MACRO/VIEW.vue.ftl 生成
 @Component({
     components: {
         view_form, 
         view_wfform_refuseform, 
+        view_wfform_start001, 
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {

app_Web/src/pages/sample/ibizsample0021-wfdyna-edit-view/ibizsample0021-wfdyna-edit-view-base.vue

@@ -1113,7 +1113,7 @@ export default class IBIZSample0021WFDynaEditViewBase extends Vue {
             return;
         }
         let tempContext: any = Util.deepCopy(this.context);
-         Object.assign(tempContext,{ibizsample0021:datas && datas[0].srfkey});
+         Object.assign(tempContext,{ibizsample0021:data && data[0].srfkey});
         let tempViewParam: any = { actionForm: linkItem.sequenceflowform };
         const appmodal = this.$appmodal.openModal({ viewname: targetView.viewname, title: (this.$t(targetView.title) as string), height: targetView.height, width: targetView.width }, tempContext, tempViewParam);
         appmodal.subscribe((result: any) => {

app_Web/src/store/modules/view-action/state.ts

@@ -712,6 +712,7 @@ export const viewstate: any = {
                 'FE8FC98E-6465-4EB3-9336-BE1E90897170',
                 'BFE52920-D6CB-4E52-AEAE-9E6C572FE8FC',
                 '4FB815F9-B6D8-4F8F-8A0A-85E8BEDA0927',
+                '8F01A331-F098-4D05-8583-B6DA5574B43C',
             ],
         },
         {

app_Web/src/widgets/ibizbook/guide-borrow-form-form/guide-borrow-form-form-base.vue

@@ -1378,7 +1378,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
      */
     public async load(opt: any = {}): Promise<any> {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loadaction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -1425,7 +1425,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
      */
     public async loadDraft(opt: any = {}): Promise<any> {
         if (!this.loaddraftAction) {
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
             return;
         }
         const arg: any = { ...opt } ;
@@ -1495,7 +1495,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
         const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
         if(!action){
             let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
             return;
         }
         Object.assign(arg,{viewparams:this.viewparams});
@@ -1603,7 +1603,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
             const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
             if(!action){
                 let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
-                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
                 return;
             }
             Object.assign(arg, { viewparams: this.viewparams });
@@ -1695,7 +1695,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
     public remove(opt:Array<any> = [],showResultInfo?: boolean): Promise<any> {
         return new Promise((resolve: any, reject: any) => {
             if(!this.removeAction){
-                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.removeaction') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.removeaction') as string) });
                 return;
             }
             const arg: any = opt[0];

app_Web/src/widgets/ibizbook/guide-return-form-form/guide-return-form-form-base.vue

@@ -1344,7 +1344,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
      */
     public async load(opt: any = {}): Promise<any> {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loadaction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -1391,7 +1391,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
      */
     public async loadDraft(opt: any = {}): Promise<any> {
         if (!this.loaddraftAction) {
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
             return;
         }
         const arg: any = { ...opt } ;
@@ -1461,7 +1461,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
         const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
         if(!action){
             let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
             return;
         }
         Object.assign(arg,{viewparams:this.viewparams});
@@ -1569,7 +1569,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
             const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
             if(!action){
                 let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
-                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
                 return;
             }
             Object.assign(arg, { viewparams: this.viewparams });
@@ -1661,7 +1661,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
     public remove(opt:Array<any> = [],showResultInfo?: boolean): Promise<any> {
         return new Promise((resolve: any, reject: any) => {
             if(!this.removeAction){
-                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.removeaction') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.removeaction') as string) });
                 return;
             }
             const arg: any = opt[0];

app_Web/src/widgets/ibizbook/guide-view-form-form/guide-view-form-form-base.vue

@@ -1447,7 +1447,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
      */
     public async load(opt: any = {}): Promise<any> {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loadaction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -1494,7 +1494,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
      */
     public async loadDraft(opt: any = {}): Promise<any> {
         if (!this.loaddraftAction) {
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
             return;
         }
         const arg: any = { ...opt } ;
@@ -1564,7 +1564,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
         const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
         if(!action){
             let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
             return;
         }
         Object.assign(arg,{viewparams:this.viewparams});
@@ -1672,7 +1672,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
             const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
             if(!action){
                 let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
-                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
                 return;
             }
             Object.assign(arg, { viewparams: this.viewparams });
@@ -1764,7 +1764,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
     public remove(opt:Array<any> = [],showResultInfo?: boolean): Promise<any> {
         return new Promise((resolve: any, reject: any) => {
             if(!this.removeAction){
-                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.removeaction') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.removeaction') as string) });
                 return;
             }
             const arg: any = opt[0];

app_Web/src/widgets/ibizbook/usr4-dataview/usr4-dataview-base.vue

@@ -698,7 +698,7 @@ export default class Usr4Base extends Vue implements ControlInterface {
      */
     public async load(opt: any = {}, isReset: boolean = false): Promise<any> {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.fetchAction') as string) });
             return;
         }      
         const arg: any = {...opt};
@@ -792,7 +792,7 @@ export default class Usr4Base extends Vue implements ControlInterface {
      */
     public async remove(datas: any[]): Promise<any> {
         if(!this.removeAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -908,7 +908,7 @@ export default class Usr4Base extends Vue implements ControlInterface {
             try {
                 if(Object.is(item.rowDataState, 'create')){
                     if(!this.createAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.createAction') as string) });
                     }else{
                       Object.assign(item,{viewparams:this.viewparams});
                       let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
@@ -916,7 +916,7 @@ export default class Usr4Base extends Vue implements ControlInterface {
                     }
                 }else if(Object.is(item.rowDataState, 'update')){
                     if(!this.updateAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizbook){

app_Web/src/widgets/ibizbook/usr4-dataview/usr4-dataview-model.ts

@@ -70,11 +70,6 @@ export default class Usr4Model {
         prop: 'n_ibizbookname_like',
         dataType: 'QUERYPARAM'
       },
-      {
-        name: 'n_price_gtandeq',
-        prop: 'n_price_gtandeq',
-        dataType: 'QUERYPARAM'
-      },
 
 
       {

app_Web/src/widgets/ibizorder/main-grid/main-grid-base.vue

@@ -319,7 +319,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZOrderSF1GridViewBase
+     * @memberof IBIZOrderPickupGridViewBase
      */
     public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         if (args.length === 0) {
@@ -462,20 +462,6 @@ export default class MainBase extends Vue implements ControlInterface {
         return this.selections[0];
     }
 
-    /**
-     * 打开新建数据视图
-     *
-     * @type {any}
-     * @memberof MainBase
-     */
-    @Prop() public newdata: any;
-    /**
-     * 打开编辑数据视图
-     *
-     * @type {any}
-     * @memberof MainBase
-     */
-    @Prop() public opendata: any;
     
     /**
     * 是否嵌入关系界面
@@ -1010,7 +996,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.fetchAction) {
             this.$Notice.error({
                 title: this.$t("app.commonWords.wrong") as string,
-                desc: "IBIZOrderSF1GridView" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
+                desc: "IBIZOrderPickupGridView" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
             });
             return;
         }
@@ -1139,7 +1125,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.removeAction) {
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZOrderSF1GridView' + (this.$t('app.gridpage.notConfig.removeAction') as string)
+                desc: 'IBIZOrderPickupGridView' + (this.$t('app.gridpage.notConfig.removeAction') as string)
             });
             return;
         }
@@ -1253,7 +1239,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public addBatch(arg: any = {}): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(!arg){
@@ -2184,7 +2170,7 @@ export default class MainBase extends Vue implements ControlInterface {
             try {
                 if (Object.is(item.rowDataState, 'create')) {
                     if (!this.createAction) {
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
                     } else {
                         Object.assign(item, { viewparams: this.viewparams });
                         const tempContext = Util.deepCopy(this.context);
@@ -2193,7 +2179,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     }
                 }else if (Object.is(item.rowDataState, 'update')){
                     if (!this.updateAction) {
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
                     } else {
                         Object.assign(item, { viewparams: this.viewparams });
                         const tempContext = Util.deepCopy(this.context);
@@ -2269,7 +2255,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if(!this.loaddraftAction){
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZOrderSF1GridView' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
+                desc: 'IBIZOrderPickupGridView' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
             });
             return;
         }

app_Web/src/widgets/ibizorder/main-grid/main-grid-model.ts

@@ -105,21 +105,6 @@ export default class MainModel {
         prop: 'n_ibizordername_like',
         dataType: 'QUERYPARAM'
       },
-      {
-        name: 'n_orderstate_eq',
-        prop: 'n_orderstate_eq',
-        dataType: 'QUERYPARAM'
-      },
-      {
-        name: 'n_ordertime_gt',
-        prop: 'n_ordertime_gt',
-        dataType: 'QUERYPARAM'
-      },
-      {
-        name: 'n_ordertime_lt',
-        prop: 'n_ordertime_lt',
-        dataType: 'QUERYPARAM'
-      },
 
         {
           name:'size',

app_Web/src/widgets/ibizsample0021/start001-form/start001-form-model.ts

+// 基于 @CONTROL/表单/MODEL.ts.ftl 生成
+/**
+ * Start001 部件模型
+ *
+ * @export
+ * @class Start001Model
+ */
+export default class Start001Model {
+
+  /**
+  * 获取数据项集合
+  *
+  * @returns {any[]}
+  * @memberof Start001Model
+  */
+  public getDataItems(): any[] {
+    return [
+      {
+        name: 'srfwfmemo',
+        prop: 'srfwfmemo',
+        dataType: 'TEXT',
+      },
+      // 前端新增修改标识，新增为"0",修改为"1"或未设值
+      {
+        name: 'srffrontuf',
+        prop: 'srffrontuf',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'srfupdatedate',
+        prop: 'updatedate',
+        dataType: 'DATETIME',
+      },
+      {
+        name: 'srforikey',
+      },
+      {
+        name: 'srfkey',
+        prop: 'ibizsample0021id',
+        dataType: 'GUID',
+      },
+      {
+        name: 'srfmajortext',
+        prop: 'ibizsample0021name',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'srftempmode',
+      },
+      {
+        name: 'srfuf',
+      },
+      {
+        name: 'srfdeid',
+      },
+      {
+        name: 'srfsourcekey',
+      },
+      {
+        name: 'deptheads',
+        prop: 'deptheads',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'ibizsample0021id',
+        prop: 'ibizsample0021id',
+        dataType: 'GUID',
+      },
+      {
+        name: 'ibizsample0021',
+        prop: 'ibizsample0021id',
+        dataType: 'FONTKEY',
+      },
+    ]
+  }
+
+}
\ No newline at end of file

app_Web/src/widgets/ibizsample0021/start001-form/start001-form.less

+// 基于 @CONTROL/表单/CONTROL.less.ftl 生成
+.ivu-tabs-no-animation>.ivu-tabs-content{
+    padding: 0 16px;
+}
+.ivu-card-head{
+    padding: 14px 0;
+}
+.app-form {
+    overflow: auto;
+    padding: 6px;
+    > .ivu-row {
+        > .ivu-tabs {
+            height: 100%;
+            display: flex;
+            flex-direction: column;
+            > .ivu-tabs-content {
+                flex-grow: 1;
+                overflow: auto;
+                > .ivu-tabs-tabpane {
+                    height: 100%;
+                }
+            }
+        }
+    }
+}
+.app-tabpanel-flex {
+    height: 100%;
+    > .ivu-tabs-content {
+        height: calc(100% - 52px);
+        > .ivu-tabs-tabpane {
+            height: 100%;
+        }
+    }
+}
+
+.app-form {
+    >.ivu-row:nth-child(2) {
+        >.ivu-col:nth-child(1) {
+            >.ivu-row.app-form-group.app-group-hiddden-caption:nth-child(1) {
+                margin-top: 12px;
+            }
+        }
+    }
+}
+.app-form{
+  // 表单行间距
+  .app-form-item{
+    margin-bottom: 20px;
+  }
+  // 表单按钮margin
+  .app-form-button{
+      margin:0 6px;
+  }
+}
+// this is less

app_Web/src/widgets/ibizsample0021/start001-form/start001-form.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import Start001Base from './start001-form-base.vue';
+
+ 
+// 基于 @CONTROL/@MACRO/CONTROL/CONTROL.vue.ftl 生成
+@Component({
+    components: {
+         
+    }
+})
+export default class Start001 extends Start001Base {
+
+}
+</script>
\ No newline at end of file

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZSample0021/PSFORMS/Start001.json

+{
+  "codeName" : "Start001",
+  "controlType" : "FORM",
+  "getCreatePSControlAction" : {
+    "modelref" : true,
+    "id" : "create"
+  },
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZSample0021/PSFORMS/Start001.json",
+  "getGetDraftFromPSControlAction" : {
+    "modelref" : true,
+    "id" : "loaddraftfrom"
+  },
+  "getGetDraftPSControlAction" : {
+    "modelref" : true,
+    "id" : "loaddraft"
+  },
+  "getGetPSControlAction" : {
+    "modelref" : true,
+    "id" : "load"
+  },
+  "logicName" : "流程启动",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZSample0021.json"
+  },
+  "getPSDEFormItems" : [ {
+    "id" : "srfupdatedate",
+    "hidden" : true,
+    "dataType" : 5,
+    "getPSAppDEField" : {
+      "name" : "UPDATEDATE",
+      "codeName" : "UpdateDate"
+    }
+  }, {
+    "id" : "srforikey",
+    "hidden" : true,
+    "dataType" : 25
+  }, {
+    "id" : "srfkey",
+    "hidden" : true,
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "IBIZSAMPLE0021ID",
+      "codeName" : "IBIZSample0021Id"
+    }
+  }, {
+    "id" : "srfmajortext",
+    "hidden" : true,
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "IBIZSAMPLE0021NAME",
+      "codeName" : "IBIZSample0021Name"
+    }
+  }, {
+    "id" : "srftempmode",
+    "hidden" : true,
+    "dataType" : 25
+  }, {
+    "id" : "srfuf",
+    "hidden" : true,
+    "dataType" : 25
+  }, {
+    "id" : "srfdeid",
+    "hidden" : true,
+    "dataType" : 25
+  }, {
+    "id" : "srfsourcekey",
+    "hidden" : true,
+    "dataType" : 25
+  }, {
+    "id" : "deptheads",
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "DEPTHEADS",
+      "codeName" : "DeptHeads"
+    }
+  }, {
+    "id" : "ibizsample0021id",
+    "hidden" : true,
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "IBIZSAMPLE0021ID",
+      "codeName" : "IBIZSample0021Id"
+    }
+  } ],
+  "getPSDEFormPages" : [ {
+    "caption" : "基本信息",
+    "codeName" : "formpage1",
+    "detailStyle" : "DEFAULT",
+    "detailType" : "FORMPAGE",
+    "name" : "formpage1",
+    "getPSDEFormDetails" : [ {
+      "actionGroupExtractMode" : "ITEM",
+      "caption" : "订单基本信息",
+      "codeName" : "group1",
+      "detailStyle" : "DEFAULT",
+      "detailType" : "GROUPPANEL",
+      "name" : "group1",
+      "getPSDEFormDetails" : [ {
+        "caption" : "部门领导",
+        "codeName" : "deptheads",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "deptheads",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "DEPTHEADS",
+          "codeName" : "DeptHeads"
+        },
+        "getPSEditor" : {
+          "editorParams" : {
+            "multiple" : "false",
+            "url" : "/wfcore/wfgroups/DepartmentHeads/wfmembers/fetchdefault?n_mdeptid_eq=${srforgsectorid}&sort=showorder,asc",
+            "AC" : "TRUE",
+            "fillMap" : "{id:'userid',label:'personname'}",
+            "PICKUPVIEW" : "TRUE",
+            "REALSTYLECODE" : "COMMONMICROCOM"
+          },
+          "editorStyle" : "COMMONMICROCOM",
+          "editorType" : "PICKER",
+          "handlerType" : "PickupText",
+          "name" : "deptheads",
+          "enableAC" : true,
+          "enablePickupView" : true,
+          "forceSelection" : true,
+          "showTrigger" : true,
+          "singleSelect" : true
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "allowEmpty" : true,
+        "showCaption" : true
+      } ],
+      "getPSLayout" : {
+        "columnCount" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "infoGroupMode" : false,
+      "showCaption" : false
+    } ],
+    "getPSLayout" : {
+      "columnCount" : 24,
+      "layout" : "TABLE_24COL"
+    },
+    "infoGroupMode" : false
+  } ],
+  "getPSLayout" : {
+    "columnCount" : 24,
+    "layout" : "TABLE_24COL"
+  },
+  "getRemovePSControlAction" : {
+    "modelref" : true,
+    "id" : "remove"
+  },
+  "tabHeaderPos" : "TOP",
+  "getUpdatePSControlAction" : {
+    "modelref" : true,
+    "id" : "update"
+  },
+  "getWFStartPSControlAction" : {
+    "modelref" : true,
+    "id" : "WFSTART"
+  },
+  "getWFSubmitPSControlAction" : {
+    "modelref" : true,
+    "id" : "WFSUBMIT"
+  },
+  "noTabHeader" : true,
+  "modelid" : "E0FF925E-F2F5-4E19-9974-63CE5B13055F",
+  "modeltype" : "PSDEFORM_EDITFORM"
+}
\ No newline at end of file

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZSample0021EditView.json

@@ -344,6 +344,10 @@
         "codeName" : "SaveAndStart",
         "fullCodeName" : "SaveAndStart",
         "name" : "开始",
+        "getNextPSUIAction" : {
+          "modelref" : true,
+          "id" : "WFStartWizard@ACTv2"
+        },
         "predefinedType" : "EDITVIEW_SAVEANDSTARTWFACTION",
         "timeout" : 60000,
         "uIActionMode" : "SYS",

demo-boot/src/main/resources/static/remotemodel/PSWORKFLOWS/ACT/PSWFVERSIONS/ACTv2.json

@@ -199,7 +199,7 @@
   } ],
   "getPSWFProcesses" : [ {
     "codeName" : "Start001",
-    "formCodeName" : "refuseForm",
+    "formCodeName" : "Start001",
     "height" : 30,
     "leftPos" : 15,
     "logicName" : "开始",
@@ -232,17 +232,9 @@
       "id" : "C70"
     } ],
     "getPSWFProcessRoles" : [ {
-      "name" : "部门领导",
-      "getPSWFRole" : {
-        "modelref" : true,
-        "path" : "PSWFROLES/DepartmentHeads.json"
-      },
-      "userData" : "dept",
-      "userData2" : "CURDEPTID",
-      "wFProcessRoleType" : "WFROLE"
-    }, {
-      "name" : "[当前操作者]",
-      "wFProcessRoleType" : "CURACTOR"
+      "name" : "[当前数据属性]",
+      "uDField" : "DEPTHEADSID",
+      "wFProcessRoleType" : "UDACTOR"
     } ],
     "predefinedActions" : [ "SENDBACK", "ADDSTEPBEFORE", "REASSIGN" ],
     "timeout" : 6,

demo-boot/src/main/resources/static/remotemodel/PSWORKFLOWS/ACT/PSWFVERSIONS/ACTv2.json.bpmn

@@ -4,7 +4,7 @@
         <extensionElements>
             <flowable:eventListener delegateExpression="${processInstanceListener}"  />
             <flowable:field name="refgroups">
-                <flowable:string>DepartmentHeads|部门领导|USERGROUP,GeneralManager|总经理|USERGROUP,FinancialManager|财务经理|USERGROUP,FinancialDirector|财务总监|USERGROUP</flowable:string>
+                <flowable:string>GeneralManager|总经理|USERGROUP,FinancialManager|财务经理|USERGROUP,FinancialDirector|财务总监|USERGROUP</flowable:string>
             </flowable:field>
             <flowable:field name="bookings">
                 <flowable:string>ibizsample0021</flowable:string>
@@ -34,10 +34,10 @@
 
      <startEvent id="sid-137c359f364406040df60ee70baba8a0" name="开始">
           <extensionElements>
-            <flowable:form process-form="refuseForm" wfversion="2"/>
+            <flowable:form process-form="Start001" wfversion="2"/>
           </extensionElements>
      </startEvent>
-     <userTask flowable:category="${businessKey}"  flowable:dueDate="PT6M"  flowable:candidateUsers="${activedata.createman},${wfCoreService.getGroupUsers('DepartmentHeads|dept|CURDEPTID',execution)},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-5-b43328c7712bd3739742121269b6c386" name="部门经理审核" >
+     <userTask flowable:category="${businessKey}"  flowable:dueDate="PT6M"  flowable:candidateUsers="${activedata.deptheadsid},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-5-b43328c7712bd3739742121269b6c386" name="部门经理审核" >
          <documentation>${majortext}</documentation>
          <extensionElements>
          <flowable:form procfunc="sendback;addstepbefore;reassign" process-form="operationForm"  />