xignzi006 发布系统代码

app_BusinessCentral/src/locale/lanres/entities/account/account_en_US.ts

@@ -319,6 +319,8 @@ export default {
 			group1: "账户信息", 
 			grouppanel3: "简介", 
 			grouppanel1: "地址信息", 
+			druipart1: "", 
+			grouppanel4: "联系人", 
 			grouppanel2: "联系人首选项", 
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 
@@ -352,6 +354,7 @@ export default {
 			address1_fax: "地址 1: 传真", 
 			address1_freighttermscode: "地址 1: 货运条款", 
 			address1_postalcode: "地址 1: 邮政编码", 
+			primarycontactname: "主要联系人", 
 			preferredcontactmethodcode: "首选联系方式", 
 			donotemail: "不允许使用电子邮件", 
 			donotbulkemail: "不允许使用批量电子邮件", 
@@ -364,6 +367,7 @@ export default {
 			edit_accountinfo: "编辑",
 			edit_introduction: "编辑",
 			edit_address: "编辑",
+			openquickcreateview: "新建",
 		},
 	},
 	info_account_form: {

app_BusinessCentral/src/locale/lanres/entities/account/account_zh_CN.ts

@@ -318,6 +318,8 @@ export default {
 			group1: '账户信息', 
 			grouppanel3: '简介', 
 			grouppanel1: '地址信息', 
+			druipart1: '', 
+			grouppanel4: '联系人', 
 			grouppanel2: '联系人首选项', 
 			formpage1: '基本信息', 
 			srfupdatedate: '更新时间', 
@@ -351,6 +353,7 @@ export default {
 			address1_fax: '地址 1: 传真', 
 			address1_freighttermscode: '地址 1: 货运条款', 
 			address1_postalcode: '地址 1: 邮政编码', 
+			primarycontactname: '主要联系人', 
 			preferredcontactmethodcode: '首选联系方式', 
 			donotemail: '不允许使用电子邮件', 
 			donotbulkemail: '不允许使用批量电子邮件', 
@@ -363,6 +366,7 @@ export default {
 			edit_accountinfo: '编辑',
 			edit_introduction: '编辑',
 			edit_address: '编辑',
+			openquickcreateview: '新建',
 		},
 	},
 	info_account_form: {

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

@@ -551,7 +551,7 @@ export default {
 		uiactions: {
 		},
 	},
-	main_grid: {
+	byaccount_grid: {
 		columns: {
 			fullname: "全名",
 			emailaddress1: "电子邮件",
@@ -561,7 +561,7 @@ export default {
 		uiactions: {
 		},
 	},
-	byaccount_grid: {
+	main_grid: {
 		columns: {
 			fullname: "全名",
 			emailaddress1: "电子邮件",
@@ -581,7 +581,7 @@ export default {
 		uiactions: {
 		},
 	},
-	gridviewtoolbar_toolbar: {
+	byaccounttoolbar_toolbar: {
 		tbitem1_openquickcreateview: {
 			caption: "新建",
 			tip: "新建",
@@ -614,16 +614,8 @@ export default {
 			caption: "Export",
 			tip: "Export {0} Data To Excel",
 		},
-		tbitem10: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem19: {
-			caption: "Filter",
-			tip: "Filter",
-		},
 	},
-	byaccounttoolbar_toolbar: {
+	gridviewtoolbar_toolbar: {
 		tbitem1_openquickcreateview: {
 			caption: "新建",
 			tip: "新建",
@@ -656,6 +648,14 @@ export default {
 			caption: "Export",
 			tip: "Export {0} Data To Excel",
 		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem19: {
+			caption: "Filter",
+			tip: "Filter",
+		},
 	},
 	editviewtoolbar_toolbar: {
 		tbitem3: {

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

@@ -550,7 +550,7 @@ export default {
 		uiactions: {
 		},
 	},
-	main_grid: {
+	byaccount_grid: {
 		columns: {
 			fullname: '全名',
 			emailaddress1: '电子邮件',
@@ -560,7 +560,7 @@ export default {
 		uiactions: {
 		},
 	},
-	byaccount_grid: {
+	main_grid: {
 		columns: {
 			fullname: '全名',
 			emailaddress1: '电子邮件',
@@ -580,7 +580,7 @@ export default {
 		uiactions: {
 		},
 	},
-	gridviewtoolbar_toolbar: {
+	byaccounttoolbar_toolbar: {
 		tbitem1_openquickcreateview: {
 			caption: '新建',
 			tip: '新建',
@@ -613,16 +613,8 @@ export default {
 			caption: '导出',
 			tip: '导出',
 		},
-		tbitem10: {
-			caption: '-',
-			tip: '',
-		},
-		tbitem19: {
-			caption: '过滤',
-			tip: '过滤',
-		},
 	},
-	byaccounttoolbar_toolbar: {
+	gridviewtoolbar_toolbar: {
 		tbitem1_openquickcreateview: {
 			caption: '新建',
 			tip: '新建',
@@ -655,6 +647,14 @@ export default {
 			caption: '导出',
 			tip: '导出',
 		},
+		tbitem10: {
+			caption: '-',
+			tip: '',
+		},
+		tbitem19: {
+			caption: '过滤',
+			tip: '过滤',
+		},
 	},
 	editviewtoolbar_toolbar: {
 		tbitem3: {

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

@@ -288,6 +288,8 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
+                '9224b0b14d2d99014e051f8035ba5cbf',
+                'e404dc93e70d6284d4e1a083017625ed',
                 'e4335da0a7c14a65376eecaabb771fd7',
                 '90cb61421b72cbc76f75360deffde218',
                 '688201ee5642d41628dbf4deba002d17',

app_BusinessCentral/src/widgets/account/info-all-form/info-all-form-base.vue

@@ -187,6 +187,46 @@
     </row>
 </app-form-group>
 
+</i-col>
+<i-col v-show="detailsModel.grouppanel4.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel4.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.account.info_all_form.details.grouppanel4')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="2" :isInfoGroupMode="true" :iconInfo="{'iconclass':'fa fa-user'}">    
+    <row>
+        <i-col v-show="detailsModel.primarycontactname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='primarycontactname' :itemRules="this.rules.primarycontactname" class='' :caption="$t('entities.account.info_all_form.details.primarycontactname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.primarycontactname.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+<app-span name='primarycontactname' :value="data.primarycontactname" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
+</app-form-item>
+
+</i-col>
+<i-col v-show="detailsModel.druipart1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-druipart
+    
+    :formState="formState"
+    :isForbidLoad="this.data.srfuf === '0'"
+    paramItem='account' 
+    :parentdata='{"srfparentdename":"ACCOUNT","SRFPARENTTYPE":"CUSTOM"}'
+    :parameters="[
+    ]"
+    :context="context"
+    :viewparams="viewparams"
+    :localContext ='{}'
+    :localParam ='{}'
+    parameterName='account'
+    parentName="Account"  
+    refviewtype='DEGRIDVIEW' 
+    refreshitems='' 
+    :ignorefieldvaluechange="ignorefieldvaluechange"
+    viewname='contact-by-account' 
+    :data="JSON.stringify(this.data)" 
+    @drdatasaved="drdatasaved($event)"
+    style=";overflow: auto;">
+</app-form-druipart>
+
+</i-col>
+    
+    </row>
+</app-form-group>
+
 </i-col>
 <i-col v-show="detailsModel.grouppanel2.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel2.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.account.info_all_form.details.grouppanel2')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="1" :isInfoGroupMode="true" :iconInfo="{'iconclass':'fa fa-phone'}">    
@@ -249,6 +289,7 @@ import AccountService from '@/service/account/account-service';
 import Info_AllService from './info-all-form-service';
 
 import AccountUIService from '@/uiservice/account/account-ui-service';
+import ContactUIService from '@/uiservice/contact/contact-ui-service';
 import { FormButtonModel, FormPageModel, FormItemModel, FormDRUIPartModel, FormPartModel, FormGroupPanelModel, FormIFrameModel, FormRowItemModel, FormTabPageModel, FormTabPanelModel, FormUserControlModel } from '@/model/form-detail';
 import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
 
@@ -422,6 +463,34 @@ export default class Info_AllBase extends Vue implements ControlInterface {
         curUIService.Account_Edit_Address(datas,contextJO, paramJO,  $event, xData,this,"Account");
     }
 
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public form_grouppanel4_u5a905ee_click(params: any = {}, tag?: any, $event?: any) {
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this;
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        const curUIService:ContactUIService  = new ContactUIService();
+        curUIService.Contact_OpenQuickCreateView(datas,contextJO, paramJO,  $event, xData,this,"Account");
+    }
+
 
     /**
      * 关闭视图
@@ -647,6 +716,7 @@ export default class Info_AllBase extends Vue implements ControlInterface {
         address1_fax: null,
         address1_freighttermscode: null,
         address1_postalcode: null,
+        primarycontactname: null,
         preferredcontactmethodcode: null,
         donotemail: null,
         donotbulkemail: null,
@@ -882,6 +952,12 @@ export default class Info_AllBase extends Vue implements ControlInterface {
             { required: false, type: 'string', message: '地址 1: 邮政编码 值不能为空', trigger: 'change' },
             { required: false, type: 'string', message: '地址 1: 邮政编码 值不能为空', trigger: 'blur' },
         ],
+        primarycontactname: [
+            { type: 'string', message: '主要联系人 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '主要联系人 值必须为字符串类型', trigger: 'blur' },
+            { required: false, type: 'string', message: '主要联系人 值不能为空', trigger: 'change' },
+            { required: false, type: 'string', message: '主要联系人 值不能为空', trigger: 'blur' },
+        ],
         preferredcontactmethodcode: [
             { type: 'string', message: '首选联系方式 值必须为字符串类型', trigger: 'change' },
             { type: 'string', message: '首选联系方式 值必须为字符串类型', trigger: 'blur' },
@@ -938,6 +1014,10 @@ export default class Info_AllBase extends Vue implements ControlInterface {
         grouppanel3: new FormGroupPanelModel({ caption: '简介', detailType: 'GROUPPANEL', name: 'grouppanel3', visible: true, isShowCaption: true, form: this, uiActionGroup: { caption: '编辑_简介信息', langbase: 'entities.account.info_all_form', extractMode: 'ITEM', details: [{ name: 'grouppanel3_uc061117', caption: '编辑', uiactiontag: 'edit_introduction',isShowCaption:true,isShowIcon:true }] } })
 , 
         grouppanel1: new FormGroupPanelModel({ caption: '地址信息', detailType: 'GROUPPANEL', name: 'grouppanel1', visible: true, isShowCaption: true, form: this, uiActionGroup: { caption: '编辑_地址信息', langbase: 'entities.account.info_all_form', extractMode: 'ITEM', details: [{ name: 'grouppanel1_u2ccbfc9', caption: '编辑', uiactiontag: 'edit_address',isShowCaption:true,isShowIcon:true }] } })
+, 
+        druipart1: new FormDRUIPartModel({ caption: '', detailType: 'DRUIPART', name: 'druipart1', visible: true, isShowCaption: true, form: this })
+, 
+        grouppanel4: new FormGroupPanelModel({ caption: '联系人', detailType: 'GROUPPANEL', name: 'grouppanel4', visible: true, isShowCaption: true, form: this, uiActionGroup: { caption: '添加联系人', langbase: 'entities.account.info_all_form', extractMode: 'ITEM', details: [{ name: 'grouppanel4_u5a905ee', caption: '新建', uiactiontag: 'openquickcreateview', icon: 'fa fa-file-text-o',isShowCaption:true,isShowIcon:true }] } })
 , 
         grouppanel2: new FormGroupPanelModel({ caption: '联系人首选项', detailType: 'GROUPPANEL', name: 'grouppanel2', visible: true, isShowCaption: true, form: this, uiActionGroup: { caption: '', langbase: 'entities.account.info_all_form', extractMode: 'ITEM', details: [] } })
 , 
@@ -1004,6 +1084,8 @@ export default class Info_AllBase extends Vue implements ControlInterface {
         address1_freighttermscode: new FormItemModel({ caption: '地址 1: 货运条款', detailType: 'FORMITEM', name: 'address1_freighttermscode', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
         address1_postalcode: new FormItemModel({ caption: '地址 1: 邮政编码', detailType: 'FORMITEM', name: 'address1_postalcode', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
+, 
+        primarycontactname: new FormItemModel({ caption: '主要联系人', detailType: 'FORMITEM', name: 'primarycontactname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
         preferredcontactmethodcode: new FormItemModel({ caption: '首选联系方式', detailType: 'FORMITEM', name: 'preferredcontactmethodcode', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
@@ -1393,6 +1475,18 @@ export default class Info_AllBase extends Vue implements ControlInterface {
         this.formDataChange({ name: 'address1_postalcode', newVal: newVal, oldVal: oldVal });
     }
 
+    /**
+     * 监控表单属性 primarycontactname 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof Info_All
+     */
+    @Watch('data.primarycontactname')
+    onPrimarycontactnameChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'primarycontactname', newVal: newVal, oldVal: oldVal });
+    }
+
     /**
      * 监控表单属性 preferredcontactmethodcode 值
      *
@@ -1552,6 +1646,9 @@ export default class Info_AllBase extends Vue implements ControlInterface {
 
 
 
+
+
+
 
 
 
@@ -1767,6 +1864,9 @@ export default class Info_AllBase extends Vue implements ControlInterface {
         if (Object.is(item.name, 'grouppanel1_u2ccbfc9')) {
             this.form_grouppanel1_u2ccbfc9_click(null, null, $event.event);
         }
+        if (Object.is(item.name, 'grouppanel4_u5a905ee')) {
+            this.form_grouppanel4_u5a905ee_click(null, null, $event.event);
+        }
     }
 
     /**
@@ -2088,7 +2188,7 @@ export default class Info_AllBase extends Vue implements ControlInterface {
             Object.assign(arg, data);
             Object.assign(arg, this.context);
             if (ifStateNext) {
-                this.drcounter = 0;
+                this.drcounter = 1;
                 if(this.drcounter !== 0){
                     this.drsaveopt = opt;
                     this.formState.next({ type: 'beforesave', data: arg });//先通知关系界面保存

app_BusinessCentral/src/widgets/account/info-all-form/info-all-form-model.ts

@@ -170,6 +170,11 @@ export default class Info_AllModel {
         prop: 'address1_postalcode',
         dataType: 'TEXT',
       },
+      {
+        name: 'primarycontactname',
+        prop: 'primarycontactname',
+        dataType: 'PICKUPTEXT',
+      },
       {
         name: 'preferredcontactmethodcode',
         prop: 'preferredcontactmethodcode',