xignzi006 发布系统代码

app_CRM/public/assets/json/data-dictionary.json

@@ -6005,6 +6005,33 @@
             }
         ]
     }, 
+    {
+        "srfkey": "Transactioncurrency__StatusCode",
+        "emptytext": "未定义",
+        "codelisttype":"static",
+        "items": [
+             {
+                "id": "2",
+                "label": "停用",
+                "text": "停用",
+                "data":"",
+                "codename":"Item_2",
+                "value": "2",
+                
+                "disabled": false
+            }
+            , {
+                "id": "1",
+                "label": "可用",
+                "text": "可用",
+                "data":"",
+                "codename":"Item_1",
+                "value": "1",
+                
+                "disabled": false
+            }
+        ]
+    }, 
     {
         "srfkey": "Quote__PaymentTermsCode",
         "emptytext": "未定义",
@@ -6096,6 +6123,33 @@
             }
         ]
     }, 
+    {
+        "srfkey": "Transactioncurrency__StateCode",
+        "emptytext": "未定义",
+        "codelisttype":"static",
+        "items": [
+             {
+                "id": "1",
+                "label": "停用",
+                "text": "停用",
+                "data":"",
+                "codename":"Item_1",
+                "value": "1",
+                
+                "disabled": false
+            }
+            , {
+                "id": "0",
+                "label": "可用",
+                "text": "可用",
+                "data":"",
+                "codename":"Item_0",
+                "value": "0",
+                
+                "disabled": false
+            }
+        ]
+    }, 
     {
         "srfkey": "Account__StatusCode",
         "emptytext": "未定义",

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

@@ -2369,6 +2369,16 @@
         "viewtag": "c7d0ca0f6fa1b27bbd1b5c422d1a108d",
         "memo": "系统自动添加"
     },
+    "transactioncurrencyeditview": {
+        "title": "货币编辑视图",
+        "caption": "货币",
+        "viewtype": "DEEDITVIEW",
+        "viewmodule": "Base",
+        "viewname": "TransactionCurrencyEditView",
+        "viewfilename": "transaction-currency-edit-view",
+        "viewtag": "c933802c076d527d0bacfb5c4c47919c",
+        "memo": "系统自动添加"
+    },
     "goalquickcreateview": {
         "title": "快速新建",
         "caption": "目标",
@@ -2679,6 +2689,16 @@
         "viewtag": "e9c822edbc51531e713b561101e783a6",
         "memo": ""
     },
+    "transactioncurrencygridview": {
+        "title": "货币表格视图",
+        "caption": "货币",
+        "viewtype": "DEGRIDVIEW",
+        "viewmodule": "Base",
+        "viewname": "TransactionCurrencyGridView",
+        "viewfilename": "transaction-currency-grid-view",
+        "viewtag": "ef8908af79e7631a6292209fa498a899",
+        "memo": ""
+    },
     "accountpickupgridview": {
         "title": "客户选择表格视图",
         "caption": "客户",

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

@@ -129,6 +129,7 @@ export default {
                 top_menus: "顶部菜单",
                 menuitem3: "设置",
                 menuitem4: "链接角色",
+                menuitem26: "货币",
                 menuitem34: "消息通知",
                 menuitem35: "帮助",
                 left_exp: "左侧菜单",

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

@@ -129,6 +129,7 @@ export default {
                 top_menus: "顶部菜单",
                 menuitem3: "设置",
                 menuitem4: "链接角色",
+                menuitem26: "货币",
                 menuitem34: "消息通知",
                 menuitem35: "帮助",
                 left_exp: "左侧菜单",

app_CRM/src/locale/lanres/codelist/codelist_en_US.ts

@@ -758,6 +758,11 @@ export default {
         "3": "网站/网页",
         "empty": ""
     },
+    Transactioncurrency__StatusCode: {
+        "2": "停用",
+        "1": "可用",
+        "empty": ""
+    },
     Quote__PaymentTermsCode: {
         "2": "2/10 N30",
         "1": "N30",
@@ -774,6 +779,11 @@ export default {
         "1": "男",
         "empty": ""
     },
+    Transactioncurrency__StateCode: {
+        "1": "停用",
+        "0": "可用",
+        "empty": ""
+    },
     Account__StatusCode: {
         "2": "停用",
         "1": "可用",

app_CRM/src/locale/lanres/codelist/codelist_zh_CN.ts

@@ -758,6 +758,11 @@ export default {
         "3": "网站/网页",
         "empty": "",
     },
+    Transactioncurrency__StatusCode: {
+        "2": "停用",
+        "1": "可用",
+        "empty": "",
+    },
     Quote__PaymentTermsCode: {
         "2": "2/10 N30",
         "1": "N30",
@@ -774,6 +779,11 @@ export default {
         "1": "男",
         "empty": "",
     },
+    Transactioncurrency__StateCode: {
+        "1": "停用",
+        "0": "可用",
+        "empty": "",
+    },
     Account__StatusCode: {
         "2": "停用",
         "1": "可用",

app_CRM/src/locale/lanres/entities/transaction-currency/transaction-currency_en_US.ts

@@ -27,15 +27,58 @@ export default {
 			caption: "货币",
       		title: "货币选择表格视图",
 		},
+		editview: {
+			caption: "货币",
+      		title: "货币编辑视图",
+		},
 		pickupview: {
 			caption: "货币",
       		title: "货币数据选择视图",
 		},
+		gridview: {
+			caption: "货币",
+      		title: "货币表格视图",
+		},
+	},
+	main_form: {
+		details: {
+			group1: "货币基本信息", 
+			formpage1: "基本信息", 
+			group2: "操作信息", 
+			formpage2: "其它", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "交易币种", 
+			srfmajortext: "货币名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			currencyname: "货币名称", 
+			currencyprecision: "货币精度", 
+			currencysymbol: "货币符号", 
+			exchangerate: "汇率", 
+			statecode: "状态", 
+			statuscode: "状态描述", 
+			isocurrencycode: "货币代码", 
+			createman: "建立人", 
+			createdate: "建立时间", 
+			updateman: "更新人", 
+			updatedate: "更新时间", 
+			transactioncurrencyid: "交易币种", 
+		},
+		uiactions: {
+		},
 	},
 	main_grid: {
 		columns: {
 			currencyname: "货币名称",
-			updateman: "更新人",
+			currencyprecision: "货币精度",
+			currencysymbol: "货币符号",
+			exchangerate: "汇率",
+			isocurrencycode: "货币代码",
+			statecode: "状态",
+			statuscode: "状态描述",
 			updatedate: "更新时间",
 		},
 		uiactions: {
@@ -48,4 +91,80 @@ export default {
 		uiactions: {
 		},
 	},
+	gridviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "New",
+			tip: "New",
+		},
+		tbitem4: {
+			caption: "Edit",
+			tip: "Edit {0}",
+		},
+		tbitem6: {
+			caption: "Copy",
+			tip: "Copy {0}",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "Remove",
+			tip: "Remove {0}",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem13: {
+			caption: "Export",
+			tip: "Export {0} Data To Excel",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem19: {
+			caption: "Filter",
+			tip: "Filter",
+		},
+	},
+	editviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "Save",
+			tip: "Save",
+		},
+		tbitem4: {
+			caption: "Save And New",
+			tip: "Save And New",
+		},
+		tbitem5: {
+			caption: "Save And Close",
+			tip: "Save And Close Window",
+		},
+		tbitem6: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem7: {
+			caption: "Remove And Close",
+			tip: "Remove And Close Window",
+		},
+		tbitem8: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem12: {
+			caption: "New",
+			tip: "New",
+		},
+		tbitem13: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem14: {
+			caption: "Copy",
+			tip: "Copy {0}",
+		},
+	},
 };
\ No newline at end of file

app_CRM/src/locale/lanres/entities/transaction-currency/transaction-currency_zh_CN.ts

@@ -26,15 +26,58 @@ export default {
 			caption: "货币",
       		title: "货币选择表格视图",
 		},
+		editview: {
+			caption: "货币",
+      		title: "货币编辑视图",
+		},
 		pickupview: {
 			caption: "货币",
       		title: "货币数据选择视图",
 		},
+		gridview: {
+			caption: "货币",
+      		title: "货币表格视图",
+		},
+	},
+	main_form: {
+		details: {
+			group1: "货币基本信息", 
+			formpage1: "基本信息", 
+			group2: "操作信息", 
+			formpage2: "其它", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "交易币种", 
+			srfmajortext: "货币名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			currencyname: "货币名称", 
+			currencyprecision: "货币精度", 
+			currencysymbol: "货币符号", 
+			exchangerate: "汇率", 
+			statecode: "状态", 
+			statuscode: "状态描述", 
+			isocurrencycode: "货币代码", 
+			createman: "建立人", 
+			createdate: "建立时间", 
+			updateman: "更新人", 
+			updatedate: "更新时间", 
+			transactioncurrencyid: "交易币种", 
+		},
+		uiactions: {
+		},
 	},
 	main_grid: {
 		columns: {
 			currencyname: "货币名称",
-			updateman: "更新人",
+			currencyprecision: "货币精度",
+			currencysymbol: "货币符号",
+			exchangerate: "汇率",
+			isocurrencycode: "货币代码",
+			statecode: "状态",
+			statuscode: "状态描述",
 			updatedate: "更新时间",
 		},
 		uiactions: {
@@ -47,4 +90,80 @@ export default {
 		uiactions: {
 		},
 	},
+	gridviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem4: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		tbitem6: {
+			caption: "拷贝",
+			tip: "拷贝",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "删除",
+			tip: "删除",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem13: {
+			caption: "导出",
+			tip: "导出",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem19: {
+			caption: "过滤",
+			tip: "过滤",
+		},
+	},
+	editviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "保存",
+			tip: "保存",
+		},
+		tbitem4: {
+			caption: "保存并新建",
+			tip: "保存并新建",
+		},
+		tbitem5: {
+			caption: "保存并关闭",
+			tip: "保存并关闭",
+		},
+		tbitem6: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem7: {
+			caption: "删除并关闭",
+			tip: "删除并关闭",
+		},
+		tbitem8: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem12: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem13: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem14: {
+			caption: "拷贝",
+			tip: "拷贝",
+		},
+	},
 };
\ No newline at end of file

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

@@ -81,6 +81,24 @@ mock.onGet('v7/centralappmenu').reply((config: any) => {
 	textcls: '',
 	appfunctag: '_5',
 	resourcetag: '',
+},
+		{
+	id: 'E4387964-20DA-4525-B118-DC04F91510D8',
+	name: 'menuitem26',
+	text: '货币',
+	type: 'MENUITEM',
+	counterid: '',
+	tooltip: '货币',
+	expanded: false,
+	separator: false,
+	hidden: false,
+	hidesidebar: false,
+	opendefault: false,
+	iconcls: '',
+	icon: '',
+	textcls: '',
+	appfunctag: '_7',
+	resourcetag: '',
 },
 	],
 },
@@ -283,7 +301,7 @@ mock.onGet('v7/centralappmenu').reply((config: any) => {
 	iconcls: 'fa fa-users',
 	icon: '',
 	textcls: '',
-	appfunctag: '_7',
+	appfunctag: '_8',
 	resourcetag: '',
 },
 		{

app_CRM/src/mock/codelist/codelist.ts

@@ -6013,6 +6013,33 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
             },
         ]
     },
+    {
+        srfkey: "Transactioncurrency__StatusCode",
+        emptytext: "未定义",
+        "codelisttype":"static",
+        items: [
+            {
+                id: "2",
+                label: "停用",
+                text: "停用",
+                "data":"",
+                "codename":"Item_2",
+                value: "2",
+                
+                disabled: false,
+            },
+            {
+                id: "1",
+                label: "可用",
+                text: "可用",
+                "data":"",
+                "codename":"Item_1",
+                value: "1",
+                
+                disabled: false,
+            },
+        ]
+    },
     {
         srfkey: "Quote__PaymentTermsCode",
         emptytext: "未定义",
@@ -6104,6 +6131,33 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
             },
         ]
     },
+    {
+        srfkey: "Transactioncurrency__StateCode",
+        emptytext: "未定义",
+        "codelisttype":"static",
+        items: [
+            {
+                id: "1",
+                label: "停用",
+                text: "停用",
+                "data":"",
+                "codename":"Item_1",
+                value: "1",
+                
+                disabled: false,
+            },
+            {
+                id: "0",
+                label: "可用",
+                text: "可用",
+                "data":"",
+                "codename":"Item_0",
+                value: "0",
+                
+                disabled: false,
+            },
+        ]
+    },
     {
         srfkey: "Account__StatusCode",
         emptytext: "未定义",

app_CRM/src/mock/viewconfig/viewconfig.ts

@@ -1903,6 +1903,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "ListContactEditView",
             "viewtag": "c7d0ca0f6fa1b27bbd1b5c422d1a108d"
         },
+        "transactioncurrencyeditview": {
+            "title": "货币编辑视图",
+            "caption": "货币",
+            "viewtype": "DEEDITVIEW",
+            "viewmodule": "Base",
+            "viewname": "TransactionCurrencyEditView",
+            "viewtag": "c933802c076d527d0bacfb5c4c47919c"
+        },
         "goalquickcreateview": {
             "title": "快速新建",
             "caption": "目标",
@@ -2151,6 +2159,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "SalesOrderQuickCreateView",
             "viewtag": "e9c822edbc51531e713b561101e783a6"
         },
+        "transactioncurrencygridview": {
+            "title": "货币表格视图",
+            "caption": "货币",
+            "viewtype": "DEGRIDVIEW",
+            "viewmodule": "Base",
+            "viewname": "TransactionCurrencyGridView",
+            "viewtag": "ef8908af79e7631a6292209fa498a899"
+        },
         "accountpickupgridview": {
             "title": "客户选择表格视图",
             "caption": "客户",

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

@@ -27,8 +27,8 @@ export const PageComponents = {
         Vue.component('sales-literature-quick-create-view', () => import('@pages/sales/sales-literature-quick-create-view/sales-literature-quick-create-view.vue'));
         Vue.component('quote-info', () => import('@pages/sales/quote-info/quote-info.vue'));
         Vue.component('contact-usable-grid-view', () => import('@pages/base/contact-usable-grid-view/contact-usable-grid-view.vue'));
-        Vue.component('ibiz-list-grid-view', () => import('@pages/marketing/ibiz-list-grid-view/ibiz-list-grid-view.vue'));
         Vue.component('opportunity-win-grid-view', () => import('@pages/sales/opportunity-win-grid-view/opportunity-win-grid-view.vue'));
+        Vue.component('ibiz-list-grid-view', () => import('@pages/marketing/ibiz-list-grid-view/ibiz-list-grid-view.vue'));
         Vue.component('discount-type-pickup-view', () => import('@pages/sales/discount-type-pickup-view/discount-type-pickup-view.vue'));
         Vue.component('quote-win-grid-view', () => import('@pages/sales/quote-win-grid-view/quote-win-grid-view.vue'));
         Vue.component('opportunity-edit-date-panel-view', () => import('@pages/sales/opportunity-edit-date-panel-view/opportunity-edit-date-panel-view.vue'));
@@ -102,6 +102,7 @@ export const PageComponents = {
         Vue.component('lead-info', () => import('@pages/sales/lead-info/lead-info.vue'));
         Vue.component('sales-order-finish-grid-view', () => import('@pages/sales/sales-order-finish-grid-view/sales-order-finish-grid-view.vue'));
         Vue.component('lead-on-grid-view', () => import('@pages/sales/lead-on-grid-view/lead-on-grid-view.vue'));
+        Vue.component('transaction-currency-edit-view', () => import('@pages/base/transaction-currency-edit-view/transaction-currency-edit-view.vue'));
         Vue.component('sales-order-detail-soproduct-grid-view', () => import('@pages/sales/sales-order-detail-soproduct-grid-view/sales-order-detail-soproduct-grid-view.vue'));
         Vue.component('incident-info-incident-view', () => import('@pages/service/incident-info-incident-view/incident-info-incident-view.vue'));
         Vue.component('account-usable-grid-view', () => import('@pages/base/account-usable-grid-view/account-usable-grid-view.vue'));
@@ -166,6 +167,7 @@ export const PageComponents = {
         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('contact-tab-exp-view', () => import('@pages/base/contact-tab-exp-view/contact-tab-exp-view.vue'));
         Vue.component('product-association-grid-view', () => import('@pages/product/product-association-grid-view/product-association-grid-view.vue'));
+        Vue.component('transaction-currency-grid-view', () => import('@pages/base/transaction-currency-grid-view/transaction-currency-grid-view.vue'));
         Vue.component('appointment-quick-create', () => import('@pages/base/appointment-quick-create/appointment-quick-create.vue'));
         Vue.component('account-by-parent-key', () => import('@pages/base/account-by-parent-key/account-by-parent-key.vue'));
         Vue.component('incident-customer-pickup-grid-view', () => import('@pages/service/incident-customer-pickup-grid-view/incident-customer-pickup-grid-view.vue'));

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

@@ -1307,20 +1307,6 @@ const router = new Router({
                     },
                     component: () => import('@pages/base/contact-usable-grid-view/contact-usable-grid-view.vue'),
                 },
-                {
-                    path: 'ibizlists/:ibizlist?/gridview/:gridview?',
-                    meta: {
-                        caption: 'entities.ibizlist.views.gridview.title',
-                        info:'',
-                        parameters: [
-                            { pathName: 'central', parameterName: 'central' },
-                            { pathName: 'ibizlists', parameterName: 'ibizlist' },
-                            { pathName: 'gridview', parameterName: 'gridview' },
-                        ],
-                        requireAuth: true,
-                    },
-                    component: () => import('@pages/marketing/ibiz-list-grid-view/ibiz-list-grid-view.vue'),
-                },
                 {
                     path: 'accounts/:account?/contacts/:contact?/opportunities/:opportunity?/wingridview/:wingridview?',
                     meta: {
@@ -1381,6 +1367,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/sales/opportunity-win-grid-view/opportunity-win-grid-view.vue'),
                 },
+                {
+                    path: 'ibizlists/:ibizlist?/gridview/:gridview?',
+                    meta: {
+                        caption: 'entities.ibizlist.views.gridview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'central', parameterName: 'central' },
+                            { pathName: 'ibizlists', parameterName: 'ibizlist' },
+                            { pathName: 'gridview', parameterName: 'gridview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/marketing/ibiz-list-grid-view/ibiz-list-grid-view.vue'),
+                },
                 {
                     path: 'discounttypes/:discounttype?/pickupview/:pickupview?',
                     meta: {
@@ -4453,6 +4453,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/sales/lead-on-grid-view/lead-on-grid-view.vue'),
                 },
+                {
+                    path: 'transactioncurrencies/:transactioncurrency?/editview/:editview?',
+                    meta: {
+                        caption: 'entities.transactioncurrency.views.editview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'central', parameterName: 'central' },
+                            { pathName: 'transactioncurrencies', parameterName: 'transactioncurrency' },
+                            { pathName: 'editview', parameterName: 'editview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/base/transaction-currency-edit-view/transaction-currency-edit-view.vue'),
+                },
                 {
                     path: 'accounts/:account?/contacts/:contact?/opportunities/:opportunity?/quotes/:quote?/salesorders/:salesorder?/salesorderdetails/:salesorderdetail?/soproductgridview/:soproductgridview?',
                     meta: {
@@ -7310,6 +7324,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/product/product-association-grid-view/product-association-grid-view.vue'),
                 },
+                {
+                    path: 'transactioncurrencies/:transactioncurrency?/gridview/:gridview?',
+                    meta: {
+                        caption: 'entities.transactioncurrency.views.gridview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'central', parameterName: 'central' },
+                            { pathName: 'transactioncurrencies', parameterName: 'transactioncurrency' },
+                            { pathName: 'gridview', parameterName: 'gridview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/base/transaction-currency-grid-view/transaction-currency-grid-view.vue'),
+                },
                 {
                     path: 'appointments/:appointment?/quickcreate/:quickcreate?',
                     meta: {

app_CRM/src/pages/base/transaction-currency-edit-view/transaction-currency-edit-view.html

+<studio-view-style2 viewName="transactioncurrencyeditview" viewTitle="货币编辑视图" class='deeditview transaction-currency-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/transaction-currency-edit-view/transaction-currency-edit-view.vue

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

app_CRM/src/pages/base/transaction-currency-grid-view/transaction-currency-grid-view.html

+<studio-view-style2 viewName="transactioncurrencygridview" viewTitle="货币表格视图" class='degridview transaction-currency-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"
+        updateAction=""
+        removeAction="Remove"
+        loaddraftAction=""
+        loadAction=""
+        createAction=""
+        fetchAction="FetchDefault"
+        :newdata="newdata"
+        :opendata="opendata"
+        name="grid"  
+        ref='grid' 
+        @selectionchange="grid_selectionchange($event)"  
+        @beforeload="grid_beforeload($event)"  
+        @rowdblclick="grid_rowdblclick($event)"  
+        @remove="grid_remove($event)"  
+        @load="grid_load($event)"  
+        @closeview="closeView($event)">
+    </view_grid>
+</studio-view-style2>
\ No newline at end of file

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

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

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

@@ -62,6 +62,21 @@ export default class CampaignServiceBase extends EntityService {
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
+        let leadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
+            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
+            if(leadsData && leadsData.length && leadsData.length > 0){
+                leadsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.leadid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.leads = leadsData;
         let campaignlistsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
             campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
@@ -92,21 +107,6 @@ export default class CampaignServiceBase extends EntityService {
             }
         }
         masterData.campaigncampaigns = campaigncampaignsData;
-        let leadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
-            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
-            if(leadsData && leadsData.length && leadsData.length > 0){
-                leadsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.leads = leadsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -116,9 +116,9 @@ export default class CampaignServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/campaigns`,data,isloading);
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
         return res;
     }
 
@@ -133,6 +133,21 @@ export default class CampaignServiceBase extends EntityService {
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
+        let leadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
+            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
+            if(leadsData && leadsData.length && leadsData.length > 0){
+                leadsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.leadid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.leads = leadsData;
         let campaignlistsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
             campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
@@ -163,26 +178,11 @@ export default class CampaignServiceBase extends EntityService {
             }
         }
         masterData.campaigncampaigns = campaigncampaignsData;
-        let leadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
-            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
-            if(leadsData && leadsData.length && leadsData.length > 0){
-                leadsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.leads = leadsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/campaigns/${context.campaign}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
-            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             return res;
     }
 
@@ -210,9 +210,9 @@ export default class CampaignServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/campaigns/${context.campaign}`,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
-            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             return res;
     }
 
@@ -228,9 +228,9 @@ export default class CampaignServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/campaigns/getdraft`,isloading);
         res.data.campaign = data.campaign;
+            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
-            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
         return res;
     }
 
@@ -258,6 +258,21 @@ export default class CampaignServiceBase extends EntityService {
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
+        let leadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
+            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
+            if(leadsData && leadsData.length && leadsData.length > 0){
+                leadsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.leadid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.leads = leadsData;
         let campaignlistsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
             campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
@@ -288,26 +303,11 @@ export default class CampaignServiceBase extends EntityService {
             }
         }
         masterData.campaigncampaigns = campaigncampaignsData;
-        let leadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
-            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
-            if(leadsData && leadsData.length && leadsData.length > 0){
-                leadsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.leads = leadsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/campaigns/${context.campaign}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
-            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             return res;
     }
 

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

@@ -1464,6 +1464,7 @@ export const viewstate: any = {
                 '0e4d8b949764a2c40c2b93261aed6fd8',
                 '24a93674ec4c976c08902a3e95421ca6',
                 '00e8e9d547a2367a0e13e232ea85b920',
+                'ef8908af79e7631a6292209fa498a899',
                 'b38bc0256ecd5be1a58a3c2210a98d05',
                 '25bf5f8c2ebd1ce2be6d06717ed08a96',
                 '3202f3f503424c7a2c549b2c5186dc36',
@@ -1476,8 +1477,8 @@ export const viewstate: any = {
                 '9AE386A9-53DE-4F99-BCCA-747AEFE666A4',
                 '3cac572b3a6905293a0e22e3f3fa3c04',
                 '7FCD2E75-E34A-493C-922E-8AE47BCE08CA',
-                'd1c35f3c52010e1428d7dc1a6bc82f63',
                 'e0aef8c0d1f1ae28f628a0541b118961',
+                'd1c35f3c52010e1428d7dc1a6bc82f63',
                 '3a665de6a3970b95fde436c0fea4b1df',
                 '00367e275947880480763049e5c495be',
             ],
@@ -2188,6 +2189,15 @@ export const viewstate: any = {
             refviews: [
             ],
         },
+        {
+            viewtag: 'c933802c076d527d0bacfb5c4c47919c',
+            viewmodule: 'Base',
+            viewname: 'TransactionCurrencyEditView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+            ],
+        },
         {
             viewtag: 'cab8702dc3d6cc283eb40a1e07fa72ba',
             viewmodule: 'Sales',
@@ -2473,6 +2483,16 @@ export const viewstate: any = {
                 'da3f8c1f20f440f3df54d6c13a8de586',
             ],
         },
+        {
+            viewtag: 'ef8908af79e7631a6292209fa498a899',
+            viewmodule: 'Base',
+            viewname: 'TransactionCurrencyGridView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                'c933802c076d527d0bacfb5c4c47919c',
+            ],
+        },
         {
             viewtag: 'ef9fea872a6a21e7566033fafcc0ccb5',
             viewmodule: 'Base',

app_CRM/src/uiservice/transaction-currency/transaction-currency-ui-service-base.ts

@@ -80,7 +80,9 @@ export default class TransactionCurrencyUIServiceBase extends UIService {
      */  
     public initViewMap(){
         this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'transactioncurrencies'});
+        this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'transactioncurrencies'});
         this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'transactioncurrencies'});
+        this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'transactioncurrencies'});
     }
 
     /**

app_CRM/src/widgets/transaction-currency/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>

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/filter/AccountSearchContext.java

@@ -187,6 +187,20 @@ public class AccountSearchContext extends QueryWrapperContext<Account> {
         if(!ObjectUtils.isEmpty(this.n_preferredappointmenttimecode_eq)){
             this.getSearchCond().eq("preferredappointmenttimecode", n_preferredappointmenttimecode_eq);
         }
+    }
+	private String n_slaname_eq;//[SLAName]
+	public void setN_slaname_eq(String n_slaname_eq) {
+        this.n_slaname_eq = n_slaname_eq;
+        if(!ObjectUtils.isEmpty(this.n_slaname_eq)){
+            this.getSearchCond().eq("slaname", n_slaname_eq);
+        }
+    }
+	private String n_slaname_like;//[SLAName]
+	public void setN_slaname_like(String n_slaname_like) {
+        this.n_slaname_like = n_slaname_like;
+        if(!ObjectUtils.isEmpty(this.n_slaname_like)){
+            this.getSearchCond().like("slaname", n_slaname_like);
+        }
     }
 	private String n_originatingleadid_eq;//[原始潜在顾客]
 	public void setN_originatingleadid_eq(String n_originatingleadid_eq) {

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

@@ -505,7 +505,7 @@
             {
                "appid":"CRM",
                "appname":"客户管理",
-               "appmenu":[{"menuid":"Central", "menuname":"Central", "menuitem":[{ "id":"user_menus" , "name":"用户菜单" },{ "id":"top_menus" , "name":"顶部菜单" , "items":[{ "id":"menuitem3" , "name":"设置" , "items":[{ "id":"menuitem4" , "name":"链接角色" }]},{ "id":"menuitem34" , "name":"消息通知" },{ "id":"menuitem35" , "name":"帮助" }]},{ "id":"left_exp" , "name":"左侧菜单" , "items":[{ "id":"menuitem17" , "name":"主页" },{ "id":"menuitem18" , "name":"最近" },{ "id":"menuitem19" , "name":"固定" },{ "id":"menuitem16" , "name":"我的工作" , "items":[{ "id":"menuitem1" , "name":"仪表盘" },{ "id":"menuitem2" , "name":"活动" }]},{ "id":"menuitem20" , "name":"客户" , "items":[{ "id":"menuitem5" , "name":"客户" },{ "id":"menuitem7" , "name":"联系人" }]},{ "id":"menuitem21" , "name":"销售" , "items":[{ "id":"menuitem8" , "name":"潜在客户" },{ "id":"menuitem9" , "name":"商机" },{ "id":"menuitem10" , "name":"竞争对手" }]},{ "id":"menuitem22" , "name":"宣传资料" , "items":[{ "id":"menuitem11" , "name":"报价单" },{ "id":"menuitem12" , "name":"订单" },{ "id":"menuitem13" , "name":"发票" },{ "id":"menuitem6" , "name":"产品" },{ "id":"menuitem14" , "name":"销售宣传资料" }]},{ "id":"menuitem23" , "name":"市场营销" , "items":[{ "id":"menuitem30" , "name":"市场活动" },{ "id":"menuitem15" , "name":"市场营销列表" }]},{ "id":"menuitem24" , "name":"绩效" , "items":[{ "id":"menuitem25" , "name":"目标" },{ "id":"menuitem31" , "name":"目标度量" }]},{ "id":"menuitem27" , "name":"服务" , "items":[{ "id":"menuitem28" , "name":"服务案例" },{ "id":"menuitem32" , "name":"知识文章" }]}]},{ "id":"bottom_exp" , "name":"底部内容" },{ "id":"footer_left" , "name":"底部左侧" },{ "id":"footer_center" , "name":"底部中间" },{ "id":"footer_right" , "name":"底部右侧" }] },{"menuid":"Setting", "menuname":"Setting", "menuitem":[{ "id":"menuitem1" , "name":"链接角色" }] }]
+               "appmenu":[{"menuid":"Central", "menuname":"Central", "menuitem":[{ "id":"user_menus" , "name":"用户菜单" },{ "id":"top_menus" , "name":"顶部菜单" , "items":[{ "id":"menuitem3" , "name":"设置" , "items":[{ "id":"menuitem4" , "name":"链接角色" },{ "id":"menuitem26" , "name":"货币" }]},{ "id":"menuitem34" , "name":"消息通知" },{ "id":"menuitem35" , "name":"帮助" }]},{ "id":"left_exp" , "name":"左侧菜单" , "items":[{ "id":"menuitem17" , "name":"主页" },{ "id":"menuitem18" , "name":"最近" },{ "id":"menuitem19" , "name":"固定" },{ "id":"menuitem16" , "name":"我的工作" , "items":[{ "id":"menuitem1" , "name":"仪表盘" },{ "id":"menuitem2" , "name":"活动" }]},{ "id":"menuitem20" , "name":"客户" , "items":[{ "id":"menuitem5" , "name":"客户" },{ "id":"menuitem7" , "name":"联系人" }]},{ "id":"menuitem21" , "name":"销售" , "items":[{ "id":"menuitem8" , "name":"潜在客户" },{ "id":"menuitem9" , "name":"商机" },{ "id":"menuitem10" , "name":"竞争对手" }]},{ "id":"menuitem22" , "name":"宣传资料" , "items":[{ "id":"menuitem11" , "name":"报价单" },{ "id":"menuitem12" , "name":"订单" },{ "id":"menuitem13" , "name":"发票" },{ "id":"menuitem6" , "name":"产品" },{ "id":"menuitem14" , "name":"销售宣传资料" }]},{ "id":"menuitem23" , "name":"市场营销" , "items":[{ "id":"menuitem30" , "name":"市场活动" },{ "id":"menuitem15" , "name":"市场营销列表" }]},{ "id":"menuitem24" , "name":"绩效" , "items":[{ "id":"menuitem25" , "name":"目标" },{ "id":"menuitem31" , "name":"目标度量" }]},{ "id":"menuitem27" , "name":"服务" , "items":[{ "id":"menuitem28" , "name":"服务案例" },{ "id":"menuitem32" , "name":"知识文章" }]}]},{ "id":"bottom_exp" , "name":"底部内容" },{ "id":"footer_left" , "name":"底部左侧" },{ "id":"footer_center" , "name":"底部中间" },{ "id":"footer_right" , "name":"底部右侧" }] },{"menuid":"Setting", "menuname":"Setting", "menuitem":[{ "id":"menuitem1" , "name":"链接角色" }] }]
             }
             ,
             {