xignzi006 发布系统代码

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

@@ -289,6 +289,31 @@ export default {
       		title: "联系人信息",
 		},
 	},
+	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: "联系人基本信息", 
@@ -431,31 +456,6 @@ 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: "联系人基本信息", 
@@ -658,26 +658,26 @@ export default {
 		uiactions: {
 		},
 	},
-	main_grid: {
+	byaccount_grid: {
 		columns: {
 			fullname: "全名",
 			emailaddress1: "电子邮件",
 			parentcustomerid: "公司名称",
 			telephone1: "商务电话",
+			uagridcolumn1: "设置主联系人",
 		},
 		uiactions: {
+        contact_setprimary: "设置为主要联系人",
 		},
 	},
-	byaccount_grid: {
+	main_grid: {
 		columns: {
 			fullname: "全名",
 			emailaddress1: "电子邮件",
 			parentcustomerid: "公司名称",
 			telephone1: "商务电话",
-			uagridcolumn1: "设置主联系人",
 		},
 		uiactions: {
-        contact_setprimary: "设置为主要联系人",
 		},
 	},
 	default_searchform: {
@@ -690,6 +690,48 @@ export default {
 		uiactions: {
 		},
 	},
+	gridviewtoolbar_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: {
 		tbitem12: {
 			caption: "关闭",
@@ -742,48 +784,6 @@ export default {
 			tip: "关闭",
 		},
 	},
-	gridviewtoolbar_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",
-		},
-	},
 	usablegridviewtoolbar_toolbar: {
 		tbitem1_quickcreate: {
 			caption: "新建",

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

@@ -288,6 +288,31 @@ export default {
       		title: "联系人信息",
 		},
 	},
+	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: "联系人基本信息", 
@@ -430,31 +455,6 @@ 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: "联系人基本信息", 
@@ -657,26 +657,26 @@ export default {
 		uiactions: {
 		},
 	},
-	main_grid: {
+	byaccount_grid: {
 		columns: {
 			fullname: "全名",
 			emailaddress1: "电子邮件",
 			parentcustomerid: "公司名称",
 			telephone1: "商务电话",
+			uagridcolumn1: "设置主联系人",
 		},
 		uiactions: {
+			contact_setprimary: "设置为主要联系人",
 		},
 	},
-	byaccount_grid: {
+	main_grid: {
 		columns: {
 			fullname: "全名",
 			emailaddress1: "电子邮件",
 			parentcustomerid: "公司名称",
 			telephone1: "商务电话",
-			uagridcolumn1: "设置主联系人",
 		},
 		uiactions: {
-			contact_setprimary: "设置为主要联系人",
 		},
 	},
 	default_searchform: {
@@ -689,6 +689,48 @@ export default {
 		uiactions: {
 		},
 	},
+	gridviewtoolbar_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: {
 		tbitem12: {
 			caption: "关闭",
@@ -741,48 +783,6 @@ export default {
 			tip: "关闭",
 		},
 	},
-	gridviewtoolbar_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: "过滤",
-		},
-	},
 	usablegridviewtoolbar_toolbar: {
 		tbitem1_quickcreate: {
 			caption: "新建",

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

@@ -201,6 +201,7 @@ export default {
 			billto_stateorprovince: "省/市/自治区", 
 			billto_city: "市/县", 
 			billto_line1: "街道", 
+			opportunityid: "商机", 
 			invoiceid: "发票", 
 		},
 		uiactions: {

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

@@ -200,6 +200,7 @@ export default {
 			billto_stateorprovince: "省/市/自治区", 
 			billto_city: "市/县", 
 			billto_line1: "街道", 
+			opportunityid: "商机", 
 			invoiceid: "发票", 
 		},
 		uiactions: {

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

@@ -518,7 +518,7 @@ export default {
 			tip: "关闭",
 		},
 	},
-	conleadgridviewtoolbar_toolbar: {
+	gridviewtoolbar_toolbar: {
 		tbitem1_quickcreate: {
 			caption: "新建",
 			tip: "新建",
@@ -560,7 +560,7 @@ export default {
 			tip: "Filter",
 		},
 	},
-	gridviewtoolbar_toolbar: {
+	conleadgridviewtoolbar_toolbar: {
 		tbitem1_quickcreate: {
 			caption: "新建",
 			tip: "新建",

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

@@ -517,7 +517,7 @@ export default {
 			tip: "关闭",
 		},
 	},
-	conleadgridviewtoolbar_toolbar: {
+	gridviewtoolbar_toolbar: {
 		tbitem1_quickcreate: {
 			caption: "新建",
 			tip: "新建",
@@ -559,7 +559,7 @@ export default {
 			tip: "过滤",
 		},
 	},
-	gridviewtoolbar_toolbar: {
+	conleadgridviewtoolbar_toolbar: {
 		tbitem1_quickcreate: {
 			caption: "新建",
 			tip: "新建",

app_CRM/src/locale/lanres/entities/quote/quote_en_US.ts

@@ -151,30 +151,6 @@ export default {
       		title: "报价单状态分页视图",
 		},
 	},
-	main_form: {
-		details: {
-			group1: "quote基本信息", 
-			formpage1: "基本信息", 
-			group2: "操作信息", 
-			formpage2: "其它", 
-			srfupdatedate: "更新时间", 
-			srforikey: "", 
-			srfkey: "报价单", 
-			srfmajortext: "报价名称", 
-			srftempmode: "", 
-			srfuf: "", 
-			srfdeid: "", 
-			srfsourcekey: "", 
-			quotename: "报价名称", 
-			createman: "建立人", 
-			createdate: "建立时间", 
-			updateman: "更新人", 
-			updatedate: "更新时间", 
-			quoteid: "报价单", 
-		},
-		uiactions: {
-		},
-	},
 	quickcreate_form: {
 		details: {
 			group1: "报价单基本信息", 
@@ -233,6 +209,7 @@ export default {
 			shippingmethodcode: "送货方式", 
 			shipto_postalcode: "送货地的邮政编码", 
 			willcall: "送货地址", 
+			opportunityid: "商机", 
 			quoteid: "报价单", 
 		},
 		uiactions: {
@@ -283,6 +260,30 @@ export default {
         quote_edit_datapanel: "编辑头部信息",
 		},
 	},
+	main_form: {
+		details: {
+			group1: "quote基本信息", 
+			formpage1: "基本信息", 
+			group2: "操作信息", 
+			formpage2: "其它", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "报价单", 
+			srfmajortext: "报价名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			quotename: "报价名称", 
+			createman: "建立人", 
+			createdate: "建立时间", 
+			updateman: "更新人", 
+			updatedate: "更新时间", 
+			quoteid: "报价单", 
+		},
+		uiactions: {
+		},
+	},
 	main_grid: {
 		columns: {
 			quotename: "报价名称",
@@ -300,82 +301,6 @@ export default {
 		uiactions: {
 		},
 	},
-	oppquagridviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "New",
-			tip: "New",
-		},
-		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: {
-		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}",
-		},
-	},
 	infotoolbar_toolbar: {
 		tbitem17_active: {
 			caption: "激活报价单",
@@ -452,6 +377,82 @@ export default {
 			tip: "Filter",
 		},
 	},
+	oppquagridviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "New",
+			tip: "New",
+		},
+		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: {
+		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}",
+		},
+	},
 	gridviewtoolbar_toolbar: {
 		tbitem1_quickcreate: {
 			caption: "新建",

app_CRM/src/locale/lanres/entities/quote/quote_zh_CN.ts

@@ -150,30 +150,6 @@ export default {
       		title: "报价单状态分页视图",
 		},
 	},
-	main_form: {
-		details: {
-			group1: "quote基本信息", 
-			formpage1: "基本信息", 
-			group2: "操作信息", 
-			formpage2: "其它", 
-			srfupdatedate: "更新时间", 
-			srforikey: "", 
-			srfkey: "报价单", 
-			srfmajortext: "报价名称", 
-			srftempmode: "", 
-			srfuf: "", 
-			srfdeid: "", 
-			srfsourcekey: "", 
-			quotename: "报价名称", 
-			createman: "建立人", 
-			createdate: "建立时间", 
-			updateman: "更新人", 
-			updatedate: "更新时间", 
-			quoteid: "报价单", 
-		},
-		uiactions: {
-		},
-	},
 	quickcreate_form: {
 		details: {
 			group1: "报价单基本信息", 
@@ -232,6 +208,7 @@ export default {
 			shippingmethodcode: "送货方式", 
 			shipto_postalcode: "送货地的邮政编码", 
 			willcall: "送货地址", 
+			opportunityid: "商机", 
 			quoteid: "报价单", 
 		},
 		uiactions: {
@@ -282,6 +259,30 @@ export default {
 			quote_edit_datapanel: "编辑头部信息",
 		},
 	},
+	main_form: {
+		details: {
+			group1: "quote基本信息", 
+			formpage1: "基本信息", 
+			group2: "操作信息", 
+			formpage2: "其它", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "报价单", 
+			srfmajortext: "报价名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			quotename: "报价名称", 
+			createman: "建立人", 
+			createdate: "建立时间", 
+			updateman: "更新人", 
+			updatedate: "更新时间", 
+			quoteid: "报价单", 
+		},
+		uiactions: {
+		},
+	},
 	main_grid: {
 		columns: {
 			quotename: "报价名称",
@@ -299,82 +300,6 @@ export default {
 		uiactions: {
 		},
 	},
-	oppquagridviewtoolbar_toolbar: {
-		tbitem3: {
-			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: {
-		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: "拷贝",
-		},
-	},
 	infotoolbar_toolbar: {
 		tbitem17_active: {
 			caption: "激活报价单",
@@ -451,6 +376,82 @@ export default {
 			tip: "过滤",
 		},
 	},
+	oppquagridviewtoolbar_toolbar: {
+		tbitem3: {
+			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: {
+		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: "拷贝",
+		},
+	},
 	gridviewtoolbar_toolbar: {
 		tbitem1_quickcreate: {
 			caption: "新建",

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

@@ -225,6 +225,7 @@ export default {
 			billto_line1: "街道", 
 			billto_postalcode: "邮政编码", 
 			salesorderid: "订单", 
+			opportunityid: "商机", 
 		},
 		uiactions: {
 		},

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

@@ -224,6 +224,7 @@ export default {
 			billto_line1: "街道", 
 			billto_postalcode: "邮政编码", 
 			salesorderid: "订单", 
+			opportunityid: "商机", 
 		},
 		uiactions: {
 		},

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

@@ -844,6 +844,7 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
+                '8bfcd7acdd1f36afc1714f1071671f2c',
             ],
         },
         {
@@ -2606,6 +2607,7 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
+                '8bfcd7acdd1f36afc1714f1071671f2c',
             ],
         },
         {
@@ -2663,6 +2665,7 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
+                '8bfcd7acdd1f36afc1714f1071671f2c',
             ],
         },
         {

app_CRM/src/widgets/invoice/info-form/info-form-base.tsx

@@ -96,6 +96,7 @@ export class InfoEditFormBase extends EditFormControlBase {
         billto_stateorprovince: null,
         billto_city: null,
         billto_line1: null,
+        opportunityid: null,
         invoiceid: null,
         invoice:null,
     };
@@ -188,6 +189,8 @@ export class InfoEditFormBase extends EditFormControlBase {
 
         billto_line1: new FormItemModel({ caption: '街道', detailType: 'FORMITEM', name: 'billto_line1', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
+        opportunityid: new FormItemModel({ caption: '商机', detailType: 'FORMITEM', name: 'opportunityid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
         invoiceid: new FormItemModel({ caption: '发票', detailType: 'FORMITEM', name: 'invoiceid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
     };

app_CRM/src/widgets/invoice/info-form/info-form-model.ts

@@ -165,6 +165,11 @@ export default class InfoModel {
         prop: 'billto_line1',
         dataType: 'TEXT',
       },
+      {
+        name: 'opportunityid',
+        prop: 'opportunityid',
+        dataType: 'PICKUP',
+      },
       {
         name: 'invoiceid',
         prop: 'invoiceid',

app_CRM/src/widgets/invoice/info-form/info-form-service.ts

@@ -2,6 +2,7 @@ import { Http,Util,Errorlog } from '@/utils';
 import ControlService from '@/widgets/control-service';
 import InvoiceService from '@/service/invoice/invoice-service';
 import InfoModel from './info-form-model';
+import OpportunityService from '@/service/opportunity/opportunity-service';
 
 
 /**
@@ -41,6 +42,14 @@ export default class InfoService extends ControlService {
         this.model = new InfoModel();
     }
 
+    /**
+     * 商机服务对象
+     *
+     * @type {OpportunityService}
+     * @memberof InfoService
+     */
+    public opportunityService: OpportunityService = new OpportunityService();
+
     /**
      * 处理数据
      *
@@ -80,6 +89,9 @@ export default class InfoService extends ControlService {
      */
     @Errorlog
     public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
+        if (Object.is(serviceName, 'OpportunityService') && Object.is(interfaceName, 'FetchDefault')) {
+            return this.doItems(this.opportunityService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'opportunityid', 'opportunity');
+        }
 
         return Promise.reject([])
     }

app_CRM/src/widgets/invoice/info-form/info-form.html

@@ -141,7 +141,24 @@
         <i-col v-show="detailsModel.opportunityname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='opportunityname' :itemRules="this.rules.opportunityname" class='' :caption="$t('entities.invoice.info_form.details.opportunityname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.opportunityname.error" :isEmptyCaption="false" labelPos="LEFT">
     
-<app-span name='opportunityname' :value="data.opportunityname" :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.opportunityname.disabled"
+  name='opportunityname'
+  deMajorField='opportunityname'
+  deKeyField='opportunity'
+  valueitem='opportunityid' 
+  :value="data.opportunityname"  
+  editortype="linkonly" 
+  :linkview="{ viewname: 'OpportunityInfo', title: $t('entities.opportunity.views.info.title'), deResParameters: [{ pathName: 'accounts', parameterName: 'account' }, ], parameters: [{ pathName: 'opportunities', parameterName: 'opportunity' }, { 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/opportunity-competitor/main-grid/main-grid.html

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

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

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

app_CRM/src/widgets/quote/abstract-info-form/abstract-info-form-base.tsx

@@ -93,6 +93,7 @@ export class AbstractInfoEditFormBase extends EditFormControlBase {
         shippingmethodcode: null,
         shipto_postalcode: null,
         willcall: null,
+        opportunityid: null,
         quoteid: null,
         quote:null,
     };
@@ -173,6 +174,8 @@ export class AbstractInfoEditFormBase extends EditFormControlBase {
 
         willcall: new FormItemModel({ caption: '送货地址', detailType: 'FORMITEM', name: 'willcall', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
+        opportunityid: new FormItemModel({ caption: '商机', detailType: 'FORMITEM', name: 'opportunityid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
         quoteid: new FormItemModel({ caption: '报价单', detailType: 'FORMITEM', name: 'quoteid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
     };

app_CRM/src/widgets/quote/abstract-info-form/abstract-info-form-model.ts

@@ -148,6 +148,11 @@ export default class AbstractInfoModel {
         prop: 'willcall',
         dataType: 'YESNO',
       },
+      {
+        name: 'opportunityid',
+        prop: 'opportunityid',
+        dataType: 'PICKUP',
+      },
       {
         name: 'quoteid',
         prop: 'quoteid',

app_CRM/src/widgets/quote/abstract-info-form/abstract-info-form-service.ts

@@ -2,6 +2,7 @@ import { Http,Util,Errorlog } from '@/utils';
 import ControlService from '@/widgets/control-service';
 import QuoteService from '@/service/quote/quote-service';
 import AbstractInfoModel from './abstract-info-form-model';
+import OpportunityService from '@/service/opportunity/opportunity-service';
 
 
 /**
@@ -41,6 +42,14 @@ export default class AbstractInfoService extends ControlService {
         this.model = new AbstractInfoModel();
     }
 
+    /**
+     * 商机服务对象
+     *
+     * @type {OpportunityService}
+     * @memberof AbstractInfoService
+     */
+    public opportunityService: OpportunityService = new OpportunityService();
+
     /**
      * 处理数据
      *
@@ -80,6 +89,9 @@ export default class AbstractInfoService extends ControlService {
      */
     @Errorlog
     public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
+        if (Object.is(serviceName, 'OpportunityService') && Object.is(interfaceName, 'FetchDefault')) {
+            return this.doItems(this.opportunityService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'opportunityid', 'opportunity');
+        }
 
         return Promise.reject([])
     }

app_CRM/src/widgets/quote/abstract-info-form/abstract-info-form.html

@@ -30,7 +30,24 @@
 <i-col v-show="detailsModel.opportunityname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='opportunityname' :itemRules="this.rules.opportunityname" class='' :caption="$t('entities.quote.abstractinfo_form.details.opportunityname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.opportunityname.error" :isEmptyCaption="false" labelPos="LEFT">
     
-<app-span name='opportunityname' :value="data.opportunityname" :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.opportunityname.disabled"
+  name='opportunityname'
+  deMajorField='opportunityname'
+  deKeyField='opportunity'
+  valueitem='opportunityid' 
+  :value="data.opportunityname"  
+  editortype="linkonly" 
+  :linkview="{ viewname: 'OpportunityInfo', title: $t('entities.opportunity.views.info.title'), deResParameters: [{ pathName: 'accounts', parameterName: 'account' }, ], parameters: [{ pathName: 'opportunities', parameterName: 'opportunity' }, { 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/sales-order/info-form/info-form-base.tsx

@@ -98,6 +98,7 @@ export class InfoEditFormBase extends EditFormControlBase {
         billto_line1: null,
         billto_postalcode: null,
         salesorderid: null,
+        opportunityid: null,
         salesorder:null,
     };
 
@@ -193,5 +194,7 @@ export class InfoEditFormBase extends EditFormControlBase {
 
         salesorderid: new FormItemModel({ caption: '订单', detailType: 'FORMITEM', name: 'salesorderid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
+        opportunityid: new FormItemModel({ caption: '商机', detailType: 'FORMITEM', name: 'opportunityid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
     };
 }
\ No newline at end of file

app_CRM/src/widgets/sales-order/info-form/info-form-model.ts

@@ -175,6 +175,11 @@ export default class InfoModel {
         prop: 'salesorderid',
         dataType: 'GUID',
       },
+      {
+        name: 'opportunityid',
+        prop: 'opportunityid',
+        dataType: 'PICKUP',
+      },
       {
         name: 'salesorder',
         prop: 'salesorderid',

app_CRM/src/widgets/sales-order/info-form/info-form-service.ts

@@ -2,6 +2,7 @@ import { Http,Util,Errorlog } from '@/utils';
 import ControlService from '@/widgets/control-service';
 import SalesOrderService from '@/service/sales-order/sales-order-service';
 import InfoModel from './info-form-model';
+import OpportunityService from '@/service/opportunity/opportunity-service';
 
 
 /**
@@ -41,6 +42,14 @@ export default class InfoService extends ControlService {
         this.model = new InfoModel();
     }
 
+    /**
+     * 商机服务对象
+     *
+     * @type {OpportunityService}
+     * @memberof InfoService
+     */
+    public opportunityService: OpportunityService = new OpportunityService();
+
     /**
      * 处理数据
      *
@@ -80,6 +89,9 @@ export default class InfoService extends ControlService {
      */
     @Errorlog
     public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
+        if (Object.is(serviceName, 'OpportunityService') && Object.is(interfaceName, 'FetchDefault')) {
+            return this.doItems(this.opportunityService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'opportunityid', 'opportunity');
+        }
 
         return Promise.reject([])
     }

app_CRM/src/widgets/sales-order/info-form/info-form.html

@@ -141,7 +141,24 @@
         <i-col v-show="detailsModel.opportunityname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='opportunityname' :itemRules="this.rules.opportunityname" class='' :caption="$t('entities.salesorder.info_form.details.opportunityname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.opportunityname.error" :isEmptyCaption="false" labelPos="LEFT">
     
-<app-span name='opportunityname' :value="data.opportunityname" :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.opportunityname.disabled"
+  name='opportunityname'
+  deMajorField='opportunityname'
+  deKeyField='opportunity'
+  valueitem='opportunityid' 
+  :value="data.opportunityname"  
+  editortype="linkonly" 
+  :linkview="{ viewname: 'OpportunityInfo', title: $t('entities.opportunity.views.info.title'), deResParameters: [{ pathName: 'accounts', parameterName: 'account' }, ], parameters: [{ pathName: 'opportunities', parameterName: 'opportunity' }, { pathName: 'info', parameterName: 'info' } ], width: 0, height: 0, placement: '', isRedirectView: false }" 
+  style=""  
+  @formitemvaluechange="onFormItemValueChange">
+</app-picker>
 </app-form-item>
 
 </i-col>