xignzi006 发布系统代码

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

@@ -1209,6 +1209,16 @@
         "viewtag": "7b7560b6d508b7bb0447d3204ed1c8be",
         "memo": ""
     },
+    "quotebyparentkey": {
+        "title": "报价单信息",
+        "caption": "报价单",
+        "viewtype": "DEGRIDVIEW",
+        "viewmodule": "Sales",
+        "viewname": "QuoteByParentKey",
+        "viewfilename": "quote-by-parent-key",
+        "viewtag": "7b8b062c86b8e62d907ccbd467bb7ac6",
+        "memo": "系统自动添加"
+    },
     "opportunityeditview": {
         "title": "商机编辑视图",
         "caption": "商机",
@@ -1729,6 +1739,16 @@
         "viewtag": "a69ba7dd2f8bdac8a3c733dcc79c0ee5",
         "memo": ""
     },
+    "salesorderbyparentkey": {
+        "title": "订单信息",
+        "caption": "订单",
+        "viewtype": "DEGRIDVIEW",
+        "viewmodule": "Sales",
+        "viewname": "SalesOrderByParentKey",
+        "viewfilename": "sales-order-by-parent-key",
+        "viewtag": "a949aac338fd2543ae39e258573ab231",
+        "memo": "系统自动添加"
+    },
     "phonecalleditview": {
         "title": "电话联络编辑视图",
         "caption": "电话联络",

app_CRM/src/locale/lanres/entities/quote-detail/quote-detail_en_US.ts

@@ -118,44 +118,6 @@ export default {
 		uiactions: {
 		},
 	},
-	editviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "Save",
-			tip: "Save",
-		},
-		tbitem4: {
-			caption: "Save And New",
-			tip: "Save And New",
-		},
-		tbitem5: {
-			caption: "Save And Close",
-			tip: "Save And Close Window",
-		},
-		tbitem6: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem7: {
-			caption: "Remove And Close",
-			tip: "Remove And Close Window",
-		},
-		tbitem8: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem12: {
-			caption: "New",
-			tip: "New",
-		},
-		tbitem13: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem14: {
-			caption: "Copy",
-			tip: "Copy {0}",
-		},
-	},
 	quodetailgridviewtoolbar_toolbar: {
 		deuiaction1: {
 			caption: "New",
@@ -194,4 +156,42 @@ export default {
 			tip: "Filter",
 		},
 	},
+	editviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "Save",
+			tip: "Save",
+		},
+		tbitem4: {
+			caption: "Save And New",
+			tip: "Save And New",
+		},
+		tbitem5: {
+			caption: "Save And Close",
+			tip: "Save And Close Window",
+		},
+		tbitem6: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem7: {
+			caption: "Remove And Close",
+			tip: "Remove And Close Window",
+		},
+		tbitem8: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem12: {
+			caption: "New",
+			tip: "New",
+		},
+		tbitem13: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem14: {
+			caption: "Copy",
+			tip: "Copy {0}",
+		},
+	},
 };
\ No newline at end of file

app_CRM/src/locale/lanres/entities/quote-detail/quote-detail_zh_CN.ts

@@ -117,44 +117,6 @@ export default {
 		uiactions: {
 		},
 	},
-	editviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "保存",
-			tip: "保存",
-		},
-		tbitem4: {
-			caption: "保存并新建",
-			tip: "保存并新建",
-		},
-		tbitem5: {
-			caption: "保存并关闭",
-			tip: "保存并关闭",
-		},
-		tbitem6: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem7: {
-			caption: "删除并关闭",
-			tip: "删除并关闭",
-		},
-		tbitem8: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem12: {
-			caption: "新建",
-			tip: "新建",
-		},
-		tbitem13: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem14: {
-			caption: "拷贝",
-			tip: "拷贝",
-		},
-	},
 	quodetailgridviewtoolbar_toolbar: {
 		deuiaction1: {
 			caption: "新建",
@@ -193,4 +155,42 @@ export default {
 			tip: "过滤",
 		},
 	},
+	editviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "保存",
+			tip: "保存",
+		},
+		tbitem4: {
+			caption: "保存并新建",
+			tip: "保存并新建",
+		},
+		tbitem5: {
+			caption: "保存并关闭",
+			tip: "保存并关闭",
+		},
+		tbitem6: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem7: {
+			caption: "删除并关闭",
+			tip: "删除并关闭",
+		},
+		tbitem8: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem12: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem13: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem14: {
+			caption: "拷贝",
+			tip: "拷贝",
+		},
+	},
 };
\ No newline at end of file

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

@@ -114,6 +114,10 @@ export default {
 			caption: "报价单",
       		title: "报价单表格视图",
 		},
+		byparentkey: {
+			caption: "报价单",
+      		title: "报价单信息",
+		},
 		optionview: {
 			caption: "报价单",
       		title: "报价单选项操作视图",
@@ -361,6 +365,48 @@ export default {
 			tip: "关闭",
 		},
 	},
+	byparentkeytoolbar_toolbar: {
+		tbitem1_openquickcreateview: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem2: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem4: {
+			caption: "Edit",
+			tip: "Edit {0}",
+		},
+		tbitem6: {
+			caption: "Copy",
+			tip: "Copy {0}",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "Remove",
+			tip: "Remove {0}",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem13: {
+			caption: "Export",
+			tip: "Export {0} Data To Excel",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem19: {
+			caption: "Filter",
+			tip: "Filter",
+		},
+	},
 	gridviewtoolbar_toolbar: {
 		tbitem1_openquickcreateview: {
 			caption: "新建",

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

@@ -113,6 +113,10 @@ export default {
 			caption: "报价单",
       		title: "报价单表格视图",
 		},
+		byparentkey: {
+			caption: "报价单",
+      		title: "报价单信息",
+		},
 		optionview: {
 			caption: "报价单",
       		title: "报价单选项操作视图",
@@ -360,6 +364,48 @@ export default {
 			tip: "关闭",
 		},
 	},
+	byparentkeytoolbar_toolbar: {
+		tbitem1_openquickcreateview: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem2: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem4: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		tbitem6: {
+			caption: "拷贝",
+			tip: "拷贝",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "删除",
+			tip: "删除",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem13: {
+			caption: "导出",
+			tip: "导出",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem19: {
+			caption: "过滤",
+			tip: "过滤",
+		},
+	},
 	gridviewtoolbar_toolbar: {
 		tbitem1_openquickcreateview: {
 			caption: "新建",

app_CRM/src/locale/lanres/entities/sales-order/sales-order_en_US.ts

@@ -117,6 +117,10 @@ export default {
 			caption: "订单",
       		title: "订单数据看板视图",
 		},
+		byparentkey: {
+			caption: "订单",
+      		title: "订单信息",
+		},
 		pickupgridview: {
 			caption: "订单",
       		title: "订单选择表格视图",
@@ -300,7 +304,7 @@ export default {
 			tip: "关闭",
 		},
 	},
-	gridviewtoolbar_toolbar: {
+	byparentkeytoolbar_toolbar: {
 		tbitem1_openquickcreateview: {
 			caption: "新建",
 			tip: "新建",
@@ -380,4 +384,46 @@ export default {
 			tip: "Copy {0}",
 		},
 	},
+	gridviewtoolbar_toolbar: {
+		tbitem1_openquickcreateview: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem2: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem4: {
+			caption: "Edit",
+			tip: "Edit {0}",
+		},
+		tbitem6: {
+			caption: "Copy",
+			tip: "Copy {0}",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "Remove",
+			tip: "Remove {0}",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem13: {
+			caption: "Export",
+			tip: "Export {0} Data To Excel",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem19: {
+			caption: "Filter",
+			tip: "Filter",
+		},
+	},
 };
\ No newline at end of file

app_CRM/src/locale/lanres/entities/sales-order/sales-order_zh_CN.ts

@@ -116,6 +116,10 @@ export default {
 			caption: "订单",
       		title: "订单数据看板视图",
 		},
+		byparentkey: {
+			caption: "订单",
+      		title: "订单信息",
+		},
 		pickupgridview: {
 			caption: "订单",
       		title: "订单选择表格视图",
@@ -299,7 +303,7 @@ export default {
 			tip: "关闭",
 		},
 	},
-	gridviewtoolbar_toolbar: {
+	byparentkeytoolbar_toolbar: {
 		tbitem1_openquickcreateview: {
 			caption: "新建",
 			tip: "新建",
@@ -379,4 +383,46 @@ export default {
 			tip: "拷贝",
 		},
 	},
+	gridviewtoolbar_toolbar: {
+		tbitem1_openquickcreateview: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem2: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem4: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		tbitem6: {
+			caption: "拷贝",
+			tip: "拷贝",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "删除",
+			tip: "删除",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem13: {
+			caption: "导出",
+			tip: "导出",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem19: {
+			caption: "过滤",
+			tip: "过滤",
+		},
+	},
 };
\ No newline at end of file

app_CRM/src/mock/entity/sales-orders/sales-orders.ts

@@ -385,6 +385,50 @@ mock.onPost(new RegExp(/^\/salesorders\/?([a-zA-Z0-9\-\;]{0,35})\/save$/)).reply
     return [status, data];
 });
     
+// FetchByParentKey
+mock.onGet(new RegExp(/^\/salesorders\/fetchbyparentkey$/)).reply((config: any) => {
+    console.groupCollapsed("实体:salesorder 方法: FetchByParentKey");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(mockDatas);
+    console.groupEnd();
+    console.groupEnd();
+    return [status, mockDatas ? mockDatas : []];
+});
+
+// FetchByParentKey
+mock.onGet(new RegExp(/^\/salesorders\/fetchbyparentkey(\?[\w-./?%&=,]*)*$/)).reply((config: any) => {
+    console.groupCollapsed("实体:salesorder 方法: FetchByParentKey");
+    console.table({url:config.url, method: config.method, data:config.data});
+    if(config.url.includes('page')){
+        let url = config.url.split('?')[1];
+        let params  =  qs.parse(url);
+        Object.assign(config, params);
+    }
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }
+    let total = mockDatas.length;
+    let records: Array<any> = [];
+    if(!config.page || !config.size){
+        records = mockDatas;
+    }else{
+        if((config.page-1)*config.size < total){
+          records = mockDatas.slice(config.page,config.size);
+        }
+    }
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(records ?  records : []);
+    console.groupEnd();
+    console.groupEnd();
+    return [status, records ?  records : []];
+});
+    
 // FetchDefault
 mock.onGet(new RegExp(/^\/salesorders\/fetchdefault$/)).reply((config: any) => {
     console.groupCollapsed("实体:salesorder 方法: FetchDefault");

app_CRM/src/mock/viewconfig/viewconfig.ts

@@ -975,6 +975,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "CampaignResponseQuickCreate",
             "viewtag": "7b7560b6d508b7bb0447d3204ed1c8be"
         },
+        "quotebyparentkey": {
+            "title": "报价单信息",
+            "caption": "报价单",
+            "viewtype": "DEGRIDVIEW",
+            "viewmodule": "Sales",
+            "viewname": "QuoteByParentKey",
+            "viewtag": "7b8b062c86b8e62d907ccbd467bb7ac6"
+        },
         "opportunityeditview": {
             "title": "商机编辑视图",
             "caption": "商机",
@@ -1391,6 +1399,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "AccountQuickCreate",
             "viewtag": "a69ba7dd2f8bdac8a3c733dcc79c0ee5"
         },
+        "salesorderbyparentkey": {
+            "title": "订单信息",
+            "caption": "订单",
+            "viewtype": "DEGRIDVIEW",
+            "viewmodule": "Sales",
+            "viewname": "SalesOrderByParentKey",
+            "viewtag": "a949aac338fd2543ae39e258573ab231"
+        },
         "phonecalleditview": {
             "title": "电话联络编辑视图",
             "caption": "电话联络",

app_CRM/src/pages/sales/quote-by-parent-key/quote-by-parent-key.html

+<studio-view-style2 viewName="quotebyparentkey" viewTitle="报价单信息" class='degridview quote-by-parent-key'>
+    <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" search @on-search="onSearch($event)"/>
+    <template slot="toolbar">
+                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>
+    <template slot="searchForm">
+                <view_searchform 
+            :viewState="viewState"  
+            :viewparams="viewparams" 
+            :context="context" 
+            :showBusyIndicator="true"
+            v-show="isExpandSearchForm"
+            loaddraftAction="FilterGetDraft"
+            loadAction="FilterGet"
+        
+            name="searchform"  
+            ref='searchform' 
+            @save="searchform_save($event)"  
+            @search="searchform_search($event)"  
+            @load="searchform_load($event)"  
+            @closeview="closeView($event)">
+        </view_searchform>
+    </template>
+    <view_grid 
+        :viewState="viewState"  
+        :viewparams="viewparams" 
+        :context="context" 
+        :isSingleSelect="isGridSingleSelect"
+        :showBusyIndicator="true"
+        :isOpenEdit="false"
+        :gridRowActiveMode="gridRowActiveMode"
+        @save="onSave"
+        updateAction=""
+        removeAction="Remove"
+        loaddraftAction=""
+        loadAction=""
+        createAction=""
+        fetchAction="FetchByParentKey"
+        :newdata="newdata"
+        :opendata="opendata"
+        name="grid"  
+        ref='grid' 
+        @selectionchange="grid_selectionchange($event)"  
+        @beforeload="grid_beforeload($event)"  
+        @rowdblclick="grid_rowdblclick($event)"  
+        @remove="grid_remove($event)"  
+        @load="grid_load($event)"  
+        @closeview="closeView($event)">
+    </view_grid>
+</studio-view-style2>
\ No newline at end of file

app_CRM/src/pages/sales/quote-by-parent-key/quote-by-parent-key.vue

+<template src="./quote-by-parent-key.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { QuoteByParentKeyBase } from './quote-by-parent-key-base';
+import view_grid from '@widgets/quote/main-grid/main-grid.vue';
+import view_searchform from '@widgets/quote/default-searchform/default-searchform.vue';
+
+/**
+ * 报价单信息视图
+ *
+ * @export
+ * @class QuoteByParentKey
+ * @extends {QuoteByParentKeyBase}
+ */
+@Component({
+    components: {
+        view_grid, 
+        view_searchform, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class QuoteByParentKey extends QuoteByParentKeyBase { }
+</script>

app_CRM/src/pages/sales/quote-grid-view/quote-grid-view.html

 <studio-view-style2 viewName="quotegridview" viewTitle="报价单信息" class='degridview quote-grid-view'>
-    <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
-    </template>
     <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" search @on-search="onSearch($event)"/>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>

app_CRM/src/pages/sales/sales-order-by-parent-key/sales-order-by-parent-key.html

+<studio-view-style2 viewName="salesorderbyparentkey" viewTitle="订单信息" class='degridview sales-order-by-parent-key'>
+    <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" search @on-search="onSearch($event)"/>
+    <template slot="toolbar">
+                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>
+    <template slot="searchForm">
+                <view_searchform 
+            :viewState="viewState"  
+            :viewparams="viewparams" 
+            :context="context" 
+            :showBusyIndicator="true"
+            v-show="isExpandSearchForm"
+            loaddraftAction="FilterGetDraft"
+            loadAction="FilterGet"
+        
+            name="searchform"  
+            ref='searchform' 
+            @save="searchform_save($event)"  
+            @search="searchform_search($event)"  
+            @load="searchform_load($event)"  
+            @closeview="closeView($event)">
+        </view_searchform>
+    </template>
+    <view_grid 
+        :viewState="viewState"  
+        :viewparams="viewparams" 
+        :context="context" 
+        :isSingleSelect="isGridSingleSelect"
+        :showBusyIndicator="true"
+        :isOpenEdit="false"
+        :gridRowActiveMode="gridRowActiveMode"
+        @save="onSave"
+        updateAction=""
+        removeAction="Remove"
+        loaddraftAction=""
+        loadAction=""
+        createAction=""
+        fetchAction="FetchByParentKey"
+        :newdata="newdata"
+        :opendata="opendata"
+        name="grid"  
+        ref='grid' 
+        @selectionchange="grid_selectionchange($event)"  
+        @beforeload="grid_beforeload($event)"  
+        @rowdblclick="grid_rowdblclick($event)"  
+        @remove="grid_remove($event)"  
+        @load="grid_load($event)"  
+        @closeview="closeView($event)">
+    </view_grid>
+</studio-view-style2>
\ No newline at end of file

app_CRM/src/pages/sales/sales-order-by-parent-key/sales-order-by-parent-key.vue

+<template src="./sales-order-by-parent-key.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { SalesOrderByParentKeyBase } from './sales-order-by-parent-key-base';
+import view_grid from '@widgets/sales-order/main-grid/main-grid.vue';
+import view_searchform from '@widgets/sales-order/default-searchform/default-searchform.vue';
+
+/**
+ * 订单信息视图
+ *
+ * @export
+ * @class SalesOrderByParentKey
+ * @extends {SalesOrderByParentKeyBase}
+ */
+@Component({
+    components: {
+        view_grid, 
+        view_searchform, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class SalesOrderByParentKey extends SalesOrderByParentKeyBase { }
+</script>

app_CRM/src/pages/ungroup/central/page-register.ts

@@ -64,6 +64,7 @@ export const PageComponents = {
         Vue.component('sales-order-grid-view', () => import('@pages/sales/sales-order-grid-view/sales-order-grid-view.vue'));
         Vue.component('campaign-activity-edit-view', () => import('@pages/marketing/campaign-activity-edit-view/campaign-activity-edit-view.vue'));
         Vue.component('contact-quick-create', () => import('@pages/base/contact-quick-create/contact-quick-create.vue'));
+        Vue.component('quote-by-parent-key', () => import('@pages/sales/quote-by-parent-key/quote-by-parent-key.vue'));
         Vue.component('competitor-info-abstract', () => import('@pages/sales/competitor-info-abstract/competitor-info-abstract.vue'));
         Vue.component('metric-pickup-view', () => import('@pages/base/metric-pickup-view/metric-pickup-view.vue'));
         Vue.component('metric-edit-view', () => import('@pages/base/metric-edit-view/metric-edit-view.vue'));
@@ -144,6 +145,7 @@ export const PageComponents = {
         Vue.component('competitor-info', () => import('@pages/sales/competitor-info/competitor-info.vue'));
         Vue.component('lead-excluded-grid-view', () => import('@pages/sales/lead-excluded-grid-view/lead-excluded-grid-view.vue'));
         Vue.component('account-pickup-grid-view', () => import('@pages/base/account-pickup-grid-view/account-pickup-grid-view.vue'));
+        Vue.component('sales-order-by-parent-key', () => import('@pages/sales/sales-order-by-parent-key/sales-order-by-parent-key.vue'));
         Vue.component('lead-on-grid-view', () => import('@pages/sales/lead-on-grid-view/lead-on-grid-view.vue'));
         Vue.component('lead-info', () => import('@pages/sales/lead-info/lead-info.vue'));
         Vue.component('product-pickup-grid-view', () => import('@pages/product/product-pickup-grid-view/product-pickup-grid-view.vue'));

app_CRM/src/pages/ungroup/central/router.ts

@@ -1886,6 +1886,84 @@ const router = new Router({
                     },
                     component: () => import('@pages/base/contact-quick-create/contact-quick-create.vue'),
                 },
+                {
+                    path: 'accounts/:account?/contacts/:contact?/opportunities/:opportunity?/quotes/:quote?/byparentkey/:byparentkey?',
+                    meta: {
+                        caption: 'entities.quote.views.byparentkey.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'central', parameterName: 'central' },
+                            { pathName: 'accounts', parameterName: 'account' },
+                            { pathName: 'contacts', parameterName: 'contact' },
+                            { pathName: 'opportunities', parameterName: 'opportunity' },
+                            { pathName: 'quotes', parameterName: 'quote' },
+                            { pathName: 'byparentkey', parameterName: 'byparentkey' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/sales/quote-by-parent-key/quote-by-parent-key.vue'),
+                },
+                {
+                    path: 'contacts/:contact?/opportunities/:opportunity?/quotes/:quote?/byparentkey/:byparentkey?',
+                    meta: {
+                        caption: 'entities.quote.views.byparentkey.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'central', parameterName: 'central' },
+                            { pathName: 'contacts', parameterName: 'contact' },
+                            { pathName: 'opportunities', parameterName: 'opportunity' },
+                            { pathName: 'quotes', parameterName: 'quote' },
+                            { pathName: 'byparentkey', parameterName: 'byparentkey' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/sales/quote-by-parent-key/quote-by-parent-key.vue'),
+                },
+                {
+                    path: 'accounts/:account?/opportunities/:opportunity?/quotes/:quote?/byparentkey/:byparentkey?',
+                    meta: {
+                        caption: 'entities.quote.views.byparentkey.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'central', parameterName: 'central' },
+                            { pathName: 'accounts', parameterName: 'account' },
+                            { pathName: 'opportunities', parameterName: 'opportunity' },
+                            { pathName: 'quotes', parameterName: 'quote' },
+                            { pathName: 'byparentkey', parameterName: 'byparentkey' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/sales/quote-by-parent-key/quote-by-parent-key.vue'),
+                },
+                {
+                    path: 'opportunities/:opportunity?/quotes/:quote?/byparentkey/:byparentkey?',
+                    meta: {
+                        caption: 'entities.quote.views.byparentkey.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'central', parameterName: 'central' },
+                            { pathName: 'opportunities', parameterName: 'opportunity' },
+                            { pathName: 'quotes', parameterName: 'quote' },
+                            { pathName: 'byparentkey', parameterName: 'byparentkey' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/sales/quote-by-parent-key/quote-by-parent-key.vue'),
+                },
+                {
+                    path: 'quotes/:quote?/byparentkey/:byparentkey?',
+                    meta: {
+                        caption: 'entities.quote.views.byparentkey.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'central', parameterName: 'central' },
+                            { pathName: 'quotes', parameterName: 'quote' },
+                            { pathName: 'byparentkey', parameterName: 'byparentkey' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/sales/quote-by-parent-key/quote-by-parent-key.vue'),
+                },
                 {
                     path: 'competitors/:competitor?/info_abstract/:info_abstract?',
                     meta: {
@@ -4482,6 +4560,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/base/account-pickup-grid-view/account-pickup-grid-view.vue'),
                 },
+                {
+                    path: 'salesorders/:salesorder?/byparentkey/:byparentkey?',
+                    meta: {
+                        caption: 'entities.salesorder.views.byparentkey.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'central', parameterName: 'central' },
+                            { pathName: 'salesorders', parameterName: 'salesorder' },
+                            { pathName: 'byparentkey', parameterName: 'byparentkey' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/sales/sales-order-by-parent-key/sales-order-by-parent-key.vue'),
+                },
                 {
                     path: 'accounts/:account?/contacts/:contact?/leads/:lead?/ongridview/:ongridview?',
                     meta: {

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

@@ -1063,6 +1063,36 @@ export default class QuoteServiceBase extends EntityService {
             return Http.getInstance().post(`/quotes/${context.quote}/win`,data,isloading);
     }
 
+    /**
+     * FetchByParentKey接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof QuoteServiceBase
+     */
+    public async FetchByParentKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.account && context.contact && context.opportunity && true){
+            let tempData:any = JSON.parse(JSON.stringify(data));
+            return Http.getInstance().get(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/fetchbyparentkey`,tempData,isloading);
+        }
+        if(context.contact && context.opportunity && true){
+            let tempData:any = JSON.parse(JSON.stringify(data));
+            return Http.getInstance().get(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/fetchbyparentkey`,tempData,isloading);
+        }
+        if(context.account && context.opportunity && true){
+            let tempData:any = JSON.parse(JSON.stringify(data));
+            return Http.getInstance().get(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/fetchbyparentkey`,tempData,isloading);
+        }
+        if(context.opportunity && true){
+            let tempData:any = JSON.parse(JSON.stringify(data));
+            return Http.getInstance().get(`/opportunities/${context.opportunity}/quotes/fetchbyparentkey`,tempData,isloading);
+        }
+        let tempData:any = JSON.parse(JSON.stringify(data));
+        return Http.getInstance().get(`/quotes/fetchbyparentkey`,tempData,isloading);
+    }
+
     /**
      * FetchDefault接口方法
      *

app_CRM/src/service/sales-order/sales-order-service-base.ts

@@ -250,6 +250,20 @@ export default class SalesOrderServiceBase extends EntityService {
             return res;
     }
 
+    /**
+     * FetchByParentKey接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof SalesOrderServiceBase
+     */
+    public async FetchByParentKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let tempData:any = JSON.parse(JSON.stringify(data));
+        return Http.getInstance().get(`/salesorders/fetchbyparentkey`,tempData,isloading);
+    }
+
     /**
      * FetchDefault接口方法
      *

app_CRM/src/store/modules/view-action/state.ts

@@ -460,14 +460,14 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
+                'a949aac338fd2543ae39e258573ab231',
                 '15d12c1173fcb6e742b6a6d92cbc53ed',
                 '0326a502bb574cddc41da4323786dcb5',
                 '08e0772f0c42c435525ed40425ae4661',
                 '26e0707950d8676b9a9363c6bc46ee89',
                 '5f8f689d5dccc3db6d2b74a24a8b24ef',
-                'dfc0051ae4813115e03f3d095f8cd7d3',
+                '7b8b062c86b8e62d907ccbd467bb7ac6',
                 'bae77557d2f7a7852b634dc5d5a93435',
-                '78862ad65295f145e7520291f1183604',
                 '016e75bb460270519a0ee9dda57b2c90',
             ],
         },
@@ -1078,6 +1078,17 @@ export const viewstate: any = {
             refviews: [
             ],
         },
+        {
+            viewtag: '7b8b062c86b8e62d907ccbd467bb7ac6',
+            viewmodule: 'Sales',
+            viewname: 'QuoteByParentKey',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                'bf670ca93d5a63c4feba5a3cc3de7a9c',
+                '9a8f1a5129b4191c2dfb20b23aeb4c7a',
+            ],
+        },
         {
             viewtag: '7bf35293fd1d9db7816755a74c4d575e',
             viewmodule: 'Sales',
@@ -1504,6 +1515,17 @@ export const viewstate: any = {
                 '29bfcd628ab25e297248ff0524d12908',
             ],
         },
+        {
+            viewtag: 'a949aac338fd2543ae39e258573ab231',
+            viewmodule: 'Sales',
+            viewname: 'SalesOrderByParentKey',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                '4f45c8798db273fefeef7c02541fab6c',
+                'e9c822edbc51531e713b561101e783a6',
+            ],
+        },
         {
             viewtag: 'a95d7d9111bc13a8b73a11ee1e4ff92a',
             viewmodule: 'Base',

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

@@ -83,6 +83,7 @@ export default class QuoteUIServiceBase extends UIService {
         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:'byparentkey',srfappde:'quotes'});
         this.allViewMap.set(':',{viewname:'optionview',srfappde:'quotes'});
         this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'quotes'});
         this.allViewMap.set(':',{viewname:'info',srfappde:'quotes'});

app_CRM/src/uiservice/sales-order/sales-order-ui-service-base.ts

@@ -82,6 +82,7 @@ export default class SalesOrderUIServiceBase extends UIService {
         this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'salesorders'});
         this.allViewMap.set(':',{viewname:'infoview',srfappde:'salesorders'});
         this.allViewMap.set(':',{viewname:'summaryview',srfappde:'salesorders'});
+        this.allViewMap.set(':',{viewname:'byparentkey',srfappde:'salesorders'});
         this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'salesorders'});
         this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'salesorders'});
         this.allViewMap.set(':',{viewname:'info_soview',srfappde:'salesorders'});

app_CRM/src/widgets/account/infotabviewpanel8-tabviewpanel/infotabviewpanel8-tabviewpanel.html

 <div class='tabviewpanel' v-if='isActivied'>
-        <quote-opp-qua-grid-view 
+        <quote-by-parent-key 
         class='viewcontainer2' 
         :viewdata="viewdata" 
         :viewparam="viewparam"

app_CRM/src/widgets/account/infotabviewpanel9-tabviewpanel/infotabviewpanel9-tabviewpanel.html

 <div class='tabviewpanel' v-if='isActivied'>
-        <sales-order-grid-view 
+        <sales-order-by-parent-key 
         class='viewcontainer2' 
         :viewdata="viewdata" 
         :viewparam="viewparam"

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/mapper/QuoteMapper.java

@@ -19,6 +19,7 @@ import com.alibaba.fastjson.JSONObject;
 
 public interface QuoteMapper extends BaseMapper<Quote>{
 
+    Page<Quote> searchByParentKey(IPage page, @Param("srf") QuoteSearchContext context, @Param("ew") Wrapper<Quote> wrapper) ;
     Page<Quote> searchDefault(IPage page, @Param("srf") QuoteSearchContext context, @Param("ew") Wrapper<Quote> wrapper) ;
     @Override
     Quote selectById(Serializable id);

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/mapper/SalesOrderMapper.java

@@ -19,6 +19,7 @@ import com.alibaba.fastjson.JSONObject;
 
 public interface SalesOrderMapper extends BaseMapper<SalesOrder>{
 
+    Page<SalesOrder> searchByParentKey(IPage page, @Param("srf") SalesOrderSearchContext context, @Param("ew") Wrapper<SalesOrder> wrapper) ;
     Page<SalesOrder> searchDefault(IPage page, @Param("srf") SalesOrderSearchContext context, @Param("ew") Wrapper<SalesOrder> wrapper) ;
     @Override
     SalesOrder selectById(Serializable id);

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/service/IQuoteService.java

@@ -40,6 +40,7 @@ public interface IQuoteService extends IService<Quote>{
     boolean save(Quote et) ;
     void saveBatch(List<Quote> list) ;
     Quote win(Quote et) ;
+    Page<Quote> searchByParentKey(QuoteSearchContext context) ;
     Page<Quote> searchDefault(QuoteSearchContext context) ;
     List<Quote> selectByCampaignid(String campaignid) ;
     void removeByCampaignid(String campaignid) ;

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/service/ISalesOrderService.java

@@ -39,6 +39,7 @@ public interface ISalesOrderService extends IService<SalesOrder>{
     SalesOrder genInvoice(SalesOrder et) ;
     boolean save(SalesOrder et) ;
     void saveBatch(List<SalesOrder> list) ;
+    Page<SalesOrder> searchByParentKey(SalesOrderSearchContext context) ;
     Page<SalesOrder> searchDefault(SalesOrderSearchContext context) ;
     List<SalesOrder> selectByCampaignid(String campaignid) ;
     void removeByCampaignid(String campaignid) ;

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/service/impl/QuoteServiceImpl.java

@@ -251,6 +251,15 @@ public class QuoteServiceImpl extends ServiceImpl<QuoteMapper, Quote> implements
     }
 
 
+    /**
+     * 查询集合 ByParentKey
+     */
+    @Override
+    public Page<Quote> searchByParentKey(QuoteSearchContext context) {
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<Quote> pages=baseMapper.searchByParentKey(context.getPages(),context,context.getSelectCond());
+        return new PageImpl<Quote>(pages.getRecords(), context.getPageable(), pages.getTotal());
+    }
+
     /**
      * 查询集合 DEFAULT
      */

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/service/impl/SalesOrderServiceImpl.java

@@ -257,6 +257,15 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
     }
 
 
+    /**
+     * 查询集合 ByParentKey
+     */
+    @Override
+    public Page<SalesOrder> searchByParentKey(SalesOrderSearchContext context) {
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<SalesOrder> pages=baseMapper.searchByParentKey(context.getPages(),context,context.getSelectCond());
+        return new PageImpl<SalesOrder>(pages.getRecords(), context.getPageable(), pages.getTotal());
+    }
+
     /**
      * 查询集合 DEFAULT
      */

businesscentral-core/src/main/resources/mapper/sales/quote/QuoteMapper.xml

@@ -100,6 +100,15 @@
          where  transactioncurrencyid=#{transactioncurrencyid}
      </select>
 
+    <!--数据集合[ByParentKey]-->
+	 <select id="searchByParentKey"  parameterType="cn.ibizlab.businesscentral.core.sales.filter.QuoteSearchContext"  resultMap="QuoteResultMap">
+         select t1.* from (
+                <include refid="ByParentKey" />
+         )t1
+         <where><if test="ew!=null and ew.sqlSegment!=null and !ew.emptyOfWhere">${ew.sqlSegment}</if></where>
+         <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
+     </select>
+
     <!--数据集合[Default]-->
 	 <select id="searchDefault"  parameterType="cn.ibizlab.businesscentral.core.sales.filter.QuoteSearchContext"  resultMap="QuoteResultMap">
          select t1.* from (
@@ -109,6 +118,12 @@
          <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
      </select>
 
+    <!--数据查询[ByParentKey]-->
+    <sql id="ByParentKey" databaseId="mysql">
+		<![CDATA[ SELECT t1.`ACCOUNTIDYOMINAME`, t1.`BILLTO_ADDRESSID`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_CONTACTNAME`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CLOSEDON`, t1.`CONTACTIDYOMINAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERIDTYPE`, t1.`CUSTOMERIDYOMINAME`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EFFECTIVEFROM`, t1.`EFFECTIVETO`, t1.`EMAILADDRESS`, t1.`EXCHANGERATE`, t1.`EXPIRESON`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERIDYOMINAME`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICINGERRORCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTENAME`, t1.`QUOTENUMBER`, t1.`REQUESTDELIVERYBY`, t1.`REVISIONNUMBER`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UNIQUEDSCID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `QUOTE` t1  
+					 WHERE 	( t1.`CUSTOMERID` =  #{srf.datacontext.srfparentkey} )
+			]]>
+    </sql>
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
 		<![CDATA[ SELECT t1.`ACCOUNTIDYOMINAME`, t1.`BILLTO_ADDRESSID`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_CONTACTNAME`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CLOSEDON`, t1.`CONTACTIDYOMINAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERIDTYPE`, t1.`CUSTOMERIDYOMINAME`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EFFECTIVEFROM`, t1.`EFFECTIVETO`, t1.`EMAILADDRESS`, t1.`EXCHANGERATE`, t1.`EXPIRESON`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERIDYOMINAME`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICINGERRORCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTENAME`, t1.`QUOTENUMBER`, t1.`REQUESTDELIVERYBY`, t1.`REVISIONNUMBER`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UNIQUEDSCID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `QUOTE` t1  

businesscentral-core/src/main/resources/mapper/sales/salesorder/SalesOrderMapper.xml

@@ -112,6 +112,15 @@
          where  transactioncurrencyid=#{transactioncurrencyid}
      </select>
 
+    <!--数据集合[ByParentKey]-->
+	 <select id="searchByParentKey"  parameterType="cn.ibizlab.businesscentral.core.sales.filter.SalesOrderSearchContext"  resultMap="SalesOrderResultMap">
+         select t1.* from (
+                <include refid="ByParentKey" />
+         )t1
+         <where><if test="ew!=null and ew.sqlSegment!=null and !ew.emptyOfWhere">${ew.sqlSegment}</if></where>
+         <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
+     </select>
+
     <!--数据集合[Default]-->
 	 <select id="searchDefault"  parameterType="cn.ibizlab.businesscentral.core.sales.filter.SalesOrderSearchContext"  resultMap="SalesOrderResultMap">
          select t1.* from (
@@ -121,6 +130,12 @@
          <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
      </select>
 
+    <!--数据查询[ByParentKey]-->
+    <sql id="ByParentKey" databaseId="mysql">
+		<![CDATA[ SELECT t1.`ACCOUNTIDYOMINAME`, t1.`BILLTO_ADDRESSID`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_CONTACTNAME`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CONTACTIDYOMINAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERIDTYPE`, t1.`CUSTOMERIDYOMINAME`, t1.`DATEFULFILLED`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTBACKOFFICESUBMIT`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`ORDERNUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERIDYOMINAME`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICELOCKED`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTENAME`, t1.`REQUESTDELIVERYBY`, t1.`SALESORDERID`, t1.`SALESORDERNAME`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBMITDATE`, t1.`SUBMITSTATUS`, t1.`SUBMITSTATUSDESCRIPTION`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `SALESORDER` t1  
+					 WHERE 	( t1.`CUSTOMERID` =  #{srf.datacontext.srfparentkey} )
+			]]>
+    </sql>
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
 		<![CDATA[ SELECT t1.`ACCOUNTIDYOMINAME`, t1.`BILLTO_ADDRESSID`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_CONTACTNAME`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CONTACTIDYOMINAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERIDTYPE`, t1.`CUSTOMERIDYOMINAME`, t1.`DATEFULFILLED`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTBACKOFFICESUBMIT`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`ORDERNUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERIDYOMINAME`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICELOCKED`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTENAME`, t1.`REQUESTDELIVERYBY`, t1.`SALESORDERID`, t1.`SALESORDERNAME`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBMITDATE`, t1.`SUBMITSTATUS`, t1.`SUBMITSTATUSDESCRIPTION`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `SALESORDER` t1  

businesscentral-core/src/main/resources/permission/systemResource.json

@@ -295,7 +295,7 @@
     "dename":"Quote",
     "delogicname":"报价单",
     "sysmoudle":{"id":"SALES","name":"Sales"},
-    "dedataset":[{"id":"Default" , "name":"DEFAULT"}],
+    "dedataset":[{"id":"ByParentKey" , "name":"ByParentKey"},{"id":"Default" , "name":"DEFAULT"}],
     "deaction":[{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"Active" , "name":"激活报价单" , "type":"USERCUSTOM" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Close" , "name":"结束报价单" , "type":"USERCUSTOM" },{"id":"GenSalesOrder" , "name":"创建订单" , "type":"USERCUSTOM" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" },{"id":"Win" , "name":"赢单" , "type":"USERCUSTOM" }],
     "datascope":[{"id":"all","name":"全部数据"}, {"id":"createman","name":"创建人"}]
      }
@@ -383,7 +383,7 @@
     "dename":"SalesOrder",
     "delogicname":"订单",
     "sysmoudle":{"id":"SALES","name":"Sales"},
-    "dedataset":[{"id":"Default" , "name":"DEFAULT"}],
+    "dedataset":[{"id":"ByParentKey" , "name":"ByParentKey"},{"id":"Default" , "name":"DEFAULT"}],
     "deaction":[{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"Cancel" , "name":"取消订单" , "type":"USERCUSTOM" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Finish" , "name":"完成订单" , "type":"USERCUSTOM" },{"id":"GenInvoice" , "name":"创建发票" , "type":"USERCUSTOM" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" }],
     "datascope":[{"id":"all","name":"全部数据"}, {"id":"createman","name":"创建人"}]
      }

businesscentral-provider/businesscentral-provider-centralapi/src/main/java/cn/ibizlab/businesscentral/centralapi/rest/SalesOrderResource.java

@@ -175,6 +175,27 @@ public class SalesOrderResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-SalesOrder-searchByParentKey-all') and hasPermission(#context,'iBizBusinessCentral-SalesOrder-Get')")
+	@ApiOperation(value = "获取ByParentKey", tags = {"订单" } ,notes = "获取ByParentKey")
+    @RequestMapping(method= RequestMethod.GET , value="/salesorders/fetchbyparentkey")
+	public ResponseEntity<List<SalesOrderDTO>> fetchByParentKey(SalesOrderSearchContext context) {
+        Page<SalesOrder> domains = salesorderService.searchByParentKey(context) ;
+        List<SalesOrderDTO> list = salesorderMapping.toDto(domains.getContent());
+        return ResponseEntity.status(HttpStatus.OK)
+                .header("x-page", String.valueOf(context.getPageable().getPageNumber()))
+                .header("x-per-page", String.valueOf(context.getPageable().getPageSize()))
+                .header("x-total", String.valueOf(domains.getTotalElements()))
+                .body(list);
+	}
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-SalesOrder-searchByParentKey-all') and hasPermission(#context,'iBizBusinessCentral-SalesOrder-Get')")
+	@ApiOperation(value = "查询ByParentKey", tags = {"订单" } ,notes = "查询ByParentKey")
+    @RequestMapping(method= RequestMethod.POST , value="/salesorders/searchbyparentkey")
+	public ResponseEntity<Page<SalesOrderDTO>> searchByParentKey(@RequestBody SalesOrderSearchContext context) {
+        Page<SalesOrder> domains = salesorderService.searchByParentKey(context) ;
+	    return ResponseEntity.status(HttpStatus.OK)
+                .body(new PageImpl(salesorderMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
+	}
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-SalesOrder-searchDefault-all') and hasPermission(#context,'iBizBusinessCentral-SalesOrder-Get')")
 	@ApiOperation(value = "获取DEFAULT", tags = {"订单" } ,notes = "获取DEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/salesorders/fetchdefault")