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

ERMCP/PCWEB/TableSql/fxgl_v3_pcweb_table_define.sql

@@ -301,7 +301,7 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_all', 'convertfacto
 -- 销售--待点价
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_sales_pointprice', 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_sales_pointprice', 'accountname', '采购方 ', '200', 10, 1, 1, '', '', 'accountname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_pointprice', 'nickname', '采购方 ', '200', 10, 1, 1, '', '', 'nickname', 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_sales_pointprice', 'contractno', '合同编号', '0', 20, 1, 1, '', '', 'contractno', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
@@ -336,7 +336,7 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_pointprice', 'startdat
 -- 销售--履约交收
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_sales_settle', 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_sales_settle', 'accountname', '采购方', '200', 10, 1, 1, '', '', 'accountname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_settle', 'nickname', '采购方', '200', 10, 1, 1, '', '', 'nickname', 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_sales_settle', 'contractno', '合同编号 ', '0', 20, 1, 1, '', '', 'contractno', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
@@ -375,7 +375,7 @@ insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) valu
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_all', 'contracctstatus', '状态', '0', 10, 1, 1, '', '', 'contracctstatus', 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_sales_all', 'accountname', '采购方', '200', 20, 1, 1, '', '', 'accountname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_all', 'nickname', '采购方', '200', 20, 1, 1, '', '', 'nickname', 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_sales_all', 'contractno', '合同编号 ', '0', 30, 1, 1, '', '', 'contractno', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
@@ -768,8 +768,6 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_fincial_aduit_fp', 'contract
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_fincial_aduit_fp', 'InvoiceAmount', '金额', '0', 80, 1, 1, '', '', 'InvoiceAmount', 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_fincial_aduit_fp', 'attachurl', '发票附件', '0', 80, 1, 1, '', '', 'attachurl', 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_fincial_aduit_fp', 'applytime', '登记时间', '0', 90, 1, 1, '', '', 'applytime', 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_fincial_aduit_fp', 'applyname', '登记人', '0', 100, 1, 1, '', '', 'applyname', 0, 0, '');
@@ -793,8 +791,6 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_fincial_aduit_yfp', 'contrac
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_fincial_aduit_yfp', 'InvoiceAmount', '金额', '0', 80, 1, 1, '', '', 'InvoiceAmount', 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_fincial_aduit_yfp', 'attachurl', '发票附件', '0', 80, 1, 1, '', '', 'attachurl', 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_fincial_aduit_yfp', 'applytime', '登记时间', '0', 90, 1, 1, '', '', 'applytime', 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_fincial_aduit_yfp', 'applyname', '登记人', '0', 100, 1, 1, '', '', 'applyname', 0, 0, '');