xignzi006 发布系统代码

app_CRM/src/locale/lanres/entities/account/account_en_US.ts

@@ -369,6 +369,7 @@ export default {
 			donotphone: "不允许电话联络", 
 			donotfax: "不允许使用传真", 
 			donotpostalmail: "不允许使用邮件", 
+			parentaccountid: "上级单位", 
 			accountid: "客户", 
 		},
 		uiactions: {
@@ -525,6 +526,7 @@ export default {
 			tickersymbol: "股票代号", 
 			customertypecode: "关系类型", 
 			defaultpricelevelname: "价目表", 
+			parentaccountid: "上级单位", 
 			accountid: "客户", 
 		},
 		uiactions: {
@@ -653,6 +655,7 @@ export default {
 			srfsourcekey: "", 
 			primarycontactname: "主要联系人", 
 			emailaddress1: "电子邮件", 
+			primarycontactid: "主要联系人", 
 			accountid: "客户", 
 		},
 		uiactions: {
@@ -691,6 +694,48 @@ export default {
 		uiactions: {
 		},
 	},
+	byparentkeytoolbar_toolbar: {
+		tbitem1_quickcreate: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem2: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem4: {
+			caption: "Edit",
+			tip: "Edit {0}",
+		},
+		tbitem6: {
+			caption: "Copy",
+			tip: "Copy {0}",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "Remove",
+			tip: "Remove {0}",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem13: {
+			caption: "Export",
+			tip: "Export {0} Data To Excel",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem19: {
+			caption: "Filter",
+			tip: "Filter",
+		},
+	},
 	editviewtoolbar_toolbar: {
 		tbitem1: {
 			caption: "Save And Close",
@@ -747,48 +792,6 @@ export default {
 			tip: "关闭",
 		},
 	},
-	byparentkeytoolbar_toolbar: {
-		tbitem1_quickcreate: {
-			caption: "新建",
-			tip: "新建",
-		},
-		tbitem2: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem4: {
-			caption: "Edit",
-			tip: "Edit {0}",
-		},
-		tbitem6: {
-			caption: "Copy",
-			tip: "Copy {0}",
-		},
-		tbitem7: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem8: {
-			caption: "Remove",
-			tip: "Remove {0}",
-		},
-		tbitem9: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem13: {
-			caption: "Export",
-			tip: "Export {0} Data To Excel",
-		},
-		tbitem10: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem19: {
-			caption: "Filter",
-			tip: "Filter",
-		},
-	},
 	treegridexviewtoolbar_toolbar: {
 		tbitem1_quickcreate: {
 			caption: "新建",

app_CRM/src/locale/lanres/entities/account/account_zh_CN.ts

@@ -368,6 +368,7 @@ export default {
 			donotphone: "不允许电话联络", 
 			donotfax: "不允许使用传真", 
 			donotpostalmail: "不允许使用邮件", 
+			parentaccountid: "上级单位", 
 			accountid: "客户", 
 		},
 		uiactions: {
@@ -524,6 +525,7 @@ export default {
 			tickersymbol: "股票代号", 
 			customertypecode: "关系类型", 
 			defaultpricelevelname: "价目表", 
+			parentaccountid: "上级单位", 
 			accountid: "客户", 
 		},
 		uiactions: {
@@ -652,6 +654,7 @@ export default {
 			srfsourcekey: "", 
 			primarycontactname: "主要联系人", 
 			emailaddress1: "电子邮件", 
+			primarycontactid: "主要联系人", 
 			accountid: "客户", 
 		},
 		uiactions: {
@@ -690,6 +693,48 @@ export default {
 		uiactions: {
 		},
 	},
+	byparentkeytoolbar_toolbar: {
+		tbitem1_quickcreate: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem2: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem4: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		tbitem6: {
+			caption: "拷贝",
+			tip: "拷贝",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "删除",
+			tip: "删除",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem13: {
+			caption: "导出",
+			tip: "导出",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem19: {
+			caption: "过滤",
+			tip: "过滤",
+		},
+	},
 	editviewtoolbar_toolbar: {
 		tbitem1: {
 			caption: "保存并关闭",
@@ -746,48 +791,6 @@ export default {
 			tip: "关闭",
 		},
 	},
-	byparentkeytoolbar_toolbar: {
-		tbitem1_quickcreate: {
-			caption: "新建",
-			tip: "新建",
-		},
-		tbitem2: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem4: {
-			caption: "编辑",
-			tip: "编辑",
-		},
-		tbitem6: {
-			caption: "拷贝",
-			tip: "拷贝",
-		},
-		tbitem7: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem8: {
-			caption: "删除",
-			tip: "删除",
-		},
-		tbitem9: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem13: {
-			caption: "导出",
-			tip: "导出",
-		},
-		tbitem10: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem19: {
-			caption: "过滤",
-			tip: "过滤",
-		},
-	},
 	treegridexviewtoolbar_toolbar: {
 		tbitem1_quickcreate: {
 			caption: "新建",

app_CRM/src/locale/lanres/entities/contact/contact_en_US.ts

@@ -289,56 +289,6 @@ export default {
       		title: "联系人信息",
 		},
 	},
-	abstractedit_form: {
-		details: {
-			group1: "联系人基本信息", 
-			formpage1: "基本信息", 
-			srfupdatedate: "更新时间", 
-			srforikey: "", 
-			srfkey: "联系人", 
-			srfmajortext: "全名", 
-			srftempmode: "", 
-			srfuf: "", 
-			srfdeid: "", 
-			srfsourcekey: "", 
-			fullname: "全名", 
-			jobtitle: "职务", 
-			customername: "客户", 
-			emailaddress1: "电子邮件", 
-			telephone1: "商务电话", 
-			mobilephone: "移动电话", 
-			fax: "传真", 
-			customerid: "客户", 
-			contactid: "联系人", 
-		},
-		uiactions: {
-		},
-	},
-	quickcreate_form: {
-		details: {
-			group1: "联系人基本信息", 
-			formpage1: "基本信息", 
-			srfupdatedate: "更新时间", 
-			srforikey: "", 
-			srfkey: "联系人", 
-			srfmajortext: "全名", 
-			srftempmode: "", 
-			srfuf: "", 
-			srfdeid: "", 
-			srfsourcekey: "", 
-			fullname: "全名", 
-			jobtitle: "职务", 
-			customername: "客户", 
-			emailaddress1: "电子邮件", 
-			telephone1: "商务电话", 
-			mobilephone: "移动电话", 
-			fax: "传真", 
-			customerid: "客户", 
-			contactid: "联系人", 
-		},
-		uiactions: {
-		},
-	},
 	abstractinfo_form: {
 		details: {
 			group1: "联系人基本信息", 
@@ -479,6 +429,56 @@ export default {
         contact_edit_datapanel: "编辑头部信息",
 		},
 	},
+	quickcreate_form: {
+		details: {
+			group1: "联系人基本信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "联系人", 
+			srfmajortext: "全名", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			fullname: "全名", 
+			jobtitle: "职务", 
+			customername: "客户", 
+			emailaddress1: "电子邮件", 
+			telephone1: "商务电话", 
+			mobilephone: "移动电话", 
+			fax: "传真", 
+			customerid: "客户", 
+			contactid: "联系人", 
+		},
+		uiactions: {
+		},
+	},
+	abstractedit_form: {
+		details: {
+			group1: "联系人基本信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "联系人", 
+			srfmajortext: "全名", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			fullname: "全名", 
+			jobtitle: "职务", 
+			customername: "客户", 
+			emailaddress1: "电子邮件", 
+			telephone1: "商务电话", 
+			mobilephone: "移动电话", 
+			fax: "传真", 
+			customerid: "客户", 
+			contactid: "联系人", 
+		},
+		uiactions: {
+		},
+	},
 	marketedit_form: {
 		details: {
 			group1: "联系人基本信息", 

app_CRM/src/locale/lanres/entities/contact/contact_zh_CN.ts

@@ -288,56 +288,6 @@ export default {
       		title: "联系人信息",
 		},
 	},
-	abstractedit_form: {
-		details: {
-			group1: "联系人基本信息", 
-			formpage1: "基本信息", 
-			srfupdatedate: "更新时间", 
-			srforikey: "", 
-			srfkey: "联系人", 
-			srfmajortext: "全名", 
-			srftempmode: "", 
-			srfuf: "", 
-			srfdeid: "", 
-			srfsourcekey: "", 
-			fullname: "全名", 
-			jobtitle: "职务", 
-			customername: "客户", 
-			emailaddress1: "电子邮件", 
-			telephone1: "商务电话", 
-			mobilephone: "移动电话", 
-			fax: "传真", 
-			customerid: "客户", 
-			contactid: "联系人", 
-		},
-		uiactions: {
-		},
-	},
-	quickcreate_form: {
-		details: {
-			group1: "联系人基本信息", 
-			formpage1: "基本信息", 
-			srfupdatedate: "更新时间", 
-			srforikey: "", 
-			srfkey: "联系人", 
-			srfmajortext: "全名", 
-			srftempmode: "", 
-			srfuf: "", 
-			srfdeid: "", 
-			srfsourcekey: "", 
-			fullname: "全名", 
-			jobtitle: "职务", 
-			customername: "客户", 
-			emailaddress1: "电子邮件", 
-			telephone1: "商务电话", 
-			mobilephone: "移动电话", 
-			fax: "传真", 
-			customerid: "客户", 
-			contactid: "联系人", 
-		},
-		uiactions: {
-		},
-	},
 	abstractinfo_form: {
 		details: {
 			group1: "联系人基本信息", 
@@ -478,6 +428,56 @@ export default {
 			contact_edit_datapanel: "编辑头部信息",
 		},
 	},
+	quickcreate_form: {
+		details: {
+			group1: "联系人基本信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "联系人", 
+			srfmajortext: "全名", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			fullname: "全名", 
+			jobtitle: "职务", 
+			customername: "客户", 
+			emailaddress1: "电子邮件", 
+			telephone1: "商务电话", 
+			mobilephone: "移动电话", 
+			fax: "传真", 
+			customerid: "客户", 
+			contactid: "联系人", 
+		},
+		uiactions: {
+		},
+	},
+	abstractedit_form: {
+		details: {
+			group1: "联系人基本信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "联系人", 
+			srfmajortext: "全名", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			fullname: "全名", 
+			jobtitle: "职务", 
+			customername: "客户", 
+			emailaddress1: "电子邮件", 
+			telephone1: "商务电话", 
+			mobilephone: "移动电话", 
+			fax: "传真", 
+			customerid: "客户", 
+			contactid: "联系人", 
+		},
+		uiactions: {
+		},
+	},
 	marketedit_form: {
 		details: {
 			group1: "联系人基本信息", 

app_CRM/src/locale/lanres/entities/invoice/invoice_en_US.ts

@@ -303,44 +303,6 @@ export default {
 			tip: "Filter",
 		},
 	},
-	editviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "Save",
-			tip: "Save",
-		},
-		tbitem4: {
-			caption: "Save And New",
-			tip: "Save And New",
-		},
-		tbitem5: {
-			caption: "Save And Close",
-			tip: "Save And Close Window",
-		},
-		tbitem6: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem7: {
-			caption: "Remove And Close",
-			tip: "Remove And Close Window",
-		},
-		tbitem8: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem12: {
-			caption: "New",
-			tip: "New",
-		},
-		tbitem13: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem14: {
-			caption: "Copy",
-			tip: "Copy {0}",
-		},
-	},
 	byparentkeytoolbar_toolbar: {
 		tbitem1_quickcreate: {
 			caption: "新建",
@@ -383,4 +345,42 @@ export default {
 			tip: "Filter",
 		},
 	},
+	editviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "Save",
+			tip: "Save",
+		},
+		tbitem4: {
+			caption: "Save And New",
+			tip: "Save And New",
+		},
+		tbitem5: {
+			caption: "Save And Close",
+			tip: "Save And Close Window",
+		},
+		tbitem6: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem7: {
+			caption: "Remove And Close",
+			tip: "Remove And Close Window",
+		},
+		tbitem8: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem12: {
+			caption: "New",
+			tip: "New",
+		},
+		tbitem13: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem14: {
+			caption: "Copy",
+			tip: "Copy {0}",
+		},
+	},
 };
\ No newline at end of file

app_CRM/src/locale/lanres/entities/invoice/invoice_zh_CN.ts

@@ -302,44 +302,6 @@ export default {
 			tip: "过滤",
 		},
 	},
-	editviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "保存",
-			tip: "保存",
-		},
-		tbitem4: {
-			caption: "保存并新建",
-			tip: "保存并新建",
-		},
-		tbitem5: {
-			caption: "保存并关闭",
-			tip: "保存并关闭",
-		},
-		tbitem6: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem7: {
-			caption: "删除并关闭",
-			tip: "删除并关闭",
-		},
-		tbitem8: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem12: {
-			caption: "新建",
-			tip: "新建",
-		},
-		tbitem13: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem14: {
-			caption: "拷贝",
-			tip: "拷贝",
-		},
-	},
 	byparentkeytoolbar_toolbar: {
 		tbitem1_quickcreate: {
 			caption: "新建",
@@ -382,4 +344,42 @@ export default {
 			tip: "过滤",
 		},
 	},
+	editviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "保存",
+			tip: "保存",
+		},
+		tbitem4: {
+			caption: "保存并新建",
+			tip: "保存并新建",
+		},
+		tbitem5: {
+			caption: "保存并关闭",
+			tip: "保存并关闭",
+		},
+		tbitem6: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem7: {
+			caption: "删除并关闭",
+			tip: "删除并关闭",
+		},
+		tbitem8: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem12: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem13: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem14: {
+			caption: "拷贝",
+			tip: "拷贝",
+		},
+	},
 };
\ No newline at end of file

app_CRM/src/locale/lanres/entities/lead/lead_en_US.ts

@@ -222,32 +222,6 @@ export default {
       		title: "授予资格",
 		},
 	},
-	quickcreate_form: {
-		details: {
-			group1: "联系人信息", 
-			formpage1: "基本信息", 
-			srfupdatedate: "更新时间", 
-			srforikey: "", 
-			srfkey: "潜在顾客", 
-			srfmajortext: "姓名", 
-			srftempmode: "", 
-			srfuf: "", 
-			srfdeid: "", 
-			srfsourcekey: "", 
-			subject: "主题", 
-			budgetamount: "预算金额", 
-			purchasetimeframe: "购买时间范围", 
-			leadsourcecode: "潜在顾客来源", 
-			fullname: "姓名", 
-			companyname: "公司名称", 
-			jobtitle: "职务", 
-			mobilephone: "移动电话", 
-			emailaddress1: "电子邮件", 
-			leadid: "潜在顾客", 
-		},
-		uiactions: {
-		},
-	},
 	contactinfo_form: {
 		details: {
 			group1: "潜在顾客基本信息", 
@@ -361,6 +335,32 @@ export default {
 		uiactions: {
 		},
 	},
+	quickcreate_form: {
+		details: {
+			group1: "联系人信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "潜在顾客", 
+			srfmajortext: "姓名", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			subject: "主题", 
+			budgetamount: "预算金额", 
+			purchasetimeframe: "购买时间范围", 
+			leadsourcecode: "潜在顾客来源", 
+			fullname: "姓名", 
+			companyname: "公司名称", 
+			jobtitle: "职务", 
+			mobilephone: "移动电话", 
+			emailaddress1: "电子邮件", 
+			leadid: "潜在顾客", 
+		},
+		uiactions: {
+		},
+	},
 	main_form: {
 		details: {
 			group1: "lead基本信息", 

app_CRM/src/locale/lanres/entities/lead/lead_zh_CN.ts

@@ -221,32 +221,6 @@ export default {
       		title: "授予资格",
 		},
 	},
-	quickcreate_form: {
-		details: {
-			group1: "联系人信息", 
-			formpage1: "基本信息", 
-			srfupdatedate: "更新时间", 
-			srforikey: "", 
-			srfkey: "潜在顾客", 
-			srfmajortext: "姓名", 
-			srftempmode: "", 
-			srfuf: "", 
-			srfdeid: "", 
-			srfsourcekey: "", 
-			subject: "主题", 
-			budgetamount: "预算金额", 
-			purchasetimeframe: "购买时间范围", 
-			leadsourcecode: "潜在顾客来源", 
-			fullname: "姓名", 
-			companyname: "公司名称", 
-			jobtitle: "职务", 
-			mobilephone: "移动电话", 
-			emailaddress1: "电子邮件", 
-			leadid: "潜在顾客", 
-		},
-		uiactions: {
-		},
-	},
 	contactinfo_form: {
 		details: {
 			group1: "潜在顾客基本信息", 
@@ -360,6 +334,32 @@ export default {
 		uiactions: {
 		},
 	},
+	quickcreate_form: {
+		details: {
+			group1: "联系人信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "潜在顾客", 
+			srfmajortext: "姓名", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			subject: "主题", 
+			budgetamount: "预算金额", 
+			purchasetimeframe: "购买时间范围", 
+			leadsourcecode: "潜在顾客来源", 
+			fullname: "姓名", 
+			companyname: "公司名称", 
+			jobtitle: "职务", 
+			mobilephone: "移动电话", 
+			emailaddress1: "电子邮件", 
+			leadid: "潜在顾客", 
+		},
+		uiactions: {
+		},
+	},
 	main_form: {
 		details: {
 			group1: "lead基本信息", 

app_CRM/src/locale/lanres/entities/opportunity/opportunity_en_US.ts

@@ -355,6 +355,44 @@ export default {
 		uiactions: {
 		},
 	},
+	conoppgridviewtoolbar_toolbar: {
+		deuiaction1: {
+			caption: "New",
+			tip: "New",
+		},
+		tbitem2: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem4: {
+			caption: "Edit",
+			tip: "Edit {0}",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "Remove",
+			tip: "Remove {0}",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem13: {
+			caption: "Export",
+			tip: "Export {0} Data To Excel",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem19: {
+			caption: "Filter",
+			tip: "Filter",
+		},
+	},
 	editviewtoolbar_toolbar: {
 		tbitem1: {
 			caption: "Save And Close",
@@ -529,42 +567,4 @@ export default {
 			tip: "Filter",
 		},
 	},
-	conoppgridviewtoolbar_toolbar: {
-		deuiaction1: {
-			caption: "New",
-			tip: "New",
-		},
-		tbitem2: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem4: {
-			caption: "Edit",
-			tip: "Edit {0}",
-		},
-		tbitem7: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem8: {
-			caption: "Remove",
-			tip: "Remove {0}",
-		},
-		tbitem9: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem13: {
-			caption: "Export",
-			tip: "Export {0} Data To Excel",
-		},
-		tbitem10: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem19: {
-			caption: "Filter",
-			tip: "Filter",
-		},
-	},
 };
\ No newline at end of file

app_CRM/src/locale/lanres/entities/opportunity/opportunity_zh_CN.ts

@@ -354,6 +354,44 @@ export default {
 		uiactions: {
 		},
 	},
+	conoppgridviewtoolbar_toolbar: {
+		deuiaction1: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem2: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem4: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "删除",
+			tip: "删除",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem13: {
+			caption: "导出",
+			tip: "导出",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem19: {
+			caption: "过滤",
+			tip: "过滤",
+		},
+	},
 	editviewtoolbar_toolbar: {
 		tbitem1: {
 			caption: "保存并关闭",
@@ -528,42 +566,4 @@ export default {
 			tip: "过滤",
 		},
 	},
-	conoppgridviewtoolbar_toolbar: {
-		deuiaction1: {
-			caption: "新建",
-			tip: "新建",
-		},
-		tbitem2: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem4: {
-			caption: "编辑",
-			tip: "编辑",
-		},
-		tbitem7: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem8: {
-			caption: "删除",
-			tip: "删除",
-		},
-		tbitem9: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem13: {
-			caption: "导出",
-			tip: "导出",
-		},
-		tbitem10: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem19: {
-			caption: "过滤",
-			tip: "过滤",
-		},
-	},
 };
\ No newline at end of file

app_CRM/src/locale/lanres/entities/sales-order/sales-order_en_US.ts

@@ -385,7 +385,7 @@ export default {
 			tip: "Filter",
 		},
 	},
-	finishgridviewtoolbar_toolbar: {
+	byparentkeytoolbar_toolbar: {
 		tbitem1_quickcreate: {
 			caption: "新建",
 			tip: "新建",
@@ -427,7 +427,7 @@ export default {
 			tip: "Filter",
 		},
 	},
-	invoicegridviewtoolbar_toolbar: {
+	finishgridviewtoolbar_toolbar: {
 		tbitem1_quickcreate: {
 			caption: "新建",
 			tip: "新建",
@@ -469,7 +469,7 @@ export default {
 			tip: "Filter",
 		},
 	},
-	cancelgridviewtoolbar_toolbar: {
+	invoicegridviewtoolbar_toolbar: {
 		tbitem1_quickcreate: {
 			caption: "新建",
 			tip: "新建",
@@ -511,7 +511,7 @@ export default {
 			tip: "Filter",
 		},
 	},
-	byparentkeytoolbar_toolbar: {
+	cancelgridviewtoolbar_toolbar: {
 		tbitem1_quickcreate: {
 			caption: "新建",
 			tip: "新建",

app_CRM/src/locale/lanres/entities/sales-order/sales-order_zh_CN.ts

@@ -384,7 +384,7 @@ export default {
 			tip: "过滤",
 		},
 	},
-	finishgridviewtoolbar_toolbar: {
+	byparentkeytoolbar_toolbar: {
 		tbitem1_quickcreate: {
 			caption: "新建",
 			tip: "新建",
@@ -426,7 +426,7 @@ export default {
 			tip: "过滤",
 		},
 	},
-	invoicegridviewtoolbar_toolbar: {
+	finishgridviewtoolbar_toolbar: {
 		tbitem1_quickcreate: {
 			caption: "新建",
 			tip: "新建",
@@ -468,7 +468,7 @@ export default {
 			tip: "过滤",
 		},
 	},
-	cancelgridviewtoolbar_toolbar: {
+	invoicegridviewtoolbar_toolbar: {
 		tbitem1_quickcreate: {
 			caption: "新建",
 			tip: "新建",
@@ -510,7 +510,7 @@ export default {
 			tip: "过滤",
 		},
 	},
-	byparentkeytoolbar_toolbar: {
+	cancelgridviewtoolbar_toolbar: {
 		tbitem1_quickcreate: {
 			caption: "新建",
 			tip: "新建",

app_CRM/src/service/invoice/cancel-logic-base.ts

+import InvoiceService from '@/service/invoice/invoice-service';
 import { Verify } from '@/utils/verify/verify';
 
 
@@ -58,6 +59,24 @@ export default class CancelLogicBase {
     }
 
 
+    /**
+     * 计算0节点结果
+     * 
+     * @param params 传入参数
+     */
+    public compute0Cond(params:any):boolean{
+        return true;
+    }
+
+    /**
+     * 计算1节点结果
+     * 
+     * @param params 传入参数
+     */
+    public compute1Cond(params:any):boolean{
+        return true;
+    }
+
     /**
      * 执行逻辑
      * 
@@ -69,6 +88,26 @@ export default class CancelLogicBase {
     }
 
 
+    /**
+    * 更新发票状态
+    * 
+    * @param context 应用上下文
+    * @param params 传入参数
+    */
+    private async executeDeaction1(context:any,params:any,isloading:boolean){
+        // 行为处理节点
+        let result: any;
+        let actionParam:any = this.paramsMap.get('Default');
+        const targetService:InvoiceService = new InvoiceService();
+        if (targetService['Update'] && targetService['Update'] instanceof Function) {
+            result = await targetService['Update'](actionParam.context,actionParam.data, false);
+        }
+        if(result && result.status == 200){
+            Object.assign(actionParam.data,result.data);
+        return this.paramsMap.get(this.defaultParamName).data;
+        }
+    }
+
     /**
     * 开始
     * 
@@ -76,7 +115,26 @@ export default class CancelLogicBase {
     */
     private async executeBegin(context:any,params:any,isloading:boolean){
         //开始节点
-        return this.paramsMap.get(this.defaultParamName).data;
+        if(this.compute0Cond(params)){
+            return this.executePrepareparam1(context,params,isloading);   
+        }
+    }
+
+    /**
+    * 准备参数
+    * 
+    * @param context 应用上下文
+    * @param params 传入参数
+    */
+    private async executePrepareparam1(context:any,params:any,isloading:boolean){
+        // 准备参数节点
+    let tempDstParam0Context:any = this.paramsMap.get('Default').context?this.paramsMap.get('Default').context:{};
+    let tempDstParam0Data:any = this.paramsMap.get('Default').data?this.paramsMap.get('Default').data:{};
+    Object.assign(tempDstParam0Data,{statecode:"3"});
+    this.paramsMap.set('Default',{data:tempDstParam0Data,context:tempDstParam0Context});
+        if(this.compute1Cond(params)){
+            return this.executeDeaction1(context,params,isloading);   
+        }
     }
 
 

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

@@ -607,6 +607,7 @@ export const viewstate: any = {
             viewdatachange: false,
             refviews: [
                 '9224b0b14d2d99014e051f8035ba5cbf',
+                '2e9c7792c3a728896ca8902634f71983',
                 'e404dc93e70d6284d4e1a083017625ed',
                 'e4335da0a7c14a65376eecaabb771fd7',
                 '688201ee5642d41628dbf4deba002d17',

app_CRM/src/widgets/account/info-all-form/info-all-form-base.tsx

@@ -190,6 +190,7 @@ export class Info_AllEditFormBase extends EditFormControlBase {
         donotphone: null,
         donotfax: null,
         donotpostalmail: null,
+        parentaccountid: null,
         accountid: null,
         account:null,
     };
@@ -315,6 +316,8 @@ export class Info_AllEditFormBase extends EditFormControlBase {
 
         donotpostalmail: new FormItemModel({ caption: '不允许使用邮件', detailType: 'FORMITEM', name: 'donotpostalmail', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
+        parentaccountid: new FormItemModel({ caption: '上级单位', detailType: 'FORMITEM', name: 'parentaccountid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
         accountid: new FormItemModel({ caption: '客户', detailType: 'FORMITEM', name: 'accountid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
     };

app_CRM/src/widgets/account/info-all-form/info-all-form-model.ts

@@ -210,6 +210,11 @@ export default class Info_AllModel {
         prop: 'donotpostalmail',
         dataType: 'YESNO',
       },
+      {
+        name: 'parentaccountid',
+        prop: 'parentaccountid',
+        dataType: 'PICKUP',
+      },
       {
         name: 'accountid',
         prop: 'accountid',

app_CRM/src/widgets/account/info-all-form/info-all-form-service.ts

@@ -2,6 +2,7 @@ import { Http,Util,Errorlog } from '@/utils';
 import ControlService from '@/widgets/control-service';
 import AccountService from '@/service/account/account-service';
 import Info_AllModel from './info-all-form-model';
+import ContactService from '@/service/contact/contact-service';
 
 
 /**
@@ -41,6 +42,14 @@ export default class Info_AllService extends ControlService {
         this.model = new Info_AllModel();
     }
 
+    /**
+     * 联系人服务对象
+     *
+     * @type {ContactService}
+     * @memberof Info_AllService
+     */
+    public contactService: ContactService = new ContactService();
+
     /**
      * 处理数据
      *
@@ -80,6 +89,12 @@ export default class Info_AllService extends ControlService {
      */
     @Errorlog
     public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
+        if (Object.is(serviceName, 'AccountService') && Object.is(interfaceName, 'FetchDefault')) {
+            return this.doItems(this.appEntityService.FetchDefault(JSON.parse(JSON.stringify(context)), data, isloading), 'accountid', 'account');
+        }
+        if (Object.is(serviceName, 'ContactService') && Object.is(interfaceName, 'FetchDefault')) {
+            return this.doItems(this.contactService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'contactid', 'contact');
+        }
 
         return Promise.reject([])
     }

app_CRM/src/widgets/account/info-all-form/info-all-form.html

@@ -57,7 +57,24 @@
 <i-col v-show="detailsModel.parentaccountname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='parentaccountname' :itemRules="this.rules.parentaccountname" class='' :caption="$t('entities.account.info_all_form.details.parentaccountname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.parentaccountname.error" :isEmptyCaption="false" labelPos="LEFT">
     
-<app-span name='parentaccountname' :value="data.parentaccountname" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
+<app-picker 
+  :formState="formState"
+  :data="data"
+  :context="context"
+  :viewparams="viewparams"
+  :localContext ='{ }' 
+  :localParam ='{ }' 
+  :disabled="detailsModel.parentaccountname.disabled"
+  name='parentaccountname'
+  deMajorField='accountname'
+  deKeyField='account'
+  valueitem='parentaccountid' 
+  :value="data.parentaccountname"  
+  editortype="linkonly" 
+  :linkview="{ viewname: 'AccountInfo', title: $t('entities.account.views.info.title'), deResParameters: [], parameters: [{ pathName: 'accounts', parameterName: 'account' }, { pathName: 'info', parameterName: 'info' } ], width: 0, height: 0, placement: '', isRedirectView: false }" 
+  style=""  
+  @formitemvaluechange="onFormItemValueChange">
+</app-picker>
 </app-form-item>
 
 </i-col>
@@ -185,7 +202,24 @@
         <i-col v-show="detailsModel.primarycontactname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='primarycontactname' :itemRules="this.rules.primarycontactname" class='' :caption="$t('entities.account.info_all_form.details.primarycontactname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.primarycontactname.error" :isEmptyCaption="false" labelPos="LEFT">
     
-<app-span name='primarycontactname' :value="data.primarycontactname" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
+<app-picker 
+  :formState="formState"
+  :data="data"
+  :context="context"
+  :viewparams="viewparams"
+  :localContext ='{ }' 
+  :localParam ='{ }' 
+  :disabled="detailsModel.primarycontactname.disabled"
+  name='primarycontactname'
+  deMajorField='fullname'
+  deKeyField='contact'
+  valueitem='primarycontactid' 
+  :value="data.primarycontactname"  
+  editortype="linkonly" 
+  :linkview="{ viewname: 'ContactInfo', title: $t('entities.contact.views.info.title'), deResParameters: [{ pathName: 'accounts', parameterName: 'account' }, ], parameters: [{ pathName: 'contacts', parameterName: 'contact' }, { pathName: 'info', parameterName: 'info' } ], width: 0, height: 0, placement: '', isRedirectView: false }" 
+  style=""  
+  @formitemvaluechange="onFormItemValueChange">
+</app-picker>
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/account/inner-pickip-grid/inner-pickip-grid.html

@@ -31,7 +31,14 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
+                        <app-column-link deKeyField='account' :context="JSON.parse(JSON.stringify(context))" :viewparams="JSON.parse(JSON.stringify(viewparams))" :data="row" :linkview="{viewname: 'account-info', height: 0,width: 0,title: $t('entities.account.views.info.title'),placement: '', isRedirectView: false,deResParameters: [
+            ]
+            ,parameters: [
+            { pathName: 'accounts', parameterName: 'account' },
+            { pathName: 'info', parameterName: 'info' }
+            ]}" valueitem="srfkey">
                             <span>{{row.accountname}}</span>
+                        </app-column-link >
                     </template>
                 </el-table-column>
             </template>

app_CRM/src/widgets/account/main-grid/main-grid.html

@@ -31,7 +31,14 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
+                        <app-column-link deKeyField='account' :context="JSON.parse(JSON.stringify(context))" :viewparams="JSON.parse(JSON.stringify(viewparams))" :data="row" :linkview="{viewname: 'account-info', height: 0,width: 0,title: $t('entities.account.views.info.title'),placement: '', isRedirectView: false,deResParameters: [
+            ]
+            ,parameters: [
+            { pathName: 'accounts', parameterName: 'account' },
+            { pathName: 'info', parameterName: 'info' }
+            ]}" valueitem="srfkey">
                             <span>{{row.accountname}}</span>
+                        </app-column-link >
                     </template>
                 </el-table-column>
             </template>
@@ -67,7 +74,15 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
+                        <app-column-link deKeyField='contact' :context="JSON.parse(JSON.stringify(context))" :viewparams="JSON.parse(JSON.stringify(viewparams))" :data="row" :linkview="{viewname: 'contact-info', height: 0,width: 0,title: $t('entities.contact.views.info.title'),placement: '', isRedirectView: false,deResParameters: [
+            { pathName: 'accounts', parameterName: 'account' },
+            ]
+            ,parameters: [
+            { pathName: 'contacts', parameterName: 'contact' },
+            { pathName: 'info', parameterName: 'info' }
+            ]}" valueitem="primarycontactid">
                             <span>{{row.primarycontactname}}</span>
+                        </app-column-link >
                     </template>
                 </el-table-column>
             </template>
@@ -103,7 +118,14 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
+                        <app-column-link deKeyField='account' :context="JSON.parse(JSON.stringify(context))" :viewparams="JSON.parse(JSON.stringify(viewparams))" :data="row" :linkview="{viewname: 'account-info', height: 0,width: 0,title: $t('entities.account.views.info.title'),placement: '', isRedirectView: false,deResParameters: [
+            ]
+            ,parameters: [
+            { pathName: 'accounts', parameterName: 'account' },
+            { pathName: 'info', parameterName: 'info' }
+            ]}" valueitem="parentaccountid">
                             <span>{{row.parentaccountname}}</span>
+                        </app-column-link >
                     </template>
                 </el-table-column>
             </template>

app_CRM/src/widgets/contact/by-account-grid/by-account-grid.html

@@ -31,7 +31,15 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
+                        <app-column-link deKeyField='contact' :context="JSON.parse(JSON.stringify(context))" :viewparams="JSON.parse(JSON.stringify(viewparams))" :data="row" :linkview="{viewname: 'contact-info', height: 0,width: 0,title: $t('entities.contact.views.info.title'),placement: '', isRedirectView: false,deResParameters: [
+            { pathName: 'accounts', parameterName: 'account' },
+            ]
+            ,parameters: [
+            { pathName: 'contacts', parameterName: 'contact' },
+            { pathName: 'info', parameterName: 'info' }
+            ]}" valueitem="srfkey">
                             <span>{{row.fullname}}</span>
+                        </app-column-link >
                     </template>
                 </el-table-column>
             </template>

app_CRM/src/widgets/contact/main-grid/main-grid.html

@@ -31,7 +31,15 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
+                        <app-column-link deKeyField='contact' :context="JSON.parse(JSON.stringify(context))" :viewparams="JSON.parse(JSON.stringify(viewparams))" :data="row" :linkview="{viewname: 'contact-info', height: 0,width: 0,title: $t('entities.contact.views.info.title'),placement: '', isRedirectView: false,deResParameters: [
+            { pathName: 'accounts', parameterName: 'account' },
+            ]
+            ,parameters: [
+            { pathName: 'contacts', parameterName: 'contact' },
+            { pathName: 'info', parameterName: 'info' }
+            ]}" valueitem="srfkey">
                             <span>{{row.fullname}}</span>
+                        </app-column-link >
                     </template>
                 </el-table-column>
             </template>

app_CRM/src/widgets/lead-competitor/main-grid/main-grid.html

@@ -31,7 +31,15 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
+                        <app-column-link deKeyField='lead' :context="JSON.parse(JSON.stringify(context))" :viewparams="JSON.parse(JSON.stringify(viewparams))" :data="row" :linkview="{viewname: 'lead-info', height: 0,width: 0,title: $t('entities.lead.views.info.title'),placement: '', isRedirectView: false,deResParameters: [
+            { pathName: 'accounts', parameterName: 'account' },
+            ]
+            ,parameters: [
+            { pathName: 'leads', parameterName: 'lead' },
+            { pathName: 'info', parameterName: 'info' }
+            ]}" valueitem="entityid">
                             <span>{{row.entityname}}</span>
+                        </app-column-link >
                     </template>
                 </el-table-column>
             </template>

app_CRM/src/widgets/lead/main-grid/main-grid.html

@@ -31,7 +31,15 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
+                        <app-column-link deKeyField='lead' :context="JSON.parse(JSON.stringify(context))" :viewparams="JSON.parse(JSON.stringify(viewparams))" :data="row" :linkview="{viewname: 'lead-info', height: 0,width: 0,title: $t('entities.lead.views.info.title'),placement: '', isRedirectView: false,deResParameters: [
+            { pathName: 'accounts', parameterName: 'account' },
+            ]
+            ,parameters: [
+            { pathName: 'leads', parameterName: 'lead' },
+            { pathName: 'info', parameterName: 'info' }
+            ]}" valueitem="srfkey">
                             <span>{{row.fullname}}</span>
+                        </app-column-link >
                     </template>
                 </el-table-column>
             </template>

app_CRM/src/widgets/list-account/main-grid/main-grid.html

@@ -31,7 +31,14 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
+                        <app-column-link deKeyField='account' :context="JSON.parse(JSON.stringify(context))" :viewparams="JSON.parse(JSON.stringify(viewparams))" :data="row" :linkview="{viewname: 'account-info', height: 0,width: 0,title: $t('entities.account.views.info.title'),placement: '', isRedirectView: false,deResParameters: [
+            ]
+            ,parameters: [
+            { pathName: 'accounts', parameterName: 'account' },
+            { pathName: 'info', parameterName: 'info' }
+            ]}" valueitem="entity2id">
                             <span>{{row.entity2name}}</span>
+                        </app-column-link >
                     </template>
                 </el-table-column>
             </template>

app_CRM/src/widgets/list-contact/inner-grid/inner-grid.html

@@ -31,7 +31,15 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
+                        <app-column-link deKeyField='contact' :context="JSON.parse(JSON.stringify(context))" :viewparams="JSON.parse(JSON.stringify(viewparams))" :data="row" :linkview="{viewname: 'contact-info', height: 0,width: 0,title: $t('entities.contact.views.info.title'),placement: '', isRedirectView: false,deResParameters: [
+            { pathName: 'accounts', parameterName: 'account' },
+            ]
+            ,parameters: [
+            { pathName: 'contacts', parameterName: 'contact' },
+            { pathName: 'info', parameterName: 'info' }
+            ]}" valueitem="entity2id">
                             <span>{{row.entity2name}}</span>
+                        </app-column-link >
                     </template>
                 </el-table-column>
             </template>

app_CRM/src/widgets/list-contact/main-grid/main-grid.html

@@ -31,7 +31,15 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
+                        <app-column-link deKeyField='contact' :context="JSON.parse(JSON.stringify(context))" :viewparams="JSON.parse(JSON.stringify(viewparams))" :data="row" :linkview="{viewname: 'contact-info', height: 0,width: 0,title: $t('entities.contact.views.info.title'),placement: '', isRedirectView: false,deResParameters: [
+            { pathName: 'accounts', parameterName: 'account' },
+            ]
+            ,parameters: [
+            { pathName: 'contacts', parameterName: 'contact' },
+            { pathName: 'info', parameterName: 'info' }
+            ]}" valueitem="entity2id">
                             <span>{{row.entity2name}}</span>
+                        </app-column-link >
                     </template>
                 </el-table-column>
             </template>

app_CRM/src/widgets/list-lead/main-grid/main-grid.html

@@ -31,7 +31,15 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
+                        <app-column-link deKeyField='lead' :context="JSON.parse(JSON.stringify(context))" :viewparams="JSON.parse(JSON.stringify(viewparams))" :data="row" :linkview="{viewname: 'lead-info', height: 0,width: 0,title: $t('entities.lead.views.info.title'),placement: '', isRedirectView: false,deResParameters: [
+            { pathName: 'accounts', parameterName: 'account' },
+            ]
+            ,parameters: [
+            { pathName: 'leads', parameterName: 'lead' },
+            { pathName: 'info', parameterName: 'info' }
+            ]}" valueitem="entity2id">
                             <span>{{row.entity2name}}</span>
+                        </app-column-link >
                     </template>
                 </el-table-column>
             </template>

app_CRM/src/widgets/opportunity/main-grid/main-grid.html

@@ -43,7 +43,14 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
+                        <app-column-link deKeyField='account' :context="JSON.parse(JSON.stringify(context))" :viewparams="JSON.parse(JSON.stringify(viewparams))" :data="row" :linkview="{viewname: 'account-info', height: 0,width: 0,title: $t('entities.account.views.info.title'),placement: '', isRedirectView: false,deResParameters: [
+            ]
+            ,parameters: [
+            { pathName: 'accounts', parameterName: 'account' },
+            { pathName: 'info', parameterName: 'info' }
+            ]}" valueitem="parentaccountid">
                             <span>{{row.parentaccountname}}</span>
+                        </app-column-link >
                     </template>
                 </el-table-column>
             </template>
@@ -55,7 +62,15 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
+                        <app-column-link deKeyField='contact' :context="JSON.parse(JSON.stringify(context))" :viewparams="JSON.parse(JSON.stringify(viewparams))" :data="row" :linkview="{viewname: 'contact-info', height: 0,width: 0,title: $t('entities.contact.views.info.title'),placement: '', isRedirectView: false,deResParameters: [
+            { pathName: 'accounts', parameterName: 'account' },
+            ]
+            ,parameters: [
+            { pathName: 'contacts', parameterName: 'contact' },
+            { pathName: 'info', parameterName: 'info' }
+            ]}" valueitem="parentcontactid">
                             <span>{{row.parentcontactname}}</span>
+                        </app-column-link >
                     </template>
                 </el-table-column>
             </template>

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/extensions/service/InvoiceExService.java

@@ -21,16 +21,6 @@ public class InvoiceExService extends InvoiceServiceImpl {
         return com.baomidou.mybatisplus.core.toolkit.ReflectionKit.getSuperClassGenericType(this.getClass().getSuperclass(), 1);
     }
 
-    /**
-     * 自定义行为[Cancel]用户扩展
-     * @param et
-     * @return
-     */
-    @Override
-    @Transactional
-    public Invoice cancel(Invoice et) {
-        return super.cancel(et);
-    }
     /**
      * 自定义行为[Finish]用户扩展
      * @param et
@@ -41,15 +31,5 @@ public class InvoiceExService extends InvoiceServiceImpl {
     public Invoice finish(Invoice et) {
         return super.finish(et);
     }
-    /**
-     * 自定义行为[Paid]用户扩展
-     * @param et
-     * @return
-     */
-    @Override
-    @Transactional
-    public Invoice paid(Invoice et) {
-        return super.paid(et);
-    }
 }
 

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/finance/service/impl/InvoiceServiceImpl.java

@@ -63,6 +63,14 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
     @Lazy
     protected cn.ibizlab.businesscentral.core.base.service.ITransactionCurrencyService transactioncurrencyService;
 
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.businesscentral.core.finance.service.logic.IInvoiceCancelLogic cancelLogic;
+
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.businesscentral.core.finance.service.logic.IInvoicePaidLogic paidLogic;
+
     protected int batchSize = 500;
 
     @Override
@@ -131,8 +139,8 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
     @Override
     @Transactional
     public Invoice cancel(Invoice et) {
-        //自定义代码
-        return et;
+        cancelLogic.execute(et);
+         return et ;
     }
 
     @Override
@@ -149,8 +157,8 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
     @Override
     @Transactional
     public Invoice paid(Invoice et) {
-        //自定义代码
-        return et;
+        paidLogic.execute(et);
+         return et ;
     }
 
     @Override

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/finance/service/logic/impl/InvoiceCancelLogicImpl.java

@@ -26,6 +26,13 @@ public class InvoiceCancelLogicImpl implements IInvoiceCancelLogic{
     @Autowired
     private KieContainer kieContainer;
 
+    @Autowired
+    private cn.ibizlab.businesscentral.core.finance.service.IInvoiceService invoiceservice;
+
+    public cn.ibizlab.businesscentral.core.finance.service.IInvoiceService getInvoiceService() {
+        return this.invoiceservice;
+    }
+
 
     @Autowired
     private cn.ibizlab.businesscentral.core.finance.service.IInvoiceService iBzSysDefaultService;
@@ -41,6 +48,7 @@ public class InvoiceCancelLogicImpl implements IInvoiceCancelLogic{
            kieSession=kieContainer.newKieSession();
            kieSession.insert(et); 
            kieSession.setGlobal("invoicecanceldefault",et);
+           kieSession.setGlobal("invoiceservice",invoiceservice);
            kieSession.setGlobal("iBzSysInvoiceDefaultService",iBzSysDefaultService);
            kieSession.setGlobal("curuser", cn.ibizlab.businesscentral.util.security.AuthenticationUser.getAuthenticationUser());
            kieSession.startProcess("cn.ibizlab.businesscentral.core.finance.service.logic.invoicecancel");

businesscentral-core/src/main/resources/permission/systemResource.json

@@ -120,7 +120,7 @@
     "delogicname":"发票",
     "sysmoudle":{"id":"FINANCE","name":"Finance"},
     "dedataset":[{"id":"ByParentKey" , "name":"ByParentKey"},{"id":"Cancel" , "name":"已取消"},{"id":"Default" , "name":"DEFAULT"},{"id":"Paid" , "name":"已支付"}],
-    "deaction":[{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"Cancel" , "name":"取消发票" , "type":"USERCUSTOM" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Finish" , "name":"确认发票" , "type":"USERCUSTOM" },{"id":"Paid" , "name":"发票已支付" , "type":"USERCUSTOM" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" }],
+    "deaction":[{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"Cancel" , "name":"取消发票" , "type":"DELOGIC" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Finish" , "name":"确认发票" , "type":"USERCUSTOM" },{"id":"Paid" , "name":"发票已支付" , "type":"DELOGIC" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" }],
     "datascope":[{"id":"all","name":"全部数据"}, {"id":"createman","name":"创建人"}]
      }
     ,    {

businesscentral-core/src/main/resources/rules/InvoiceCancelRule.drl

@@ -4,11 +4,21 @@ import java.util.Map;
 import java.util.HashMap;
 import com.alibaba.fastjson.JSONObject;
 global cn.ibizlab.businesscentral.core.finance.domain.Invoice invoicecanceldefault;
+global cn.ibizlab.businesscentral.core.finance.service.IInvoiceService invoiceservice;
 global cn.ibizlab.businesscentral.core.finance.service.IInvoiceService iBzSysInvoiceDefaultService;
 global cn.ibizlab.businesscentral.util.security.AuthenticationUser curuser;
 
 no-loop
 
+//逻辑处理节点[更新发票状态]
+rule "deaction1"
+ruleflow-group "invoicecanceldeaction1"
+    when
+    then
+    invoiceservice.update(invoicecanceldefault);
+    update(invoicecanceldefault);//更新fact中变量值
+    end
+
 //逻辑处理节点[开始]
 rule "begin"
 ruleflow-group "invoicecancelbegin"
@@ -16,3 +26,12 @@ ruleflow-group "invoicecancelbegin"
     then
     end
 
+//逻辑处理节点[准备参数]
+rule "prepareparam1"
+ruleflow-group "invoicecancelprepareparam1"
+    when
+    then
+    invoicecanceldefault.set("statecode","3");
+    update(invoicecanceldefault);//更新fact中变量值
+    end
+

businesscentral-core/src/main/resources/rules/InvoiceCancelRuleFlow.bpmn

@@ -7,9 +7,15 @@
             <tns:import name="cn.ibizlab.businesscentral.util.helper.RuleUtils"/>
         <tns:global identifier="invoicecanceldefault" type="cn.ibizlab.businesscentral.core.finance.domain.Invoice" />
         </extensionElements>
+     <businessRuleTask activiti:exclusive="true" g:ruleFlowGroup="invoicecanceldeaction1" id="91A57E37-3A94-415C-88B2-78E546913016" implementation="http://www.jboss.org/drools/rule" name="更新发票状态"/>
+     <endEvent id="91A57E37-3A94-415C-88B2-78E546913016_End" name="End"/>
+     <sequenceFlow id="91A57E37-3A94-415C-88B2-78E546913016_End_Line" sourceRef="91A57E37-3A94-415C-88B2-78E546913016" targetRef="91A57E37-3A94-415C-88B2-78E546913016_End"/>
      <startEvent id="9A2B78B2-DC42-4EE1-96D4-507FAB73DE1D" isInterrupting="true"/>
-     <endEvent id="9A2B78B2-DC42-4EE1-96D4-507FAB73DE1D_End" name="End"/>
-     <sequenceFlow id="9A2B78B2-DC42-4EE1-96D4-507FAB73DE1D_End_Line" sourceRef="9A2B78B2-DC42-4EE1-96D4-507FAB73DE1D" targetRef="9A2B78B2-DC42-4EE1-96D4-507FAB73DE1D_End"/>
+     <businessRuleTask activiti:exclusive="true" g:ruleFlowGroup="invoicecancelprepareparam1" id="A2B8CECC-0BD2-4C05-B057-F275A2799B63" implementation="http://www.jboss.org/drools/rule" name="准备参数"/>
+     <sequenceFlow id="43A26025-AAF1-4335-B6CC-5B741ED948BC" sourceRef="9A2B78B2-DC42-4EE1-96D4-507FAB73DE1D" targetRef="A2B8CECC-0BD2-4C05-B057-F275A2799B63">
+     </sequenceFlow>
+     <sequenceFlow id="098C3875-0F81-4FBA-B62A-A69A5584846D" sourceRef="A2B8CECC-0BD2-4C05-B057-F275A2799B63" targetRef="91A57E37-3A94-415C-88B2-78E546913016">
+     </sequenceFlow>
     </process>
 </definitions>