xignzi006 发布系统代码

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

@@ -491,7 +491,7 @@
     },
     "activitypointergridview": {
         "title": "活动",
-        "caption": "活动",
+        "caption": "活动信息",
         "viewtype": "DEGRIDVIEW",
         "viewmodule": "Base",
         "viewname": "ActivityPointerGridView",
@@ -1510,7 +1510,7 @@
         "memo": "系统自动添加"
     },
     "salesordergridview": {
-        "title": "订单表格视图",
+        "title": "订单信息",
         "caption": "订单",
         "viewtype": "DEGRIDVIEW",
         "viewmodule": "Sales",
@@ -1520,7 +1520,7 @@
         "memo": ""
     },
     "invoicegridview": {
-        "title": "发票表格视图",
+        "title": "发票信息",
         "caption": "发票",
         "viewtype": "DEGRIDVIEW",
         "viewmodule": "Finance",

app_CRM/src/locale/lanres/entities/account/account_en_US.ts

@@ -616,8 +616,6 @@ export default {
 		uiactions: {
 		},
 	},
-	pickupgridviewtoolbar_toolbar: {
-	},
 	gridviewtoolbar_toolbar: {
 		tbitem1_openquickcreateview: {
 			caption: "新建",

app_CRM/src/locale/lanres/entities/account/account_zh_CN.ts

@@ -615,8 +615,6 @@ export default {
 		uiactions: {
 		},
 	},
-	pickupgridviewtoolbar_toolbar: {
-	},
 	gridviewtoolbar_toolbar: {
 		tbitem1_openquickcreateview: {
 			caption: "新建",

app_CRM/src/locale/lanres/entities/activity-pointer/activity-pointer_en_US.ts

@@ -61,7 +61,7 @@ export default {
       		title: "活动编辑视图",
 		},
 		gridview: {
-			caption: "活动",
+			caption: "活动信息",
       		title: "活动",
 		},
 		byparentkey: {
@@ -189,4 +189,42 @@ export default {
 			tip: "Copy {0}",
 		},
 	},
+	gridviewtoolbar_toolbar: {
+		items1: {
+			caption: "新建",
+			tip: "新建",
+		},
+		deuiaction2: {
+			caption: "任务",
+			tip: "任务",
+		},
+		deuiaction3: {
+			caption: "电子邮件",
+			tip: "电子邮件",
+		},
+		deuiaction4: {
+			caption: "约会",
+			tip: "约会",
+		},
+		deuiaction5: {
+			caption: "电话联络",
+			tip: "电话联络",
+		},
+		deuiaction1: {
+			caption: "Filter",
+			tip: "Filter",
+		},
+		tbitem4: {
+			caption: "Edit",
+			tip: "Edit {0}",
+		},
+		tbitem26: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "Remove",
+			tip: "Remove {0}",
+		},
+	},
 };

app_CRM/src/locale/lanres/entities/activity-pointer/activity-pointer_zh_CN.ts

@@ -60,7 +60,7 @@ export default {
       		title: "活动编辑视图",
 		},
 		gridview: {
-			caption: "活动",
+			caption: "活动信息",
       		title: "活动",
 		},
 		byparentkey: {
@@ -188,4 +188,42 @@ export default {
 			tip: "拷贝",
 		},
 	},
+	gridviewtoolbar_toolbar: {
+		items1: {
+			caption: "新建",
+			tip: "新建",
+		},
+		deuiaction2: {
+			caption: "任务",
+			tip: "任务",
+		},
+		deuiaction3: {
+			caption: "电子邮件",
+			tip: "电子邮件",
+		},
+		deuiaction4: {
+			caption: "约会",
+			tip: "约会",
+		},
+		deuiaction5: {
+			caption: "电话联络",
+			tip: "电话联络",
+		},
+		deuiaction1: {
+			caption: "过滤",
+			tip: "过滤",
+		},
+		tbitem4: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		tbitem26: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "删除",
+			tip: "删除",
+		},
+	},
 };
\ No newline at end of file

app_CRM/src/locale/lanres/entities/invoice/invoice_en_US.ts

@@ -113,7 +113,7 @@ export default {
 		},
 		gridview: {
 			caption: "发票",
-      		title: "发票表格视图",
+      		title: "发票信息",
 		},
 		info_invoiceview: {
 			caption: "发票",

app_CRM/src/locale/lanres/entities/invoice/invoice_zh_CN.ts

@@ -112,7 +112,7 @@ export default {
 		},
 		gridview: {
 			caption: "发票",
-      		title: "发票表格视图",
+      		title: "发票信息",
 		},
 		info_invoiceview: {
 			caption: "发票",

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

@@ -123,7 +123,7 @@ export default {
 		},
 		gridview: {
 			caption: "订单",
-      		title: "订单表格视图",
+      		title: "订单信息",
 		},
 		info_soview: {
 			caption: "订单",

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

@@ -122,7 +122,7 @@ export default {
 		},
 		gridview: {
 			caption: "订单",
-      		title: "订单表格视图",
+      		title: "订单信息",
 		},
 		info_soview: {
 			caption: "订单",

app_CRM/src/mock/viewconfig/viewconfig.ts

@@ -401,7 +401,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
         },
         "activitypointergridview": {
             "title": "活动",
-            "caption": "活动",
+            "caption": "活动信息",
             "viewtype": "DEGRIDVIEW",
             "viewmodule": "Base",
             "viewname": "ActivityPointerGridView",
@@ -1216,7 +1216,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewtag": "dd10cba0f2ded085120f7dc8eccc7c10"
         },
         "salesordergridview": {
-            "title": "订单表格视图",
+            "title": "订单信息",
             "caption": "订单",
             "viewtype": "DEGRIDVIEW",
             "viewmodule": "Sales",
@@ -1224,7 +1224,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewtag": "dfc0051ae4813115e03f3d095f8cd7d3"
         },
         "invoicegridview": {
-            "title": "发票表格视图",
+            "title": "发票信息",
             "caption": "发票",
             "viewtype": "DEGRIDVIEW",
             "viewmodule": "Finance",

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

@@ -52,21 +52,10 @@ export class AccountPickupGridViewBase extends PickupGridViewBase {
      * @memberof AccountPickupGridViewBase
      */
     protected containerModel: any = {
-        view_toolbar: { name: 'toolbar', type: 'TOOLBAR' },
         view_grid: { name: 'grid', type: 'GRID' },
         view_searchform: { name: 'searchform', type: 'SEARCHFORM' },
     };
 
-    /**
-     * 工具栏模型
-     *
-     * @type {*}
-     * @memberof AccountPickupGridView
-     */
-    public toolBarModels: any = {
-    };
-
-
 
 	/**
      * 视图唯一标识

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

 <studio-view-style2 viewName="accountpickupgridview" viewTitle="客户选择表格视图" class='depickupgridview account-pickup-grid-view'>
-    <template slot="toolbar">
-                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>
     <template slot="searchForm">
                 <view_searchform 
             :viewState="viewState"  

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

 <studio-view-style2 viewName="activitypointergridview" viewTitle="活动" class='degridview activity-pointer-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="quickGroupSearch">
         <app-quick-group :items="quickGroupModel" @valuechange="quickGroupValueChange"></app-quick-group>
     </template>
+    <template slot="toolbar">
+                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>
     <template slot="searchForm">
                 <view_searchform 
             :viewState="viewState"  

app_CRM/src/pages/finance/invoice-grid-view/invoice-grid-view-base.tsx

@@ -8,7 +8,7 @@ import CodeListService from "@service/app/codelist-service";
 
 
 /**
- * 发票表格视图视图基类
+ * 发票信息视图基类
  *
  * @export
  * @class InvoiceGridViewBase

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

-<studio-view-style2 viewName="invoicegridview" viewTitle="发票表格视图" class='degridview invoice-grid-view'>
+<studio-view-style2 viewName="invoicegridview" viewTitle="发票信息" class='degridview invoice-grid-view'>
     <template slot='title'>
     <span class='caption-info'>{{$t(model.srfTitle)}}</span>
     </template>

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

@@ -7,7 +7,7 @@ import view_grid from '@widgets/invoice/main-grid/main-grid.vue';
 import view_searchform from '@widgets/invoice/default-searchform/default-searchform.vue';
 
 /**
- * 发票表格视图视图
+ * 发票信息视图
  *
  * @export
  * @class InvoiceGridView

app_CRM/src/pages/sales/sales-order-grid-view/sales-order-grid-view-base.tsx

@@ -8,7 +8,7 @@ import CodeListService from "@service/app/codelist-service";
 
 
 /**
- * 订单表格视图视图基类
+ * 订单信息视图基类
  *
  * @export
  * @class SalesOrderGridViewBase

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

-<studio-view-style2 viewName="salesordergridview" viewTitle="订单表格视图" class='degridview sales-order-grid-view'>
+<studio-view-style2 viewName="salesordergridview" viewTitle="订单信息" class='degridview sales-order-grid-view'>
     <template slot='title'>
     <span class='caption-info'>{{$t(model.srfTitle)}}</span>
     </template>

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

@@ -7,7 +7,7 @@ import view_grid from '@widgets/sales-order/main-grid/main-grid.vue';
 import view_searchform from '@widgets/sales-order/default-searchform/default-searchform.vue';
 
 /**
- * 订单表格视图视图
+ * 订单信息视图
  *
  * @export
  * @class SalesOrderGridView

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

@@ -67,8 +67,8 @@ export const PageComponents = {
         Vue.component('account-summary', () => import('@pages/base/account-summary/account-summary.vue'));
         Vue.component('opportunity-product-opp-opp-pro-grid-view', () => import('@pages/sales/opportunity-product-opp-opp-pro-grid-view/opportunity-product-opp-opp-pro-grid-view.vue'));
         Vue.component('ibiz-list-quick-create', () => import('@pages/marketing/ibiz-list-quick-create/ibiz-list-quick-create.vue'));
-        Vue.component('quote-detail-quo-detail-grid-view', () => import('@pages/sales/quote-detail-quo-detail-grid-view/quote-detail-quo-detail-grid-view.vue'));
         Vue.component('appointment-quick-create', () => import('@pages/base/appointment-quick-create/appointment-quick-create.vue'));
+        Vue.component('quote-detail-quo-detail-grid-view', () => import('@pages/sales/quote-detail-quo-detail-grid-view/quote-detail-quo-detail-grid-view.vue'));
         Vue.component('campaign-response-edit-view', () => import('@pages/marketing/campaign-response-edit-view/campaign-response-edit-view.vue'));
         Vue.component('campaign-activity-quick-create', () => import('@pages/marketing/campaign-activity-quick-create/campaign-activity-quick-create.vue'));
         Vue.component('campaign-info', () => import('@pages/marketing/campaign-info/campaign-info.vue'));

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

@@ -1993,6 +1993,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/marketing/ibiz-list-quick-create/ibiz-list-quick-create.vue'),
                 },
+                {
+                    path: 'appointments/:appointment?/quickcreate/:quickcreate?',
+                    meta: {
+                        caption: 'entities.appointment.views.quickcreate.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'central', parameterName: 'central' },
+                            { pathName: 'appointments', parameterName: 'appointment' },
+                            { pathName: 'quickcreate', parameterName: 'quickcreate' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/base/appointment-quick-create/appointment-quick-create.vue'),
+                },
                 {
                     path: 'accounts/:account?/contacts/:contact?/opportunities/:opportunity?/quotes/:quote?/quotedetails/:quotedetail?/quodetailgridview/:quodetailgridview?',
                     meta: {
@@ -2073,20 +2087,6 @@ const router = new Router({
                     },
                     component: () => import('@pages/sales/quote-detail-quo-detail-grid-view/quote-detail-quo-detail-grid-view.vue'),
                 },
-                {
-                    path: 'appointments/:appointment?/quickcreate/:quickcreate?',
-                    meta: {
-                        caption: 'entities.appointment.views.quickcreate.title',
-                        info:'',
-                        parameters: [
-                            { pathName: 'central', parameterName: 'central' },
-                            { pathName: 'appointments', parameterName: 'appointment' },
-                            { pathName: 'quickcreate', parameterName: 'quickcreate' },
-                        ],
-                        requireAuth: true,
-                    },
-                    component: () => import('@pages/base/appointment-quick-create/appointment-quick-create.vue'),
-                },
                 {
                     path: 'campaignresponses/:campaignresponse?/editview/:editview?',
                     meta: {

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

@@ -448,11 +448,13 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
+                'aa79d35850f36fbc1a5085353ecd5af5',
                 '24e222a530526aab94ed4ed22cfedf9a',
                 '99d4a530c13b03a98cd143f341394354',
                 '30458f00562fda145be535e56948b067',
                 'b3cfac5362b3bfb70d1471932f120fa5',
                 '3d538df4ca389d372347f7b53d67269f',
+                '893e62d6fbdc4580de7e3e802aec9108',
                 'a50134133db91e46c8434ad0ebff22c7',
                 'a95d7d9111bc13a8b73a11ee1e4ff92a',
                 '3f78dcc732a7a8ba6d959dcf6007b225',