Commit 9bd0a9d6 authored by neo's avatar neo

[dev] revert celldatatype to formulaDataSourceType

parent 2175262a
......@@ -1287,7 +1287,7 @@
var getAllDataGridColumns = function () {
var dataGridColumns;
switch ($scope.detail.allCellType) {
case enums.cellDataSourceType.InputInvoice:
case enums.formulaDataSourceType.InputInvoice:
//进项明细数据源
dataGridColumns = [
{
......@@ -1326,7 +1326,7 @@
{dataField: 'productionName', caption: $translate.instant('InvoiceHWMC'), alignment: 'left'}
];
break;
case enums.cellDataSourceType.OutputInvoice:
case enums.formulaDataSourceType.OutputInvoice:
//销项发票数据源
dataGridColumns = [
{
......@@ -1367,7 +1367,7 @@
{dataField: 'invoiceType', caption: $translate.instant('InvoiceType'), alignment: 'left'}
];
break;
case enums.cellDataSourceType.CustomInvoice:
case enums.formulaDataSourceType.CustomInvoice:
//海关稽核
dataGridColumns = [
{
......@@ -1403,7 +1403,7 @@
{dataField: 'auditResult', caption: $translate.instant('CustomsAuditResult'), alignment: 'left'}
];
break;
case enums.cellDataSourceType.Voucher:
case enums.formulaDataSourceType.Voucher:
//凭证选择
dataGridColumns = [
{
......@@ -1442,7 +1442,7 @@
var allDataFilter = function (config, data) {
var dataGridColumns;
switch ($scope.detail.allCellType) {
case enums.cellDataSourceType.Voucher:
case enums.formulaDataSourceType.Voucher:
data = _.map(data, function (item) {
item.date = item.date ? (new Date(item.date)).dateTimeToString('yyyyMMdd') : ""
return item;
......@@ -1455,7 +1455,7 @@
return _.contains(config.accountCodes, x.accountSubject)
}
});
case enums.cellDataSourceType.InputInvoice:
case enums.formulaDataSourceType.InputInvoice:
return data.filter(function (x) {
return (config.taxRate == "99" ||
_.contains(config.taxRate.map(function (r) {
......@@ -1463,7 +1463,7 @@
}), x.rate)) &&
_.contains(config.invoiceCategory, x.invoiceType);
});
case enums.cellDataSourceType.OutputInvoice:
case enums.formulaDataSourceType.OutputInvoice:
data = data.filter(function (x) {
return (_.contains(config.taxRate.map(function (r) {
return percentToPoint(r)
......@@ -1475,7 +1475,7 @@
return item;
});
return data;
case enums.cellDataSourceType.CustomInvoice:
case enums.formulaDataSourceType.CustomInvoice:
return data;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment