liuye / etradeclient · Commits

Commit f0e26553e6d094d59725fe8a3d071bf49ff5bd29

Authored by liuye
1 parent a2c8f866
build: skipped

bugfix<central>:修复综合业务系统菜单项显示错误的问题 

Signed-off-by: liuye <liuye@diligrp.com>
Inline Side-by-side
Showing 3 changed files with 19 additions and 20 deletions
central_clearing_system/Config/menu_res_auth_cfg.json
  View file @f0e2655
@@ -8,12 +8,12 @@ @@ -8,12 +8,12 @@
8 {"res_id":20003, "auth_id":101003, "icon":"query_manage.ico", "index":[1, 2]}, 8 {"res_id":20003, "auth_id":101003, "icon":"query_manage.ico", "index":[1, 2]},
9 {"res_id":20004, "auth_id":101004, "icon":"special_handle.ico", "index":[1, 3]}, 9 {"res_id":20004, "auth_id":101004, "icon":"special_handle.ico", "index":[1, 3]},
10 {"res_id":4, "auth_id":1020, "icon":"", "index":[2]}, 10 {"res_id":4, "auth_id":1020, "icon":"", "index":[2]},
11 - {"res_id":40002, "auth_id":102002, "icon":"cate_manage.ico", "index":[2, 0]},  
12 - {"res_id":40003, "auth_id":102003, "icon":"agreement.ico", "index":[2, 1]},  
13 - {"res_id":40004, "auth_id":102004, "icon":"consign_manage.ico", "index":[2, 2]},  
14 - {"res_id":40001, "auth_id":102001, "icon":"point_rule.ico", "index":[2, 4]},  
15 - {"res_id":40006, "auth_id":102005, "icon":"buckle-list.ico", "index":[2, 5]},  
16 - {"res_id":40009, "auth_id":102008, "icon":"pay-mode.ico", "index":[2, 7]}, 11 + {"res_id":40001, "auth_id":102002, "icon":"cate_manage.ico", "index":[2, 0]},
  12 + {"res_id":40002, "auth_id":102003, "icon":"agreement.ico", "index":[2, 1]},
  13 + {"res_id":40003, "auth_id":102004, "icon":"consign_manage.ico", "index":[2, 2]},
  14 + {"res_id":40004, "auth_id":102001, "icon":"point_rule.ico", "index":[2, 4]},
  15 + {"res_id":40005, "auth_id":102005, "icon":"buckle-list.ico", "index":[2, 5]},
  16 + {"res_id":40006, "auth_id":102008, "icon":"pay-mode.ico", "index":[2, 7]},
17 {"res_id":40007, "auth_id":102006, "icon":"pay-black-list.ico", "index":[2, 8]}, 17 {"res_id":40007, "auth_id":102006, "icon":"pay-black-list.ico", "index":[2, 8]},
18 {"res_id":40008, "auth_id":102007, "icon":"pay-white-list.ico", "index":[2, 9]}, 18 {"res_id":40008, "auth_id":102007, "icon":"pay-white-list.ico", "index":[2, 9]},
19 {"res_id":5, "auth_id":1040, "icon":"", "index":[3]}, 19 {"res_id":5, "auth_id":1040, "icon":"", "index":[3]},
central_clearing_system/ETradeClient.rc
  View file @f0e2655
@@ -286,8 +286,8 @@ END @@ -286,8 +286,8 @@ END
286 // 286 //
287 287
288 VS_VERSION_INFO VERSIONINFO 288 VS_VERSION_INFO VERSIONINFO
289 - FILEVERSION 4,0,0,0  
290 - PRODUCTVERSION 4,0,0,0 289 + FILEVERSION 4,0,1,0
  290 + PRODUCTVERSION 4,0,1,0
291 FILEFLAGSMASK 0x3fL 291 FILEFLAGSMASK 0x3fL
292 #ifdef _DEBUG 292 #ifdef _DEBUG
293 FILEFLAGS 0x1L 293 FILEFLAGS 0x1L
@@ -304,12 +304,12 @@ BEGIN @@ -304,12 +304,12 @@ BEGIN
304 BEGIN 304 BEGIN
305 VALUE "CompanyName", "地利集团【DILI GROUP】" 305 VALUE "CompanyName", "地利集团【DILI GROUP】"
306 VALUE "FileDescription", "电子交易结算综合业务系统" 306 VALUE "FileDescription", "电子交易结算综合业务系统"
307 - VALUE "FileVersion", "4.0.0.0"  
308 - VALUE "InternalName", "电子交易结算综合业务系统v4.0.0" 307 + VALUE "FileVersion", "4.0.1.0"
  308 + VALUE "InternalName", "电子交易结算综合业务系统"
309 VALUE "LegalCopyright", "(C) 地利集团保留所有权利。" 309 VALUE "LegalCopyright", "(C) 地利集团保留所有权利。"
310 - VALUE "OriginalFilename", "电子交易结算综合业务系统v4.0.0"  
311 - VALUE "ProductName", "电子交易结算综合业务系统v4.0.0"  
312 - VALUE "ProductVersion", "4.0.0.0" 310 + VALUE "OriginalFilename", "电子交易结算综合业务系统"
  311 + VALUE "ProductName", "电子交易结算综合业务系统"
  312 + VALUE "ProductVersion", "4.0.1.0"
313 END 313 END
314 END 314 END
315 BLOCK "VarFileInfo" 315 BLOCK "VarFileInfo"
central_clearing_system/Resource.h
  View file @f0e2655
@@ -93,15 +93,14 @@ @@ -93,15 +93,14 @@
93 #define ID_ACCELERATOR_X 32887 93 #define ID_ACCELERATOR_X 32887
94 #define ID_ACCELERATOR_A 32895 94 #define ID_ACCELERATOR_A 32895
95 #define ID_Menu 32909 95 #define ID_Menu 32909
96 -#define ID_POINT_RULE 40001  
97 -#define ID_CATEGORY_RULE 40002  
98 -#define ID_AGREEMENT 40003  
99 -#define ID_TAPE_HANDLE 40004  
100 -#define ID_CREDIT 40005  
101 -#define ID_KOUDIAN_WHITE_LIST 40006 96 +#define ID_CATEGORY_RULE 40001
  97 +#define ID_AGREEMENT 40002
  98 +#define ID_TAPE_HANDLE 40003
  99 +#define ID_POINT_RULE 40004
  100 +#define ID_KOUDIAN_WHITE_LIST 40005
  101 +#define ID_PAY_MANAGE 40006
102 #define ID_PAY_BLACK_LIST 40007 102 #define ID_PAY_BLACK_LIST 40007
103 #define ID_PAY_WHITE_LIST 40008 103 #define ID_PAY_WHITE_LIST 40008
104 -#define ID_PAY_MANAGE 40009  
105 #define ID_USER_MANAGE 50001 104 #define ID_USER_MANAGE 50001
106 #define ID_ROLE_MANAGE 50002 105 #define ID_ROLE_MANAGE 50002
107 #define ID_PARAM_SET 50003 106 #define ID_PARAM_SET 50003