xignzi006 发布系统代码

app_CRM/src/locale/lang/en-US.ts

@@ -189,12 +189,16 @@ export default {
                 user_menus: "用户菜单",
                 top_menus: "顶部菜单",
                 menuitem3: "系统设置",
-                menuitem4: "链接角色",
+                menuitem39: "区域",
                 menuitem26: "货币",
+                menuitem4: "链接角色",
+                menuitem33: "计价单位",
+                menuitem36: "计价单位组",
+                menuitem37: "价目表",
+                menuitem38: "折扣表",
                 menuitem34: "消息通知",
                 menuitem35: "帮助",
                 left_exp: "左侧菜单",
-                menuitem17: "主页",
                 menuitem18: "最近",
                 menuitem19: "固定",
                 menuitem16: "我的工作",

app_CRM/src/locale/lang/zh-CN.ts

@@ -189,12 +189,16 @@ export default {
                 user_menus: "用户菜单",
                 top_menus: "顶部菜单",
                 menuitem3: "系统设置",
-                menuitem4: "链接角色",
+                menuitem39: "区域",
                 menuitem26: "货币",
+                menuitem4: "链接角色",
+                menuitem33: "计价单位",
+                menuitem36: "计价单位组",
+                menuitem37: "价目表",
+                menuitem38: "折扣表",
                 menuitem34: "消息通知",
                 menuitem35: "帮助",
                 left_exp: "左侧菜单",
-                menuitem17: "主页",
                 menuitem18: "最近",
                 menuitem19: "固定",
                 menuitem16: "我的工作",

app_CRM/src/locale/lanres/entities/incident/incident_en_US.ts

@@ -212,7 +212,7 @@ export default {
 			srfsourcekey: "", 
 			title: "案例标题", 
 			subjectname: "主题", 
-			customerid: "客户", 
+			accountname: "客户", 
 			caseorigincode: "起源", 
 			productname: "产品", 
 			entitlementname: "权利", 

app_CRM/src/locale/lanres/entities/incident/incident_zh_CN.ts

@@ -211,7 +211,7 @@ export default {
 			srfsourcekey: "", 
 			title: "案例标题", 
 			subjectname: "主题", 
-			customerid: "客户", 
+			accountname: "客户", 
 			caseorigincode: "起源", 
 			productname: "产品", 
 			entitlementname: "权利", 

app_CRM/src/mock/app/central-appmenu/central-appmenu.ts

@@ -65,21 +65,21 @@ mock.onGet('v7/centralappmenu').reply((config: any) => {
 	resourcetag: '',
 	items: [
 		{
-	id: '214745B6-68CB-4548-B138-81E07338033C',
-	name: 'menuitem4',
-	text: '链接角色',
+	id: 'F48CE2BC-A608-49B7-B339-C02D91AF9740',
+	name: 'menuitem39',
+	text: '区域',
 	type: 'MENUITEM',
 	counterid: '',
-	tooltip: '链接角色',
+	tooltip: '区域',
 	expanded: false,
 	separator: false,
 	hidden: false,
 	hidesidebar: false,
 	opendefault: false,
-	iconcls: 'fa fa-link',
+	iconcls: 'fa fa-cog',
 	icon: '',
 	textcls: '',
-	appfunctag: 'Auto27',
+	appfunctag: 'Auto24',
 	resourcetag: '',
 },
 		{
@@ -99,6 +99,96 @@ mock.onGet('v7/centralappmenu').reply((config: any) => {
 	textcls: '',
 	appfunctag: 'Auto29',
 	resourcetag: '',
+},
+		{
+	id: '214745B6-68CB-4548-B138-81E07338033C',
+	name: 'menuitem4',
+	text: '链接角色',
+	type: 'MENUITEM',
+	counterid: '',
+	tooltip: '链接角色',
+	expanded: false,
+	separator: false,
+	hidden: false,
+	hidesidebar: false,
+	opendefault: false,
+	iconcls: 'fa fa-link',
+	icon: '',
+	textcls: '',
+	appfunctag: 'Auto27',
+	resourcetag: '',
+},
+		{
+	id: '49CE3694-FE83-4A75-A3DC-87AD0FA3B89D',
+	name: 'menuitem33',
+	text: '计价单位',
+	type: 'MENUITEM',
+	counterid: '',
+	tooltip: '计价单位',
+	expanded: false,
+	separator: false,
+	hidden: false,
+	hidesidebar: false,
+	opendefault: false,
+	iconcls: 'fa fa-cog',
+	icon: '',
+	textcls: '',
+	appfunctag: 'Auto21',
+	resourcetag: '',
+},
+		{
+	id: 'FD18E8AE-A489-4ACA-BA47-86BB70CA6368',
+	name: 'menuitem36',
+	text: '计价单位组',
+	type: 'MENUITEM',
+	counterid: '',
+	tooltip: '计价单位组',
+	expanded: false,
+	separator: false,
+	hidden: false,
+	hidesidebar: false,
+	opendefault: false,
+	iconcls: 'fa fa-cog',
+	icon: '',
+	textcls: '',
+	appfunctag: 'Auto18',
+	resourcetag: '',
+},
+		{
+	id: 'E2201D09-B837-41EF-9B08-4B5FBA56BA68',
+	name: 'menuitem37',
+	text: '价目表',
+	type: 'MENUITEM',
+	counterid: '',
+	tooltip: '价目表',
+	expanded: false,
+	separator: false,
+	hidden: false,
+	hidesidebar: false,
+	opendefault: false,
+	iconcls: 'fa fa-cog',
+	icon: '',
+	textcls: '',
+	appfunctag: 'Auto31',
+	resourcetag: '',
+},
+		{
+	id: '1733455A-A7CF-446B-9BA8-709A45D01D40',
+	name: 'menuitem38',
+	text: '折扣表',
+	type: 'MENUITEM',
+	counterid: '',
+	tooltip: '折扣表',
+	expanded: false,
+	separator: false,
+	hidden: false,
+	hidesidebar: false,
+	opendefault: false,
+	iconcls: 'fa fa-cog',
+	icon: '',
+	textcls: '',
+	appfunctag: 'Auto23',
+	resourcetag: '',
 },
 	],
 },
@@ -159,24 +249,6 @@ mock.onGet('v7/centralappmenu').reply((config: any) => {
 	resourcetag: '',
 	items: [
 		{
-	id: 'bc7e54efebeacbb9d7de317c5b049c33',
-	name: 'menuitem17',
-	text: '主页',
-	type: 'MENUITEM',
-	counterid: '',
-	tooltip: '主页',
-	expanded: false,
-	separator: false,
-	hidden: false,
-	hidesidebar: false,
-	opendefault: false,
-	iconcls: 'fa fa-home',
-	icon: '',
-	textcls: '',
-	appfunctag: '',
-	resourcetag: '',
-},
-		{
 	id: '1a17fc650d716d88e6a694b4ef927d08',
 	name: 'menuitem18',
 	text: '最近',

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

@@ -239,6 +239,7 @@ export class CentralBase extends Vue {
       this.$store.getters.getAppData().context
     ) {
       Object.assign(this.context, this.$store.getters.getAppData().context);
+      this.$store.getters.getAppData().context = this.context;
     }
   }
 

app_CRM/src/pages/base/territory-edit-view/territory-edit-view.html

+<studio-view-style2 viewName="territoryeditview" viewTitle="区域编辑视图" class='deeditview territory-edit-view'>
+    <template slot='title'>
+    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    </template>
+    <template slot="toolbar">
+                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>
+    <view_form 
+                :viewState="viewState"  
+                :viewparams="viewparams" 
+                :context="context" 
+                :autosave="false" 
+                :viewtag="viewtag"
+                :showBusyIndicator="true"
+                updateAction="Update"
+                removeAction="Remove"
+                loaddraftAction="GetDraft"
+                loadAction="Get"
+                createAction="Create"
+                WFSubmitAction=""
+                WFStartAction=""
+                style='' 
+                name="form"  
+                ref='form' 
+                @save="form_save($event)"  
+                @remove="form_remove($event)"  
+                @load="form_load($event)"  
+                @closeview="closeView($event)">
+            </view_form>
+</studio-view-style2>
\ No newline at end of file

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

+<template src="./territory-edit-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { TerritoryEditViewBase } from './territory-edit-view-base';
+import view_form from '@widgets/territory/main-form/main-form.vue';
+
+/**
+ * 区域编辑视图视图
+ *
+ * @export
+ * @class TerritoryEditView
+ * @extends {TerritoryEditViewBase}
+ */
+@Component({
+    components: {
+        view_form, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class TerritoryEditView extends TerritoryEditViewBase { }
+</script>

app_CRM/src/pages/base/territory-grid-view/territory-grid-view.html

+<studio-view-style2 viewName="territorygridview" viewTitle="区域表格视图" class='degridview territory-grid-view'>
+    <template slot='title'>
+    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    </template>
+    <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" search @on-search="onSearch($event)"/>
+    <template slot="toolbar">
+                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>
+    <template slot="searchForm">
+                <view_searchform 
+            :viewState="viewState"  
+            :viewparams="viewparams" 
+            :context="context" 
+            :showBusyIndicator="true"
+            v-show="isExpandSearchForm"
+            loaddraftAction="FilterGetDraft"
+            loadAction="FilterGet"
+        
+            name="searchform"  
+            ref='searchform' 
+            @save="searchform_save($event)"  
+            @search="searchform_search($event)"  
+            @load="searchform_load($event)"  
+            @closeview="closeView($event)">
+        </view_searchform>
+    </template>
+    <view_grid 
+        :viewState="viewState"  
+        :viewparams="viewparams" 
+        :context="context" 
+        :isSingleSelect="isGridSingleSelect"
+        :showBusyIndicator="true"
+        :isOpenEdit="false"
+        :gridRowActiveMode="gridRowActiveMode"
+        @save="onSave.apply(_self, arguments)"
+        updateAction=""
+        removeAction="Remove"
+        loaddraftAction=""
+        loadAction=""
+        createAction=""
+        fetchAction="FetchDefault"
+        :newdata="newdata.bind(_self)"
+        :opendata="opendata.bind(_self)"
+        name="grid"  
+        ref='grid' 
+        @selectionchange="grid_selectionchange($event)"  
+        @beforeload="grid_beforeload($event)"  
+        @rowdblclick="grid_rowdblclick($event)"  
+        @remove="grid_remove($event)"  
+        @load="grid_load($event)"  
+        @closeview="closeView($event)">
+    </view_grid>
+</studio-view-style2>
\ No newline at end of file

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

+<template src="./territory-grid-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { TerritoryGridViewBase } from './territory-grid-view-base';
+import view_grid from '@widgets/territory/main-grid/main-grid.vue';
+import view_searchform from '@widgets/territory/default-searchform/default-searchform.vue';
+
+/**
+ * 区域表格视图视图
+ *
+ * @export
+ * @class TerritoryGridView
+ * @extends {TerritoryGridViewBase}
+ */
+@Component({
+    components: {
+        view_grid, 
+        view_searchform, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class TerritoryGridView extends TerritoryGridViewBase { }
+</script>

app_CRM/src/pages/base/uom-edit-view/uom-edit-view.html

+<studio-view-style2 viewName="uomeditview" viewTitle="计价单位编辑视图" class='deeditview uom-edit-view'>
+    <template slot='title'>
+    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    </template>
+    <template slot="toolbar">
+                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>
+    <view_form 
+                :viewState="viewState"  
+                :viewparams="viewparams" 
+                :context="context" 
+                :autosave="false" 
+                :viewtag="viewtag"
+                :showBusyIndicator="true"
+                updateAction="Update"
+                removeAction="Remove"
+                loaddraftAction="GetDraft"
+                loadAction="Get"
+                createAction="Create"
+                WFSubmitAction=""
+                WFStartAction=""
+                style='' 
+                name="form"  
+                ref='form' 
+                @save="form_save($event)"  
+                @remove="form_remove($event)"  
+                @load="form_load($event)"  
+                @closeview="closeView($event)">
+            </view_form>
+</studio-view-style2>
\ No newline at end of file

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

+<template src="./uom-edit-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { UomEditViewBase } from './uom-edit-view-base';
+import view_form from '@widgets/uom/main-form/main-form.vue';
+
+/**
+ * 计价单位编辑视图视图
+ *
+ * @export
+ * @class UomEditView
+ * @extends {UomEditViewBase}
+ */
+@Component({
+    components: {
+        view_form, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class UomEditView extends UomEditViewBase { }
+</script>

app_CRM/src/pages/base/uom-grid-view/uom-grid-view.html

+<studio-view-style2 viewName="uomgridview" viewTitle="计价单位表格视图" class='degridview uom-grid-view'>
+    <template slot='title'>
+    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    </template>
+    <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" search @on-search="onSearch($event)"/>
+    <template slot="toolbar">
+                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>
+    <template slot="searchForm">
+                <view_searchform 
+            :viewState="viewState"  
+            :viewparams="viewparams" 
+            :context="context" 
+            :showBusyIndicator="true"
+            v-show="isExpandSearchForm"
+            loaddraftAction="FilterGetDraft"
+            loadAction="FilterGet"
+        
+            name="searchform"  
+            ref='searchform' 
+            @save="searchform_save($event)"  
+            @search="searchform_search($event)"  
+            @load="searchform_load($event)"  
+            @closeview="closeView($event)">
+        </view_searchform>
+    </template>
+    <view_grid 
+        :viewState="viewState"  
+        :viewparams="viewparams" 
+        :context="context" 
+        :isSingleSelect="isGridSingleSelect"
+        :showBusyIndicator="true"
+        :isOpenEdit="false"
+        :gridRowActiveMode="gridRowActiveMode"
+        @save="onSave.apply(_self, arguments)"
+        updateAction=""
+        removeAction="Remove"
+        loaddraftAction=""
+        loadAction=""
+        createAction=""
+        fetchAction="FetchDefault"
+        :newdata="newdata.bind(_self)"
+        :opendata="opendata.bind(_self)"
+        name="grid"  
+        ref='grid' 
+        @selectionchange="grid_selectionchange($event)"  
+        @beforeload="grid_beforeload($event)"  
+        @rowdblclick="grid_rowdblclick($event)"  
+        @remove="grid_remove($event)"  
+        @load="grid_load($event)"  
+        @closeview="closeView($event)">
+    </view_grid>
+</studio-view-style2>
\ No newline at end of file

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

+<template src="./uom-grid-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { UomGridViewBase } from './uom-grid-view-base';
+import view_grid from '@widgets/uom/main-grid/main-grid.vue';
+import view_searchform from '@widgets/uom/default-searchform/default-searchform.vue';
+
+/**
+ * 计价单位表格视图视图
+ *
+ * @export
+ * @class UomGridView
+ * @extends {UomGridViewBase}
+ */
+@Component({
+    components: {
+        view_grid, 
+        view_searchform, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class UomGridView extends UomGridViewBase { }
+</script>

app_CRM/src/pages/base/uom-schedule-edit-view/uom-schedule-edit-view.html

+<studio-view-style2 viewName="uomscheduleeditview" viewTitle="计价单位组编辑视图" class='deeditview uom-schedule-edit-view'>
+    <template slot='title'>
+    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    </template>
+    <template slot="toolbar">
+                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>
+    <view_form 
+                :viewState="viewState"  
+                :viewparams="viewparams" 
+                :context="context" 
+                :autosave="false" 
+                :viewtag="viewtag"
+                :showBusyIndicator="true"
+                updateAction="Update"
+                removeAction="Remove"
+                loaddraftAction="GetDraft"
+                loadAction="Get"
+                createAction="Create"
+                WFSubmitAction=""
+                WFStartAction=""
+                style='' 
+                name="form"  
+                ref='form' 
+                @save="form_save($event)"  
+                @remove="form_remove($event)"  
+                @load="form_load($event)"  
+                @closeview="closeView($event)">
+            </view_form>
+</studio-view-style2>
\ No newline at end of file

app_CRM/src/pages/base/uom-schedule-edit-view/uom-schedule-edit-view.vue

+<template src="./uom-schedule-edit-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { UomScheduleEditViewBase } from './uom-schedule-edit-view-base';
+import view_form from '@widgets/uom-schedule/main-form/main-form.vue';
+
+/**
+ * 计价单位组编辑视图视图
+ *
+ * @export
+ * @class UomScheduleEditView
+ * @extends {UomScheduleEditViewBase}
+ */
+@Component({
+    components: {
+        view_form, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class UomScheduleEditView extends UomScheduleEditViewBase { }
+</script>

app_CRM/src/pages/base/uom-schedule-grid-view/uom-schedule-grid-view.html

+<studio-view-style2 viewName="uomschedulegridview" viewTitle="计价单位组表格视图" class='degridview uom-schedule-grid-view'>
+    <template slot='title'>
+    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    </template>
+    <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" search @on-search="onSearch($event)"/>
+    <template slot="toolbar">
+                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>
+    <template slot="searchForm">
+                <view_searchform 
+            :viewState="viewState"  
+            :viewparams="viewparams" 
+            :context="context" 
+            :showBusyIndicator="true"
+            v-show="isExpandSearchForm"
+            loaddraftAction="FilterGetDraft"
+            loadAction="FilterGet"
+        
+            name="searchform"  
+            ref='searchform' 
+            @save="searchform_save($event)"  
+            @search="searchform_search($event)"  
+            @load="searchform_load($event)"  
+            @closeview="closeView($event)">
+        </view_searchform>
+    </template>
+    <view_grid 
+        :viewState="viewState"  
+        :viewparams="viewparams" 
+        :context="context" 
+        :isSingleSelect="isGridSingleSelect"
+        :showBusyIndicator="true"
+        :isOpenEdit="false"
+        :gridRowActiveMode="gridRowActiveMode"
+        @save="onSave.apply(_self, arguments)"
+        updateAction=""
+        removeAction="Remove"
+        loaddraftAction=""
+        loadAction=""
+        createAction=""
+        fetchAction="FetchDefault"
+        :newdata="newdata.bind(_self)"
+        :opendata="opendata.bind(_self)"
+        name="grid"  
+        ref='grid' 
+        @selectionchange="grid_selectionchange($event)"  
+        @beforeload="grid_beforeload($event)"  
+        @rowdblclick="grid_rowdblclick($event)"  
+        @remove="grid_remove($event)"  
+        @load="grid_load($event)"  
+        @closeview="closeView($event)">
+    </view_grid>
+</studio-view-style2>
\ No newline at end of file

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

+<template src="./uom-schedule-grid-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { UomScheduleGridViewBase } from './uom-schedule-grid-view-base';
+import view_grid from '@widgets/uom-schedule/main-grid/main-grid.vue';
+import view_searchform from '@widgets/uom-schedule/default-searchform/default-searchform.vue';
+
+/**
+ * 计价单位组表格视图视图
+ *
+ * @export
+ * @class UomScheduleGridView
+ * @extends {UomScheduleGridViewBase}
+ */
+@Component({
+    components: {
+        view_grid, 
+        view_searchform, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class UomScheduleGridView extends UomScheduleGridViewBase { }
+</script>

app_CRM/src/pages/product/price-level-edit-view/price-level-edit-view.html

+<studio-view-style2 viewName="priceleveleditview" viewTitle="价目表编辑视图" class='deeditview price-level-edit-view'>
+    <template slot='title'>
+    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    </template>
+    <template slot="toolbar">
+                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>
+    <view_form 
+                :viewState="viewState"  
+                :viewparams="viewparams" 
+                :context="context" 
+                :autosave="false" 
+                :viewtag="viewtag"
+                :showBusyIndicator="true"
+                updateAction="Update"
+                removeAction="Remove"
+                loaddraftAction="GetDraft"
+                loadAction="Get"
+                createAction="Create"
+                WFSubmitAction=""
+                WFStartAction=""
+                style='' 
+                name="form"  
+                ref='form' 
+                @save="form_save($event)"  
+                @remove="form_remove($event)"  
+                @load="form_load($event)"  
+                @closeview="closeView($event)">
+            </view_form>
+</studio-view-style2>
\ No newline at end of file

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

+<template src="./price-level-edit-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { PriceLevelEditViewBase } from './price-level-edit-view-base';
+import view_form from '@widgets/price-level/main-form/main-form.vue';
+
+/**
+ * 价目表编辑视图视图
+ *
+ * @export
+ * @class PriceLevelEditView
+ * @extends {PriceLevelEditViewBase}
+ */
+@Component({
+    components: {
+        view_form, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class PriceLevelEditView extends PriceLevelEditViewBase { }
+</script>

app_CRM/src/pages/product/price-level-grid-view/price-level-grid-view.html

+<studio-view-style2 viewName="pricelevelgridview" viewTitle="价目表表格视图" class='degridview price-level-grid-view'>
+    <template slot='title'>
+    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    </template>
+    <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" search @on-search="onSearch($event)"/>
+    <template slot="toolbar">
+                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>
+    <template slot="searchForm">
+                <view_searchform 
+            :viewState="viewState"  
+            :viewparams="viewparams" 
+            :context="context" 
+            :showBusyIndicator="true"
+            v-show="isExpandSearchForm"
+            loaddraftAction="FilterGetDraft"
+            loadAction="FilterGet"
+        
+            name="searchform"  
+            ref='searchform' 
+            @save="searchform_save($event)"  
+            @search="searchform_search($event)"  
+            @load="searchform_load($event)"  
+            @closeview="closeView($event)">
+        </view_searchform>
+    </template>
+    <view_grid 
+        :viewState="viewState"  
+        :viewparams="viewparams" 
+        :context="context" 
+        :isSingleSelect="isGridSingleSelect"
+        :showBusyIndicator="true"
+        :isOpenEdit="false"
+        :gridRowActiveMode="gridRowActiveMode"
+        @save="onSave.apply(_self, arguments)"
+        updateAction=""
+        removeAction="Remove"
+        loaddraftAction=""
+        loadAction=""
+        createAction=""
+        fetchAction="FetchDefault"
+        :newdata="newdata.bind(_self)"
+        :opendata="opendata.bind(_self)"
+        name="grid"  
+        ref='grid' 
+        @selectionchange="grid_selectionchange($event)"  
+        @beforeload="grid_beforeload($event)"  
+        @rowdblclick="grid_rowdblclick($event)"  
+        @remove="grid_remove($event)"  
+        @load="grid_load($event)"  
+        @closeview="closeView($event)">
+    </view_grid>
+</studio-view-style2>
\ No newline at end of file

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

+<template src="./price-level-grid-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { PriceLevelGridViewBase } from './price-level-grid-view-base';
+import view_grid from '@widgets/price-level/main-grid/main-grid.vue';
+import view_searchform from '@widgets/price-level/default-searchform/default-searchform.vue';
+
+/**
+ * 价目表表格视图视图
+ *
+ * @export
+ * @class PriceLevelGridView
+ * @extends {PriceLevelGridViewBase}
+ */
+@Component({
+    components: {
+        view_grid, 
+        view_searchform, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class PriceLevelGridView extends PriceLevelGridViewBase { }
+</script>

app_CRM/src/pages/sales/discount-type-edit-view/discount-type-edit-view.html

+<studio-view-style2 viewName="discounttypeeditview" viewTitle="折扣表编辑视图" class='deeditview discount-type-edit-view'>
+    <template slot='title'>
+    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    </template>
+    <template slot="toolbar">
+                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>
+    <view_form 
+                :viewState="viewState"  
+                :viewparams="viewparams" 
+                :context="context" 
+                :autosave="false" 
+                :viewtag="viewtag"
+                :showBusyIndicator="true"
+                updateAction="Update"
+                removeAction="Remove"
+                loaddraftAction="GetDraft"
+                loadAction="Get"
+                createAction="Create"
+                WFSubmitAction=""
+                WFStartAction=""
+                style='' 
+                name="form"  
+                ref='form' 
+                @save="form_save($event)"  
+                @remove="form_remove($event)"  
+                @load="form_load($event)"  
+                @closeview="closeView($event)">
+            </view_form>
+</studio-view-style2>
\ No newline at end of file

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

+<template src="./discount-type-edit-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { DiscountTypeEditViewBase } from './discount-type-edit-view-base';
+import view_form from '@widgets/discount-type/main-form/main-form.vue';
+
+/**
+ * 折扣表编辑视图视图
+ *
+ * @export
+ * @class DiscountTypeEditView
+ * @extends {DiscountTypeEditViewBase}
+ */
+@Component({
+    components: {
+        view_form, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class DiscountTypeEditView extends DiscountTypeEditViewBase { }
+</script>

app_CRM/src/pages/sales/discount-type-grid-view/discount-type-grid-view.html

+<studio-view-style2 viewName="discounttypegridview" viewTitle="折扣表表格视图" class='degridview discount-type-grid-view'>
+    <template slot='title'>
+    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    </template>
+    <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" search @on-search="onSearch($event)"/>
+    <template slot="toolbar">
+                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>
+    <template slot="searchForm">
+                <view_searchform 
+            :viewState="viewState"  
+            :viewparams="viewparams" 
+            :context="context" 
+            :showBusyIndicator="true"
+            v-show="isExpandSearchForm"
+            loaddraftAction="FilterGetDraft"
+            loadAction="FilterGet"
+        
+            name="searchform"  
+            ref='searchform' 
+            @save="searchform_save($event)"  
+            @search="searchform_search($event)"  
+            @load="searchform_load($event)"  
+            @closeview="closeView($event)">
+        </view_searchform>
+    </template>
+    <view_grid 
+        :viewState="viewState"  
+        :viewparams="viewparams" 
+        :context="context" 
+        :isSingleSelect="isGridSingleSelect"
+        :showBusyIndicator="true"
+        :isOpenEdit="false"
+        :gridRowActiveMode="gridRowActiveMode"
+        @save="onSave.apply(_self, arguments)"
+        updateAction=""
+        removeAction="Remove"
+        loaddraftAction=""
+        loadAction=""
+        createAction=""
+        fetchAction="FetchDefault"
+        :newdata="newdata.bind(_self)"
+        :opendata="opendata.bind(_self)"
+        name="grid"  
+        ref='grid' 
+        @selectionchange="grid_selectionchange($event)"  
+        @beforeload="grid_beforeload($event)"  
+        @rowdblclick="grid_rowdblclick($event)"  
+        @remove="grid_remove($event)"  
+        @load="grid_load($event)"  
+        @closeview="closeView($event)">
+    </view_grid>
+</studio-view-style2>
\ No newline at end of file

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

+<template src="./discount-type-grid-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { DiscountTypeGridViewBase } from './discount-type-grid-view-base';
+import view_grid from '@widgets/discount-type/main-grid/main-grid.vue';
+import view_searchform from '@widgets/discount-type/default-searchform/default-searchform.vue';
+
+/**
+ * 折扣表表格视图视图
+ *
+ * @export
+ * @class DiscountTypeGridView
+ * @extends {DiscountTypeGridViewBase}
+ */
+@Component({
+    components: {
+        view_grid, 
+        view_searchform, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class DiscountTypeGridView extends DiscountTypeGridViewBase { }
+</script>

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

@@ -88,7 +88,7 @@ export default class GoalServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/goals`,data,isloading);
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_goals',JSON.stringify(res.data.goals));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_goals',JSON.stringify(res.data.goals ? res.data.goals : []));
         return res;
     }
 
@@ -120,7 +120,7 @@ export default class GoalServiceBase extends EntityService {
         masterData.goals = goalsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/goals/${context.goal}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_goals',JSON.stringify(res.data.goals));
+            this.tempStorage.setItem(context.srfsessionkey+'_goals',JSON.stringify(res.data.goals ? res.data.goals : []));
             return res;
     }
 
@@ -148,7 +148,7 @@ export default class GoalServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/goals/${context.goal}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_goals',JSON.stringify(res.data.goals));
+            this.tempStorage.setItem(context.srfsessionkey+'_goals',JSON.stringify(res.data.goals ? res.data.goals : []));
             return res;
     }
 
@@ -164,7 +164,7 @@ export default class GoalServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/goals/getdraft`,isloading);
         res.data.goal = data.goal;
-            this.tempStorage.setItem(context.srfsessionkey+'_goals',JSON.stringify(res.data.goals));
+            this.tempStorage.setItem(context.srfsessionkey+'_goals',JSON.stringify(res.data.goals ? res.data.goals : []));
         return res;
     }
 
@@ -239,7 +239,7 @@ export default class GoalServiceBase extends EntityService {
         masterData.goals = goalsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/goals/${context.goal}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_goals',JSON.stringify(res.data.goals));
+            this.tempStorage.setItem(context.srfsessionkey+'_goals',JSON.stringify(res.data.goals ? res.data.goals : []));
             return res;
     }
 

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

@@ -89,7 +89,7 @@ export default class IncidentServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/incidents`,data,isloading);
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_incidents',JSON.stringify(res.data.incidents));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_incidents',JSON.stringify(res.data.incidents ? res.data.incidents : []));
         return res;
     }
 
@@ -121,7 +121,7 @@ export default class IncidentServiceBase extends EntityService {
         masterData.incidents = incidentsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/incidents/${context.incident}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_incidents',JSON.stringify(res.data.incidents));
+            this.tempStorage.setItem(context.srfsessionkey+'_incidents',JSON.stringify(res.data.incidents ? res.data.incidents : []));
             return res;
     }
 
@@ -149,7 +149,7 @@ export default class IncidentServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/incidents/${context.incident}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_incidents',JSON.stringify(res.data.incidents));
+            this.tempStorage.setItem(context.srfsessionkey+'_incidents',JSON.stringify(res.data.incidents ? res.data.incidents : []));
             return res;
     }
 
@@ -165,7 +165,7 @@ export default class IncidentServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/incidents/getdraft`,isloading);
         res.data.incident = data.incident;
-            this.tempStorage.setItem(context.srfsessionkey+'_incidents',JSON.stringify(res.data.incidents));
+            this.tempStorage.setItem(context.srfsessionkey+'_incidents',JSON.stringify(res.data.incidents ? res.data.incidents : []));
         return res;
     }
 
@@ -255,7 +255,7 @@ export default class IncidentServiceBase extends EntityService {
         masterData.incidents = incidentsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/incidents/${context.incident}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_incidents',JSON.stringify(res.data.incidents));
+            this.tempStorage.setItem(context.srfsessionkey+'_incidents',JSON.stringify(res.data.incidents ? res.data.incidents : []));
             return res;
     }
 

app_CRM/src/widgets/app/setting-appmenu/setting-appmenu-base.tsx

@@ -8,11 +8,10 @@ export class SettingBase extends Vue {
     /**
      * 菜单点击
      *
-     * @protected
      * @param {*} item 菜单数据
      * @memberof Setting
      */
-    protected click(item: any) {
+    public click(item: any) {
         if (item) {
             let judge = true;
             switch (item.appfunctag) {

app_CRM/src/widgets/discount-type/main-form/main-form.vue

+<template src="./main-form.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { MainEditFormBase } from './main-form-base';
+ 
+
+/**
+ * form部件
+ *
+ * @export
+ * @class MainEditForm
+ * @extends {MainEditFormBase}
+ */
+@Component({
+    components: {
+         
+    }
+})
+@VueLifeCycleProcessing()
+export default class MainEditForm extends MainEditFormBase { }
+</script>