Skip to content

T
traffic-front
Commit 80b609ea authored by chase's avatar chase
Browse files
Options

Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql

parents 10b8164a d51f078a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 937 additions and 692 deletions
atms-api/src/main/java/pwc/taxtech/atms/service/impl/CitDataPreviewServiceImpl.java
View file @ 80b609ea
...@@ -141,6 +141,9 @@ public class CitDataPreviewServiceImpl extends BaseService { ...@@ -141,6 +141,9 @@ public class CitDataPreviewServiceImpl extends BaseService {
public int exportJournalMergeData2(CitJournalAdjustDto citJournalAdjustDto, HttpServletResponse response){ public int exportJournalMergeData2(CitJournalAdjustDto citJournalAdjustDto, HttpServletResponse response){
CitJournalEntryAdjust citJournalEntryAdjust = beanUtil.copyProperties(citJournalAdjustDto, new CitJournalEntryAdjust()); CitJournalEntryAdjust citJournalEntryAdjust = beanUtil.copyProperties(citJournalAdjustDto, new CitJournalEntryAdjust());
List<String> orgList = getOrgList(citJournalAdjustDto.getProjectId()); List<String> orgList = getOrgList(citJournalAdjustDto.getProjectId());
if(citJournalEntryAdjust.getPeriodEnd()!=null && citJournalEntryAdjust.getPeriodEnd()%100 ==12){
citJournalEntryAdjust.setPeriodEnd(citJournalEntryAdjust.getPeriodEnd()/100*100+13);
}
List<CitJournalEntryAdjust> journalMerges = citJournalMapper.getJournalMergeByOrgList(citJournalEntryAdjust,orgList); List<CitJournalEntryAdjust> journalMerges = citJournalMapper.getJournalMergeByOrgList(citJournalEntryAdjust,orgList);
if(journalMerges.size()==0){ if(journalMerges.size()==0){
return 0; return 0;
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/CitImportExcelServiceImpl.java
View file @ 80b609ea
...@@ -455,7 +455,8 @@ public class CitImportExcelServiceImpl extends BaseService { ...@@ -455,7 +455,8 @@ public class CitImportExcelServiceImpl extends BaseService {
citDataImportLogList.add(citDataImportLogError); citDataImportLogList.add(citDataImportLogError);
continue; continue;
} }
trialBalance.setAccountCode(cellValue.toString().replace(".0","")); // trialBalance.setAccountCode(cellValue.toString().replace(".0",""));
trialBalance.setAccountCode(new BigDecimal(cellValue.toString()).toPlainString());
trialBalance.setSegment4(CitCommonUtil.getValue(rowData.getCell(8)).toString()); trialBalance.setSegment4(CitCommonUtil.getValue(rowData.getCell(8)).toString());
trialBalance.setSegment5(CitCommonUtil.getValue(rowData.getCell(9)).toString()); trialBalance.setSegment5(CitCommonUtil.getValue(rowData.getCell(9)).toString());
trialBalance.setSegment6(CitCommonUtil.getValue(rowData.getCell(10)).toString()); trialBalance.setSegment6(CitCommonUtil.getValue(rowData.getCell(10)).toString());
...@@ -509,7 +510,10 @@ public class CitImportExcelServiceImpl extends BaseService { ...@@ -509,7 +510,10 @@ public class CitImportExcelServiceImpl extends BaseService {
citTrialBalanceMapper.deleteByExample(citTrialBalanceExample); citTrialBalanceMapper.deleteByExample(citTrialBalanceExample);
updateImportLog(EnumCitImportType.TrialBalance.getCode()); updateImportLog(EnumCitImportType.TrialBalance.getCode());
} }
int insertBatchNum = citTrialBalanceMapper.insertBatch(trialBalanceList); int insertBatchNum = 0;
if(trialBalanceList != null && trialBalanceList.size()>0){
insertBatchNum = citTrialBalanceMapper.insertBatch(trialBalanceList);
}
//循环遍历成功导入的数据，组装日志记录实体并放入集合 //循环遍历成功导入的数据，组装日志记录实体并放入集合
for (Map.Entry<String, Integer> entry : companySuccessMap.entrySet()) { for (Map.Entry<String, Integer> entry : companySuccessMap.entrySet()) {
...@@ -539,7 +543,8 @@ public class CitImportExcelServiceImpl extends BaseService { ...@@ -539,7 +543,8 @@ public class CitImportExcelServiceImpl extends BaseService {
citDataImportLogList.add(citDataImportLogError); citDataImportLogList.add(citDataImportLogError);
} }
for (Map.Entry<String, Integer> entry : noProjectMap.entrySet()) { for (Map.Entry<String, Integer> entry : noProjectMap.entrySet()) {
CitDataImportLog citDataImportLogError = generalCitDataImportLog(entry.getKey(), "", "", String[] split = entry.getKey().split(",");
CitDataImportLog citDataImportLogError = generalCitDataImportLog(split[0], split[1], split[2],
EnumCitImportType.TrialBalance.getCode(), period, EnumCitImportType.TrialBalance.getCode(), period,
"", "试算平衡表", false); "", "试算平衡表", false);
citDataImportLogError.setRecordSize(entry.getValue()); citDataImportLogError.setRecordSize(entry.getValue());
...@@ -645,7 +650,6 @@ public class CitImportExcelServiceImpl extends BaseService { ...@@ -645,7 +650,6 @@ public class CitImportExcelServiceImpl extends BaseService {
msg = "覆盖导入成功"; msg = "覆盖导入成功";
CitDraftAccountMappingExample example = new CitDraftAccountMappingExample(); CitDraftAccountMappingExample example = new CitDraftAccountMappingExample();
CitDraftAccountMappingExample.Criteria criteria = example.createCriteria(); CitDraftAccountMappingExample.Criteria criteria = example.createCriteria();
criteria.andCreatedByEqualTo(currentUserName);
criteria.andPeriodEqualTo(period); criteria.andPeriodEqualTo(period);
citDAMappingMapper.deleteByExample(example); citDAMappingMapper.deleteByExample(example);
updateImportLog(EnumCitImportType.DraftAccountMapping.getCode()); updateImportLog(EnumCitImportType.DraftAccountMapping.getCode());
...@@ -1532,11 +1536,12 @@ public class CitImportExcelServiceImpl extends BaseService { ...@@ -1532,11 +1536,12 @@ public class CitImportExcelServiceImpl extends BaseService {
BigDecimal lastYearBegBla = new BigDecimal(0); BigDecimal lastYearBegBla = new BigDecimal(0);
CitTrialBalanceExample citTrialBalanceExample = new CitTrialBalanceExample(); CitTrialBalanceExample citTrialBalanceExample = new CitTrialBalanceExample();
CitTrialBalanceExample.Criteria criteria = citTrialBalanceExample.createCriteria(); CitTrialBalanceExample.Criteria criteria = citTrialBalanceExample.createCriteria();
criteria.andOrganizationIdEqualTo(project.getOrganizationId());
criteria.andAccountCodeEqualTo(citJournal.getSubjectCode()); criteria.andAccountCodeEqualTo(citJournal.getSubjectCode());
criteria.andPeriodEqualTo(project.getYear()-1); criteria.andPeriodEqualTo(project.getYear()-1);
List<CitTrialBalance> trialBalances = citTrialBalanceMapper.selectByExample(citTrialBalanceExample); List<CitTrialBalance> trialBalances = citTrialBalanceMapper.selectByExample(citTrialBalanceExample);
if(trialBalances != null && trialBalances.size() > 0){ if(trialBalances != null && trialBalances.size() > 0){
lastYearBegBla = trialBalances.get(0).getBeginningBalance(); lastYearBegBla = lastYearBegBla.add(trialBalances.get(0).getBeginningBalance());
} }
trialBalance.setBeginningBalance(lastYearBegBla); trialBalance.setBeginningBalance(lastYearBegBla);
......
atms-api/src/main/resources/conf/conf_profile_uat.properties
View file @ 80b609ea
jdbc_url=jdbc:mysql://172.20.2.218:3300/fintax_test_2?useUnicode=true&amp;characterEncoding=utf-8&amp;zeroDateTimeBehavior=convertToNull&amp;allowMultiQueries=true&amp;useSSL=false jdbc_url=jdbc:mysql://172.20.2.218:3300/fintax_test_2?useUnicode=true&amp;characterEncoding=utf-8&amp;zeroDateTimeBehavior=convertToNull&amp;allowMultiQueries=true&amp;useSSL=false
jdbc_user=fintax_user_test2 jdbc_user=fintax_user_test2
jdbc_password=Fintaxuser@123Test2 jdbc_password=Fintaxuser@123Test2
...@@ -60,18 +59,19 @@ org_sync_token=174af08f ...@@ -60,18 +59,19 @@ org_sync_token=174af08f
dd_pubkey=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKUfMPRKV6I5num1dDWcxTrgTjXf5LctsVj0CpbwHE83mmjUO5CAlvA0Fwy30ajCX5sLmsyi+Eu/4uNmM6GQF3kCAwEAAQ== dd_pubkey=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKUfMPRKV6I5num1dDWcxTrgTjXf5LctsVj0CpbwHE83mmjUO5CAlvA0Fwy30ajCX5sLmsyi+Eu/4uNmM6GQF3kCAwEAAQ==
ebs_call_url=http://172.20.201.201:8020/ebs-proxy-test/dts ebs_call_url=http://172.20.201.98:8020/ebs-proxy-test/dts
#tableau config #tableau config
tableau_get_ticket=http://47.94.233.173:16010/trusted?username=%s tableau_get_ticket=http://172.20.201.98:8090/trusted?username=%s
tableau_unreturned_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet8?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no tableau_unreturned_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet0?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_tax_comparison=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet14?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no tableau_tax_comparison=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet3?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_other_countries=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Others?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no tableau_other_countries=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/Others?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_cost_analysis=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet19?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no tableau_cost_analysis=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet4?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_profit_and_loss=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet26?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no tableau_profit_and_loss=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet5?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_other_domestic_data=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet32?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no tableau_other_domestic_data=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet7?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_doc_situation=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet40?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no tableau_doc_situation=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet9?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_global_overview=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/InternationalOverview?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no tableau_global_overview=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/InternationalOverview?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_mexican_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Mexico?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no tableau_mexican_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/Mexico?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_australian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Australia?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no tableau_australian_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/Australia?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_brazilian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no tableau_brazilian_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CitJournalAdjustExtendsMapper.xml
View file @ 80b609ea
...@@ -418,7 +418,7 @@ ...@@ -418,7 +418,7 @@
attribute16, attribute16,
created_by, created_date, late_updated_by, created_by, created_date, late_updated_by,
late_updated_date, create_time, update_time,is_select late_updated_date, create_time, update_time,is_select
from cit_journal_entry_adjust where period like CONCAT('%' ,#{record.period},'%') from cit_journal_entry_adjust where period = #{record.period}
<if test="orgList != null and orgList.size > 0"> <if test="orgList != null and orgList.size > 0">
AND organization_id in AND organization_id in
<foreach item="item" index="index" collection="orgList" open="(" separator="," close=")"> <foreach item="item" index="index" collection="orgList" open="(" separator="," close=")">
......
atms-web/src/main/java/pwc/taxtech/atms/web/controller/AccountController.java
View file @ 80b609ea
...@@ -208,7 +208,7 @@ public class AccountController { ...@@ -208,7 +208,7 @@ public class AccountController {
response.addCookie(ddTicketCookie); response.addCookie(ddTicketCookie);
response.addCookie(ddJumptoCookie); response.addCookie(ddJumptoCookie);
// todo 这里写死为DD的登出地址了 // todo 这里写死为DD的登出地址了
response.sendRedirect("http://mis.diditaxi.com.cn/auth/ldap/logout?app_id=2500&jumpto=http://dts.erp.didichuxing.com:9001/sso/accept"); response.sendRedirect("http://mis.diditaxi.com.cn/auth/ldap/logout?app_id=2500&jumpto=http://dts-test.erp.didichuxing.com/sso/accept");
} catch (Exception e) { } catch (Exception e) {
logger.error("登出失败", e); logger.error("登出失败", e);
} }
......
atms-web/src/main/resources/conf_profile_uat.properties
View file @ 80b609ea
api.url=http://dts.erp.didichuxing.com api.url=http://dts-test.erp.didichuxing.com
jwt.base64Secret=TXppQjFlZFBSbnJzMHc0Tg== jwt.base64Secret=TXppQjFlZFBSbnJzMHc0Tg==
jwt.powerToken=xxxx jwt.powerToken=xxxx
...@@ -21,49 +21,49 @@ longi_api_basic_pwd= ...@@ -21,49 +21,49 @@ longi_api_basic_pwd=
longi_api_gl_balance=http://39.105.197.175:13001/ETMSSB/Erp/GLBalance/ProxyServices/ErpQueryGLBalanceSoapProxy?wsdl longi_api_gl_balance=http://39.105.197.175:13001/ETMSSB/Erp/GLBalance/ProxyServices/ErpQueryGLBalanceSoapProxy?wsdl
#tableau config #tableau config
tableau_get_ticket=http://47.94.233.173:16010/trusted?username=%s tableau_get_ticket=http://172.20.201.98:8090/trusted?username=%s
#税种未返还税金 #税种未返还税金
tableau_tax_category_unreturned_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/_mobile_1?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_tax_category_unreturned_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/_mobile_1?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#地区未返还税金 #地区未返还税金
tableau_district_unreturned_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_district_unreturned_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#未返还/返还后税金比较 #未返还/返还后税金比较
tableau_unreturned_and_returned_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet14?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_unreturned_and_returned_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet3?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#费用分析 #费用分析
tableau_cost_analysis=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet19?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_cost_analysis=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet4?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#地区利润总额 / 亏损额 #地区利润总额 / 亏损额
tableau_district_profit_and_loss=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet26?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_district_profit_and_loss=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet5?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#公司利润总额 / 亏损额 #公司利润总额 / 亏损额
tableau_company_profit_and_loss=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/_mobile_2?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_company_profit_and_loss=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/_mobile_2?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#司机 / 员工人数 #司机 / 员工人数
tableau_driver_and_employee=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet32?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_driver_and_employee=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet7?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#业务线GMV及补贴统计 #业务线GMV及补贴统计
tableau_gmv_and_subsidy=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/GMV_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_gmv_and_subsidy=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/GMV_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#档案归档情况 #档案归档情况
tableau_file_arrangement=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/_mobile_3?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_file_arrangement=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/_mobile_3?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#国际税全球概覧 #国际税全球概覧
tableau_global_overview=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/InternationalOverview?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_global_overview=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/InternationalOverview?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#国际税业务数据 #国际税业务数据
tableau_global_business=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/International_Table_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_global_business=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/International_Table_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#墨西哥税务分析 #墨西哥税务分析
tableau_mexican_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Mexico?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_mexican_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/Mexico?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#澳洲税务分析 #澳洲税务分析
tableau_australian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Australia?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_australian_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/Australia?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#巴西税务分析 #巴西税务分析
tableau_brazilian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_brazilian_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#其他税务分析 #其他税务分析
tableau_other_tax_analysis=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Others?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_other_tax_analysis=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/Others?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.html
View file @ 80b609ea
...@@ -530,7 +530,7 @@ ...@@ -530,7 +530,7 @@
<select class="input-group" style="display: none" <select class="input-group" style="display: none"
name="taxReturnBusinessType" name="taxReturnBusinessType"
ng-model="editOrgExtraModel.taxReturnBusinessType" ng-model="editOrgExtraModel.taxReturnBusinessType"
ng-options="x.code as x.code for x in taxReturnBusinessTypeList"> ng-options="x.code as x.type for x in taxReturnBusinessTypeList">
<option value="">{{resources.TaxReturnBusinessType}} <option value="">{{resources.TaxReturnBusinessType}}
</option> </option>
</select> </select>
......
atms-web/src/main/webapp/app/analysis/data-import/domestic-data-import/domestic-data-import.ctrl.js
View file @ 80b609ea
...@@ -475,7 +475,7 @@ ...@@ -475,7 +475,7 @@
pageSize: constant.page.pageSize pageSize: constant.page.pageSize
}, },
pager: { pager: {
showPageSizeSelector: true, showPageSizeSelector: false,
allowedPageSizes: constant.page.pageSizeArrary, allowedPageSizes: constant.page.pageSizeArrary,
showInfo: true showInfo: true
} }
......
atms-web/src/main/webapp/app/analysis/data-import/international-data-import/international-data-import.html
View file @ 80b609ea
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
<select class="selectpicker show-tick dropup" multiple data-live-search="true" <select class="selectpicker show-tick dropup" multiple data-live-search="true"
data-max-options="1" data-max-options="1"
data-size="10" data-size="10"
data-style="btn-primary" id ="contryList" data-style="btn-info" id ="contryList"
data-header="国家列表" data-header="国家列表"
data-content = "true" data-content = "true"
data-none-selected-text = "选择国家" data-none-selected-text = "选择国家"
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
<select class="selectpicker show-tick dropup" multiple data-live-search="true" <select class="selectpicker show-tick dropup" multiple data-live-search="true"
data-width="auto" data-max-options="1" data-width="auto" data-max-options="1"
data-size="10" data-size="10"
data-style="btn-primary" id ="orgList" data-style="btn-info" id ="orgList"
data-header="公司列表" data-header="公司列表"
data-content = "true" data-content = "true"
data-icon-base = "tickIcon" data-icon-base = "tickIcon"
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-journal-merge/cit-preview-journal-merge.html
View file @ 80b609ea
...@@ -22,33 +22,15 @@ ...@@ -22,33 +22,15 @@
<!--{{'ImportTime' | translate}}<span class="numAmount">{{importDate| date:'yyyy-MM-dd hh:mm:ss'}}</span>--> <!--{{'ImportTime' | translate}}<span class="numAmount">{{importDate| date:'yyyy-MM-dd hh:mm:ss'}}</span>-->
<!--</div>--> <!--</div>-->
<div id="filterCriteriaDiv" style="max-width:98%;margin-bottom:2px;" ng-show="criteriaList.length>0"> <div id="tab_total">
<span class="text-bold margin-left20" translate="FilterCriteriaTags"></span>: <div class="dt-init-wrapper">
<span class="tag label label-default" ng-repeat="criteria in criteriaListFirstRow"> <div id="extractFinancialGridContainer" dx-data-grid="gridOptions">
<span title="{{criteria.fullName}}"> </div>
{{criteria.name}} <div class="page-footer">
</span> <ack-pagination page-options="pagingOptions"
<a><i class="remove glyphicon glyphicon-remove-sign glyphicon-white" ng-click="doDataFilter(criteria.propertyName)"></i></a> refresh-table="refreshGrid()"></ack-pagination>
</span> </div>
<span ng-if="criteriaList.length>6"><br /></span>
<span ng-if="criteriaList.length>6" style="margin-left: 81px; margin-top: 19px; display: inline-block;"></span>
<span ng-if="criteriaList.length>6" class="tag label label-default" ng-repeat="criteria in criteriaListSecondRow">
<span title="{{criteria.fullName}}">
{{criteria.name}}
</span>
<a><i class="remove glyphicon glyphicon-remove-sign glyphicon-white" ng-click="doDataFilter(criteria.propertyName)"></i></a>
</span>
</div>
<div id="mainAreaDiv" class="main-area" style="padding-top: 10px">
<div class="inputInvoiceGrid" ui-grid="gridOptions">
<div class="watermark" ng-show="!gridOptions.data.length"><span translate="NoDataAvailable"></span></div>
</div> </div>
</div> </div>
<div class="page-footer">
<ack-pagination page-options="pagingOptions"
refresh-table="refreshGrid()"></ack-pagination>
</div>
</div> </div>
atms-web/src/main/webapp/app/cit/preview/cit-preview-journal-merge/cit-preview-journal-merge.less
View file @ 80b609ea
@import "~/app-resources/less/theme.less"; @import "~/app-resources/less/theme.less";
.cit-preview-journal-merge { .cit-preview-journal-merge {
background-color: white; /*background-color: @color-white;*/
height: 100%; padding-left: 20px;
/*min-height: 800px;*/
height: 96%;
.row { .dropdown-common() {
margin-left: 0px; display: inline-block;
margin-bottom:10px;
&>span { .select-button {
float: right; background-color: #F5F5F5;
margin-right: 15px; padding: 6px 0;
cursor: pointer; width: 100px;
} }
}
.nav-wrapper { .caret {
padding-bottom: 10px; margin-top: 8px;
border-bottom: 1px solid #DBD8D3;
.nav-header {
height: 54px;
line-height: 54px;
font-family: "Microsoft YaHei Bold", "Microsoft YaHei Regular", "Microsoft YaHei";
font-weight: 700;
font-style: normal;
font-size: 15px;
color: #333;
} }
.nav-tab { .dropdown-menu {
/*display: inline-block;*/ min-width: 100px;
span { li {
display: inline-block;
height: 34px;
width: 80px;
text-align: center; text-align: center;
line-height: 34px; min-height: 0px;
padding: 0 10px; height: 30px;
background-color: #B90808; line-height: 30px;
color: #FFF; color: #000;
font-weight: normal;
&:hover {
background-color: #F91000;
color: #FFF;
}
}
}
}
#tab_total {
display: block;
height: calc(~'100% - 80px');
position: relative;
.import-wrapper {
span {
margin-left: 10px;
color: #333;
font-family: "Microsoft YaHei"; font-family: "Microsoft YaHei";
font-weight: 400;
font-style: normal; font-style: normal;
font-size: 14px; font-size: 14px;
cursor: pointer; font-weight: bold;
} }
.active { .checkbox-custom {
background-color: #F91000; float: left;
position: relative;
margin-right : 10px;
margin-top: 0;
display: inline-block;
} }
} .divider{
} height: 1px;
margin: 9px 0;
.numAmount { overflow: hidden;
padding: 0 3px; background-color: #e5e5e5;
height: 21px; }
margin-left: 5px;
/* font-family: 'Arial'; */
font-weight: 600;
border-radius: 2px;
font-style: normal;
outline: none;
border: none;
min-width: 20px;
background-color: #DDDDDD;
color: #AA0000;
}
.top-area-wrapper {
height: 60px;
width: 98%;
margin: 0 20px;
.filter-button { .checkbox-custom input[type="checkbox"] {
width: 30px; cursor: pointer;
margin-top: 16px; z-index: 2;
} margin: -6px 0 0 0;
top: 50%;
left: 3px;
}
.operation-wrapper { .checkbox-custom label:before {
margin: 15px 25px 10px 10px; content: '';
position: absolute;
top: 50%;
left: 0;
margin-top: -9px;
width: 19px;
height: 18px;
display: inline-block;
border-radius: 2px;
border: 1px solid #bbb;
background: #fff;
}
span { .checkbox-custom input[type="checkbox"]:checked +label:after {
position: absolute;
display: inline-block;
font-family: 'Glyphicons Halflings';
content: "\e013";
top: 42%;
left: 3px;
margin-top: -5px;
font-size: 11px;
line-height: 1;
width: 16px;
height: 16px;
color: #333;
}
.checkbox-custom label {
cursor: pointer; cursor: pointer;
line-height: 1.2;
font-weight: normal;
margin-bottom: 0;
text-align: left;
} }
}
}
.filter-popup-wrapper { .period-picker {
display: none; width: 110px;
} border: 1px solid #c7c5c0;
display: inline-block;
line-height: 20px;
margin-top: 7px;
}
.imp-subheader {
display: inline-block;
font-size: 15px;
height: 30px;
line-height: 30px;
vertical-align: middle;
border: none;
select {
appearance: none;
-moz-appearance: none;
-webkit-appearance: none;
background: transparent;
}
}
.dropdown {
.dropdown-common();
}
.margin-left20 { input {
margin-left: 20px; width: 50px;
} outline: none;
/*******************************************/ border-radius: 3px;
/*Filter Criteria tags:*/ border: 1px solid #3c3a36;
.tag { padding: 2px;
font-size: 12px; text-align: center;
padding: .3em .4em .4em; }
margin: 0 .1em;
a { > button:last-child {
color: #bbb; float: right;
cursor: pointer; margin-right: 20px;
opacity: 0.6; }
margin: 0 0 0 .3em;
.btn-wrapper {
border-radius: 5px;
background-color: #e0301e;
color: #FFF;
display: inline-block;
float: right;
margin-right: 10px;
&:hover { .btn-vat-primary {
opacity: 1.0; min-width: 80px;
}
} }
}
.glyphicon-white { .dt-init-wrapper {
color: #fff; margin: 0px 0;
margin-bottom: 2px; max-width: 99%;
} height: calc(~'100% - 20px');
position: relative;
margin-top: 10px;
} }
.remove { .error-info-wrapper {
vertical-align: bottom; position: absolute;
top: 0; height: 150px;
bottom: 0;
left: 0;
right: 0;
overflow: hidden;
background-color: #FFF;
margin-left: -40px;
} }
}
/*Filter Criteria tags:*/
/*******************************************/
.main-area {
margin: 0 20px;
.watermark { #content-resizer {
width: 110%;
position: absolute; position: absolute;
top: 50%; height: 4px;
transform: translateY(-50%); bottom: 150px;
opacity: .25; left: 0;
font-size: 3em; right: 0;
width: 100%; background-color: red;
text-align: center; cursor: n-resize;
z-index: 1000; margin-left: -40px;
#topIcon {
cursor: pointer;
margin-top: -19px;
width: 38px;
margin-left: 46%;
z-index: 999;
bottom: -381px;
text-align: center;
display: block !important;
}
} }
.inputInvoiceGrid { .dt-import-wrapper {
width: 100%; margin: 60px 0;
height: calc(~'100% - 158px'); max-width: 99%;
overflow: auto;
height: calc(~"100% - 35px");
.ui-grid-header-cell-wrapper .ui-grid-header-cell-row .ui-grid-cell-contents { .dropdown {
height: 40px; .dropdown-common();
i { i {
display: none; color: #F85550;
} }
} }
} }
} }
/*覆写ack-pagination.less中：.page-size, .pagination 中的margin演示 */
.form-control { .page-form-group{
float:right;
&:focus { .page-size{
border-color: transparent; margin:0;
-webkit-box-shadow: none; }
box-shadow: none; .pagination {
border: 1px solid #ccc; margin:0;
} }
} }
}
.input-width-middle { .form-control {
width: 217px; &:focus {
border-color: transparent;
-webkit-box-shadow: none;
box-shadow: none;
border: 1px solid #ccc;
} }
} }
.input-width-middle {
width: 217px;
}
.popover { .popover {
min-width: 370px; min-width: 370px;
......
atms-web/src/main/webapp/app/cit/reduction/cit-asset-eam-mapping/cit-asset-eam-mapping.ctrl.js
View file @ 80b609ea
...@@ -192,8 +192,8 @@ ...@@ -192,8 +192,8 @@
$scope.pagingOptions = { $scope.pagingOptions = {
pageIndex: 1, //当前页码 pageIndex: 1, //当前页码
totalItems: 0, //总数据 totalItems: 0, //总数据
pageSize: 50, //每页多少条数据 pageSize: 20, //每页多少条数据
pageSizeString:"50" pageSizeString:"20"
}; };
$('#input-invoice-period-picker').focus(function () { $('#input-invoice-period-picker').focus(function () {
...@@ -224,7 +224,6 @@ ...@@ -224,7 +224,6 @@
bindingOptions: { bindingOptions: {
dataSource: 'gridDataSource' dataSource: 'gridDataSource'
}, },
showBorders: true,
columns: [ columns: [
{ {
caption: $translate.instant('AssetType'), caption: $translate.instant('AssetType'),
...@@ -334,47 +333,18 @@ ...@@ -334,47 +333,18 @@
selection: { selection: {
mode: "single" mode: "single"
}, },
grouping: { paging: {
autoExpandAll: false pageSize: 20
}, },
allowColumnResizing: true, allowColumnResizing: true,
columnAutoWidth: true,
showRowLines: true, showRowLines: true,
showColumnLines: true, showColumnLines: true,
rowAlternationEnabled: true, //单双行颜色 rowAlternationEnabled: true, //单双行颜色
showBorders: true,
hoverStateEnabled: true,
height: '99%',
noDataText: $translate.instant('NoDataText'), noDataText: $translate.instant('NoDataText'),
}; };
// $scope.gridOptions = {
// rowHeight: constant.UIGrid.rowHeight,
// selectionRowHeaderWidth: constant.UIGrid.rowHeight,
// // expandableRowTemplate: '<div ui-grid="row.entity.subGridOptions" style="height:150px;"></div>',
// virtualizationThreshold: 50,//默认加载50条数据，避免在数据展示时，只显示前面4条
// enableSorting: false,
// enableColumnMenus: false,
// enableHorizontalScrollbar : 1,
// columnDefs: [
// { name: $translate.instant('AssetType'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.assetType}}<span></div>' },
// { name: $translate.instant('AssetNumber'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.assetNumber}}<span></div>' },
// { name: $translate.instant('AssetName'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.assetDescription}}</span></div>' },
// { name: $translate.instant('BuyDate'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.buyDate | date:"yyyy-MM-dd"}}</span></div>' },
// { name: $translate.instant('DepreciationDate2'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.depreciationDate | date:"yyyy-MM-dd"}}</span></div>' },
// { name: $translate.instant('AssetGroupName'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.assetGroupName}}</span></div>' },
// { name: $translate.instant('AcquisitionValue'), width: 120,cellTemplate: '<div class="ui-grid-cell-contents" style="float: right"><span >{{row.entity.acquisitionValue}}</span></div>' },
// { name: $translate.instant('ResidualValue'), width: 120,cellTemplate: '<div class="ui-grid-cell-contents" style="float: right"><span >{{row.entity.residualRate}}</span></div>' },
// { name: $translate.instant('YearEndValue'), width: 120,cellTemplate: '<div class="ui-grid-cell-contents" style="float: right"><span>{{row.entity.yearEndValue}}</span></div>' },
// { name: $translate.instant('compensationSaleAmount'), width: 120,cellTemplate: '<div class="ui-grid-cell-contents" style="float: right"><span>{{row.entity.compensationSaleAmount}}</span></div>' },
//
// { name: $translate.instant('DisposalProfitAndLoss'), width: 120,cellTemplate: '<div class="ui-grid-cell-contents" style="float: right"><span>{{row.entity.disposalProfitAndLoss}}</span></div>' },
//
// { name: $translate.instant('TaxGroupName'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.taxGroupName}}</span></div>' },
// { name: $translate.instant('DepreciationPeriod'),width: 120,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.depreciationPeriod}}</span></div>' },
// { name: $translate.instant('PerMonthDepreciationAmount'),width: 120,cellTemplate: '<div class="ui-grid-cell-contents" style="float: right"><span>{{row.entity.perMonthDepreciationAmount}}</span></div>' },
// { name: $translate.instant('TaxToCurrentYearDepreciationPeriod'), width: 120,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.taxToCurrentYearDepreciationPeriod}}</span></div>' },
// { name: $translate.instant('AccountTotalepreciationAmount'),width: 120, cellTemplate: '<div class="ui-grid-cell-contents" style="float: right"><span>{{row.entity.taxToCurrentYearDepreciationAmount}}</span></div>' },
// { name: $translate.instant('TaxNetValue'),width: 120, cellTemplate: '<div class="ui-grid-cell-contents" style="float: right"><span>{{row.entity.taxNetValue}}</span></div>' },
// { name: $translate.instant('DisposalTaxBenefit'),width: 120, cellTemplate: '<div class="ui-grid-cell-contents" style="float: right"><span>{{row.entity.disposalTaxBenefit}}</span></div>' }
// ]
// };
$scope.doDataFilter = doDataFilter; $scope.doDataFilter = doDataFilter;
$scope.doDataFilterReset = doDataFilterReset; $scope.doDataFilterReset = doDataFilterReset;
......
atms-web/src/main/webapp/app/cit/reduction/cit-asset-eam-mapping/cit-asset-eam-mapping.html
View file @ 80b609ea
...@@ -23,10 +23,7 @@ ...@@ -23,10 +23,7 @@
<!--导航栏--> <!--导航栏-->
<div id="tab_total"> <div id="tab_total">
<div class="dt-init-wrapper"> <div class="dt-init-wrapper">
<div class="dx-viewport grid-container"> <div id="extractFinancialGridContainer" dx-data-grid="gridOptions" >
<div id="extractFinancialGridContainer" dx-data-grid="gridOptions"
style="margin-top: 30px;">
</div>
</div> </div>
<div class="page-footer"> <div class="page-footer">
<ack-pagination page-options="pagingOptions" <ack-pagination page-options="pagingOptions"
......
atms-web/src/main/webapp/app/cit/reduction/cit-asset-eam-mapping/cit-asset-eam-mapping.less
View file @ 80b609ea
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#tab_total { #tab_total {
display: block; display: block;
height: calc(~'100% - 40px'); height: calc(~'100% - 80px');
position: relative; position: relative;
.import-wrapper { .import-wrapper {
...@@ -170,29 +170,11 @@ ...@@ -170,29 +170,11 @@
} }
.dt-init-wrapper { .dt-init-wrapper {
//margin: 60px 0; margin: 0px 0;
max-width: 99%; max-width: 99%;
height: calc(100% - 200px); height: calc(~'100% - 20px');
position: relative; position: relative;
margin-top: 10px;
.dropdown {
.dropdown-common();
i {
color: #F85550;
}
}
.extractFinancialGridContainer {
height: calc(~'100% - 30px');
overflow: hidden;
position: absolute;
top: 0;
bottom: 136px; /* 130 + 6 */
left: 0;
right: 0;
background-color: #FFF;
}
} }
.error-info-wrapper { .error-info-wrapper {
......
atms-web/src/main/webapp/app/cit/reduction/cit-distribution-table/cit-distribution-table.ctrl.js
View file @ 80b609ea
...@@ -207,8 +207,8 @@ ...@@ -207,8 +207,8 @@
$scope.pagingOptions = { $scope.pagingOptions = {
pageIndex: 1, //当前页码 pageIndex: 1, //当前页码
totalItems: 0, //总数据 totalItems: 0, //总数据
pageSize: 50, //每页多少条数据 pageSize: 20, //每页多少条数据
pageSizeString:"50" pageSizeString:"20"
}; };
$('#input-invoice-period-picker').focus(function () { $('#input-invoice-period-picker').focus(function () {
...@@ -284,6 +284,9 @@ ...@@ -284,6 +284,9 @@
grouping: { grouping: {
autoExpandAll: false autoExpandAll: false
}, },
paging: {
pageSize: 20
},
allowColumnResizing: true, allowColumnResizing: true,
columnAutoWidth: true, columnAutoWidth: true,
showRowLines: true, showRowLines: true,
......
atms-web/src/main/webapp/app/cit/reduction/cit-distribution-table/cit-distribution-table.html
View file @ 80b609ea
...@@ -22,10 +22,8 @@ ...@@ -22,10 +22,8 @@
<div id="tab_total"> <div id="tab_total">
<div class="dt-init-wrapper"> <div class="dt-init-wrapper">
<div class="dx-viewport grid-container"> <div id="extractFinancialGridContainer" dx-data-grid="gridOptions"
<div id="extractFinancialGridContainer" dx-data-grid="gridOptions" style="margin-top: 30px;">
style="margin-top: 30px;">
</div>
</div> </div>
<div class="page-footer"> <div class="page-footer">
<ack-pagination page-options="pagingOptions" <ack-pagination page-options="pagingOptions"
......
atms-web/src/main/webapp/app/cit/reduction/cit-distribution-table/cit-distribution-table.less
View file @ 80b609ea
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#tab_total { #tab_total {
display: block; display: block;
height: calc(~'100% - 40px'); height: calc(~'100% - 80px');
position: relative; position: relative;
.import-wrapper { .import-wrapper {
...@@ -170,29 +170,11 @@ ...@@ -170,29 +170,11 @@
} }
.dt-init-wrapper { .dt-init-wrapper {
//margin: 60px 0; margin: 0px 0;
max-width: 99%; max-width: 99%;
height: calc(100% - 200px); height: calc(~'100% - 20px');
position: relative; position: relative;
margin-top: 10px;
.dropdown {
.dropdown-common();
i {
color: #F85550;
}
}
.extractFinancialGridContainer {
height: calc(~'100% - 30px');
overflow: hidden;
position: absolute;
top: 0;
bottom: 136px; /* 130 + 6 */
left: 0;
right: 0;
background-color: #FFF;
}
} }
.error-info-wrapper { .error-info-wrapper {
......
atms-web/src/main/webapp/app/common/controls/import/import-adjust-table/import-adjust-table.ctrl.js
View file @ 80b609ea
...@@ -1011,6 +1011,19 @@ ...@@ -1011,6 +1011,19 @@
}); });
}; };
//-------------------------------------------------kevin insert begin ---------------------------------------------
var exp = {
showDropDownButton : true,
bindingOptions : {
value : 'checkedCompanyCodeList',
dataSource : 'companyList'
}
}
PWC.orgManySelect($scope, $translate, exp);
//-------------------------------------------------kevin insert end ---------------------------------------------
$scope.selectOne = function () { $scope.selectOne = function () {
$scope.checkedCompanyList = []; $scope.checkedCompanyList = [];
angular.forEach($scope.companyList , function (i) { angular.forEach($scope.companyList , function (i) {
......
atms-web/src/main/webapp/app/common/controls/import/import-balance-sheet/import-balance-sheet.ctrl.js
View file @ 80b609ea
...@@ -1183,6 +1183,19 @@ ...@@ -1183,6 +1183,19 @@
$scope.setGridStyle = setGridStyle; $scope.setGridStyle = setGridStyle;
}; };
//-------------------------------------------------kevin insert begin ---------------------------------------------
var exp = {
showDropDownButton : true,
bindingOptions : {
value : 'checkedCompanyCodeList',
dataSource : 'companyList'
}
}
PWC.orgManySelect($scope, $translate, exp);
//-------------------------------------------------kevin insert end ---------------------------------------------
$scope.selectOne = function () { $scope.selectOne = function () {
$scope.checkedCompanyList = []; $scope.checkedCompanyList = [];
angular.forEach($scope.companyList , function (i) { angular.forEach($scope.companyList , function (i) {
......
atms-web/src/main/webapp/app/common/controls/import/import-cash-flow/import-cash-flow.ctrl.js
View file @ 80b609ea
...@@ -929,6 +929,18 @@ ...@@ -929,6 +929,18 @@
$scope.pagingOptions.totalItems = totalItemsCount; $scope.pagingOptions.totalItems = totalItemsCount;
}; };
//-------------------------------------------------kevin insert begin ---------------------------------------------
var exp = {
showDropDownButton : true,
bindingOptions : {
value : 'checkedCompanyCodeList',
dataSource : 'companyList'
}
}
PWC.orgManySelect($scope, $translate, exp);
//-------------------------------------------------kevin insert end ---------------------------------------------
$scope.selectOne = function () { $scope.selectOne = function () {
$scope.checkedCompanyList = []; $scope.checkedCompanyList = [];
angular.forEach($scope.companyList , function (i) { angular.forEach($scope.companyList , function (i) {
......
atms-web/src/main/webapp/app/common/controls/import/import-certified-invoices-list/import-certified-invoices-list.ctrl.js
View file @ 80b609ea
...@@ -368,7 +368,18 @@ ...@@ -368,7 +368,18 @@
var initPagingControl = function (totalItemsCount) { var initPagingControl = function (totalItemsCount) {
$scope.pagingOptions.totalItems = totalItemsCount; $scope.pagingOptions.totalItems = totalItemsCount;
}; };
//-------------------------------------------------kevin insert begin ---------------------------------------------
var exp = {
showDropDownButton : true,
bindingOptions : {
value : 'checkedCompanyCodeList',
dataSource : 'companyList'
}
}
PWC.orgManySelect($scope, $translate, exp);
//-------------------------------------------------kevin insert end ---------------------------------------------
$scope.selectOne = function () { $scope.selectOne = function () {
$scope.checkedCompanyList = []; $scope.checkedCompanyList = [];
angular.forEach($scope.companyList , function (i) { angular.forEach($scope.companyList , function (i) {
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-bs-prc-adjust/import-cit-bs-prc-adjust.ctrl.js
View file @ 80b609ea
...@@ -413,7 +413,18 @@ ...@@ -413,7 +413,18 @@
} }
}); });
}; };
//-------------------------------------------------kevin insert begin ---------------------------------------------
var exp = {
showDropDownButton : true,
bindingOptions : {
value : 'checkedCompanyCodeList',
dataSource : 'companyList'
}
}
PWC.orgManySelect($scope, $translate, exp);
//-------------------------------------------------kevin insert end ---------------------------------------------
$scope.selectOne = function () { $scope.selectOne = function () {
$scope.checkedCompanyList = []; $scope.checkedCompanyList = [];
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-bs-prc-adjust/import-cit-bs-prc-adjust.html
View file @ 80b609ea
...@@ -5,10 +5,12 @@ ...@@ -5,10 +5,12 @@
</div> </div>
<!--导航栏--> <!--导航栏-->
<div id="tab_total"> <div id="tab_total">
<form class="form-inline" id="navigationForm" name="navigationForm"> <form class="form-inline" id="navigationForm" name="navigationForm" style="margin-top: 10px;">
<div class="form-group" ng-style="setButtonWrapStyle()"> <div class="form-group">
<div class="import-wrapper"> <label class="text-bold" translate="SelectedOrganization" style=" top: -6px; position: relative;"><span>:</span></label>
<span class="text-bold" translate="SelectedOrganization"></span>: <div dx-tag-box="selectOrgOptions" style="display: inline-block;position: relative; top: 6px;"></div>
</div>
<!--<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px"> <div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width:200px;"> data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width:200px;">
...@@ -30,50 +32,54 @@ ...@@ -30,50 +32,54 @@
</div> </div>
</li> </li>
</ul> </ul>
</div>-->
<div class="form-group">
<span class="text-bold" translate="InvoiceQJ"></span>:
<div class="period-picker" style="display: inline-block">
<input type="text" id="periodDatepicker" class="datepicker form-control imp-subheader" style="width:120px;"
readonly="readonly" ng-model="UploadPeriodTime"/>
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div>
<div ng-show="fileName" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
</div>
</div> </div>
<span class="text-bold" translate="InvoiceQJ"></span>: <div class="form-group">
<div class="period-picker" style="margin-left:10px"> <button type="button"
<input type="text" id="periodDatepicker" class="datepicker imp-subheader" style="width:120px;" ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
readonly="readonly" ng-model="UploadPeriodTime"/> ngf-allow-dir="false" class="btn btn-vat-third" style="margin-top: 8px;">
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i> {{'SelectFile' | translate}}
</div> </button>
<div ng-show="fileName" style="display:inline-block"> <button type="button"
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span> class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
</div> translate="TemplateBtn"
<button type="button" ng-click="downloadTemplate()"></button>
ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px;margin-left:30px"> <button type="button"
{{'SelectFile' | translate}} class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
</button> translate="AddImportBtn"
<button type="button" ng-click="importFile(importEnum.AddImport)"></button>
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
translate="TemplateBtn" <button type="button"
ng-click="downloadTemplate()"></button> class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
translate="CoverImportBtn"
<button type="button" ng-click="importFile(importEnum.CoverImport)"></button>
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;" </div>
translate="AddImportBtn"
ng-click="importFile(importEnum.AddImport)"></button>
<button type="button" <div class="form-group">
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;" <div class="btn-wrapper" ng-if="!isShowImportTotalBtn">
translate="CoverImportBtn" <button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
ng-click="importFile(importEnum.CoverImport)"></button> permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="ConverImportBtn"
ng-click="doUploadTbResult(importEnum.CoverImport)"></button>|
<button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
<div class="btn-wrapper" ng-if="!isShowImportTotalBtn"> permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
<button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf" translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button>
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="ConverImportBtn"
ng-click="doUploadTbResult(importEnum.CoverImport)"></button>|
<button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button>
</div>
</div> </div>
</div>
</div>
<!--分页栏--> <!--分页栏-->
<!--<div class="form-group page-form-group" ng-show="!fileName"> <!--<div class="form-group page-form-group" ng-show="!fileName">
<div class="page-footer"> <div class="page-footer">
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-journal-adjust/import-cit-journal-adjust.ctrl.js
View file @ 80b609ea
...@@ -424,6 +424,18 @@ ...@@ -424,6 +424,18 @@
}); });
}; };
//-------------------------------------------------kevin insert begin ---------------------------------------------
var exp = {
showDropDownButton : true,
bindingOptions : {
value : 'checkedCompanyCodeList',
dataSource : 'companyList'
}
}
PWC.orgManySelect($scope, $translate, exp);
//-------------------------------------------------kevin insert end ---------------------------------------------
$scope.selectOne = function () { $scope.selectOne = function () {
$scope.checkedCompanyList = []; $scope.checkedCompanyList = [];
angular.forEach($scope.companyList , function (i) { angular.forEach($scope.companyList , function (i) {
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-journal-adjust/import-cit-journal-adjust.html
View file @ 80b609ea
...@@ -5,10 +5,12 @@ ...@@ -5,10 +5,12 @@
</div> </div>
<!--导航栏--> <!--导航栏-->
<div id="tab_total"> <div id="tab_total">
<form class="form-inline" id="navigationForm" name="navigationForm"> <form class="form-inline" id="navigationForm" name="navigationForm" style="margin-top: 10px;">
<div class="form-group" ng-style="setButtonWrapStyle()"> <div class="form-group">
<div class="import-wrapper"> <label class="text-bold" translate="SelectedOrganization" style=" top: -6px; position: relative;"><span>:</span></label>
<span class="text-bold" translate="SelectedOrganization"></span>: <div dx-tag-box="selectOrgOptions" style="display: inline-block;position: relative; top: 6px;"></div>
</div>
<!--<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px"> <div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;"> data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;">
...@@ -30,50 +32,54 @@ ...@@ -30,50 +32,54 @@
</div> </div>
</li> </li>
</ul> </ul>
</div>-->
<div class="form-group">
<span class="text-bold" translate="InvoiceQJ"></span>:
<div class="period-picker" style="display: inline-block;">
<input type="text" id="periodDatepicker" class="datepicker form-control imp-subheader" style="width:120px;"
readonly="readonly" ng-model="UploadPeriodTime"/>
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div>
<div ng-show="fileName" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
</div>
</div> </div>
<span class="text-bold" translate="InvoiceQJ"></span>: <div class="form-group">
<div class="period-picker" style="margin-left:10px"> <button type="button"
<input type="text" id="periodDatepicker" class="datepicker imp-subheader" style="width:120px;" ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
readonly="readonly" ng-model="UploadPeriodTime"/> ngf-allow-dir="false" class="btn btn-vat-third" style="margin-top: 8px;">
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i> {{'SelectFile' | translate}}
</div> </button>
<div ng-show="fileName" style="display:inline-block"> <button type="button"
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span> class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
</div> translate="TemplateBtn"
<button type="button" ng-click="downloadTemplate()"></button>
ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px;margin-left:30px"> <button type="button"
{{'SelectFile' | translate}} class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
</button> translate="AddImportBtn"
<button type="button" ng-click="importFile(importEnum.AddImport)"></button>
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
translate="TemplateBtn" <button type="button"
ng-click="downloadTemplate()"></button> class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
translate="CoverImportBtn"
<button type="button" ng-click="importFile(importEnum.CoverImport)"></button>
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
translate="AddImportBtn"
ng-click="importFile(importEnum.AddImport)"></button>
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
translate="CoverImportBtn"
ng-click="importFile(importEnum.CoverImport)"></button>
<div class="btn-wrapper" ng-if="!isShowImportTotalBtn">
<button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="ConverImportBtn"
ng-click="doUploadTbResult(importEnum.CoverImport)"></button>|
<button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button>
</div> </div>
</div>
</div>
<div class="form-group">
<div class="btn-wrapper" ng-if="!isShowImportTotalBtn">
<button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="ConverImportBtn"
ng-click="doUploadTbResult(importEnum.CoverImport)"></button>|
<button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button>
</div>
</div>
<!--分页栏--> <!--分页栏-->
<!--<div class="form-group page-form-group" ng-show="!fileName"> <!--<div class="form-group page-form-group" ng-show="!fileName">
<div class="page-footer"> <div class="page-footer">
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-profit-prc-adjust/import-cit-profit-prc-adjust.ctrl.js
View file @ 80b609ea
...@@ -416,6 +416,18 @@ ...@@ -416,6 +416,18 @@
}); });
}; };
//-------------------------------------------------kevin insert begin ---------------------------------------------
var exp = {
showDropDownButton : true,
bindingOptions : {
value : 'checkedCompanyCodeList',
dataSource : 'companyList'
}
}
PWC.orgManySelect($scope, $translate, exp);
//-------------------------------------------------kevin insert end ---------------------------------------------
$scope.selectOne = function () { $scope.selectOne = function () {
$scope.checkedCompanyList = []; $scope.checkedCompanyList = [];
angular.forEach($scope.companyList , function (i) { angular.forEach($scope.companyList , function (i) {
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-profit-prc-adjust/import-cit-profit-prc-adjust.html
View file @ 80b609ea
...@@ -5,10 +5,12 @@ ...@@ -5,10 +5,12 @@
</div> </div>
<!--导航栏--> <!--导航栏-->
<div id="tab_total"> <div id="tab_total">
<form class="form-inline" id="navigationForm" name="navigationForm"> <form class="form-inline" id="navigationForm" name="navigationForm" style="margin-top: 10px;">
<div class="form-group" ng-style="setButtonWrapStyle()"> <div class="form-group">
<div class="import-wrapper"> <label class="text-bold" translate="SelectedOrganization" style=" top: -6px; position: relative;"><span>:</span></label>
<span class="text-bold" translate="SelectedOrganization"></span>: <div dx-tag-box="selectOrgOptions" style="display: inline-block;position: relative; top: 6px;"></div>
</div>
<!-- <span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px"> <div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;"> data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;">
...@@ -30,49 +32,53 @@ ...@@ -30,49 +32,53 @@
</div> </div>
</li> </li>
</ul> </ul>
</div>-->
<div class="form-group">
<span class="text-bold" translate="InvoiceQJ"></span>:
<div class="period-picker" style="display: inline-block;">
<input type="text" id="periodDatepicker" class="datepicker form-control imp-subheader" style="width:120px;"
readonly="readonly" ng-model="UploadPeriodTime"/>
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div>
<div ng-show="fileName" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
</div>
</div> </div>
<span class="text-bold" translate="InvoiceQJ"></span>: <div class="form-group">
<div class="period-picker" style="margin-left:10px"> <button type="button"
<input type="text" id="periodDatepicker" class="datepicker imp-subheader" style="width:120px;" ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
readonly="readonly" ng-model="UploadPeriodTime"/> ngf-allow-dir="false" class="btn btn-vat-third" style="margin-top: 8px;">
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i> {{'SelectFile' | translate}}
</div> </button>
<div ng-show="fileName" style="display:inline-block"> <button type="button"
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span> class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
translate="TemplateBtn"
ng-click="downloadTemplate()"></button>
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
translate="AddImportBtn"
ng-click="importFile(importEnum.AddImport)"></button>
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
translate="CoverImportBtn"
ng-click="importFile(importEnum.CoverImport)"></button>
</div>
<div class="form-group">
<div class="btn-wrapper" ng-if="!isShowImportTotalBtn">
<button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="ConverImportBtn"
ng-click="doUploadTbResult(importEnum.CoverImport)"></button>|
<button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button>
</div>
</div> </div>
<button type="button"
ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px;margin-left:30px">
{{'SelectFile' | translate}}
</button>
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
translate="TemplateBtn"
ng-click="downloadTemplate()"></button>
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
translate="AddImportBtn"
ng-click="importFile(importEnum.AddImport)"></button>
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
translate="CoverImportBtn"
ng-click="importFile(importEnum.CoverImport)"></button>
<div class="btn-wrapper" ng-if="!isShowImportTotalBtn">
<button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="ConverImportBtn"
ng-click="doUploadTbResult(importEnum.CoverImport)"></button>|
<button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button>
</div>
</div>
</div>
<!--分页栏--> <!--分页栏-->
<!--<div class="form-group page-form-group" ng-show="!fileName"> <!--<div class="form-group page-form-group" ng-show="!fileName">
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-salary-advance/import-cit-salary-advance.ctrl.js
View file @ 80b609ea
...@@ -440,7 +440,18 @@ ...@@ -440,7 +440,18 @@
} }
}); });
}; };
//-------------------------------------------------kevin insert begin ---------------------------------------------
var exp = {
showDropDownButton : true,
bindingOptions : {
value : 'checkedCompanyCodeList',
dataSource : 'companyList'
}
}
PWC.orgManySelect($scope, $translate, exp);
//-------------------------------------------------kevin insert end ---------------------------------------------
$scope.selectOne = function () { $scope.selectOne = function () {
$scope.checkedCompanyList = []; $scope.checkedCompanyList = [];
angular.forEach($scope.companyList , function (i) { angular.forEach($scope.companyList , function (i) {
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-salary-advance/import-cit-salary-advance.html
View file @ 80b609ea
...@@ -5,10 +5,12 @@ ...@@ -5,10 +5,12 @@
</div> </div>
<!--导航栏--> <!--导航栏-->
<div id="tab_total"> <div id="tab_total">
<form class="form-inline" id="navigationForm" name="navigationForm"> <form class="form-inline" id="navigationForm" name="navigationForm" style="margin-top: 10px;">
<div class="form-group" ng-style="setButtonWrapStyle()"> <div class="form-group">
<div class="import-wrapper"> <label class="text-bold" translate="SelectedOrganization" style=" top: -6px; position: relative;"><span>:</span></label>
<span class="text-bold" translate="SelectedOrganization"></span>: <div dx-tag-box="selectOrgOptions" style="display: inline-block;position: relative; top: 6px;"></div>
</div>
<!-- <span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px"> <div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;"> data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;">
...@@ -30,54 +32,60 @@ ...@@ -30,54 +32,60 @@
</div> </div>
</li> </li>
</ul> </ul>
</div> </div>-->
<!--本年底、下年初的选择--> <!--本年底、下年初的选择-->
<span class="text-bold" translate="PreClassified"></span>: <div class="form-group">
<div class="option" style="display: inline-block"> <label class="text-bold" translate="PreClassified"><span>:</span></label>
<div id="endBeginButton" dx-select-box="endBeginOptions" style="width: 130px"></div> <div class="option" style="display: inline-block">
<div id="endBeginButton" dx-select-box="endBeginOptions" style="width: 130px"></div>
</div>
</div> </div>
<span class="text-bold" translate="InvoiceQJ"></span>: <div class="form-group">
<div class="period-picker" style="margin-left:10px"> <span class="text-bold" translate="InvoiceQJ"></span>:
<input type="text" id="periodDatepicker" class="datepicker imp-subheader" style="width:120px;" <div class="period-picker" style="display: inline-block;">
readonly="readonly" ng-model="UploadPeriodTime"/> <input type="text" id="periodDatepicker" class="datepicker form-control imp-subheader" style="width:120px;"
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i> readonly="readonly" ng-model="UploadPeriodTime"/>
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div>
<div ng-show="fileName" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
</div>
</div> </div>
<div ng-show="fileName" style="display:inline-block"> <div class="form-group">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span> <button type="button"
ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
ngf-allow-dir="false" class="btn btn-vat-third" style=" margin-top: 8px;">
{{'SelectFile' | translate}}
</button>
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
translate="TemplateBtn"
ng-click="downloadTemplate()"></button>
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
translate="AddImportBtn"
ng-click="importFile(importEnum.AddImport)"></button>
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
translate="CoverImportBtn"
ng-click="importFile(importEnum.CoverImport)"></button>
</div> </div>
<button type="button"
ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px;margin-left:30px">
{{'SelectFile' | translate}} <div class="form-group">
</button> <div class="btn-wrapper" ng-if="!isShowImportTotalBtn">
<button type="button" <button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="TemplateBtn" translate="ConverImportBtn"
ng-click="downloadTemplate()"></button> ng-click="doUploadTbResult(importEnum.CoverImport)"></button>|
<button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
<button type="button" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;" translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button>
translate="AddImportBtn" </div>
ng-click="importFile(importEnum.AddImport)"></button>
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
translate="CoverImportBtn"
ng-click="importFile(importEnum.CoverImport)"></button>
<div class="btn-wrapper" ng-if="!isShowImportTotalBtn">
<button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="ConverImportBtn"
ng-click="doUploadTbResult(importEnum.CoverImport)"></button>|
<button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button>
</div> </div>
</div>
</div>
<!--分页栏--> <!--分页栏-->
<!--<div class="form-group page-form-group" ng-show="!fileName"> <!--<div class="form-group page-form-group" ng-show="!fileName">
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-trial-balance/import-cit-trial-balance.ctrl.js
View file @ 80b609ea
...@@ -418,6 +418,19 @@ ...@@ -418,6 +418,19 @@
} }
}); });
}; };
//-------------------------------------------------kevin insert begin ---------------------------------------------
var exp = {
showDropDownButton : true,
bindingOptions : {
value : 'checkedCompanyCodeList',
dataSource : 'companyList'
}
}
PWC.orgManySelect($scope, $translate, exp);
//-------------------------------------------------kevin insert end ---------------------------------------------
$scope.selectOne = function () { $scope.selectOne = function () {
$scope.checkedCompanyList = []; $scope.checkedCompanyList = [];
......
atms-web/src/main/webapp/app/common/controls/import/import-coupa-purchasing-report/import-coupa-purchasing-report.ctrl.js
View file @ 80b609ea
...@@ -464,6 +464,19 @@ ...@@ -464,6 +464,19 @@
}); });
}; };
//-------------------------------------------------kevin insert begin ---------------------------------------------
var exp = {
showDropDownButton : true,
bindingOptions : {
value : 'checkedCompanyCodeList',
dataSource : 'companyList'
}
}
PWC.orgManySelect($scope, $translate, exp);
//-------------------------------------------------kevin insert end ---------------------------------------------
$scope.selectOne = function () { $scope.selectOne = function () {
$scope.checkedCompanyList = []; $scope.checkedCompanyList = [];
angular.forEach($scope.companyList , function (i) { angular.forEach($scope.companyList , function (i) {
......
atms-web/src/main/webapp/app/common/controls/import/import-coupa-purchasing-report/import-coupa-purchasing-report.html
View file @ 80b609ea
...@@ -9,11 +9,12 @@ ...@@ -9,11 +9,12 @@
</div> </div>
<!--导航栏--> <!--导航栏-->
<div id="tab_total"> <div id="tab_total">
<form class="form-inline" id="navigationForm" name="navigationForm"> <form class="form-inline" id="navigationForm" name="navigationForm" style="margin-top: 10px;">
<div class="form-group" ng-style="setButtonWrapStyle()" style="margin-bottom: -38px; width: 100%;"> <div class="form-group">
<div class="import-wrapper"> <label class="text-bold" translate="SelectedOrganization" style=" top: -6px; position: relative;"><span>:</span></label>
<div class="col-sm-6 leftNav" style="width: 60%;"> <div dx-tag-box="selectOrgOptions" style="display: inline-block;position: relative; top: 6px;"></div>
<span class="text-bold" translate="SelectedOrganization"></span>: </div>
<!--<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px"> <div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" style="width:200px;" type="button" <button class="btn btn-default dropdown-toggle" style="width:200px;" type="button"
id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
...@@ -35,34 +36,33 @@ ...@@ -35,34 +36,33 @@
</div> </div>
</li> </li>
</ul> </ul>
</div>-->
<div class="form-group">
<label class="text-bold" translate="InvoiceQJ"><span>:</span></label>
<div class="period-picker" style="display: inline-block;">
<input type="text" id="periodDatepicker" class="datepicker form-control imp-subheader"
style="width:120px;" readonly="readonly" ng-model="UploadPeriodTime" />
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div>
<div ng-show="fileNameShow" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
</div>
</div> </div>
<span class="text-bold" translate="InvoiceQJ"></span>: <div class="form-group">
<div class="period-picker" style="margin-left:10px"> <button type="button" ngf-select="" type="file" ng-model="importExcelFile"
<input type="text" id="periodDatepicker" class="datepicker imp-subheader" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
style="width:120px;" readonly="readonly" ng-model="UploadPeriodTime" /> ngf-allow-dir="false" class="btn btn-vat-third">
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i> {{'SelectFile' | translate}}
</div> </button>
<div ng-show="fileNameShow" style="display:inline-block"> <button type="button" class="btn btn-vat-primary" translate="TemplateBtn"
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span> ng-click="downloadTemplate()"></button>
</div>
</div>
<div class="col-sm-6 rightNav" style="width: 40%;margin-top: 10px;">
<button type="button" ngf-select="" type="file" ng-model="importExcelFile"
ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
ngf-allow-dir="false" class="btn btn-vat-third">
{{'SelectFile' | translate}}
</button>
<button type="button" class="btn btn-vat-primary" translate="TemplateBtn"
ng-click="downloadTemplate()"></button>
<button type="button " class="btn btn-vat-primary topButton" translate="AddImportBtn"
ng-click="doUploadCPR(importEnum.AddImport)"></button>
<button type="button" class="btn btn-vat-primary topButton" translate="CoverImportBtn"
ng-click="doUploadCPR(importEnum.CoverImport)"></button>
<button type="button " class="btn btn-vat-primary topButton" translate="AddImportBtn"
ng-click="doUploadCPR(importEnum.AddImport)"></button>
<button type="button" class="btn btn-vat-primary topButton" translate="CoverImportBtn"
ng-click="doUploadCPR(importEnum.CoverImport)"></button>
</div>
<div class="btn-wrapper" ng-if="!isShowImportTotalBtn"> <div class="btn-wrapper" ng-if="!isShowImportTotalBtn">
<button class="btn btn-vat-primary topButton" atms-permission permission-control-type="ngIf" <button class="btn btn-vat-primary topButton" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
...@@ -72,9 +72,6 @@ ...@@ -72,9 +72,6 @@
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button> translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button>
</div> </div>
</div>
</div>
</div>
</form> </form>
<div class="dt-init-wrapper"> <div class="dt-init-wrapper">
......
atms-web/src/main/webapp/app/common/controls/import/import-invoice-data/import-invoice-data.ctrl.js
View file @ 80b609ea
...@@ -384,7 +384,18 @@ ...@@ -384,7 +384,18 @@
var initPagingControl = function (totalItemsCount) { var initPagingControl = function (totalItemsCount) {
$scope.pagingOptions.totalItems = totalItemsCount; $scope.pagingOptions.totalItems = totalItemsCount;
}; };
//-------------------------------------------------kevin insert begin ---------------------------------------------
var exp = {
showDropDownButton : true,
bindingOptions : {
value : 'checkedCompanyCodeList',
dataSource : 'companyList'
}
}
PWC.orgManySelect($scope, $translate, exp);
//-------------------------------------------------kevin insert end ---------------------------------------------
$scope.selectOne = function () { $scope.selectOne = function () {
$scope.checkedCompanyList = []; $scope.checkedCompanyList = [];
angular.forEach($scope.companyList , function (i) { angular.forEach($scope.companyList , function (i) {
......
atms-web/src/main/webapp/app/common/controls/import/import-invoice-data/import-invoice-data.html
View file @ 80b609ea
...@@ -8,12 +8,12 @@ ...@@ -8,12 +8,12 @@
</div> </div>
<!--导航栏--> <!--导航栏-->
<div id="tab_total"> <div id="tab_total">
<form class="form-inline" id="navigationForm" name="navigationForm"> <form class="form-inline" id="navigationForm" name="navigationForm" style="margin-top: 10px;">
<div class="form-group" ng-style="setButtonWrapStyle()" style="width: 100%; margin-bottom: -38px;"> <div class="form-group">
<div class="import-wrapper"> <label class="text-bold" translate="SelectedOrganization" style=" top: -6px; position: relative;"><span>:</span></label>
<div class="row"> <div dx-tag-box="selectOrgOptions" style="display: inline-block;"></div>
<div class="col-sm-6 leftNav " style="width: 60%;"> </div>
<span class="text-bold" translate="SelectedOrganization"></span>: <!-- <span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px"> <div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;"> data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;">
...@@ -35,38 +35,33 @@ ...@@ -35,38 +35,33 @@
</div> </div>
</li> </li>
</ul> </ul>
</div>-->
<div class="form-group">
<span class="text-bold" translate="InvoiceQJ"></span>:
<div class="period-picker" style="display: inline-block">
<input type="text" id="periodDatepicker" class=" form-control datepicker imp-subheader" style="width:120px;"
readonly="readonly" ng-model="UploadPeriodTime"/>
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div>
<div ng-show="fileName" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
</div>
</div> </div>
<span class="text-bold" translate="InvoiceQJ"></span>: <div class="form-group">
<div class="period-picker" style="margin-left:10px"> <button type="button"
<input type="text" id="periodDatepicker" class="datepicker imp-subheader" style="width:120px;" ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
readonly="readonly" ng-model="UploadPeriodTime"/> ngf-allow-dir="false" class="btn btn-vat-third" >
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i> {{'SelectFile' | translate}}
</div> </button>
<div ng-show="fileName" style="display:inline-block"> <button type="button"
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span> class="btn btn-vat-primary"
translate="TemplateBtn"
ng-click="downloadTemplate()"></button>
<button type="button"
class="btn btn-vat-primary topButton"
translate="CoverImportBtn"
ng-click="doUploadID(importEnum.CoverImport)"></button>
</div> </div>
</div>
<div class="col-sm-6 rightNav" style="width: 40%; margin-top: 10px;">
<button type="button"
ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
ngf-allow-dir="false" class="btn btn-vat-third" >
{{'SelectFile' | translate}}
</button>
<button type="button"
class="btn btn-vat-primary"
translate="TemplateBtn"
ng-click="downloadTemplate()"></button>
<!--<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
translate="AddImportBtn"
ng-click="doUploadID(importEnum.AddImport)"></button>-->
<button type="button"
class="btn btn-vat-primary topButton"
translate="CoverImportBtn"
ng-click="doUploadID(importEnum.CoverImport)"></button>
<div class="btn-wrapper" ng-if="!isShowImportTotalBtn"> <div class="btn-wrapper" ng-if="!isShowImportTotalBtn">
<button class="btn btn-vat-primary topButton" atms-permission permission-control-type="ngIf" <button class="btn btn-vat-primary topButton" atms-permission permission-control-type="ngIf"
...@@ -76,11 +71,7 @@ ...@@ -76,11 +71,7 @@
<button class="btn btn-vat-primary topButton" atms-permission permission-control-type="ngIf" <button class="btn btn-vat-primary topButton" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button> translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button>
</div> </div>
</div>
</div>
</div>
</div>
</form> </form>
<div class="dt-init-wrapper"> <div class="dt-init-wrapper">
......
atms-web/src/main/webapp/app/common/controls/import/import-invoice-record/import-invoice-record.ctrl.js
View file @ 80b609ea
...@@ -419,6 +419,19 @@ ...@@ -419,6 +419,19 @@
} }
}; };
//-------------------------------------kevin insert begin -------------------------------------------
var exp = {
showDropDownButton : true,
bindingOptions : {
value : 'checkedCompanyCodeList',
dataSource : 'companyList'
}
}
PWC.orgManySelect($scope, $translate, exp);
//-------------------------------------kevin insert end -------------------------------------------
$scope.selectOne = function () { $scope.selectOne = function () {
$scope.checkedCompanyList = []; $scope.checkedCompanyList = [];
angular.forEach($scope.companyList , function (i) { angular.forEach($scope.companyList , function (i) {
......
atms-web/src/main/webapp/app/common/controls/import/import-invoice-record/import-invoice-record.html
View file @ 80b609ea
...@@ -8,11 +8,12 @@ ...@@ -8,11 +8,12 @@
</div> </div>
<!--导航栏--> <!--导航栏-->
<div id="tab_total"> <div id="tab_total">
<form class="form-inline" id="navigationForm" name="navigationForm"> <form class="form-inline" id="navigationForm" name="navigationForm" style="margin-top: 10px;">
<div class="form-group" ng-style="setButtonWrapStyle()" style="width: 100%; margin-bottom: -38px;"> <div class="form-group">
<div class="import-wrapper"> <label class="text-bold" translate="SelectedOrganization" style=" top: -6px; position: relative;"><span>:</span></label>
<div class="row"> <div dx-tag-box="selectOrgOptions" style="display: inline-block;"></div>
<div class="col-sm-6 col-xs-6 col-lg-6 leftNav" style="width: 60%;"> </div>
<!-- <div class="col-sm-6 col-xs-6 col-lg-6 leftNav" style="width: 60%;">
<span class="text-bold" translate="SelectedOrganization"></span>: <span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px"> <div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
...@@ -36,41 +37,42 @@ ...@@ -36,41 +37,42 @@
</li> </li>
</ul> </ul>
</div> </div>
</div>-->
<div class="form-group">
<span class="text-bold" translate="InvoiceQJ"></span>: <span class="text-bold" translate="InvoiceQJ"></span>:
<div class="period-picker" style="margin-left:10px"> <div class="period-picker" style="display: inline-block">
<input type="text" id="periodDatepicker" class="datepicker imp-subheader" style="width:120px;" <input type="text" id="periodDatepicker" class="datepicker form-control imp-subheader" style="width:120px;"
readonly="readonly" ng-model="UploadPeriodTime"/> readonly="readonly" ng-model="UploadPeriodTime"/>
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i> <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div> </div>
</div>
<div class="form-group">
<div ng-show="fileNameShow" style="display:inline-block"> <div ng-show="fileNameShow" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span> <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
</div> </div>
</div> </div>
<div class="col-sm-6 col-xs-6 col-lg-6 rightNav" style="width: 40%; margin-top: 10px" > <div class="form-group">
<button type="button" <button type="button"
ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false" ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
ngf-allow-dir="false" class="btn btn-vat-third" > ngf-allow-dir="false" class="btn btn-vat-third" >
{{'SelectFile' | translate}} {{'SelectFile' | translate}}
</button> </button>
<button type="button" <button type="button"
class="btn btn-vat-primary" class="btn btn-vat-primary"
translate="TemplateBtn" translate="TemplateBtn"
ng-click="downloadTemplate()"></button> ng-click="downloadTemplate()"></button>
<button type="button" <button type="button"
class="btn btn-vat-primary topButton" class="btn btn-vat-primary "
translate="AddImportBtn" translate="AddImportBtn"
ng-click="doUploadIR(importEnum.AddImport)"></button> ng-click="doUploadIR(importEnum.AddImport)"></button>
<button type="button" <button type="button"
class="btn btn-vat-primary topButton" class="btn btn-vat-primary "
translate="CoverImportBtn" translate="CoverImportBtn"
ng-click="doUploadIR(importEnum.CoverImport)"></button> ng-click="doUploadIR(importEnum.CoverImport)"></button>
</div> </div>
</div>
</div>
</div>
</form> </form>
<div class="dt-init-wrapper"> <div class="dt-init-wrapper">
......
atms-web/src/main/webapp/app/common/controls/import/import-profit-loss/import-profit-loss.ctrl.js
View file @ 80b609ea
...@@ -459,7 +459,18 @@ ...@@ -459,7 +459,18 @@
} }
}); });
}; };
//-------------------------------------------------kevin insert begin ---------------------------------------------
var exp = {
showDropDownButton : true,
bindingOptions : {
value : 'checkedCompanyCodeList',
dataSource : 'companyList'
}
}
PWC.orgManySelect($scope, $translate, exp);
//-------------------------------------------------kevin insert end ---------------------------------------------
$scope.selectOne = function () { $scope.selectOne = function () {
$scope.checkedCompanyList = []; $scope.checkedCompanyList = [];
......
atms-web/src/main/webapp/app/common/controls/import/import-red-letter-info-table/import-red-letter-info-table.ctrl.js
View file @ 80b609ea
...@@ -230,33 +230,18 @@ ...@@ -230,33 +230,18 @@
}; };
/------------------------------------------kevin insert -----------------------------------------/ //-------------------------------------------------kevin insert begin ---------------------------------------------
//机构下拉设置
$scope.selectOrgOptions = {
displayExpr: 'name',
valueExpr: 'id',
width: '95%',
bindingOptions: {
value: 'checkedCompanyCodeList',
dataSource: 'companyList'
},
height: '30px',
placeholder: $translate.instant('PleaseSelected'),
showClearButton: true,
searchEnabled: true,
noDataText: $translate.instant('RevenueNoOrgData'),
showSelectionControls: true
};
var initCompanyList = function () { var exp = {
orgService.getOrgListByUserId().success(function (data) { showDropDownButton : true,
if (data) { bindingOptions : {
$scope.companyList = data; value : 'checkedCompanyCodeList',
} dataSource : 'companyList'
}); }
}; }
PWC.orgManySelect($scope, $translate, exp);
//----------------------------------------------------------------------------------------------- //-------------------------------------------------kevin insert end ---------------------------------------------
var getGridHeight = function () { var getGridHeight = function () {
if ($scope.isLoadComplete) { if ($scope.isLoadComplete) {
......
atms-web/src/main/webapp/app/common/controls/import/import-red-letter-info-table/import-red-letter-info-table.html
View file @ 80b609ea
...@@ -65,11 +65,12 @@ ...@@ -65,11 +65,12 @@
</div> </div>
</div> </div>
</form>--> </form>-->
<form class="form-inline"> <form class="form-inline" style="margin-top: 10px;">
<div class="form-group" style="margin-bottom: -38px;width: 100%"> <div class="form-group">
<div class="import-wrapper"> <label class="text-bold" translate="SelectedOrganization" style=" top: -6px; position: relative;"><span>:</span></label>
<div class="col-sm-6 leftNav" style="width: 60%;"> <div dx-tag-box="selectOrgOptions" style="display: inline-block;"></div>
<span class="text-bold" translate="SelectedOrganization"></span>: </div>
<!-- <span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px"> <div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" style="width: 200px;" type="button" <button class="btn btn-default dropdown-toggle" style="width: 200px;" type="button"
id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;"> id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;">
...@@ -91,13 +92,15 @@ ...@@ -91,13 +92,15 @@
</div> </div>
</li> </li>
</ul> </ul>
</div> </div>-->
<span class="text-bold" translate="InvoiceQJ"></span>: <div class="form-group">
<div class="period-picker" style="margin-left:10px"> <span class="text-bold" translate="InvoiceQJ"></span>:
<input type="text" id="periodDatepicker" class="datepicker imp-subheader" <div class="period-picker" style="display: inline-block">
style="width:120px;" readonly="readonly" ng-model="UploadPeriodTime" /> <input type="text" id="periodDatepicker" class="datepicker form-control imp-subheader"
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i> style="width:120px;" readonly="readonly" ng-model="UploadPeriodTime" />
</div> <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div>
</div>
<!-- <label class="col-sm-2 control-label marTop">{{'SelectedOrganization' | translate}}：</label> <!-- <label class="col-sm-2 control-label marTop">{{'SelectedOrganization' | translate}}：</label>
<div class="col-sm-5 marTop"> <div class="col-sm-5 marTop">
<div dx-tag-box="selectOrgOptions" style="position: relative; left: 33px;"></div> <div dx-tag-box="selectOrgOptions" style="position: relative; left: 33px;"></div>
...@@ -108,24 +111,22 @@ ...@@ -108,24 +111,22 @@
readonly="readonly" ng-model="UploadPeriodTime"/> readonly="readonly" ng-model="UploadPeriodTime"/>
<i class="fa fa-calendar imp-subheader red-color" style=" position: relative; right: relative; right: -100px; top: -26px;"></i> <i class="fa fa-calendar imp-subheader red-color" style=" position: relative; right: relative; right: -100px; top: -26px;"></i>
</div> --> </div> -->
</div> <div class="form-group">
<div class="col-sm-6 rightNav" style="margin-top: 10px; width: 40%"> <button type="button" ngf-select="" type="file" ng-model="importExcelFile"
<button type="button" ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false" ngf-allow-dir="false" class="btn btn-vat-third">
ngf-allow-dir="false" class="btn btn-vat-third"> {{'SelectFile' | translate}}
{{'SelectFile' | translate}} </button>
</button> <span ng-show="fileName" class="marTop"
<span ng-show="fileName" class="marTop" title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span> <button type="button" class="btn btn-vat-primary" translate="TemplateBtn"
<button type="button" class="btn btn-vat-primary" translate="TemplateBtn" ng-click="downloadTemplate()"></button>
ng-click="downloadTemplate()"></button> <button type="button" class="btn btn-vat-primary " translate="CoverImportBtn"
<button type="button" class="btn btn-vat-primary topButton" translate="CoverImportBtn" ng-click="doUploadRLIT(importEnum.CoverImport)"></button>
ng-click="doUploadRLIT(importEnum.CoverImport)"></button> <button type="button" class="btn btn-vat-primary " translate="AddImportBtn"
<button type="button" class="btn btn-vat-primary topButton" translate="AddImportBtn" ng-click="doUploadRLIT(importEnum.AddImport)"></button>
ng-click="doUploadRLIT(importEnum.AddImport)"></button> </div>
</div>
</div>
</div>
</form> </form>
<div class="dt-init-wrapper"> <div class="dt-init-wrapper">
......
atms-web/src/main/webapp/app/common/utils/constant.js
View file @ 80b609ea
...@@ -1506,7 +1506,7 @@ constant.TaxReturnBusinessTypeList = [ ...@@ -1506,7 +1506,7 @@ constant.TaxReturnBusinessTypeList = [
{code: 100, type: "非跨地区经营企业"}, {code: 100, type: "非跨地区经营企业"},
{code: 210, type: "跨地区经营企业总机构 总机构（跨省）"}, {code: 210, type: "跨地区经营企业总机构 总机构（跨省）"},
{code: 220, type: "总机构（跨省）——不适用《跨地区经营汇总纳税企业所得税征收管理办法》"}, {code: 220, type: "总机构（跨省）——不适用《跨地区经营汇总纳税企业所得税征收管理办法》"},
{code: 230, type: "undefine"}, // {code: 230, type: "undefine"},
{code: 311, type: "跨地区经营企业分支机构 需进行完整年度纳税申报 分支机构（须进行完整年度申报并按比例纳税）"}, {code: 311, type: "跨地区经营企业分支机构 需进行完整年度纳税申报 分支机构（须进行完整年度申报并按比例纳税）"},
{code: 312, type: "分支机构（须进行完整年度申报但不就地缴纳）"} {code: 312, type: "分支机构（须进行完整年度申报但不就地缴纳）"}
]; ];
......
atms-web/src/main/webapp/app/common/utils/pwc-util.js
View file @ 80b609ea
...@@ -51,8 +51,8 @@ ...@@ -51,8 +51,8 @@
if (!Number.prototype.formatAmount) { if (!Number.prototype.formatAmount) {
Number.prototype.formatAmount = function (decPlaces, type) { Number.prototype.formatAmount = function (decPlaces, type) {
if(type){ if (type) {
return Number(decPlaces.toFixed(2)); return Number(decPlaces.toFixed(2));
} }
decPlaces = isNaN(decPlaces = Math.abs(decPlaces)) ? 2 : decPlaces; decPlaces = isNaN(decPlaces = Math.abs(decPlaces)) ? 2 : decPlaces;
var n = this.toFixed(decPlaces); var n = this.toFixed(decPlaces);
...@@ -132,9 +132,11 @@ ...@@ -132,9 +132,11 @@
} }
s = a.join("").replace(new RegExp("(\\d+)(\\d{" + d + "})\\d$"), "$1.$2"); s = a.join("").replace(new RegExp("(\\d+)(\\d{" + d + "})\\d$"), "$1.$2");
} if (b) s = s.substr(1); }
if (b) s = s.substr(1);
return (pm + s).replace(/\.$/, ""); return (pm + s).replace(/\.$/, "");
} return this + ""; }
return this + "";
}; };
...@@ -324,7 +326,7 @@ ...@@ -324,7 +326,7 @@
} }
value = new String(value); value = new String(value);
for (var i = 0, zeros = ''; i < (length - value.length) ; i++) { for (var i = 0, zeros = ''; i < (length - value.length); i++) {
zeros += '0'; zeros += '0';
} }
return zeros + value; return zeros + value;
...@@ -402,8 +404,18 @@ ...@@ -402,8 +404,18 @@
if (!Date.prototype.dateAdd) { if (!Date.prototype.dateAdd) {
Date.prototype.dateAdd = function (interval, number) { Date.prototype.dateAdd = function (interval, number) {
var d = this; var d = this;
var k = { 'y': 'FullYear', 'q': 'Month', 'm': 'Month', 'w': 'Date', 'd': 'Date', 'h': 'Hours', 'n': 'Minutes', 's': 'Seconds', 'ms': 'MilliSeconds' }; var k = {
var n = { 'q': 3, 'w': 7 }; 'y': 'FullYear',
'q': 'Month',
'm': 'Month',
'w': 'Date',
'd': 'Date',
'h': 'Hours',
'n': 'Minutes',
's': 'Seconds',
'ms': 'MilliSeconds'
};
var n = {'q': 3, 'w': 7};
eval('d.set' + k[interval] + '(d.get' + k[interval] + '()+' + ((n[interval] || 1) * number) + ')'); eval('d.set' + k[interval] + '(d.get' + k[interval] + '()+' + ((n[interval] || 1) * number) + ')');
return d; return d;
}; };
...@@ -915,7 +927,9 @@ ...@@ -915,7 +927,9 @@
} }
// Sort object keys // Sort object keys
data = _.chain(data).pairs().sortBy(function (x) { return x[0]; }).value(); data = _.chain(data).pairs().sortBy(function (x) {
return x[0];
}).value();
// Build new object // Build new object
data = _.object.apply(_, _.zip.apply(_, data)); data = _.object.apply(_, _.zip.apply(_, data));
...@@ -947,7 +961,9 @@ ...@@ -947,7 +961,9 @@
var chineseStr = ''; var chineseStr = '';
//分离金额后用的数组，预定义 //分离金额后用的数组，预定义
var parts; var parts;
if (money == '') { return ''; } if (money == '') {
return '';
}
money = parseFloat(money); money = parseFloat(money);
if (money >= maxNum) { if (money >= maxNum) {
//超出最大处理数字 //超出最大处理数字
...@@ -1034,7 +1050,9 @@ ...@@ -1034,7 +1050,9 @@
var chineseStr = ''; var chineseStr = '';
//分离金额后用的数组，预定义 //分离金额后用的数组，预定义
var parts; var parts;
if (money == '') { return ''; } if (money == '') {
return '';
}
money = parseFloat(money); money = parseFloat(money);
if (money >= maxNum) { if (money >= maxNum) {
//超出最大处理数字 //超出最大处理数字
...@@ -1128,9 +1146,10 @@ ...@@ -1128,9 +1146,10 @@
}, {}); }, {});
} }
}); });
}; }
;
PWC.warning = function(title, text, callback){ PWC.warning = function (title, text, callback) {
swal({ swal({
title: title, title: title,
text: text, text: text,
...@@ -1144,7 +1163,7 @@ ...@@ -1144,7 +1163,7 @@
}, },
callback); callback);
}; };
PWC.alert = function(title, text, callback){ PWC.alert = function (title, text, callback) {
swal({ swal({
title: title, title: title,
text: text, text: text,
...@@ -1160,7 +1179,7 @@ ...@@ -1160,7 +1179,7 @@
}; };
/------------------------------------------------kevin insert -----------------------------------/ /------------------------------------------------kevin insert -----------------------------------/
PWC.downloadCallBack = function(data,status, headers, fileName){ PWC.downloadCallBack = function (data, status, headers, fileName) {
var octetStreamMime = 'application/octet-stream'; var octetStreamMime = 'application/octet-stream';
var contentType = headers('content-type') || octetStreamMime; var contentType = headers('content-type') || octetStreamMime;
if (window.navigator.msSaveBlob) { if (window.navigator.msSaveBlob) {
...@@ -1183,7 +1202,38 @@ ...@@ -1183,7 +1202,38 @@
a.click(); a.click();
} }
} }
} };
/**
* @param scope angular 作用域
* @param translate 翻译器
*这里指定 dataSource 为 companyList
*/
PWC.orgManySelect = function (scope, translate, exp) {
var dataSource = "companyList";
var bindValue = "formParam.orgIds";
scope.selectOrgOptions = {
displayExpr: 'name',
valueExpr: 'id',
width: function() {
return window.innerWidth / 4.5;
},
bindingOptions: {
value: bindValue,
dataSource: dataSource
},
height: '35px',
placeholder: translate.instant('PleaseSelected'),
showClearButton: true,
searchEnabled: true,
noDataText: translate.instant('RevenueNoOrgData'),
showSelectionControls: true,
visible : true,
deferRendering : false
};
if(exp)
_.extend(scope.selectOrgOptions, exp);
};
/*-----------------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------------*/
})(window) })(window)
\ No newline at end of file
atms-web/src/main/webapp/app/dataImport/data-extraction/extract-invoice-data/extract-invoice-data.ctrl.js
View file @ 80b609ea
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
$scope.selectedPeriod = null; $scope.selectedPeriod = null;
$scope.showTotalSecondRow = false; $scope.showTotalSecondRow = false;
$scope.maxTitleLength = constant.maxButtonTitleLength; $scope.maxTitleLength = constant.maxButtonTitleLength;
$scope.companyList = []; $scope.companyList = [];
$scope.checkedCompanyList = []; $scope.checkedCompanyList = [];
$scope.checkedCompanyCodeList = []; $scope.checkedCompanyCodeList = [];
...@@ -52,8 +51,6 @@ ...@@ -52,8 +51,6 @@
$scope.importExcelFile = null; $scope.importExcelFile = null;
$scope.UploadPeriodTime = null; $scope.UploadPeriodTime = null;
//写日志 //写日志
var logDto = { var logDto = {
ID: '', ID: '',
...@@ -288,6 +285,9 @@ ...@@ -288,6 +285,9 @@
ele1.datepicker("setDate", $scope.selectedDate); ele1.datepicker("setDate", $scope.selectedDate);
}; };
//-------------------------------------kevin insert begin -------------------------------------------
var initCompanyList = function () { var initCompanyList = function () {
orgService.getOrgListByUserId().success(function (data) { orgService.getOrgListByUserId().success(function (data) {
if (data) { if (data) {
...@@ -295,7 +295,36 @@ ...@@ -295,7 +295,36 @@
} }
}); });
}; };
var exp = {
showDropDownButton : true,
bindingOptions : {
value : 'checkedCompanyCodeList',
dataSource : 'companyList'
}
}
PWC.orgManySelect($scope, $translate, exp);
$scope.selectDataType = {
displayExpr: 'type',
valueExpr: 'code',
width: function() {
return window.innerWidth / 4.5;
},
bindingOptions: {
value: 'checkedFileCodeList',
dataSource: 'fileTypeList'
},
height: '30px',
placeholder: $translate.instant('PleaseSelected'),
showClearButton: true,
searchEnabled: true,
noDataText: $translate.instant('RevenueNoOrgData'),
showSelectionControls: true,
visible : true,
deferRendering : false
};
//-------------------------------------kevin insert end -------------------------------------------
$scope.selectOne = function () { $scope.selectOne = function () {
$scope.checkedCompanyList = []; $scope.checkedCompanyList = [];
angular.forEach($scope.companyList , function (i) { angular.forEach($scope.companyList , function (i) {
......
atms-web/src/main/webapp/app/dataImport/data-extraction/extract-invoice-data/extract-invoice-data.html
View file @ 80b609ea
...@@ -8,10 +8,8 @@ ...@@ -8,10 +8,8 @@
</div> </div>
<!--导航栏--> <!--导航栏-->
<div id="tab_total"> <div id="tab_total">
<form class="form-inline" id="navigationForm" name="navigationForm"> <form class="form-inline" id="navigationForm" name="navigationForm"style="margin-top: 10px;">
<div class="form-group" ng-style="setButtonWrapStyle()"> <!--<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="import-wrapper">
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px"> <div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 220px;"> data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 220px;">
...@@ -33,43 +31,53 @@ ...@@ -33,43 +31,53 @@
</div> </div>
</li> </li>
</ul> </ul>
</div>-->
<div class="form-group" style=" margin-top: 5px;">
<label class="control-label" translate="SelectedOrganization" style="position: relative; top: -9px;">:</label>
<div dx-tag-box="selectOrgOptions" style="display: inline-block; width: 300px!important;"></div>
</div> </div>
<span class="text-bold" translate="InvoiceQJ"></span>: <div class="form-group">
<div class="period-picker" style="margin-left:10px"> <label class="control-label" translate="InvoiceQJ"></label>:
<input type="text" id="periodDatepicker" class="datepicker imp-subheader" style="width:80px;" <div class="period-picker" style="margin-left:10px; display: inline-block">
readonly="readonly" ng-model="UploadPeriodTime"/> <input type="text" id="periodDatepicker" class="datepicker imp-subheader form-control"
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i> readonly="readonly" ng-model="UploadPeriodTime"/>
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div>
</div> </div>
<span class="text-bold" translate="SelectedDataType"></span>: <div class="form-group">
<div class="dropdown" style="margin-left:10px"> <label class="text-bold" translate="SelectedDataType" style=" position: relative; top: -5px;">:</label>
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu2" <!-- <div class="dropdown" style="margin-left:10px; display: inline-block">
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 180px;"> <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu2"
{{checkedFileTypeList ? ((checkedFileTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}} data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 180px;">
<span class="caret" style="float: right "></span> {{checkedFileTypeList ? ((checkedFileTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
</button> <span class="caret" style="float: right "></span>
<ul class="dropdown-menu" style="width: 180px;" aria-labelledby="dropdownMenu2"> </button>
<li><input type="checkbox" ng-model="selectedAllFileType" ng-change="selectAllFile()" <ul class="dropdown-menu" style="width: 180px;" aria-labelledby="dropdownMenu2">
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px" checked> <li><input type="checkbox" ng-model="selectedAllFileType" ng-change="selectAllFile()"
<span style="margin-left:5px;float: left;">全选</span></li> style="float: left;margin-left: 10px; margin-top: 7px; width: 15px" checked>
<li role="separator" class="divider" style="height: 1px;margin: 9px 0; <span style="margin-left:5px;float: left;">全选</span></li>
<li role="separator" class="divider" style="height: 1px;margin: 9px 0;
overflow: hidden;background-color: #e5e5e5;"></li> overflow: hidden;background-color: #e5e5e5;"></li>
<li ng-repeat="i in fileTypeList"> <li ng-repeat="i in fileTypeList">
<div class="checkbox-custom checkbox-default"> <div class="checkbox-custom checkbox-default">
<input type="checkbox" ng-model="i.checked" ng-change="selectOneFileType()" <input type="checkbox" ng-model="i.checked" ng-change="selectOneFileType()"
ng-checked="selectedOneFile" ng-checked="selectedOneFile"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px"> style="float: left;margin-left: 10px; margin-top: 7px; width: 15px">
<span style="margin-left:5px;">{{i.type}}</span> <span style="margin-left:5px;">{{i.type}}</span>
</div> </div>
</li> </li>
</ul> </ul>
</div>-->
<div dx-tag-box="selectDataType" style="display: inline-block; position: relative; top: 5px;"></div>
</div> </div>
<button type="button" atms-permission permission-control-type="ngIf" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}" <div class="form-group">
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;" <button type="button" atms-permission permission-control-type="ngIf" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="ImportBtn" class="btn btn-vat-primary form-control"
ng-click="callInvoiceApi()"></button> translate="ImportBtn"
</div> ng-click="callInvoiceApi()"></button>
</div> </div>
</form> </form>
<div class="dt-init-wrapper"> <div class="dt-init-wrapper">
......
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