xignzi006 发布系统代码

app_BusinessCentral/src/locale/lanres/entities/campaign-activity/campaign-activity_en_US.ts

@@ -115,6 +115,7 @@ export default {
 			actualend: "实际结束时间", 
 			budgetedcost: "预算分配", 
 			actualcost: "实际成本", 
+			regardingobjectid: "上级市场活动", 
 			activityid: "市场活动项目", 
 		},
 		uiactions: {

app_BusinessCentral/src/locale/lanres/entities/campaign-activity/campaign-activity_zh_CN.ts

@@ -114,6 +114,7 @@ export default {
 			actualend: '实际结束时间', 
 			budgetedcost: '预算分配', 
 			actualcost: '实际成本', 
+			regardingobjectid: '上级市场活动', 
 			activityid: '市场活动项目', 
 		},
 		uiactions: {

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

@@ -124,6 +124,25 @@ export default {
 		uiactions: {
 		},
 	},
+	quickcreate_form: {
+		details: {
+			group1: "campaignresponse基本信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "市场活动响应", 
+			srfmajortext: "主题", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			subject: "主题", 
+			regardingobjectid: "上级市场活动", 
+			activityid: "市场活动响应", 
+		},
+		uiactions: {
+		},
+	},
 	main_grid: {
 		columns: {
 			subject: "主题",

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

@@ -123,6 +123,25 @@ export default {
 		uiactions: {
 		},
 	},
+	quickcreate_form: {
+		details: {
+			group1: 'campaignresponse基本信息', 
+			formpage1: '基本信息', 
+			srfupdatedate: '更新时间', 
+			srforikey: '', 
+			srfkey: '市场活动响应', 
+			srfmajortext: '主题', 
+			srftempmode: '', 
+			srfuf: '', 
+			srfdeid: '', 
+			srfsourcekey: '', 
+			subject: '主题', 
+			regardingobjectid: '上级市场活动', 
+			activityid: '市场活动响应', 
+		},
+		uiactions: {
+		},
+	},
 	main_grid: {
 		columns: {
 			subject: '主题',

app_BusinessCentral/src/pages/marketing/campaign-activity-by-parent-key/campaign-activity-by-parent-key-base.vue

@@ -933,16 +933,28 @@ export default class CampaignActivityByParentKeyBase extends Vue {
         const deResParameters: any[] = [];
         const parameters: any[] = [
             { pathName: 'campaignactivities', parameterName: 'campaignactivity' },
-            { pathName: 'quickcreate', parameterName: 'quickcreate' },
         ];
         const _this: any = this;
-        const openIndexViewTab = (data: any) => {
-            const _data: any = { w: (new Date().getTime()) };
-            Object.assign(_data, data);
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
-            this.$router.push(routePath);
+        const openDrawer = (view: any, data: any) => {
+            let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
                 }
-        openIndexViewTab(data);
+                xData.refresh(result.datas);
+            });
+        }
+        const view: any = {
+            viewname: 'campaign-activity-quick-create', 
+            height: 0, 
+            width: 450,  
+            title: this.$t('entities.campaignactivity.views.quickcreate.title'),
+            placement: 'DRAWER_RIGHT',
+        };
+        openDrawer(view, data);
     }
 
 
@@ -967,14 +979,28 @@ export default class CampaignActivityByParentKeyBase extends Vue {
         const deResParameters: any[] = [];
         const parameters: any[] = [
             { pathName: 'campaignactivities', parameterName: 'campaignactivity' },
-            { pathName: 'quickcreate', parameterName: 'quickcreate' },
         ];
         const _this: any = this;
-        const openIndexViewTab = (data: any) => {
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
-            this.$router.push(routePath);
+        const openDrawer = (view: any, data: any) => {
+            let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
                 }
-        openIndexViewTab(data);
+                xData.refresh(result.datas);
+            });
+        }
+        const view: any = {
+            viewname: 'campaign-activity-quick-create', 
+            height: 0, 
+            width: 450,  
+            title: this.$t('entities.campaignactivity.views.quickcreate.title'),
+            placement: 'DRAWER_RIGHT',
+        };
+        openDrawer(view, data);
     }
 
 

app_BusinessCentral/src/pages/marketing/campaign-activity-quick-create/campaign-activity-quick-create-base.vue

@@ -128,6 +128,7 @@ export default class CampaignActivityQuickCreateBase extends Vue {
 	 * @memberof CampaignActivityQuickCreateBase
 	 */
     public customViewParams:any ={
+    "regardingobjectid":{"isRawValue":false,"value":"campaign"}
     };
 
     /**

app_BusinessCentral/src/widgets/campaign-activity/quick-create-form/quick-create-form-base.vue

@@ -77,6 +77,12 @@
     <input-box v-model="data.actualcost"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.actualcost.disabled" type='number'  style=""></input-box>
 </app-form-item>
 
+</i-col>
+<i-col v-show="detailsModel.regardingobjectid.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='regardingobjectid' :itemRules="this.rules.regardingobjectid" class='' :caption="$t('entities.campaignactivity.quickcreate_form.details.regardingobjectid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.regardingobjectid.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box v-model="data.regardingobjectid"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.regardingobjectid.disabled" type='text'  style=""></input-box>
+</app-form-item>
+
 </i-col>
     
     </row>
@@ -399,6 +405,7 @@ export default class QuickCreateBase extends Vue implements ControlInterface {
         actualend: null,
         budgetedcost: null,
         actualcost: null,
+        regardingobjectid: null,
         activityid: null,
         campaignactivity:null,
     };
@@ -550,6 +557,12 @@ export default class QuickCreateBase extends Vue implements ControlInterface {
             { required: false, type: 'number', message: '实际成本 值不能为空', trigger: 'change' },
             { required: false, type: 'number', message: '实际成本 值不能为空', trigger: 'blur' },
         ],
+        regardingobjectid: [
+            { type: 'string', message: '上级市场活动 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '上级市场活动 值必须为字符串类型', trigger: 'blur' },
+            { required: true, type: 'string', message: '上级市场活动 值不能为空', trigger: 'change' },
+            { required: true, type: 'string', message: '上级市场活动 值不能为空', trigger: 'blur' },
+        ],
         activityid: [
             { type: 'string', message: '市场活动项目 值必须为字符串类型', trigger: 'change' },
             { type: 'string', message: '市场活动项目 值必须为字符串类型', trigger: 'blur' },
@@ -604,6 +617,8 @@ export default class QuickCreateBase extends Vue implements ControlInterface {
         budgetedcost: new FormItemModel({ caption: '预算分配', detailType: 'FORMITEM', name: 'budgetedcost', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
         actualcost: new FormItemModel({ caption: '实际成本', detailType: 'FORMITEM', name: 'actualcost', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
+, 
+        regardingobjectid: new FormItemModel({ caption: '上级市场活动', detailType: 'FORMITEM', name: 'regardingobjectid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 1 })
 , 
         activityid: new FormItemModel({ caption: '市场活动项目', detailType: 'FORMITEM', name: 'activityid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 1 })
 , 
@@ -825,6 +840,18 @@ export default class QuickCreateBase extends Vue implements ControlInterface {
         this.formDataChange({ name: 'actualcost', newVal: newVal, oldVal: oldVal });
     }
 
+    /**
+     * 监控表单属性 regardingobjectid 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof QuickCreate
+     */
+    @Watch('data.regardingobjectid')
+    onRegardingobjectidChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'regardingobjectid', newVal: newVal, oldVal: oldVal });
+    }
+
     /**
      * 监控表单属性 activityid 值
      *
@@ -892,6 +919,7 @@ export default class QuickCreateBase extends Vue implements ControlInterface {
 
 
 
+
 
 
     }
@@ -1792,6 +1820,9 @@ export default class QuickCreateBase extends Vue implements ControlInterface {
      * @memberof QuickCreate
      */
     public createDefault(){                    
+        if (this.data.hasOwnProperty('regardingobjectid')) {
+            this.data['regardingobjectid'] = this.viewparams['regardingobjectid'];
+        }
     }
 
     /**

app_BusinessCentral/src/widgets/campaign-activity/quick-create-form/quick-create-form-model.ts

@@ -105,6 +105,11 @@ export default class QuickCreateModel {
         prop: 'actualcost',
         dataType: 'BIGDECIMAL',
       },
+      {
+        name: 'regardingobjectid',
+        prop: 'regardingobjectid',
+        dataType: 'TEXT',
+      },
       {
         name: 'activityid',
         prop: 'activityid',