Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/Configuration

ERMCP/PCWEB/Menu/pc_menu_shangpingdiaoqi.json

@@ -1118,6 +1118,62 @@
 										"children": []
 									}
 								]
+							},
+							{
+								"code": "warehouse_receipt_trade_designate",
+								"title": "指定挂牌",
+								"sort": 1,
+								"type": 1,
+								"rulekey": "",
+								"isshow": true,
+								"url": "",
+								"remark": "",
+								"children": [
+									{
+										"code": "warehouse_receipt_trade_designate_post_buying",
+										"title": "挂牌求购",
+										"sort": 1,
+										"type": 2,
+										"rulekey": "",
+										"isshow": true,
+										"url": "",
+										"remark": "",
+										"children": []
+									},
+									{
+										"code": "warehouse_receipt_trade_designate_delisting",
+										"title": "摘牌",
+										"sort": 1,
+										"type": 2,
+										"rulekey": "",
+										"isshow": true,
+										"url": "",
+										"remark": "",
+										"children": []
+									},
+									{
+										"code": "warehouse_receipt_trade_designate_bargain_delisting",
+										"title": "议价摘牌",
+										"sort": 1,
+										"type": 2,
+										"rulekey": "",
+										"isshow": true,
+										"url": "",
+										"remark": "",
+										"children": []
+									},
+									{
+										"code": "warehouse_receipt_trade_designate_detail",
+										"title": "详情",
+										"sort": 1,
+										"type": 2,
+										"rulekey": "",
+										"isshow": true,
+										"url": "",
+										"remark": "",
+										"children": []
+									}
+								]
 							}
 						]
 					},
@@ -1368,6 +1424,62 @@
 										"children": []
 									}
 								]
+							},
+							{
+								"code": "warehouse_pre_sale_designate",
+								"title": "指定挂牌",
+								"sort": 1,
+								"type": 1,
+								"rulekey": "",
+								"isshow": true,
+								"url": "",
+								"remark": "",
+								"children": [
+									{
+										"code": "warehouse_pre_sale_designate_post_buying",
+										"title": "挂牌求购",
+										"sort": 1,
+										"type": 2,
+										"rulekey": "",
+										"isshow": true,
+										"url": "",
+										"remark": "",
+										"children": []
+									},
+									{
+										"code": "warehouse_pre_sale_designate_delisting",
+										"title": "摘牌",
+										"sort": 1,
+										"type": 2,
+										"rulekey": "",
+										"isshow": true,
+										"url": "",
+										"remark": "",
+										"children": []
+									},
+									{
+										"code": "warehouse_pre_sale_designate_bargain_delisting",
+										"title": "议价摘牌",
+										"sort": 1,
+										"type": 2,
+										"rulekey": "",
+										"isshow": true,
+										"url": "",
+										"remark": "",
+										"children": []
+									},
+									{
+										"code": "warehouse_pre_sale_designate_detail",
+										"title": "详情",
+										"sort": 1,
+										"type": 2,
+										"rulekey": "",
+										"isshow": true,
+										"url": "",
+										"remark": "",
+										"children": []
+									}
+								]
 							}
 						]
 					},

ERMCP/PCWEB/TableSql/fxgl_v3_pcweb_table_define.sql

@@ -460,7 +460,7 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure_detail', 'createtim
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure_detail', 'contracttype', '类型', '0', 30, 1, 1, '', '', 'contracttype', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure_detail', 'deliverygoodsname', '现货商品', '0', 40, 1, 1, '', '', 'deliverygoodsname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure_detail', 'wrstandardname', '现货商品', '0', 40, 1, 1, '', '', 'wrstandardname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure_detail', 'qty', '现货商品数量', '0', 50, 1, 1, '', 'FormatterUnit,enumdicname', 'qty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
@@ -719,7 +719,7 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_js', 'applyti
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_js', 'applyname', '登记人', '0', 120, 1, 1, '', '', 'auditname', 0, 0, '');
 
--- 业务审核-交收-未审核
+-- 业务审核-交收-已审核
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_business_aduit_yjs', 2, '业务审核-交收', '', 'web端-业务审核-交收');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_yjs', 'applystatus', '状态', '0', 10, 1, 1, '', '', 'applystatus', 0, 0, '');