chitanda 发布系统代码

app_CRM/src/components/app-form-druipart/app-form-druipart.vue

@@ -280,7 +280,7 @@ export default class AppFormDRUIPart extends Vue {
         if (Object.is(this.parentdata.SRFPARENTTYPE, 'CUSTOM')) {
             this.isRelationalData = false;
         }
-        const formData: any = data?data:JSON.parse(this.data);
+        const formData: any = data || JSON.parse(this.data);
         const _paramitem = formData[this.paramItem];
         let tempContext:any = {};
         let tempParam:any = {};
@@ -317,7 +317,11 @@ export default class AppFormDRUIPart extends Vue {
             }
         }
         if(!this.isForbidLoad){
-            this.partViewEvent('load', {srfparentdename:this.parentName,srfparentkey:_paramitem}, 0);
+            this.$nextTick(() => {
+                this.$nextTick(() => {
+                    this.partViewEvent('load', {srfparentdename:this.parentName,srfparentkey:_paramitem}, 0);
+                });
+            });
         }
     }
 

app_CRM/src/components/dropdown-list/dropdown-list.vue

@@ -8,7 +8,7 @@
         :filterable="filterable === true ? true : false"
         @on-open-change="onClick"
         :placeholder="$t('components.dropDownList.placeholder')">
-        <i-option v-for="(item, index) in items" :key="index" :value="item.value">{{($t('codelist.'+tag+'.'+item.value)!== ('codelist.'+tag+'.'+item.value))?$t('codelist.'+tag+'.'+item.value) : item.text}}</i-option>
+        <i-option v-for="(item, index) in items" :key="index" :value="item.value.toString()">{{($t('codelist.'+tag+'.'+item.value)!== ('codelist.'+tag+'.'+item.value))?$t('codelist.'+tag+'.'+item.value) : item.text}}</i-option>
     </i-select>
 </template>
 

app_CRM/src/pages/base/account-info/account-info-base.tsx

@@ -441,10 +441,11 @@ export class AccountInfoBase extends TabExpViewBase {
 
     /**
      * 加载模型
-     * 
+     *
+     * @protected
      * @memberof AccountInfoBase
      */
-    public async loadModel(): Promise<void> {
+    protected async loadModel(): Promise<any> {
         if(this.context.account){
             this.appEntityService.getDataInfo(JSON.parse(JSON.stringify(this.context)),{},false).then((response:any) =>{
                 if (!response || response.status !== 200) {
@@ -453,9 +454,8 @@ export class AccountInfoBase extends TabExpViewBase {
                 const { data: _data } = response;
                 if (_data.accountname) {
                     Object.assign(this.model, { dataInfo: _data.accountname });
-                    if(this.$tabPageExp){
-                        let _this:any = this;
-                        this.$tabPageExp.setCurPageCaption(_this.$t(this.model.srfTitle), _this.$t(this.model.srfTitle), _this.model.dataInfo);
+                    if (this.$tabPageExp) {
+                        this.$tabPageExp.setCurPageCaption(this.model.srfTitle, this.model.srfTitle, this.model.dataInfo);
                     }
                     if(this.$route){
                         this.$route.meta.info = this.model.dataInfo;

app_CRM/src/pages/base/activity-pointer-by-parent-key/activity-pointer-by-parent-key.html

 <studio-view-style2 viewName="activitypointerbyparentkey" viewTitle="活动" class='degridview activity-pointer-by-parent-key'>
     <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" search @on-search="onSearch($event)"/>
     <template slot="quickGroupSearch">
-        <app-quick-group :items="quickGroupModel" @valuechange="quickGroupValueChange"></app-quick-group>
+        <app-quick-group :items="quickGroupModel" @valuechange="quickGroupValueChange($event)"></app-quick-group>
     </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>

app_CRM/src/pages/base/activity-pointer-grid-view/activity-pointer-grid-view.html

@@ -4,7 +4,7 @@
     </template>
     <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" search @on-search="onSearch($event)"/>
     <template slot="quickGroupSearch">
-        <app-quick-group :items="quickGroupModel" @valuechange="quickGroupValueChange"></app-quick-group>
+        <app-quick-group :items="quickGroupModel" @valuechange="quickGroupValueChange($event)"></app-quick-group>
     </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>

app_CRM/src/pages/base/activity-pointer-redirect-view/activity-pointer-redirect-view.html

-!!!!模版产生代码错误:----
-FTL stack trace ("~" means nesting-related):
-	- Failed at: ${P.getLayoutCode("VIEW.vue").code}  [in template "TEMPLCODE_zh_CN" at line 1, column 1]
-----
-无法获取指定部件[VIEWLAYOUTPANEL#APPDEREDIRECTVIEW_STYLE2]发布代码[VIEW.vue]
\ No newline at end of file
+<studio-view-style2 viewName="activitypointerredirectview" viewTitle="活动数据重定向视图" class='deredirectview activity-pointer-redirect-view'>
+    <template slot='title'>
+    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    </template>
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="activitypointerredirectview"></app-studioaction>
+</studio-view-style2>
\ No newline at end of file

app_CRM/src/pages/base/contact-info/contact-info-base.tsx

@@ -406,10 +406,11 @@ export class ContactInfoBase extends TabExpViewBase {
 
     /**
      * 加载模型
-     * 
+     *
+     * @protected
      * @memberof ContactInfoBase
      */
-    public async loadModel(): Promise<void> {
+    protected async loadModel(): Promise<any> {
         if(this.context.contact){
             this.appEntityService.getDataInfo(JSON.parse(JSON.stringify(this.context)),{},false).then((response:any) =>{
                 if (!response || response.status !== 200) {
@@ -418,9 +419,8 @@ export class ContactInfoBase extends TabExpViewBase {
                 const { data: _data } = response;
                 if (_data.fullname) {
                     Object.assign(this.model, { dataInfo: _data.fullname });
-                    if(this.$tabPageExp){
-                        let _this:any = this;
-                        this.$tabPageExp.setCurPageCaption(_this.$t(this.model.srfTitle), _this.$t(this.model.srfTitle), _this.model.dataInfo);
+                    if (this.$tabPageExp) {
+                        this.$tabPageExp.setCurPageCaption(this.model.srfTitle, this.model.srfTitle, this.model.dataInfo);
                     }
                     if(this.$route){
                         this.$route.meta.info = this.model.dataInfo;

app_CRM/src/pages/finance/invoice-info-view/invoice-info-view-base.tsx

@@ -94,10 +94,11 @@ export class InvoiceInfoViewBase extends TabExpViewBase {
 
     /**
      * 加载模型
-     * 
+     *
+     * @protected
      * @memberof InvoiceInfoViewBase
      */
-    public async loadModel(): Promise<void> {
+    protected async loadModel(): Promise<any> {
         if(this.context.invoice){
             this.appEntityService.getDataInfo(JSON.parse(JSON.stringify(this.context)),{},false).then((response:any) =>{
                 if (!response || response.status !== 200) {
@@ -106,9 +107,8 @@ export class InvoiceInfoViewBase extends TabExpViewBase {
                 const { data: _data } = response;
                 if (_data.invoicename) {
                     Object.assign(this.model, { dataInfo: _data.invoicename });
-                    if(this.$tabPageExp){
-                        let _this:any = this;
-                        this.$tabPageExp.setCurPageCaption(_this.$t(this.model.srfTitle), _this.$t(this.model.srfTitle), _this.model.dataInfo);
+                    if (this.$tabPageExp) {
+                        this.$tabPageExp.setCurPageCaption(this.model.srfTitle, this.model.srfTitle, this.model.dataInfo);
                     }
                     if(this.$route){
                         this.$route.meta.info = this.model.dataInfo;

app_CRM/src/pages/marketing/campaign-info/campaign-info-base.tsx

@@ -406,10 +406,11 @@ export class CampaignInfoBase extends TabExpViewBase {
 
     /**
      * 加载模型
-     * 
+     *
+     * @protected
      * @memberof CampaignInfoBase
      */
-    public async loadModel(): Promise<void> {
+    protected async loadModel(): Promise<any> {
         if(this.context.campaign){
             this.appEntityService.getDataInfo(JSON.parse(JSON.stringify(this.context)),{},false).then((response:any) =>{
                 if (!response || response.status !== 200) {
@@ -418,9 +419,8 @@ export class CampaignInfoBase extends TabExpViewBase {
                 const { data: _data } = response;
                 if (_data.campaignname) {
                     Object.assign(this.model, { dataInfo: _data.campaignname });
-                    if(this.$tabPageExp){
-                        let _this:any = this;
-                        this.$tabPageExp.setCurPageCaption(_this.$t(this.model.srfTitle), _this.$t(this.model.srfTitle), _this.model.dataInfo);
+                    if (this.$tabPageExp) {
+                        this.$tabPageExp.setCurPageCaption(this.model.srfTitle, this.model.srfTitle, this.model.dataInfo);
                     }
                     if(this.$route){
                         this.$route.meta.info = this.model.dataInfo;

app_CRM/src/pages/marketing/ibiz-list-info/ibiz-list-info-base.tsx

@@ -94,10 +94,11 @@ export class IBizListInfoBase extends TabExpViewBase {
 
     /**
      * 加载模型
-     * 
+     *
+     * @protected
      * @memberof IBizListInfoBase
      */
-    public async loadModel(): Promise<void> {
+    protected async loadModel(): Promise<any> {
         if(this.context.ibizlist){
             this.appEntityService.getDataInfo(JSON.parse(JSON.stringify(this.context)),{},false).then((response:any) =>{
                 if (!response || response.status !== 200) {
@@ -106,9 +107,8 @@ export class IBizListInfoBase extends TabExpViewBase {
                 const { data: _data } = response;
                 if (_data.listname) {
                     Object.assign(this.model, { dataInfo: _data.listname });
-                    if(this.$tabPageExp){
-                        let _this:any = this;
-                        this.$tabPageExp.setCurPageCaption(_this.$t(this.model.srfTitle), _this.$t(this.model.srfTitle), _this.model.dataInfo);
+                    if (this.$tabPageExp) {
+                        this.$tabPageExp.setCurPageCaption(this.model.srfTitle, this.model.srfTitle, this.model.dataInfo);
                     }
                     if(this.$route){
                         this.$route.meta.info = this.model.dataInfo;

app_CRM/src/pages/sales/competitor-info/competitor-info-base.tsx

@@ -94,10 +94,11 @@ export class CompetitorInfoBase extends TabExpViewBase {
 
     /**
      * 加载模型
-     * 
+     *
+     * @protected
      * @memberof CompetitorInfoBase
      */
-    public async loadModel(): Promise<void> {
+    protected async loadModel(): Promise<any> {
         if(this.context.competitor){
             this.appEntityService.getDataInfo(JSON.parse(JSON.stringify(this.context)),{},false).then((response:any) =>{
                 if (!response || response.status !== 200) {
@@ -106,9 +107,8 @@ export class CompetitorInfoBase extends TabExpViewBase {
                 const { data: _data } = response;
                 if (_data.competitorname) {
                     Object.assign(this.model, { dataInfo: _data.competitorname });
-                    if(this.$tabPageExp){
-                        let _this:any = this;
-                        this.$tabPageExp.setCurPageCaption(_this.$t(this.model.srfTitle), _this.$t(this.model.srfTitle), _this.model.dataInfo);
+                    if (this.$tabPageExp) {
+                        this.$tabPageExp.setCurPageCaption(this.model.srfTitle, this.model.srfTitle, this.model.dataInfo);
                     }
                     if(this.$route){
                         this.$route.meta.info = this.model.dataInfo;

app_CRM/src/pages/sales/lead-info/lead-info-base.tsx

@@ -610,10 +610,11 @@ export class LeadInfoBase extends TabExpViewBase {
 
     /**
      * 加载模型
-     * 
+     *
+     * @protected
      * @memberof LeadInfoBase
      */
-    public async loadModel(): Promise<void> {
+    protected async loadModel(): Promise<any> {
         if(this.context.lead){
             this.appEntityService.getDataInfo(JSON.parse(JSON.stringify(this.context)),{},false).then((response:any) =>{
                 if (!response || response.status !== 200) {
@@ -622,9 +623,8 @@ export class LeadInfoBase extends TabExpViewBase {
                 const { data: _data } = response;
                 if (_data.fullname) {
                     Object.assign(this.model, { dataInfo: _data.fullname });
-                    if(this.$tabPageExp){
-                        let _this:any = this;
-                        this.$tabPageExp.setCurPageCaption(_this.$t(this.model.srfTitle), _this.$t(this.model.srfTitle), _this.model.dataInfo);
+                    if (this.$tabPageExp) {
+                        this.$tabPageExp.setCurPageCaption(this.model.srfTitle, this.model.srfTitle, this.model.dataInfo);
                     }
                     if(this.$route){
                         this.$route.meta.info = this.model.dataInfo;

app_CRM/src/pages/sales/opportunity-info/opportunity-info-base.tsx

@@ -508,10 +508,11 @@ export class OpportunityInfoBase extends TabExpViewBase {
 
     /**
      * 加载模型
-     * 
+     *
+     * @protected
      * @memberof OpportunityInfoBase
      */
-    public async loadModel(): Promise<void> {
+    protected async loadModel(): Promise<any> {
         if(this.context.opportunity){
             this.appEntityService.getDataInfo(JSON.parse(JSON.stringify(this.context)),{},false).then((response:any) =>{
                 if (!response || response.status !== 200) {
@@ -520,9 +521,8 @@ export class OpportunityInfoBase extends TabExpViewBase {
                 const { data: _data } = response;
                 if (_data.opportunityname) {
                     Object.assign(this.model, { dataInfo: _data.opportunityname });
-                    if(this.$tabPageExp){
-                        let _this:any = this;
-                        this.$tabPageExp.setCurPageCaption(_this.$t(this.model.srfTitle), _this.$t(this.model.srfTitle), _this.model.dataInfo);
+                    if (this.$tabPageExp) {
+                        this.$tabPageExp.setCurPageCaption(this.model.srfTitle, this.model.srfTitle, this.model.dataInfo);
                     }
                     if(this.$route){
                         this.$route.meta.info = this.model.dataInfo;

app_CRM/src/pages/sales/quote-info/quote-info-base.tsx

@@ -94,10 +94,11 @@ export class QuoteInfoBase extends TabExpViewBase {
 
     /**
      * 加载模型
-     * 
+     *
+     * @protected
      * @memberof QuoteInfoBase
      */
-    public async loadModel(): Promise<void> {
+    protected async loadModel(): Promise<any> {
         if(this.context.quote){
             this.appEntityService.getDataInfo(JSON.parse(JSON.stringify(this.context)),{},false).then((response:any) =>{
                 if (!response || response.status !== 200) {
@@ -106,9 +107,8 @@ export class QuoteInfoBase extends TabExpViewBase {
                 const { data: _data } = response;
                 if (_data.quotename) {
                     Object.assign(this.model, { dataInfo: _data.quotename });
-                    if(this.$tabPageExp){
-                        let _this:any = this;
-                        this.$tabPageExp.setCurPageCaption(_this.$t(this.model.srfTitle), _this.$t(this.model.srfTitle), _this.model.dataInfo);
+                    if (this.$tabPageExp) {
+                        this.$tabPageExp.setCurPageCaption(this.model.srfTitle, this.model.srfTitle, this.model.dataInfo);
                     }
                     if(this.$route){
                         this.$route.meta.info = this.model.dataInfo;

app_CRM/src/pages/sales/sales-order-info-view/sales-order-info-view-base.tsx

@@ -94,10 +94,11 @@ export class SalesOrderInfoViewBase extends TabExpViewBase {
 
     /**
      * 加载模型
-     * 
+     *
+     * @protected
      * @memberof SalesOrderInfoViewBase
      */
-    public async loadModel(): Promise<void> {
+    protected async loadModel(): Promise<any> {
         if(this.context.salesorder){
             this.appEntityService.getDataInfo(JSON.parse(JSON.stringify(this.context)),{},false).then((response:any) =>{
                 if (!response || response.status !== 200) {
@@ -106,9 +107,8 @@ export class SalesOrderInfoViewBase extends TabExpViewBase {
                 const { data: _data } = response;
                 if (_data.salesordername) {
                     Object.assign(this.model, { dataInfo: _data.salesordername });
-                    if(this.$tabPageExp){
-                        let _this:any = this;
-                        this.$tabPageExp.setCurPageCaption(_this.$t(this.model.srfTitle), _this.$t(this.model.srfTitle), _this.model.dataInfo);
+                    if (this.$tabPageExp) {
+                        this.$tabPageExp.setCurPageCaption(this.model.srfTitle, this.model.srfTitle, this.model.dataInfo);
                     }
                     if(this.$route){
                         this.$route.meta.info = this.model.dataInfo;

app_CRM/src/studio-core/components/studio-view/studio-view-layout.less

@@ -468,9 +468,14 @@
                     overflow-y: auto;
 
                     >div {
+                        cursor: pointer;
                         padding: 3px 5px;
                         border-bottom: 1px solid var(--view-dividing-line-color-tint);
                     }
+
+                    >.select {
+                        background-color: var(--view-background-color-active);
+                    }
                 }
             }
         }

app_CRM/src/studio-core/widgets/ControlBase.tsx

@@ -54,6 +54,15 @@ export class ControlBase extends Vue {
     @Prop({ default: true })
     public showBusyIndicator?: boolean;
 
+    /**
+     * 在消息中心订阅的本地消息实例标识
+     *
+     * @protected
+     * @type {string[]}
+     * @memberof ControlBase
+     */
+    protected accLocalTags: string[] = [];
+
     /**
      * 应用实体名称
      *
@@ -172,6 +181,9 @@ export class ControlBase extends Vue {
         this.rxjsEvents.forEach((item: Subscription) => {
             item.unsubscribe();
         });
+        this.accLocalTags.forEach((str: string) => {
+            this.$acc.unsubscribeLocal(str);
+        });
         this.ctrlDestroyed();
     }
 

app_CRM/src/studio-core/widgets/EditFormControlBase.tsx

@@ -123,6 +123,22 @@ export class EditFormControlBase extends FormControlBase {
                 const state = !Object.is(JSON.stringify(this.oldData), JSON.stringify(this.data)) ? true : false;
                 this.$store.commit('viewaction/setViewDataChange', { viewtag: this.viewtag, viewdatachange: state });
             });
+        this.accLocalTags.push(this.$acc.commandLocal((data: any) => {
+            if (data && this.data.srfkey === data.srfkey && (!data.___localUpdateDate || this.data.___localUpdateDate !== data.___localUpdateDate)) {
+                const appview = this.$store.getters['viewaction/getAppView'](this.viewtag);
+                if (appview && appview.viewdatachange) {
+                    this.$Modal.confirm({
+                        title: '数据已变更',
+                        content: '数据已变更，是否刷新数据?',
+                        onOk: () => {
+                            this.refresh([{}]);
+                        }
+                    });
+                } else {
+                    this.refresh([{}]);
+                }
+            }
+        }, 'update', this.appDeName.toUpperCase()));
     }
 
     /**
@@ -230,6 +246,7 @@ export class EditFormControlBase extends FormControlBase {
             this.onFormLoad(data, 'autoSave');
             this.$emit('save', data);
             this.$store.dispatch('viewaction/datasaved', { viewtag: this.viewtag });
+            this.sendAccMessage(Object.is(data.srfuf, '1') ? 'update' : 'create');
             this.$nextTick(() => {
                 this.formState.next({ type: 'save', data: data });
             });
@@ -291,6 +308,7 @@ export class EditFormControlBase extends FormControlBase {
                 this.onFormLoad(data, 'save');
                 this.$emit('save', data);
                 this.$store.dispatch('viewaction/datasaved', { viewtag: this.viewtag });
+                this.sendAccMessage(Object.is(data.srfuf, '1') ? 'update' : 'create');
                 this.$nextTick(() => {
                     this.formState.next({ type: 'save', data: data });
                 });
@@ -630,4 +648,16 @@ export class EditFormControlBase extends FormControlBase {
         });
     }
 
+    /**
+     * 向消息中中心发送数据变更指令
+     *
+     * @protected
+     * @param {('update' | 'create' | 'remove')} type
+     * @memberof EditFormControlBase
+     */
+    protected sendAccMessage(type: 'update' | 'create' | 'remove'): void {
+        this.data.___localUpdateDate = new Date().getTime();
+        this.$acc.send[type](this.data, this.appDeName.toUpperCase());
+    }
+
 }
\ No newline at end of file

app_CRM/src/studio-core/widgets/FormControlBase.tsx

@@ -392,13 +392,15 @@ export class FormControlBase extends MainControlBase {
     /**
      * 部件刷新
      *
-     * @param {any[]} args
+     * @param {any[]} [args]
      * @returns {void}
      * @memberof FormControlBase
      */
-    public refresh(args: any[]): void {
+    public refresh(args?: any[]): void {
         const arg: any = {};
-        Object.assign(arg, args[0]);
+        if (args && args.length > 0) {
+            Object.assign(arg, args[0]);
+        }
         if (this.data.srfkey && !Object.is(this.data.srfkey, '')) {
             Object.assign(arg, { srfkey: this.data.srfkey });
             this.load(arg);

app_CRM/src/studio-core/widgets/GridControllerBase.tsx

@@ -206,10 +206,31 @@ export class GridControllerBase extends MDControlBase {
      * @param {any[]} args
      * @memberof GridControllerBase
      */
-    public refresh(args: any[]): void {
+    public refresh(args?: any[]): void {
         this.load();
     }
 
+    /**
+     * 消息中心
+     *
+     * @protected
+     * @param {*} data
+     * @memberof GridControllerBase
+     */
+    protected accChange(data: any): void {
+        if (this.isOpenEdit) {
+            this.$Modal.confirm({
+                title: '数据已变更',
+                content: '数据已变更，是否刷新数据?',
+                onOk: () => {
+                    this.refresh();
+                }
+            });
+        } else {
+            this.refresh();
+        }
+    }
+
     /**
      * 部件创建完毕
      *
@@ -217,6 +238,7 @@ export class GridControllerBase extends MDControlBase {
      * @memberof GridControllerBase
      */
     protected ctrlCreated(): void {
+        super.ctrlCreated();
         this.setColState();
         this.$acc.commandLocal(() => {
             this.load()

app_CRM/src/studio-core/widgets/ListControllerBase.tsx

@@ -24,6 +24,7 @@ export class ListControllerBase extends MDControlBase {
      * @memberof ListControllerBase
      */
     protected ctrlCreated(): void {
+        super.ctrlCreated();
         if (this.viewState) {
             this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
                 if (!Object.is(this.name, tag)) {
@@ -53,7 +54,7 @@ export class ListControllerBase extends MDControlBase {
     /**
     * 加载更多
     *
-    * @memberof Mob
+    * @memberof ListControllerBase
     */
     public loadMore() {
         if (this.totalRecord > this.items.length) {
@@ -63,11 +64,22 @@ export class ListControllerBase extends MDControlBase {
         }
     }
 
+    /**
+     * 消息中心
+     *
+     * @protected
+     * @param {*} data
+     * @memberof ListControllerBase
+     */
+    protected accChange(data: any): void {
+        this.refresh();
+    }
+
     /**
      * 刷新
      *
      * @param {*} [opt={}]
-     * @memberof Main
+     * @memberof ListControllerBase
      */
     public refresh(opt: any = {}) {
         this.curPage = 1;

app_CRM/src/studio-core/widgets/MDControlBase.tsx

@@ -192,6 +192,32 @@ export class MDControlBase extends MainControlBase {
         return this.selections[0];
     }
 
+    /**
+     * 部件创建完毕
+     *
+     * @protected
+     * @memberof MDControlBase
+     */
+    protected ctrlCreated(): void {
+        this.accLocalTags.push(this.$acc.commandLocal((data: any) => {
+            if (data && data.srfkey) {
+                const i = this.items.findIndex((item: any) => Object.is(item.srfkey, data.srfkey));
+                if (i !== -1) {
+                    this.accChange(data)
+                }
+            }
+        }, 'all', this.appDeName.toUpperCase()));
+    }
+
+    /**
+     * 消息中心
+     *
+     * @protected
+     * @param {*} data
+     * @memberof MDControlBase
+     */
+    protected accChange(data: any): void { }
+
     /**
      * 选择数据
      *

app_CRM/src/styles/default.less

@@ -664,6 +664,32 @@ div::-webkit-scrollbar-thumb {
                         border-color: var(--form-editor-active-color);
                     }
                 }
+
+                // 数值编辑器
+                .ivu-input-number, .ivu-input-number-input, .ivu-input-number-handler-wrap {
+                    background-color: var(--form-editor-background-color);
+                    color: var(--form-editor-placeholder-font-color);
+                }
+
+                .ivu-input-number {
+                    border-color: transparent;
+                    
+                    .ivu-input-number-input {
+                        text-align: left;
+                    }
+
+                    .ivu-input-number-handler {
+                        color: var(--form-editor-placeholder-font-color);
+                    }
+                    
+                    .ivu-input-number-handler-wrap, .ivu-input-number-handler.ivu-input-number-handler-down {
+                        border-color: var(--form-editor-active-color);
+                    }
+                }
+
+                .ivu-input-number:hover {
+                    border-color: var(--form-editor-active-color);
+                }
             }
         }
     }
@@ -1096,4 +1122,8 @@ div::-webkit-scrollbar-thumb {
     }
 }
 
+// 图表部件样式
+.app-data-chart {
+    height: 100%;
+}
 @import './user.less';
\ No newline at end of file

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

@@ -76,82 +76,10 @@ export class Edit_AccountInfoEditFormBase extends EditFormControlBase {
      * @memberof Edit_AccountInfoEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '客户 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '客户 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '客户名称 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '客户名称 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
         accountname: [
             { required: true, type: 'string', message: '客户名称 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '客户名称 值不能为空', trigger: 'blur' },
         ],
-        telephone1: [
-            { required: false, type: 'string', message: '主要电话 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '主要电话 值不能为空', trigger: 'blur' },
-        ],
-        fax: [
-            { required: false, type: 'string', message: '传真 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '传真 值不能为空', trigger: 'blur' },
-        ],
-        websiteurl: [
-            { required: false, type: 'string', message: '网站 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '网站 值不能为空', trigger: 'blur' },
-        ],
-        parentaccountname: [
-            { required: false, type: 'string', message: '上级单位 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '上级单位 值不能为空', trigger: 'blur' },
-        ],
-        tickersymbol: [
-            { required: false, type: 'string', message: '股票代号 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '股票代号 值不能为空', trigger: 'blur' },
-        ],
-        customertypecode: [
-            { required: false, type: 'string', message: '关系类型 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '关系类型 值不能为空', trigger: 'blur' },
-        ],
-        defaultpricelevelname: [
-            { required: false, type: 'string', message: '价目表 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '价目表 值不能为空', trigger: 'blur' },
-        ],
-        defaultpricelevelid: [
-            { required: false, type: 'string', message: '价目表 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '价目表 值不能为空', trigger: 'blur' },
-        ],
-        parentaccountid: [
-            { required: false, type: 'string', message: '上级单位 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '上级单位 值不能为空', trigger: 'blur' },
-        ],
-        accountid: [
-            { required: false, type: 'string', message: '客户 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '客户 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

app_CRM/src/widgets/account/edit-address-form/edit-address-form-base.tsx

@@ -73,70 +73,6 @@ export class Edit_AddressEditFormBase extends EditFormControlBase {
      * @memberof Edit_AddressEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '客户 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '客户 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '客户名称 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '客户名称 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        address1_addressid: [
-            { required: false, type: 'string', message: '地址 1: ID 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '地址 1: ID 值不能为空', trigger: 'blur' },
-        ],
-        address1_name: [
-            { required: false, type: 'string', message: '地址 1: 名称 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '地址 1: 名称 值不能为空', trigger: 'blur' },
-        ],
-        address1_addresstypecode: [
-            { required: false, type: 'string', message: '地址 1: 地址类型 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '地址 1: 地址类型 值不能为空', trigger: 'blur' },
-        ],
-        address1_country: [
-            { required: false, type: 'string', message: '地址 1: 国家/地区 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '地址 1: 国家/地区 值不能为空', trigger: 'blur' },
-        ],
-        address1_stateorprovince: [
-            { required: false, type: 'string', message: '地址 1: 省/市/自治区 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '地址 1: 省/市/自治区 值不能为空', trigger: 'blur' },
-        ],
-        address1_city: [
-            { required: false, type: 'string', message: '地址 1: 市/县 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '地址 1: 市/县 值不能为空', trigger: 'blur' },
-        ],
-        address1_county: [
-            { required: false, type: 'string', message: '地址 1: 县 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '地址 1: 县 值不能为空', trigger: 'blur' },
-        ],
-        accountid: [
-            { required: false, type: 'string', message: '客户 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '客户 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

app_CRM/src/widgets/account/edit-introduction-form/edit-introduction-form-base.tsx

@@ -70,58 +70,6 @@ export class Edit_IntroductionEditFormBase extends EditFormControlBase {
      * @memberof Edit_IntroductionEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '客户 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '客户 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '客户名称 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '客户名称 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        industrycode: [
-            { required: false, type: 'string', message: '行业 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '行业 值不能为空', trigger: 'blur' },
-        ],
-        sic: [
-            { required: false, type: 'string', message: '行业编码 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '行业编码 值不能为空', trigger: 'blur' },
-        ],
-        ownershipcode: [
-            { required: false, type: 'string', message: '所有权 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '所有权 值不能为空', trigger: 'blur' },
-        ],
-        description: [
-            { required: false, type: 'string', message: '说明 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '说明 值不能为空', trigger: 'blur' },
-        ],
-        accountid: [
-            { required: false, type: 'string', message: '客户 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '客户 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

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

@@ -219,7 +219,7 @@
     viewname='contact-by-account' 
     :data="JSON.stringify(this.data)" 
     @drdatasaved="drdatasaved($event)"
-    style=";overflow: auto;">
+    style="overflow: auto;">
 </app-form-druipart>
 
 </i-col>

app_CRM/src/widgets/account/info-major-contact-form/info-major-contact-form-base.tsx

@@ -77,50 +77,6 @@ export class Info_MajorContactEditFormBase extends EditFormControlBase {
      * @memberof Info_MajorContactEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '客户 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '客户 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '客户名称 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '客户名称 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        primarycontactname: [
-            { required: false, type: 'string', message: '主要联系人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '主要联系人 值不能为空', trigger: 'blur' },
-        ],
-        emailaddress1: [
-            { required: false, type: 'string', message: '电子邮件 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '电子邮件 值不能为空', trigger: 'blur' },
-        ],
-        accountid: [
-            { required: false, type: 'string', message: '客户 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '客户 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

app_CRM/src/widgets/account/info-major-contact-form/info-major-contact-form.html

@@ -41,7 +41,7 @@
     viewname='contact-by-account' 
     :data="JSON.stringify(this.data)" 
     @drdatasaved="drdatasaved($event)"
-    style=";overflow: auto;">
+    style="overflow: auto;">
 </app-form-druipart>
 
 </i-col>

app_CRM/src/widgets/account/inner-pickip-grid/inner-pickip-grid-base.tsx

@@ -120,4 +120,18 @@ export class InnerPickipGridBase extends GridControllerBase {
     }
 
 
+    /**
+     * 导出数据格式化
+     *
+     * @param {*} filterVal
+     * @param {*} jsonData
+     * @param {any[]} [codelistColumns=[]]
+     * @returns {Promise<any>}
+     * @memberof InnerPickipGridBase
+     */
+    public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
+        return super.formatExcelData(filterVal, jsonData, [
+        ]);
+    }
+
 }
\ No newline at end of file

app_CRM/src/widgets/account/main-grid/main-grid-base.tsx

@@ -144,4 +144,18 @@ export class MainGridBase extends GridControllerBase {
     }
 
 
+    /**
+     * 导出数据格式化
+     *
+     * @param {*} filterVal
+     * @param {*} jsonData
+     * @param {any[]} [codelistColumns=[]]
+     * @returns {Promise<any>}
+     * @memberof MainGridBase
+     */
+    public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
+        return super.formatExcelData(filterVal, jsonData, [
+        ]);
+    }
+
 }
\ No newline at end of file

app_CRM/src/widgets/account/quick-create-form/quick-create-form-base.tsx

@@ -76,82 +76,10 @@ export class QuickCreateEditFormBase extends EditFormControlBase {
      * @memberof QuickCreateEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '客户 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '客户 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '客户名称 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '客户名称 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
         accountname: [
             { required: true, type: 'string', message: '客户名称 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '客户名称 值不能为空', trigger: 'blur' },
         ],
-        telephone1: [
-            { required: false, type: 'string', message: '主要电话 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '主要电话 值不能为空', trigger: 'blur' },
-        ],
-        fax: [
-            { required: false, type: 'string', message: '传真 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '传真 值不能为空', trigger: 'blur' },
-        ],
-        websiteurl: [
-            { required: false, type: 'string', message: '网站 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '网站 值不能为空', trigger: 'blur' },
-        ],
-        parentaccountname: [
-            { required: false, type: 'string', message: '上级单位 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '上级单位 值不能为空', trigger: 'blur' },
-        ],
-        tickersymbol: [
-            { required: false, type: 'string', message: '股票代号 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '股票代号 值不能为空', trigger: 'blur' },
-        ],
-        customertypecode: [
-            { required: false, type: 'string', message: '关系类型 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '关系类型 值不能为空', trigger: 'blur' },
-        ],
-        defaultpricelevelname: [
-            { required: false, type: 'string', message: '价目表 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '价目表 值不能为空', trigger: 'blur' },
-        ],
-        defaultpricelevelid: [
-            { required: false, type: 'string', message: '价目表 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '价目表 值不能为空', trigger: 'blur' },
-        ],
-        parentaccountid: [
-            { required: false, type: 'string', message: '上级单位 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '上级单位 值不能为空', trigger: 'blur' },
-        ],
-        accountid: [
-            { required: false, type: 'string', message: '客户 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '客户 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

app_CRM/src/widgets/activity-pointer/by-regarding-object-id-panel/by-regarding-object-id-panel-base.tsx

@@ -159,11 +159,28 @@ export class ByRegardingObjectIdPanelBase extends MainControlBase {
      * @param codelistArray 代码表模型数组
      * @memberof ByRegardingObjectId
      */
-    public computedUIData(newVal:any){
+    public async computedUIData(newVal:any){
+        let codelistArray:Array<any> = [];
         if((this.dataModel.getDataItems instanceof Function) && this.dataModel.getDataItems().length >0){
             this.dataModel.getDataItems().forEach((item:any) =>{
-                this.data[item.name] = newVal[item.prop];
+                if(item.codelist){
+                    codelistArray.push(item.codelist);
+                }
             })
+            if(codelistArray.length >0){
+                let res:any = await this.getAllCodeList(codelistArray);
+                this.dataModel.getDataItems().forEach((item:any) =>{
+                    if(item.codelist){
+                        this.data[item.name] = res.get(item.codelist.tag).get(newVal[item.prop]);
+                    }else{
+                        this.data[item.name] = newVal[item.prop];
+                    }
+                })
+            }else{
+                this.dataModel.getDataItems().forEach((item:any) =>{
+                    this.data[item.name] = newVal[item.prop];
+                }) 
+            }
         }
     }
 
@@ -173,14 +190,92 @@ export class ByRegardingObjectIdPanelBase extends MainControlBase {
      * @param codelistArray 代码表模型数组
      * @memberof Mob
      */
-    public computeOutputData(){
+    public async computePanelData(){
+        let codelistArray:Array<any> = [];
         let panelData:any = {};
         if((this.dataModel.getDataItems instanceof Function) && this.dataModel.getDataItems().length >0){
             this.dataModel.getDataItems().forEach((item:any) =>{
-                panelData[item.prop] = this.data[item.name];
-            }) 
+                if(item.codelist){
+                    codelistArray.push(item.codelist);
+                }
+            })
+            if(codelistArray.length >0){
+                let res:any = await this.getAllCodeList(codelistArray,true);
+                this.dataModel.getDataItems().forEach((item:any) =>{
+                    if(item.codelist){
+                        panelData[item.prop]  = res.get(item.codelist.tag).get(this.data[item.name]);
+                    }else{
+                        panelData[item.prop] = this.data[item.name];
+                    }
+                })
+            }else{
+                this.dataModel.getDataItems().forEach((item:any) =>{
+                    panelData[item.prop] = this.data[item.name];
+                }) 
+            }
         }
-        this.panelData = Object.assign(JSON.parse(JSON.stringify(this.inputData)),panelData);
+         this.panelData = Object.assign(JSON.parse(JSON.stringify(this.inputData)),panelData);
+    }
+
+    /**
+     * 获取所有代码表
+     * 
+     * @param codelistArray 代码表模型数组
+     * @memberof ByRegardingObjectId
+     */
+    public getAllCodeList(codelistArray:Array<any>,reverse:boolean = false):Promise<any>{
+        return new Promise((resolve:any,reject:any) =>{
+            let codeListMap:Map<string,any> = new Map();
+            let promiseArray:Array<any> = [];
+            codelistArray.forEach((item:any) =>{
+                if(!codeListMap.get(item.tag)){
+                    promiseArray.push(this.getCodeList(item));
+                    Promise.all(promiseArray).then((result:any) =>{
+                        if(result && result.length >0){
+                            result.forEach((codeList:any) =>{
+                                let tempCodeListMap:Map<number,any> = new Map();
+                                if(codeList.length >0){
+                                    codeList.forEach((codeListItem:any) =>{
+                                        if(reverse){
+                                            tempCodeListMap.set(codeListItem.text,codeListItem.value);
+                                        }else{
+                                            tempCodeListMap.set(codeListItem.value,codeListItem.text);
+                                        }
+                                    })
+                                }
+                                codeListMap.set(item.tag,tempCodeListMap);       
+                            })
+                            resolve(codeListMap);
+                        }
+                    })
+                }
+            })
+        })
+    }
+
+    /**
+     * 获取代码表
+     * 
+     * @param codeListObject 传入代码表对象
+     * @memberof ByRegardingObjectId
+     */
+    public getCodeList(codeListObject:any):Promise<any>{
+        return new Promise((resolve:any,reject:any) =>{
+            if(codeListObject.tag && Object.is(codeListObject.codelistType,"STATIC")){
+                const codelist = this.$store.getters.getCodeList(codeListObject.tag);
+                if (codelist) {
+                    resolve([...JSON.parse(JSON.stringify(codelist.items))]);
+                } else {
+                    resolve([]);
+                }
+            }else if(codeListObject.tag && Object.is(codeListObject.codelistType,"DYNAMIC")){
+                this.codeListService.getItems(codeListObject.tag).then((res:any) => {
+                    resolve(res);
+                }).catch((error:any) => {
+                    resolve([]);
+                });
+            }
+        })
     }
 
     /**
@@ -192,7 +287,7 @@ export class ByRegardingObjectIdPanelBase extends MainControlBase {
      * @memberof ByRegardingObjectId
      */
     public async uiAction(row: any, tag: any, $event: any) {
-        await this.computeOutputData();
+        await this.computePanelData();
     }
 
     /**

app_CRM/src/widgets/activity-pointer/main-form/main-form-base.tsx

@@ -71,62 +71,10 @@ export class MainEditFormBase extends EditFormControlBase {
      * @memberof MainEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '活动 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '活动 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '主题 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '主题 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
         subject: [
             { required: true, type: 'string', message: '主题 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '主题 值不能为空', trigger: 'blur' },
         ],
-        createman: [
-            { required: false, type: 'string', message: '建立人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '建立人 值不能为空', trigger: 'blur' },
-        ],
-        createdate: [
-            { required: false, type: 'string', message: '建立时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '建立时间 值不能为空', trigger: 'blur' },
-        ],
-        updateman: [
-            { required: false, type: 'string', message: '更新人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新人 值不能为空', trigger: 'blur' },
-        ],
-        updatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        activityid: [
-            { required: false, type: 'string', message: '活动 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '活动 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

app_CRM/src/widgets/activity-pointer/main-grid/main-grid-base.tsx

@@ -160,4 +160,42 @@ export class MainGridBase extends GridControllerBase {
     }
 
 
+    /**
+     * 导出数据格式化
+     *
+     * @param {*} filterVal
+     * @param {*} jsonData
+     * @param {any[]} [codelistColumns=[]]
+     * @returns {Promise<any>}
+     * @memberof MainGridBase
+     */
+    public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
+        return super.formatExcelData(filterVal, jsonData, [
+            {
+                name: 'activitytypecode',
+                srfkey: 'ActivityTypeCode',
+                codelistType : 'STATIC',
+                renderMode: 'other',
+                textSeparator: '、',
+                valueSeparator: ',',
+            },
+            {
+                name: 'statecode',
+                srfkey: 'Activitypointer__StateCode',
+                codelistType : 'STATIC',
+                renderMode: 'other',
+                textSeparator: '、',
+                valueSeparator: ',',
+            },
+            {
+                name: 'prioritycode',
+                srfkey: 'Activitypointer__PriorityCode',
+                codelistType : 'STATIC',
+                renderMode: 'other',
+                textSeparator: '、',
+                valueSeparator: ',',
+            },
+        ]);
+    }
+
 }
\ No newline at end of file

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

@@ -71,62 +71,10 @@ export class MainEditFormBase extends EditFormControlBase {
      * @memberof MainEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '约会 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '约会 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '主题 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '主题 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
         subject: [
             { required: true, type: 'string', message: '主题 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '主题 值不能为空', trigger: 'blur' },
         ],
-        createman: [
-            { required: false, type: 'string', message: '建立人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '建立人 值不能为空', trigger: 'blur' },
-        ],
-        createdate: [
-            { required: false, type: 'string', message: '建立时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '建立时间 值不能为空', trigger: 'blur' },
-        ],
-        updateman: [
-            { required: false, type: 'string', message: '更新人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新人 值不能为空', trigger: 'blur' },
-        ],
-        updatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        activityid: [
-            { required: false, type: 'string', message: '约会 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '约会 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

app_CRM/src/widgets/appointment/quick-create-form/quick-create-form-base.tsx

@@ -67,46 +67,10 @@ export class QuickCreateEditFormBase extends EditFormControlBase {
      * @memberof QuickCreateEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '约会 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '约会 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '主题 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '主题 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
         subject: [
             { required: true, type: 'string', message: '主题 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '主题 值不能为空', trigger: 'blur' },
         ],
-        activityid: [
-            { required: false, type: 'string', message: '约会 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '约会 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

app_CRM/src/widgets/campaign-activity/main-form/main-form-base.tsx

@@ -71,62 +71,10 @@ export class MainEditFormBase extends EditFormControlBase {
      * @memberof MainEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '市场活动项目 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '市场活动项目 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '主题 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '主题 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
         subject: [
             { required: true, type: 'string', message: '主题 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '主题 值不能为空', trigger: 'blur' },
         ],
-        createman: [
-            { required: false, type: 'string', message: '建立人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '建立人 值不能为空', trigger: 'blur' },
-        ],
-        createdate: [
-            { required: false, type: 'string', message: '建立时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '建立时间 值不能为空', trigger: 'blur' },
-        ],
-        updateman: [
-            { required: false, type: 'string', message: '更新人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新人 值不能为空', trigger: 'blur' },
-        ],
-        updatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        activityid: [
-            { required: false, type: 'string', message: '市场活动项目 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '市场活动项目 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

app_CRM/src/widgets/campaign-activity/main-grid/main-grid-base.tsx

@@ -128,4 +128,26 @@ export class MainGridBase extends GridControllerBase {
     }
 
 
+    /**
+     * 导出数据格式化
+     *
+     * @param {*} filterVal
+     * @param {*} jsonData
+     * @param {any[]} [codelistColumns=[]]
+     * @returns {Promise<any>}
+     * @memberof MainGridBase
+     */
+    public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
+        return super.formatExcelData(filterVal, jsonData, [
+            {
+                name: 'updateman',
+                srfkey: 'SysOperator',
+                codelistType : 'DYNAMIC',
+                renderMode: 'other',
+                textSeparator: '、',
+                valueSeparator: ',',
+            },
+        ]);
+    }
+
 }
\ No newline at end of file

app_CRM/src/widgets/campaign-activity/quick-create-form/quick-create-form-base.tsx

@@ -77,86 +77,10 @@ export class QuickCreateEditFormBase extends EditFormControlBase {
      * @memberof QuickCreateEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '市场活动项目 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '市场活动项目 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '主题 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '主题 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
         subject: [
             { required: true, type: 'string', message: '主题 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '主题 值不能为空', trigger: 'blur' },
         ],
-        category: [
-            { required: false, type: 'string', message: '类别 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '类别 值不能为空', trigger: 'blur' },
-        ],
-        channeltypecode: [
-            { required: false, type: 'string', message: '渠道 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '渠道 值不能为空', trigger: 'blur' },
-        ],
-        description: [
-            { required: false, type: 'string', message: '说明 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '说明 值不能为空', trigger: 'blur' },
-        ],
-        scheduledstart: [
-            { required: false, type: 'string', message: '计划开始时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '计划开始时间 值不能为空', trigger: 'blur' },
-        ],
-        scheduledend: [
-            { required: false, type: 'string', message: '计划结束时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '计划结束时间 值不能为空', trigger: 'blur' },
-        ],
-        actualstart: [
-            { required: false, type: 'string', message: '实际开始时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '实际开始时间 值不能为空', trigger: 'blur' },
-        ],
-        actualend: [
-            { required: false, type: 'string', message: '实际结束时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '实际结束时间 值不能为空', trigger: 'blur' },
-        ],
-        budgetedcost: [
-            { required: false, type: 'number', message: '预算分配 值不能为空', trigger: 'change' },
-            { required: false, type: 'number', message: '预算分配 值不能为空', trigger: 'blur' },
-        ],
-        actualcost: [
-            { required: false, type: 'number', message: '实际成本 值不能为空', trigger: 'change' },
-            { required: false, type: 'number', message: '实际成本 值不能为空', trigger: 'blur' },
-        ],
-        regardingobjectid: [
-            { required: false, type: 'string', message: '关于 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '关于 值不能为空', trigger: 'blur' },
-        ],
-        activityid: [
-            { required: false, type: 'string', message: '市场活动项目 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '市场活动项目 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

app_CRM/src/widgets/campaign-list/main-form/main-form-base.tsx

@@ -66,42 +66,6 @@ export class MainEditFormBase extends EditFormControlBase {
      * @memberof MainEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '关系标识 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '关系标识 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '关系名称 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '关系名称 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        relationshipsid: [
-            { required: false, type: 'string', message: '关系标识 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '关系标识 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

app_CRM/src/widgets/campaign-response/main-form/main-form-base.tsx

@@ -71,62 +71,10 @@ export class MainEditFormBase extends EditFormControlBase {
      * @memberof MainEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '市场活动响应 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '市场活动响应 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '主题 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '主题 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
         subject: [
             { required: true, type: 'string', message: '主题 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '主题 值不能为空', trigger: 'blur' },
         ],
-        createman: [
-            { required: false, type: 'string', message: '建立人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '建立人 值不能为空', trigger: 'blur' },
-        ],
-        createdate: [
-            { required: false, type: 'string', message: '建立时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '建立时间 值不能为空', trigger: 'blur' },
-        ],
-        updateman: [
-            { required: false, type: 'string', message: '更新人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新人 值不能为空', trigger: 'blur' },
-        ],
-        updatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        activityid: [
-            { required: false, type: 'string', message: '市场活动响应 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '市场活动响应 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

app_CRM/src/widgets/campaign-response/main-grid/main-grid-base.tsx

@@ -128,4 +128,26 @@ export class MainGridBase extends GridControllerBase {
     }
 
 
+    /**
+     * 导出数据格式化
+     *
+     * @param {*} filterVal
+     * @param {*} jsonData
+     * @param {any[]} [codelistColumns=[]]
+     * @returns {Promise<any>}
+     * @memberof MainGridBase
+     */
+    public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
+        return super.formatExcelData(filterVal, jsonData, [
+            {
+                name: 'updateman',
+                srfkey: 'SysOperator',
+                codelistType : 'DYNAMIC',
+                renderMode: 'other',
+                textSeparator: '、',
+                valueSeparator: ',',
+            },
+        ]);
+    }
+
 }
\ No newline at end of file

app_CRM/src/widgets/campaign-response/quick-create-form/quick-create-form-base.tsx

@@ -68,50 +68,10 @@ export class QuickCreateEditFormBase extends EditFormControlBase {
      * @memberof QuickCreateEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '市场活动响应 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '市场活动响应 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '主题 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '主题 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
         subject: [
             { required: true, type: 'string', message: '主题 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '主题 值不能为空', trigger: 'blur' },
         ],
-        regardingobjectid: [
-            { required: false, type: 'string', message: '关于 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '关于 值不能为空', trigger: 'blur' },
-        ],
-        activityid: [
-            { required: false, type: 'string', message: '市场活动响应 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '市场活动响应 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

app_CRM/src/widgets/campaign/edit-head-form/edit-head-form-base.tsx

@@ -70,58 +70,10 @@ export class Edit_HeadEditFormBase extends EditFormControlBase {
      * @memberof Edit_HeadEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '市场活动 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '市场活动 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '活动名称 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '活动名称 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        template: [
-            { required: false, type: 'number', message: '模板 值不能为空', trigger: 'change' },
-            { required: false, type: 'number', message: '模板 值不能为空', trigger: 'blur' },
-        ],
-        expectedrevenue: [
-            { required: false, type: 'number', message: '估计收入 值不能为空', trigger: 'change' },
-            { required: false, type: 'number', message: '估计收入 值不能为空', trigger: 'blur' },
-        ],
-        statuscode: [
-            { required: false, type: 'number', message: '状态描述 值不能为空', trigger: 'change' },
-            { required: false, type: 'number', message: '状态描述 值不能为空', trigger: 'blur' },
-        ],
         owneridyominame: [
             { required: true, type: 'string', message: '负责人 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '负责人 值不能为空', trigger: 'blur' },
         ],
-        campaignid: [
-            { required: false, type: 'string', message: '市场活动 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '市场活动 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

app_CRM/src/widgets/campaign/info-campagin-form/info-campagin-form-base.tsx

@@ -72,66 +72,6 @@ export class Info_CampaginEditFormBase extends EditFormControlBase {
      * @memberof Info_CampaginEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '市场活动 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '市场活动 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '活动名称 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '活动名称 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        campaignname: [
-            { required: false, type: 'string', message: '活动名称 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '活动名称 值不能为空', trigger: 'blur' },
-        ],
-        codename: [
-            { required: false, type: 'string', message: '活动代码 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '活动代码 值不能为空', trigger: 'blur' },
-        ],
-        transactioncurrencyname: [
-            { required: false, type: 'string', message: '货币 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '货币 值不能为空', trigger: 'blur' },
-        ],
-        typecode: [
-            { required: false, type: 'string', message: '活动类型 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '活动类型 值不能为空', trigger: 'blur' },
-        ],
-        expectedresponse: [
-            { required: false, type: 'number', message: '预期响应百分比 值不能为空', trigger: 'change' },
-            { required: false, type: 'number', message: '预期响应百分比 值不能为空', trigger: 'blur' },
-        ],
-        objective: [
-            { required: false, type: 'string', message: '活动内容 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '活动内容 值不能为空', trigger: 'blur' },
-        ],
-        campaignid: [
-            { required: false, type: 'string', message: '市场活动 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '市场活动 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

app_CRM/src/widgets/campaign/info-head-form/info-head-form-base.tsx

@@ -100,62 +100,6 @@ export class Info_HeadEditFormBase extends EditFormControlBase {
      * @memberof Info_HeadEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '市场活动 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '市场活动 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '活动名称 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '活动名称 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        campaignname: [
-            { required: false, type: 'string', message: '活动名称 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '活动名称 值不能为空', trigger: 'blur' },
-        ],
-        template: [
-            { required: false, type: 'string', message: '模板 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '模板 值不能为空', trigger: 'blur' },
-        ],
-        expectedrevenue: [
-            { required: false, type: 'number', message: '估计收入 值不能为空', trigger: 'change' },
-            { required: false, type: 'number', message: '估计收入 值不能为空', trigger: 'blur' },
-        ],
-        statuscode: [
-            { required: false, type: 'string', message: '状态描述 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '状态描述 值不能为空', trigger: 'blur' },
-        ],
-        owneridyominame: [
-            { required: false, type: 'string', message: '负责人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '负责人 值不能为空', trigger: 'blur' },
-        ],
-        campaignid: [
-            { required: false, type: 'string', message: '市场活动 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '市场活动 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

app_CRM/src/widgets/campaign/info-manager-form/info-manager-form-base.tsx

@@ -70,58 +70,6 @@ export class Info_ManagerEditFormBase extends EditFormControlBase {
      * @memberof Info_ManagerEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '市场活动 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '市场活动 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '活动名称 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '活动名称 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        budgetedcost: [
-            { required: false, type: 'number', message: '预算分配 值不能为空', trigger: 'change' },
-            { required: false, type: 'number', message: '预算分配 值不能为空', trigger: 'blur' },
-        ],
-        othercost: [
-            { required: false, type: 'number', message: '其他费用 值不能为空', trigger: 'change' },
-            { required: false, type: 'number', message: '其他费用 值不能为空', trigger: 'blur' },
-        ],
-        totalactualcost: [
-            { required: false, type: 'number', message: '市场活动总费用 值不能为空', trigger: 'change' },
-            { required: false, type: 'number', message: '市场活动总费用 值不能为空', trigger: 'blur' },
-        ],
-        owneridyominame: [
-            { required: false, type: 'string', message: '负责人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '负责人 值不能为空', trigger: 'blur' },
-        ],
-        campaignid: [
-            { required: false, type: 'string', message: '市场活动 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '市场活动 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

app_CRM/src/widgets/campaign/info-schedule-form/info-schedule-form-base.tsx

@@ -70,58 +70,6 @@ export class Info_ScheduleEditFormBase extends EditFormControlBase {
      * @memberof Info_ScheduleEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '市场活动 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '市场活动 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '活动名称 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '活动名称 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        proposedstart: [
-            { required: false, type: 'string', message: '拟定日期 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '拟定日期 值不能为空', trigger: 'blur' },
-        ],
-        proposedend: [
-            { required: false, type: 'string', message: '拟定结束日期 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '拟定结束日期 值不能为空', trigger: 'blur' },
-        ],
-        actualstart: [
-            { required: false, type: 'string', message: '实际开始日期 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '实际开始日期 值不能为空', trigger: 'blur' },
-        ],
-        actualend: [
-            { required: false, type: 'string', message: '实际结束日期 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '实际结束日期 值不能为空', trigger: 'blur' },
-        ],
-        campaignid: [
-            { required: false, type: 'string', message: '市场活动 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '市场活动 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

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

@@ -76,82 +76,14 @@ export class MainEditFormBase extends EditFormControlBase {
      * @memberof MainEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '市场活动 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '市场活动 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '活动名称 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '活动名称 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
         campaignname: [
             { required: true, type: 'string', message: '活动名称 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '活动名称 值不能为空', trigger: 'blur' },
         ],
-        codename: [
-            { required: false, type: 'string', message: '活动代码 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '活动代码 值不能为空', trigger: 'blur' },
-        ],
         transactioncurrencyname: [
             { required: true, type: 'string', message: '货币 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '货币 值不能为空', trigger: 'blur' },
         ],
-        typecode: [
-            { required: false, type: 'string', message: '活动类型 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '活动类型 值不能为空', trigger: 'blur' },
-        ],
-        expectedresponse: [
-            { required: false, type: 'number', message: '预期响应百分比 值不能为空', trigger: 'change' },
-            { required: false, type: 'number', message: '预期响应百分比 值不能为空', trigger: 'blur' },
-        ],
-        createman: [
-            { required: false, type: 'string', message: '建立人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '建立人 值不能为空', trigger: 'blur' },
-        ],
-        createdate: [
-            { required: false, type: 'string', message: '建立时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '建立时间 值不能为空', trigger: 'blur' },
-        ],
-        updateman: [
-            { required: false, type: 'string', message: '更新人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新人 值不能为空', trigger: 'blur' },
-        ],
-        updatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        transactioncurrencyid: [
-            { required: false, type: 'string', message: '货币 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '货币 值不能为空', trigger: 'blur' },
-        ],
-        campaignid: [
-            { required: false, type: 'string', message: '市场活动 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '市场活动 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

app_CRM/src/widgets/campaign/main-grid/main-grid-base.tsx

@@ -176,4 +176,42 @@ export class MainGridBase extends GridControllerBase {
     }
 
 
+    /**
+     * 导出数据格式化
+     *
+     * @param {*} filterVal
+     * @param {*} jsonData
+     * @param {any[]} [codelistColumns=[]]
+     * @returns {Promise<any>}
+     * @memberof MainGridBase
+     */
+    public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
+        return super.formatExcelData(filterVal, jsonData, [
+            {
+                name: 'typecode',
+                srfkey: 'Campaign__TypeCode',
+                codelistType : 'STATIC',
+                renderMode: 'other',
+                textSeparator: '、',
+                valueSeparator: ',',
+            },
+            {
+                name: 'template',
+                srfkey: 'YesNo',
+                codelistType : 'STATIC',
+                renderMode: 'other',
+                textSeparator: '、',
+                valueSeparator: ',',
+            },
+            {
+                name: 'statuscode',
+                srfkey: 'Campaign__StatusCode',
+                codelistType : 'STATIC',
+                renderMode: 'other',
+                textSeparator: '、',
+                valueSeparator: ',',
+            },
+        ]);
+    }
+
 }
\ No newline at end of file

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

@@ -76,82 +76,6 @@ export class AbstractInfoEditFormBase extends EditFormControlBase {
      * @memberof AbstractInfoEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '竞争对手 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '竞争对手 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '竞争对手名称 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '竞争对手名称 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        competitorname: [
-            { required: false, type: 'string', message: '竞争对手名称 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '竞争对手名称 值不能为空', trigger: 'blur' },
-        ],
-        websiteurl: [
-            { required: false, type: 'string', message: '网站 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '网站 值不能为空', trigger: 'blur' },
-        ],
-        transactioncurrencyname: [
-            { required: false, type: 'string', message: '货币 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '货币 值不能为空', trigger: 'blur' },
-        ],
-        address1_postalcode: [
-            { required: false, type: 'string', message: '邮政编码 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '邮政编码 值不能为空', trigger: 'blur' },
-        ],
-        address1_country: [
-            { required: false, type: 'string', message: '国家/地区 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '国家/地区 值不能为空', trigger: 'blur' },
-        ],
-        address1_stateorprovince: [
-            { required: false, type: 'string', message: '省/直辖市/自治区 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '省/直辖市/自治区 值不能为空', trigger: 'blur' },
-        ],
-        address1_city: [
-            { required: false, type: 'string', message: '市/县 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '市/县 值不能为空', trigger: 'blur' },
-        ],
-        address1_line1: [
-            { required: false, type: 'string', message: '街道 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '街道 值不能为空', trigger: 'blur' },
-        ],
-        strengths: [
-            { required: false, type: 'string', message: '优势 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '优势 值不能为空', trigger: 'blur' },
-        ],
-        weaknesses: [
-            { required: false, type: 'string', message: '劣势 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '劣势 值不能为空', trigger: 'blur' },
-        ],
-        competitorid: [
-            { required: false, type: 'string', message: '竞争对手 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '竞争对手 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

app_CRM/src/widgets/competitor/main-grid/main-grid-base.tsx

@@ -120,4 +120,18 @@ export class MainGridBase extends GridControllerBase {
     }
 
 
+    /**
+     * 导出数据格式化
+     *
+     * @param {*} filterVal
+     * @param {*} jsonData
+     * @param {any[]} [codelistColumns=[]]
+     * @returns {Promise<any>}
+     * @memberof MainGridBase
+     */
+    public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
+        return super.formatExcelData(filterVal, jsonData, [
+        ]);
+    }
+
 }
\ No newline at end of file

app_CRM/src/widgets/competitor/quick-create-form/quick-create-form-base.tsx

@@ -75,78 +75,10 @@ export class QuickCreateEditFormBase extends EditFormControlBase {
      * @memberof QuickCreateEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '竞争对手 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '竞争对手 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '竞争对手名称 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '竞争对手名称 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
         competitorname: [
             { required: true, type: 'string', message: '竞争对手名称 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '竞争对手名称 值不能为空', trigger: 'blur' },
         ],
-        websiteurl: [
-            { required: false, type: 'string', message: '网站 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '网站 值不能为空', trigger: 'blur' },
-        ],
-        transactioncurrencyname: [
-            { required: false, type: 'string', message: '货币 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '货币 值不能为空', trigger: 'blur' },
-        ],
-        address1_postalcode: [
-            { required: false, type: 'string', message: '邮政编码 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '邮政编码 值不能为空', trigger: 'blur' },
-        ],
-        address1_country: [
-            { required: false, type: 'string', message: '国家/地区 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '国家/地区 值不能为空', trigger: 'blur' },
-        ],
-        address1_stateorprovince: [
-            { required: false, type: 'string', message: '省/直辖市/自治区 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '省/直辖市/自治区 值不能为空', trigger: 'blur' },
-        ],
-        address1_city: [
-            { required: false, type: 'string', message: '市/县 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '市/县 值不能为空', trigger: 'blur' },
-        ],
-        address1_line1: [
-            { required: false, type: 'string', message: '街道 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '街道 值不能为空', trigger: 'blur' },
-        ],
-        transactioncurrencyid: [
-            { required: false, type: 'string', message: '货币 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '货币 值不能为空', trigger: 'blur' },
-        ],
-        competitorid: [
-            { required: false, type: 'string', message: '竞争对手 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '竞争对手 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

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

@@ -74,74 +74,10 @@ export class AbstractEditEditFormBase extends EditFormControlBase {
      * @memberof AbstractEditEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '全名 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '全名 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
         fullname: [
             { required: true, type: 'string', message: '全名 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '全名 值不能为空', trigger: 'blur' },
         ],
-        jobtitle: [
-            { required: false, type: 'string', message: '职务 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '职务 值不能为空', trigger: 'blur' },
-        ],
-        customername: [
-            { required: false, type: 'string', message: '客户 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '客户 值不能为空', trigger: 'blur' },
-        ],
-        emailaddress1: [
-            { required: false, type: 'string', message: '电子邮件 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '电子邮件 值不能为空', trigger: 'blur' },
-        ],
-        telephone1: [
-            { required: false, type: 'string', message: '商务电话 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '商务电话 值不能为空', trigger: 'blur' },
-        ],
-        mobilephone: [
-            { required: false, type: 'string', message: '移动电话 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '移动电话 值不能为空', trigger: 'blur' },
-        ],
-        fax: [
-            { required: false, type: 'string', message: '传真 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '传真 值不能为空', trigger: 'blur' },
-        ],
-        customerid: [
-            { required: false, type: 'string', message: '客户 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '客户 值不能为空', trigger: 'blur' },
-        ],
-        contactid: [
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

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

@@ -73,70 +73,6 @@ export class AbstractInfoEditFormBase extends EditFormControlBase {
      * @memberof AbstractInfoEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '全名 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '全名 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        fullname: [
-            { required: false, type: 'string', message: '全名 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '全名 值不能为空', trigger: 'blur' },
-        ],
-        jobtitle: [
-            { required: false, type: 'string', message: '职务 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '职务 值不能为空', trigger: 'blur' },
-        ],
-        customername: [
-            { required: false, type: 'string', message: '客户 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '客户 值不能为空', trigger: 'blur' },
-        ],
-        emailaddress1: [
-            { required: false, type: 'string', message: '电子邮件 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '电子邮件 值不能为空', trigger: 'blur' },
-        ],
-        telephone1: [
-            { required: false, type: 'string', message: '商务电话 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '商务电话 值不能为空', trigger: 'blur' },
-        ],
-        mobilephone: [
-            { required: false, type: 'string', message: '移动电话 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '移动电话 值不能为空', trigger: 'blur' },
-        ],
-        fax: [
-            { required: false, type: 'string', message: '传真 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '传真 值不能为空', trigger: 'blur' },
-        ],
-        contactid: [
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

app_CRM/src/widgets/contact/address-edit-form/address-edit-form-base.tsx

@@ -71,62 +71,6 @@ export class AddressEditEditFormBase extends EditFormControlBase {
      * @memberof AddressEditEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '全名 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '全名 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        address1_country: [
-            { required: false, type: 'string', message: '国家/地区 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '国家/地区 值不能为空', trigger: 'blur' },
-        ],
-        address1_stateorprovince: [
-            { required: false, type: 'string', message: '省/市/自治区 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '省/市/自治区 值不能为空', trigger: 'blur' },
-        ],
-        address1_city: [
-            { required: false, type: 'string', message: '市/县 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '市/县 值不能为空', trigger: 'blur' },
-        ],
-        address1_line1: [
-            { required: false, type: 'string', message: '街道 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '街道 值不能为空', trigger: 'blur' },
-        ],
-        address1_postalcode: [
-            { required: false, type: 'string', message: '邮政编码 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '邮政编码 值不能为空', trigger: 'blur' },
-        ],
-        contactid: [
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

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

@@ -71,62 +71,6 @@ export class AddressInfoEditFormBase extends EditFormControlBase {
      * @memberof AddressInfoEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '全名 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '全名 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        address1_country: [
-            { required: false, type: 'string', message: '国家/地区 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '国家/地区 值不能为空', trigger: 'blur' },
-        ],
-        address1_stateorprovince: [
-            { required: false, type: 'string', message: '省/市/自治区 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '省/市/自治区 值不能为空', trigger: 'blur' },
-        ],
-        address1_city: [
-            { required: false, type: 'string', message: '市/县 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '市/县 值不能为空', trigger: 'blur' },
-        ],
-        address1_line1: [
-            { required: false, type: 'string', message: '街道 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '街道 值不能为空', trigger: 'blur' },
-        ],
-        address1_postalcode: [
-            { required: false, type: 'string', message: '邮政编码 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '邮政编码 值不能为空', trigger: 'blur' },
-        ],
-        contactid: [
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

app_CRM/src/widgets/contact/book-edit-form/book-edit-form-base.tsx

@@ -71,62 +71,6 @@ export class BookEditEditFormBase extends EditFormControlBase {
      * @memberof BookEditEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '全名 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '全名 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        transactioncurrencyname: [
-            { required: false, type: 'string', message: '货币 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '货币 值不能为空', trigger: 'blur' },
-        ],
-        creditlimit: [
-            { required: false, type: 'number', message: '信用额度 值不能为空', trigger: 'change' },
-            { required: false, type: 'number', message: '信用额度 值不能为空', trigger: 'blur' },
-        ],
-        creditonhold: [
-            { required: false, type: 'number', message: '信用冻结 值不能为空', trigger: 'change' },
-            { required: false, type: 'number', message: '信用冻结 值不能为空', trigger: 'blur' },
-        ],
-        paymenttermscode: [
-            { required: false, type: 'string', message: '付款方式 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '付款方式 值不能为空', trigger: 'blur' },
-        ],
-        transactioncurrencyid: [
-            { required: false, type: 'string', message: '货币 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '货币 值不能为空', trigger: 'blur' },
-        ],
-        contactid: [
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

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

@@ -70,58 +70,6 @@ export class BookInfoEditFormBase extends EditFormControlBase {
      * @memberof BookInfoEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '全名 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '全名 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        transactioncurrencyname: [
-            { required: false, type: 'string', message: '货币 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '货币 值不能为空', trigger: 'blur' },
-        ],
-        creditlimit: [
-            { required: false, type: 'number', message: '信用额度 值不能为空', trigger: 'change' },
-            { required: false, type: 'number', message: '信用额度 值不能为空', trigger: 'blur' },
-        ],
-        creditonhold: [
-            { required: false, type: 'string', message: '信用冻结 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '信用冻结 值不能为空', trigger: 'blur' },
-        ],
-        paymenttermscode: [
-            { required: false, type: 'string', message: '付款方式 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '付款方式 值不能为空', trigger: 'blur' },
-        ],
-        contactid: [
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

app_CRM/src/widgets/contact/by-account-grid/by-account-grid-base.tsx

@@ -189,4 +189,33 @@ export class ByAccountGridBase extends GridControllerBase {
     }
 
 
+    /**
+     * 导出数据格式化
+     *
+     * @param {*} filterVal
+     * @param {*} jsonData
+     * @param {any[]} [codelistColumns=[]]
+     * @returns {Promise<any>}
+     * @memberof ByAccountGridBase
+     */
+    public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
+        return super.formatExcelData(filterVal, jsonData, [
+        ]);
+    }
+
+
+    /**
+     * 界面行为
+     *
+     * @param {*} row
+     * @param {*} tag
+     * @param {*} $event
+     * @memberof ByAccountGridBase
+     */
+	public uiAction(row: any, tag: any, $event: any): void {
+        $event.stopPropagation();
+        if(Object.is('SetPrimary', tag)) {
+            this.grid_uagridcolumn1_u0a2fe00_click(row, tag, $event);
+        }
+    }
 }
\ No newline at end of file

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

@@ -85,7 +85,7 @@
                               <i class='fa fa-check'></i>
                               
                             </a>
-                            <div slot='content'>{{$t('entities.contact.byaccount_grid.uiactions.setprimary')}}</div>
+                            <div slot='content'>{{$t('entities.contact.byaccount_grid.uiactions.contact_setprimary')}}</div>
                             </tooltip>
                         </div>
                     </template>

app_CRM/src/widgets/contact/main-grid/main-grid-base.tsx

@@ -136,4 +136,18 @@ export class MainGridBase extends GridControllerBase {
     }
 
 
+    /**
+     * 导出数据格式化
+     *
+     * @param {*} filterVal
+     * @param {*} jsonData
+     * @param {any[]} [codelistColumns=[]]
+     * @returns {Promise<any>}
+     * @memberof MainGridBase
+     */
+    public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
+        return super.formatExcelData(filterVal, jsonData, [
+        ]);
+    }
+
 }
\ No newline at end of file

app_CRM/src/widgets/contact/market-edit-form/market-edit-form-base.tsx

@@ -71,62 +71,6 @@ export class MarketEditEditFormBase extends EditFormControlBase {
      * @memberof MarketEditEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '全名 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '全名 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        originatingleadname: [
-            { required: false, type: 'string', message: '原始潜在顾客 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '原始潜在顾客 值不能为空', trigger: 'blur' },
-        ],
-        lastusedincampaign: [
-            { required: false, type: 'string', message: '上次参与市场活动的日期 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '上次参与市场活动的日期 值不能为空', trigger: 'blur' },
-        ],
-        donotsendmm: [
-            { required: false, type: 'number', message: '发送市场营销资料 值不能为空', trigger: 'change' },
-            { required: false, type: 'number', message: '发送市场营销资料 值不能为空', trigger: 'blur' },
-        ],
-        shippingmethodcode: [
-            { required: false, type: 'string', message: '送货方式 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '送货方式 值不能为空', trigger: 'blur' },
-        ],
-        originatingleadid: [
-            { required: false, type: 'string', message: '原始潜在顾客 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '原始潜在顾客 值不能为空', trigger: 'blur' },
-        ],
-        contactid: [
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

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

@@ -70,58 +70,6 @@ export class MarketInfoEditFormBase extends EditFormControlBase {
      * @memberof MarketInfoEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '全名 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '全名 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        originatingleadname: [
-            { required: false, type: 'string', message: '原始潜在顾客 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '原始潜在顾客 值不能为空', trigger: 'blur' },
-        ],
-        lastusedincampaign: [
-            { required: false, type: 'string', message: '上次参与市场活动的日期 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '上次参与市场活动的日期 值不能为空', trigger: 'blur' },
-        ],
-        donotsendmm: [
-            { required: false, type: 'string', message: '发送市场营销资料 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '发送市场营销资料 值不能为空', trigger: 'blur' },
-        ],
-        shippingmethodcode: [
-            { required: false, type: 'string', message: '送货方式 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '送货方式 值不能为空', trigger: 'blur' },
-        ],
-        contactid: [
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

app_CRM/src/widgets/contact/person-edit-form/person-edit-form-base.tsx

@@ -72,66 +72,6 @@ export class PersonEditEditFormBase extends EditFormControlBase {
      * @memberof PersonEditEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '全名 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '全名 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        gendercode: [
-            { required: false, type: 'string', message: '性别 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '性别 值不能为空', trigger: 'blur' },
-        ],
-        familystatuscode: [
-            { required: false, type: 'string', message: '婚姻状况 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '婚姻状况 值不能为空', trigger: 'blur' },
-        ],
-        spousesname: [
-            { required: false, type: 'string', message: '配偶/伴侣姓名 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '配偶/伴侣姓名 值不能为空', trigger: 'blur' },
-        ],
-        birthdate: [
-            { required: false, type: 'string', message: '生日 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '生日 值不能为空', trigger: 'blur' },
-        ],
-        anniversary: [
-            { required: false, type: 'string', message: '纪念日 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '纪念日 值不能为空', trigger: 'blur' },
-        ],
-        description: [
-            { required: false, type: 'string', message: '说明 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '说明 值不能为空', trigger: 'blur' },
-        ],
-        contactid: [
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

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

@@ -72,66 +72,6 @@ export class PersonInfoEditFormBase extends EditFormControlBase {
      * @memberof PersonInfoEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '全名 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '全名 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        gendercode: [
-            { required: false, type: 'string', message: '性别 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '性别 值不能为空', trigger: 'blur' },
-        ],
-        familystatuscode: [
-            { required: false, type: 'string', message: '婚姻状况 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '婚姻状况 值不能为空', trigger: 'blur' },
-        ],
-        spousesname: [
-            { required: false, type: 'string', message: '配偶/伴侣姓名 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '配偶/伴侣姓名 值不能为空', trigger: 'blur' },
-        ],
-        birthdate: [
-            { required: false, type: 'string', message: '生日 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '生日 值不能为空', trigger: 'blur' },
-        ],
-        anniversary: [
-            { required: false, type: 'string', message: '纪念日 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '纪念日 值不能为空', trigger: 'blur' },
-        ],
-        description: [
-            { required: false, type: 'string', message: '说明 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '说明 值不能为空', trigger: 'blur' },
-        ],
-        contactid: [
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

app_CRM/src/widgets/contact/quick-create-form/quick-create-form-base.tsx

@@ -74,74 +74,10 @@ export class QuickCreateEditFormBase extends EditFormControlBase {
      * @memberof QuickCreateEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '全名 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '全名 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
         fullname: [
             { required: true, type: 'string', message: '全名 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '全名 值不能为空', trigger: 'blur' },
         ],
-        jobtitle: [
-            { required: false, type: 'string', message: '职务 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '职务 值不能为空', trigger: 'blur' },
-        ],
-        customername: [
-            { required: false, type: 'string', message: '客户 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '客户 值不能为空', trigger: 'blur' },
-        ],
-        emailaddress1: [
-            { required: false, type: 'string', message: '电子邮件 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '电子邮件 值不能为空', trigger: 'blur' },
-        ],
-        telephone1: [
-            { required: false, type: 'string', message: '商务电话 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '商务电话 值不能为空', trigger: 'blur' },
-        ],
-        mobilephone: [
-            { required: false, type: 'string', message: '移动电话 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '移动电话 值不能为空', trigger: 'blur' },
-        ],
-        fax: [
-            { required: false, type: 'string', message: '传真 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '传真 值不能为空', trigger: 'blur' },
-        ],
-        customerid: [
-            { required: false, type: 'string', message: '客户 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '客户 值不能为空', trigger: 'blur' },
-        ],
-        contactid: [
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '联系人 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

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

@@ -71,62 +71,6 @@ export class MainEditFormBase extends EditFormControlBase {
      * @memberof MainEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '电子邮件 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '电子邮件 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '主题 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '主题 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        subject: [
-            { required: false, type: 'string', message: '主题 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '主题 值不能为空', trigger: 'blur' },
-        ],
-        createman: [
-            { required: false, type: 'string', message: '建立人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '建立人 值不能为空', trigger: 'blur' },
-        ],
-        createdate: [
-            { required: false, type: 'string', message: '建立时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '建立时间 值不能为空', trigger: 'blur' },
-        ],
-        updateman: [
-            { required: false, type: 'string', message: '更新人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新人 值不能为空', trigger: 'blur' },
-        ],
-        updatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        activityid: [
-            { required: false, type: 'string', message: '电子邮件 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '电子邮件 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

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

@@ -71,62 +71,10 @@ export class MainEditFormBase extends EditFormControlBase {
      * @memberof MainEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '传真 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '传真 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '主题 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '主题 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
         subject: [
             { required: true, type: 'string', message: '主题 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '主题 值不能为空', trigger: 'blur' },
         ],
-        createman: [
-            { required: false, type: 'string', message: '建立人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '建立人 值不能为空', trigger: 'blur' },
-        ],
-        createdate: [
-            { required: false, type: 'string', message: '建立时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '建立时间 值不能为空', trigger: 'blur' },
-        ],
-        updateman: [
-            { required: false, type: 'string', message: '更新人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新人 值不能为空', trigger: 'blur' },
-        ],
-        updatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        activityid: [
-            { required: false, type: 'string', message: '传真 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '传真 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

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

@@ -71,62 +71,10 @@ export class MainEditFormBase extends EditFormControlBase {
      * @memberof MainEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '目标 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '目标 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '名称 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '名称 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
         title: [
             { required: true, type: 'string', message: '名称 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '名称 值不能为空', trigger: 'blur' },
         ],
-        createman: [
-            { required: false, type: 'string', message: '建立人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '建立人 值不能为空', trigger: 'blur' },
-        ],
-        createdate: [
-            { required: false, type: 'string', message: '建立时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '建立时间 值不能为空', trigger: 'blur' },
-        ],
-        updateman: [
-            { required: false, type: 'string', message: '更新人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新人 值不能为空', trigger: 'blur' },
-        ],
-        updatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        goalid: [
-            { required: false, type: 'string', message: '目标 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '目标 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

app_CRM/src/widgets/goal/main-grid/main-grid-base.tsx

@@ -128,4 +128,26 @@ export class MainGridBase extends GridControllerBase {
     }
 
 
+    /**
+     * 导出数据格式化
+     *
+     * @param {*} filterVal
+     * @param {*} jsonData
+     * @param {any[]} [codelistColumns=[]]
+     * @returns {Promise<any>}
+     * @memberof MainGridBase
+     */
+    public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
+        return super.formatExcelData(filterVal, jsonData, [
+            {
+                name: 'updateman',
+                srfkey: 'SysOperator',
+                codelistType : 'DYNAMIC',
+                renderMode: 'other',
+                textSeparator: '、',
+                valueSeparator: ',',
+            },
+        ]);
+    }
+
 }
\ No newline at end of file

app_CRM/src/widgets/ibiz-list/abstract-edit-form/abstract-edit-form-base.tsx

@@ -76,38 +76,6 @@ export class AbstractEditEditFormBase extends EditFormControlBase {
      * @memberof AbstractEditEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '列表 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '列表 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '名称 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '名称 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
         listname: [
             { required: true, type: 'string', message: '名称 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '名称 值不能为空', trigger: 'blur' },
@@ -116,42 +84,10 @@ export class AbstractEditEditFormBase extends EditFormControlBase {
             { required: true, type: 'number', message: '类型 值不能为空', trigger: 'change' },
             { required: true, type: 'number', message: '类型 值不能为空', trigger: 'blur' },
         ],
-        purpose: [
-            { required: false, type: 'string', message: '用途 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '用途 值不能为空', trigger: 'blur' },
-        ],
-        membertype: [
-            { required: false, type: 'string', message: '目标对象 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '目标对象 值不能为空', trigger: 'blur' },
-        ],
-        source: [
-            { required: false, type: 'string', message: '来源 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '来源 值不能为空', trigger: 'blur' },
-        ],
-        transactioncurrencyname: [
-            { required: false, type: 'string', message: '货币 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '货币 值不能为空', trigger: 'blur' },
-        ],
-        cost: [
-            { required: false, type: 'number', message: '成本 值不能为空', trigger: 'change' },
-            { required: false, type: 'number', message: '成本 值不能为空', trigger: 'blur' },
-        ],
         owneridyominame: [
             { required: true, type: 'string', message: '负责人 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '负责人 值不能为空', trigger: 'blur' },
         ],
-        description: [
-            { required: false, type: 'string', message: '说明 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '说明 值不能为空', trigger: 'blur' },
-        ],
-        transactioncurrencyid: [
-            { required: false, type: 'string', message: '货币 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '货币 值不能为空', trigger: 'blur' },
-        ],
-        listid: [
-            { required: false, type: 'string', message: '列表 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '列表 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

app_CRM/src/widgets/ibiz-list/abstract-info-form/abstract-info-form-base.tsx

@@ -84,78 +84,6 @@ export class AbstractInfoEditFormBase extends EditFormControlBase {
      * @memberof AbstractInfoEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '列表 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '列表 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '名称 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '名称 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        listname: [
-            { required: false, type: 'string', message: '名称 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '名称 值不能为空', trigger: 'blur' },
-        ],
-        type: [
-            { required: false, type: 'string', message: '类型 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '类型 值不能为空', trigger: 'blur' },
-        ],
-        purpose: [
-            { required: false, type: 'string', message: '用途 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '用途 值不能为空', trigger: 'blur' },
-        ],
-        membertype: [
-            { required: false, type: 'string', message: '目标对象 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '目标对象 值不能为空', trigger: 'blur' },
-        ],
-        source: [
-            { required: false, type: 'string', message: '来源 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '来源 值不能为空', trigger: 'blur' },
-        ],
-        transactioncurrencyname: [
-            { required: false, type: 'string', message: '货币 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '货币 值不能为空', trigger: 'blur' },
-        ],
-        cost: [
-            { required: false, type: 'number', message: '成本 值不能为空', trigger: 'change' },
-            { required: false, type: 'number', message: '成本 值不能为空', trigger: 'blur' },
-        ],
-        owneridyominame: [
-            { required: false, type: 'string', message: '负责人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '负责人 值不能为空', trigger: 'blur' },
-        ],
-        description: [
-            { required: false, type: 'string', message: '说明 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '说明 值不能为空', trigger: 'blur' },
-        ],
-        listid: [
-            { required: false, type: 'string', message: '列表 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '列表 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

app_CRM/src/widgets/ibiz-list/abstract-info-form/abstract-info-form.html

@@ -98,7 +98,7 @@
     viewname='list-account-inner' 
     :data="JSON.stringify(this.data)" 
     @drdatasaved="drdatasaved($event)"
-    style=";overflow: auto;">
+    style="overflow: auto;">
 </app-form-druipart>
 
 </i-col>
@@ -132,7 +132,7 @@
     viewname='list-contact-inner' 
     :data="JSON.stringify(this.data)" 
     @drdatasaved="drdatasaved($event)"
-    style=";overflow: auto;">
+    style="overflow: auto;">
 </app-form-druipart>
 
 </i-col>
@@ -166,7 +166,7 @@
     viewname='list-lead-by-list' 
     :data="JSON.stringify(this.data)" 
     @drdatasaved="drdatasaved($event)"
-    style=";overflow: auto;">
+    style="overflow: auto;">
 </app-form-druipart>
 
 </i-col>

app_CRM/src/widgets/ibiz-list/main-grid/main-grid-base.tsx

@@ -144,4 +144,34 @@ export class MainGridBase extends GridControllerBase {
     }
 
 
+    /**
+     * 导出数据格式化
+     *
+     * @param {*} filterVal
+     * @param {*} jsonData
+     * @param {any[]} [codelistColumns=[]]
+     * @returns {Promise<any>}
+     * @memberof MainGridBase
+     */
+    public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
+        return super.formatExcelData(filterVal, jsonData, [
+            {
+                name: 'type',
+                srfkey: 'YesNo',
+                codelistType : 'STATIC',
+                renderMode: 'other',
+                textSeparator: '、',
+                valueSeparator: ',',
+            },
+            {
+                name: 'createdfromcode',
+                srfkey: 'List__CreatedFromCode',
+                codelistType : 'STATIC',
+                renderMode: 'other',
+                textSeparator: '、',
+                valueSeparator: ',',
+            },
+        ]);
+    }
+
 }
\ No newline at end of file

app_CRM/src/widgets/ibiz-list/quick-create-form/quick-create-form-base.tsx

@@ -84,78 +84,14 @@ export class QuickCreateEditFormBase extends EditFormControlBase {
      * @memberof QuickCreateEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '列表 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '列表 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '名称 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '名称 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
         listname: [
             { required: true, type: 'string', message: '名称 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '名称 值不能为空', trigger: 'blur' },
         ],
-        membertype: [
-            { required: false, type: 'string', message: '目标对象 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '目标对象 值不能为空', trigger: 'blur' },
-        ],
         type: [
             { required: true, type: 'number', message: '类型 值不能为空', trigger: 'change' },
             { required: true, type: 'number', message: '类型 值不能为空', trigger: 'blur' },
         ],
-        purpose: [
-            { required: false, type: 'string', message: '用途 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '用途 值不能为空', trigger: 'blur' },
-        ],
-        source: [
-            { required: false, type: 'string', message: '来源 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '来源 值不能为空', trigger: 'blur' },
-        ],
-        transactioncurrencyname: [
-            { required: false, type: 'string', message: '货币 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '货币 值不能为空', trigger: 'blur' },
-        ],
-        cost: [
-            { required: false, type: 'number', message: '成本 值不能为空', trigger: 'change' },
-            { required: false, type: 'number', message: '成本 值不能为空', trigger: 'blur' },
-        ],
-        lastusedon: [
-            { required: false, type: 'string', message: '上次使用时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '上次使用时间 值不能为空', trigger: 'blur' },
-        ],
-        lockstatus: [
-            { required: false, type: 'number', message: '已锁定 值不能为空', trigger: 'change' },
-            { required: false, type: 'number', message: '已锁定 值不能为空', trigger: 'blur' },
-        ],
-        description: [
-            { required: false, type: 'string', message: '说明 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '说明 值不能为空', trigger: 'blur' },
-        ],
         ownerid: [
             { required: true, type: 'string', message: '负责人 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '负责人 值不能为空', trigger: 'blur' },
@@ -168,30 +104,6 @@ export class QuickCreateEditFormBase extends EditFormControlBase {
             { required: true, type: 'string', message: '负责人 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '负责人 值不能为空', trigger: 'blur' },
         ],
-        createman: [
-            { required: false, type: 'string', message: '建立人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '建立人 值不能为空', trigger: 'blur' },
-        ],
-        createdate: [
-            { required: false, type: 'string', message: '建立时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '建立时间 值不能为空', trigger: 'blur' },
-        ],
-        updateman: [
-            { required: false, type: 'string', message: '更新人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新人 值不能为空', trigger: 'blur' },
-        ],
-        updatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        transactioncurrencyid: [
-            { required: false, type: 'string', message: '货币 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '货币 值不能为空', trigger: 'blur' },
-        ],
-        listid: [
-            { required: false, type: 'string', message: '列表 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '列表 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

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

@@ -71,62 +71,10 @@ export class MainEditFormBase extends EditFormControlBase {
      * @memberof MainEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '案例 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '案例 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '案例标题 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '案例标题 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
         title: [
             { required: true, type: 'string', message: '案例标题 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '案例标题 值不能为空', trigger: 'blur' },
         ],
-        createman: [
-            { required: false, type: 'string', message: '建立人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '建立人 值不能为空', trigger: 'blur' },
-        ],
-        createdate: [
-            { required: false, type: 'string', message: '建立时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '建立时间 值不能为空', trigger: 'blur' },
-        ],
-        updateman: [
-            { required: false, type: 'string', message: '更新人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新人 值不能为空', trigger: 'blur' },
-        ],
-        updatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        incidentid: [
-            { required: false, type: 'string', message: '案例 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '案例 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

app_CRM/src/widgets/incident/main-grid/main-grid-base.tsx

@@ -128,4 +128,26 @@ export class MainGridBase extends GridControllerBase {
     }
 
 
+    /**
+     * 导出数据格式化
+     *
+     * @param {*} filterVal
+     * @param {*} jsonData
+     * @param {any[]} [codelistColumns=[]]
+     * @returns {Promise<any>}
+     * @memberof MainGridBase
+     */
+    public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
+        return super.formatExcelData(filterVal, jsonData, [
+            {
+                name: 'updateman',
+                srfkey: 'SysOperator',
+                codelistType : 'DYNAMIC',
+                renderMode: 'other',
+                textSeparator: '、',
+                valueSeparator: ',',
+            },
+        ]);
+    }
+
 }
\ No newline at end of file

app_CRM/src/widgets/invoice-detail/invoice-product-grid-grid/invoice-product-grid-grid-base.tsx

@@ -144,4 +144,18 @@ export class InvoiceProductGridGridBase extends GridControllerBase {
     }
 
 
+    /**
+     * 导出数据格式化
+     *
+     * @param {*} filterVal
+     * @param {*} jsonData
+     * @param {any[]} [codelistColumns=[]]
+     * @returns {Promise<any>}
+     * @memberof InvoiceProductGridGridBase
+     */
+    public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
+        return super.formatExcelData(filterVal, jsonData, [
+        ]);
+    }
+
 }
\ No newline at end of file

app_CRM/src/widgets/invoice-detail/main-form/main-form-base.tsx

@@ -74,74 +74,10 @@ export class MainEditFormBase extends EditFormControlBase {
      * @memberof MainEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '发票产品 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '发票产品 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '名称 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '名称 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        productname: [
-            { required: false, type: 'string', message: '产品名称 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '产品名称 值不能为空', trigger: 'blur' },
-        ],
-        priceperunit: [
-            { required: false, type: 'number', message: '单价 值不能为空', trigger: 'change' },
-            { required: false, type: 'number', message: '单价 值不能为空', trigger: 'blur' },
-        ],
         quantity: [
             { required: true, type: 'number', message: '数量 值不能为空', trigger: 'change' },
             { required: true, type: 'number', message: '数量 值不能为空', trigger: 'blur' },
         ],
-        uomname: [
-            { required: false, type: 'string', message: '计价单位 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '计价单位 值不能为空', trigger: 'blur' },
-        ],
-        manualdiscountamount: [
-            { required: false, type: 'number', message: '零售折扣 值不能为空', trigger: 'change' },
-            { required: false, type: 'number', message: '零售折扣 值不能为空', trigger: 'blur' },
-        ],
-        tax: [
-            { required: false, type: 'number', message: '税 值不能为空', trigger: 'change' },
-            { required: false, type: 'number', message: '税 值不能为空', trigger: 'blur' },
-        ],
-        productid: [
-            { required: false, type: 'string', message: '现有产品 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '现有产品 值不能为空', trigger: 'blur' },
-        ],
-        invoicedetailid: [
-            { required: false, type: 'string', message: '发票产品 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '发票产品 值不能为空', trigger: 'blur' },
-        ],
-        uomid: [
-            { required: false, type: 'string', message: '计价单位 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '计价单位 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

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

@@ -92,38 +92,6 @@ export class InfoEditFormBase extends EditFormControlBase {
      * @memberof InfoEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '发票 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '发票 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '发票名称 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '发票名称 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
         invoicenumber: [
             { required: true, type: 'string', message: '发票编码 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '发票编码 值不能为空', trigger: 'blur' },
@@ -140,98 +108,10 @@ export class InfoEditFormBase extends EditFormControlBase {
             { required: true, type: 'string', message: '价目表 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '价目表 值不能为空', trigger: 'blur' },
         ],
-        datedelivered: [
-            { required: false, type: 'string', message: '交付日期 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '交付日期 值不能为空', trigger: 'blur' },
-        ],
-        duedate: [
-            { required: false, type: 'string', message: '截止日期 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '截止日期 值不能为空', trigger: 'blur' },
-        ],
-        shippingmethodcode: [
-            { required: false, type: 'string', message: '送货方式 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '送货方式 值不能为空', trigger: 'blur' },
-        ],
-        paymenttermscode: [
-            { required: false, type: 'string', message: '付款条件 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '付款条件 值不能为空', trigger: 'blur' },
-        ],
-        description: [
-            { required: false, type: 'string', message: '说明 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '说明 值不能为空', trigger: 'blur' },
-        ],
-        totallineitemamount: [
-            { required: false, type: 'number', message: '明细金额总计 值不能为空', trigger: 'change' },
-            { required: false, type: 'number', message: '明细金额总计 值不能为空', trigger: 'blur' },
-        ],
-        discountpercentage: [
-            { required: false, type: 'number', message: '发票折扣(%) 值不能为空', trigger: 'change' },
-            { required: false, type: 'number', message: '发票折扣(%) 值不能为空', trigger: 'blur' },
-        ],
-        discountamount: [
-            { required: false, type: 'number', message: '发票折扣金额 值不能为空', trigger: 'change' },
-            { required: false, type: 'number', message: '发票折扣金额 值不能为空', trigger: 'blur' },
-        ],
-        totalamountlessfreight: [
-            { required: false, type: 'number', message: '折后金额总计 值不能为空', trigger: 'change' },
-            { required: false, type: 'number', message: '折后金额总计 值不能为空', trigger: 'blur' },
-        ],
-        freightamount: [
-            { required: false, type: 'number', message: '运费金额 值不能为空', trigger: 'change' },
-            { required: false, type: 'number', message: '运费金额 值不能为空', trigger: 'blur' },
-        ],
-        totalamount: [
-            { required: false, type: 'number', message: '总金额 值不能为空', trigger: 'change' },
-            { required: false, type: 'number', message: '总金额 值不能为空', trigger: 'blur' },
-        ],
-        opportunityname: [
-            { required: false, type: 'string', message: '商机 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '商机 值不能为空', trigger: 'blur' },
-        ],
-        salesordername: [
-            { required: false, type: 'string', message: '订单 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '订单 值不能为空', trigger: 'blur' },
-        ],
         customerid: [
             { required: true, type: 'string', message: '客户 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '客户 值不能为空', trigger: 'blur' },
         ],
-        billto_country: [
-            { required: false, type: 'string', message: '国家/地区 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '国家/地区 值不能为空', trigger: 'blur' },
-        ],
-        billto_stateorprovince: [
-            { required: false, type: 'string', message: '省/市/自治区 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '省/市/自治区 值不能为空', trigger: 'blur' },
-        ],
-        billto_city: [
-            { required: false, type: 'string', message: '市/县 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '市/县 值不能为空', trigger: 'blur' },
-        ],
-        billto_line1: [
-            { required: false, type: 'string', message: '街道 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '街道 值不能为空', trigger: 'blur' },
-        ],
-        salesorderid: [
-            { required: false, type: 'string', message: '订单 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '订单 值不能为空', trigger: 'blur' },
-        ],
-        transactioncurrencyid: [
-            { required: false, type: 'string', message: '货币 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '货币 值不能为空', trigger: 'blur' },
-        ],
-        opportunityid: [
-            { required: false, type: 'string', message: '商机 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '商机 值不能为空', trigger: 'blur' },
-        ],
-        pricelevelid: [
-            { required: false, type: 'string', message: '价目表 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '价目表 值不能为空', trigger: 'blur' },
-        ],
-        invoiceid: [
-            { required: false, type: 'string', message: '发票 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '发票 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

app_CRM/src/widgets/invoice/main-grid/main-grid-base.tsx

@@ -136,4 +136,26 @@ export class MainGridBase extends GridControllerBase {
     }
 
 
+    /**
+     * 导出数据格式化
+     *
+     * @param {*} filterVal
+     * @param {*} jsonData
+     * @param {any[]} [codelistColumns=[]]
+     * @returns {Promise<any>}
+     * @memberof MainGridBase
+     */
+    public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
+        return super.formatExcelData(filterVal, jsonData, [
+            {
+                name: 'statuscode',
+                srfkey: 'Invoice__StatusCode',
+                codelistType : 'STATIC',
+                renderMode: 'other',
+                textSeparator: '、',
+                valueSeparator: ',',
+            },
+        ]);
+    }
+
 }
\ No newline at end of file

app_CRM/src/widgets/invoice/quick-create-form/quick-create-form-base.tsx

@@ -72,38 +72,6 @@ export class QuickCreateEditFormBase extends EditFormControlBase {
      * @memberof QuickCreateEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '发票 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '发票 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '发票名称 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '发票名称 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
         invoicenumber: [
             { required: true, type: 'string', message: '发票编码 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '发票编码 值不能为空', trigger: 'blur' },
@@ -120,18 +88,6 @@ export class QuickCreateEditFormBase extends EditFormControlBase {
             { required: true, type: 'string', message: '价目表 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '价目表 值不能为空', trigger: 'blur' },
         ],
-        transactioncurrencyid: [
-            { required: false, type: 'string', message: '货币 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '货币 值不能为空', trigger: 'blur' },
-        ],
-        pricelevelid: [
-            { required: false, type: 'string', message: '价目表 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '价目表 值不能为空', trigger: 'blur' },
-        ],
-        invoiceid: [
-            { required: false, type: 'string', message: '发票 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '发票 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

app_CRM/src/widgets/lead/company-info-form/company-info-form-base.tsx

@@ -73,70 +73,6 @@ export class CompanyInfoEditFormBase extends EditFormControlBase {
      * @memberof CompanyInfoEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '潜在顾客 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '潜在顾客 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '姓名 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '姓名 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        companyname: [
-            { required: false, type: 'string', message: '公司名称 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '公司名称 值不能为空', trigger: 'blur' },
-        ],
-        websiteurl: [
-            { required: false, type: 'string', message: '网站 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '网站 值不能为空', trigger: 'blur' },
-        ],
-        address1_postalcode: [
-            { required: false, type: 'string', message: '邮政编码 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '邮政编码 值不能为空', trigger: 'blur' },
-        ],
-        address1_country: [
-            { required: false, type: 'string', message: '国家/地区 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '国家/地区 值不能为空', trigger: 'blur' },
-        ],
-        address1_stateorprovince: [
-            { required: false, type: 'string', message: '省/直辖市/自治区 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '省/直辖市/自治区 值不能为空', trigger: 'blur' },
-        ],
-        address1_city: [
-            { required: false, type: 'string', message: '市/县 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '市/县 值不能为空', trigger: 'blur' },
-        ],
-        address1_line1: [
-            { required: false, type: 'string', message: '街道 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '街道 值不能为空', trigger: 'blur' },
-        ],
-        leadid: [
-            { required: false, type: 'string', message: '潜在顾客 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '潜在顾客 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

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

@@ -72,66 +72,6 @@ export class ContactInfoEditFormBase extends EditFormControlBase {
      * @memberof ContactInfoEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '潜在顾客 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '潜在顾客 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '姓名 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '姓名 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        subject: [
-            { required: false, type: 'string', message: '主题 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '主题 值不能为空', trigger: 'blur' },
-        ],
-        fullname: [
-            { required: false, type: 'string', message: '姓名 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '姓名 值不能为空', trigger: 'blur' },
-        ],
-        jobtitle: [
-            { required: false, type: 'string', message: '职务 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '职务 值不能为空', trigger: 'blur' },
-        ],
-        telephone1: [
-            { required: false, type: 'string', message: '商务电话 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '商务电话 值不能为空', trigger: 'blur' },
-        ],
-        mobilephone: [
-            { required: false, type: 'string', message: '移动电话 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '移动电话 值不能为空', trigger: 'blur' },
-        ],
-        emailaddress1: [
-            { required: false, type: 'string', message: '电子邮件 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '电子邮件 值不能为空', trigger: 'blur' },
-        ],
-        leadid: [
-            { required: false, type: 'string', message: '潜在顾客 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '潜在顾客 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

app_CRM/src/widgets/lead/detail-info-form/detail-info-form-base.tsx

@@ -72,66 +72,6 @@ export class DetailInfoEditFormBase extends EditFormControlBase {
      * @memberof DetailInfoEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '潜在顾客 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '潜在顾客 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '姓名 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '姓名 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        description: [
-            { required: false, type: 'string', message: '说明 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '说明 值不能为空', trigger: 'blur' },
-        ],
-        industrycode: [
-            { required: false, type: 'string', message: '行业 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '行业 值不能为空', trigger: 'blur' },
-        ],
-        revenue: [
-            { required: false, type: 'number', message: '年收入 值不能为空', trigger: 'change' },
-            { required: false, type: 'number', message: '年收入 值不能为空', trigger: 'blur' },
-        ],
-        numberofemployees: [
-            { required: false, type: 'number', message: '员工数 值不能为空', trigger: 'change' },
-            { required: false, type: 'number', message: '员工数 值不能为空', trigger: 'blur' },
-        ],
-        sic: [
-            { required: false, type: 'string', message: '行业编码 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '行业编码 值不能为空', trigger: 'blur' },
-        ],
-        transactioncurrencyname: [
-            { required: false, type: 'string', message: '货币 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '货币 值不能为空', trigger: 'blur' },
-        ],
-        leadid: [
-            { required: false, type: 'string', message: '潜在顾客 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '潜在顾客 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

app_CRM/src/widgets/lead/main-grid/main-grid-base.tsx

@@ -128,4 +128,26 @@ export class MainGridBase extends GridControllerBase {
     }
 
 
+    /**
+     * 导出数据格式化
+     *
+     * @param {*} filterVal
+     * @param {*} jsonData
+     * @param {any[]} [codelistColumns=[]]
+     * @returns {Promise<any>}
+     * @memberof MainGridBase
+     */
+    public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
+        return super.formatExcelData(filterVal, jsonData, [
+            {
+                name: 'statuscode',
+                srfkey: 'Lead__StatusCode',
+                codelistType : 'STATIC',
+                renderMode: 'other',
+                textSeparator: '、',
+                valueSeparator: ',',
+            },
+        ]);
+    }
+
 }
\ No newline at end of file

app_CRM/src/widgets/lead/market-info-form/market-info-form-base.tsx

@@ -69,54 +69,6 @@ export class MarketInfoEditFormBase extends EditFormControlBase {
      * @memberof MarketInfoEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '潜在顾客 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '潜在顾客 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '姓名 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '姓名 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        campaignname: [
-            { required: false, type: 'string', message: '源市场活动 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '源市场活动 值不能为空', trigger: 'blur' },
-        ],
-        donotsendmm: [
-            { required: false, type: 'string', message: '市场营销资料 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '市场营销资料 值不能为空', trigger: 'blur' },
-        ],
-        lastusedincampaign: [
-            { required: false, type: 'string', message: '上次市场活动日期 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '上次市场活动日期 值不能为空', trigger: 'blur' },
-        ],
-        leadid: [
-            { required: false, type: 'string', message: '潜在顾客 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '潜在顾客 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

app_CRM/src/widgets/lead/quick-create-form/quick-create-form-base.tsx

@@ -75,78 +75,14 @@ export class QuickCreateEditFormBase extends EditFormControlBase {
      * @memberof QuickCreateEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '潜在顾客 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '潜在顾客 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '姓名 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '姓名 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
         subject: [
             { required: true, type: 'string', message: '主题 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '主题 值不能为空', trigger: 'blur' },
         ],
-        budgetamount: [
-            { required: false, type: 'number', message: '预算金额 值不能为空', trigger: 'change' },
-            { required: false, type: 'number', message: '预算金额 值不能为空', trigger: 'blur' },
-        ],
-        purchasetimeframe: [
-            { required: false, type: 'string', message: '购买时间范围 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '购买时间范围 值不能为空', trigger: 'blur' },
-        ],
-        leadsourcecode: [
-            { required: false, type: 'string', message: '潜在顾客来源 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '潜在顾客来源 值不能为空', trigger: 'blur' },
-        ],
         fullname: [
             { required: true, type: 'string', message: '姓名 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '姓名 值不能为空', trigger: 'blur' },
         ],
-        companyname: [
-            { required: false, type: 'string', message: '公司名称 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '公司名称 值不能为空', trigger: 'blur' },
-        ],
-        jobtitle: [
-            { required: false, type: 'string', message: '职务 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '职务 值不能为空', trigger: 'blur' },
-        ],
-        mobilephone: [
-            { required: false, type: 'string', message: '移动电话 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '移动电话 值不能为空', trigger: 'blur' },
-        ],
-        emailaddress1: [
-            { required: false, type: 'string', message: '电子邮件 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '电子邮件 值不能为空', trigger: 'blur' },
-        ],
-        leadid: [
-            { required: false, type: 'string', message: '潜在顾客 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '潜在顾客 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

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

@@ -71,62 +71,10 @@ export class MainEditFormBase extends EditFormControlBase {
      * @memberof MainEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '信件 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '信件 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '主题 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '主题 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
         subject: [
             { required: true, type: 'string', message: '主题 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '主题 值不能为空', trigger: 'blur' },
         ],
-        createman: [
-            { required: false, type: 'string', message: '建立人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '建立人 值不能为空', trigger: 'blur' },
-        ],
-        createdate: [
-            { required: false, type: 'string', message: '建立时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '建立时间 值不能为空', trigger: 'blur' },
-        ],
-        updateman: [
-            { required: false, type: 'string', message: '更新人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新人 值不能为空', trigger: 'blur' },
-        ],
-        updatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        activityid: [
-            { required: false, type: 'string', message: '信件 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '信件 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

app_CRM/src/widgets/list-account/main-form/main-form-base.tsx

@@ -66,42 +66,6 @@ export class MainEditFormBase extends EditFormControlBase {
      * @memberof MainEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '关系标识 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '关系标识 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '关系名称 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '关系名称 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        relationshipsid: [
-            { required: false, type: 'string', message: '关系标识 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '关系标识 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

app_CRM/src/widgets/list-account/main-grid/main-grid-base.tsx

@@ -136,4 +136,26 @@ export class MainGridBase extends GridControllerBase {
     }
 
 
+    /**
+     * 导出数据格式化
+     *
+     * @param {*} filterVal
+     * @param {*} jsonData
+     * @param {any[]} [codelistColumns=[]]
+     * @returns {Promise<any>}
+     * @memberof MainGridBase
+     */
+    public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
+        return super.formatExcelData(filterVal, jsonData, [
+            {
+                name: 'statecode',
+                srfkey: 'Account__StateCode',
+                codelistType : 'STATIC',
+                renderMode: 'other',
+                textSeparator: '、',
+                valueSeparator: ',',
+            },
+        ]);
+    }
+
 }
\ No newline at end of file

app_CRM/src/widgets/list-account/quick-create-by-list-form/quick-create-by-list-form-base.tsx

@@ -68,50 +68,6 @@ export class QuickCreateByListEditFormBase extends EditFormControlBase {
      * @memberof QuickCreateByListEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '关系标识 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '关系标识 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '关系名称 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '关系名称 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        entity2name: [
-            { required: false, type: 'string', message: '选择客户： 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '选择客户： 值不能为空', trigger: 'blur' },
-        ],
-        entity2id: [
-            { required: false, type: 'string', message: '客户 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '客户 值不能为空', trigger: 'blur' },
-        ],
-        relationshipsid: [
-            { required: false, type: 'string', message: '关系标识 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '关系标识 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

app_CRM/src/widgets/list-contact/inner-grid/inner-grid-base.tsx

@@ -160,4 +160,26 @@ export class InnerGridBase extends GridControllerBase {
     }
 
 
+    /**
+     * 导出数据格式化
+     *
+     * @param {*} filterVal
+     * @param {*} jsonData
+     * @param {any[]} [codelistColumns=[]]
+     * @returns {Promise<any>}
+     * @memberof InnerGridBase
+     */
+    public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
+        return super.formatExcelData(filterVal, jsonData, [
+            {
+                name: 'statecode',
+                srfkey: 'Contact__StateCode',
+                codelistType : 'STATIC',
+                renderMode: 'other',
+                textSeparator: '、',
+                valueSeparator: ',',
+            },
+        ]);
+    }
+
 }
\ No newline at end of file

app_CRM/src/widgets/list-contact/main-form/main-form-base.tsx

@@ -66,42 +66,6 @@ export class MainEditFormBase extends EditFormControlBase {
      * @memberof MainEditFormBase
      */
     public rules: any = {
-        srfupdatedate: [
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
-        ],
-        srforikey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { required: false, type: 'string', message: '关系标识 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '关系标识 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { required: false, type: 'string', message: '关系名称 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '关系名称 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        relationshipsid: [
-            { required: false, type: 'string', message: '关系标识 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '关系标识 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

app_CRM/src/widgets/list-contact/main-grid/main-grid-base.tsx

@@ -144,4 +144,26 @@ export class MainGridBase extends GridControllerBase {
     }
 
 
+    /**
+     * 导出数据格式化
+     *
+     * @param {*} filterVal
+     * @param {*} jsonData
+     * @param {any[]} [codelistColumns=[]]
+     * @returns {Promise<any>}
+     * @memberof MainGridBase
+     */
+    public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
+        return super.formatExcelData(filterVal, jsonData, [
+            {
+                name: 'statecode',
+                srfkey: 'Contact__StateCode',
+                codelistType : 'STATIC',
+                renderMode: 'other',
+                textSeparator: '、',
+                valueSeparator: ',',
+            },
+        ]);
+    }
+
 }
\ No newline at end of file

app_CRM/src/widgets/list-lead/main-grid/main-grid-base.tsx

@@ -136,4 +136,26 @@ export class MainGridBase extends GridControllerBase {
     }
 
 
+    /**
+     * 导出数据格式化
+     *
+     * @param {*} filterVal
+     * @param {*} jsonData
+     * @param {any[]} [codelistColumns=[]]
+     * @returns {Promise<any>}
+     * @memberof MainGridBase
+     */
+    public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
+        return super.formatExcelData(filterVal, jsonData, [
+            {
+                name: 'statuscode',
+                srfkey: 'Lead__StatusCode',
+                codelistType : 'STATIC',
+                renderMode: 'other',
+                textSeparator: '、',
+                valueSeparator: ',',
+            },
+        ]);
+    }
+
 }
\ No newline at end of file