xignzi006 发布系统代码

app_BusinessCentral/src/locale/lanres/entities/campaign/campaign_en_US.ts

@@ -104,10 +104,10 @@ export default {
 			srfdeid: "", 
 			srfsourcekey: "", 
 			campaignname: "活动名称", 
-			owneridyominame: "负责人", 
-			statuscode: "状态描述", 
-			expectedrevenue: "估计收入", 
 			template: "模板", 
+			expectedrevenue: "估计收入", 
+			statuscode: "状态描述", 
+			owneridyominame: "负责人", 
 			campaignid: "市场活动", 
 		},
 		uiactions: {

app_BusinessCentral/src/locale/lanres/entities/campaign/campaign_zh_CN.ts

@@ -103,10 +103,10 @@ export default {
 			srfdeid: '', 
 			srfsourcekey: '', 
 			campaignname: '活动名称', 
-			owneridyominame: '负责人', 
-			statuscode: '状态描述', 
-			expectedrevenue: '估计收入', 
 			template: '模板', 
+			expectedrevenue: '估计收入', 
+			statuscode: '状态描述', 
+			owneridyominame: '负责人', 
 			campaignid: '市场活动', 
 		},
 		uiactions: {

app_BusinessCentral/src/pages/marketing/campaign-info/campaign-info-base.vue

  
 <template>
 <studio-view viewName="campaigninfo" viewTitle="市场活动" class='detabexpview campaign-info'>
-    <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
-    </template>
     <view_tabexppanel 
         :viewState="viewState"  
         :viewparams="viewparams" 

app_BusinessCentral/src/widgets/campaign/head-summary-dashboard/head-summary-dashboard-base.vue

@@ -17,7 +17,6 @@
                             :viewState="viewState"  
                             :viewparams="viewparams" 
                             :context="context" 
-                            :height="300"
                             name="dashboard_sysportlet1"  
                             ref='dashboard_sysportlet1' 
                             @closeview="closeView($event)">

app_BusinessCentral/src/widgets/campaign/info-head-form/info-head-form-base.vue

@@ -4,7 +4,7 @@
     <row >
             
 <i-col v-show="detailsModel.group1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-group layoutType="FLEX" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.campaign.info_head_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="true" >    
+    <app-form-group layoutType="FLEX" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.campaign.info_head_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="true" >    
     <div style="height: 100%;display: flex;">
         <div  v-show="detailsModel.grouppanel1.visible" :style="{}">
 <app-form-group layoutType="FLEX" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.campaign.info_head_form.details.grouppanel1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="true" >    
@@ -23,32 +23,32 @@
 </div>
 <div  v-show="detailsModel.grouppanel2.visible" :style="{}">
 <app-form-group layoutType="FLEX" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel2.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.campaign.info_head_form.details.grouppanel2')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="true" >    
-    <div style="height: 100%;display: flex;flex-direction: row-reverse;">
-        <div  v-show="detailsModel.owneridyominame.visible" :style="{}">
-<app-form-item name='owneridyominame' :itemRules="this.rules.owneridyominame" class='' :caption="$t('entities.campaign.info_head_form.details.owneridyominame')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.owneridyominame.error" :isEmptyCaption="false" labelPos="BOTTOM">
+    <div style="height: 100%;display: flex;flex-direction: row;justify-content: flex-end;">
+        <div  v-show="detailsModel.template.visible" :style="{}">
+<app-form-item name='template' :itemRules="this.rules.template" class='' :caption="$t('entities.campaign.info_head_form.details.template')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.template.error" :isEmptyCaption="false" labelPos="BOTTOM">
     
-<app-span name='owneridyominame' :value="data.owneridyominame" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
+<app-span name='template' :value="data.template" tag='YesNo' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </div>
-<div  v-show="detailsModel.statuscode.visible" :style="{}">
-<app-form-item name='statuscode' :itemRules="this.rules.statuscode" class='' :caption="$t('entities.campaign.info_head_form.details.statuscode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.statuscode.error" :isEmptyCaption="false" labelPos="BOTTOM">
+<div  v-show="detailsModel.expectedrevenue.visible" :style="{}">
+<app-form-item name='expectedrevenue' :itemRules="this.rules.expectedrevenue" class='' :caption="$t('entities.campaign.info_head_form.details.expectedrevenue')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.expectedrevenue.error" :isEmptyCaption="false" labelPos="BOTTOM">
     
-<app-span name='statuscode' :value="data.statuscode" tag='Status' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
+<app-span name='expectedrevenue' :value="data.expectedrevenue" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </div>
-<div  v-show="detailsModel.expectedrevenue.visible" :style="{}">
-<app-form-item name='expectedrevenue' :itemRules="this.rules.expectedrevenue" class='' :caption="$t('entities.campaign.info_head_form.details.expectedrevenue')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.expectedrevenue.error" :isEmptyCaption="false" labelPos="BOTTOM">
+<div  v-show="detailsModel.statuscode.visible" :style="{}">
+<app-form-item name='statuscode' :itemRules="this.rules.statuscode" class='' :caption="$t('entities.campaign.info_head_form.details.statuscode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.statuscode.error" :isEmptyCaption="false" labelPos="BOTTOM">
     
-<app-span name='expectedrevenue' :value="data.expectedrevenue" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
+<app-span name='statuscode' :value="data.statuscode" tag='Status' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </div>
-<div  v-show="detailsModel.template.visible" :style="{}">
-<app-form-item name='template' :itemRules="this.rules.template" class='' :caption="$t('entities.campaign.info_head_form.details.template')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.template.error" :isEmptyCaption="false" labelPos="BOTTOM">
+<div  v-show="detailsModel.owneridyominame.visible" :style="{}">
+<app-form-item name='owneridyominame' :itemRules="this.rules.owneridyominame" class='' :caption="$t('entities.campaign.info_head_form.details.owneridyominame')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.owneridyominame.error" :isEmptyCaption="false" labelPos="BOTTOM">
     
-<app-span name='template' :value="data.template" tag='YesNo' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
+<app-span name='owneridyominame' :value="data.owneridyominame" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </div>
@@ -369,10 +369,10 @@ export default class Info_HeadBase extends Vue implements ControlInterface {
         srfdeid: null,
         srfsourcekey: null,
         campaignname: null,
-        owneridyominame: null,
-        statuscode: null,
-        expectedrevenue: null,
         template: null,
+        expectedrevenue: null,
+        statuscode: null,
+        owneridyominame: null,
         campaignid: null,
         campaign:null,
     };
@@ -470,17 +470,11 @@ export default class Info_HeadBase extends Vue implements ControlInterface {
             { required: false, type: 'string', message: '活动名称 值不能为空', trigger: 'change' },
             { required: false, type: 'string', message: '活动名称 值不能为空', trigger: 'blur' },
         ],
-        owneridyominame: [
-            { type: 'string', message: '负责人 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '负责人 值必须为字符串类型', trigger: 'blur' },
-            { required: false, type: 'string', message: '负责人 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '负责人 值不能为空', trigger: 'blur' },
-        ],
-        statuscode: [
-            { type: 'string', message: '状态描述 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '状态描述 值必须为字符串类型', trigger: 'blur' },
-            { required: false, type: 'string', message: '状态描述 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '状态描述 值不能为空', trigger: 'blur' },
+        template: [
+            { type: 'string', message: '模板 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '模板 值必须为字符串类型', trigger: 'blur' },
+            { required: false, type: 'string', message: '模板 值不能为空', trigger: 'change' },
+            { required: false, type: 'string', message: '模板 值不能为空', trigger: 'blur' },
         ],
         expectedrevenue: [
             { type: 'number', message: '估计收入 值必须为数值类型', trigger: 'change' },
@@ -488,11 +482,17 @@ export default class Info_HeadBase extends Vue implements ControlInterface {
             { required: false, type: 'number', message: '估计收入 值不能为空', trigger: 'change' },
             { required: false, type: 'number', message: '估计收入 值不能为空', trigger: 'blur' },
         ],
-        template: [
-            { type: 'string', message: '模板 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '模板 值必须为字符串类型', trigger: 'blur' },
-            { required: false, type: 'string', message: '模板 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '模板 值不能为空', trigger: 'blur' },
+        statuscode: [
+            { type: 'string', message: '状态描述 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '状态描述 值必须为字符串类型', trigger: 'blur' },
+            { required: false, type: 'string', message: '状态描述 值不能为空', trigger: 'change' },
+            { required: false, type: 'string', message: '状态描述 值不能为空', trigger: 'blur' },
+        ],
+        owneridyominame: [
+            { type: 'string', message: '负责人 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '负责人 值必须为字符串类型', trigger: 'blur' },
+            { required: false, type: 'string', message: '负责人 值不能为空', trigger: 'change' },
+            { required: false, type: 'string', message: '负责人 值不能为空', trigger: 'blur' },
         ],
         campaignid: [
             { type: 'string', message: '市场活动 值必须为字符串类型', trigger: 'change' },
@@ -513,7 +513,7 @@ export default class Info_HeadBase extends Vue implements ControlInterface {
 , 
         grouppanel2: new FormGroupPanelModel({ caption: '分组面板', detailType: 'GROUPPANEL', name: 'grouppanel2', visible: true, isShowCaption: false, form: this, uiActionGroup: { caption: '', langbase: 'entities.campaign.info_head_form', extractMode: 'ITEM', details: [] } })
 , 
-        group1: new FormGroupPanelModel({ caption: '市场活动', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: false, form: this, uiActionGroup: { caption: '', langbase: 'entities.campaign.info_head_form', extractMode: 'ITEM', details: [] } })
+        group1: new FormGroupPanelModel({ caption: '市场活动', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: true, form: this, uiActionGroup: { caption: '', langbase: 'entities.campaign.info_head_form', extractMode: 'ITEM', details: [] } })
 , 
         formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this })
 , 
@@ -535,13 +535,13 @@ export default class Info_HeadBase extends Vue implements ControlInterface {
 , 
         campaignname: new FormItemModel({ caption: '活动名称', detailType: 'FORMITEM', name: 'campaignname', visible: true, isShowCaption: false, form: this, disabled: false, enableCond: 3 })
 , 
-        owneridyominame: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'owneridyominame', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 0 })
-, 
-        statuscode: new FormItemModel({ caption: '状态描述', detailType: 'FORMITEM', name: 'statuscode', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
+        template: new FormItemModel({ caption: '模板', detailType: 'FORMITEM', name: 'template', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 1 })
 , 
         expectedrevenue: new FormItemModel({ caption: '估计收入', detailType: 'FORMITEM', name: 'expectedrevenue', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
-        template: new FormItemModel({ caption: '模板', detailType: 'FORMITEM', name: 'template', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 1 })
+        statuscode: new FormItemModel({ caption: '状态描述', detailType: 'FORMITEM', name: 'statuscode', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
+, 
+        owneridyominame: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'owneridyominame', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 0 })
 , 
         campaignid: new FormItemModel({ caption: '市场活动', detailType: 'FORMITEM', name: 'campaignid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 1 })
 , 
@@ -656,51 +656,51 @@ export default class Info_HeadBase extends Vue implements ControlInterface {
     }
 
     /**
-     * 监控表单属性 owneridyominame 值
+     * 监控表单属性 template 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof Info_Head
      */
-    @Watch('data.owneridyominame')
-    onOwneridyominameChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'owneridyominame', newVal: newVal, oldVal: oldVal });
+    @Watch('data.template')
+    onTemplateChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'template', newVal: newVal, oldVal: oldVal });
     }
 
     /**
-     * 监控表单属性 statuscode 值
+     * 监控表单属性 expectedrevenue 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof Info_Head
      */
-    @Watch('data.statuscode')
-    onStatuscodeChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'statuscode', newVal: newVal, oldVal: oldVal });
+    @Watch('data.expectedrevenue')
+    onExpectedrevenueChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'expectedrevenue', newVal: newVal, oldVal: oldVal });
     }
 
     /**
-     * 监控表单属性 expectedrevenue 值
+     * 监控表单属性 statuscode 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof Info_Head
      */
-    @Watch('data.expectedrevenue')
-    onExpectedrevenueChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'expectedrevenue', newVal: newVal, oldVal: oldVal });
+    @Watch('data.statuscode')
+    onStatuscodeChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'statuscode', newVal: newVal, oldVal: oldVal });
     }
 
     /**
-     * 监控表单属性 template 值
+     * 监控表单属性 owneridyominame 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof Info_Head
      */
-    @Watch('data.template')
-    onTemplateChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'template', newVal: newVal, oldVal: oldVal });
+    @Watch('data.owneridyominame')
+    onOwneridyominameChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'owneridyominame', newVal: newVal, oldVal: oldVal });
     }
 
     /**

app_BusinessCentral/src/widgets/campaign/info-head-form/info-head-form-model.ts

@@ -61,14 +61,9 @@ export default class Info_HeadModel {
         dataType: 'TEXT',
       },
       {
-        name: 'owneridyominame',
-        prop: 'owneridyominame',
-        dataType: 'TEXT',
-      },
-      {
-        name: 'statuscode',
-        prop: 'statuscode',
-        dataType: 'NSCODELIST',
+        name: 'template',
+        prop: 'template',
+        dataType: 'YESNO',
       },
       {
         name: 'expectedrevenue',
@@ -76,9 +71,14 @@ export default class Info_HeadModel {
         dataType: 'BIGDECIMAL',
       },
       {
-        name: 'template',
-        prop: 'template',
-        dataType: 'YESNO',
+        name: 'statuscode',
+        prop: 'statuscode',
+        dataType: 'NSCODELIST',
+      },
+      {
+        name: 'owneridyominame',
+        prop: 'owneridyominame',
+        dataType: 'TEXT',
       },
       {
         name: 'campaignid',

app_BusinessCentral/src/widgets/campaign/pt-info-head-portlet/pt-info-head-portlet-base.vue

 <template>
-    <div class='portlet pt-info-head ' :style="{'height': isAdaptiveSize ? 'calc(100% - 16px)' : (height > 0 ? height+'px' :'300px'),}">
+    <div class='portlet pt-info-head ' :style="{'height': isAdaptiveSize ? 'calc(100% - 16px)' : (height > 0 ? height+'px' :'0px'),}">
         <div class="portlet-without-title">
         <campaign-info-head :viewdata="JSON.stringify(context)" :viewDefaultUsage="false" ></campaign-info-head>
         </div>

businesscentral-core/src/main/resources/liquibase/h2_table.xml

@@ -7334,7 +7334,7 @@
 
 
     <!--输出实体[CAMPAIGN]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-campaign-46-75">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-campaign-50-75">
         <createTable tableName="CAMPAIGN">
                 <column name="EXPECTEDRESPONSE" remarks="" type="INT">
                 </column>
@@ -11281,10 +11281,10 @@
        <addForeignKeyConstraint baseColumnNames="BASECURRENCYID" baseTableName="ORGANIZATION" constraintName="DER1N_ORGANIZATION__TRANSACTIO" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[CAMPAIGN]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-campaign-46-311">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-campaign-50-311">
        <addForeignKeyConstraint baseColumnNames="PRICELISTID" baseTableName="CAMPAIGN" constraintName="DER1N_CAMPAIGN__PRICELEVEL__PR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRICELEVELID" referencedTableName="PRICELEVEL" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-campaign-46-312">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-campaign-50-312">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="CAMPAIGN" constraintName="DER1N_CAMPAIGN__TRANSACTIONCUR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[BOOKABLERESCHARACTERISTIC]外键关系 -->