xignzi006 发布系统代码

app_CRM/public/assets/json/view-config.json

@@ -2530,7 +2530,7 @@
         "memo": "系统自动添加"
     },
     "transactioncurrencyeditview": {
-        "title": "货币编辑视图",
+        "title": "货币",
         "caption": "货币",
         "viewtype": "DEEDITVIEW",
         "viewmodule": "Base",

app_CRM/src/interface/entity/connection.ts

@@ -79,7 +79,7 @@ export interface Connection {
     master?: any;
 
     /**
-     * Record1IdObjectTypeCode
+     * 连接自
      *
      * @returns {*}
      * @memberof Connection
@@ -143,7 +143,7 @@ export interface Connection {
     ownertype?: any;
 
     /**
-     * Record2IdObjectTypeCode
+     * 已连接到
      *
      * @returns {*}
      * @memberof Connection

app_CRM/src/locale/lanres/codelist/codelist_en_US.ts

 export default {
+    AddressTypeCode: {
+        "empty": ""
+    },
     List__CreatedFromCode: {
         "1": "帐户",
         "4": "潜在顾客",
         "2": "联系人",
         "empty": ""
     },
+    ShippingMethodCode: {
+        "1": "默认值",
+        "empty": ""
+    },
     Campaignactivity__ChannelTypeCode: {
         "5": "传真",
         "3": "信件",
@@ -43,16 +50,6 @@ export default {
         "CONTACT": "联系人",
         "empty": ""
     },
-    Salesorder__ShippingMethodCode: {
-        "2": "DHL",
-        "3": "FedEx",
-        "6": "Full Load",
-        "4": "UPS",
-        "7": "Will Call",
-        "1": "航空运输",
-        "5": "邮递",
-        "empty": ""
-    },
     Contact__PaymentTermsCode: {
         "2": "2/10 N30",
         "1": "N30",
@@ -189,7 +186,7 @@ export default {
         "CAMPAIGNACTIVITY": "市场活动项目",
         "empty": ""
     },
-    Account__AccountClassificationCode: {
+    AccountClassificationCode: {
         "1": "默认值",
         "empty": ""
     },
@@ -208,7 +205,7 @@ export default {
         "0": "立即",
         "empty": ""
     },
-    Account__AccountRatingCode: {
+    AccountRatingCode: {
         "1": "默认值",
         "empty": ""
     },
@@ -220,7 +217,7 @@ export default {
         "4": "联合品牌",
         "empty": ""
     },
-    Account__Address1_FreightTermsCode: {
+    FreightTermsCode: {
         "1": "FOB",
         "2": "免收费用",
         "empty": ""
@@ -323,16 +320,6 @@ export default {
         "2": "高",
         "empty": ""
     },
-    Quote__ShippingMethodCode: {
-        "2": "DHL",
-        "3": "FedEx",
-        "6": "Full Load",
-        "4": "UPS",
-        "7": "Will Call",
-        "1": "航空运输",
-        "5": "邮递",
-        "empty": ""
-    },
     Connectionrole__StateCode: {
         "1": "停用",
         "0": "可用",
@@ -370,13 +357,6 @@ export default {
         "2": "顾问",
         "empty": ""
     },
-    Account__Address1_AddressTypeCode: {
-        "3": "主要地址",
-        "4": "其他",
-        "1": "帐单邮寄地址",
-        "2": "送货地址",
-        "empty": ""
-    },
     Contact__StatusCode: {
         "2": "停用",
         "1": "可用",
@@ -388,7 +368,7 @@ export default {
         "LEAD": "潜在客户",
         "empty": ""
     },
-    Account__AccountCategoryCode: {
+    AccountCategoryCode: {
         "2": "标准",
         "1": "首选客户",
         "empty": ""
@@ -399,16 +379,6 @@ export default {
         "2": "未知",
         "empty": ""
     },
-    Invoice__ShippingMethodCode: {
-        "2": "DHL",
-        "3": "FedEx",
-        "6": "Full Load",
-        "4": "UPS",
-        "7": "Will Call",
-        "1": "航空运输",
-        "5": "邮递",
-        "empty": ""
-    },
     Lead__StatusCode: {
         "6": "不再感兴趣",
         "4": "丢单",
@@ -424,11 +394,6 @@ export default {
         "0": "有效",
         "empty": ""
     },
-    Quote__FreightTermsCode: {
-        "1": "FOB",
-        "2": "免收费用",
-        "empty": ""
-    },
     Product__StateCode: {
         "1": "已停用",
         "0": "有效",
@@ -560,42 +525,6 @@ export default {
         "1001": "销售团队",
         "empty": ""
     },
-    Lead__IndustryCode: {
-        "1": "Accounting",
-        "2": "Agriculture and Non-petrol Natural Resource Extraction",
-        "3": "Broadcasting Printing and Publishing",
-        "4": "Brokers",
-        "5": "Building Supply Retail",
-        "6": "Business Services",
-        "7": "Consulting",
-        "8": "Consumer Services",
-        "9": "Design, Direction and Creative Management",
-        "10": "Distributors, Dispatchers and Processors",
-        "11": "Doctor's Offices and Clinics",
-        "12": "Durable Manufacturing",
-        "13": "Eating and Drinking Places",
-        "14": "Entertainment Retail",
-        "15": "Equipment Rental and Leasing",
-        "17": "Food and Tobacco Processing",
-        "18": "Inbound Capital Intensive Processing",
-        "19": "Inbound Repair and Services",
-        "20": "Insurance",
-        "21": "Legal Services",
-        "22": "Non-Durable Merchandise Retail",
-        "23": "Outbound Consumer Service",
-        "24": "Petrochemical Extraction and Distribution",
-        "25": "Service Retail",
-        "26": "SIG Affiliations",
-        "27": "Social Services",
-        "28": "Special Outbound Trade Contractors",
-        "29": "Specialty Realty",
-        "30": "Transportation",
-        "31": "Utility Creation and Distribution",
-        "32": "Vehicle Retail",
-        "33": "Wholesale",
-        "16": "金融业",
-        "empty": ""
-    },
     Productpricelevel__PricingMethodCode: {
         "2": "定价百分比",
         "5": "成本加成百分比 - 标准成本",
@@ -610,16 +539,6 @@ export default {
         "1": "有效",
         "empty": ""
     },
-    Account__Address1_ShippingMethodCode: {
-        "2": "DHL",
-        "3": "FedEx",
-        "6": "Full Load",
-        "4": "UPS",
-        "7": "Will Call",
-        "1": "航空运输",
-        "5": "邮递",
-        "empty": ""
-    },
     Connection__StatusCode: {
         "2": "停用",
         "1": "可用",
@@ -688,8 +607,7 @@ export default {
         "301": "年度",
         "empty": ""
     },
-    Account__IndustryCode: {
-        "1": "Accounting",
+    IndustryCode: {
         "2": "Agriculture and Non-petrol Natural Resource Extraction",
         "3": "Broadcasting Printing and Publishing",
         "4": "Brokers",
@@ -721,6 +639,7 @@ export default {
         "31": "Utility Creation and Distribution",
         "32": "Vehicle Retail",
         "33": "Wholesale",
+        "1": "会计",
         "16": "金融业",
         "empty": ""
     },
@@ -741,15 +660,6 @@ export default {
         "0": "已开始",
         "empty": ""
     },
-    Salesorder__FreightTermsCode: {
-        "1": "FOB",
-        "2": "免收费用",
-        "empty": ""
-    },
-    Contact__ShippingMethodCode: {
-        "1": "默认值",
-        "empty": ""
-    },
     Account__StateCode: {
         "1": "停用",
         "0": "可用",

app_CRM/src/locale/lanres/codelist/codelist_zh_CN.ts

 export default {
+    AddressTypeCode: {
+        "empty": "",
+    },
     List__CreatedFromCode: {
         "1": "帐户",
         "4": "潜在顾客",
         "2": "联系人",
         "empty": "",
     },
+    ShippingMethodCode: {
+        "1": "默认值",
+        "empty": "",
+    },
     Campaignactivity__ChannelTypeCode: {
         "5": "传真",
         "3": "信件",
@@ -43,16 +50,6 @@ export default {
         "CONTACT": "联系人",
         "empty": "",
     },
-    Salesorder__ShippingMethodCode: {
-        "2": "DHL",
-        "3": "FedEx",
-        "6": "Full Load",
-        "4": "UPS",
-        "7": "Will Call",
-        "1": "航空运输",
-        "5": "邮递",
-        "empty": "",
-    },
     Contact__PaymentTermsCode: {
         "2": "2/10 N30",
         "1": "N30",
@@ -189,7 +186,7 @@ export default {
         "CAMPAIGNACTIVITY": "市场活动项目",
         "empty": "",
     },
-    Account__AccountClassificationCode: {
+    AccountClassificationCode: {
         "1": "默认值",
         "empty": "",
     },
@@ -208,7 +205,7 @@ export default {
         "0": "立即",
         "empty": "",
     },
-    Account__AccountRatingCode: {
+    AccountRatingCode: {
         "1": "默认值",
         "empty": "",
     },
@@ -220,7 +217,7 @@ export default {
         "4": "联合品牌",
         "empty": "",
     },
-    Account__Address1_FreightTermsCode: {
+    FreightTermsCode: {
         "1": "FOB",
         "2": "免收费用",
         "empty": "",
@@ -323,16 +320,6 @@ export default {
         "2": "高",
         "empty": "",
     },
-    Quote__ShippingMethodCode: {
-        "2": "DHL",
-        "3": "FedEx",
-        "6": "Full Load",
-        "4": "UPS",
-        "7": "Will Call",
-        "1": "航空运输",
-        "5": "邮递",
-        "empty": "",
-    },
     Connectionrole__StateCode: {
         "1": "停用",
         "0": "可用",
@@ -370,13 +357,6 @@ export default {
         "2": "顾问",
         "empty": "",
     },
-    Account__Address1_AddressTypeCode: {
-        "3": "主要地址",
-        "4": "其他",
-        "1": "帐单邮寄地址",
-        "2": "送货地址",
-        "empty": "",
-    },
     Contact__StatusCode: {
         "2": "停用",
         "1": "可用",
@@ -388,7 +368,7 @@ export default {
         "LEAD": "潜在客户",
         "empty": "",
     },
-    Account__AccountCategoryCode: {
+    AccountCategoryCode: {
         "2": "标准",
         "1": "首选客户",
         "empty": "",
@@ -399,16 +379,6 @@ export default {
         "2": "未知",
         "empty": "",
     },
-    Invoice__ShippingMethodCode: {
-        "2": "DHL",
-        "3": "FedEx",
-        "6": "Full Load",
-        "4": "UPS",
-        "7": "Will Call",
-        "1": "航空运输",
-        "5": "邮递",
-        "empty": "",
-    },
     Lead__StatusCode: {
         "6": "不再感兴趣",
         "4": "丢单",
@@ -424,11 +394,6 @@ export default {
         "0": "有效",
         "empty": "",
     },
-    Quote__FreightTermsCode: {
-        "1": "FOB",
-        "2": "免收费用",
-        "empty": "",
-    },
     Product__StateCode: {
         "1": "已停用",
         "0": "有效",
@@ -560,42 +525,6 @@ export default {
         "1001": "销售团队",
         "empty": "",
     },
-    Lead__IndustryCode: {
-        "1": "Accounting",
-        "2": "Agriculture and Non-petrol Natural Resource Extraction",
-        "3": "Broadcasting Printing and Publishing",
-        "4": "Brokers",
-        "5": "Building Supply Retail",
-        "6": "Business Services",
-        "7": "Consulting",
-        "8": "Consumer Services",
-        "9": "Design, Direction and Creative Management",
-        "10": "Distributors, Dispatchers and Processors",
-        "11": "Doctor's Offices and Clinics",
-        "12": "Durable Manufacturing",
-        "13": "Eating and Drinking Places",
-        "14": "Entertainment Retail",
-        "15": "Equipment Rental and Leasing",
-        "17": "Food and Tobacco Processing",
-        "18": "Inbound Capital Intensive Processing",
-        "19": "Inbound Repair and Services",
-        "20": "Insurance",
-        "21": "Legal Services",
-        "22": "Non-Durable Merchandise Retail",
-        "23": "Outbound Consumer Service",
-        "24": "Petrochemical Extraction and Distribution",
-        "25": "Service Retail",
-        "26": "SIG Affiliations",
-        "27": "Social Services",
-        "28": "Special Outbound Trade Contractors",
-        "29": "Specialty Realty",
-        "30": "Transportation",
-        "31": "Utility Creation and Distribution",
-        "32": "Vehicle Retail",
-        "33": "Wholesale",
-        "16": "金融业",
-        "empty": "",
-    },
     Productpricelevel__PricingMethodCode: {
         "2": "定价百分比",
         "5": "成本加成百分比 - 标准成本",
@@ -610,16 +539,6 @@ export default {
         "1": "有效",
         "empty": "",
     },
-    Account__Address1_ShippingMethodCode: {
-        "2": "DHL",
-        "3": "FedEx",
-        "6": "Full Load",
-        "4": "UPS",
-        "7": "Will Call",
-        "1": "航空运输",
-        "5": "邮递",
-        "empty": "",
-    },
     Connection__StatusCode: {
         "2": "停用",
         "1": "可用",
@@ -688,8 +607,7 @@ export default {
         "301": "年度",
         "empty": "",
     },
-    Account__IndustryCode: {
-        "1": "Accounting",
+    IndustryCode: {
         "2": "Agriculture and Non-petrol Natural Resource Extraction",
         "3": "Broadcasting Printing and Publishing",
         "4": "Brokers",
@@ -721,6 +639,7 @@ export default {
         "31": "Utility Creation and Distribution",
         "32": "Vehicle Retail",
         "33": "Wholesale",
+        "1": "会计",
         "16": "金融业",
         "empty": "",
     },
@@ -741,15 +660,6 @@ export default {
         "0": "已开始",
         "empty": "",
     },
-    Salesorder__FreightTermsCode: {
-        "1": "FOB",
-        "2": "免收费用",
-        "empty": "",
-    },
-    Contact__ShippingMethodCode: {
-        "1": "默认值",
-        "empty": "",
-    },
     Account__StateCode: {
         "1": "停用",
         "0": "可用",

app_CRM/src/locale/lanres/entities/competitor-product/competitor-product_en_US.ts

@@ -61,16 +61,6 @@ export default {
 		uiactions: {
 		},
 	},
-	edit_compproviewtoolbar_toolbar: {
-		tbitem1: {
-			caption: "Save And Close",
-			tip: "Save And Close Window",
-		},
-		tbitem2: {
-			caption: "关闭",
-			tip: "关闭",
-		},
-	},
 	compprogridviewtoolbar_toolbar: {
 		deuiaction1: {
 			caption: "New",
@@ -109,4 +99,14 @@ export default {
 			tip: "Filter",
 		},
 	},
+	edit_compproviewtoolbar_toolbar: {
+		tbitem1: {
+			caption: "Save And Close",
+			tip: "Save And Close Window",
+		},
+		tbitem2: {
+			caption: "关闭",
+			tip: "关闭",
+		},
+	},
 };
\ No newline at end of file

app_CRM/src/locale/lanres/entities/competitor-product/competitor-product_zh_CN.ts

@@ -60,16 +60,6 @@ export default {
 		uiactions: {
 		},
 	},
-	edit_compproviewtoolbar_toolbar: {
-		tbitem1: {
-			caption: "保存并关闭",
-			tip: "保存并关闭",
-		},
-		tbitem2: {
-			caption: "关闭",
-			tip: "关闭",
-		},
-	},
 	compprogridviewtoolbar_toolbar: {
 		deuiaction1: {
 			caption: "新建",
@@ -108,4 +98,14 @@ export default {
 			tip: "过滤",
 		},
 	},
+	edit_compproviewtoolbar_toolbar: {
+		tbitem1: {
+			caption: "保存并关闭",
+			tip: "保存并关闭",
+		},
+		tbitem2: {
+			caption: "关闭",
+			tip: "关闭",
+		},
+	},
 };
\ No newline at end of file

app_CRM/src/locale/lanres/entities/competitor/competitor_en_US.ts

@@ -125,9 +125,10 @@ export default {
       		title: "竞争对手编辑视图",
 		},
 	},
-	quickcreate_form: {
+	abstractinfo_form: {
 		details: {
 			group1: "竞争对手基本信息", 
+			grouppanel1: "详细信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
@@ -145,16 +146,16 @@ export default {
 			address1_stateorprovince: "省/直辖市/自治区", 
 			address1_city: "市/县", 
 			address1_line1: "街道", 
-			transactioncurrencyid: "货币", 
+			strengths: "优势", 
+			weaknesses: "劣势", 
 			competitorid: "竞争对手", 
 		},
 		uiactions: {
 		},
 	},
-	abstractinfo_form: {
+	edit_datapanel_form: {
 		details: {
 			group1: "竞争对手基本信息", 
-			grouppanel1: "详细信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
@@ -164,23 +165,17 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			competitorname: "竞争对手名称", 
+			reportedrevenue: "报告收入", 
 			websiteurl: "网站", 
-			transactioncurrencyname: "货币", 
-			address1_postalcode: "邮政编码", 
-			address1_country: "国家/地区", 
-			address1_stateorprovince: "省/直辖市/自治区", 
-			address1_city: "市/县", 
-			address1_line1: "街道", 
-			strengths: "优势", 
-			weaknesses: "劣势", 
 			competitorid: "竞争对手", 
 		},
 		uiactions: {
 		},
 	},
-	edit_datapanel_form: {
+	datapanel_form: {
 		details: {
+			button1: "编辑头部信息", 
+			grouppanel1: "分组面板", 
 			group1: "竞争对手基本信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 
@@ -196,12 +191,11 @@ export default {
 			competitorid: "竞争对手", 
 		},
 		uiactions: {
+        competitor_edit_datapanel: "编辑头部信息",
 		},
 	},
-	datapanel_form: {
+	quickcreate_form: {
 		details: {
-			button1: "编辑头部信息", 
-			grouppanel1: "分组面板", 
 			group1: "竞争对手基本信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 
@@ -212,12 +206,18 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			reportedrevenue: "报告收入", 
+			competitorname: "竞争对手名称", 
 			websiteurl: "网站", 
+			transactioncurrencyname: "货币", 
+			address1_postalcode: "邮政编码", 
+			address1_country: "国家/地区", 
+			address1_stateorprovince: "省/直辖市/自治区", 
+			address1_city: "市/县", 
+			address1_line1: "街道", 
+			transactioncurrencyid: "货币", 
 			competitorid: "竞争对手", 
 		},
 		uiactions: {
-        competitor_edit_datapanel: "编辑头部信息",
 		},
 	},
 	main_form: {

app_CRM/src/locale/lanres/entities/competitor/competitor_zh_CN.ts

@@ -124,9 +124,10 @@ export default {
       		title: "竞争对手编辑视图",
 		},
 	},
-	quickcreate_form: {
+	abstractinfo_form: {
 		details: {
 			group1: "竞争对手基本信息", 
+			grouppanel1: "详细信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
@@ -144,16 +145,16 @@ export default {
 			address1_stateorprovince: "省/直辖市/自治区", 
 			address1_city: "市/县", 
 			address1_line1: "街道", 
-			transactioncurrencyid: "货币", 
+			strengths: "优势", 
+			weaknesses: "劣势", 
 			competitorid: "竞争对手", 
 		},
 		uiactions: {
 		},
 	},
-	abstractinfo_form: {
+	edit_datapanel_form: {
 		details: {
 			group1: "竞争对手基本信息", 
-			grouppanel1: "详细信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
@@ -163,23 +164,17 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			competitorname: "竞争对手名称", 
+			reportedrevenue: "报告收入", 
 			websiteurl: "网站", 
-			transactioncurrencyname: "货币", 
-			address1_postalcode: "邮政编码", 
-			address1_country: "国家/地区", 
-			address1_stateorprovince: "省/直辖市/自治区", 
-			address1_city: "市/县", 
-			address1_line1: "街道", 
-			strengths: "优势", 
-			weaknesses: "劣势", 
 			competitorid: "竞争对手", 
 		},
 		uiactions: {
 		},
 	},
-	edit_datapanel_form: {
+	datapanel_form: {
 		details: {
+			button1: "编辑头部信息", 
+			grouppanel1: "分组面板", 
 			group1: "竞争对手基本信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 
@@ -195,12 +190,11 @@ export default {
 			competitorid: "竞争对手", 
 		},
 		uiactions: {
+			competitor_edit_datapanel: "编辑头部信息",
 		},
 	},
-	datapanel_form: {
+	quickcreate_form: {
 		details: {
-			button1: "编辑头部信息", 
-			grouppanel1: "分组面板", 
 			group1: "竞争对手基本信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 
@@ -211,12 +205,18 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			reportedrevenue: "报告收入", 
+			competitorname: "竞争对手名称", 
 			websiteurl: "网站", 
+			transactioncurrencyname: "货币", 
+			address1_postalcode: "邮政编码", 
+			address1_country: "国家/地区", 
+			address1_stateorprovince: "省/直辖市/自治区", 
+			address1_city: "市/县", 
+			address1_line1: "街道", 
+			transactioncurrencyid: "货币", 
 			competitorid: "竞争对手", 
 		},
 		uiactions: {
-			competitor_edit_datapanel: "编辑头部信息",
 		},
 	},
 	main_form: {

app_CRM/src/locale/lanres/entities/connection/connection_en_US.ts

@@ -10,7 +10,7 @@ export default {
     record1objecttypecode: "类型(源)",
     record2id: "已连接到",
     master: "主记录",
-    record1idobjecttypecode: "Record1IdObjectTypeCode",
+    record1idobjecttypecode: "连接自",
     ownerid: "负责人",
     updateman: "更新人",
     effectivestart: "正在启动",
@@ -18,7 +18,7 @@ export default {
     overriddencreatedon: "创建记录的时间",
     importsequencenumber: "导入序列号",
     ownertype: "负责人类型",
-    record2idobjecttypecode: "Record2IdObjectTypeCode",
+    record2idobjecttypecode: "已连接到",
     exchangerate: "汇率",
     entityimageid: "实体图像 ID",
     versionnumber: "版本号",
@@ -65,7 +65,7 @@ export default {
 			record1rolename: "角色（源）", 
 			record2rolename: "角色（目标）", 
 			record2id: "已连接到", 
-			record2idobjecttypecode: "Record2IdObjectTypeCode", 
+			record2idobjecttypecode: "已连接到", 
 			record2objecttypecode: "类型(目标)", 
 			statecode: "状态", 
 			statuscode: "状态描述", 

app_CRM/src/locale/lanres/entities/connection/connection_zh_CN.ts

@@ -9,7 +9,7 @@ export default {
     record1objecttypecode: "类型(源)",
     record2id: "已连接到",
     master: "主记录",
-    record1idobjecttypecode: "Record1IdObjectTypeCode",
+    record1idobjecttypecode: "连接自",
     ownerid: "负责人",
     updateman: "更新人",
     effectivestart: "正在启动",
@@ -17,7 +17,7 @@ export default {
     overriddencreatedon: "创建记录的时间",
     importsequencenumber: "导入序列号",
     ownertype: "负责人类型",
-    record2idobjecttypecode: "Record2IdObjectTypeCode",
+    record2idobjecttypecode: "已连接到",
     exchangerate: "汇率",
     entityimageid: "实体图像 ID",
     versionnumber: "版本号",
@@ -64,7 +64,7 @@ export default {
 			record1rolename: "角色（源）", 
 			record2rolename: "角色（目标）", 
 			record2id: "已连接到", 
-			record2idobjecttypecode: "Record2IdObjectTypeCode", 
+			record2idobjecttypecode: "已连接到", 
 			record2objecttypecode: "类型(目标)", 
 			statecode: "状态", 
 			statuscode: "状态描述", 

app_CRM/src/locale/lanres/entities/lead-competitor/lead-competitor_en_US.ts

@@ -84,7 +84,7 @@ export default {
 		uiactions: {
 		},
 	},
-	competitorgridviewtoolbar_toolbar: {
+	leadgridviewtoolbar_toolbar: {
 		deuiaction1: {
 			caption: "New",
 			tip: "New",
@@ -160,7 +160,7 @@ export default {
 			tip: "Copy {0}",
 		},
 	},
-	leadgridviewtoolbar_toolbar: {
+	competitorgridviewtoolbar_toolbar: {
 		deuiaction1: {
 			caption: "New",
 			tip: "New",

app_CRM/src/locale/lanres/entities/lead-competitor/lead-competitor_zh_CN.ts

@@ -83,7 +83,7 @@ export default {
 		uiactions: {
 		},
 	},
-	competitorgridviewtoolbar_toolbar: {
+	leadgridviewtoolbar_toolbar: {
 		deuiaction1: {
 			caption: "新建",
 			tip: "新建",
@@ -159,7 +159,7 @@ export default {
 			tip: "拷贝",
 		},
 	},
-	leadgridviewtoolbar_toolbar: {
+	competitorgridviewtoolbar_toolbar: {
 		deuiaction1: {
 			caption: "新建",
 			tip: "新建",

app_CRM/src/locale/lanres/entities/opportunity-competitor/opportunity-competitor_en_US.ts

@@ -37,7 +37,7 @@ export default {
       		title: "商机对手编辑视图",
 		},
 	},
-	main_form: {
+	edit_compopp_form: {
 		details: {
 			group1: "商机对手基本信息", 
 			formpage1: "基本信息", 
@@ -49,18 +49,18 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			entityid: "商机", 
-			entity2name: "竞争对手", 
+			entity2id: "竞争对手", 
+			entityname: "商机", 
 			estimatedvalue: "预计收入", 
 			estimatedclosedate: "预计结束日期", 
 			statecode: "状态", 
-			entity2id: "竞争对手", 
 			relationshipsid: "关系标识", 
+			entityid: "商机", 
 		},
 		uiactions: {
 		},
 	},
-	edit_compopp_form: {
+	main_form: {
 		details: {
 			group1: "商机对手基本信息", 
 			formpage1: "基本信息", 
@@ -72,13 +72,13 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			entity2id: "竞争对手", 
-			entityname: "商机", 
+			entityid: "商机", 
+			entity2name: "竞争对手", 
 			estimatedvalue: "预计收入", 
 			estimatedclosedate: "预计结束日期", 
 			statecode: "状态", 
+			entity2id: "竞争对手", 
 			relationshipsid: "关系标识", 
-			entityid: "商机", 
 		},
 		uiactions: {
 		},
@@ -102,15 +102,19 @@ export default {
 		uiactions: {
 		},
 	},
-	oppcompgridviewtoolbar_toolbar: {
+	compoppgridviewtoolbar_toolbar: {
+		deuiaction1: {
+			caption: "New",
+			tip: "New",
+		},
+		tbitem2: {
+			caption: "-",
+			tip: "",
+		},
 		tbitem4: {
 			caption: "Edit",
 			tip: "Edit {0}",
 		},
-		tbitem6: {
-			caption: "Copy",
-			tip: "Copy {0}",
-		},
 		tbitem7: {
 			caption: "-",
 			tip: "",
@@ -136,25 +140,25 @@ export default {
 			tip: "Filter",
 		},
 	},
-	editviewtoolbar_toolbar: {
-		tbitem12: {
+	edit_compoppviewtoolbar_toolbar: {
+		tbitem1: {
+			caption: "Save And Close",
+			tip: "Save And Close Window",
+		},
+		tbitem2: {
 			caption: "关闭",
 			tip: "关闭",
 		},
 	},
-	compoppgridviewtoolbar_toolbar: {
-		deuiaction1: {
-			caption: "New",
-			tip: "New",
-		},
-		tbitem2: {
-			caption: "-",
-			tip: "",
-		},
+	oppcompgridviewtoolbar_toolbar: {
 		tbitem4: {
 			caption: "Edit",
 			tip: "Edit {0}",
 		},
+		tbitem6: {
+			caption: "Copy",
+			tip: "Copy {0}",
+		},
 		tbitem7: {
 			caption: "-",
 			tip: "",
@@ -180,12 +184,8 @@ export default {
 			tip: "Filter",
 		},
 	},
-	edit_compoppviewtoolbar_toolbar: {
-		tbitem1: {
-			caption: "Save And Close",
-			tip: "Save And Close Window",
-		},
-		tbitem2: {
+	editviewtoolbar_toolbar: {
+		tbitem12: {
 			caption: "关闭",
 			tip: "关闭",
 		},

app_CRM/src/locale/lanres/entities/opportunity-competitor/opportunity-competitor_zh_CN.ts

@@ -36,7 +36,7 @@ export default {
       		title: "商机对手编辑视图",
 		},
 	},
-	main_form: {
+	edit_compopp_form: {
 		details: {
 			group1: "商机对手基本信息", 
 			formpage1: "基本信息", 
@@ -48,18 +48,18 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			entityid: "商机", 
-			entity2name: "竞争对手", 
+			entity2id: "竞争对手", 
+			entityname: "商机", 
 			estimatedvalue: "预计收入", 
 			estimatedclosedate: "预计结束日期", 
 			statecode: "状态", 
-			entity2id: "竞争对手", 
 			relationshipsid: "关系标识", 
+			entityid: "商机", 
 		},
 		uiactions: {
 		},
 	},
-	edit_compopp_form: {
+	main_form: {
 		details: {
 			group1: "商机对手基本信息", 
 			formpage1: "基本信息", 
@@ -71,13 +71,13 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			entity2id: "竞争对手", 
-			entityname: "商机", 
+			entityid: "商机", 
+			entity2name: "竞争对手", 
 			estimatedvalue: "预计收入", 
 			estimatedclosedate: "预计结束日期", 
 			statecode: "状态", 
+			entity2id: "竞争对手", 
 			relationshipsid: "关系标识", 
-			entityid: "商机", 
 		},
 		uiactions: {
 		},
@@ -101,15 +101,19 @@ export default {
 		uiactions: {
 		},
 	},
-	oppcompgridviewtoolbar_toolbar: {
+	compoppgridviewtoolbar_toolbar: {
+		deuiaction1: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem2: {
+			caption: "-",
+			tip: "",
+		},
 		tbitem4: {
 			caption: "编辑",
 			tip: "编辑",
 		},
-		tbitem6: {
-			caption: "拷贝",
-			tip: "拷贝",
-		},
 		tbitem7: {
 			caption: "-",
 			tip: "",
@@ -135,25 +139,25 @@ export default {
 			tip: "过滤",
 		},
 	},
-	editviewtoolbar_toolbar: {
-		tbitem12: {
+	edit_compoppviewtoolbar_toolbar: {
+		tbitem1: {
+			caption: "保存并关闭",
+			tip: "保存并关闭",
+		},
+		tbitem2: {
 			caption: "关闭",
 			tip: "关闭",
 		},
 	},
-	compoppgridviewtoolbar_toolbar: {
-		deuiaction1: {
-			caption: "新建",
-			tip: "新建",
-		},
-		tbitem2: {
-			caption: "-",
-			tip: "",
-		},
+	oppcompgridviewtoolbar_toolbar: {
 		tbitem4: {
 			caption: "编辑",
 			tip: "编辑",
 		},
+		tbitem6: {
+			caption: "拷贝",
+			tip: "拷贝",
+		},
 		tbitem7: {
 			caption: "-",
 			tip: "",
@@ -179,12 +183,8 @@ export default {
 			tip: "过滤",
 		},
 	},
-	edit_compoppviewtoolbar_toolbar: {
-		tbitem1: {
-			caption: "保存并关闭",
-			tip: "保存并关闭",
-		},
-		tbitem2: {
+	editviewtoolbar_toolbar: {
+		tbitem12: {
 			caption: "关闭",
 			tip: "关闭",
 		},

app_CRM/src/locale/lanres/entities/transaction-currency/transaction-currency_en_US.ts

@@ -29,7 +29,7 @@ export default {
 		},
 		editview: {
 			caption: "货币",
-      		title: "货币编辑视图",
+      		title: "货币",
 		},
 		pickupview: {
 			caption: "货币",

app_CRM/src/locale/lanres/entities/transaction-currency/transaction-currency_zh_CN.ts

@@ -28,7 +28,7 @@ export default {
 		},
 		editview: {
 			caption: "货币",
-      		title: "货币编辑视图",
+      		title: "货币",
 		},
 		pickupview: {
 			caption: "货币",

app_CRM/src/mock/viewconfig/viewconfig.ts

@@ -2032,7 +2032,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewtag": "c7d0ca0f6fa1b27bbd1b5c422d1a108d"
         },
         "transactioncurrencyeditview": {
-            "title": "货币编辑视图",
+            "title": "货币",
             "caption": "货币",
             "viewtype": "DEEDITVIEW",
             "viewmodule": "Base",

app_CRM/src/pages/base/transaction-currency-edit-view/transaction-currency-edit-view-base.tsx

@@ -6,7 +6,7 @@ import EditViewEngine from '@engine/view/edit-view-engine';
 import TransactionCurrencyUIService from '@/uiservice/transaction-currency/transaction-currency-ui-service';
 
 /**
- * 货币编辑视图视图基类
+ * 货币视图基类
  *
  * @export
  * @class TransactionCurrencyEditViewBase

app_CRM/src/pages/base/transaction-currency-edit-view/transaction-currency-edit-view.html

-<studio-view-style2 viewName="transactioncurrencyeditview" viewTitle="货币编辑视图" class='deeditview transaction-currency-edit-view'>
+<studio-view-style2 viewName="transactioncurrencyeditview" viewTitle="货币" class='deeditview transaction-currency-edit-view'>
     <template slot='title'>
     <span class='caption-info'>{{$t(model.srfTitle)}}</span>
     </template>

app_CRM/src/pages/base/transaction-currency-edit-view/transaction-currency-edit-view.vue

@@ -6,7 +6,7 @@ import { TransactionCurrencyEditViewBase } from './transaction-currency-edit-vie
 import view_form from '@widgets/transaction-currency/main-form/main-form.vue';
 
 /**
- * 货币编辑视图视图
+ * 货币视图
  *
  * @export
  * @class TransactionCurrencyEditView

app_CRM/src/service/campaign/campaign-service-base.ts

@@ -64,6 +64,21 @@ export default class CampaignServiceBase extends EntityService {
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
+        let leadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
+            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
+            if(leadsData && leadsData.length && leadsData.length > 0){
+                leadsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.leadid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.leads = leadsData;
         let campaignlistsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
             campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
@@ -94,21 +109,6 @@ export default class CampaignServiceBase extends EntityService {
             }
         }
         masterData.campaigncampaigns = campaigncampaignsData;
-        let leadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
-            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
-            if(leadsData && leadsData.length && leadsData.length > 0){
-                leadsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.leads = leadsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -118,9 +118,9 @@ export default class CampaignServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/campaigns`,data,isloading);
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
         return res;
     }
 
@@ -135,6 +135,21 @@ export default class CampaignServiceBase extends EntityService {
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
+        let leadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
+            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
+            if(leadsData && leadsData.length && leadsData.length > 0){
+                leadsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.leadid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.leads = leadsData;
         let campaignlistsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
             campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
@@ -165,26 +180,11 @@ export default class CampaignServiceBase extends EntityService {
             }
         }
         masterData.campaigncampaigns = campaigncampaignsData;
-        let leadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
-            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
-            if(leadsData && leadsData.length && leadsData.length > 0){
-                leadsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.leads = leadsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/campaigns/${context.campaign}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
-            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             return res;
     }
 
@@ -212,9 +212,9 @@ export default class CampaignServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/campaigns/${context.campaign}`,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
-            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             return res;
     }
 
@@ -230,9 +230,9 @@ export default class CampaignServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/campaigns/getdraft`,isloading);
         res.data.campaign = data.campaign;
+            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
-            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
         return res;
     }
 
@@ -275,6 +275,21 @@ export default class CampaignServiceBase extends EntityService {
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
+        let leadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
+            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
+            if(leadsData && leadsData.length && leadsData.length > 0){
+                leadsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.leadid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.leads = leadsData;
         let campaignlistsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
             campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
@@ -305,26 +320,11 @@ export default class CampaignServiceBase extends EntityService {
             }
         }
         masterData.campaigncampaigns = campaigncampaignsData;
-        let leadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
-            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
-            if(leadsData && leadsData.length && leadsData.length > 0){
-                leadsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.leads = leadsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/campaigns/${context.campaign}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
-            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             return res;
     }
 

app_CRM/src/widgets/account/default-searchform/default-searchform.html

@@ -41,7 +41,7 @@
               :localContext ='{ }' 
               :localParam ='{ }' 
               :disabled="detailsModel.n_accountcategorycode_eq.disabled"  
-              tag='Account__AccountCategoryCode' 
+              tag='AccountCategoryCode' 
               codelistType='STATIC'
               placeholder='请选择...' style="">
            </dropdown-list>
@@ -59,7 +59,7 @@
               :localContext ='{ }' 
               :localParam ='{ }' 
               :disabled="detailsModel.n_accountclassificationcode_eq.disabled"  
-              tag='Account__AccountClassificationCode' 
+              tag='AccountClassificationCode' 
               codelistType='STATIC'
               placeholder='请选择...' style="">
            </dropdown-list>
@@ -77,7 +77,7 @@
               :localContext ='{ }' 
               :localParam ='{ }' 
               :disabled="detailsModel.n_accountratingcode_eq.disabled"  
-              tag='Account__AccountRatingCode' 
+              tag='AccountRatingCode' 
               codelistType='STATIC'
               placeholder='请选择...' style="">
            </dropdown-list>

app_CRM/src/widgets/account/edit-address-form/edit-address-form.html

@@ -29,7 +29,7 @@
     :localContext ='{ }' 
     :localParam ='{ }' 
     :disabled="detailsModel.address1_addresstypecode.disabled"  
-    tag='Account__Address1_AddressTypeCode' 
+    tag='AddressTypeCode' 
     codelistType='STATIC'
     placeholder='请选择...' style="">
  </dropdown-list>

app_CRM/src/widgets/account/edit-data-panel-form/edit-data-panel-form.html

@@ -17,7 +17,7 @@
     :localContext ='{ }' 
     :localParam ='{ }' 
     :disabled="detailsModel.industrycode.disabled"  
-    tag='Account__IndustryCode' 
+    tag='IndustryCode' 
     codelistType='STATIC'
     placeholder='请选择...' style="">
  </dropdown-list>

app_CRM/src/widgets/account/edit-introduction-form/edit-introduction-form.html

@@ -17,7 +17,7 @@
     :localContext ='{ }' 
     :localParam ='{ }' 
     :disabled="detailsModel.industrycode.disabled"  
-    tag='Account__IndustryCode' 
+    tag='IndustryCode' 
     codelistType='STATIC'
     placeholder='请选择...' style="">
  </dropdown-list>

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

@@ -30,7 +30,7 @@
 <i-col v-show="detailsModel.industrycode.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='industrycode' :itemRules="this.rules.industrycode" class='' :caption="$t('entities.account.info_all_form.details.industrycode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.industrycode.error" :isEmptyCaption="false" labelPos="LEFT">
     
-<app-span name='industrycode' :value="data.industrycode" tag='Account__IndustryCode' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
+<app-span name='industrycode' :value="data.industrycode" tag='IndustryCode' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
@@ -133,7 +133,7 @@
 <i-col v-show="detailsModel.address1_addresstypecode.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='address1_addresstypecode' :itemRules="this.rules.address1_addresstypecode" class='' :caption="$t('entities.account.info_all_form.details.address1_addresstypecode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.address1_addresstypecode.error" :isEmptyCaption="false" labelPos="LEFT">
     
-<app-span name='address1_addresstypecode' :value="data.address1_addresstypecode" tag='Account__Address1_AddressTypeCode' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
+<app-span name='address1_addresstypecode' :value="data.address1_addresstypecode" tag='AddressTypeCode' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
@@ -182,7 +182,7 @@
 <i-col v-show="detailsModel.address1_freighttermscode.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='address1_freighttermscode' :itemRules="this.rules.address1_freighttermscode" class='' :caption="$t('entities.account.info_all_form.details.address1_freighttermscode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.address1_freighttermscode.error" :isEmptyCaption="false" labelPos="LEFT">
     
-<app-span name='address1_freighttermscode' :value="data.address1_freighttermscode" tag='Account__Address1_FreightTermsCode' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
+<app-span name='address1_freighttermscode' :value="data.address1_freighttermscode" tag='FreightTermsCode' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/account/info-data-panel-form/info-data-panel-form.html

@@ -9,7 +9,7 @@
         <div  v-show="detailsModel.industrycode.visible" :style="{}">
 <app-form-item name='industrycode' :itemRules="this.rules.industrycode" class='datapanel-style' :caption="$t('entities.account.info_datapanel_form.details.industrycode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.industrycode.error" :isEmptyCaption="false" labelPos="BOTTOM">
     
-<app-span name='industrycode' :value="data.industrycode" tag='Account__IndustryCode' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
+<app-span name='industrycode' :value="data.industrycode" tag='IndustryCode' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </div>

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

@@ -128,7 +128,7 @@
     :localContext ='{ }' 
     :localParam ='{ }' 
     :disabled="detailsModel.industrycode.disabled"  
-    tag='Account__IndustryCode' 
+    tag='IndustryCode' 
     codelistType='STATIC'
     placeholder='请选择...' style="">
  </dropdown-list>
@@ -197,7 +197,7 @@
     :localContext ='{ }' 
     :localParam ='{ }' 
     :disabled="detailsModel.address1_addresstypecode.disabled"  
-    tag='Account__Address1_AddressTypeCode' 
+    tag='AddressTypeCode' 
     codelistType='STATIC'
     placeholder='请选择...' style="">
  </dropdown-list>
@@ -251,7 +251,7 @@
     :localContext ='{ }' 
     :localParam ='{ }' 
     :disabled="detailsModel.address1_freighttermscode.disabled"  
-    tag='Account__Address1_FreightTermsCode' 
+    tag='FreightTermsCode' 
     codelistType='STATIC'
     placeholder='请选择...' style="">
  </dropdown-list>

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

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

app_CRM/src/widgets/competitor-sales-literature/sal-lit-comp-grid-grid/sal-lit-comp-grid-grid.html

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

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

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

app_CRM/src/widgets/connection/main-form/main-form-base.tsx

@@ -165,7 +165,7 @@ export class MainEditFormBase extends EditFormControlBase {
 
         record2id: new FormItemModel({ caption: '已连接到', detailType: 'FORMITEM', name: 'record2id', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
-        record2idobjecttypecode: new FormItemModel({ caption: 'Record2IdObjectTypeCode', detailType: 'FORMITEM', name: 'record2idobjecttypecode', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+        record2idobjecttypecode: new FormItemModel({ caption: '已连接到', detailType: 'FORMITEM', name: 'record2idobjecttypecode', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
         record2objecttypecode: new FormItemModel({ caption: '类型(目标)', detailType: 'FORMITEM', name: 'record2objecttypecode', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 

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

@@ -217,7 +217,7 @@
 <i-col v-show="detailsModel.shippingmethodcode.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='shippingmethodcode' :itemRules="this.rules.shippingmethodcode" class='' :caption="$t('entities.contact.abstractinfo_form.details.shippingmethodcode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.shippingmethodcode.error" :isEmptyCaption="false" labelPos="LEFT">
     
-<app-span name='shippingmethodcode' :value="data.shippingmethodcode" tag='Contact__ShippingMethodCode' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
+<app-span name='shippingmethodcode' :value="data.shippingmethodcode" tag='ShippingMethodCode' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/contact/edit-abstract-form/edit-abstract-form.html

@@ -249,7 +249,7 @@
     :localContext ='{ }' 
     :localParam ='{ }' 
     :disabled="detailsModel.shippingmethodcode.disabled"  
-    tag='Contact__ShippingMethodCode' 
+    tag='ShippingMethodCode' 
     codelistType='STATIC'
     placeholder='请选择...' style="">
  </dropdown-list>

app_CRM/src/widgets/contact/market-edit-form/market-edit-form.html

@@ -69,7 +69,7 @@
     :localContext ='{ }' 
     :localParam ='{ }' 
     :disabled="detailsModel.shippingmethodcode.disabled"  
-    tag='Contact__ShippingMethodCode' 
+    tag='ShippingMethodCode' 
     codelistType='STATIC'
     placeholder='请选择...' style="">
  </dropdown-list>

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

@@ -60,7 +60,7 @@
 <i-col v-show="detailsModel.shippingmethodcode.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='shippingmethodcode' :itemRules="this.rules.shippingmethodcode" class='' :caption="$t('entities.invoice.info_form.details.shippingmethodcode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.shippingmethodcode.error" :isEmptyCaption="false" labelPos="LEFT">
     
-<app-span name='shippingmethodcode' :value="data.shippingmethodcode" tag='Invoice__ShippingMethodCode' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
+<app-span name='shippingmethodcode' :value="data.shippingmethodcode" tag='ShippingMethodCode' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>

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

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

app_CRM/src/widgets/lead/contact-info-form/contact-info-form.html

@@ -118,7 +118,7 @@
         <i-col v-show="detailsModel.industrycode.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='industrycode' :itemRules="this.rules.industrycode" class='' :caption="$t('entities.lead.contactinfo_form.details.industrycode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.industrycode.error" :isEmptyCaption="false" labelPos="LEFT">
     
-<app-span name='industrycode' :value="data.industrycode" tag='Lead__IndustryCode' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
+<app-span name='industrycode' :value="data.industrycode" tag='IndustryCode' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>

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

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

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

@@ -81,7 +81,7 @@
 <i-col v-show="detailsModel.freighttermscode.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='freighttermscode' :itemRules="this.rules.freighttermscode" class='' :caption="$t('entities.quote.abstractinfo_form.details.freighttermscode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.freighttermscode.error" :isEmptyCaption="false" labelPos="LEFT">
     
-<app-span name='freighttermscode' :value="data.freighttermscode" tag='Quote__FreightTermsCode' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
+<app-span name='freighttermscode' :value="data.freighttermscode" tag='FreightTermsCode' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
@@ -129,7 +129,7 @@
 <i-col v-show="detailsModel.shippingmethodcode.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='shippingmethodcode' :itemRules="this.rules.shippingmethodcode" class='' :caption="$t('entities.quote.abstractinfo_form.details.shippingmethodcode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.shippingmethodcode.error" :isEmptyCaption="false" labelPos="LEFT">
     
-<app-span name='shippingmethodcode' :value="data.shippingmethodcode" tag='Quote__ShippingMethodCode' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
+<app-span name='shippingmethodcode' :value="data.shippingmethodcode" tag='ShippingMethodCode' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>

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

@@ -53,7 +53,7 @@
 <i-col v-show="detailsModel.shippingmethodcode.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='shippingmethodcode' :itemRules="this.rules.shippingmethodcode" class='' :caption="$t('entities.salesorder.info_form.details.shippingmethodcode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.shippingmethodcode.error" :isEmptyCaption="false" labelPos="LEFT">
     
-<app-span name='shippingmethodcode' :value="data.shippingmethodcode" tag='Salesorder__ShippingMethodCode' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
+<app-span name='shippingmethodcode' :value="data.shippingmethodcode" tag='ShippingMethodCode' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
@@ -67,7 +67,7 @@
 <i-col v-show="detailsModel.freighttermscode.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='freighttermscode' :itemRules="this.rules.freighttermscode" class='' :caption="$t('entities.salesorder.info_form.details.freighttermscode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.freighttermscode.error" :isEmptyCaption="false" labelPos="LEFT">
     
-<app-span name='freighttermscode' :value="data.freighttermscode" tag='Salesorder__FreightTermsCode' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
+<app-span name='freighttermscode' :value="data.freighttermscode" tag='FreightTermsCode' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/runtime/domain/Connection.java

@@ -111,7 +111,7 @@ public class Connection extends EntityMP implements Serializable {
     @JsonProperty("master")
     private Integer master;
     /**
-     * Record1IdObjectTypeCode
+     * 连接自
      */
     @TableField(value = "record1idobjecttypecode")
     @JSONField(name = "record1idobjecttypecode")
@@ -170,7 +170,7 @@ public class Connection extends EntityMP implements Serializable {
     @JsonProperty("ownertype")
     private String ownertype;
     /**
-     * Record2IdObjectTypeCode
+     * 已连接到
      */
     @TableField(value = "record2idobjecttypecode")
     @JSONField(name = "record2idobjecttypecode")
@@ -367,7 +367,7 @@ public class Connection extends EntityMP implements Serializable {
     }
 
     /**
-     * 设置 [Record1IdObjectTypeCode]
+     * 设置 [连接自]
      */
     public void setRecord1idobjecttypecode(String record1idobjecttypecode){
         this.record1idobjecttypecode = record1idobjecttypecode ;
@@ -443,7 +443,7 @@ public class Connection extends EntityMP implements Serializable {
     }
 
     /**
-     * 设置 [Record2IdObjectTypeCode]
+     * 设置 [已连接到]
      */
     public void setRecord2idobjecttypecode(String record2idobjecttypecode){
         this.record2idobjecttypecode = record2idobjecttypecode ;

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/domain/Lead.java

@@ -240,6 +240,7 @@ public class Lead extends EntityMP implements Serializable {
     /**
      * 状态描述
      */
+    @DEField(defaultValue = "1")
     @TableField(value = "statuscode")
     @JSONField(name = "statuscode")
     @JsonProperty("statuscode")