Skip to content

T
traffic-front
Commit 69de6bd6 authored by Ken you's avatar Ken you
Browse files
Options

fix 导入分发 追加和覆盖区分---Ken

parent 1f74d0af
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 454 additions and 158 deletions
atms-api/src/main/java/pwc/taxtech/atms/dto/DataImportLogDto.java
View file @ 69de6bd6
...@@ -215,6 +215,19 @@ public class DataImportLogDto implements Serializable { ...@@ -215,6 +215,19 @@ public class DataImportLogDto implements Serializable {
*/ */
private Date updateTime; private Date updateTime;
/**
* Database Column Remarks:
* 导入类型
默认0；追加导入1；覆盖导入2；
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column data_import_log.import_type
*
* @mbg.generated
*/
private Integer importType;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
* This field corresponds to the database table data_import_log * This field corresponds to the database table data_import_log
...@@ -623,12 +636,14 @@ public class DataImportLogDto implements Serializable { ...@@ -623,12 +636,14 @@ public class DataImportLogDto implements Serializable {
this.recordSize = recordSize; this.recordSize = recordSize;
} }
/** public Integer getImportType() {
* This method was generated by MyBatis Generator. return importType;
* This method corresponds to the database table data_import_log }
*
* @mbg.generated public void setImportType(Integer importType) {
*/ this.importType = importType;
}
@Override @Override
public String toString() { public String toString() {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
...@@ -637,6 +652,7 @@ public class DataImportLogDto implements Serializable { ...@@ -637,6 +652,7 @@ public class DataImportLogDto implements Serializable {
sb.append("Hash = ").append(hashCode()); sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id); sb.append(", id=").append(id);
sb.append(", organizationId=").append(organizationId); sb.append(", organizationId=").append(organizationId);
sb.append(", taxpayerIdNum=").append(taxpayerIdNum);
sb.append(", type=").append(type); sb.append(", type=").append(type);
sb.append(", companyCode=").append(companyCode); sb.append(", companyCode=").append(companyCode);
sb.append(", companyName=").append(companyName); sb.append(", companyName=").append(companyName);
...@@ -649,8 +665,10 @@ public class DataImportLogDto implements Serializable { ...@@ -649,8 +665,10 @@ public class DataImportLogDto implements Serializable {
sb.append(", operateTime=").append(operateTime); sb.append(", operateTime=").append(operateTime);
sb.append(", importResult=").append(importResult); sb.append(", importResult=").append(importResult);
sb.append(", errorMsg=").append(errorMsg); sb.append(", errorMsg=").append(errorMsg);
sb.append(", recordSize=").append(recordSize);
sb.append(", createTime=").append(createTime); sb.append(", createTime=").append(createTime);
sb.append(", updateTime=").append(updateTime); sb.append(", updateTime=").append(updateTime);
sb.append(", importType=").append(importType);
sb.append("]"); sb.append("]");
return sb.toString(); return sb.toString();
} }
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/DataImportService.java
View file @ 69de6bd6
...@@ -283,7 +283,8 @@ public class DataImportService extends BaseService { ...@@ -283,7 +283,8 @@ public class DataImportService extends BaseService {
EnumImportType.ProfitLoss.getCode(), period/100, EnumImportType.ProfitLoss.getCode(), period/100,
tmsPeriod%100, period%100, tmsPeriod%100, period%100,
companyName, fileType); companyName, fileType);
//添加导入类型
dataImportLog.setImportType(importType);
if (organizations.size() < 1) { if (organizations.size() < 1) {
dataImportLog.setImportResult(false); dataImportLog.setImportResult(false);
dataImportLog.setErrorMsg(ErrorMessageCN.NoCompanyError); dataImportLog.setErrorMsg(ErrorMessageCN.NoCompanyError);
...@@ -460,6 +461,8 @@ public class DataImportService extends BaseService { ...@@ -460,6 +461,8 @@ public class DataImportService extends BaseService {
EnumImportType.BalanceSheet.getCode(), period/100, EnumImportType.BalanceSheet.getCode(), period/100,
tmsPeriod%100, period%100, tmsPeriod%100, period%100,
companyName, fileType); companyName, fileType);
//添加导入类型
dataImportLog.setImportType(importType);
if (organizations.size() < 1) { if (organizations.size() < 1) {
dataImportLog.setImportResult(false); dataImportLog.setImportResult(false);
dataImportLog.setErrorMsg(ErrorMessageCN.NoCompanyError); dataImportLog.setErrorMsg(ErrorMessageCN.NoCompanyError);
...@@ -611,6 +614,8 @@ public class DataImportService extends BaseService { ...@@ -611,6 +614,8 @@ public class DataImportService extends BaseService {
EnumImportType.CashFlow.getCode(), period/100, EnumImportType.CashFlow.getCode(), period/100,
tmsPeriod%100, period%100, tmsPeriod%100, period%100,
companyName, fileType); companyName, fileType);
//添加导入类型
dataImportLog.setImportType(importType);
if (organizations.size() < 1) { if (organizations.size() < 1) {
dataImportLog.setImportResult(false); dataImportLog.setImportResult(false);
dataImportLog.setErrorMsg(ErrorMessageCN.NoCompanyError); dataImportLog.setErrorMsg(ErrorMessageCN.NoCompanyError);
...@@ -767,6 +772,8 @@ public class DataImportService extends BaseService { ...@@ -767,6 +772,8 @@ public class DataImportService extends BaseService {
EnumImportType.InvoiceData.getCode(), period/100, EnumImportType.InvoiceData.getCode(), period/100,
tmsPeriod%100, period%100, tmsPeriod%100, period%100,
companyName, fileType); companyName, fileType);
//添加导入类型
dataImportLog.setImportType(importType);
if (organizations.size() < 1) { if (organizations.size() < 1) {
dataImportLog.setImportResult(false); dataImportLog.setImportResult(false);
dataImportLog.setErrorMsg(ErrorMessageCN.NoCompanyError); dataImportLog.setErrorMsg(ErrorMessageCN.NoCompanyError);
...@@ -978,7 +985,8 @@ public class DataImportService extends BaseService { ...@@ -978,7 +985,8 @@ public class DataImportService extends BaseService {
tmsPeriod%100, period%100, tmsPeriod%100, period%100,
rlits.get(0).getSubjectName(), ""); rlits.get(0).getSubjectName(), "");
dataImportLog.setRecordSize(rlits.size()); dataImportLog.setRecordSize(rlits.size());
//添加导入类型
dataImportLog.setImportType(importType);
if(orgs.size()<1){ if(orgs.size()<1){
dataImportLog.setErrorMsg(ErrorMessageCN.NoCompanyError); dataImportLog.setErrorMsg(ErrorMessageCN.NoCompanyError);
dataImportLog.setImportResult(false); dataImportLog.setImportResult(false);
...@@ -1081,7 +1089,8 @@ public class DataImportService extends BaseService { ...@@ -1081,7 +1089,8 @@ public class DataImportService extends BaseService {
tmsPeriod%100, ats.get(0).getPeriod()%100, tmsPeriod%100, ats.get(0).getPeriod()%100,
ats.get(0).getSegment1Name(), ""); ats.get(0).getSegment1Name(), "");
dataImportLog.setRecordSize(ats.size()); dataImportLog.setRecordSize(ats.size());
//添加导入类型
dataImportLog.setImportType(importType);
if(orgs.size()<1){ if(orgs.size()<1){
dataImportLog.setErrorMsg(ErrorMessageCN.NoCompanyError); dataImportLog.setErrorMsg(ErrorMessageCN.NoCompanyError);
dataImportLog.setImportResult(false); dataImportLog.setImportResult(false);
...@@ -1185,7 +1194,8 @@ public class DataImportService extends BaseService { ...@@ -1185,7 +1194,8 @@ public class DataImportService extends BaseService {
tmsPeriod%100, cprs.get(0).getPeriod()%100, tmsPeriod%100, cprs.get(0).getPeriod()%100,
"", ""); "", "");
dataImportLog.setRecordSize(cprs.size()); dataImportLog.setRecordSize(cprs.size());
//添加导入类型
dataImportLog.setImportType(importType);
if(orgs.size()<1){ if(orgs.size()<1){
dataImportLog.setErrorMsg(ErrorMessageCN.NoCompanyError); dataImportLog.setErrorMsg(ErrorMessageCN.NoCompanyError);
dataImportLog.setImportResult(false); dataImportLog.setImportResult(false);
...@@ -1289,6 +1299,8 @@ public class DataImportService extends BaseService { ...@@ -1289,6 +1299,8 @@ public class DataImportService extends BaseService {
EnumImportType.CertifiedInvoicesList.getCode(), period/100, EnumImportType.CertifiedInvoicesList.getCode(), period/100,
tmsPeriod%100, period%100, tmsPeriod%100, period%100,
"", fileType); "", fileType);
//添加导入类型
dataImportLog.setImportType(importType);
if (organizations.size() < 1) { if (organizations.size() < 1) {
dataImportLog.setImportResult(false); dataImportLog.setImportResult(false);
dataImportLog.setErrorMsg(ErrorMessageCN.NoCompanyError); dataImportLog.setErrorMsg(ErrorMessageCN.NoCompanyError);
...@@ -1453,7 +1465,8 @@ public class DataImportService extends BaseService { ...@@ -1453,7 +1465,8 @@ public class DataImportService extends BaseService {
tmsPeriod%100, irs.get(0).getPeriod()%100, tmsPeriod%100, irs.get(0).getPeriod()%100,
irs.get(0).getBillingBody(), ""); irs.get(0).getBillingBody(), "");
dataImportLog.setRecordSize(irs.size()); dataImportLog.setRecordSize(irs.size());
//添加导入类型
dataImportLog.setImportType(importType);
if(orgs.size()<1){ if(orgs.size()<1){
dataImportLog.setErrorMsg(ErrorMessageCN.NoCompanyError); dataImportLog.setErrorMsg(ErrorMessageCN.NoCompanyError);
dataImportLog.setImportResult(false); dataImportLog.setImportResult(false);
......
atms-dao/etc/generator-mysql/generatorConfig.xml
View file @ 69de6bd6
...@@ -41,11 +41,19 @@ ...@@ -41,11 +41,19 @@
<property name="rootInterface" value="pwc.taxtech.atms.MyMapper"/> <property name="rootInterface" value="pwc.taxtech.atms.MyMapper"/>
</javaClientGenerator> </javaClientGenerator>
<table tableName="analysis_expected_tax_return" domainObjectName="AnalysisExpectedTaxReturn"> <table tableName="data_import_log" domainObjectName="DataImportLog">
<property name="useActualColumnNames" value="false"/> <property name="useActualColumnNames" value="false"/>
<property name="ignoreQualifiersAtRuntime" value="true"/> <property name="ignoreQualifiersAtRuntime" value="true"/>
<columnOverride column="type" javaType="java.lang.Integer" jdbcType="TINYINT"/>
<columnOverride column="tms_period_month" javaType="java.lang.Integer" jdbcType="TINYINT"/>
<columnOverride column="period_month" javaType="java.lang.Integer" jdbcType="TINYINT"/>
</table> </table>
<!--<table tableName="analysis_expected_tax_return" domainObjectName="AnalysisExpectedTaxReturn">-->
<!--<property name="useActualColumnNames" value="false"/>-->
<!--<property name="ignoreQualifiersAtRuntime" value="true"/>-->
<!--</table>-->
<!--<table tableName="cit_distribution" domainObjectName="CitDistribution">--> <!--<table tableName="cit_distribution" domainObjectName="CitDistribution">-->
<!--<property name="useActualColumnNames" value="false"/>--> <!--<property name="useActualColumnNames" value="false"/>-->
<!--<property name="ignoreQualifiersAtRuntime" value="true"/>--> <!--<property name="ignoreQualifiersAtRuntime" value="true"/>-->
...@@ -62,13 +70,7 @@ ...@@ -62,13 +70,7 @@
<columnOverride column="num_of_branches" javaType="java.lang.Integer" jdbcType="TINYINT"/> <columnOverride column="num_of_branches" javaType="java.lang.Integer" jdbcType="TINYINT"/>
</table> </table>
<table tableName="data_import_log" domainObjectName="DataImportLog">
<property name="useActualColumnNames" value="false"/>
<property name="ignoreQualifiersAtRuntime" value="true"/>
<columnOverride column="type" javaType="java.lang.Integer" jdbcType="TINYINT"/>
<columnOverride column="tms_period_month" javaType="java.lang.Integer" jdbcType="TINYINT"/>
<columnOverride column="period_month" javaType="java.lang.Integer" jdbcType="TINYINT"/>
</table>
<table tableName="organization_extra" domainObjectName="OrganizationExtra"> <table tableName="organization_extra" domainObjectName="OrganizationExtra">
<property name="useActualColumnNames" value="false"/> <property name="useActualColumnNames" value="false"/>
......
atms-dao/src/main/java/pwc/taxtech/atms/dao/DataImportLogMapper.java
View file @ 69de6bd6
package pwc.taxtech.atms.dao; package pwc.taxtech.atms.dao;
import java.util.List; import java.util.List;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.session.RowBounds; import org.apache.ibatis.session.RowBounds;
import pwc.taxtech.atms.MyMapper; import pwc.taxtech.atms.MyMapper;
import pwc.taxtech.atms.entity.DataImportLog; import pwc.taxtech.atms.entity.DataImportLog;
import pwc.taxtech.atms.entity.DataImportLogExample; import pwc.taxtech.atms.entity.DataImportLogExample;
@Mapper @Mapper
public interface DataImportLogMapper extends MyMapper { public interface DataImportLogMapper extends MyMapper {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table data_import_log * This method corresponds to the database table data_import_log
* *
* @mbg.generated * @mbg.generated
*/ */
long countByExample(DataImportLogExample example); long countByExample(DataImportLogExample example);
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table data_import_log * This method corresponds to the database table data_import_log
* *
* @mbg.generated * @mbg.generated
*/ */
int deleteByExample(DataImportLogExample example); int deleteByExample(DataImportLogExample example);
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table data_import_log * This method corresponds to the database table data_import_log
* *
* @mbg.generated * @mbg.generated
*/ */
int deleteByPrimaryKey(Long id); int deleteByPrimaryKey(Long id);
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table data_import_log * This method corresponds to the database table data_import_log
* *
* @mbg.generated * @mbg.generated
*/ */
int insert(DataImportLog record); int insert(DataImportLog record);
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table data_import_log * This method corresponds to the database table data_import_log
* *
* @mbg.generated * @mbg.generated
*/ */
int insertSelective(DataImportLog record); int insertSelective(DataImportLog record);
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table data_import_log * This method corresponds to the database table data_import_log
* *
* @mbg.generated * @mbg.generated
*/ */
List<DataImportLog> selectByExampleWithRowbounds(DataImportLogExample example, RowBounds rowBounds); List<DataImportLog> selectByExampleWithRowbounds(DataImportLogExample example, RowBounds rowBounds);
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table data_import_log * This method corresponds to the database table data_import_log
* *
* @mbg.generated * @mbg.generated
*/ */
List<DataImportLog> selectByExample(DataImportLogExample example); List<DataImportLog> selectByExample(DataImportLogExample example);
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table data_import_log * This method corresponds to the database table data_import_log
* *
* @mbg.generated * @mbg.generated
*/ */
DataImportLog selectByPrimaryKey(Long id); DataImportLog selectByPrimaryKey(Long id);
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table data_import_log * This method corresponds to the database table data_import_log
* *
* @mbg.generated * @mbg.generated
*/ */
int updateByExampleSelective(@Param("record") DataImportLog record, @Param("example") DataImportLogExample example); int updateByExampleSelective(@Param("record") DataImportLog record, @Param("example") DataImportLogExample example);
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table data_import_log * This method corresponds to the database table data_import_log
* *
* @mbg.generated * @mbg.generated
*/ */
int updateByExample(@Param("record") DataImportLog record, @Param("example") DataImportLogExample example); int updateByExample(@Param("record") DataImportLog record, @Param("example") DataImportLogExample example);
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table data_import_log * This method corresponds to the database table data_import_log
* *
* @mbg.generated * @mbg.generated
*/ */
int updateByPrimaryKeySelective(DataImportLog record); int updateByPrimaryKeySelective(DataImportLog record);
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table data_import_log * This method corresponds to the database table data_import_log
* *
* @mbg.generated * @mbg.generated
*/ */
int updateByPrimaryKey(DataImportLog record); int updateByPrimaryKey(DataImportLog record);
int displayOld(@Param("type") Integer type);
int displayOld(@Param("type") Integer type);
} }
\ No newline at end of file
atms-dao/src/main/java/pwc/taxtech/atms/entity/DataImportLogExample.java
View file @ 69de6bd6
This source diff could not be displayed because it is too large. You can view the blob instead.
atms-web/src/main/webapp/app-resources/i18n/en-us/vat.json
View file @ 69de6bd6
...@@ -1821,6 +1821,7 @@ ...@@ -1821,6 +1821,7 @@
"CoverImportBalanceSheet": "Overwrite import BS", "CoverImportBalanceSheet": "Overwrite import BS",
"AddImportBalanceSheet": "Expand import BS", "AddImportBalanceSheet": "Expand import BS",
"TMSPeriod": "TMS Period", "TMSPeriod": "TMS Period",
"ImportType": "Import Type",
"cashFlow": "Cash Flow", "cashFlow": "Cash Flow",
"CashFlowDDTitle": "Cash Flow", "CashFlowDDTitle": "Cash Flow",
"invoiceData": "Invoice Data", "invoiceData": "Invoice Data",
......
atms-web/src/main/webapp/app-resources/i18n/zh-CN/vat.json
View file @ 69de6bd6
...@@ -2076,8 +2076,7 @@ ...@@ -2076,8 +2076,7 @@
"CoverImportBalanceSheet": "覆盖导入资产负债表", "CoverImportBalanceSheet": "覆盖导入资产负债表",
"AddImportBalanceSheet": "追加导入资产负债表", "AddImportBalanceSheet": "追加导入资产负债表",
"TMSPeriod": "税务系统期间", "TMSPeriod": "税务系统期间",
"ImportType":"导入方式",
"invoiceData": "发票资料", "invoiceData": "发票资料",
"InvoiceDataTitle": "发票资料", "InvoiceDataTitle": "发票资料",
"IDTotalAmount": "合计", "IDTotalAmount": "合计",
......
atms-web/src/main/webapp/app/common/controls/import/import-adjust-table/import-adjust-table.ctrl.js
View file @ 69de6bd6
...@@ -846,7 +846,7 @@ ...@@ -846,7 +846,7 @@
}, { }, {
dataField: "periodMonth", dataField: "periodMonth",
allowHeaderFiltering: false, allowHeaderFiltering: false,
width: '10%', width: '5%',
caption: $translate.instant('TMSPeriod') caption: $translate.instant('TMSPeriod')
}, { }, {
dataField: "periodMonth", dataField: "periodMonth",
...@@ -861,8 +861,23 @@ ...@@ -861,8 +861,23 @@
}, { }, {
dataField: "errorMsg", dataField: "errorMsg",
allowHeaderFiltering: false, allowHeaderFiltering: false,
width: '15%', width: '10%',
caption: $translate.instant('Status') caption: $translate.instant('Status')
}, {
dataField: "importType",
allowHeaderFiltering: false,
width: '10%',
caption: $translate.instant('ImportType'),
calculateDisplayValue: function (data) {
var importType1 = _.find(constant.importTypeList, function (item) {
return item.value == data.importType;
});
if (importType1) {
return importType1.name;
} else {
return '未知';
}
}
} }
], ],
onContentReady: function (e) { onContentReady: function (e) {
......
atms-web/src/main/webapp/app/common/controls/import/import-balance-sheet/import-balance-sheet.ctrl.js
View file @ 69de6bd6
...@@ -854,12 +854,12 @@ ...@@ -854,12 +854,12 @@
}, { }, {
dataField: "periodYear", dataField: "periodYear",
allowHeaderFiltering: false, allowHeaderFiltering: false,
width: '7%', width: '5%',
caption: $translate.instant('YearPeriod') caption: $translate.instant('YearPeriod')
}, { }, {
dataField: "periodMonth", dataField: "periodMonth",
allowHeaderFiltering: false, allowHeaderFiltering: false,
width: '8%', width: '5%',
caption: $translate.instant('TMSPeriod') caption: $translate.instant('TMSPeriod')
}, { }, {
dataField: "periodMonth", dataField: "periodMonth",
...@@ -874,8 +874,23 @@ ...@@ -874,8 +874,23 @@
}, { }, {
dataField: "errorMsg", dataField: "errorMsg",
allowHeaderFiltering: false, allowHeaderFiltering: false,
width: '15%', width: '10%',
caption: $translate.instant('Status') caption: $translate.instant('Status')
}, {
dataField: "importType",
allowHeaderFiltering: false,
width: '10%',
caption: $translate.instant('ImportType'),
calculateDisplayValue: function (data) {
var importType1 = _.find(constant.importTypeList, function (item) {
return item.value == data.importType;
});
if (importType1) {
return importType1.name;
} else {
return '未知';
}
}
} }
], ],
onContentReady: function (e) { onContentReady: function (e) {
......
atms-web/src/main/webapp/app/common/controls/import/import-cash-flow/import-cash-flow.ctrl.js
View file @ 69de6bd6
...@@ -823,7 +823,7 @@ ...@@ -823,7 +823,7 @@
}, { }, {
dataField: "periodMonth", dataField: "periodMonth",
allowHeaderFiltering: false, allowHeaderFiltering: false,
width: '10%', width: '5%',
caption: $translate.instant('TMSPeriod') caption: $translate.instant('TMSPeriod')
}, { }, {
dataField: "periodMonth", dataField: "periodMonth",
...@@ -838,8 +838,23 @@ ...@@ -838,8 +838,23 @@
}, { }, {
dataField: "errorMsg", dataField: "errorMsg",
allowHeaderFiltering: false, allowHeaderFiltering: false,
width: '15%', width: '10%',
caption: $translate.instant('Status') caption: $translate.instant('Status')
}, {
dataField: "importType",
allowHeaderFiltering: false,
width: '10%',
caption: $translate.instant('ImportType'),
calculateDisplayValue: function (data) {
var importType1 = _.find(constant.importTypeList, function (item) {
return item.value == data.importType;
});
if (importType1) {
return importType1.name;
} else {
return '未知';
}
}
} }
], ],
onContentReady: function (e) { onContentReady: function (e) {
......
atms-web/src/main/webapp/app/common/controls/import/import-certified-invoices-list/import-certified-invoices-list.ctrl.js
View file @ 69de6bd6
...@@ -263,7 +263,7 @@ ...@@ -263,7 +263,7 @@
}, { }, {
dataField: "periodMonth", dataField: "periodMonth",
allowHeaderFiltering: false, allowHeaderFiltering: false,
width: '10%', width: '5%',
caption: $translate.instant('TMSPeriod') caption: $translate.instant('TMSPeriod')
}, { }, {
dataField: "periodMonth", dataField: "periodMonth",
...@@ -278,8 +278,23 @@ ...@@ -278,8 +278,23 @@
}, { }, {
dataField: "errorMsg", dataField: "errorMsg",
allowHeaderFiltering: false, allowHeaderFiltering: false,
width: '15%', width: '10%',
caption: $translate.instant('Status') caption: $translate.instant('Status')
}, {
dataField: "importType",
allowHeaderFiltering: false,
width: '10%',
caption: $translate.instant('ImportType'),
calculateDisplayValue: function (data) {
var importType1 = _.find(constant.importTypeList, function (item) {
return item.value == data.importType;
});
if (importType1) {
return importType1.name;
} else {
return '未知';
}
}
} }
], ],
onContentReady: function (e) { onContentReady: function (e) {
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-bs-prc-adjust/import-cit-bs-prc-adjust.ctrl.js
View file @ 69de6bd6
...@@ -259,8 +259,23 @@ ...@@ -259,8 +259,23 @@
}, { }, {
dataField: "errorMsg", dataField: "errorMsg",
allowHeaderFiltering: false, allowHeaderFiltering: false,
width: '20%', width: '10%',
caption: $translate.instant('Status') caption: $translate.instant('Status')
}, {
dataField: "importType",
allowHeaderFiltering: false,
width: '10%',
caption: $translate.instant('ImportType'),
calculateDisplayValue: function (data) {
var importType1 = _.find(constant.importTypeList, function (item) {
return item.value == data.importType;
});
if (importType1) {
return importType1.name;
} else {
return '未知';
}
}
} }
], ],
onContentReady: function (e) { onContentReady: function (e) {
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-draft-account-mapping/import-cit-draft-account-mapping.ctrl.js
View file @ 69de6bd6
...@@ -252,8 +252,23 @@ ...@@ -252,8 +252,23 @@
}, { }, {
dataField: "errorMsg", dataField: "errorMsg",
allowHeaderFiltering: false, allowHeaderFiltering: false,
width: '20%', width: '10%',
caption: $translate.instant('Status') caption: $translate.instant('Status')
}, {
dataField: "importType",
allowHeaderFiltering: false,
width: '10%',
caption: $translate.instant('ImportType'),
calculateDisplayValue: function (data) {
var importType1 = _.find(constant.importTypeList, function (item) {
return item.value == data.importType;
});
if (importType1) {
return importType1.name;
} else {
return '未知';
}
}
} }
], ],
onContentReady: function (e) { onContentReady: function (e) {
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-eam-assets-disposal/import-cit-eam-assets-disposal.ctrl.js
View file @ 69de6bd6
...@@ -251,8 +251,23 @@ ...@@ -251,8 +251,23 @@
}, { }, {
dataField: "errorMsg", dataField: "errorMsg",
allowHeaderFiltering: false, allowHeaderFiltering: false,
width: '20%', width: '10%',
caption: $translate.instant('Status') caption: $translate.instant('Status')
}, {
dataField: "importType",
allowHeaderFiltering: false,
width: '10%',
caption: $translate.instant('ImportType'),
calculateDisplayValue: function (data) {
var importType1 = _.find(constant.importTypeList, function (item) {
return item.value == data.importType;
});
if (importType1) {
return importType1.name;
} else {
return '未知';
}
}
} }
], ],
onContentReady: function (e) { onContentReady: function (e) {
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-journal-adjust/import-cit-journal-adjust.ctrl.js
View file @ 69de6bd6
...@@ -267,8 +267,23 @@ ...@@ -267,8 +267,23 @@
}, { }, {
dataField: "errorMsg", dataField: "errorMsg",
allowHeaderFiltering: false, allowHeaderFiltering: false,
width: '20%', width: '10%',
caption: $translate.instant('Status') caption: $translate.instant('Status')
}, {
dataField: "importType",
allowHeaderFiltering: false,
width: '10%',
caption: $translate.instant('ImportType'),
calculateDisplayValue: function (data) {
var importType1 = _.find(constant.importTypeList, function (item) {
return item.value == data.importType;
});
if (importType1) {
return importType1.name;
} else {
return '未知';
}
}
} }
], ],
onContentReady: function (e) { onContentReady: function (e) {
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-profit-prc-adjust/import-cit-profit-prc-adjust.ctrl.js
View file @ 69de6bd6
...@@ -260,8 +260,23 @@ ...@@ -260,8 +260,23 @@
}, { }, {
dataField: "errorMsg", dataField: "errorMsg",
allowHeaderFiltering: false, allowHeaderFiltering: false,
width: '20%', width: '10%',
caption: $translate.instant('Status') caption: $translate.instant('Status')
}, {
dataField: "importType",
allowHeaderFiltering: false,
width: '10%',
caption: $translate.instant('ImportType'),
calculateDisplayValue: function (data) {
var importType1 = _.find(constant.importTypeList, function (item) {
return item.value == data.importType;
});
if (importType1) {
return importType1.name;
} else {
return '未知';
}
}
} }
], ],
onContentReady: function (e) { onContentReady: function (e) {
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-salary-advance/import-cit-salary-advance.ctrl.js
View file @ 69de6bd6
...@@ -285,8 +285,23 @@ ...@@ -285,8 +285,23 @@
}, { }, {
dataField: "errorMsg", dataField: "errorMsg",
allowHeaderFiltering: false, allowHeaderFiltering: false,
width: '20%', width: '10%',
caption: $translate.instant('Status') caption: $translate.instant('Status')
}, {
dataField: "importType",
allowHeaderFiltering: false,
width: '10%',
caption: $translate.instant('ImportType'),
calculateDisplayValue: function (data) {
var importType1 = _.find(constant.importTypeList, function (item) {
return item.value == data.importType;
});
if (importType1) {
return importType1.name;
} else {
return '未知';
}
}
} }
], ],
onContentReady: function (e) { onContentReady: function (e) {
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-trial-balance/import-cit-trial-balance.ctrl.js
View file @ 69de6bd6
...@@ -262,8 +262,23 @@ ...@@ -262,8 +262,23 @@
}, { }, {
dataField: "errorMsg", dataField: "errorMsg",
allowHeaderFiltering: false, allowHeaderFiltering: false,
width: '20%', width: '10%',
caption: $translate.instant('Status') caption: $translate.instant('Status')
}, {
dataField: "importType",
allowHeaderFiltering: false,
width: '10%',
caption: $translate.instant('ImportType'),
calculateDisplayValue: function (data) {
var importType1 = _.find(constant.importTypeList, function (item) {
return item.value == data.importType;
});
if (importType1) {
return importType1.name;
} else {
return '未知';
}
}
} }
], ],
onContentReady: function (e) { onContentReady: function (e) {
......
atms-web/src/main/webapp/app/common/controls/import/import-coupa-purchasing-report/import-coupa-purchasing-report.ctrl.js
View file @ 69de6bd6
...@@ -288,7 +288,7 @@ ...@@ -288,7 +288,7 @@
}, { }, {
dataField: "periodMonth", dataField: "periodMonth",
allowHeaderFiltering: false, allowHeaderFiltering: false,
width: '10%', width: '5%',
caption: $translate.instant('TMSPeriod') caption: $translate.instant('TMSPeriod')
}, { }, {
dataField: "periodMonth", dataField: "periodMonth",
...@@ -303,8 +303,23 @@ ...@@ -303,8 +303,23 @@
}, { }, {
dataField: "errorMsg", dataField: "errorMsg",
allowHeaderFiltering: false, allowHeaderFiltering: false,
width: '15%', width: '10%',
caption: $translate.instant('Status') caption: $translate.instant('Status')
}, {
dataField: "importType",
allowHeaderFiltering: false,
width: '10%',
caption: $translate.instant('ImportType'),
calculateDisplayValue: function (data) {
var importType1 = _.find(constant.importTypeList, function (item) {
return item.value == data.importType;
});
if (importType1) {
return importType1.name;
} else {
return '未知';
}
}
} }
], ],
onContentReady: function (e) { onContentReady: function (e) {
......
atms-web/src/main/webapp/app/common/controls/import/import-invoice-data/import-invoice-data.ctrl.js
View file @ 69de6bd6
...@@ -274,7 +274,7 @@ ...@@ -274,7 +274,7 @@
}, { }, {
dataField: "periodMonth", dataField: "periodMonth",
allowHeaderFiltering: false, allowHeaderFiltering: false,
width: '10%', width: '5%',
caption: $translate.instant('TMSPeriod') caption: $translate.instant('TMSPeriod')
}, { }, {
dataField: "periodMonth", dataField: "periodMonth",
...@@ -289,8 +289,23 @@ ...@@ -289,8 +289,23 @@
}, { }, {
dataField: "errorMsg", dataField: "errorMsg",
allowHeaderFiltering: false, allowHeaderFiltering: false,
width: '15%', width: '10%',
caption: $translate.instant('Status') caption: $translate.instant('Status')
}, {
dataField: "importType",
allowHeaderFiltering: false,
width: '10%',
caption: $translate.instant('ImportType'),
calculateDisplayValue: function (data) {
var importType1 = _.find(constant.importTypeList, function (item) {
return item.value == data.importType;
});
if (importType1) {
return importType1.name;
} else {
return '未知';
}
}
} }
], ],
onContentReady: function (e) { onContentReady: function (e) {
......
atms-web/src/main/webapp/app/common/controls/import/import-invoice-record/import-invoice-record.ctrl.js
View file @ 69de6bd6
...@@ -272,7 +272,7 @@ ...@@ -272,7 +272,7 @@
}, { }, {
dataField: "periodMonth", dataField: "periodMonth",
allowHeaderFiltering: false, allowHeaderFiltering: false,
width: '10%', width: '5%',
caption: $translate.instant('TMSPeriod') caption: $translate.instant('TMSPeriod')
}, { }, {
dataField: "periodMonth", dataField: "periodMonth",
...@@ -287,8 +287,23 @@ ...@@ -287,8 +287,23 @@
}, { }, {
dataField: "errorMsg", dataField: "errorMsg",
allowHeaderFiltering: false, allowHeaderFiltering: false,
width: '15%', width: '10%',
caption: $translate.instant('Status') caption: $translate.instant('Status')
}, {
dataField: "importType",
allowHeaderFiltering: false,
width: '10%',
caption: $translate.instant('ImportType'),
calculateDisplayValue: function (data) {
var importType1 = _.find(constant.importTypeList, function (item) {
return item.value == data.importType;
});
if (importType1) {
return importType1.name;
} else {
return '未知';
}
}
} }
], ],
onContentReady: function (e) { onContentReady: function (e) {
......
atms-web/src/main/webapp/app/common/controls/import/import-profit-loss/import-profit-loss.ctrl.js
View file @ 69de6bd6
...@@ -274,7 +274,7 @@ ...@@ -274,7 +274,7 @@
}, { }, {
dataField: "periodMonth", dataField: "periodMonth",
allowHeaderFiltering: false, allowHeaderFiltering: false,
width: '10%', width: '5%',
caption: $translate.instant('TMSPeriod') caption: $translate.instant('TMSPeriod')
}, { }, {
dataField: "periodMonth", dataField: "periodMonth",
...@@ -289,8 +289,23 @@ ...@@ -289,8 +289,23 @@
}, { }, {
dataField: "errorMsg", dataField: "errorMsg",
allowHeaderFiltering: false, allowHeaderFiltering: false,
width: '15%', width: '10%',
caption: $translate.instant('Status') caption: $translate.instant('Status')
}, {
dataField: "importType",
allowHeaderFiltering: false,
width: '10%',
caption: $translate.instant('ImportType'),
calculateDisplayValue: function (data) {
var importType1 = _.find(constant.importTypeList, function (item) {
return item.value == data.importType;
});
if (importType1) {
return importType1.name;
} else {
return '未知';
}
}
} }
], ],
onContentReady: function (e) { onContentReady: function (e) {
......
atms-web/src/main/webapp/app/common/controls/import/import-red-letter-info-table/import-red-letter-info-table.ctrl.js
View file @ 69de6bd6
...@@ -302,7 +302,7 @@ ...@@ -302,7 +302,7 @@
}, { }, {
dataField: "periodMonth", dataField: "periodMonth",
allowHeaderFiltering: false, allowHeaderFiltering: false,
width: '10%', width: '5%',
caption: $translate.instant('TMSPeriod') caption: $translate.instant('TMSPeriod')
}, { }, {
dataField: "periodMonth", dataField: "periodMonth",
...@@ -317,8 +317,23 @@ ...@@ -317,8 +317,23 @@
}, { }, {
dataField: "errorMsg", dataField: "errorMsg",
allowHeaderFiltering: false, allowHeaderFiltering: false,
width: '15%', width: '10%',
caption: $translate.instant('Status') caption: $translate.instant('Status')
}, {
dataField: "importType",
allowHeaderFiltering: false,
width: '10%',
caption: $translate.instant('ImportType'),
calculateDisplayValue: function (data) {
var importType1 = _.find(constant.importTypeList, function (item) {
return item.value == data.importType;
});
if (importType1) {
return importType1.name;
} else {
return '未知';
}
}
} }
], ],
onContentReady: function (e) { onContentReady: function (e) {
......
atms-web/src/main/webapp/app/common/controls/import/import-template/import-template.ctrl.js
View file @ 69de6bd6
...@@ -839,7 +839,7 @@ ...@@ -839,7 +839,7 @@
}, { }, {
dataField: "periodMonth", dataField: "periodMonth",
allowHeaderFiltering: false, allowHeaderFiltering: false,
width: '10%', width: '5%',
caption: $translate.instant('TMSPeriod') caption: $translate.instant('TMSPeriod')
}, { }, {
dataField: "periodMonth", dataField: "periodMonth",
...@@ -854,8 +854,23 @@ ...@@ -854,8 +854,23 @@
}, { }, {
dataField: "errorMsg", dataField: "errorMsg",
allowHeaderFiltering: false, allowHeaderFiltering: false,
width: '15%', width: '10%',
caption: $translate.instant('Status') caption: $translate.instant('Status')
}, {
dataField: "importType",
allowHeaderFiltering: false,
width: '10%',
caption: $translate.instant('ImportType'),
calculateDisplayValue: function (data) {
var importType1 = _.find(constant.importTypeList, function (item) {
return item.value == data.importType;
});
if (importType1) {
return importType1.name;
} else {
return '未知';
}
}
} }
], ],
onContentReady: function (e) { onContentReady: function (e) {
......
atms-web/src/main/webapp/app/common/utils/constant.js
View file @ 69de6bd6
...@@ -45,6 +45,12 @@ constant.priority = { ...@@ -45,6 +45,12 @@ constant.priority = {
high: 3 high: 3
} }
constant.importTypeList = [
{value:0,name:"默认导入"},
{value:1,name:"覆盖导入"},
{value:2,name:"追加导入"}
]
constant.customer = { constant.customer = {
codeMaxLength: 50, codeMaxLength: 50,
nameMaxLength: 100, nameMaxLength: 100,
......
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