chitanda 发布系统代码

app_CRM/src/app-register.ts

@@ -16,7 +16,6 @@ import InputBox from './components/input-box/input-box.vue'
 import AppKeepAlive from './components/app-keep-alive/app-keep-alive.vue'
 import TabPageExp from './components/tab-page-exp/tab-page-exp.vue'
 import AppLang from './components/app-lang/app-lang.vue'
-import AppTheme from './components/app-theme/app-theme.vue'
 import AppUser from './components/app-user/app-user.vue'
 import AppForm from './components/app-form/app-form.vue'
 import APPAutocomplete from './components/app-autocomplete/app-autocomplete.vue'
@@ -100,7 +99,6 @@ export const AppComponents = {
         v.component('app-keep-alive',AppKeepAlive);
         v.component('tab-page-exp',TabPageExp);
         v.component('app-lang',AppLang);
-        v.component('app-theme',AppTheme);
         v.component('app-user',AppUser);
         v.component('app-form', AppForm);
         v.component('app-autocomplete', APPAutocomplete);

app_CRM/src/components/tab-page-exp/tab-page-exp.vue

 <template>
-    <div class="ibiz-page-tag" v-if="$store.state.pageMetas.length > 0">
+    <div class="ibiz-page-tag" v-if="$appService.navHistory.historyPathList > 0">
         <div class="move-btn move-left" @click="leftMove">
             <icon type="ios-arrow-back" />
         </div>
         <div ref="scrollBody" class="tags-body">
             <div ref="scrollChild" class="tags-container" :style="{left: styleLeft + 'px'}">
                 <transition-group name="tags-transition">
-                    <template v-for="(meta, index) of $store.state.pageMetas">
-                        <Tag ref="tagElement" :key="index" :class="isActive(index) ? 'tag-is-active' : ''" :name="index" closable @click.native="changePage(index)" @on-close="onClose(index)">
+                    <template v-for="(page, index) of $appService.navHistory.historyPathList">
+                        <Tag ref="tagElement" :key="index" :class="isActive(page) ? 'tag-is-active' : ''" :name="index" closable @click.native="changePage(page)" @on-close="onClose(page)">
                             <div class="tag-text">
-                                <div :title="getCaption(meta.caption, meta.info)" style="max-width: 300px;">
-                                    <i v-if="meta.iconCls && !Object.is(meta.iconCls, '')" :class="meta.iconCls"></i>
-                                    <img v-else :src="meta.imgPath" class="text-icon" />
-                                    &nbsp;{{getCaption(meta.caption, meta.info)}}
+                                <div :title="getCaption(page.meta.caption, page.meta.info)" style="max-width: 300px;">
+                                    <i v-if="page.meta.iconCls && !Object.is(page.meta.iconCls, '')" :class="page.meta.iconCls"></i>
+                                    <img v-else :src="page.meta.imgPath" class="text-icon" />
+                                    &nbsp;{{getCaption(page.meta.caption, page.meta.info)}}
                                 </div>
                             </div>
                         </Tag>
@@ -42,6 +42,7 @@ import { Environment } from '../../environments/environment';
 
 @Component({})
 export default class TabPageExp extends Vue {
+
     @Provide()
     public styleLeft: number = 0;
 
@@ -97,12 +98,11 @@ export default class TabPageExp extends Vue {
     /**
      * 是否选中
      *
-     * @param {(string | number)} index
-     * @returns
+     * @param {*} page
+     * @returns {boolean}
      * @memberof TabPageExp
      */
-    public isActive(index: string | number) {
-        const page = this.$store.state.pageTagList[index];
+    public isActive(page: any): boolean {
         if (Object.is(page.fullPath, this.$route.fullPath)) {
             return true;
         }
@@ -112,14 +112,12 @@ export default class TabPageExp extends Vue {
     /**
      * 关闭
      *
-     * @param {*} event
-     * @param {*} name
+     * @param {*} page
      * @memberof TabPageExp
      */
-    public onClose(name: any) {
-        const page = this.$store.getters.getPage(name);
+    public onClose(page: any) {
         if (!page) {
-            this.$store.commit("deletePage", name);
+            this.$appService.navHistory.remove(page);
             this.gotoPage();
         }
         const appview = this.$store.getters['viewaction/getAppView'](page.viewtag);
@@ -130,14 +128,14 @@ export default class TabPageExp extends Vue {
                 title: title,
                 content: content,
                 onOk: () => {
-                    this.$store.commit("deletePage", name);
+                    this.$appService.navHistory.remove(page);
                     this.gotoPage();
                 },
                 onCancel: () => {
                 }
             });
         } else {
-            this.$store.commit("deletePage", name);
+            this.$appService.navHistory.remove(page);
             this.gotoPage();
         }
     }
@@ -149,8 +147,7 @@ export default class TabPageExp extends Vue {
      * @memberof TabPageExp
      */
     public isClose() {
-        const pageTagList = this.$store.state.pageTagList;
-        if (pageTagList.length > 1) {
+        if (this.$appService.navHistory.historyList.length > 1) {
             return true;
         }
         return false;
@@ -159,12 +156,11 @@ export default class TabPageExp extends Vue {
     /**
      * 切换分页
      *
-     * @param {*} index
+     * @param {*} page
      * @memberof TabPageExp
      */
-    public changePage(index: any) {
-        this.$store.commit("setCurPage", index);
-        this.gotoPage();
+    public changePage(page: any) {
+        this.gotoPage(page);
     }
 
     /**
@@ -173,20 +169,14 @@ export default class TabPageExp extends Vue {
      * @returns
      * @memberof TabPageExp
      */
-    public gotoPage() {
-        const length = this.$store.state.historyPathList.length;
-        if (length > 0) {
-            const path = this.$store.state.historyPathList[length - 1];
-            if (Object.is(path, this.$route.fullPath)) {
+    public gotoPage(page?: any) {
+        if (page) {
+            if (Object.is(page.fullPath, this.$route.fullPath)) {
                 return;
             }
-            const index = this.$store.state.pageTagList.findIndex((page: any) => Object.is(page.fullPath, path));
-            if (index >= 0) {
-                const page = this.$store.state.pageTagList[index];
             this.$router.push({ path: page.path, params: page.params, query: page.query });
-            }
         } else {
-            let path: string | null = window.sessionStorage.getItem(Environment.AppName);
+            const path: string | null = window.sessionStorage.getItem(Environment.AppName);
             if(path) {
                 this.$router.push({path: path});
             } else {
@@ -214,11 +204,11 @@ export default class TabPageExp extends Vue {
     /**
      * 移动至指定页面标签
      *
-     * @param {*} to
+     * @param {*} page
      * @memberof TabPageExp
      */
-    public moveToView(to: any) {
-        const pages: any[] = this.$store.state.pageTagList;
+    public moveToView(page: any) {
+        const pages: any[] = this.$appService.navHistory.historyList;
         let leftWidth: number = 0;
         this.$nextTick(() => {
             pages.forEach((page, index) => {
@@ -227,7 +217,7 @@ export default class TabPageExp extends Vue {
                     return ;
                 }
                 const el = tag[index].$el;
-                if (Object.is(page.fullPath, to.fullPath)) {
+                if (Object.is(page.fullPath, page.fullPath)) {
                     this.setLeft(el, leftWidth);
                 } else {
                     leftWidth += el.offsetWidth;
@@ -262,10 +252,10 @@ export default class TabPageExp extends Vue {
      */
     public doTagAction(name: string) {
         if (Object.is(name, 'closeAll')) {
-            this.$store.commit("removeAllPage");
+            this.$appService.navHistory.reset();
             this.gotoPage();
         } else if (Object.is(name, 'closeOther')) {
-            this.$store.commit("removeOtherPage");
+            this.$appService.navHistory.removeOther(this.$route);
             this.moveToView(this.$route);
         }
     }  

app_CRM/src/mock/entity/quotes/quotes.ts

@@ -621,6 +621,125 @@ mock.onPost(new RegExp(/^\/quotes\/?([a-zA-Z0-9\-\;]{0,35})\/checkkey$/)).reply(
 });
 
     
+// GenSalesOrder
+mock.onPost(new RegExp(/^\/accounts\/([a-zA-Z0-9\-\;]{1,35})\/contacts\/([a-zA-Z0-9\-\;]{1,35})\/opportunities\/([a-zA-Z0-9\-\;]{1,35})\/quotes\/([a-zA-Z0-9\-\;]{1,35})\/gensalesorder$/)).reply((config: any) => {
+    console.groupCollapsed("实体:quote 方法: GenSalesOrder");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }
+    const paramArray:Array<any> = ['accountid','contactid','opportunityid','quoteid'];
+    const matchArray:any = new RegExp(/^\/accounts\/([a-zA-Z0-9\-\;]{1,35})\/contacts\/([a-zA-Z0-9\-\;]{1,35})\/opportunities\/([a-zA-Z0-9\-\;]{1,35})\/quotes\/([a-zA-Z0-9\-\;]{1,35})\/gensalesorder$/).exec(config.url);
+    let tempValue: any = {};
+    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
+        paramArray.forEach((item: any, index: number) => {
+            Object.defineProperty(tempValue, item, {
+                enumerable: true,
+                value: matchArray[index + 1]
+            });
+        });
+    }
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table({});
+    console.groupEnd();
+    console.groupEnd();
+    return [status, {}];
+});
+
+    
+// GenSalesOrder
+mock.onPost(new RegExp(/^\/contacts\/([a-zA-Z0-9\-\;]{1,35})\/opportunities\/([a-zA-Z0-9\-\;]{1,35})\/quotes\/([a-zA-Z0-9\-\;]{1,35})\/gensalesorder$/)).reply((config: any) => {
+    console.groupCollapsed("实体:quote 方法: GenSalesOrder");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }
+    const paramArray:Array<any> = ['contactid','opportunityid','quoteid'];
+    const matchArray:any = new RegExp(/^\/contacts\/([a-zA-Z0-9\-\;]{1,35})\/opportunities\/([a-zA-Z0-9\-\;]{1,35})\/quotes\/([a-zA-Z0-9\-\;]{1,35})\/gensalesorder$/).exec(config.url);
+    let tempValue: any = {};
+    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
+        paramArray.forEach((item: any, index: number) => {
+            Object.defineProperty(tempValue, item, {
+                enumerable: true,
+                value: matchArray[index + 1]
+            });
+        });
+    }
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table({});
+    console.groupEnd();
+    console.groupEnd();
+    return [status, {}];
+});
+
+    
+// GenSalesOrder
+mock.onPost(new RegExp(/^\/opportunities\/([a-zA-Z0-9\-\;]{1,35})\/quotes\/([a-zA-Z0-9\-\;]{1,35})\/gensalesorder$/)).reply((config: any) => {
+    console.groupCollapsed("实体:quote 方法: GenSalesOrder");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }
+    const paramArray:Array<any> = ['opportunityid','quoteid'];
+    const matchArray:any = new RegExp(/^\/opportunities\/([a-zA-Z0-9\-\;]{1,35})\/quotes\/([a-zA-Z0-9\-\;]{1,35})\/gensalesorder$/).exec(config.url);
+    let tempValue: any = {};
+    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
+        paramArray.forEach((item: any, index: number) => {
+            Object.defineProperty(tempValue, item, {
+                enumerable: true,
+                value: matchArray[index + 1]
+            });
+        });
+    }
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table({});
+    console.groupEnd();
+    console.groupEnd();
+    return [status, {}];
+});
+        
+// GenSalesOrder
+mock.onPost(new RegExp(/^\/quotes\/?([a-zA-Z0-9\-\;]{0,35})\/gensalesorder$/)).reply((config: any) => {
+    console.groupCollapsed("实体:quote 方法: GenSalesOrder");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }    
+    const paramArray:Array<any> = ['quoteid'];
+    const matchArray:any = new RegExp(/^\/quotes\/([a-zA-Z0-9\-\;]{1,35})\/gensalesorder$/).exec(config.url);
+    let tempValue: any = {};
+    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
+        paramArray.forEach((item: any, index: number) => {
+            Object.defineProperty(tempValue, item, {
+                enumerable: true,
+                value: matchArray[index + 1]
+            });
+        });
+    }
+    //let items = mockDatas ? mockDatas : [];
+    //let _items = items.find((item: any) => Object.is(item.quoteid, tempValue.quoteid));
+      let data = JSON.parse(config.data);
+    mockDatas.forEach((item)=>{
+        if(item['quoteid'] == tempValue['quoteid'] ){
+            for(let value in data){
+              if(item.hasOwnProperty(value)){
+                  item[value] = data[value];
+              }
+            }
+        }
+    })
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(data);
+    console.groupEnd();
+    console.groupEnd();
+    return [status, data];
+});
+
+    
 // Save
 mock.onPost(new RegExp(/^\/accounts\/([a-zA-Z0-9\-\;]{1,35})\/contacts\/([a-zA-Z0-9\-\;]{1,35})\/opportunities\/([a-zA-Z0-9\-\;]{1,35})\/quotes\/([a-zA-Z0-9\-\;]{1,35})\/save$/)).reply((config: any) => {
     console.groupCollapsed("实体:quote 方法: Save");
@@ -740,6 +859,125 @@ mock.onPost(new RegExp(/^\/quotes\/?([a-zA-Z0-9\-\;]{0,35})\/save$/)).reply((con
 });
 
     
+// Win
+mock.onPost(new RegExp(/^\/accounts\/([a-zA-Z0-9\-\;]{1,35})\/contacts\/([a-zA-Z0-9\-\;]{1,35})\/opportunities\/([a-zA-Z0-9\-\;]{1,35})\/quotes\/([a-zA-Z0-9\-\;]{1,35})\/win$/)).reply((config: any) => {
+    console.groupCollapsed("实体:quote 方法: Win");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }
+    const paramArray:Array<any> = ['accountid','contactid','opportunityid','quoteid'];
+    const matchArray:any = new RegExp(/^\/accounts\/([a-zA-Z0-9\-\;]{1,35})\/contacts\/([a-zA-Z0-9\-\;]{1,35})\/opportunities\/([a-zA-Z0-9\-\;]{1,35})\/quotes\/([a-zA-Z0-9\-\;]{1,35})\/win$/).exec(config.url);
+    let tempValue: any = {};
+    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
+        paramArray.forEach((item: any, index: number) => {
+            Object.defineProperty(tempValue, item, {
+                enumerable: true,
+                value: matchArray[index + 1]
+            });
+        });
+    }
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table({});
+    console.groupEnd();
+    console.groupEnd();
+    return [status, {}];
+});
+
+    
+// Win
+mock.onPost(new RegExp(/^\/contacts\/([a-zA-Z0-9\-\;]{1,35})\/opportunities\/([a-zA-Z0-9\-\;]{1,35})\/quotes\/([a-zA-Z0-9\-\;]{1,35})\/win$/)).reply((config: any) => {
+    console.groupCollapsed("实体:quote 方法: Win");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }
+    const paramArray:Array<any> = ['contactid','opportunityid','quoteid'];
+    const matchArray:any = new RegExp(/^\/contacts\/([a-zA-Z0-9\-\;]{1,35})\/opportunities\/([a-zA-Z0-9\-\;]{1,35})\/quotes\/([a-zA-Z0-9\-\;]{1,35})\/win$/).exec(config.url);
+    let tempValue: any = {};
+    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
+        paramArray.forEach((item: any, index: number) => {
+            Object.defineProperty(tempValue, item, {
+                enumerable: true,
+                value: matchArray[index + 1]
+            });
+        });
+    }
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table({});
+    console.groupEnd();
+    console.groupEnd();
+    return [status, {}];
+});
+
+    
+// Win
+mock.onPost(new RegExp(/^\/opportunities\/([a-zA-Z0-9\-\;]{1,35})\/quotes\/([a-zA-Z0-9\-\;]{1,35})\/win$/)).reply((config: any) => {
+    console.groupCollapsed("实体:quote 方法: Win");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }
+    const paramArray:Array<any> = ['opportunityid','quoteid'];
+    const matchArray:any = new RegExp(/^\/opportunities\/([a-zA-Z0-9\-\;]{1,35})\/quotes\/([a-zA-Z0-9\-\;]{1,35})\/win$/).exec(config.url);
+    let tempValue: any = {};
+    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
+        paramArray.forEach((item: any, index: number) => {
+            Object.defineProperty(tempValue, item, {
+                enumerable: true,
+                value: matchArray[index + 1]
+            });
+        });
+    }
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table({});
+    console.groupEnd();
+    console.groupEnd();
+    return [status, {}];
+});
+        
+// Win
+mock.onPost(new RegExp(/^\/quotes\/?([a-zA-Z0-9\-\;]{0,35})\/win$/)).reply((config: any) => {
+    console.groupCollapsed("实体:quote 方法: Win");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }    
+    const paramArray:Array<any> = ['quoteid'];
+    const matchArray:any = new RegExp(/^\/quotes\/([a-zA-Z0-9\-\;]{1,35})\/win$/).exec(config.url);
+    let tempValue: any = {};
+    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
+        paramArray.forEach((item: any, index: number) => {
+            Object.defineProperty(tempValue, item, {
+                enumerable: true,
+                value: matchArray[index + 1]
+            });
+        });
+    }
+    //let items = mockDatas ? mockDatas : [];
+    //let _items = items.find((item: any) => Object.is(item.quoteid, tempValue.quoteid));
+      let data = JSON.parse(config.data);
+    mockDatas.forEach((item)=>{
+        if(item['quoteid'] == tempValue['quoteid'] ){
+            for(let value in data){
+              if(item.hasOwnProperty(value)){
+                  item[value] = data[value];
+              }
+            }
+        }
+    })
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(data);
+    console.groupEnd();
+    console.groupEnd();
+    return [status, data];
+});
+
+
 // FetchDefault
 mock.onGet(new RegExp(/^\/accounts\/([a-zA-Z0-9\-\;]{1,35})\/contacts\/([a-zA-Z0-9\-\;]{1,35})\/opportunities\/([a-zA-Z0-9\-\;]{1,35})\/quotes\/fetchdefault$/)).reply((config: any) => {
     console.groupCollapsed("实体:quote 方法: FetchDefault");

app_CRM/src/pages/base/account-edit-account-info/account-edit-account-info.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/account/edit-account-info-form/edit-account-info
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/account-edit-address/account-edit-address.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/account/edit-address-form/edit-address-form.vue'
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/account-edit-introduction/account-edit-introduction.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/account/edit-introduction-form/edit-introduction
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/account-edit-view/account-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/account/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/account-gradation/account-gradation.vue

@@ -18,7 +18,7 @@ import view_treeexpbar from '@widgets/account/gradationtreeexpbar-treeexpbar/gra
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/account-grid-view/account-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/account/default-searchform/default-searchf
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

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

@@ -18,7 +18,7 @@ import view_form from '@widgets/account/info-all-form/info-all-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/account-info-major-contact/account-info-major-contact.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/account/info-major-contact-form/info-major-conta
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/account-info/account-info.vue

@@ -18,7 +18,7 @@ import view_tabexppanel from '@widgets/account/infotabexppanel-tabexppanel/infot
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/account-inner-pickup-grid-view/account-inner-pickup-grid-view.vue

@@ -18,7 +18,7 @@ import view_grid from '@widgets/account/inner-pickip-grid/inner-pickip-grid.vue'
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/account-inner-pickup-view/account-inner-pickup-view.vue

@@ -18,7 +18,7 @@ import view_pickupviewpanel from '@widgets/account/inner-pickup-viewpickupviewpa
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/account-pickup-grid-view/account-pickup-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/account/default-searchform/default-searchf
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/account-pickup-view/account-pickup-view.vue

@@ -18,7 +18,7 @@ import view_pickupviewpanel from '@widgets/account/pickup-viewpickupviewpanel-pi
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/account-quick-create/account-quick-create.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/account/quick-create-form/quick-create-form.vue'
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/account-summary/account-summary.vue

@@ -18,7 +18,7 @@ import view_dashboard from '@widgets/account/summary-dashboard/summary-dashboard
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/activity-pointer-by-parent-key/activity-pointer-by-parent-key.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/activity-pointer/default-searchform/defaul
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/activity-pointer-edit-view/activity-pointer-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/activity-pointer/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/activity-pointer-grid-view/activity-pointer-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/activity-pointer/default-searchform/defaul
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/activity-pointer-redirect-view/activity-pointer-redirect-view.vue

@@ -16,7 +16,7 @@ import { ActivityPointerRedirectViewBase } from './activity-pointer-redirect-vie
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/appointment-edit-view/appointment-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/appointment/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/appointment-quick-create/appointment-quick-create.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/appointment/quick-create-form/quick-create-form.
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/contact-by-account/contact-by-account.vue

@@ -18,7 +18,7 @@ import view_grid from '@widgets/contact/by-account-grid/by-account-grid.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/contact-edit-address/contact-edit-address.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/contact/address-edit-form/address-edit-form.vue'
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/contact-edit-book/contact-edit-book.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/contact/book-edit-form/book-edit-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/contact-edit-market/contact-edit-market.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/contact/market-edit-form/market-edit-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/contact-edit-person/contact-edit-person.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/contact/person-edit-form/person-edit-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/contact-grid-view/contact-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/contact/default-searchform/default-searchf
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/contact-info-abstract/contact-info-abstract.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/contact/abstract-info-form/abstract-info-form.vu
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/contact-info/contact-info.vue

@@ -18,7 +18,7 @@ import view_tabexppanel from '@widgets/contact/infotabexppanel-tabexppanel/infot
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/contact-pickup-grid-view/contact-pickup-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/contact/default-searchform/default-searchf
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/contact-pickup-view/contact-pickup-view.vue

@@ -18,7 +18,7 @@ import view_pickupviewpanel from '@widgets/contact/pickup-viewpickupviewpanel-pi
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/contact-quick-create/contact-quick-create.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/contact/quick-create-form/quick-create-form.vue'
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/contact-summary-view/contact-summary-view.vue

@@ -18,7 +18,7 @@ import view_dashboard from '@widgets/contact/con-abs-dashboard/con-abs-dashboard
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/email-edit-view/email-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/email/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/fax-edit-view/fax-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/fax/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/letter-edit-view/letter-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/letter/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/metric-edit-view/metric-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/metric/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/metric-grid-view/metric-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/metric/default-searchform/default-searchfo
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/metric-pickup-grid-view/metric-pickup-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/metric/default-searchform/default-searchfo
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/metric-pickup-view/metric-pickup-view.vue

@@ -18,7 +18,7 @@ import view_pickupviewpanel from '@widgets/metric/pickup-viewpickupviewpanel-pic
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/phone-call-edit-view/phone-call-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/phone-call/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/subject-pickup-grid-view/subject-pickup-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/subject/default-searchform/default-searchf
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/subject-pickup-view/subject-pickup-view.vue

@@ -18,7 +18,7 @@ import view_pickupviewpanel from '@widgets/subject/pickup-viewpickupviewpanel-pi
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/task-edit-view/task-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/task/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/task-quick-create/task-quick-create.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/task/quick-create-form/quick-create-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/transaction-currency-pickup-grid-view/transaction-currency-pickup-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/transaction-currency/default-searchform/de
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/transaction-currency-pickup-view/transaction-currency-pickup-view.vue

@@ -18,7 +18,7 @@ import view_pickupviewpanel from '@widgets/transaction-currency/pickup-viewpicku
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/uom-pickup-grid-view/uom-pickup-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/uom/default-searchform/default-searchform.
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/uom-pickup-view/uom-pickup-view.vue

@@ -18,7 +18,7 @@ import view_pickupviewpanel from '@widgets/uom/pickup-viewpickupviewpanel-pickup
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/finance/invoice-detail-edit-view/invoice-detail-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/invoice-detail/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/finance/invoice-detail-invoice-pro-grid-view/invoice-detail-invoice-pro-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/invoice-detail/default-searchform/default-
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/finance/invoice-grid-view/invoice-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/invoice/default-searchform/default-searchf
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/finance/invoice-info-invoice-view/invoice-info-invoice-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/invoice/info-form/info-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/finance/invoice-info-view/invoice-info-view.vue

@@ -18,7 +18,7 @@ import view_tabexppanel from '@widgets/invoice/info-viewtabexppanel-tabexppanel/
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/finance/invoice-quick-create-view/invoice-quick-create-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/invoice/quick-create-form/quick-create-form.vue'
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/finance/invoice-summary-view/invoice-summary-view.vue

@@ -18,7 +18,7 @@ import view_dashboard from '@widgets/invoice/board-dashboard/board-dashboard.vue
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

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

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/campaign-activity/default-searchform/defau
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/campaign-activity-edit-view/campaign-activity-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/campaign-activity/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/campaign-activity-quick-create/campaign-activity-quick-create.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/campaign-activity/quick-create-form/quick-create
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/campaign-edit-head/campaign-edit-head.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/campaign/edit-head-form/edit-head-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/campaign-grid-view/campaign-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/campaign/default-searchform/default-search
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/campaign-info-campagin/campaign-info-campagin.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/campaign/info-campagin-form/info-campagin-form.v
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/campaign-info-head/campaign-info-head.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/campaign/info-head-form/info-head-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/campaign-info-manager/campaign-info-manager.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/campaign/info-manager-form/info-manager-form.vue
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/campaign-info-schedule/campaign-info-schedule.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/campaign/info-schedule-form/info-schedule-form.v
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/campaign-info/campaign-info.vue

@@ -18,7 +18,7 @@ import view_tabexppanel from '@widgets/campaign/infotabexppanel-tabexppanel/info
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/campaign-list-edit-view/campaign-list-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/campaign-list/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/campaign-list-grid-view/campaign-list-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/campaign-list/default-searchform/default-s
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/campaign-quick-create-view/campaign-quick-create-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/campaign/quick-create-form/quick-create-form.vue
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/campaign-response-by-parent-key/campaign-response-by-parent-key.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/campaign-response/default-searchform/defau
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/campaign-response-edit-view/campaign-response-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/campaign-response/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/campaign-response-quick-create/campaign-response-quick-create.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/campaign-response/quick-create-form/quick-create
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/campaign-summary-head/campaign-summary-head.vue

@@ -18,7 +18,7 @@ import view_dashboard from '@widgets/campaign/head-summary-dashboard/head-summar
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/campaign-summary/campaign-summary.vue

@@ -18,7 +18,7 @@ import view_dashboard from '@widgets/campaign/summary-dashboard/summary-dashboar
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/ibiz-list-grid-view/ibiz-list-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/ibiz-list/default-searchform/default-searc
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/ibiz-list-info-abstract/ibiz-list-info-abstract.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/ibiz-list/abstract-info-form/abstract-info-form.
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/ibiz-list-info/ibiz-list-info.vue

@@ -18,7 +18,7 @@ import view_tabexppanel from '@widgets/ibiz-list/infotabexppanel-tabexppanel/inf
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/ibiz-list-option-view/ibiz-list-option-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/ibiz-list/abstract-edit-form/abstract-edit-form.
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/ibiz-list-quick-create/ibiz-list-quick-create.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/ibiz-list/quick-create-form/quick-create-form.vu
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/ibiz-list-summary/ibiz-list-summary.vue

@@ -18,7 +18,7 @@ import view_dashboard from '@widgets/ibiz-list/summary-dashboard/summary-dashboa
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/list-account-by-list/list-account-by-list.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/list-account/default-searchform/default-se
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/list-account-edit-view/list-account-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/list-account/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/list-account-inner/list-account-inner.vue

@@ -18,7 +18,7 @@ import view_grid from '@widgets/list-account/main-grid/main-grid.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/list-account-quick-create-by-list/list-account-quick-create-by-list.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/list-account/quick-create-by-list-form/quick-cre
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/list-contact-edit-view/list-contact-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/list-contact/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/list-contact-grid-view/list-contact-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/list-contact/default-searchform/default-se
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/list-contact-inner/list-contact-inner.vue

@@ -18,7 +18,7 @@ import view_grid from '@widgets/list-contact/inner-grid/inner-grid.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/list-lead-by-list/list-lead-by-list.vue

@@ -18,7 +18,7 @@ import view_grid from '@widgets/list-lead/main-grid/main-grid.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/list-lead-quick-create-by-list/list-lead-quick-create-by-list.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/list-lead/quick-create-by-list-form/quick-create
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/product/price-level-pickup-grid-view/price-level-pickup-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/price-level/default-searchform/default-sea
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/product/price-level-pickup-view/price-level-pickup-view.vue

@@ -18,7 +18,7 @@ import view_pickupviewpanel from '@widgets/price-level/pickup-viewpickupviewpane
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/product/product-association-edit-view/product-association-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/product-association/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/product/product-association-grid-view/product-association-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/product-association/default-searchform/def
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/product/product-grid-view/product-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/product/default-searchform/default-searchf
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/product/product-info-pro-info/product-info-pro-info.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/product/pro-info-form/pro-info-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/product/product-info-view/product-info-view.vue

@@ -18,7 +18,7 @@ import view_tabexppanel from '@widgets/product/info-viewtabexppanel-tabexppanel/
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/product/product-pickup-grid-view/product-pickup-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/product/default-searchform/default-searchf
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/product/product-pickup-view/product-pickup-view.vue

@@ -18,7 +18,7 @@ import view_pickupviewpanel from '@widgets/product/pickup-viewpickupviewpanel-pi
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/product/product-price-level-pro-prilv-edit-view/product-price-level-pro-prilv-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/product-price-level/pro-prilv-form/pro-prilv-for
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/product/product-price-level-pro-prilv-grid-view/product-price-level-pro-prilv-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/product-price-level/default-searchform/def
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/product/product-quick-create-view/product-quick-create-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/product/quick-create-form/quick-create-form.vue'
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/product/product-substitute-edit-view/product-substitute-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/product-substitute/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/product/product-substitute-grid-view/product-substitute-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/product-substitute/default-searchform/defa
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/product/product-summary-view/product-summary-view.vue

@@ -18,7 +18,7 @@ import view_dashboard from '@widgets/product/pro-info-dashboard/pro-info-dashboa
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/competitor-grid-view/competitor-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/competitor/default-searchform/default-sear
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/competitor-info-abstract/competitor-info-abstract.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/competitor/abstract-info-form/abstract-info-form
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/competitor-info/competitor-info.vue

@@ -18,7 +18,7 @@ import view_tabexppanel from '@widgets/competitor/infotabexppanel-tabexppanel/in
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/competitor-option-view/competitor-option-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/competitor/quick-create-form/quick-create-form.v
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/competitor-pickup-grid-view/competitor-pickup-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/competitor/default-searchform/default-sear
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/competitor-pickup-view/competitor-pickup-view.vue

@@ -18,7 +18,7 @@ import view_pickupviewpanel from '@widgets/competitor/pickup-viewpickupviewpanel
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/competitor-sales-literature-sal-lit-comp-edit-view/competitor-sales-literature-sal-lit-comp-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/competitor-sales-literature/sal-lit-comp-form/sa
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/competitor-sales-literature-sal-lit-comp-grid-view/competitor-sales-literature-sal-lit-comp-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/competitor-sales-literature/default-search
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/competitor-summary/competitor-summary.vue

@@ -18,7 +18,7 @@ import view_dashboard from '@widgets/competitor/abstract-info-dashboard/abstract
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/discount-type-pickup-grid-view/discount-type-pickup-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/discount-type/default-searchform/default-s
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/discount-type-pickup-view/discount-type-pickup-view.vue

@@ -18,7 +18,7 @@ import view_pickupviewpanel from '@widgets/discount-type/pickup-viewpickupviewpa
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/goal-child-goal-grid-view/goal-child-goal-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/goal/default-searchform/default-searchform
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/goal-edit-child-goal-view/goal-edit-child-goal-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/goal/edit-child-goal-form/edit-child-goal-form.v
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/goal-grid-view/goal-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/goal/default-searchform/default-searchform
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/goal-info-goal-view/goal-info-goal-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/goal/info-goal-form/info-goal-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/goal-info-view/goal-info-view.vue

@@ -18,7 +18,7 @@ import view_tabexppanel from '@widgets/goal/info-viewtabexppanel-tabexppanel/inf
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/goal-pickup-grid-view/goal-pickup-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/goal/default-searchform/default-searchform
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/goal-pickup-view/goal-pickup-view.vue

@@ -18,7 +18,7 @@ import view_pickupviewpanel from '@widgets/goal/pickup-viewpickupviewpanel-picku
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/goal-quick-create-view/goal-quick-create-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/goal/quick-create-form/quick-create-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/goal-summary-view/goal-summary-view.vue

@@ -18,7 +18,7 @@ import view_dashboard from '@widgets/goal/goal-info-dashboard/goal-info-dashboar
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/lead-con-lead-grid-view/lead-con-lead-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/lead/default-searchform/default-searchform
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/lead-dashboard-view/lead-dashboard-view.vue

@@ -18,7 +18,7 @@ import view_dashboard from '@widgets/lead/lead-info-dashboard/lead-info-dashboar
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/lead-grid-view/lead-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/lead/default-searchform/default-searchform
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/lead-info-contact/lead-info-contact.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/lead/contact-info-form/contact-info-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/lead-info/lead-info.vue

@@ -18,7 +18,7 @@ import view_tabexppanel from '@widgets/lead/infotabexppanel-tabexppanel/infotabe
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/lead-pickup-grid-view/lead-pickup-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/lead/default-searchform/default-searchform
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/lead-pickup-view/lead-pickup-view.vue

@@ -18,7 +18,7 @@ import view_pickupviewpanel from '@widgets/lead/pickup-viewpickupviewpanel-picku
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/lead-quick-create/lead-quick-create.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/lead/quick-create-form/quick-create-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/opportunity-competitor-edit-view/opportunity-competitor-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/opportunity-competitor/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/opportunity-competitor-opp-comp-grid-view/opportunity-competitor-opp-comp-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/opportunity-competitor/default-searchform/
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/opportunity-con-opp-grid-view/opportunity-con-opp-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/opportunity/default-searchform/default-sea
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/opportunity-edit-view/opportunity-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/opportunity/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/opportunity-grid-view/opportunity-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/opportunity/default-searchform/default-sea
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/opportunity-info-abstract/opportunity-info-abstract.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/opportunity/abstract-info-form/abstract-info-for
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/opportunity-info/opportunity-info.vue

@@ -18,7 +18,7 @@ import view_tabexppanel from '@widgets/opportunity/infotabexppanel-tabexppanel/i
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/opportunity-pickup-grid-view/opportunity-pickup-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/opportunity/default-searchform/default-sea
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/opportunity-pickup-view/opportunity-pickup-view.vue

@@ -18,7 +18,7 @@ import view_pickupviewpanel from '@widgets/opportunity/pickup-viewpickupviewpane
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/opportunity-product-edit-view/opportunity-product-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/opportunity-product/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/opportunity-product-opp-opp-pro-grid-view/opportunity-product-opp-opp-pro-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/opportunity-product/default-searchform/def
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/opportunity-quick-create/opportunity-quick-create.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/opportunity/quick-create-form/quick-create-form.
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/opportunity-summary/opportunity-summary.vue

@@ -18,7 +18,7 @@ import view_dashboard from '@widgets/opportunity/abstract-info-dashboard/abstrac
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/product-sales-literature-sal-lit-pro-edit-view/product-sales-literature-sal-lit-pro-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/product-sales-literature/sal-lit-pro-form/sal-li
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/product-sales-literature-sal-lit-pro-grid-view/product-sales-literature-sal-lit-pro-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/product-sales-literature/default-searchfor
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/quote-detail-edit-view/quote-detail-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/quote-detail/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/quote-detail-quo-detail-grid-view/quote-detail-quo-detail-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/quote-detail/default-searchform/default-se
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/quote-edit-view/quote-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/quote/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

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

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/quote/default-searchform/default-searchfor
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/quote-info-abstract/quote-info-abstract.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/quote/abstract-info-form/abstract-info-form.vue'
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/quote-info/quote-info.vue

@@ -18,7 +18,7 @@ import view_tabexppanel from '@widgets/quote/infotabexppanel-tabexppanel/infotab
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/quote-opp-qua-grid-view/quote-opp-qua-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/quote/default-searchform/default-searchfor
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/quote-option-view/quote-option-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/quote/quick-create-form/quick-create-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/quote-summary/quote-summary.vue

@@ -18,7 +18,7 @@ import view_dashboard from '@widgets/quote/abstract-info-dashboard/abstract-info
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/sales-literature-grid-view/sales-literature-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/sales-literature/default-searchform/defaul
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/sales-literature-info-sal-lit-view/sales-literature-info-sal-lit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/sales-literature/info-form/info-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/sales-literature-info-view/sales-literature-info-view.vue

@@ -18,7 +18,7 @@ import view_tabexppanel from '@widgets/sales-literature/info-viewtabexppanel-tab
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/sales-literature-item-edit-view/sales-literature-item-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/sales-literature-item/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/sales-literature-item-grid-view/sales-literature-item-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/sales-literature-item/default-searchform/d
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/sales-literature-quick-create-view/sales-literature-quick-create-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/sales-literature/quick-create-form/quick-create-
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/sales-literature-summary-view/sales-literature-summary-view.vue

@@ -18,7 +18,7 @@ import view_dashboard from '@widgets/sales-literature/sal-lit-info-dashboard/sal
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/sales-order-detail-edit-view/sales-order-detail-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/sales-order-detail/soproduct-edit-form/soproduct
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/sales-order-detail-soproduct-grid-view/sales-order-detail-soproduct-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/sales-order-detail/default-searchform/defa
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/sales-order-grid-view/sales-order-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/sales-order/default-searchform/default-sea
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/sales-order-info-soview/sales-order-info-soview.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/sales-order/info-form/info-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/sales-order-info-view/sales-order-info-view.vue

@@ -18,7 +18,7 @@ import view_tabexppanel from '@widgets/sales-order/info-viewtabexppanel-tabexppa
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/sales-order-quick-create-view/sales-order-quick-create-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/sales-order/quick-create-form/quick-create-form.
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/sales/sales-order-summary-view/sales-order-summary-view.vue

@@ -18,7 +18,7 @@ import view_dashboard from '@widgets/sales-order/soinfo-dashboard/soinfo-dashboa
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/service/entitlement-pickup-grid-view/entitlement-pickup-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/entitlement/default-searchform/default-sea
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/service/entitlement-pickup-view/entitlement-pickup-view.vue

@@ -18,7 +18,7 @@ import view_pickupviewpanel from '@widgets/entitlement/pickup-viewpickupviewpane
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/service/incident-child-incident-grid-view/incident-child-incident-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/incident/default-searchform/default-search
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/service/incident-edit-chlid-incident/incident-edit-chlid-incident.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/incident/edit-child-incident-form/edit-child-inc
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/service/incident-grid-view/incident-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/incident/default-searchform/default-search
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/service/incident-info-incident-view/incident-info-incident-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/incident/info-incident-form/info-incident-form.v
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/service/incident-info-view/incident-info-view.vue

@@ -18,7 +18,7 @@ import view_tabexppanel from '@widgets/incident/info-viewtabexppanel-tabexppanel
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/service/incident-quick-create-view/incident-quick-create-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/incident/quick-create-form/quick-create-form.vue
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/service/incident-summary-view/incident-summary-view.vue

@@ -18,7 +18,7 @@ import view_dashboard from '@widgets/incident/incident-info-dashboard/incident-i
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/service/service-appointment-edit-view/service-appointment-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/service-appointment/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/ungroup/centeral-portal/centeral-portal.vue

@@ -18,7 +18,7 @@ import view_dashboard from '@widgets/app/centeral-portal-db-dashboard/centeral-p
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/ungroup/central/central-base.tsx

@@ -267,7 +267,7 @@ export class CentralBase extends Vue {
           </template> : null}
           {styleMode === 'DEFAULT' ? <tab-page-exp></tab-page-exp> : null}
           <div class="view-warp">
-            <app-keep-alive routerList={this.$store.state.historyPathList}>
+            <app-keep-alive routerList={this.$appService.navHistory.historyList}>
               <router-view key={this.$route.fullPath}></router-view>
             </app-keep-alive>
           </div>

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

@@ -29,7 +29,7 @@ import store from '@/store';
 import router from './router';
 
 Vue.config.errorHandler = function (err: any, vm: any, info: any) {
-  console.log(err);
+    console.error(err);
 }
 Vue.config.productionTip = false;
 Vue.use(Print);
@@ -50,13 +50,6 @@ Vue.use(PageComponents);
 Vue.use(UserComponent);
 Vue.use(PortletComponent);
 
-router.beforeEach((to: any, from: any, next: any) => {
-  if (to.meta && !to.meta.ignoreAddPage) {
-    router.app.$store.commit('addPage', to);
-  }
-  next();
-});
-
 Interceptors.getInstance(router, store);
 
 const init = async () => {

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

@@ -3,9 +3,13 @@ import Router from 'vue-router';
 import { AuthGuard } from '@/utils';
 import qs from 'qs';
 import { globalRoutes, indexRoutes} from '@/router'
+import { AppService } from '@/studio-core/service/app-service/AppService';
 
 Vue.use(Router);
 
+const appService = new AppService();
+
+
 const router = new Router({
     routes: [
         {
@@ -4641,7 +4645,7 @@ const router = new Router({
                 ignoreAddPage: true,
             },
             beforeEnter: (to: any, from: any, next: any) => {
-                router.app.$store.commit('resetRootStateData');
+                appService.navHistory.reset();
                 next();
             },
             component: () => import('@components/login/login.vue'),
@@ -4660,4 +4664,12 @@ const router = new Router({
         }
     ]
 });
+
+router.beforeEach((to: any, from: any, next: any) => {
+    if (to.meta && !to.meta.ignoreAddPage) {
+        appService.navHistory.add(to);
+    }
+    next();
+});
+
 export default router;
\ No newline at end of file

app_CRM/src/service/ibiz-list/ibiz-list-service-base.ts

@@ -62,11 +62,11 @@ export default class IBizListServiceBase extends EntityService {
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let listaccountsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
-            listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
-            if(listaccountsData && listaccountsData.length && listaccountsData.length > 0){
-                listaccountsData.forEach((item:any) => {
+        let campaignlistsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
+            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
+            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
+                campaignlistsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -76,12 +76,12 @@ export default class IBizListServiceBase extends EntityService {
                 });
             }
         }
-        masterData.listaccounts = listaccountsData;
-        let campaignlistsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
-            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
-            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
-                campaignlistsData.forEach((item:any) => {
+        masterData.campaignlists = campaignlistsData;
+        let listaccountsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
+            listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
+            if(listaccountsData && listaccountsData.length && listaccountsData.length > 0){
+                listaccountsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -91,7 +91,7 @@ export default class IBizListServiceBase extends EntityService {
                 });
             }
         }
-        masterData.campaignlists = campaignlistsData;
+        masterData.listaccounts = listaccountsData;
         let listleadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
             listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
@@ -131,8 +131,8 @@ export default class IBizListServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/ibizlists`,data,isloading);
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
         return res;
@@ -149,11 +149,11 @@ export default class IBizListServiceBase extends EntityService {
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let listaccountsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
-            listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
-            if(listaccountsData && listaccountsData.length && listaccountsData.length > 0){
-                listaccountsData.forEach((item:any) => {
+        let campaignlistsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
+            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
+            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
+                campaignlistsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -163,12 +163,12 @@ export default class IBizListServiceBase extends EntityService {
                 });
             }
         }
-        masterData.listaccounts = listaccountsData;
-        let campaignlistsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
-            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
-            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
-                campaignlistsData.forEach((item:any) => {
+        masterData.campaignlists = campaignlistsData;
+        let listaccountsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
+            listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
+            if(listaccountsData && listaccountsData.length && listaccountsData.length > 0){
+                listaccountsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -178,7 +178,7 @@ export default class IBizListServiceBase extends EntityService {
                 });
             }
         }
-        masterData.campaignlists = campaignlistsData;
+        masterData.listaccounts = listaccountsData;
         let listleadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
             listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
@@ -211,8 +211,8 @@ export default class IBizListServiceBase extends EntityService {
         masterData.listcontacts = listcontactsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/ibizlists/${context.ibizlist}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
+            this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
             this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             return res;
@@ -242,8 +242,8 @@ export default class IBizListServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/ibizlists/${context.ibizlist}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
+            this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
             this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             return res;
@@ -261,8 +261,8 @@ export default class IBizListServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/ibizlists/getdraft`,isloading);
         res.data.ibizlist = data.ibizlist;
-            this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
+            this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
             this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
         return res;
@@ -292,11 +292,11 @@ export default class IBizListServiceBase extends EntityService {
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let listaccountsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
-            listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
-            if(listaccountsData && listaccountsData.length && listaccountsData.length > 0){
-                listaccountsData.forEach((item:any) => {
+        let campaignlistsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
+            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
+            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
+                campaignlistsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -306,12 +306,12 @@ export default class IBizListServiceBase extends EntityService {
                 });
             }
         }
-        masterData.listaccounts = listaccountsData;
-        let campaignlistsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
-            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
-            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
-                campaignlistsData.forEach((item:any) => {
+        masterData.campaignlists = campaignlistsData;
+        let listaccountsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
+            listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
+            if(listaccountsData && listaccountsData.length && listaccountsData.length > 0){
+                listaccountsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -321,7 +321,7 @@ export default class IBizListServiceBase extends EntityService {
                 });
             }
         }
-        masterData.campaignlists = campaignlistsData;
+        masterData.listaccounts = listaccountsData;
         let listleadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
             listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
@@ -354,8 +354,8 @@ export default class IBizListServiceBase extends EntityService {
         masterData.listcontacts = listcontactsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/ibizlists/${context.ibizlist}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
+            this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
             this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             return res;

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

@@ -62,21 +62,6 @@ export default class ProductServiceBase extends EntityService {
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let productassociationsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productassociations'),'undefined')){
-            productassociationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productassociations') as any);
-            if(productassociationsData && productassociationsData.length && productassociationsData.length > 0){
-                productassociationsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.productassociationid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.productassociations = productassociationsData;
         let productsubstitutesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes'),'undefined')){
             productsubstitutesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes') as any);
@@ -107,6 +92,21 @@ export default class ProductServiceBase extends EntityService {
             }
         }
         masterData.productpricelevels = productpricelevelsData;
+        let productassociationsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productassociations'),'undefined')){
+            productassociationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productassociations') as any);
+            if(productassociationsData && productassociationsData.length && productassociationsData.length > 0){
+                productassociationsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.productassociationid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.productassociations = productassociationsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -116,9 +116,9 @@ export default class ProductServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/products`,data,isloading);
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
         return res;
     }
 
@@ -133,21 +133,6 @@ export default class ProductServiceBase extends EntityService {
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let productassociationsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productassociations'),'undefined')){
-            productassociationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productassociations') as any);
-            if(productassociationsData && productassociationsData.length && productassociationsData.length > 0){
-                productassociationsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.productassociationid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.productassociations = productassociationsData;
         let productsubstitutesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes'),'undefined')){
             productsubstitutesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes') as any);
@@ -178,11 +163,26 @@ export default class ProductServiceBase extends EntityService {
             }
         }
         masterData.productpricelevels = productpricelevelsData;
+        let productassociationsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productassociations'),'undefined')){
+            productassociationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productassociations') as any);
+            if(productassociationsData && productassociationsData.length && productassociationsData.length > 0){
+                productassociationsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.productassociationid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.productassociations = productassociationsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/products/${context.product}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
             this.tempStorage.setItem(context.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
             this.tempStorage.setItem(context.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
+            this.tempStorage.setItem(context.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
             return res;
     }
 
@@ -210,9 +210,9 @@ export default class ProductServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/products/${context.product}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
             this.tempStorage.setItem(context.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
             this.tempStorage.setItem(context.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
+            this.tempStorage.setItem(context.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
             return res;
     }
 
@@ -228,9 +228,9 @@ export default class ProductServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/products/getdraft`,isloading);
         res.data.product = data.product;
-            this.tempStorage.setItem(context.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
             this.tempStorage.setItem(context.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
             this.tempStorage.setItem(context.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
+            this.tempStorage.setItem(context.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
         return res;
     }
 
@@ -258,21 +258,6 @@ export default class ProductServiceBase extends EntityService {
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let productassociationsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productassociations'),'undefined')){
-            productassociationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productassociations') as any);
-            if(productassociationsData && productassociationsData.length && productassociationsData.length > 0){
-                productassociationsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.productassociationid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.productassociations = productassociationsData;
         let productsubstitutesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes'),'undefined')){
             productsubstitutesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes') as any);
@@ -303,11 +288,26 @@ export default class ProductServiceBase extends EntityService {
             }
         }
         masterData.productpricelevels = productpricelevelsData;
+        let productassociationsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productassociations'),'undefined')){
+            productassociationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productassociations') as any);
+            if(productassociationsData && productassociationsData.length && productassociationsData.length > 0){
+                productassociationsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.productassociationid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.productassociations = productassociationsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/products/${context.product}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
             this.tempStorage.setItem(context.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
             this.tempStorage.setItem(context.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
+            this.tempStorage.setItem(context.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
             return res;
     }
 

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

@@ -449,6 +449,85 @@ export default class QuoteServiceBase extends EntityService {
             return Http.getInstance().post(`/quotes/${context.quote}/checkkey`,data,isloading);
     }
 
+    /**
+     * GenSalesOrder接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof QuoteServiceBase
+     */
+    public async GenSalesOrder(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.account && context.contact && context.opportunity && context.quote){
+            let masterData:any = {};
+        let quotedetailsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
+            quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
+            if(quotedetailsData && quotedetailsData.length && quotedetailsData.length > 0){
+                quotedetailsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.quotedetailid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.quotedetails = quotedetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/gensalesorder`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        if(context.contact && context.opportunity && context.quote){
+            let masterData:any = {};
+        let quotedetailsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
+            quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
+            if(quotedetailsData && quotedetailsData.length && quotedetailsData.length > 0){
+                quotedetailsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.quotedetailid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.quotedetails = quotedetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/gensalesorder`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        if(context.opportunity && context.quote){
+            let masterData:any = {};
+        let quotedetailsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
+            quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
+            if(quotedetailsData && quotedetailsData.length && quotedetailsData.length > 0){
+                quotedetailsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.quotedetailid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.quotedetails = quotedetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/opportunities/${context.opportunity}/quotes/${context.quote}/gensalesorder`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+            return Http.getInstance().post(`/quotes/${context.quote}/gensalesorder`,data,isloading);
+    }
+
     /**
      * Save接口方法
      *
@@ -547,6 +626,85 @@ export default class QuoteServiceBase extends EntityService {
             return res;
     }
 
+    /**
+     * Win接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof QuoteServiceBase
+     */
+    public async Win(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.account && context.contact && context.opportunity && context.quote){
+            let masterData:any = {};
+        let quotedetailsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
+            quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
+            if(quotedetailsData && quotedetailsData.length && quotedetailsData.length > 0){
+                quotedetailsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.quotedetailid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.quotedetails = quotedetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/win`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        if(context.contact && context.opportunity && context.quote){
+            let masterData:any = {};
+        let quotedetailsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
+            quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
+            if(quotedetailsData && quotedetailsData.length && quotedetailsData.length > 0){
+                quotedetailsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.quotedetailid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.quotedetails = quotedetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/win`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        if(context.opportunity && context.quote){
+            let masterData:any = {};
+        let quotedetailsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
+            quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
+            if(quotedetailsData && quotedetailsData.length && quotedetailsData.length > 0){
+                quotedetailsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.quotedetailid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.quotedetails = quotedetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/opportunities/${context.opportunity}/quotes/${context.quote}/win`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+            return Http.getInstance().post(`/quotes/${context.quote}/win`,data,isloading);
+    }
+
     /**
      * FetchDefault接口方法
      *

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

@@ -62,21 +62,6 @@ export default class SalesLiteratureServiceBase extends EntityService {
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let productsalesliteraturesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures'),'undefined')){
-            productsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures') as any);
-            if(productsalesliteraturesData && productsalesliteraturesData.length && productsalesliteraturesData.length > 0){
-                productsalesliteraturesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.productsalesliteratures = productsalesliteraturesData;
         let salesliteratureitemsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems'),'undefined')){
             salesliteratureitemsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems') as any);
@@ -107,6 +92,21 @@ export default class SalesLiteratureServiceBase extends EntityService {
             }
         }
         masterData.competitorsalesliteratures = competitorsalesliteraturesData;
+        let productsalesliteraturesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures'),'undefined')){
+            productsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures') as any);
+            if(productsalesliteraturesData && productsalesliteraturesData.length && productsalesliteraturesData.length > 0){
+                productsalesliteraturesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.productsalesliteratures = productsalesliteraturesData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -116,9 +116,9 @@ export default class SalesLiteratureServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/salesliteratures`,data,isloading);
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
         return res;
     }
 
@@ -133,21 +133,6 @@ export default class SalesLiteratureServiceBase extends EntityService {
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let productsalesliteraturesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures'),'undefined')){
-            productsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures') as any);
-            if(productsalesliteraturesData && productsalesliteraturesData.length && productsalesliteraturesData.length > 0){
-                productsalesliteraturesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.productsalesliteratures = productsalesliteraturesData;
         let salesliteratureitemsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems'),'undefined')){
             salesliteratureitemsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems') as any);
@@ -178,11 +163,26 @@ export default class SalesLiteratureServiceBase extends EntityService {
             }
         }
         masterData.competitorsalesliteratures = competitorsalesliteraturesData;
+        let productsalesliteraturesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures'),'undefined')){
+            productsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures') as any);
+            if(productsalesliteraturesData && productsalesliteraturesData.length && productsalesliteraturesData.length > 0){
+                productsalesliteraturesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.productsalesliteratures = productsalesliteraturesData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/salesliteratures/${context.salesliterature}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
             this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
             this.tempStorage.setItem(context.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
+            this.tempStorage.setItem(context.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
             return res;
     }
 
@@ -210,9 +210,9 @@ export default class SalesLiteratureServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/salesliteratures/${context.salesliterature}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
             this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
             this.tempStorage.setItem(context.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
+            this.tempStorage.setItem(context.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
             return res;
     }
 
@@ -228,9 +228,9 @@ export default class SalesLiteratureServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/salesliteratures/getdraft`,isloading);
         res.data.salesliterature = data.salesliterature;
-            this.tempStorage.setItem(context.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
             this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
             this.tempStorage.setItem(context.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
+            this.tempStorage.setItem(context.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
         return res;
     }
 
@@ -258,21 +258,6 @@ export default class SalesLiteratureServiceBase extends EntityService {
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let productsalesliteraturesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures'),'undefined')){
-            productsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures') as any);
-            if(productsalesliteraturesData && productsalesliteraturesData.length && productsalesliteraturesData.length > 0){
-                productsalesliteraturesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.productsalesliteratures = productsalesliteraturesData;
         let salesliteratureitemsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems'),'undefined')){
             salesliteratureitemsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems') as any);
@@ -303,11 +288,26 @@ export default class SalesLiteratureServiceBase extends EntityService {
             }
         }
         masterData.competitorsalesliteratures = competitorsalesliteraturesData;
+        let productsalesliteraturesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures'),'undefined')){
+            productsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures') as any);
+            if(productsalesliteraturesData && productsalesliteraturesData.length && productsalesliteraturesData.length > 0){
+                productsalesliteraturesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.productsalesliteratures = productsalesliteraturesData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/salesliteratures/${context.salesliterature}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
             this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
             this.tempStorage.setItem(context.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
+            this.tempStorage.setItem(context.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
             return res;
     }
 

app_CRM/src/store/mutations.ts

@@ -51,190 +51,12 @@ export const updateAppData = (state: any, appdata: string) => {
 export const updateCodeList = (state: any, { srfkey, items }: { srfkey: string, items: any[] }) => {
     const index = state.codelists.findIndex((_codelist: any) => Object.is(_codelist.srfkey, srfkey));
     if (index === -1) {
-        console.log(`${srfkey} ---- 代码表不存在`);
+        console.log(`更新代码表，代码表「${srfkey}」不存在`);
         return;
     }
     state.codelists[index].items = [...items];
 }
 
-/**
- * 修改主题
- * 
- * @param state 
- * @param val 
- */
-export const setCurrentSelectTheme = (state: any, val: any) => {
-    state.selectTheme = val;
-}
-
-/**
- * 修改字体
- * 
- * @param state 
- * @param val 
- */
-export const setCurrentSelectFont = (state: any, val: any) => {
-    state.selectFont = val;
-}
-
-/**
- * 重置分页导航数据
- * 
- * @param state 
- */
-export const resetRootStateData = (state: any) => {
-    state.pageTagList = [];
-    state.pageMetas = [];
-    state.historyPathList = [];
-}
-
-/**
- * 添加导航页面
- * 
- * @param state 
- * @param arg 
- */
-export const addPage = (state: any, arg: any) => {
-    if (!arg) {
-        return;
-    }
-    if (Object.is(arg.meta.viewType, 'APPINDEX')) {
-        window.sessionStorage.setItem(Environment.AppName, arg.fullPath);
-    } else {
-        const page: any = {};
-        const pageMeta: any = {};
-        Object.assign(page, arg);
-        Object.assign(pageMeta, page.meta, { info: null });
-        const index = state.pageTagList.findIndex((tag: any) => Object.is(tag.fullPath, page.fullPath));
-        if (index < 0) {
-            state.pageTagList.push(page);
-            state.pageMetas.push(pageMeta);
-        } else {
-            const index2 = state.historyPathList.indexOf(page.fullPath);
-            if (index2 >= 0) {
-                state.historyPathList.splice(index2, 1);
-            }
-        }
-        state.historyPathList.push(page.fullPath);
-    }
-}
-
-/**
- * 删除导航页面
- * 
- * @param state 
- * @param arg 
- */
-export const deletePage = (state: any, arg: any) => {
-    let delPage: any = null;
-    if (isNaN(arg)) {
-        const index = state.pageTagList.findIndex((page: any) => Object.is(page.fullPath, arg));
-        if (index >= 0) {
-            delPage = state.pageTagList[index];
-            state.pageTagList.splice(index, 1);
-            state.pageMetas.splice(index, 1);
-        }
-    } else {
-        delPage = state.pageTagList[arg];
-        state.pageTagList.splice(arg, 1);
-        state.pageMetas.splice(arg, 1);
-    }
-    const index = state.historyPathList.findIndex((path: any) => Object.is(path, delPage.fullPath));
-    if (index >= 0) {
-        state.historyPathList.splice(index, 1);
-    }
-}
-
-/**
- * 设置导航页面
- * 
- * @param state 
- * @param arg 
- */
-export const setCurPage = (state: any, arg: any) => {
-    let page: any = null;
-    if (isNaN(arg)) {
-        const index = state.pageTagList.findIndex((page: any) => Object.is(page.fullPath, arg));
-        if (index >= 0) {
-            page = state.pageTagList[index];
-        }
-    } else {
-        page = state.pageTagList[arg];
-    }
-    if (page) {
-        const index = state.historyPathList.findIndex((path: any) => Object.is(path, page.fullPath));
-        if (index >= 0) {
-            state.historyPathList.splice(index, 1);
-            state.historyPathList.push(page.fullPath);
-        }
-    }
-}
-
-/**
- * 设置导航页面标题
- * 
- * @param state 
- * @param param1 
- */
-export const setCurPageCaption = (state: any, { route, caption, info }: { route: any, caption: string | null, info: string | null }) => {
-    if (route) {
-        const index = state.pageTagList.findIndex((page: any) => Object.is(page.fullPath, route.fullPath));
-        if (index >= 0) {
-            state.pageMetas[index].caption = caption;
-            state.pageMetas[index].info = info;
-        }
-    }
-}
-
-/**
- * 添加当前视图视图标识
- * 
- * @param state 
- * @param param1 
- */
-export const addCurPageViewtag = (state: any, { fullPath, viewtag }: { fullPath: string, viewtag: string }) => {
-    const index = state.pageTagList.findIndex((page: any) => Object.is(page.fullPath, fullPath));
-    if (index >= 0) {
-        state.pageTagList[index].viewtag = viewtag;
-    }
-}
-
-/**
- * 删除所有导航页面
- * 
- * @param state 
- */
-export const removeAllPage = (state: any) => {
-    if (state.pageTagList.length > 0) {
-        state.pageMetas = [];
-        state.pageTagList = [];
-        state.historyPathList = [];
-    }
-}
-
-/**
- * 删除其他导航页面
- * 
- * @param state 
- */
-export const removeOtherPage = (state: any) => {
-    if (state.historyPathList.length > 0) {
-        const curPath = state.historyPathList[state.historyPathList.length - 1];
-        const index = state.pageTagList.findIndex((page: any) => Object.is(page.fullPath, curPath));
-        if (index >= 0) {
-            const page = state.pageTagList[index];
-            const meta: any = {};
-            Object.assign(meta, page.meta);
-            state.pageTagList = [];
-            state.pageMetas = [];
-            state.historyPathList = [];
-            state.historyPathList.push(page.fullPath);
-            state.pageTagList.push(page);
-            state.pageMetas.push(meta);
-        }
-    }
-}
-
 /**
  * 更新 z-index 
  * 

app_CRM/src/store/state.ts

@@ -3,17 +3,12 @@
  * 根state
  */
 export const rootstate: any = {
-    pageTagList: [],
-    pageMetas: [],
-    historyPathList: [],
     codelists: [],
-    selectTheme: '',
-    selectFont: '',
     appdata: '',
     localdata: {},
     zIndex: 300,
     viewSplit: {},
     copyDataMap:{},
     orgDataMap:{},
-    depDataMap:{},
+    depDataMap:{}
 }
\ No newline at end of file

app_CRM/src/studio-core/components/user-info/user-info.tsx

@@ -56,12 +56,7 @@ export class UserInfo extends Vue {
             return;
         }
         if (name === 'custom-logout') {
-            const leftTime = new Date();
-            leftTime.setTime(leftTime.getSeconds() - 1000);
-            document.cookie = "ibzuaa-token=;expires=" + leftTime.toUTCString();
-            localStorage.removeItem('token');
-            location.href = location.origin + location.pathname + '#/login?redirect=' + encodeURIComponent(location.href);
-            return;
+            return this.$appService.logout();
         }
         const item: any = this.findMenuByName(name);
         if (item) {

app_CRM/src/studio-core/index.ts

@@ -89,7 +89,7 @@ export const StudioCore = {
     install(v: any, opt: any) {
         // 注册服务
         v.prototype.$acc = acc;
-        v.prototype.$app = new AppService();
+        v.prototype.$appService = new AppService();
         v.prototype.$footerMenuService = new FooterItemsService();
         v.prototype.$uiState = new UIStateService();
         // 注册组件

app_CRM/src/studio-core/service/UIStateService.ts

@@ -43,7 +43,6 @@ export class UIStateService {
         } catch (error) {
             this.fillLayoutState({});
         }
-        let z = this;
         on(window, 'beforeunload', () => {
             localStorage.setItem(this.localStoreKey, JSON.stringify(this.layoutState));
         });

app_CRM/src/studio-core/service/app-nav-history/AppNavHistoryBase.ts

 import { AppContextStore } from '../app-context-store/AppContextStore';
+import { UIStateService } from '../UIStateService';
 
 /**
  * 应用导航记录基类
@@ -15,4 +16,150 @@ export class AppNavHistoryBase {
      * @memberof AppNavHistoryBase
      */
     public readonly contextStore: AppContextStore = new AppContextStore();
+
+    /**
+     * 界面UI状态服务
+     *
+     * @type {UIStateService}
+     * @memberof AppNavHistoryBase
+     */
+    public readonly uiStateService: UIStateService = new UIStateService();
+
+    /**
+     * 路由记录缓存
+     *
+     * @type {any[]}
+     * @memberof AppNavHistoryBase
+     */
+    public readonly historyList: any[] = [];
+
+    /**
+     * 导航缓存，忽略判断的导航参数正则
+     */
+    public readonly navIgnoreParameters: RegExp = new RegExp(/(srftabactivate|srftreeexpactivate)/);
+
+    /**
+     * 查找路由缓存
+     *
+     * @protected
+     * @param {*} page
+     * @param {any[]} [list=this.historyList]
+     * @returns {number}
+     * @memberof AppNavHistoryBase
+     */
+    protected findHistoryIndex(page: any, list: any[] = this.historyList): number {
+        if (page === undefined || page === null) {
+            return -1;
+        }
+        return list.findIndex((item: any) => {
+            // 基本路径是否一致
+            if (Object.is(item.path, page.path)) {
+                // 历史路径是否存在参数
+                if (this.uiStateService.layoutState.styleMode === 'STYLE2' && item.query) {
+                    let judge: boolean = true;
+                    // 新路径是否存在参数
+                    if (page.query) {
+                        for (const key in page.query) {
+                            // 忽略的参数略过
+                            if (this.navIgnoreParameters.test(`|${key}|`)) {
+                                continue;
+                            }
+                            if (item.query[key] === undefined || item.query[key] === null) {
+                                judge = false;
+                            }
+                        }
+                    } else {
+                        judge = false;
+                    }
+                    return judge;
+                }
+                return true;
+            }
+            return false;
+        });;
+    }
+
+    /**
+     * 添加视图缓存
+     *
+     * @param {*} page 当前路由信息
+     * @memberof AppNavHistoryBase
+     */
+    public add(page: any): void {
+        if (this.findHistoryIndex(page) === -1) {
+            this.historyList.push(page);
+        }
+    }
+
+    /**
+     * 删除视图缓存
+     *
+     * @param {*} page
+     * @memberof AppNavHistoryBase
+     */
+    public remove(page: any): void {
+        const i = this.findHistoryIndex(page);
+        if (i !== -1) {
+            this.historyList.splice(i, 1);
+        }
+    }
+
+    /**
+     * 重置路由缓存
+     *
+     * @memberof AppNavHistoryBase
+     */
+    public reset(): void {
+        this.historyList.splice(0, this.historyList.length);
+    }
+
+    /**
+     * 设置指定缓存视图标题
+     *
+     * @param {({ route: any, caption: string | null, info: string | null })} { route, caption, info }
+     * @returns {boolean}
+     * @memberof AppNavHistoryBase
+     */
+    public setCaption({ route, caption, info }: { route: any, caption: string | null, info: string | null }): boolean {
+        const i = this.findHistoryIndex(route);
+        if (i === -1) {
+            return false;
+        }
+        const page = this.historyList[i];
+        Object.assign(page.meta, { caption, info });
+        return true;
+    }
+
+    /**
+     * 设置缓存视图标识
+     *
+     * @param {string} tag
+     * @param {*} route
+     * @returns {boolean}
+     * @memberof AppNavHistoryBase
+     */
+    public setViewTag(tag: string, route: any): boolean {
+        const i = this.findHistoryIndex(route);
+        if (i === -1) {
+            return false;
+        }
+        const page = this.historyList[i];
+        page.viewtag = tag;
+        return true;
+    }
+
+    /**
+     * 删除其他缓存
+     *
+     * @param {*} page
+     * @memberof AppNavHistoryBase
+     */
+    public removeOther(page: any): void {
+        const i = this.findHistoryIndex(page);
+        if (i !== -1) {
+            const page = this.historyList[i];
+            this.historyList.splice(0, this.historyList.length);
+            this.historyList.push(page);
+        }
+    }
 }
\ No newline at end of file

app_CRM/src/studio-core/service/app-service/AppServiceBase.ts

@@ -24,4 +24,17 @@ export class AppServiceBase {
      * @memberof AppServiceBase
      */
     public readonly contextStore: AppContextStore = this.navHistory.contextStore;
+
+    /**
+     * 退出登录
+     *
+     * @memberof AppServiceBase
+     */
+    public logout(): void {
+        const leftTime = new Date();
+        leftTime.setTime(leftTime.getSeconds() - 1000);
+        document.cookie = "ibzuaa-token=;expires=" + leftTime.toUTCString();
+        localStorage.removeItem('token');
+        location.href = location.origin + location.pathname + '#/login?redirect=' + encodeURIComponent(location.href);
+    }
 }
\ No newline at end of file

app_CRM/src/studio-core/types/index.d.ts

@@ -6,7 +6,7 @@ import { UIStateService } from "../service/UIStateService";
 declare module "vue/types/vue" {
     interface Vue {
         $acc: AppCommunicationsCenter,
-        $app: AppService,
+        $appService: AppService,
         $footerMenuService: FooterItemsService,
         $uiState: UIStateService
     }

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/extensions.service/QuoteServiceEx.java

+package cn.ibizlab.businesscentral.core.extensions.service;
+
+/**
+ * 扩展目录已变更，请到[cn.ibizlab.businesscentral.core.extensions.service.xxExService]中来进行扩展
+ * 若您之前有在当前目录下扩展过其它的service对象，请将扩展的代码移到新的扩展类中，并注释掉老的扩展类，防止Bean重复
+ */
+@Deprecated
+public class QuoteServiceEx{
+
+}
+
+

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/extensions/service/QuoteExService.java

+package cn.ibizlab.businesscentral.core.extensions.service;
+
+import cn.ibizlab.businesscentral.core.sales.service.impl.QuoteServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import cn.ibizlab.businesscentral.core.sales.domain.Quote;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.context.annotation.Primary;
+import java.util.*;
+
+/**
+ * 实体[报价单] 自定义服务对象
+ */
+@Slf4j
+@Primary
+@Service("QuoteExService")
+public class QuoteExService extends QuoteServiceImpl {
+
+    @Override
+    protected Class currentModelClass() {
+        return com.baomidou.mybatisplus.core.toolkit.ReflectionKit.getSuperClassGenericType(this.getClass().getSuperclass(), 1);
+    }
+
+    /**
+     * 自定义行为[GenSalesOrder]用户扩展
+     * @param et
+     * @return
+     */
+    @Override
+    @Transactional
+    public Quote genSalesOrder(Quote et) {
+        return super.genSalesOrder(et);
+    }
+    /**
+     * 自定义行为[Win]用户扩展
+     * @param et
+     * @return
+     */
+    @Override
+    @Transactional
+    public Quote win(Quote et) {
+        return super.win(et);
+    }
+}
+

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

@@ -34,8 +34,10 @@ public interface IQuoteService extends IService<Quote>{
     Quote get(String key) ;
     Quote getDraft(Quote et) ;
     boolean checkKey(Quote et) ;
+    Quote genSalesOrder(Quote et) ;
     boolean save(Quote et) ;
     void saveBatch(List<Quote> list) ;
+    Quote win(Quote et) ;
     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/impl/QuoteServiceImpl.java

@@ -138,6 +138,13 @@ public class QuoteServiceImpl extends ServiceImpl<QuoteMapper, Quote> implements
     public boolean checkKey(Quote et) {
         return (!ObjectUtils.isEmpty(et.getQuoteid()))&&(!Objects.isNull(this.getById(et.getQuoteid())));
     }
+    @Override
+    @Transactional
+    public Quote genSalesOrder(Quote et) {
+        //自定义代码
+        return et;
+    }
+
     @Override
     @Transactional
     public boolean save(Quote et) {
@@ -171,6 +178,13 @@ public class QuoteServiceImpl extends ServiceImpl<QuoteMapper, Quote> implements
         saveOrUpdateBatch(list,batchSize);
     }
 
+    @Override
+    @Transactional
+    public Quote win(Quote et) {
+        //自定义代码
+        return et;
+    }
+
 
 	@Override
     public List<Quote> selectByCampaignid(String campaignid) {

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

@@ -3810,7 +3810,7 @@
 
 
     <!--输出实体[QUOTE]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-quote-49-49">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-quote-51-49">
         <createTable tableName="QUOTE">
                 <column name="BILLTO_COUNTRY" remarks="" type="VARCHAR(80)">
                 </column>
@@ -11279,19 +11279,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-49-237">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-51-237">
        <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-49-238">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-51-238">
        <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-49-239">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-51-239">
        <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-49-240">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-51-240">
        <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-49-241">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-51-241">
        <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]外键关系 -->

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

@@ -288,7 +288,7 @@
     "delogicname":"报价单",
     "sysmoudle":{"id":"SALES","name":"Sales"},
     "dedataset":[{"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":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" }],
+    "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":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"GenSalesOrder" , "name":"创建订单" , "type":"USERCUSTOM" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" },{"id":"Win" , "name":"赢单" , "type":"USERCUSTOM" }],
     "datascope":[{"id":"all","name":"全部数据"}, {"id":"createman","name":"创建人"}]
      }
     ,    {

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

@@ -124,6 +124,18 @@ public class QuoteResource {
         return  ResponseEntity.status(HttpStatus.OK).body(quoteService.checkKey(quoteMapping.toDomain(quotedto)));
     }
 
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Quote-GenSalesOrder-all')")
+    @ApiOperation(value = "创建订单", tags = {"报价单" },  notes = "创建订单")
+	@RequestMapping(method = RequestMethod.POST, value = "/quotes/{quote_id}/gensalesorder")
+    @Transactional
+    public ResponseEntity<QuoteDTO> genSalesOrder(@PathVariable("quote_id") String quote_id, @RequestBody QuoteDTO quotedto) {
+        Quote domain = quoteMapping.toDomain(quotedto);
+        domain.setQuoteid(quote_id);
+        domain = quoteService.genSalesOrder(domain);
+        quotedto = quoteMapping.toDto(domain);
+        return ResponseEntity.status(HttpStatus.OK).body(quotedto);
+    }
+
     @PreAuthorize("hasPermission(this.quoteMapping.toDomain(#quotedto),'iBizBusinessCentral-Quote-Save')")
     @ApiOperation(value = "保存报价单", tags = {"报价单" },  notes = "保存报价单")
 	@RequestMapping(method = RequestMethod.POST, value = "/quotes/save")
@@ -139,6 +151,18 @@ public class QuoteResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Quote-Win-all')")
+    @ApiOperation(value = "赢单", tags = {"报价单" },  notes = "赢单")
+	@RequestMapping(method = RequestMethod.POST, value = "/quotes/{quote_id}/win")
+    @Transactional
+    public ResponseEntity<QuoteDTO> win(@PathVariable("quote_id") String quote_id, @RequestBody QuoteDTO quotedto) {
+        Quote domain = quoteMapping.toDomain(quotedto);
+        domain.setQuoteid(quote_id);
+        domain = quoteService.win(domain);
+        quotedto = quoteMapping.toDto(domain);
+        return ResponseEntity.status(HttpStatus.OK).body(quotedto);
+    }
+
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Quote-searchDefault-all') and hasPermission(#context,'iBizBusinessCentral-Quote-Get')")
 	@ApiOperation(value = "获取DEFAULT", tags = {"报价单" } ,notes = "获取DEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/quotes/fetchdefault")
@@ -249,6 +273,18 @@ public class QuoteResource {
         return  ResponseEntity.status(HttpStatus.OK).body(quoteService.checkKey(quoteMapping.toDomain(quotedto)));
     }
 
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Quote-GenSalesOrder-all')")
+    @ApiOperation(value = "根据商机报价单", tags = {"报价单" },  notes = "根据商机报价单")
+	@RequestMapping(method = RequestMethod.POST, value = "/opportunities/{opportunity_id}/quotes/{quote_id}/gensalesorder")
+    @Transactional
+    public ResponseEntity<QuoteDTO> genSalesOrderByOpportunity(@PathVariable("opportunity_id") String opportunity_id, @PathVariable("quote_id") String quote_id, @RequestBody QuoteDTO quotedto) {
+        Quote domain = quoteMapping.toDomain(quotedto);
+        domain.setOpportunityid(opportunity_id);
+        domain = quoteService.genSalesOrder(domain) ;
+        quotedto = quoteMapping.toDto(domain);
+        return ResponseEntity.status(HttpStatus.OK).body(quotedto);
+    }
+
     @PreAuthorize("hasPermission(this.quoteMapping.toDomain(#quotedto),'iBizBusinessCentral-Quote-Save')")
     @ApiOperation(value = "根据商机保存报价单", tags = {"报价单" },  notes = "根据商机保存报价单")
 	@RequestMapping(method = RequestMethod.POST, value = "/opportunities/{opportunity_id}/quotes/save")
@@ -270,6 +306,18 @@ public class QuoteResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Quote-Win-all')")
+    @ApiOperation(value = "根据商机报价单", tags = {"报价单" },  notes = "根据商机报价单")
+	@RequestMapping(method = RequestMethod.POST, value = "/opportunities/{opportunity_id}/quotes/{quote_id}/win")
+    @Transactional
+    public ResponseEntity<QuoteDTO> winByOpportunity(@PathVariable("opportunity_id") String opportunity_id, @PathVariable("quote_id") String quote_id, @RequestBody QuoteDTO quotedto) {
+        Quote domain = quoteMapping.toDomain(quotedto);
+        domain.setOpportunityid(opportunity_id);
+        domain = quoteService.win(domain) ;
+        quotedto = quoteMapping.toDto(domain);
+        return ResponseEntity.status(HttpStatus.OK).body(quotedto);
+    }
+
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Quote-searchDefault-all') and hasPermission(#context,'iBizBusinessCentral-Quote-Get')")
 	@ApiOperation(value = "根据商机获取DEFAULT", tags = {"报价单" } ,notes = "根据商机获取DEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/opportunities/{opportunity_id}/quotes/fetchdefault")
@@ -382,6 +430,18 @@ public class QuoteResource {
         return  ResponseEntity.status(HttpStatus.OK).body(quoteService.checkKey(quoteMapping.toDomain(quotedto)));
     }
 
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Quote-GenSalesOrder-all')")
+    @ApiOperation(value = "根据联系人商机报价单", tags = {"报价单" },  notes = "根据联系人商机报价单")
+	@RequestMapping(method = RequestMethod.POST, value = "/contacts/{contact_id}/opportunities/{opportunity_id}/quotes/{quote_id}/gensalesorder")
+    @Transactional
+    public ResponseEntity<QuoteDTO> genSalesOrderByContactOpportunity(@PathVariable("contact_id") String contact_id, @PathVariable("opportunity_id") String opportunity_id, @PathVariable("quote_id") String quote_id, @RequestBody QuoteDTO quotedto) {
+        Quote domain = quoteMapping.toDomain(quotedto);
+        domain.setOpportunityid(opportunity_id);
+        domain = quoteService.genSalesOrder(domain) ;
+        quotedto = quoteMapping.toDto(domain);
+        return ResponseEntity.status(HttpStatus.OK).body(quotedto);
+    }
+
     @PreAuthorize("hasPermission(this.quoteMapping.toDomain(#quotedto),'iBizBusinessCentral-Quote-Save')")
     @ApiOperation(value = "根据联系人商机保存报价单", tags = {"报价单" },  notes = "根据联系人商机保存报价单")
 	@RequestMapping(method = RequestMethod.POST, value = "/contacts/{contact_id}/opportunities/{opportunity_id}/quotes/save")
@@ -403,6 +463,18 @@ public class QuoteResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Quote-Win-all')")
+    @ApiOperation(value = "根据联系人商机报价单", tags = {"报价单" },  notes = "根据联系人商机报价单")
+	@RequestMapping(method = RequestMethod.POST, value = "/contacts/{contact_id}/opportunities/{opportunity_id}/quotes/{quote_id}/win")
+    @Transactional
+    public ResponseEntity<QuoteDTO> winByContactOpportunity(@PathVariable("contact_id") String contact_id, @PathVariable("opportunity_id") String opportunity_id, @PathVariable("quote_id") String quote_id, @RequestBody QuoteDTO quotedto) {
+        Quote domain = quoteMapping.toDomain(quotedto);
+        domain.setOpportunityid(opportunity_id);
+        domain = quoteService.win(domain) ;
+        quotedto = quoteMapping.toDto(domain);
+        return ResponseEntity.status(HttpStatus.OK).body(quotedto);
+    }
+
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Quote-searchDefault-all') and hasPermission(#context,'iBizBusinessCentral-Quote-Get')")
 	@ApiOperation(value = "根据联系人商机获取DEFAULT", tags = {"报价单" } ,notes = "根据联系人商机获取DEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/contacts/{contact_id}/opportunities/{opportunity_id}/quotes/fetchdefault")
@@ -515,6 +587,18 @@ public class QuoteResource {
         return  ResponseEntity.status(HttpStatus.OK).body(quoteService.checkKey(quoteMapping.toDomain(quotedto)));
     }
 
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Quote-GenSalesOrder-all')")
+    @ApiOperation(value = "根据客户联系人商机报价单", tags = {"报价单" },  notes = "根据客户联系人商机报价单")
+	@RequestMapping(method = RequestMethod.POST, value = "/accounts/{account_id}/contacts/{contact_id}/opportunities/{opportunity_id}/quotes/{quote_id}/gensalesorder")
+    @Transactional
+    public ResponseEntity<QuoteDTO> genSalesOrderByAccountContactOpportunity(@PathVariable("account_id") String account_id, @PathVariable("contact_id") String contact_id, @PathVariable("opportunity_id") String opportunity_id, @PathVariable("quote_id") String quote_id, @RequestBody QuoteDTO quotedto) {
+        Quote domain = quoteMapping.toDomain(quotedto);
+        domain.setOpportunityid(opportunity_id);
+        domain = quoteService.genSalesOrder(domain) ;
+        quotedto = quoteMapping.toDto(domain);
+        return ResponseEntity.status(HttpStatus.OK).body(quotedto);
+    }
+
     @PreAuthorize("hasPermission(this.quoteMapping.toDomain(#quotedto),'iBizBusinessCentral-Quote-Save')")
     @ApiOperation(value = "根据客户联系人商机保存报价单", tags = {"报价单" },  notes = "根据客户联系人商机保存报价单")
 	@RequestMapping(method = RequestMethod.POST, value = "/accounts/{account_id}/contacts/{contact_id}/opportunities/{opportunity_id}/quotes/save")
@@ -536,6 +620,18 @@ public class QuoteResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Quote-Win-all')")
+    @ApiOperation(value = "根据客户联系人商机报价单", tags = {"报价单" },  notes = "根据客户联系人商机报价单")
+	@RequestMapping(method = RequestMethod.POST, value = "/accounts/{account_id}/contacts/{contact_id}/opportunities/{opportunity_id}/quotes/{quote_id}/win")
+    @Transactional
+    public ResponseEntity<QuoteDTO> winByAccountContactOpportunity(@PathVariable("account_id") String account_id, @PathVariable("contact_id") String contact_id, @PathVariable("opportunity_id") String opportunity_id, @PathVariable("quote_id") String quote_id, @RequestBody QuoteDTO quotedto) {
+        Quote domain = quoteMapping.toDomain(quotedto);
+        domain.setOpportunityid(opportunity_id);
+        domain = quoteService.win(domain) ;
+        quotedto = quoteMapping.toDto(domain);
+        return ResponseEntity.status(HttpStatus.OK).body(quotedto);
+    }
+
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Quote-searchDefault-all') and hasPermission(#context,'iBizBusinessCentral-Quote-Get')")
 	@ApiOperation(value = "根据客户联系人商机获取DEFAULT", tags = {"报价单" } ,notes = "根据客户联系人商机获取DEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/accounts/{account_id}/contacts/{contact_id}/opportunities/{opportunity_id}/quotes/fetchdefault")