xignzi006 发布系统代码

app_BusinessCentral/public/assets/json/view-config.json

@@ -379,6 +379,16 @@
         "viewtag": "41e012bf9b91b39e4a30072986b7c11e",
         "memo": ""
     },
+    "listaccountinner": {
+        "title": "营销列表-账户表格视图",
+        "caption": "营销列表-账户",
+        "viewtype": "DEGRIDVIEW9",
+        "viewmodule": "Marketing",
+        "viewname": "ListAccountInner",
+        "viewfilename": "list-account-inner",
+        "viewtag": "44a690a1d62a390708480cb43f67d98b",
+        "memo": ""
+    },
     "activitypointergridview": {
         "title": "活动",
         "caption": "活动",
@@ -409,6 +419,16 @@
         "viewtag": "4799b0e7139b537ebe9313a004daa0ac",
         "memo": "系统自动添加"
     },
+    "listaccounteditview": {
+        "title": "营销列表-账户编辑视图",
+        "caption": "营销列表-账户",
+        "viewtype": "DEEDITVIEW",
+        "viewmodule": "Marketing",
+        "viewname": "ListAccountEditView",
+        "viewfilename": "list-account-edit-view",
+        "viewtag": "49dc1a714631338858cd0441f6c720ca",
+        "memo": "系统自动添加"
+    },
     "campaignsummary_head": {
         "title": "市场活动概览",
         "caption": "市场活动概览",

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

@@ -18,9 +18,17 @@ export default {
     statecode: '状态',
   },
 	views: {
+		inner: {
+			caption: "营销列表-账户",
+      title: '营销列表-账户表格视图',
+		},
 		bylist: {
 			caption: "营销列表-账户",
       title: '营销列表-账户表格视图',
+		},
+		editview: {
+			caption: "营销列表-账户",
+      title: '营销列表-账户编辑视图',
 		},
 		quickcreatebylist: {
 			caption: "查找客户",
@@ -46,6 +54,25 @@ export default {
 		uiactions: {
 		},
 	},
+	main_form: {
+		details: {
+			group1: "营销列表-账户基本信息", 
+			formpage1: "基本信息", 
+			group2: "操作信息", 
+			formpage2: "其它", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "关系标识", 
+			srfmajortext: "关系名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			relationshipsid: "关系标识", 
+		},
+		uiactions: {
+		},
+	},
 	main_grid: {
 		columns: {
 			entity2name: "选择客户：",
@@ -101,4 +128,22 @@ export default {
 			tip: "Filter",
 		},
 	},
+	editviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "Save",
+			tip: "Save",
+		},
+		tbitem5: {
+			caption: "Save And Close",
+			tip: "Save And Close Window",
+		},
+		tbitem6: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem12: {
+			caption: "关闭",
+			tip: "关闭",
+		},
+	},
 };
\ No newline at end of file

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

@@ -17,9 +17,17 @@ export default {
     statecode: '状态',
   },
 	views: {
+		inner: {
+			caption: '营销列表-账户',
+      title: '营销列表-账户表格视图',
+		},
 		bylist: {
 			caption: '营销列表-账户',
       title: '营销列表-账户表格视图',
+		},
+		editview: {
+			caption: '营销列表-账户',
+      title: '营销列表-账户编辑视图',
 		},
 		quickcreatebylist: {
 			caption: '查找客户',
@@ -45,6 +53,25 @@ export default {
 		uiactions: {
 		},
 	},
+	main_form: {
+		details: {
+			group1: '营销列表-账户基本信息', 
+			formpage1: '基本信息', 
+			group2: '操作信息', 
+			formpage2: '其它', 
+			srfupdatedate: '更新时间', 
+			srforikey: '', 
+			srfkey: '关系标识', 
+			srfmajortext: '关系名称', 
+			srftempmode: '', 
+			srfuf: '', 
+			srfdeid: '', 
+			srfsourcekey: '', 
+			relationshipsid: '关系标识', 
+		},
+		uiactions: {
+		},
+	},
 	main_grid: {
 		columns: {
 			entity2name: '选择客户：',
@@ -100,4 +127,22 @@ export default {
 			tip: '过滤',
 		},
 	},
+	editviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: '保存',
+			tip: '保存',
+		},
+		tbitem5: {
+			caption: '保存并关闭',
+			tip: '保存并关闭',
+		},
+		tbitem6: {
+			caption: '-',
+			tip: '',
+		},
+		tbitem12: {
+			caption: '关闭',
+			tip: '关闭',
+		},
+	},
 };
\ No newline at end of file

app_BusinessCentral/src/mock/viewconfig/viewconfig.ts

@@ -311,6 +311,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "ProductInfo_ProInfo",
             "viewtag": "41e012bf9b91b39e4a30072986b7c11e"
         },
+        "listaccountinner": {
+            "title": "营销列表-账户表格视图",
+            "caption": "营销列表-账户",
+            "viewtype": "DEGRIDVIEW9",
+            "viewmodule": "Marketing",
+            "viewname": "ListAccountInner",
+            "viewtag": "44a690a1d62a390708480cb43f67d98b"
+        },
         "activitypointergridview": {
             "title": "活动",
             "caption": "活动",
@@ -335,6 +343,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "ListAccountByList",
             "viewtag": "4799b0e7139b537ebe9313a004daa0ac"
         },
+        "listaccounteditview": {
+            "title": "营销列表-账户编辑视图",
+            "caption": "营销列表-账户",
+            "viewtype": "DEEDITVIEW",
+            "viewmodule": "Marketing",
+            "viewname": "ListAccountEditView",
+            "viewtag": "49dc1a714631338858cd0441f6c720ca"
+        },
         "campaignsummary_head": {
             "title": "市场活动概览",
             "caption": "市场活动概览",

app_BusinessCentral/src/pages/base/account-info-all/account-info-all-base.vue

@@ -4,7 +4,7 @@
                 :viewState="viewState"  
                 :viewparams="viewparams" 
                 :context="context" 
-                :autosave="false" 
+                :autosave="true" 
                 :viewtag="viewtag"
                 :showBusyIndicator="true"
                 updateAction="Update"

app_BusinessCentral/src/uiservice/list-account/list-account-ui-service-base.ts

@@ -79,7 +79,9 @@ export default class ListAccountUIServiceBase extends UIService {
      * @memberof  ListAccountUIServiceBase
      */  
     public initViewMap(){
+        this.allViewMap.set(':',{viewname:'inner',srfappde:'listaccounts'});
         this.allViewMap.set(':',{viewname:'bylist',srfappde:'listaccounts'});
+        this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'listaccounts'});
         this.allViewMap.set(':',{viewname:'quickcreatebylist',srfappde:'listaccounts'});
     }
 

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

@@ -104,7 +104,7 @@
 
 </i-col>
 <i-col v-show="detailsModel.grouppanel1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.account.info_all_form.details.grouppanel1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="2" :isInfoGroupMode="true" :iconInfo="{'iconclass':'fa fa-map-marker'}">    
+    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.account.info_all_form.details.grouppanel1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="1" :isInfoGroupMode="true" :iconInfo="{'iconclass':'fa fa-map-marker'}">    
     <row>
         <i-col v-show="detailsModel.address1_addressid.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='address1_addressid' :itemRules="this.rules.address1_addressid" class='' :caption="$t('entities.account.info_all_form.details.address1_addressid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.address1_addressid.error" :isEmptyCaption="false" labelPos="LEFT">
@@ -189,7 +189,7 @@
 
 </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'}">    
+    <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="1" :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">

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

@@ -4514,7 +4514,7 @@
 
 
     <!--输出实体[ACCOUNT]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-account-286-54">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-account-290-54">
         <createTable tableName="ACCOUNT">
                 <column name="ADDRESS1_PRIMARYCONTACTNAME" remarks="" type="VARCHAR(100)">
                 </column>
@@ -9840,7 +9840,7 @@
 
 
     <!--输出实体[LIST]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-list-60-110">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-list-61-110">
         <createTable tableName="LIST">
                 <column name="OWNERIDTYPE" remarks="" type="VARCHAR(100)">
                 </column>
@@ -11129,31 +11129,31 @@
        <addForeignKeyConstraint baseColumnNames="METRICID" baseTableName="GOAL" constraintName="DER1N_GOAL__METRIC__METRICID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="METRICID" referencedTableName="METRIC" validate="true"/>
     </changeSet>
         <!--输出实体[ACCOUNT]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-286-253">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-290-253">
        <addForeignKeyConstraint baseColumnNames="PARENTACCOUNTID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__ACCOUNT__PARENT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ACCOUNTID" referencedTableName="ACCOUNT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-286-254">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-290-254">
        <addForeignKeyConstraint baseColumnNames="PRIMARYCONTACTID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__CONTACT__PRIMAR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONTACTID" referencedTableName="CONTACT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-286-255">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-290-255">
        <addForeignKeyConstraint baseColumnNames="PREFERREDEQUIPMENTID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__EQUIPMENT__PREF" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EQUIPMENTID" referencedTableName="EQUIPMENT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-286-256">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-290-256">
        <addForeignKeyConstraint baseColumnNames="ORIGINATINGLEADID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__LEAD__ORIGINATI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="LEADID" referencedTableName="LEAD" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-286-257">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-290-257">
        <addForeignKeyConstraint baseColumnNames="DEFAULTPRICELEVELID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__PRICELEVEL__DEF" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRICELEVELID" referencedTableName="PRICELEVEL" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-286-258">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-290-258">
        <addForeignKeyConstraint baseColumnNames="PREFERREDSERVICEID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__SERVICE__PREFER" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SERVICEID" referencedTableName="SERVICE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-286-259">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-290-259">
        <addForeignKeyConstraint baseColumnNames="SLAID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__SLA__SLAID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SLAID" referencedTableName="SLA" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-286-260">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-290-260">
        <addForeignKeyConstraint baseColumnNames="TERRITORYID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__TERRITORY__TERR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TERRITORYID" referencedTableName="TERRITORY" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-286-261">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-290-261">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__TRANSACTIONCURR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[KNOWLEDGEARTICLEVIEWS]外键关系 -->
@@ -11572,7 +11572,7 @@
         <!--输出实体[POST]外键关系 -->
         <!--输出实体[CONTRACTTEMPLATE]外键关系 -->
         <!--输出实体[LIST]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-list-60-394">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-list-61-394">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="LIST" constraintName="DER1N_LIST__TRANSACTIONCURRENC" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[KNOWLEDGEBASERECORD]外键关系 -->