xignzi006 发布系统代码

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

@@ -331,6 +331,8 @@ export default {
 			creditlimit: "信用额度", 
 			creditonhold: "信用冻结", 
 			paymenttermscode: "付款方式", 
+			customerid: "客户", 
+			originatingleadid: "原始潜在顾客", 
 			contactid: "联系人", 
 		},
 		uiactions: {
@@ -561,6 +563,7 @@ export default {
 			lastusedincampaign: "上次参与市场活动的日期", 
 			donotsendmm: "发送市场营销资料", 
 			shippingmethodcode: "送货方式", 
+			originatingleadid: "原始潜在顾客", 
 			contactid: "联系人", 
 		},
 		uiactions: {

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

@@ -330,6 +330,8 @@ export default {
 			creditlimit: "信用额度", 
 			creditonhold: "信用冻结", 
 			paymenttermscode: "付款方式", 
+			customerid: "客户", 
+			originatingleadid: "原始潜在顾客", 
 			contactid: "联系人", 
 		},
 		uiactions: {
@@ -560,6 +562,7 @@ export default {
 			lastusedincampaign: "上次参与市场活动的日期", 
 			donotsendmm: "发送市场营销资料", 
 			shippingmethodcode: "送货方式", 
+			originatingleadid: "原始潜在顾客", 
 			contactid: "联系人", 
 		},
 		uiactions: {

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

@@ -202,6 +202,7 @@ export default {
 			followupby: "跟进工作截止日期", 
 			description: "说明", 
 			incidentid: "案例", 
+			primarycontactid: "联系人", 
 		},
 		uiactions: {
 		},

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

@@ -201,6 +201,7 @@ export default {
 			followupby: "跟进工作截止日期", 
 			description: "说明", 
 			incidentid: "案例", 
+			primarycontactid: "联系人", 
 		},
 		uiactions: {
 		},

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

@@ -231,6 +231,8 @@ export default {
 			currentsituation: "当前状况", 
 			customerneed: "客户需求", 
 			proposedsolution: "已拟定解决方案", 
+			parentcontactid: "联系人", 
+			parentaccountid: "帐户", 
 			opportunityid: "商机", 
 		},
 		uiactions: {

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

@@ -230,6 +230,8 @@ export default {
 			currentsituation: "当前状况", 
 			customerneed: "客户需求", 
 			proposedsolution: "已拟定解决方案", 
+			parentcontactid: "联系人", 
+			parentaccountid: "帐户", 
 			opportunityid: "商机", 
 		},
 		uiactions: {

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

@@ -719,6 +719,8 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
+                '35728a12ceecb647982051842853547c',
+                '2e9c7792c3a728896ca8902634f71983',
             ],
         },
         {
@@ -1069,6 +1071,8 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
+                '2e9c7792c3a728896ca8902634f71983',
+                'fcdb236b65d78c4a8ae64e74f9483a63',
             ],
         },
         {
@@ -2248,6 +2252,7 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
+                'fcdb236b65d78c4a8ae64e74f9483a63',
             ],
         },
         {

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

@@ -90,6 +90,8 @@ export class AbstractInfoEditFormBase extends EditFormControlBase {
         creditlimit: null,
         creditonhold: null,
         paymenttermscode: null,
+        customerid: null,
+        originatingleadid: null,
         contactid: null,
         contact:null,
     };
@@ -190,6 +192,10 @@ export class AbstractInfoEditFormBase extends EditFormControlBase {
 
         paymenttermscode: new FormItemModel({ caption: '付款方式', detailType: 'FORMITEM', name: 'paymenttermscode', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
+        customerid: new FormItemModel({ caption: '客户', detailType: 'FORMITEM', name: 'customerid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        originatingleadid: new FormItemModel({ caption: '原始潜在顾客', detailType: 'FORMITEM', name: 'originatingleadid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
         contactid: new FormItemModel({ caption: '联系人', detailType: 'FORMITEM', name: 'contactid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
     };

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

@@ -185,6 +185,16 @@ export default class AbstractInfoModel {
         prop: 'paymenttermscode',
         dataType: 'SSCODELIST',
       },
+      {
+        name: 'customerid',
+        prop: 'customerid',
+        dataType: 'PICKUP',
+      },
+      {
+        name: 'originatingleadid',
+        prop: 'originatingleadid',
+        dataType: 'PICKUP',
+      },
       {
         name: 'contactid',
         prop: 'contactid',

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

@@ -2,6 +2,8 @@ import { Http,Util,Errorlog } from '@/utils';
 import ControlService from '@/widgets/control-service';
 import ContactService from '@/service/contact/contact-service';
 import AbstractInfoModel from './abstract-info-form-model';
+import AccountService from '@/service/account/account-service';
+import LeadService from '@/service/lead/lead-service';
 
 
 /**
@@ -41,6 +43,22 @@ export default class AbstractInfoService extends ControlService {
         this.model = new AbstractInfoModel();
     }
 
+    /**
+     * 客户服务对象
+     *
+     * @type {AccountService}
+     * @memberof AbstractInfoService
+     */
+    public accountService: AccountService = new AccountService();
+
+    /**
+     * 潜在顾客服务对象
+     *
+     * @type {LeadService}
+     * @memberof AbstractInfoService
+     */
+    public leadService: LeadService = new LeadService();
+
     /**
      * 处理数据
      *
@@ -80,6 +98,12 @@ export default class AbstractInfoService extends ControlService {
      */
     @Errorlog
     public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
+        if (Object.is(serviceName, 'AccountService') && Object.is(interfaceName, 'FetchDefault')) {
+            return this.doItems(this.accountService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'accountid', 'account');
+        }
+        if (Object.is(serviceName, 'LeadService') && Object.is(interfaceName, 'FetchDefault')) {
+            return this.doItems(this.leadService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'leadid', 'lead');
+        }
 
         return Promise.reject([])
     }

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

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

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

@@ -77,6 +77,7 @@ export class Info_IncidentEditFormBase extends EditFormControlBase {
         followupby: null,
         description: null,
         incidentid: null,
+        primarycontactid: null,
         incident:null,
     };
 
@@ -144,5 +145,7 @@ export class Info_IncidentEditFormBase extends EditFormControlBase {
 
         incidentid: new FormItemModel({ caption: '案例', detailType: 'FORMITEM', name: 'incidentid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
+        primarycontactid: new FormItemModel({ caption: '联系人', detailType: 'FORMITEM', name: 'primarycontactid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
     };
 }
\ No newline at end of file

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

@@ -120,6 +120,11 @@ export default class Info_IncidentModel {
         prop: 'incidentid',
         dataType: 'GUID',
       },
+      {
+        name: 'primarycontactid',
+        prop: 'primarycontactid',
+        dataType: 'PICKUP',
+      },
       {
         name: 'incident',
         prop: 'incidentid',

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

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

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

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

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

@@ -76,6 +76,8 @@ export class AbstractInfoEditFormBase extends EditFormControlBase {
         currentsituation: null,
         customerneed: null,
         proposedsolution: null,
+        parentcontactid: null,
+        parentaccountid: null,
         opportunityid: null,
         opportunity:null,
     };
@@ -142,6 +144,10 @@ export class AbstractInfoEditFormBase extends EditFormControlBase {
 
         proposedsolution: new FormItemModel({ caption: '已拟定解决方案', detailType: 'FORMITEM', name: 'proposedsolution', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
+        parentcontactid: new FormItemModel({ caption: '联系人', detailType: 'FORMITEM', name: 'parentcontactid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        parentaccountid: new FormItemModel({ caption: '帐户', detailType: 'FORMITEM', name: 'parentaccountid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
         opportunityid: new FormItemModel({ caption: '商机', detailType: 'FORMITEM', name: 'opportunityid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
     };

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

@@ -115,6 +115,16 @@ export default class AbstractInfoModel {
         prop: 'proposedsolution',
         dataType: 'TEXT',
       },
+      {
+        name: 'parentcontactid',
+        prop: 'parentcontactid',
+        dataType: 'PICKUP',
+      },
+      {
+        name: 'parentaccountid',
+        prop: 'parentaccountid',
+        dataType: 'PICKUP',
+      },
       {
         name: 'opportunityid',
         prop: 'opportunityid',

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

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

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

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