xignzi006 发布系统代码

app_BusinessCentral/src/interface/entity/campaign.ts

@@ -15,7 +15,7 @@ export interface Campaign {
     expectedresponse?: any;
 
     /**
-     * 市场活动类型
+     * 活动类型
      *
      * @returns {*}
      * @memberof Campaign
@@ -223,7 +223,7 @@ export interface Campaign {
     entityimage?: any;
 
     /**
-     * 市场活动代码
+     * 活动代码
      *
      * @returns {*}
      * @memberof Campaign
@@ -343,7 +343,7 @@ export interface Campaign {
     overriddencreatedon?: any;
 
     /**
-     * 拟定开始日期
+     * 拟定日期
      *
      * @returns {*}
      * @memberof Campaign
@@ -391,7 +391,7 @@ export interface Campaign {
     transactioncurrencyid?: any;
 
     /**
-     * 货币名称
+     * 货币
      *
      * @returns {*}
      * @memberof Campaign

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

@@ -2,7 +2,7 @@
 export default {
   fields: {
     expectedresponse: '预期响应百分比',
-    typecode: '市场活动类型',
+    typecode: '活动类型',
     budgetedcost: '预算分配',
     createdate: '建立时间',
     totalactualcost: '市场活动总费用',
@@ -28,7 +28,7 @@ export default {
     proposedend: '拟定结束日期',
     versionnumber: 'Version Number',
     entityimage: '实体图像',
-    codename: '市场活动代码',
+    codename: '活动代码',
     description: '说明',
     actualend: '实际结束日期',
     expectedrevenue: '估计收入',
@@ -43,13 +43,13 @@ export default {
     stageid: 'Stage Id',
     statuscode: '状态描述',
     overriddencreatedon: 'Record Created On',
-    proposedstart: '拟定开始日期',
+    proposedstart: '拟定日期',
     totalactualcost_base: '市场活动总费用 (Base)',
     emailaddress: 'Email Address',
     promotioncodename: '促销代码',
     pricelistid: '价目表',
     transactioncurrencyid: '货币',
-    currencyname: '货币名称',
+    currencyname: '货币',
   },
 	views: {
 		info_head: {
@@ -158,9 +158,9 @@ export default {
 			srfdeid: "", 
 			srfsourcekey: "", 
 			campaignname: "活动名称", 
-			codename: "市场活动代码", 
-			transactioncurrencyname: "货币名称", 
-			typecode: "市场活动类型", 
+			codename: "活动代码", 
+			transactioncurrencyname: "货币", 
+			typecode: "活动类型", 
 			expectedresponse: "预期响应百分比", 
 			createman: "建立人", 
 			createdate: "建立时间", 
@@ -185,9 +185,9 @@ export default {
 			srfdeid: "", 
 			srfsourcekey: "", 
 			campaignname: "活动名称", 
-			codename: "市场活动代码", 
-			transactioncurrencyname: "货币名称", 
-			typecode: "市场活动类型", 
+			codename: "活动代码", 
+			transactioncurrencyname: "货币", 
+			typecode: "活动类型", 
 			expectedresponse: "预期响应百分比", 
 			objective: "活动内容", 
 			campaignid: "市场活动", 
@@ -207,7 +207,7 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			proposedstart: "拟定开始日期", 
+			proposedstart: "拟定日期", 
 			proposedend: "拟定结束日期", 
 			actualstart: "实际开始日期", 
 			actualend: "实际结束日期", 
@@ -240,8 +240,14 @@ export default {
 	main_grid: {
 		columns: {
 			campaignname: "活动名称",
-			updateman: "更新人",
-			updatedate: "更新时间",
+			codename: "活动代码",
+			typecode: "活动类型",
+			transactioncurrencyname: "货币",
+			template: "模板",
+			statuscode: "状态描述",
+			proposedstart: "拟定日期",
+			budgetedcost: "预算分配",
+			createdate: "建立时间",
 		},
 		uiactions: {
 		},

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

 export default {
   fields: {
     expectedresponse: '预期响应百分比',
-    typecode: '市场活动类型',
+    typecode: '活动类型',
     budgetedcost: '预算分配',
     createdate: '建立时间',
     totalactualcost: '市场活动总费用',
@@ -27,7 +27,7 @@ export default {
     proposedend: '拟定结束日期',
     versionnumber: 'Version Number',
     entityimage: '实体图像',
-    codename: '市场活动代码',
+    codename: '活动代码',
     description: '说明',
     actualend: '实际结束日期',
     expectedrevenue: '估计收入',
@@ -42,13 +42,13 @@ export default {
     stageid: 'Stage Id',
     statuscode: '状态描述',
     overriddencreatedon: 'Record Created On',
-    proposedstart: '拟定开始日期',
+    proposedstart: '拟定日期',
     totalactualcost_base: '市场活动总费用 (Base)',
     emailaddress: 'Email Address',
     promotioncodename: '促销代码',
     pricelistid: '价目表',
     transactioncurrencyid: '货币',
-    currencyname: '货币名称',
+    currencyname: '货币',
   },
 	views: {
 		info_head: {
@@ -157,9 +157,9 @@ export default {
 			srfdeid: '', 
 			srfsourcekey: '', 
 			campaignname: '活动名称', 
-			codename: '市场活动代码', 
-			transactioncurrencyname: '货币名称', 
-			typecode: '市场活动类型', 
+			codename: '活动代码', 
+			transactioncurrencyname: '货币', 
+			typecode: '活动类型', 
 			expectedresponse: '预期响应百分比', 
 			createman: '建立人', 
 			createdate: '建立时间', 
@@ -184,9 +184,9 @@ export default {
 			srfdeid: '', 
 			srfsourcekey: '', 
 			campaignname: '活动名称', 
-			codename: '市场活动代码', 
-			transactioncurrencyname: '货币名称', 
-			typecode: '市场活动类型', 
+			codename: '活动代码', 
+			transactioncurrencyname: '货币', 
+			typecode: '活动类型', 
 			expectedresponse: '预期响应百分比', 
 			objective: '活动内容', 
 			campaignid: '市场活动', 
@@ -206,7 +206,7 @@ export default {
 			srfuf: '', 
 			srfdeid: '', 
 			srfsourcekey: '', 
-			proposedstart: '拟定开始日期', 
+			proposedstart: '拟定日期', 
 			proposedend: '拟定结束日期', 
 			actualstart: '实际开始日期', 
 			actualend: '实际结束日期', 
@@ -239,8 +239,14 @@ export default {
 	main_grid: {
 		columns: {
 			campaignname: '活动名称',
-			updateman: '更新人',
-			updatedate: '更新时间',
+			codename: '活动代码',
+			typecode: '活动类型',
+			transactioncurrencyname: '货币',
+			template: '模板',
+			statuscode: '状态描述',
+			proposedstart: '拟定日期',
+			budgetedcost: '预算分配',
+			createdate: '建立时间',
 		},
 		uiactions: {
 		},

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

@@ -463,22 +463,22 @@ export default class Info_CampaginBase extends Vue implements ControlInterface {
             { required: false, type: 'string', message: '活动名称 值不能为空', trigger: 'blur' },
         ],
         codename: [
-            { type: 'string', message: '市场活动代码 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '市场活动代码 值必须为字符串类型', trigger: 'blur' },
-            { required: false, type: 'string', message: '市场活动代码 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '市场活动代码 值不能为空', trigger: 'blur' },
+            { type: 'string', message: '活动代码 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '活动代码 值必须为字符串类型', trigger: 'blur' },
+            { required: false, type: 'string', message: '活动代码 值不能为空', trigger: 'change' },
+            { required: false, type: 'string', message: '活动代码 值不能为空', trigger: 'blur' },
         ],
         transactioncurrencyname: [
-            { type: 'string', message: '货币名称 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '货币名称 值必须为字符串类型', trigger: 'blur' },
-            { required: false, type: 'string', message: '货币名称 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '货币名称 值不能为空', trigger: 'blur' },
+            { type: 'string', message: '货币 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '货币 值必须为字符串类型', trigger: 'blur' },
+            { required: false, type: 'string', message: '货币 值不能为空', trigger: 'change' },
+            { required: false, type: 'string', message: '货币 值不能为空', trigger: 'blur' },
         ],
         typecode: [
-            { type: 'string', message: '市场活动类型 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '市场活动类型 值必须为字符串类型', trigger: 'blur' },
-            { required: false, type: 'string', message: '市场活动类型 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '市场活动类型 值不能为空', trigger: 'blur' },
+            { type: 'string', message: '活动类型 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '活动类型 值必须为字符串类型', trigger: 'blur' },
+            { required: false, type: 'string', message: '活动类型 值不能为空', trigger: 'change' },
+            { required: false, type: 'string', message: '活动类型 值不能为空', trigger: 'blur' },
         ],
         expectedresponse: [
             { type: 'number', message: '预期响应百分比 值必须为数值类型', trigger: 'change' },
@@ -529,11 +529,11 @@ export default class Info_CampaginBase extends Vue implements ControlInterface {
 , 
         campaignname: new FormItemModel({ caption: '活动名称', detailType: 'FORMITEM', name: 'campaignname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
-        codename: new FormItemModel({ caption: '市场活动代码', detailType: 'FORMITEM', name: 'codename', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 1 })
+        codename: new FormItemModel({ caption: '活动代码', detailType: 'FORMITEM', name: 'codename', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 1 })
 , 
-        transactioncurrencyname: new FormItemModel({ caption: '货币名称', detailType: 'FORMITEM', name: 'transactioncurrencyname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
+        transactioncurrencyname: new FormItemModel({ caption: '货币', detailType: 'FORMITEM', name: 'transactioncurrencyname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
-        typecode: new FormItemModel({ caption: '市场活动类型', detailType: 'FORMITEM', name: 'typecode', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
+        typecode: new FormItemModel({ caption: '活动类型', detailType: 'FORMITEM', name: 'typecode', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
         expectedresponse: new FormItemModel({ caption: '预期响应百分比', detailType: 'FORMITEM', name: 'expectedresponse', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 

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

@@ -441,10 +441,10 @@ export default class Info_ScheduleBase extends Vue implements ControlInterface {
             { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
         ],
         proposedstart: [
-            { type: 'string', message: '拟定开始日期 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '拟定开始日期 值必须为字符串类型', trigger: 'blur' },
-            { required: false, type: 'string', message: '拟定开始日期 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '拟定开始日期 值不能为空', trigger: 'blur' },
+            { type: 'string', message: '拟定日期 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '拟定日期 值必须为字符串类型', trigger: 'blur' },
+            { required: false, type: 'string', message: '拟定日期 值不能为空', trigger: 'change' },
+            { required: false, type: 'string', message: '拟定日期 值不能为空', trigger: 'blur' },
         ],
         proposedend: [
             { type: 'string', message: '拟定结束日期 值必须为字符串类型', trigger: 'change' },
@@ -499,7 +499,7 @@ export default class Info_ScheduleBase extends Vue implements ControlInterface {
 , 
         srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
-        proposedstart: new FormItemModel({ caption: '拟定开始日期', detailType: 'FORMITEM', name: 'proposedstart', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
+        proposedstart: new FormItemModel({ caption: '拟定日期', detailType: 'FORMITEM', name: 'proposedstart', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
         proposedend: new FormItemModel({ caption: '拟定结束日期', detailType: 'FORMITEM', name: 'proposedend', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 

app_BusinessCentral/src/widgets/campaign/main-form/main-form-base.vue

@@ -548,22 +548,22 @@ export default class MainBase extends Vue implements ControlInterface {
             { required: true, type: 'string', message: '活动名称 值不能为空', trigger: 'blur' },
         ],
         codename: [
-            { type: 'string', message: '市场活动代码 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '市场活动代码 值必须为字符串类型', trigger: 'blur' },
-            { required: false, type: 'string', message: '市场活动代码 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '市场活动代码 值不能为空', trigger: 'blur' },
+            { type: 'string', message: '活动代码 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '活动代码 值必须为字符串类型', trigger: 'blur' },
+            { required: false, type: 'string', message: '活动代码 值不能为空', trigger: 'change' },
+            { required: false, type: 'string', message: '活动代码 值不能为空', trigger: 'blur' },
         ],
         transactioncurrencyname: [
-            { type: 'string', message: '货币名称 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '货币名称 值必须为字符串类型', trigger: 'blur' },
-            { required: true, type: 'string', message: '货币名称 值不能为空', trigger: 'change' },
-            { required: true, type: 'string', message: '货币名称 值不能为空', trigger: 'blur' },
+            { type: 'string', message: '货币 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '货币 值必须为字符串类型', trigger: 'blur' },
+            { required: true, type: 'string', message: '货币 值不能为空', trigger: 'change' },
+            { required: true, type: 'string', message: '货币 值不能为空', trigger: 'blur' },
         ],
         typecode: [
-            { type: 'string', message: '市场活动类型 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '市场活动类型 值必须为字符串类型', trigger: 'blur' },
-            { required: false, type: 'string', message: '市场活动类型 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '市场活动类型 值不能为空', trigger: 'blur' },
+            { type: 'string', message: '活动类型 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '活动类型 值必须为字符串类型', trigger: 'blur' },
+            { required: false, type: 'string', message: '活动类型 值不能为空', trigger: 'change' },
+            { required: false, type: 'string', message: '活动类型 值不能为空', trigger: 'blur' },
         ],
         expectedresponse: [
             { type: 'number', message: '预期响应百分比 值必须为数值类型', trigger: 'change' },
@@ -642,11 +642,11 @@ export default class MainBase extends Vue implements ControlInterface {
 , 
         campaignname: new FormItemModel({ caption: '活动名称', detailType: 'FORMITEM', name: 'campaignname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
-        codename: new FormItemModel({ caption: '市场活动代码', detailType: 'FORMITEM', name: 'codename', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 1 })
+        codename: new FormItemModel({ caption: '活动代码', detailType: 'FORMITEM', name: 'codename', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 1 })
 , 
-        transactioncurrencyname: new FormItemModel({ caption: '货币名称', detailType: 'FORMITEM', name: 'transactioncurrencyname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
+        transactioncurrencyname: new FormItemModel({ caption: '货币', detailType: 'FORMITEM', name: 'transactioncurrencyname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
-        typecode: new FormItemModel({ caption: '市场活动类型', detailType: 'FORMITEM', name: 'typecode', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
+        typecode: new FormItemModel({ caption: '活动类型', detailType: 'FORMITEM', name: 'typecode', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
         expectedresponse: new FormItemModel({ caption: '预期响应百分比', detailType: 'FORMITEM', name: 'expectedresponse', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 

app_BusinessCentral/src/widgets/campaign/main-grid/main-grid-model.ts

@@ -26,20 +26,35 @@ export default class MainModel {
       ]
     }else{
 		  return [
+        {
+          name: 'template',
+          prop: 'template',
+          dataType: 'YESNO',
+        },
         {
           name: 'campaignname',
           prop: 'campaignname',
           dataType: 'TEXT',
         },
         {
-          name: 'pricelistid',
-          prop: 'pricelistid',
-          dataType: 'PICKUP',
+          name: 'typecode',
+          prop: 'typecode',
+          dataType: 'SSCODELIST',
         },
         {
-          name: 'updateman',
-          prop: 'updateman',
-          dataType: 'TEXT',
+          name: 'transactioncurrencyname',
+          prop: 'currencyname',
+          dataType: 'PICKUPTEXT',
+        },
+        {
+          name: 'createdate',
+          prop: 'createdate',
+          dataType: 'DATETIME',
+        },
+        {
+          name: 'budgetedcost',
+          prop: 'budgetedcost',
+          dataType: 'BIGDECIMAL',
         },
         {
           name: 'transactioncurrencyid',
@@ -47,8 +62,8 @@ export default class MainModel {
           dataType: 'PICKUP',
         },
         {
-          name: 'updatedate',
-          prop: 'updatedate',
+          name: 'proposedstart',
+          prop: 'proposedstart',
           dataType: 'DATETIME',
         },
         {
@@ -57,15 +72,30 @@ export default class MainModel {
           dataType: 'TEXT',
         },
         {
-          name: 'srfdataaccaction',
+          name: 'srfkey',
           prop: 'campaignid',
           dataType: 'GUID',
         },
         {
-          name: 'srfkey',
+          name: 'srfdataaccaction',
           prop: 'campaignid',
           dataType: 'GUID',
         },
+        {
+          name: 'codename',
+          prop: 'codename',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'pricelistid',
+          prop: 'pricelistid',
+          dataType: 'PICKUP',
+        },
+        {
+          name: 'statuscode',
+          prop: 'statuscode',
+          dataType: 'NSCODELIST',
+        },
         {
           name: 'campaign',
           prop: 'campaignid',

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/marketing/domain/Campaign.java

@@ -47,7 +47,7 @@ public class Campaign extends EntityMP implements Serializable {
     @JsonProperty("expectedresponse")
     private Integer expectedresponse;
     /**
-     * 市场活动类型
+     * 活动类型
      */
     @TableField(value = "typecode")
     @JSONField(name = "typecode")
@@ -241,7 +241,7 @@ public class Campaign extends EntityMP implements Serializable {
     @JsonProperty("entityimage")
     private String entityimage;
     /**
-     * 市场活动代码
+     * 活动代码
      */
     @TableField(value = "codename")
     @JSONField(name = "codename")
@@ -351,7 +351,7 @@ public class Campaign extends EntityMP implements Serializable {
     @JsonProperty("overriddencreatedon")
     private Timestamp overriddencreatedon;
     /**
-     * 拟定开始日期
+     * 拟定日期
      */
     @TableField(value = "proposedstart")
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
@@ -395,7 +395,7 @@ public class Campaign extends EntityMP implements Serializable {
     @JsonProperty("transactioncurrencyid")
     private String transactioncurrencyid;
     /**
-     * 货币名称
+     * 货币
      */
     @DEField(name = "transactioncurrencyname")
     @TableField(value = "transactioncurrencyname")
@@ -430,7 +430,7 @@ public class Campaign extends EntityMP implements Serializable {
     }
 
     /**
-     * 设置 [市场活动类型]
+     * 设置 [活动类型]
      */
     public void setTypecode(String typecode){
         this.typecode = typecode ;
@@ -616,7 +616,7 @@ public class Campaign extends EntityMP implements Serializable {
     }
 
     /**
-     * 设置 [市场活动代码]
+     * 设置 [活动代码]
      */
     public void setCodename(String codename){
         this.codename = codename ;
@@ -758,7 +758,7 @@ public class Campaign extends EntityMP implements Serializable {
         return sdf.format(overriddencreatedon);
     }
     /**
-     * 设置 [拟定开始日期]
+     * 设置 [拟定日期]
      */
     public void setProposedstart(Timestamp proposedstart){
         this.proposedstart = proposedstart ;
@@ -766,7 +766,7 @@ public class Campaign extends EntityMP implements Serializable {
     }
 
     /**
-     * 格式化日期 [拟定开始日期]
+     * 格式化日期 [拟定日期]
      */
     public String formatProposedstart(){
         if (this.proposedstart == null) {
@@ -816,7 +816,7 @@ public class Campaign extends EntityMP implements Serializable {
     }
 
     /**
-     * 设置 [货币名称]
+     * 设置 [货币]
      */
     public void setCurrencyname(String currencyname){
         this.currencyname = currencyname ;

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/marketing/filter/CampaignSearchContext.java

@@ -27,7 +27,7 @@ import cn.ibizlab.businesscentral.core.marketing.domain.Campaign;
 @Data
 public class CampaignSearchContext extends QueryWrapperContext<Campaign> {
 
-	private String n_typecode_eq;//[市场活动类型]
+	private String n_typecode_eq;//[活动类型]
 	public void setN_typecode_eq(String n_typecode_eq) {
         this.n_typecode_eq = n_typecode_eq;
         if(!ObjectUtils.isEmpty(this.n_typecode_eq)){
@@ -69,14 +69,14 @@ public class CampaignSearchContext extends QueryWrapperContext<Campaign> {
             this.getSearchCond().eq("transactioncurrencyid", n_transactioncurrencyid_eq);
         }
     }
-	private String n_transactioncurrencyname_eq;//[货币名称]
+	private String n_transactioncurrencyname_eq;//[货币]
 	public void setN_transactioncurrencyname_eq(String n_transactioncurrencyname_eq) {
         this.n_transactioncurrencyname_eq = n_transactioncurrencyname_eq;
         if(!ObjectUtils.isEmpty(this.n_transactioncurrencyname_eq)){
             this.getSearchCond().eq("transactioncurrencyname", n_transactioncurrencyname_eq);
         }
     }
-	private String n_transactioncurrencyname_like;//[货币名称]
+	private String n_transactioncurrencyname_like;//[货币]
 	public void setN_transactioncurrencyname_like(String n_transactioncurrencyname_like) {
         this.n_transactioncurrencyname_like = n_transactioncurrencyname_like;
         if(!ObjectUtils.isEmpty(this.n_transactioncurrencyname_like)){