xignzi006 发布系统代码

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

@@ -249,6 +249,16 @@
         "viewtag": "29bfcd628ab25e297248ff0524d12908",
         "memo": "系统自动添加"
     },
+    "quotesummary": {
+        "title": "报价单数据看板视图",
+        "caption": "报价单",
+        "viewtype": "DEPORTALVIEW",
+        "viewmodule": "Sales",
+        "viewname": "QuoteSummary",
+        "viewfilename": "quote-summary",
+        "viewtag": "2ac0427fe43e02ce2aade11aad712eb5",
+        "memo": ""
+    },
     "contactinfo_book": {
         "title": "联系人编辑视图",
         "caption": "联系人",

app_CRM/src/locale/lanres/entities/quote/quote_en_US.ts

@@ -101,6 +101,10 @@ export default {
 		gridview: {
 			caption: "报价单",
       title: '报价单表格视图',
+		},
+		summary: {
+			caption: "报价单",
+      title: '报价单数据看板视图',
 		},
 		infoabstract: {
 			caption: "报价单",

app_CRM/src/locale/lanres/entities/quote/quote_zh_CN.ts

@@ -100,6 +100,10 @@ export default {
 		gridview: {
 			caption: '报价单',
       title: '报价单表格视图',
+		},
+		summary: {
+			caption: '报价单',
+      title: '报价单数据看板视图',
 		},
 		infoabstract: {
 			caption: '报价单',

app_CRM/src/mock/viewconfig/viewconfig.ts

@@ -207,6 +207,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "AccountPickupView",
             "viewtag": "29bfcd628ab25e297248ff0524d12908"
         },
+        "quotesummary": {
+            "title": "报价单数据看板视图",
+            "caption": "报价单",
+            "viewtype": "DEPORTALVIEW",
+            "viewmodule": "Sales",
+            "viewname": "QuoteSummary",
+            "viewtag": "2ac0427fe43e02ce2aade11aad712eb5"
+        },
         "contactinfo_book": {
             "title": "联系人编辑视图",
             "caption": "联系人",

app_CRM/src/service/account/account-service-base.ts

@@ -92,21 +92,6 @@ export default class AccountServiceBase extends EntityService {
             }
         }
         masterData.contacts = contactsData;
-        let accountsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_accounts'),'undefined')){
-            accountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_accounts') as any);
-            if(accountsData && accountsData.length && accountsData.length > 0){
-                accountsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.accountid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.accounts = accountsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -118,7 +103,6 @@ export default class AccountServiceBase extends EntityService {
         let res:any = await Http.getInstance().post(`/accounts`,data,isloading);
         this.tempStorage.setItem(tempContext.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_contacts',JSON.stringify(res.data.contacts));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_accounts',JSON.stringify(res.data.accounts));
         return res;
     }
 
@@ -163,26 +147,10 @@ export default class AccountServiceBase extends EntityService {
             }
         }
         masterData.contacts = contactsData;
-        let accountsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_accounts'),'undefined')){
-            accountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_accounts') as any);
-            if(accountsData && accountsData.length && accountsData.length > 0){
-                accountsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.accountid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.accounts = accountsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/accounts/${context.account}`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_contacts',JSON.stringify(res.data.contacts));
-            this.tempStorage.setItem(context.srfsessionkey+'_accounts',JSON.stringify(res.data.accounts));
             return res;
     }
 
@@ -241,26 +209,10 @@ export default class AccountServiceBase extends EntityService {
             }
         }
         masterData.contacts = contactsData;
-        let accountsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_accounts'),'undefined')){
-            accountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_accounts') as any);
-            if(accountsData && accountsData.length && accountsData.length > 0){
-                accountsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.accountid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.accounts = accountsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/accounts/${context.account}/save`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_contacts',JSON.stringify(res.data.contacts));
-            this.tempStorage.setItem(context.srfsessionkey+'_accounts',JSON.stringify(res.data.accounts));
             return res;
     }
 
@@ -290,7 +242,6 @@ export default class AccountServiceBase extends EntityService {
             let res:any = await Http.getInstance().get(`/accounts/${context.account}`,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_contacts',JSON.stringify(res.data.contacts));
-            this.tempStorage.setItem(context.srfsessionkey+'_accounts',JSON.stringify(res.data.accounts));
             return res;
 
     }
@@ -309,7 +260,6 @@ export default class AccountServiceBase extends EntityService {
         res.data.account = data.account;
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_contacts',JSON.stringify(res.data.contacts));
-            this.tempStorage.setItem(context.srfsessionkey+'_accounts',JSON.stringify(res.data.accounts));
         return res;
     }
 

app_CRM/src/uiservice/quote/quote-ui-service-base.ts

@@ -80,6 +80,7 @@ export default class QuoteUIServiceBase extends UIService {
      */  
     public initViewMap(){
         this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'quotes'});
+        this.allViewMap.set(':',{viewname:'summary',srfappde:'quotes'});
         this.allViewMap.set(':',{viewname:'infoabstract',srfappde:'quotes'});
         this.allViewMap.set(':',{viewname:'oppquagridview',srfappde:'quotes'});
         this.allViewMap.set(':',{viewname:'optionview',srfappde:'quotes'});

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/domain/Account.java

@@ -1262,6 +1262,7 @@ public class Account extends EntityMP implements Serializable {
     /**
      * 相关客户数量
      */
+    @DEField(defaultValue = "0")
     @TableField(value = "childaccountcount")
     @JSONField(name = "childaccountcount")
     @JsonProperty("childaccountcount")

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

@@ -3708,7 +3708,7 @@
 
 
     <!--输出实体[QUOTE]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-quote-27-46">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-quote-29-46">
         <createTable tableName="QUOTE">
                 <column name="BILLTO_COUNTRY" remarks="" type="VARCHAR(80)">
                 </column>
@@ -4514,7 +4514,7 @@
 
 
     <!--输出实体[ACCOUNT]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-account-314-54">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-account-349-54">
         <createTable tableName="ACCOUNT">
                 <column name="ADDRESS1_PRIMARYCONTACTNAME" remarks="" type="VARCHAR(100)">
                 </column>
@@ -8087,7 +8087,7 @@
 
 
     <!--输出实体[COMPETITOR]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-competitor-34-89">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-competitor-35-89">
         <createTable tableName="COMPETITOR">
                 <column name="ENTITYIMAGE" remarks="" type="VARCHAR(100)">
                 </column>
@@ -11072,19 +11072,19 @@
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="PRICELEVEL" constraintName="DER1N_PRICELEVEL__TRANSACTIONC" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[QUOTE]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-27-226">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-29-226">
        <addForeignKeyConstraint baseColumnNames="CAMPAIGNID" baseTableName="QUOTE" constraintName="DER1N_QUOTE__CAMPAIGN__CAMPAIG" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CAMPAIGNID" referencedTableName="CAMPAIGN" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-27-227">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-29-227">
        <addForeignKeyConstraint baseColumnNames="OPPORTUNITYID" baseTableName="QUOTE" constraintName="DER1N_QUOTE__OPPORTUNITY__OPPO" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="OPPORTUNITYID" referencedTableName="OPPORTUNITY" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-27-228">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-29-228">
        <addForeignKeyConstraint baseColumnNames="PRICELEVELID" baseTableName="QUOTE" constraintName="DER1N_QUOTE__PRICELEVEL__PRICE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRICELEVELID" referencedTableName="PRICELEVEL" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-27-229">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-29-229">
        <addForeignKeyConstraint baseColumnNames="SLAID" baseTableName="QUOTE" constraintName="DER1N_QUOTE__SLA__SLAID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SLAID" referencedTableName="SLA" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-27-230">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-29-230">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="QUOTE" constraintName="DER1N_QUOTE__TRANSACTIONCURREN" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[BULKDELETEOPERATION]外键关系 -->
@@ -11137,31 +11137,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-314-255">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-349-255">
        <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-314-256">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-349-256">
        <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-314-257">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-349-257">
        <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-314-258">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-349-258">
        <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-314-259">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-349-259">
        <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-314-260">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-349-260">
        <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-314-261">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-349-261">
        <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-314-262">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-349-262">
        <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-314-263">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-349-263">
        <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]外键关系 -->
@@ -11421,7 +11421,7 @@
         <!--输出实体[CAMPAIGNLIST]外键关系 -->
         <!--输出实体[LISTCONTACT]外键关系 -->
         <!--输出实体[COMPETITOR]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-competitor-34-346">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-competitor-35-346">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="COMPETITOR" constraintName="DER1N_COMPETITOR__TRANSACTIONC" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[PRODUCT]外键关系 -->