xignzi006 发布系统代码

app_CRM/src/interface/entity/campaign-response.ts

@@ -87,15 +87,7 @@ export interface CampaignResponse {
     createdate?: any;
 
     /**
-     * 姓
-     *
-     * @returns {*}
-     * @memberof CampaignResponse
-     */
-    lastname?: any;
-
-    /**
-     * OriginatingActivityName
+     * 活动
      *
      * @returns {*}
      * @memberof CampaignResponse
@@ -214,14 +206,6 @@ export interface CampaignResponse {
      */
     serviceid?: any;
 
-    /**
-     * 活动
-     *
-     * @returns {*}
-     * @memberof CampaignResponse
-     */
-    originatingactivityname?: any;
-
     /**
      * 定期实例类型
      *
@@ -286,14 +270,6 @@ export interface CampaignResponse {
      */
     from?: any;
 
-    /**
-     * 公司名称
-     *
-     * @returns {*}
-     * @memberof CampaignResponse
-     */
-    companyname?: any;
-
     /**
      * 版本号
      *
@@ -638,14 +614,6 @@ export interface CampaignResponse {
      */
     to?: any;
 
-    /**
-     * 名
-     *
-     * @returns {*}
-     * @memberof CampaignResponse
-     */
-    firstname?: any;
-
     /**
      * 保留的语音邮件
      *

app_CRM/src/interface/entity/contact.ts

@@ -366,14 +366,6 @@ export interface Contact {
      */
     address1_line1?: any;
 
-    /**
-     * 中间名
-     *
-     * @returns {*}
-     * @memberof Contact
-     */
-    middlename?: any;
-
     /**
      * 地址 1: 电话 3
      *
@@ -646,14 +638,6 @@ export interface Contact {
      */
     versionnumber?: any;
 
-    /**
-     * 全名
-     *
-     * @returns {*}
-     * @memberof Contact
-     */
-    fullname?: any;
-
     /**
      * 实体图像
      *
@@ -910,14 +894,6 @@ export interface Contact {
      */
     territorycode?: any;
 
-    /**
-     * 名
-     *
-     * @returns {*}
-     * @memberof Contact
-     */
-    firstname?: any;
-
     /**
      * 创建记录的时间
      *
@@ -934,14 +910,6 @@ export interface Contact {
      */
     address3_country?: any;
 
-    /**
-     * 姓
-     *
-     * @returns {*}
-     * @memberof Contact
-     */
-    lastname?: any;
-
     /**
      * 不允许使用批量电子邮件
      *
@@ -1134,14 +1102,6 @@ export interface Contact {
      */
     aging60?: any;
 
-    /**
-     * 名
-     *
-     * @returns {*}
-     * @memberof Contact
-     */
-    firstname?: any;
-
     /**
      * 地址 3: 邮政信箱
      *

app_CRM/src/interface/entity/email.ts

@@ -390,14 +390,6 @@ export interface Email {
      */
     postponeemailprocessinguntil?: any;
 
-    /**
-     * 电子邮件发件人名称
-     *
-     * @returns {*}
-     * @memberof Email
-     */
-    emailsendername?: any;
-
     /**
      * 方向
      *
@@ -598,14 +590,6 @@ export interface Email {
      */
     deliveryprioritycode?: any;
 
-    /**
-     * 电子邮件发件人帐户名称
-     *
-     * @returns {*}
-     * @memberof Email
-     */
-    sendersaccountname?: any;
-
     /**
      * 负责人类型
      *

app_CRM/src/interface/entity/incident.ts

@@ -326,14 +326,6 @@ export interface Incident {
      */
     statuscode?: any;
 
-    /**
-     * ResponsibleContactName
-     *
-     * @returns {*}
-     * @memberof Incident
-     */
-    responsiblecontactname?: any;
-
     /**
      * 解决方
      *
@@ -350,14 +342,6 @@ export interface Incident {
      */
     responseby?: any;
 
-    /**
-     * 主联系人
-     *
-     * @returns {*}
-     * @memberof Incident
-     */
-    primarycontactname?: any;
-
     /**
      * EntityImageId
      *

app_CRM/src/interface/entity/lead.ts

@@ -318,14 +318,6 @@ export interface Lead {
      */
     websiteurl?: any;
 
-    /**
-     * 公司名称
-     *
-     * @returns {*}
-     * @memberof Lead
-     */
-    companyname?: any;
-
     /**
      * 更新时间
      *
@@ -494,14 +486,6 @@ export interface Lead {
      */
     revenue?: any;
 
-    /**
-     * 姓
-     *
-     * @returns {*}
-     * @memberof Lead
-     */
-    lastname?: any;
-
     /**
      * 地址 2: 县
      *
@@ -606,14 +590,6 @@ export interface Lead {
      */
     participatesinworkflow?: any;
 
-    /**
-     * 名
-     *
-     * @returns {*}
-     * @memberof Lead
-     */
-    firstname?: any;
-
     /**
      * 地址 2
      *
@@ -734,14 +710,6 @@ export interface Lead {
      */
     address1_addressid?: any;
 
-    /**
-     * 全名
-     *
-     * @returns {*}
-     * @memberof Lead
-     */
-    fullname?: any;
-
     /**
      * 销售阶段代码
      *
@@ -798,14 +766,6 @@ export interface Lead {
      */
     purchasetimeframe?: any;
 
-    /**
-     * 中间名
-     *
-     * @returns {*}
-     * @memberof Lead
-     */
-    middlename?: any;
-
     /**
      * 潜在顾客来源
      *

app_CRM/src/locale/lanres/entities/campaign-response/campaign-response_en_US.ts

@@ -11,8 +11,7 @@ export default {
     optionalattendees: "Optional Attendees",
     customers: "Customers",
     createdate: "建立时间",
-    lastname: "姓",
-    originatingactivityname: "OriginatingActivityName",
+    originatingactivityname: "活动",
     organizer: "Organizer",
     prioritycode: "优先级",
     statuscode: "状态描述",
@@ -27,7 +26,6 @@ export default {
     actualstart: "实际开始时间",
     resources: "Resources",
     serviceid: "服务",
-    originatingactivityname: "活动",
     instancetypecode: "定期实例类型",
     ownername: "负责人",
     subject: "主题",
@@ -36,7 +34,6 @@ export default {
     createman: "建立人",
     firstname: "名",
     from: "来自",
-    companyname: "公司名称",
     versionnumber: "版本号",
     activitytypecode: "活动类型",
     promotioncodename: "促销代码",
@@ -80,7 +77,6 @@ export default {
     exchangerate: "汇率",
     regardingobjectname: "关于",
     to: "To",
-    firstname: "名",
     leftvoicemail: "保留的语音邮件",
     scheduledend: "结束时间",
     transactioncurrencyid: "货币",

app_CRM/src/locale/lanres/entities/campaign-response/campaign-response_zh_CN.ts

@@ -10,8 +10,7 @@ export default {
     optionalattendees: "Optional Attendees",
     customers: "Customers",
     createdate: "建立时间",
-    lastname: "姓",
-    originatingactivityname: "OriginatingActivityName",
+    originatingactivityname: "活动",
     organizer: "Organizer",
     prioritycode: "优先级",
     statuscode: "状态描述",
@@ -26,7 +25,6 @@ export default {
     actualstart: "实际开始时间",
     resources: "Resources",
     serviceid: "服务",
-    originatingactivityname: "活动",
     instancetypecode: "定期实例类型",
     ownername: "负责人",
     subject: "主题",
@@ -35,7 +33,6 @@ export default {
     createman: "建立人",
     firstname: "名",
     from: "来自",
-    companyname: "公司名称",
     versionnumber: "版本号",
     activitytypecode: "活动类型",
     promotioncodename: "促销代码",
@@ -79,7 +76,6 @@ export default {
     exchangerate: "汇率",
     regardingobjectname: "关于",
     to: "To",
-    firstname: "名",
     leftvoicemail: "保留的语音邮件",
     scheduledend: "结束时间",
     transactioncurrencyid: "货币",

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

@@ -46,7 +46,6 @@ export default {
     assistantname: "助理",
     address1_composite: "地址 1",
     address1_line1: "地址 1: 街道 1",
-    middlename: "中间名",
     address1_telephone3: "地址 1: 电话 3",
     telephone2: "住宅电话",
     address2_addressid: "地址 2: ID",
@@ -81,7 +80,6 @@ export default {
     address1_line2: "地址 1: 街道 2",
     nickname: "昵称",
     versionnumber: "版本号",
-    fullname: "全名",
     entityimage: "实体图像",
     shippingmethodcode: "送货方式",
     customertypecode: "关系类型",
@@ -114,10 +112,8 @@ export default {
     annualincome: "年收入",
     subscriptionid: "预订",
     territorycode: "区域",
-    firstname: "名",
     overriddencreatedon: "创建记录的时间",
     address3_country: "地址 3: 国家/地区",
-    lastname: "姓",
     donotbulkemail: "不允许使用批量电子邮件",
     address3_telephone2: "地址 3: 电话 2",
     ownerid: "负责人",
@@ -142,7 +138,6 @@ export default {
     preferredsystemuserid: "首选用户",
     address1_upszone: "地址 1: UPS 区域",
     aging60: "时效 60",
-    firstname: "名",
     address3_postofficebox: "地址 3: 邮政信箱",
     address2_city: "地址 2: 市/县",
     processid: "流程",

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

@@ -45,7 +45,6 @@ export default {
     assistantname: "助理",
     address1_composite: "地址 1",
     address1_line1: "地址 1: 街道 1",
-    middlename: "中间名",
     address1_telephone3: "地址 1: 电话 3",
     telephone2: "住宅电话",
     address2_addressid: "地址 2: ID",
@@ -80,7 +79,6 @@ export default {
     address1_line2: "地址 1: 街道 2",
     nickname: "昵称",
     versionnumber: "版本号",
-    fullname: "全名",
     entityimage: "实体图像",
     shippingmethodcode: "送货方式",
     customertypecode: "关系类型",
@@ -113,10 +111,8 @@ export default {
     annualincome: "年收入",
     subscriptionid: "预订",
     territorycode: "区域",
-    firstname: "名",
     overriddencreatedon: "创建记录的时间",
     address3_country: "地址 3: 国家/地区",
-    lastname: "姓",
     donotbulkemail: "不允许使用批量电子邮件",
     address3_telephone2: "地址 3: 电话 2",
     ownerid: "负责人",
@@ -141,7 +137,6 @@ export default {
     preferredsystemuserid: "首选用户",
     address1_upszone: "地址 1: UPS 区域",
     aging60: "时效 60",
-    firstname: "名",
     address3_postofficebox: "地址 3: 邮政信箱",
     address2_city: "地址 2: 市/县",
     processid: "流程",

app_CRM/src/locale/lanres/entities/email/email_en_US.ts

@@ -49,7 +49,6 @@ export default {
     conversationindex: "对话索引",
     stageid: "流程阶段",
     postponeemailprocessinguntil: "延迟电子邮件处理，直至",
-    emailsendername: "电子邮件发件人名称",
     directioncode: "方向",
     notifications: "通知",
     emailsenderobjecttypecode: "电子邮件发件人类型",
@@ -75,7 +74,6 @@ export default {
     submittedby: "提交者",
     torecipients: "至收件人",
     deliveryprioritycode: "传递优先级",
-    sendersaccountname: "电子邮件发件人帐户名称",
     owneridtype: "负责人类型",
     attachmentcount: "附件计数",
     attachmentopencount: "附件打开计数",

app_CRM/src/locale/lanres/entities/email/email_zh_CN.ts

@@ -48,7 +48,6 @@ export default {
     conversationindex: "对话索引",
     stageid: "流程阶段",
     postponeemailprocessinguntil: "延迟电子邮件处理，直至",
-    emailsendername: "电子邮件发件人名称",
     directioncode: "方向",
     notifications: "通知",
     emailsenderobjecttypecode: "电子邮件发件人类型",
@@ -74,7 +73,6 @@ export default {
     submittedby: "提交者",
     torecipients: "至收件人",
     deliveryprioritycode: "传递优先级",
-    sendersaccountname: "电子邮件发件人帐户名称",
     owneridtype: "负责人类型",
     attachmentcount: "附件计数",
     attachmentopencount: "附件打开计数",

app_CRM/src/locale/lanres/entities/incident/incident_en_US.ts

@@ -41,10 +41,8 @@ export default {
     decrementing: "减少",
     updateman: "更新人",
     statuscode: "状态描述",
-    responsiblecontactname: "ResponsibleContactName",
     resolveby: "解决方",
     responseby: "第一个响应者",
-    primarycontactname: "主联系人",
     entityimageid: "EntityImageId",
     followuptaskcreated: "已创建跟进任务",
     firstresponsesent: "第一个响应已发送",

app_CRM/src/locale/lanres/entities/incident/incident_zh_CN.ts

@@ -40,10 +40,8 @@ export default {
     decrementing: "减少",
     updateman: "更新人",
     statuscode: "状态描述",
-    responsiblecontactname: "ResponsibleContactName",
     resolveby: "解决方",
     responseby: "第一个响应者",
-    primarycontactname: "主联系人",
     entityimageid: "EntityImageId",
     followuptaskcreated: "已创建跟进任务",
     firstresponsesent: "第一个响应已发送",

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

@@ -40,7 +40,6 @@ export default {
     followemail: "跟踪电子邮件活动",
     address1_country: "国家/地区",
     websiteurl: "网站",
-    companyname: "公司名称",
     updatedate: "更新时间",
     address1_line3: "街道 3",
     address2_addressid: "地址 2: ID",
@@ -62,7 +61,6 @@ export default {
     address1_postofficebox: "地址 1: 邮政信箱",
     address1_telephone1: "地址 1: 电话 1",
     revenue: "年收入",
-    lastname: "姓",
     address2_county: "地址 2: 县",
     stageid: "Stage Id",
     address1_shippingmethodcode: "地址 1: 送货方式",
@@ -76,7 +74,6 @@ export default {
     address2_shippingmethodcode: "地址 2: 送货方式",
     address2_latitude: "地址 2: 纬度",
     participatesinworkflow: "参与工作流",
-    firstname: "名",
     address2_composite: "地址 2",
     salesstage: "销售阶段",
     donotpostalmail: "不允许使用邮件",
@@ -92,7 +89,6 @@ export default {
     need: "需求",
     prioritycode: "优先级",
     address1_addressid: "地址 1: ID",
-    fullname: "全名",
     salesstagecode: "销售阶段代码",
     importsequencenumber: "Import Sequence Number",
     address2_telephone1: "地址 2: 电话 1",
@@ -100,7 +96,6 @@ export default {
     middlename: "中间名",
     telephone2: "住宅电话",
     purchasetimeframe: "购买时间范围",
-    middlename: "中间名",
     leadsourcecode: "潜在顾客来源",
     entityimage_timestamp: "EntityImage_Timestamp",
     preferredcontactmethodcode: "首选联系方式",

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

@@ -39,7 +39,6 @@ export default {
     followemail: "跟踪电子邮件活动",
     address1_country: "国家/地区",
     websiteurl: "网站",
-    companyname: "公司名称",
     updatedate: "更新时间",
     address1_line3: "街道 3",
     address2_addressid: "地址 2: ID",
@@ -61,7 +60,6 @@ export default {
     address1_postofficebox: "地址 1: 邮政信箱",
     address1_telephone1: "地址 1: 电话 1",
     revenue: "年收入",
-    lastname: "姓",
     address2_county: "地址 2: 县",
     stageid: "Stage Id",
     address1_shippingmethodcode: "地址 1: 送货方式",
@@ -75,7 +73,6 @@ export default {
     address2_shippingmethodcode: "地址 2: 送货方式",
     address2_latitude: "地址 2: 纬度",
     participatesinworkflow: "参与工作流",
-    firstname: "名",
     address2_composite: "地址 2",
     salesstage: "销售阶段",
     donotpostalmail: "不允许使用邮件",
@@ -91,7 +88,6 @@ export default {
     need: "需求",
     prioritycode: "优先级",
     address1_addressid: "地址 1: ID",
-    fullname: "全名",
     salesstagecode: "销售阶段代码",
     importsequencenumber: "Import Sequence Number",
     address2_telephone1: "地址 2: 电话 1",
@@ -99,7 +95,6 @@ export default {
     middlename: "中间名",
     telephone2: "住宅电话",
     purchasetimeframe: "购买时间范围",
-    middlename: "中间名",
     leadsourcecode: "潜在顾客来源",
     entityimage_timestamp: "EntityImage_Timestamp",
     preferredcontactmethodcode: "首选联系方式",

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

@@ -64,21 +64,6 @@ export default class AccountServiceBase 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 listaccountsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
             listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
@@ -124,6 +109,21 @@ export default class AccountServiceBase extends EntityService {
             }
         }
         masterData.contacts = contactsData;
+        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;
@@ -133,10 +133,10 @@ export default class AccountServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/accounts`,data,isloading);
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_contacts',JSON.stringify(res.data.contacts));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
         return res;
     }
 
@@ -151,21 +151,6 @@ export default class AccountServiceBase 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 listaccountsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
             listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
@@ -211,12 +196,27 @@ export default class AccountServiceBase extends EntityService {
             }
         }
         masterData.contacts = contactsData;
+        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(`/accounts/${context.account}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
             this.tempStorage.setItem(context.srfsessionkey+'_contacts',JSON.stringify(res.data.contacts));
+            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             return res;
     }
 
@@ -244,10 +244,10 @@ export default class AccountServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/accounts/${context.account}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
             this.tempStorage.setItem(context.srfsessionkey+'_contacts',JSON.stringify(res.data.contacts));
+            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             return res;
     }
 
@@ -263,10 +263,10 @@ export default class AccountServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/accounts/getdraft`,isloading);
         res.data.account = data.account;
-            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
             this.tempStorage.setItem(context.srfsessionkey+'_contacts',JSON.stringify(res.data.contacts));
+            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
         return res;
     }
 
@@ -337,21 +337,6 @@ export default class AccountServiceBase 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 listaccountsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
             listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
@@ -397,12 +382,27 @@ export default class AccountServiceBase extends EntityService {
             }
         }
         masterData.contacts = contactsData;
+        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(`/accounts/${context.account}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
             this.tempStorage.setItem(context.srfsessionkey+'_contacts',JSON.stringify(res.data.contacts));
+            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             return res;
     }
 

app_CRM/src/widgets/contact/con-abs-dashboard/con-abs-dashboard-model.ts

@@ -149,9 +149,6 @@ export default class ConAbsModel {
       {
         name: 'address1_line1',
       },
-      {
-        name: 'middlename',
-      },
       {
         name: 'address1_telephone3',
       },
@@ -254,9 +251,6 @@ export default class ConAbsModel {
       {
         name: 'versionnumber',
       },
-      {
-        name: 'fullname',
-      },
       {
         name: 'entityimage',
       },
@@ -353,18 +347,12 @@ export default class ConAbsModel {
       {
         name: 'territorycode',
       },
-      {
-        name: 'firstname',
-      },
       {
         name: 'overriddencreatedon',
       },
       {
         name: 'address3_country',
       },
-      {
-        name: 'lastname',
-      },
       {
         name: 'donotbulkemail',
       },
@@ -437,9 +425,6 @@ export default class ConAbsModel {
       {
         name: 'aging60',
       },
-      {
-        name: 'firstname',
-      },
       {
         name: 'address3_postofficebox',
       },

app_CRM/src/widgets/contact/infotabexppanel-tabexppanel/infotabexppanel-tabexppanel-model.ts

@@ -149,9 +149,6 @@ export default class InfotabexppanelModel {
       {
         name: 'address1_line1',
       },
-      {
-        name: 'middlename',
-      },
       {
         name: 'address1_telephone3',
       },
@@ -254,9 +251,6 @@ export default class InfotabexppanelModel {
       {
         name: 'versionnumber',
       },
-      {
-        name: 'fullname',
-      },
       {
         name: 'entityimage',
       },
@@ -353,18 +347,12 @@ export default class InfotabexppanelModel {
       {
         name: 'territorycode',
       },
-      {
-        name: 'firstname',
-      },
       {
         name: 'overriddencreatedon',
       },
       {
         name: 'address3_country',
       },
-      {
-        name: 'lastname',
-      },
       {
         name: 'donotbulkemail',
       },
@@ -437,9 +425,6 @@ export default class InfotabexppanelModel {
       {
         name: 'aging60',
       },
-      {
-        name: 'firstname',
-      },
       {
         name: 'address3_postofficebox',
       },

app_CRM/src/widgets/contact/infotabviewpanel-tabviewpanel/infotabviewpanel-tabviewpanel-model.ts

@@ -149,9 +149,6 @@ export default class InfotabviewpanelModel {
       {
         name: 'address1_line1',
       },
-      {
-        name: 'middlename',
-      },
       {
         name: 'address1_telephone3',
       },
@@ -254,9 +251,6 @@ export default class InfotabviewpanelModel {
       {
         name: 'versionnumber',
       },
-      {
-        name: 'fullname',
-      },
       {
         name: 'entityimage',
       },
@@ -353,18 +347,12 @@ export default class InfotabviewpanelModel {
       {
         name: 'territorycode',
       },
-      {
-        name: 'firstname',
-      },
       {
         name: 'overriddencreatedon',
       },
       {
         name: 'address3_country',
       },
-      {
-        name: 'lastname',
-      },
       {
         name: 'donotbulkemail',
       },
@@ -437,9 +425,6 @@ export default class InfotabviewpanelModel {
       {
         name: 'aging60',
       },
-      {
-        name: 'firstname',
-      },
       {
         name: 'address3_postofficebox',
       },

app_CRM/src/widgets/contact/infotabviewpanel2-tabviewpanel/infotabviewpanel2-tabviewpanel-model.ts

@@ -149,9 +149,6 @@ export default class Infotabviewpanel2Model {
       {
         name: 'address1_line1',
       },
-      {
-        name: 'middlename',
-      },
       {
         name: 'address1_telephone3',
       },
@@ -254,9 +251,6 @@ export default class Infotabviewpanel2Model {
       {
         name: 'versionnumber',
       },
-      {
-        name: 'fullname',
-      },
       {
         name: 'entityimage',
       },
@@ -353,18 +347,12 @@ export default class Infotabviewpanel2Model {
       {
         name: 'territorycode',
       },
-      {
-        name: 'firstname',
-      },
       {
         name: 'overriddencreatedon',
       },
       {
         name: 'address3_country',
       },
-      {
-        name: 'lastname',
-      },
       {
         name: 'donotbulkemail',
       },
@@ -437,9 +425,6 @@ export default class Infotabviewpanel2Model {
       {
         name: 'aging60',
       },
-      {
-        name: 'firstname',
-      },
       {
         name: 'address3_postofficebox',
       },

app_CRM/src/widgets/contact/infotabviewpanel3-tabviewpanel/infotabviewpanel3-tabviewpanel-model.ts

@@ -149,9 +149,6 @@ export default class Infotabviewpanel3Model {
       {
         name: 'address1_line1',
       },
-      {
-        name: 'middlename',
-      },
       {
         name: 'address1_telephone3',
       },
@@ -254,9 +251,6 @@ export default class Infotabviewpanel3Model {
       {
         name: 'versionnumber',
       },
-      {
-        name: 'fullname',
-      },
       {
         name: 'entityimage',
       },
@@ -353,18 +347,12 @@ export default class Infotabviewpanel3Model {
       {
         name: 'territorycode',
       },
-      {
-        name: 'firstname',
-      },
       {
         name: 'overriddencreatedon',
       },
       {
         name: 'address3_country',
       },
-      {
-        name: 'lastname',
-      },
       {
         name: 'donotbulkemail',
       },
@@ -437,9 +425,6 @@ export default class Infotabviewpanel3Model {
       {
         name: 'aging60',
       },
-      {
-        name: 'firstname',
-      },
       {
         name: 'address3_postofficebox',
       },

app_CRM/src/widgets/contact/infotabviewpanel4-tabviewpanel/infotabviewpanel4-tabviewpanel-model.ts

@@ -149,9 +149,6 @@ export default class Infotabviewpanel4Model {
       {
         name: 'address1_line1',
       },
-      {
-        name: 'middlename',
-      },
       {
         name: 'address1_telephone3',
       },
@@ -254,9 +251,6 @@ export default class Infotabviewpanel4Model {
       {
         name: 'versionnumber',
       },
-      {
-        name: 'fullname',
-      },
       {
         name: 'entityimage',
       },
@@ -353,18 +347,12 @@ export default class Infotabviewpanel4Model {
       {
         name: 'territorycode',
       },
-      {
-        name: 'firstname',
-      },
       {
         name: 'overriddencreatedon',
       },
       {
         name: 'address3_country',
       },
-      {
-        name: 'lastname',
-      },
       {
         name: 'donotbulkemail',
       },
@@ -437,9 +425,6 @@ export default class Infotabviewpanel4Model {
       {
         name: 'aging60',
       },
-      {
-        name: 'firstname',
-      },
       {
         name: 'address3_postofficebox',
       },

app_CRM/src/widgets/contact/infotabviewpanel5-tabviewpanel/infotabviewpanel5-tabviewpanel-model.ts

@@ -149,9 +149,6 @@ export default class Infotabviewpanel5Model {
       {
         name: 'address1_line1',
       },
-      {
-        name: 'middlename',
-      },
       {
         name: 'address1_telephone3',
       },
@@ -254,9 +251,6 @@ export default class Infotabviewpanel5Model {
       {
         name: 'versionnumber',
       },
-      {
-        name: 'fullname',
-      },
       {
         name: 'entityimage',
       },
@@ -353,18 +347,12 @@ export default class Infotabviewpanel5Model {
       {
         name: 'territorycode',
       },
-      {
-        name: 'firstname',
-      },
       {
         name: 'overriddencreatedon',
       },
       {
         name: 'address3_country',
       },
-      {
-        name: 'lastname',
-      },
       {
         name: 'donotbulkemail',
       },
@@ -437,9 +425,6 @@ export default class Infotabviewpanel5Model {
       {
         name: 'aging60',
       },
-      {
-        name: 'firstname',
-      },
       {
         name: 'address3_postofficebox',
       },

app_CRM/src/widgets/contact/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts

@@ -149,9 +149,6 @@ export default class PickupViewpickupviewpanelModel {
       {
         name: 'address1_line1',
       },
-      {
-        name: 'middlename',
-      },
       {
         name: 'address1_telephone3',
       },
@@ -254,9 +251,6 @@ export default class PickupViewpickupviewpanelModel {
       {
         name: 'versionnumber',
       },
-      {
-        name: 'fullname',
-      },
       {
         name: 'entityimage',
       },
@@ -353,18 +347,12 @@ export default class PickupViewpickupviewpanelModel {
       {
         name: 'territorycode',
       },
-      {
-        name: 'firstname',
-      },
       {
         name: 'overriddencreatedon',
       },
       {
         name: 'address3_country',
       },
-      {
-        name: 'lastname',
-      },
       {
         name: 'donotbulkemail',
       },
@@ -437,9 +425,6 @@ export default class PickupViewpickupviewpanelModel {
       {
         name: 'aging60',
       },
-      {
-        name: 'firstname',
-      },
       {
         name: 'address3_postofficebox',
       },

app_CRM/src/widgets/contact/tab-exp-viewtabexppanel-tabexppanel/tab-exp-viewtabexppanel-tabexppanel-model.ts

@@ -149,9 +149,6 @@ export default class TabExpViewtabexppanelModel {
       {
         name: 'address1_line1',
       },
-      {
-        name: 'middlename',
-      },
       {
         name: 'address1_telephone3',
       },
@@ -254,9 +251,6 @@ export default class TabExpViewtabexppanelModel {
       {
         name: 'versionnumber',
       },
-      {
-        name: 'fullname',
-      },
       {
         name: 'entityimage',
       },
@@ -353,18 +347,12 @@ export default class TabExpViewtabexppanelModel {
       {
         name: 'territorycode',
       },
-      {
-        name: 'firstname',
-      },
       {
         name: 'overriddencreatedon',
       },
       {
         name: 'address3_country',
       },
-      {
-        name: 'lastname',
-      },
       {
         name: 'donotbulkemail',
       },
@@ -437,9 +425,6 @@ export default class TabExpViewtabexppanelModel {
       {
         name: 'aging60',
       },
-      {
-        name: 'firstname',
-      },
       {
         name: 'address3_postofficebox',
       },

app_CRM/src/widgets/contact/tab-exp-viewtabviewpanel-tabviewpanel/tab-exp-viewtabviewpanel-tabviewpanel-model.ts

@@ -149,9 +149,6 @@ export default class TabExpViewtabviewpanelModel {
       {
         name: 'address1_line1',
       },
-      {
-        name: 'middlename',
-      },
       {
         name: 'address1_telephone3',
       },
@@ -254,9 +251,6 @@ export default class TabExpViewtabviewpanelModel {
       {
         name: 'versionnumber',
       },
-      {
-        name: 'fullname',
-      },
       {
         name: 'entityimage',
       },
@@ -353,18 +347,12 @@ export default class TabExpViewtabviewpanelModel {
       {
         name: 'territorycode',
       },
-      {
-        name: 'firstname',
-      },
       {
         name: 'overriddencreatedon',
       },
       {
         name: 'address3_country',
       },
-      {
-        name: 'lastname',
-      },
       {
         name: 'donotbulkemail',
       },
@@ -437,9 +425,6 @@ export default class TabExpViewtabviewpanelModel {
       {
         name: 'aging60',
       },
-      {
-        name: 'firstname',
-      },
       {
         name: 'address3_postofficebox',
       },

app_CRM/src/widgets/contact/tab-exp-viewtabviewpanel2-tabviewpanel/tab-exp-viewtabviewpanel2-tabviewpanel-model.ts

@@ -149,9 +149,6 @@ export default class TabExpViewtabviewpanel2Model {
       {
         name: 'address1_line1',
       },
-      {
-        name: 'middlename',
-      },
       {
         name: 'address1_telephone3',
       },
@@ -254,9 +251,6 @@ export default class TabExpViewtabviewpanel2Model {
       {
         name: 'versionnumber',
       },
-      {
-        name: 'fullname',
-      },
       {
         name: 'entityimage',
       },
@@ -353,18 +347,12 @@ export default class TabExpViewtabviewpanel2Model {
       {
         name: 'territorycode',
       },
-      {
-        name: 'firstname',
-      },
       {
         name: 'overriddencreatedon',
       },
       {
         name: 'address3_country',
       },
-      {
-        name: 'lastname',
-      },
       {
         name: 'donotbulkemail',
       },
@@ -437,9 +425,6 @@ export default class TabExpViewtabviewpanel2Model {
       {
         name: 'aging60',
       },
-      {
-        name: 'firstname',
-      },
       {
         name: 'address3_postofficebox',
       },

app_CRM/src/widgets/contact/tab-exp-viewtabviewpanel3-tabviewpanel/tab-exp-viewtabviewpanel3-tabviewpanel-model.ts

@@ -149,9 +149,6 @@ export default class TabExpViewtabviewpanel3Model {
       {
         name: 'address1_line1',
       },
-      {
-        name: 'middlename',
-      },
       {
         name: 'address1_telephone3',
       },
@@ -254,9 +251,6 @@ export default class TabExpViewtabviewpanel3Model {
       {
         name: 'versionnumber',
       },
-      {
-        name: 'fullname',
-      },
       {
         name: 'entityimage',
       },
@@ -353,18 +347,12 @@ export default class TabExpViewtabviewpanel3Model {
       {
         name: 'territorycode',
       },
-      {
-        name: 'firstname',
-      },
       {
         name: 'overriddencreatedon',
       },
       {
         name: 'address3_country',
       },
-      {
-        name: 'lastname',
-      },
       {
         name: 'donotbulkemail',
       },
@@ -437,9 +425,6 @@ export default class TabExpViewtabviewpanel3Model {
       {
         name: 'aging60',
       },
-      {
-        name: 'firstname',
-      },
       {
         name: 'address3_postofficebox',
       },

app_CRM/src/widgets/contact/view-con-abs-portlet/view-con-abs-portlet-model.ts

@@ -149,9 +149,6 @@ export default class View_ConAbsModel {
       {
         name: 'address1_line1',
       },
-      {
-        name: 'middlename',
-      },
       {
         name: 'address1_telephone3',
       },
@@ -254,9 +251,6 @@ export default class View_ConAbsModel {
       {
         name: 'versionnumber',
       },
-      {
-        name: 'fullname',
-      },
       {
         name: 'entityimage',
       },
@@ -353,18 +347,12 @@ export default class View_ConAbsModel {
       {
         name: 'territorycode',
       },
-      {
-        name: 'firstname',
-      },
       {
         name: 'overriddencreatedon',
       },
       {
         name: 'address3_country',
       },
-      {
-        name: 'lastname',
-      },
       {
         name: 'donotbulkemail',
       },
@@ -437,9 +425,6 @@ export default class View_ConAbsModel {
       {
         name: 'aging60',
       },
-      {
-        name: 'firstname',
-      },
       {
         name: 'address3_postofficebox',
       },

app_CRM/src/widgets/incident/incident-info-dashboard/incident-info-dashboard-model.ts

@@ -134,18 +134,12 @@ export default class IncidentInfoModel {
       {
         name: 'statuscode',
       },
-      {
-        name: 'responsiblecontactname',
-      },
       {
         name: 'resolveby',
       },
       {
         name: 'responseby',
       },
-      {
-        name: 'primarycontactname',
-      },
       {
         name: 'entityimageid',
       },

app_CRM/src/widgets/incident/info-viewtabexppanel-tabexppanel/info-viewtabexppanel-tabexppanel-model.ts

@@ -134,18 +134,12 @@ export default class InfoViewtabexppanelModel {
       {
         name: 'statuscode',
       },
-      {
-        name: 'responsiblecontactname',
-      },
       {
         name: 'resolveby',
       },
       {
         name: 'responseby',
       },
-      {
-        name: 'primarycontactname',
-      },
       {
         name: 'entityimageid',
       },

app_CRM/src/widgets/incident/info-viewtabviewpanel-tabviewpanel/info-viewtabviewpanel-tabviewpanel-model.ts

@@ -134,18 +134,12 @@ export default class InfoViewtabviewpanelModel {
       {
         name: 'statuscode',
       },
-      {
-        name: 'responsiblecontactname',
-      },
       {
         name: 'resolveby',
       },
       {
         name: 'responseby',
       },
-      {
-        name: 'primarycontactname',
-      },
       {
         name: 'entityimageid',
       },

app_CRM/src/widgets/incident/info-viewtabviewpanel2-tabviewpanel/info-viewtabviewpanel2-tabviewpanel-model.ts

@@ -134,18 +134,12 @@ export default class InfoViewtabviewpanel2Model {
       {
         name: 'statuscode',
       },
-      {
-        name: 'responsiblecontactname',
-      },
       {
         name: 'resolveby',
       },
       {
         name: 'responseby',
       },
-      {
-        name: 'primarycontactname',
-      },
       {
         name: 'entityimageid',
       },

app_CRM/src/widgets/incident/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts

@@ -134,18 +134,12 @@ export default class PickupViewpickupviewpanelModel {
       {
         name: 'statuscode',
       },
-      {
-        name: 'responsiblecontactname',
-      },
       {
         name: 'resolveby',
       },
       {
         name: 'responseby',
       },
-      {
-        name: 'primarycontactname',
-      },
       {
         name: 'entityimageid',
       },

app_CRM/src/widgets/incident/view-incident-info-portlet/view-incident-info-portlet-model.ts

@@ -134,18 +134,12 @@ export default class View_IncidentInfoModel {
       {
         name: 'statuscode',
       },
-      {
-        name: 'responsiblecontactname',
-      },
       {
         name: 'resolveby',
       },
       {
         name: 'responseby',
       },
-      {
-        name: 'primarycontactname',
-      },
       {
         name: 'entityimageid',
       },

app_CRM/src/widgets/lead/infotabexppanel-tabexppanel/infotabexppanel-tabexppanel-model.ts

@@ -132,9 +132,6 @@ export default class InfotabexppanelModel {
       {
         name: 'websiteurl',
       },
-      {
-        name: 'companyname',
-      },
       {
         name: 'updatedate',
       },
@@ -198,9 +195,6 @@ export default class InfotabexppanelModel {
       {
         name: 'revenue',
       },
-      {
-        name: 'lastname',
-      },
       {
         name: 'address2_county',
       },
@@ -240,9 +234,6 @@ export default class InfotabexppanelModel {
       {
         name: 'participatesinworkflow',
       },
-      {
-        name: 'firstname',
-      },
       {
         name: 'address2_composite',
       },
@@ -288,9 +279,6 @@ export default class InfotabexppanelModel {
       {
         name: 'address1_addressid',
       },
-      {
-        name: 'fullname',
-      },
       {
         name: 'salesstagecode',
       },
@@ -312,9 +300,6 @@ export default class InfotabexppanelModel {
       {
         name: 'purchasetimeframe',
       },
-      {
-        name: 'middlename',
-      },
       {
         name: 'leadsourcecode',
       },

app_CRM/src/widgets/lead/infotabviewpanel-tabviewpanel/infotabviewpanel-tabviewpanel-model.ts

@@ -132,9 +132,6 @@ export default class InfotabviewpanelModel {
       {
         name: 'websiteurl',
       },
-      {
-        name: 'companyname',
-      },
       {
         name: 'updatedate',
       },
@@ -198,9 +195,6 @@ export default class InfotabviewpanelModel {
       {
         name: 'revenue',
       },
-      {
-        name: 'lastname',
-      },
       {
         name: 'address2_county',
       },
@@ -240,9 +234,6 @@ export default class InfotabviewpanelModel {
       {
         name: 'participatesinworkflow',
       },
-      {
-        name: 'firstname',
-      },
       {
         name: 'address2_composite',
       },
@@ -288,9 +279,6 @@ export default class InfotabviewpanelModel {
       {
         name: 'address1_addressid',
       },
-      {
-        name: 'fullname',
-      },
       {
         name: 'salesstagecode',
       },
@@ -312,9 +300,6 @@ export default class InfotabviewpanelModel {
       {
         name: 'purchasetimeframe',
       },
-      {
-        name: 'middlename',
-      },
       {
         name: 'leadsourcecode',
       },

app_CRM/src/widgets/lead/infotabviewpanel2-tabviewpanel/infotabviewpanel2-tabviewpanel-model.ts

@@ -132,9 +132,6 @@ export default class Infotabviewpanel2Model {
       {
         name: 'websiteurl',
       },
-      {
-        name: 'companyname',
-      },
       {
         name: 'updatedate',
       },
@@ -198,9 +195,6 @@ export default class Infotabviewpanel2Model {
       {
         name: 'revenue',
       },
-      {
-        name: 'lastname',
-      },
       {
         name: 'address2_county',
       },
@@ -240,9 +234,6 @@ export default class Infotabviewpanel2Model {
       {
         name: 'participatesinworkflow',
       },
-      {
-        name: 'firstname',
-      },
       {
         name: 'address2_composite',
       },
@@ -288,9 +279,6 @@ export default class Infotabviewpanel2Model {
       {
         name: 'address1_addressid',
       },
-      {
-        name: 'fullname',
-      },
       {
         name: 'salesstagecode',
       },
@@ -312,9 +300,6 @@ export default class Infotabviewpanel2Model {
       {
         name: 'purchasetimeframe',
       },
-      {
-        name: 'middlename',
-      },
       {
         name: 'leadsourcecode',
       },

app_CRM/src/widgets/lead/infotabviewpanel3-tabviewpanel/infotabviewpanel3-tabviewpanel-model.ts

@@ -132,9 +132,6 @@ export default class Infotabviewpanel3Model {
       {
         name: 'websiteurl',
       },
-      {
-        name: 'companyname',
-      },
       {
         name: 'updatedate',
       },
@@ -198,9 +195,6 @@ export default class Infotabviewpanel3Model {
       {
         name: 'revenue',
       },
-      {
-        name: 'lastname',
-      },
       {
         name: 'address2_county',
       },
@@ -240,9 +234,6 @@ export default class Infotabviewpanel3Model {
       {
         name: 'participatesinworkflow',
       },
-      {
-        name: 'firstname',
-      },
       {
         name: 'address2_composite',
       },
@@ -288,9 +279,6 @@ export default class Infotabviewpanel3Model {
       {
         name: 'address1_addressid',
       },
-      {
-        name: 'fullname',
-      },
       {
         name: 'salesstagecode',
       },
@@ -312,9 +300,6 @@ export default class Infotabviewpanel3Model {
       {
         name: 'purchasetimeframe',
       },
-      {
-        name: 'middlename',
-      },
       {
         name: 'leadsourcecode',
       },

app_CRM/src/widgets/lead/infotabviewpanel4-tabviewpanel/infotabviewpanel4-tabviewpanel-model.ts

@@ -132,9 +132,6 @@ export default class Infotabviewpanel4Model {
       {
         name: 'websiteurl',
       },
-      {
-        name: 'companyname',
-      },
       {
         name: 'updatedate',
       },
@@ -198,9 +195,6 @@ export default class Infotabviewpanel4Model {
       {
         name: 'revenue',
       },
-      {
-        name: 'lastname',
-      },
       {
         name: 'address2_county',
       },
@@ -240,9 +234,6 @@ export default class Infotabviewpanel4Model {
       {
         name: 'participatesinworkflow',
       },
-      {
-        name: 'firstname',
-      },
       {
         name: 'address2_composite',
       },
@@ -288,9 +279,6 @@ export default class Infotabviewpanel4Model {
       {
         name: 'address1_addressid',
       },
-      {
-        name: 'fullname',
-      },
       {
         name: 'salesstagecode',
       },
@@ -312,9 +300,6 @@ export default class Infotabviewpanel4Model {
       {
         name: 'purchasetimeframe',
       },
-      {
-        name: 'middlename',
-      },
       {
         name: 'leadsourcecode',
       },

app_CRM/src/widgets/lead/lead-info-dashboard/lead-info-dashboard-model.ts

@@ -132,9 +132,6 @@ export default class LeadInfoModel {
       {
         name: 'websiteurl',
       },
-      {
-        name: 'companyname',
-      },
       {
         name: 'updatedate',
       },
@@ -198,9 +195,6 @@ export default class LeadInfoModel {
       {
         name: 'revenue',
       },
-      {
-        name: 'lastname',
-      },
       {
         name: 'address2_county',
       },
@@ -240,9 +234,6 @@ export default class LeadInfoModel {
       {
         name: 'participatesinworkflow',
       },
-      {
-        name: 'firstname',
-      },
       {
         name: 'address2_composite',
       },
@@ -288,9 +279,6 @@ export default class LeadInfoModel {
       {
         name: 'address1_addressid',
       },
-      {
-        name: 'fullname',
-      },
       {
         name: 'salesstagecode',
       },
@@ -312,9 +300,6 @@ export default class LeadInfoModel {
       {
         name: 'purchasetimeframe',
       },
-      {
-        name: 'middlename',
-      },
       {
         name: 'leadsourcecode',
       },

app_CRM/src/widgets/lead/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts

@@ -132,9 +132,6 @@ export default class PickupViewpickupviewpanelModel {
       {
         name: 'websiteurl',
       },
-      {
-        name: 'companyname',
-      },
       {
         name: 'updatedate',
       },
@@ -198,9 +195,6 @@ export default class PickupViewpickupviewpanelModel {
       {
         name: 'revenue',
       },
-      {
-        name: 'lastname',
-      },
       {
         name: 'address2_county',
       },
@@ -240,9 +234,6 @@ export default class PickupViewpickupviewpanelModel {
       {
         name: 'participatesinworkflow',
       },
-      {
-        name: 'firstname',
-      },
       {
         name: 'address2_composite',
       },
@@ -288,9 +279,6 @@ export default class PickupViewpickupviewpanelModel {
       {
         name: 'address1_addressid',
       },
-      {
-        name: 'fullname',
-      },
       {
         name: 'salesstagecode',
       },
@@ -312,9 +300,6 @@ export default class PickupViewpickupviewpanelModel {
       {
         name: 'purchasetimeframe',
       },
-      {
-        name: 'middlename',
-      },
       {
         name: 'leadsourcecode',
       },

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/domain/Feedback.java

@@ -104,7 +104,7 @@ public class Feedback extends EntityMP implements Serializable {
     @JsonProperty("exchangerate")
     private BigDecimal exchangerate;
     /**
-     * ClosedByName
+     * 关闭人
      */
     @TableField(value = "closedbyname")
     @JSONField(name = "closedbyname")
@@ -118,13 +118,6 @@ public class Feedback extends EntityMP implements Serializable {
     @JSONField(name = "updateman")
     @JsonProperty("updateman")
     private String updateman;
-    /**
-     * 关闭人
-     */
-    @TableField(value = "closedbyname")
-    @JSONField(name = "closedbyname")
-    @JsonProperty("closedbyname")
-    private String closedbyname;
     /**
      * 相关项
      */
@@ -381,14 +374,6 @@ public class Feedback extends EntityMP implements Serializable {
         this.modify("exchangerate",exchangerate);
     }
 
-    /**
-     * 设置 [ClosedByName]
-     */
-    public void setClosedbyname(String closedbyname){
-        this.closedbyname = closedbyname ;
-        this.modify("closedbyname",closedbyname);
-    }
-
     /**
      * 设置 [关闭人]
      */