Skip to content

T
traffic-front
Commit 40f27bbd authored by zhkwei's avatar zhkwei
Browse files
Options

Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql

parents 163c68c9 ce019886
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 345 additions and 205 deletions
atms-api/src/main/java/pwc/taxtech/atms/controller/OperationLogFileTypeController.java
View file @ 40f27bbd
...@@ -95,17 +95,12 @@ public class OperationLogFileTypeController { ...@@ -95,17 +95,12 @@ public class OperationLogFileTypeController {
try { try {
Map<String, String> headers = new LinkedHashMap<>(); Map<String, String> headers = new LinkedHashMap<>();
headers.put("id", "id"); headers.put("id", "id");
// headers.put("operation_content", "操作内容"); headers.put("operation_action", "操作");
// headers.put("module_name", "模块名称");
// headers.put("operation_object", "操作对象");
headers.put("operation_action", "操作action");
// headers.put("original_state", "原始状态");
// headers.put("update_state", "更新状态");
headers.put("update_state", "操作内容"); headers.put("update_state", "操作内容");
headers.put("operation_user", "操作者"); headers.put("operation_user", "操作人员");
headers.put("ip", "操作ip"); headers.put("ip", "操作ip");
headers.put("comment", "内容"); headers.put("comment", "备注");
headers.put("create_time", "创建时间"); headers.put("create_time", "操作时间");
List<OperationLogFileType> fileTypes = operationLogFileTypeService.selectFileTypesList(); List<OperationLogFileType> fileTypes = operationLogFileTypeService.selectFileTypesList();
// List<OperationLogFileType> operationLogFileTypes = operationLogFileTypeService.selectListForLog(operationLogFileType.getFileTypeIds()); // List<OperationLogFileType> operationLogFileTypes = operationLogFileTypeService.selectListForLog(operationLogFileType.getFileTypeIds());
response.setContentType("multipart/form-data"); response.setContentType("multipart/form-data");
......
atms-api/src/main/java/pwc/taxtech/atms/controller/OperationLogTaxDocController.java
View file @ 40f27bbd
...@@ -74,13 +74,13 @@ public class OperationLogTaxDocController { ...@@ -74,13 +74,13 @@ public class OperationLogTaxDocController {
public void exportExcelFile(HttpServletResponse response, @RequestBody OperationLogTaxDocument operationLogTaxDocument) { public void exportExcelFile(HttpServletResponse response, @RequestBody OperationLogTaxDocument operationLogTaxDocument) {
try { try {
Map<String, String> headers = new LinkedHashMap<>(); Map<String, String> headers = new LinkedHashMap<>();
headers.put("id", "id"); headers.put("id", "序号");
headers.put("operation_action", "操作action"); headers.put("operation_action", "操作");
headers.put("update_state", "操作内容"); headers.put("update_state", "操作内容");
headers.put("operation_user", "操作者"); headers.put("operation_user", "操作人员");
headers.put("ip", "操作ip"); headers.put("ip", "操作ip");
headers.put("comment", "内容"); headers.put("comment", "备注");
headers.put("create_time", "创建时间"); headers.put("create_time", "操作时间");
List<String> ids = operationLogTaxDocument.getIds() == null ? Lists.newArrayList() : operationLogTaxDocument.getIds(); List<String> ids = operationLogTaxDocument.getIds() == null ? Lists.newArrayList() : operationLogTaxDocument.getIds();
List<OperationLogTaxDocument> taxDocuments = operationLogTaxDocService.selectListForLog(ids); List<OperationLogTaxDocument> taxDocuments = operationLogTaxDocService.selectListForLog(ids);
response.setContentType("multipart/form-data"); response.setContentType("multipart/form-data");
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/EquityServiceImpl.java
View file @ 40f27bbd
...@@ -24,7 +24,7 @@ import static pwc.taxtech.atms.common.CommonConstants.CommonFail; ...@@ -24,7 +24,7 @@ import static pwc.taxtech.atms.common.CommonConstants.CommonFail;
import static pwc.taxtech.atms.common.CommonConstants.SystemError; import static pwc.taxtech.atms.common.CommonConstants.SystemError;
@Service @Service
public class EquityServiceImpl extends BaseService{ public class EquityServiceImpl extends BaseService {
@Autowired @Autowired
private OperationLogServiceImpl operationLogServiceImpl; private OperationLogServiceImpl operationLogServiceImpl;
...@@ -59,35 +59,35 @@ public class EquityServiceImpl extends BaseService{ ...@@ -59,35 +59,35 @@ public class EquityServiceImpl extends BaseService{
} }
public OperationResultDto<Object> insertAll(List<EquityInfoDto> equityInfoDtos) { public OperationResultDto<Object> insertAll(List<EquityInfoDto> equityInfoDtos) {
try{ try {
// todo opt insertAll // todo opt insertAll
if(equityInfoDtos.get(0).getId()==null){ if (equityInfoDtos.get(0).getId() == null) {
equityInfoDtos.get(0).setId(idService.nextId()); equityInfoDtos.get(0).setId(idService.nextId());
equityInfoDtos.get(0).seteNum(1); equityInfoDtos.get(0).seteNum(1);
} }
for (EquityInfoDto equityInfoDto : equityInfoDtos) { for (EquityInfoDto equityInfoDto : equityInfoDtos) {
EquityInformation equityInformation = new EquityInformation(); EquityInformation equityInformation = new EquityInformation();
BeanUtils.copyProperties(equityInfoDto,equityInformation); BeanUtils.copyProperties(equityInfoDto, equityInformation);
equityInformationMapper.insert(equityInformation); equityInformationMapper.insert(equityInformation);
} }
AddOrgEquityLog(OperationAction.New.value(),LogMessage.AddOrganizationEquity,equityInfoDtos.get(0).getOrganizationId(),OperationModule.Equity.value()); AddOrgEquityLog(OperationAction.New.value(), LogMessage.AddOrganizationEquity, equityInfoDtos.get(0).getOrganizationId(), OperationModule.Equity.value());
return new OperationResultDto(true); return new OperationResultDto(true);
}catch (Exception e){ } catch (Exception e) {
logger.error(String.format("写入全部股东信息异常:%s", e.getMessage())); logger.error(String.format("写入全部股东信息异常:%s", e.getMessage()));
return new OperationResultDto(false, CommonFail + SystemError); return new OperationResultDto(false, CommonFail + SystemError);
} }
} }
public OperationResultDto<Object> update(EquityInfoDto equityInfoDto) { public OperationResultDto<Object> update(EquityInfoDto equityInfoDto) {
try{ try {
EquityInformation equityInformation = new EquityInformation(); EquityInformation equityInformation = new EquityInformation();
BeanUtils.copyProperties(equityInfoDto,equityInformation); BeanUtils.copyProperties(equityInfoDto, equityInformation);
EquityInformationExample example = new EquityInformationExample(); EquityInformationExample example = new EquityInformationExample();
example.createCriteria().andIdEqualTo(equityInformation.getId()).andENumEqualTo(equityInformation.geteNum()); example.createCriteria().andIdEqualTo(equityInformation.getId()).andENumEqualTo(equityInformation.geteNum());
equityInformationMapper.updateByExampleSelective(equityInformation,example); equityInformationMapper.updateByExampleSelective(equityInformation, example);
AddOrgEquityLog(OperationAction.Update.value(),LogMessage.UpdateOrganizationEquity,equityInfoDto.getOrganizationId(),OperationModule.Equity.value()); AddOrgEquityLog(OperationAction.Update.value(), LogMessage.UpdateOrganizationEquity, equityInfoDto.getOrganizationId(), OperationModule.Equity.value());
return new OperationResultDto(true); return new OperationResultDto(true);
}catch (Exception e){ } catch (Exception e) {
logger.error(String.format("更新股东信息异常:%s", e.getMessage())); logger.error(String.format("更新股东信息异常:%s", e.getMessage()));
return new OperationResultDto(false, CommonFail + SystemError); return new OperationResultDto(false, CommonFail + SystemError);
} }
...@@ -104,7 +104,7 @@ public class EquityServiceImpl extends BaseService{ ...@@ -104,7 +104,7 @@ public class EquityServiceImpl extends BaseService{
if (delRes > 0) { if (delRes > 0) {
refreshEquityList(id); refreshEquityList(id);
} }
AddOrgEquityLog(OperationAction.Delete.value(),LogMessage.DeleteOrganizationEquity,String.valueOf(id),OperationModule.Equity.value()); AddOrgEquityLog(OperationAction.Delete.value(), LogMessage.DeleteOrganizationEquity, String.valueOf(id), OperationModule.Equity.value());
return new OperationResultDto(true); return new OperationResultDto(true);
} catch (Exception e) { } catch (Exception e) {
logger.error(String.format("删除股东信息异常:%s", e.getMessage())); logger.error(String.format("删除股东信息异常:%s", e.getMessage()));
...@@ -116,8 +116,9 @@ public class EquityServiceImpl extends BaseService{ ...@@ -116,8 +116,9 @@ public class EquityServiceImpl extends BaseService{
* 17/01/2019 15:51 * 17/01/2019 15:51
* 变更当前股权信息时，刷新股权信息的序号 * 变更当前股权信息时，刷新股权信息的序号
* [id] * [id]
* @author Gary J Li *
* @return * @return
* @author Gary J Li
*/ */
private void refreshEquityList(Long id) { private void refreshEquityList(Long id) {
EquityInformationExample exampleForENumUp = new EquityInformationExample(); EquityInformationExample exampleForENumUp = new EquityInformationExample();
...@@ -128,9 +129,9 @@ public class EquityServiceImpl extends BaseService{ ...@@ -128,9 +129,9 @@ public class EquityServiceImpl extends BaseService{
return; return;
} }
List<EquityInformation> resList = new ArrayList<>(); List<EquityInformation> resList = new ArrayList<>();
int i =1; int i = 1;
for (EquityInformation record : equityInformations) { for (EquityInformation record : equityInformations) {
if(record.geteNum()!=i){ if (record.geteNum() != i) {
record.seteNum(i); record.seteNum(i);
} }
resList.add(record); resList.add(record);
...@@ -149,18 +150,19 @@ public class EquityServiceImpl extends BaseService{ ...@@ -149,18 +150,19 @@ public class EquityServiceImpl extends BaseService{
/** /**
* 17/01/2019 20:18 股权变更 * 17/01/2019 20:18 股权变更
* 1、根据id（原始）查出旧数据 equity_infomation * 1、根据id（原始）查出旧数据 equity_infomation
* 2、旧数据插入历史表 equity_infomation_history * 2、旧数据插入历史表 equity_infomation_history
* 3、equityInfoDtos 生成新id、createTime、updateTime 插入equity_infomation * 3、equityInfoDtos 生成新id、createTime、updateTime 插入equity_infomation
* 4、根据id（原始）删除旧数据 equity_infomation * 4、根据id（原始）删除旧数据 equity_infomation
* 5、记录日志 id（原始） * 5、记录日志 id（原始）
* * <p>
* remark: * remark:
* 1、无股权记录时，为初始变更只进行3、5 * 1、无股权记录时，为初始变更只进行3、5
* 2、// todo 事务过长并发时，可能出现问题 * 2、// todo 事务过长并发时，可能出现问题
* [equityInfoDtos] * [equityInfoDtos]
* @author Gary J Li *
* @return OperationResultDto<Object> * @return OperationResultDto<Object>
* @author Gary J Li
*/ */
public OperationResultDto<Object> change(String orgName, String comment, List<EquityInfoDto> equityInfoDtos) { public OperationResultDto<Object> change(String orgName, String comment, List<EquityInfoDto> equityInfoDtos) {
...@@ -195,8 +197,8 @@ public class EquityServiceImpl extends BaseService{ ...@@ -195,8 +197,8 @@ public class EquityServiceImpl extends BaseService{
newData.setId(newId); newData.setId(newId);
newData.seteNum(i); newData.seteNum(i);
float investRadio = 0L; float investRadio = 0L;
if(CommonUtil.hasDigit(org.getRegistrationCapital())&&null!=newData.getInvestmentAmount()){ if (CommonUtil.hasDigit(org.getRegistrationCapital()) && null != newData.getInvestmentAmount()) {
investRadio = (float)newData.getInvestmentAmount()/(float)CommonUtil.getNum(org.getRegistrationCapital()); investRadio = (float) newData.getInvestmentAmount() / (float) CommonUtil.getNum(org.getRegistrationCapital());
} }
newData.setInvestmentRadio(investRadio); newData.setInvestmentRadio(investRadio);
newData.setOrganizationId(orgId); newData.setOrganizationId(orgId);
...@@ -237,7 +239,7 @@ public class EquityServiceImpl extends BaseService{ ...@@ -237,7 +239,7 @@ public class EquityServiceImpl extends BaseService{
opLog.setLogType(OperateLogType.OperationLogEquity.value()); opLog.setLogType(OperateLogType.OperationLogEquity.value());
opLog.setEquityLog(true); opLog.setEquityLog(true);
operationLogService.addOperationLog(opLog); operationLogService.addOperationLog(opLog);
AddOrgEquityLog(OperationAction.Update.value(),LogMessage.ChangeOrganizationEquity,orgName,OperationModule.Equity.value()); AddOrgEquityLog(OperationAction.Update.value(), LogMessage.ChangeOrganizationEquity, orgName, OperationModule.Equity.value());
return new OperationResultDto(true, "变更成功!", oldId); return new OperationResultDto(true, "变更成功!", oldId);
} }
...@@ -245,8 +247,9 @@ public class EquityServiceImpl extends BaseService{ ...@@ -245,8 +247,9 @@ public class EquityServiceImpl extends BaseService{
* 18/01/2019 14:03 * 18/01/2019 14:03
* 根据id查询出所有日志，时间排序 * 根据id查询出所有日志，时间排序
* [ids] * [ids]
* @author Gary J Li *
* @return List<OperationLogBasicData> * @return List<OperationLogBasicData>
* @author Gary J Li
*/ */
public List<OperationLogBasicData> getChangeLogByOrgName(String orgName) { public List<OperationLogBasicData> getChangeLogByOrgName(String orgName) {
List<OperationLogBasicData> logListByIds = null; List<OperationLogBasicData> logListByIds = null;
...@@ -268,8 +271,9 @@ public class EquityServiceImpl extends BaseService{ ...@@ -268,8 +271,9 @@ public class EquityServiceImpl extends BaseService{
* 5、根据oldId删除操作日志 operation_log_equity * 5、根据oldId删除操作日志 operation_log_equity
* remark : 最初的记录撤销变更仅做3、5 * remark : 最初的记录撤销变更仅做3、5
* [id] * [id]
* @author Gary J Li *
* @return OperationResultDto<Object> * @return OperationResultDto<Object>
* @author Gary J Li
*/ */
public OperationResultDto<Object> cancelChange(Long oldId, Long newId) { public OperationResultDto<Object> cancelChange(Long oldId, Long newId) {
if (null != oldId) { if (null != oldId) {
...@@ -308,7 +312,7 @@ public class EquityServiceImpl extends BaseService{ ...@@ -308,7 +312,7 @@ public class EquityServiceImpl extends BaseService{
logger.warn(String.format("撤销变更-3 表operation_log_equity 删除操作日志异常.id: [ %s ]", oldId)); logger.warn(String.format("撤销变更-3 表operation_log_equity 删除操作日志异常.id: [ %s ]", oldId));
throw new ApplicationException("撤销变更-5 删除操作日志异常"); throw new ApplicationException("撤销变更-5 删除操作日志异常");
} }
AddOrgEquityLog(OperationAction.Update.value(),LogMessage.CancelChangeUpdateOrganizationEquity,String.valueOf(newId),OperationModule.Equity.value()); AddOrgEquityLog(OperationAction.Update.value(), LogMessage.CancelChangeUpdateOrganizationEquity, String.valueOf(newId), OperationModule.Equity.value());
return new OperationResultDto(true); return new OperationResultDto(true);
} }
...@@ -356,10 +360,11 @@ public class EquityServiceImpl extends BaseService{ ...@@ -356,10 +360,11 @@ public class EquityServiceImpl extends BaseService{
* 25/01/2019 14:39 * 25/01/2019 14:39
* [增删改查，操作描述，操作对象，操作模块] 更新、删除需补充oldData、newData * [增删改查，操作描述，操作对象，操作模块] 更新、删除需补充oldData、newData
* [actionValue, content, object, module] * [actionValue, content, object, module]
* @author Gary J Li *
* @return * @return
* @author Gary J Li
*/ */
private void AddOrgEquityLog(int actionValue,String content,String object,Integer module) { private void AddOrgEquityLog(int actionValue, String content, String object, Integer module) {
OperationLogDto opLog = new OperationLogDto(); OperationLogDto opLog = new OperationLogDto();
opLog.setAction(actionValue); opLog.setAction(actionValue);
opLog.setOperationContent(content); opLog.setOperationContent(content);
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/TaxDocumentServiceImpl.java
View file @ 40f27bbd
...@@ -945,8 +945,8 @@ public class TaxDocumentServiceImpl { ...@@ -945,8 +945,8 @@ public class TaxDocumentServiceImpl {
taxDocument.setCompanyName(params.get(0)); taxDocument.setCompanyName(params.get(0));
taxDocument.setCreateTime(new Date()); taxDocument.setCreateTime(new Date());
taxDocument.setUpdateTime(new Date()); taxDocument.setUpdateTime(new Date());
taxDocument.setCreator(authUserHelper.getCurrentAuditor().get()); taxDocument.setCreator("System");
taxDocument.setCreatorId(authUserHelper.getCurrentUserId()); taxDocument.setCreatorId("1");
taxDocument.setUploadTime(new Date()); taxDocument.setUploadTime(new Date());
taxDocument.setYearRedundancy(Calendar.getInstance().get(Calendar.YEAR)); taxDocument.setYearRedundancy(Calendar.getInstance().get(Calendar.YEAR));
//根据公司Id 设置业务线 //根据公司Id 设置业务线
......
atms-dao/src/main/java/pwc/taxtech/atms/entity/OperationLogFileType.java
View file @ 40f27bbd
...@@ -58,7 +58,7 @@ public class OperationLogFileType implements Serializable { ...@@ -58,7 +58,7 @@ public class OperationLogFileType implements Serializable {
* *
* @mbg.generated * @mbg.generated
*/ */
@ExcelCell(index=2) @ExcelCell(index=3)
private String operationAction; private String operationAction;
/** /**
...@@ -77,7 +77,7 @@ public class OperationLogFileType implements Serializable { ...@@ -77,7 +77,7 @@ public class OperationLogFileType implements Serializable {
* *
* @mbg.generated * @mbg.generated
*/ */
@ExcelCell(index=3) @ExcelCell(index=4)
private String updateState; private String updateState;
/** /**
...@@ -87,7 +87,7 @@ public class OperationLogFileType implements Serializable { ...@@ -87,7 +87,7 @@ public class OperationLogFileType implements Serializable {
* *
* @mbg.generated * @mbg.generated
*/ */
@ExcelCell(index=4) @ExcelCell(index=5)
private String operationUser; private String operationUser;
/** /**
...@@ -97,7 +97,7 @@ public class OperationLogFileType implements Serializable { ...@@ -97,7 +97,7 @@ public class OperationLogFileType implements Serializable {
* *
* @mbg.generated * @mbg.generated
*/ */
@ExcelCell(index=5) @ExcelCell(index=6)
private String ip; private String ip;
/** /**
...@@ -107,7 +107,7 @@ public class OperationLogFileType implements Serializable { ...@@ -107,7 +107,7 @@ public class OperationLogFileType implements Serializable {
* *
* @mbg.generated * @mbg.generated
*/ */
@ExcelCell(index=5) @ExcelCell(index=7)
private String comment; private String comment;
/** /**
...@@ -117,7 +117,7 @@ public class OperationLogFileType implements Serializable { ...@@ -117,7 +117,7 @@ public class OperationLogFileType implements Serializable {
* *
* @mbg.generated * @mbg.generated
*/ */
@ExcelCell(index=6) @ExcelCell(index=2)
private Date createTime; private Date createTime;
private List<String> fileTypeIds; private List<String> fileTypeIds;
......
atms-dao/src/main/java/pwc/taxtech/atms/entity/OperationLogTaxDocument.java
View file @ 40f27bbd
...@@ -58,7 +58,7 @@ public class OperationLogTaxDocument implements Serializable { ...@@ -58,7 +58,7 @@ public class OperationLogTaxDocument implements Serializable {
* *
* @mbg.generated * @mbg.generated
*/ */
@ExcelCell(index=2) @ExcelCell(index=3)
private String operationAction; private String operationAction;
/** /**
...@@ -77,7 +77,7 @@ public class OperationLogTaxDocument implements Serializable { ...@@ -77,7 +77,7 @@ public class OperationLogTaxDocument implements Serializable {
* *
* @mbg.generated * @mbg.generated
*/ */
@ExcelCell(index=3) @ExcelCell(index=4)
private String updateState; private String updateState;
/** /**
...@@ -87,7 +87,7 @@ public class OperationLogTaxDocument implements Serializable { ...@@ -87,7 +87,7 @@ public class OperationLogTaxDocument implements Serializable {
* *
* @mbg.generated * @mbg.generated
*/ */
@ExcelCell(index=4) @ExcelCell(index=5)
private String operationUser; private String operationUser;
/** /**
...@@ -97,7 +97,7 @@ public class OperationLogTaxDocument implements Serializable { ...@@ -97,7 +97,7 @@ public class OperationLogTaxDocument implements Serializable {
* *
* @mbg.generated * @mbg.generated
*/ */
@ExcelCell(index=5) @ExcelCell(index=6)
private String ip; private String ip;
/** /**
...@@ -107,7 +107,7 @@ public class OperationLogTaxDocument implements Serializable { ...@@ -107,7 +107,7 @@ public class OperationLogTaxDocument implements Serializable {
* *
* @mbg.generated * @mbg.generated
*/ */
@ExcelCell(index=6) @ExcelCell(index=7)
private String comment; private String comment;
/** /**
...@@ -117,7 +117,7 @@ public class OperationLogTaxDocument implements Serializable { ...@@ -117,7 +117,7 @@ public class OperationLogTaxDocument implements Serializable {
* *
* @mbg.generated * @mbg.generated
*/ */
@ExcelCell(index=7) @ExcelCell(index=2)
private Date createTime; private Date createTime;
List<String> ids; List<String> ids;
......
atms-orangeheap/.env.development
View file @ 40f27bbd
VUE_APP_TABLEAU_API=http://dts.erp.didichuxing.com/OrangeHeap/ VUE_APP_TABLEAU_API=/OrangeHeap/
\ No newline at end of file \ No newline at end of file
atms-orangeheap/.env.production
View file @ 40f27bbd
VUE_APP_TABLEAU_API=http://dts.erp.didichuxing.com/OrangeHeap/ VUE_APP_TABLEAU_API=/OrangeHeap/
\ No newline at end of file \ No newline at end of file
atms-orangeheap/src/components/Panel.vue
View file @ 40f27bbd
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
export default { export default {
data: () => ({ data: () => ({
chartUrl: process.env.VUE_APP_TABLEAU_API + 'unreturnedTax', chartUrl: process.env.VUE_APP_TABLEAU_API + 'getTableauTaxCategoryUnreturnedTax',
tableauApiUrl: require('../assets/tableaujs.js'), tableauApiUrl: require('../assets/tableaujs.js'),
// tableauApiUrl: 'https://public.tableau.com/javascripts/api/tableau-2.2.2.min.js', // tableauApiUrl: 'https://public.tableau.com/javascripts/api/tableau-2.2.2.min.js',
drawer: null, drawer: null,
......
atms-web/src/main/resources/conf.properties
View file @ 40f27bbd
...@@ -24,6 +24,7 @@ longi_api_gl_balance=${longi_api_gl_balance} ...@@ -24,6 +24,7 @@ longi_api_gl_balance=${longi_api_gl_balance}
#tableau config #tableau config
tableau_get_ticket=${tableau_get_ticket}
tableau_tax_category_unreturned_tax=${tableau_tax_category_unreturned_tax} tableau_tax_category_unreturned_tax=${tableau_tax_category_unreturned_tax}
tableau_district_unreturned_tax=${tableau_district_unreturned_tax} tableau_district_unreturned_tax=${tableau_district_unreturned_tax}
......
atms-web/src/main/resources/conf_profile_dev.properties
View file @ 40f27bbd
...@@ -23,51 +23,53 @@ longi_api_gl_balance=http://39.105.197.175:13001/ETMSSB/Erp/GLBalance/ProxyServi ...@@ -23,51 +23,53 @@ longi_api_gl_balance=http://39.105.197.175:13001/ETMSSB/Erp/GLBalance/ProxyServi
#tableau config #tableau config
tableau_get_ticket=http://47.94.233.173:16010/trusted?username=%s tableau_get_ticket=http://47.94.233.173:16010/trusted?username=%s
#税种未返还税金 #税种未返还税金
tableau_tax_category_unreturned_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/_mobile_1?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no 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_district_unreturned_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/_mobile?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_unreturned_and_returned_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/sheet14?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_cost_analysis=http://10.158.230.16:8890/views/Didi_Tax_20190307/sheet19?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_district_profit_and_loss=http://10.158.230.16:8890/views/Didi_Tax_20190307/sheet26?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_company_profit_and_loss=http://10.158.230.16:8890/views/Didi_Tax_20190307/_mobile_2?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_driver_and_employee=http://10.158.230.16:8890/views/Didi_Tax_20190307/sheet32?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
#业务线GMV及补贴统计 #业务线GMV及补贴统计
tableau_gmv_and_subsidy=http://10.158.230.16:8890/views/Didi_Tax_20190307/GMV_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no 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_file_arrangement=http://10.158.230.16:8890/views/Didi_Tax_20190307/_mobile_3?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_global_overview=http://10.158.230.16:8890/views/Didi_Tax_20190307/InternationalOverview?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_business=http://10.158.230.16:8890/views/Didi_Tax_20190307/International_Table_mobile?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_mexican_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/Mexico?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_australian_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/Australia?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_brazilian_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/Brazil?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_other_tax_analysis=http://10.158.230.16:8890/views/Didi_Tax_20190307/Others?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_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://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_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://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
......
atms-web/src/main/resources/conf_profile_pub.properties
View file @ 40f27bbd
...@@ -21,48 +21,49 @@ longi_api_basic_pwd= ...@@ -21,48 +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_tax_category_unreturned_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/_mobile_1?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no 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_district_unreturned_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/_mobile?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_unreturned_and_returned_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/sheet14?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_cost_analysis=http://10.158.230.16:8890/views/Didi_Tax_20190307/sheet19?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_district_profit_and_loss=http://10.158.230.16:8890/views/Didi_Tax_20190307/sheet26?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_company_profit_and_loss=http://10.158.230.16:8890/views/Didi_Tax_20190307/_mobile_2?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_driver_and_employee=http://10.158.230.16:8890/views/Didi_Tax_20190307/sheet32?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
#业务线GMV及补贴统计 #业务线GMV及补贴统计
tableau_gmv_and_subsidy=http://10.158.230.16:8890/views/Didi_Tax_20190307/GMV_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no 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_file_arrangement=http://10.158.230.16:8890/views/Didi_Tax_20190307/_mobile_3?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_global_overview=http://10.158.230.16:8890/views/Didi_Tax_20190307/InternationalOverview?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_business=http://10.158.230.16:8890/views/Didi_Tax_20190307/International_Table_mobile?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_mexican_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/Mexico?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_australian_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/Australia?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_brazilian_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/Brazil?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_other_tax_analysis=http://10.158.230.16:8890/views/Didi_Tax_20190307/Others?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
atms-web/src/main/resources/conf_profile_staging.properties
View file @ 40f27bbd
...@@ -22,48 +22,49 @@ longi_api_basic_pwd= ...@@ -22,48 +22,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_tax_category_unreturned_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/_mobile_1?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no 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_district_unreturned_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/_mobile?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_unreturned_and_returned_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/sheet14?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_cost_analysis=http://10.158.230.16:8890/views/Didi_Tax_20190307/sheet19?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_district_profit_and_loss=http://10.158.230.16:8890/views/Didi_Tax_20190307/sheet26?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_company_profit_and_loss=http://10.158.230.16:8890/views/Didi_Tax_20190307/_mobile_2?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_driver_and_employee=http://10.158.230.16:8890/views/Didi_Tax_20190307/sheet32?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
#业务线GMV及补贴统计 #业务线GMV及补贴统计
tableau_gmv_and_subsidy=http://10.158.230.16:8890/views/Didi_Tax_20190307/GMV_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no 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_file_arrangement=http://10.158.230.16:8890/views/Didi_Tax_20190307/_mobile_3?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_global_overview=http://10.158.230.16:8890/views/Didi_Tax_20190307/InternationalOverview?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_business=http://10.158.230.16:8890/views/Didi_Tax_20190307/International_Table_mobile?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_mexican_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/Mexico?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_australian_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/Australia?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_brazilian_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/Brazil?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_other_tax_analysis=http://10.158.230.16:8890/views/Didi_Tax_20190307/Others?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
atms-web/src/main/resources/conf_profile_uat.properties
View file @ 40f27bbd
...@@ -21,48 +21,49 @@ longi_api_basic_pwd= ...@@ -21,48 +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_tax_category_unreturned_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/_mobile_1?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no 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_district_unreturned_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/_mobile?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_unreturned_and_returned_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/sheet14?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_cost_analysis=http://10.158.230.16:8890/views/Didi_Tax_20190307/sheet19?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_district_profit_and_loss=http://10.158.230.16:8890/views/Didi_Tax_20190307/sheet26?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_company_profit_and_loss=http://10.158.230.16:8890/views/Didi_Tax_20190307/_mobile_2?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_driver_and_employee=http://10.158.230.16:8890/views/Didi_Tax_20190307/sheet32?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
#业务线GMV及补贴统计 #业务线GMV及补贴统计
tableau_gmv_and_subsidy=http://10.158.230.16:8890/views/Didi_Tax_20190307/GMV_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no 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_file_arrangement=http://10.158.230.16:8890/views/Didi_Tax_20190307/_mobile_3?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_global_overview=http://10.158.230.16:8890/views/Didi_Tax_20190307/InternationalOverview?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_business=http://10.158.230.16:8890/views/Didi_Tax_20190307/International_Table_mobile?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_mexican_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/Mexico?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_australian_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/Australia?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_brazilian_tax=http://10.158.230.16:8890/views/Didi_Tax_20190307/Brazil?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_other_tax_analysis=http://10.158.230.16:8890/views/Didi_Tax_20190307/Others?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
atms-web/src/main/webapp/app-resources/i18n/en-us/app.json
View file @ 40f27bbd
...@@ -864,7 +864,7 @@ ...@@ -864,7 +864,7 @@
"ApproveEndTime":"Approved Time", "ApproveEndTime":"Approved Time",
"ApproveTaskList":"Approve Task List", "ApproveTaskList":"Approve Task List",
"ApproveRole":"Approve Role", "ApproveRole":"Approve Role",
"NumOfBranches":"分公司数量",
"ConditionColumnNum": "Search Condition Column Num", "ConditionColumnNum": "Search Condition Column Num",
"Condition": "Search Condition", "Condition": "Search Condition",
"RevenueTypeConfiguration":"Revenue Type Config" "RevenueTypeConfiguration":"Revenue Type Config"
......
atms-web/src/main/webapp/app-resources/i18n/zh-CN/app.json
View file @ 40f27bbd
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
"BusinessAllottedTimeTo": "营业期限截止", "BusinessAllottedTimeTo": "营业期限截止",
"BusinessPromition": "业务宣传费", "BusinessPromition": "业务宣传费",
"BusinessScope": "经营范围", "BusinessScope": "经营范围",
"RegStatus": "登记状态", "RegStatus": "工商登记状态",
"BusinessUnit": "所属业务线", "BusinessUnit": "所属业务线",
"BusinessUnitDesc": "业务线", "BusinessUnitDesc": "业务线",
"BusinessUnitID": "业务线", "BusinessUnitID": "业务线",
...@@ -371,6 +371,7 @@ ...@@ -371,6 +371,7 @@
"RegFinancialOfficerEmailAddress": "注册登记财务负责人邮箱", "RegFinancialOfficerEmailAddress": "注册登记财务负责人邮箱",
"SecondaryApprovalAmount": "二级审批金额", "SecondaryApprovalAmount": "二级审批金额",
"BusinessRegistrationNumber": "Business registration number", "BusinessRegistrationNumber": "Business registration number",
"NumOfBranches":"分公司数量",
"ParValue": "Par Value", "ParValue": "Par Value",
"IssuedShares": "Issued shares", "IssuedShares": "Issued shares",
"Directors": "Directors", "Directors": "Directors",
...@@ -595,7 +596,7 @@ ...@@ -595,7 +596,7 @@
"UpdateType": "更新方式", "UpdateType": "更新方式",
"RegistrationDate": "注册日期", "RegistrationDate": "注册日期",
"RegistrationLocation": "注册地址(住所)", "RegistrationLocation": "注册地址(住所)",
"RegistrationLocationEn": "注册地地址(住所)-英文", "RegistrationLocationEn": "注册地址(住所)-英文",
"RegistrationType": "注册类型", "RegistrationType": "注册类型",
"ArchitectureType": "架构类型", "ArchitectureType": "架构类型",
"RemarkColon": "备注：", "RemarkColon": "备注：",
......
atms-web/src/main/webapp/app-resources/i18n/zh-CN/infrastructure.json
View file @ 40f27bbd
...@@ -257,7 +257,7 @@ ...@@ -257,7 +257,7 @@
"OrganizationMsgClientCodeRequired": "请输入客户代码", "OrganizationMsgClientCodeRequired": "请输入客户代码",
"OrganizationCode": "公司代码", "OrganizationCode": "公司代码",
"UnifiedSocialCreditCode": "统一社会信用代码", "UnifiedSocialCreditCode": "统一社会信用代码",
"RegistrationStatus": "登记状态", "RegistrationStatus": "工商登记状态",
"LogoutTime": "注销时间", "LogoutTime": "注销时间",
"RegistrationAuthority": "登记机关", "RegistrationAuthority": "登记机关",
"ChangeType": "变更类型", "ChangeType": "变更类型",
...@@ -374,7 +374,7 @@ ...@@ -374,7 +374,7 @@
"CertificateType": "证件类型", "CertificateType": "证件类型",
"IdNum": "证件号码", "IdNum": "证件号码",
"InvestmentAmount": "投资金额", "InvestmentAmount": "投资金额",
"InvestmentCurrency": "投资金额币种", "InvestmentCurrency": "投资币种",
"InvestmentRadio": "投资比例", "InvestmentRadio": "投资比例",
"PayableShareholderName": "实缴投资方信息", "PayableShareholderName": "实缴投资方信息",
"PayableShareholderIdNum": "证件编号", "PayableShareholderIdNum": "证件编号",
......
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.ctrl.js
View file @ 40f27bbd
...@@ -296,13 +296,13 @@ ...@@ -296,13 +296,13 @@
allowHeaderFiltering: false allowHeaderFiltering: false
}, },
{ {
dataField: "investmentAmount", dataField: "investmentCurrency",
caption: $translate.instant('InvestmentAmount'), caption: $translate.instant('InvestmentCurrency'),
allowHeaderFiltering: false allowHeaderFiltering: false
}, },
{ {
dataField: "investmentCurrency", dataField: "investmentAmount",
caption: $translate.instant('InvestmentCurrency'), caption: $translate.instant('InvestmentAmount'),
allowHeaderFiltering: false allowHeaderFiltering: false
}, },
{ {
...@@ -317,17 +317,18 @@ ...@@ -317,17 +317,18 @@
}, },
{ {
dataField: "payableShareholderIdNum", dataField: "payableShareholderIdNum",
visible : false,
caption: $translate.instant('PayableShareholderIdNum'), caption: $translate.instant('PayableShareholderIdNum'),
allowHeaderFiltering: false allowHeaderFiltering: false
}, },
{ {
dataField: "payableCapitalContributionAmount", dataField: "payableCapitalContributionCurrency",
caption: $translate.instant('PayableCapitalContributionAmount'), caption: $translate.instant('PayableCapitalContributionCurrency'),
allowHeaderFiltering: false allowHeaderFiltering: false
}, },
{ {
dataField: "payableCapitalContributionCurrency", dataField: "payableCapitalContributionAmount",
caption: $translate.instant('PayableCapitalContributionCurrency'), caption: $translate.instant('PayableCapitalContributionAmount'),
allowHeaderFiltering: false allowHeaderFiltering: false
}, },
{ {
...@@ -598,6 +599,7 @@ ...@@ -598,6 +599,7 @@
}, },
{ {
dataField: "payableShareholderIdNum", dataField: "payableShareholderIdNum",
visible : false,
caption: $translate.instant('PayableShareholderIdNum'), caption: $translate.instant('PayableShareholderIdNum'),
allowHeaderFiltering: false allowHeaderFiltering: false
}, },
......
atms-web/src/main/webapp/app/common/controls/add-exist-organization-modal/add-exist-organization-modal.ctrl.js
View file @ 40f27bbd
...@@ -68,8 +68,9 @@ controller('addExistOrganizationModalController', ['$scope', '$log', '$translate ...@@ -68,8 +68,9 @@ controller('addExistOrganizationModalController', ['$scope', '$log', '$translate
var getOrgList = function () { var getOrgList = function () {
orgService.getOrgListLevel().success(function (data) { orgService.getOrgListLevel().success(function (data) {
if (data) { if (data) {
$scope.DataGridSource = data; $scope.DataGridSource = _.filter(data, function (row) {
return row.isActive == true;
});
setSelectItems($scope.selectedKeyItems); setSelectItems($scope.selectedKeyItems);
} }
}); });
......
atms-web/src/main/webapp/app/common/controls/edit-equity-change-modal/edit-equity-change-modal.ctrl.js
View file @ 40f27bbd
commonModule. commonModule.controller('editEquityChangeModalController', ['$scope', '$log', '$translate', 'uiGridConstants', '$location', '$timeout', '$interval', 'areaRegionService', '$filter', 'SweetAlert', 'regionService', 'orgService', 'enterpriseAccountService', 'organizationStructureService', 'businessUnitService', 'projectService', 'dimensionService', 'equityService',
controller('editEquityChangeModalController', ['$scope', '$log', '$translate', 'uiGridConstants', '$location', '$timeout', '$interval', 'areaRegionService', '$filter', 'SweetAlert', 'regionService', 'orgService', 'enterpriseAccountService', 'organizationStructureService', 'businessUnitService', 'projectService', 'dimensionService','equityService', function ($scope, $log, $translate, uiGridConstants, $location, $timeout, $interval, areaRegionService, $filter, SweetAlert, regionService, orgService, enterpriseAccountService, organizationStructureService, businessUnitService, projectService, dimensionService, equityService) {
function ($scope, $log, $translate, uiGridConstants, $location, $timeout, $interval, areaRegionService, $filter, SweetAlert, regionService, orgService, enterpriseAccountService, organizationStructureService, businessUnitService, projectService, dimensionService,equityService) {
var selectedModel = '.editEquityChangeControlPop'; //'#addOrgControlPop' + $scope.dimensionId; var selectedModel = '.editEquityChangeControlPop'; //'#addOrgControlPop' + $scope.dimensionId;
...@@ -21,12 +20,12 @@ controller('editEquityChangeModalController', ['$scope', '$log', '$translate', ' ...@@ -21,12 +20,12 @@ controller('editEquityChangeModalController', ['$scope', '$log', '$translate', '
}; };
$scope.nameKeyUp = function(){ $scope.nameKeyUp = function () {
var hasSpecialChar = window.PWC.hasSpecialChar($scope.editEquityModel.name); var hasSpecialChar = window.PWC.hasSpecialChar($scope.editEquityModel.name);
if (hasSpecialChar){ if (hasSpecialChar) {
$scope.editEquityModel.nameError = $translate.instant('SpecialChar'); $scope.editEquityModel.nameError = $translate.instant('SpecialChar');
} else{ } else {
$scope.editEquityModel.nameError = null; $scope.editEquityModel.nameError = null;
} }
}; };
...@@ -41,8 +40,8 @@ controller('editEquityChangeModalController', ['$scope', '$log', '$translate', ' ...@@ -41,8 +40,8 @@ controller('editEquityChangeModalController', ['$scope', '$log', '$translate', '
rows[i].data.organizationId = $scope.editOrgModel.id; rows[i].data.organizationId = $scope.editOrgModel.id;
updateEquity.push(rows[i].data); updateEquity.push(rows[i].data);
} }
var comment = $scope.editOrgModel.comment?$scope.editOrgModel.comment:''; var comment = $scope.editOrgModel.comment ? $scope.editOrgModel.comment : '';
equityService.change($scope.editOrgModel.name,comment,updateEquity).success(function (data) { equityService.change($scope.editOrgModel.name, comment, updateEquity).success(function (data) {
if (data && !data.result) { if (data && !data.result) {
//SweetAlert.info("Disable", orgId); //SweetAlert.info("Disable", orgId);
SweetAlert.warning($translate.instant(data.resultMsg)); SweetAlert.warning($translate.instant(data.resultMsg));
...@@ -70,25 +69,25 @@ controller('editEquityChangeModalController', ['$scope', '$log', '$translate', ' ...@@ -70,25 +69,25 @@ controller('editEquityChangeModalController', ['$scope', '$log', '$translate', '
}, },
columns: [ columns: [
{ {
dataField : "id", dataField: "id",
visible : false, visible: false,
allowHeaderFiltering:false allowHeaderFiltering: false
}, },
{ {
dataField: "eNum", dataField: "eNum",
visible : false, visible: false,
sortOrder: "asc", sortOrder: "asc",
allowHeaderFiltering:false allowHeaderFiltering: false
}, },
{ {
dataField: "organizationId", dataField: "organizationId",
visible : false, visible: false,
allowHeaderFiltering:false allowHeaderFiltering: false
}, },
{ {
dataField: "investorName", dataField: "investorName",
caption: $translate.instant('InvestorName'), caption: $translate.instant('InvestorName'),
allowHeaderFiltering:false allowHeaderFiltering: false
}, },
{ {
dataField: "investorEconomicNature", dataField: "investorEconomicNature",
...@@ -163,30 +162,29 @@ controller('editEquityChangeModalController', ['$scope', '$log', '$translate', ' ...@@ -163,30 +162,29 @@ controller('editEquityChangeModalController', ['$scope', '$log', '$translate', '
], ],
onContentReady: function (e) { onContentReady: function (e) {
$scope.equityListInstance = e.component; $scope.equityListInstance = e.component;
var totalCount =e.component.totalCount(); var totalCount = e.component.totalCount();
if(totalCount>0) if (totalCount > 0) {
{ $scope.totalCount = totalCount;
$scope.totalCount=totalCount;
} }
}, },
onEditingStart: function(e) { onEditingStart: function (e) {
}, },
onInitNewRow: function(e) { onInitNewRow: function (e) {
}, },
onRowInserting: function(e) { onRowInserting: function (e) {
SweetAlert.success($translate.instant('ClickEnsureTip')); SweetAlert.success($translate.instant('ClickEnsureTip'));
}, },
onRowInserted: function(e) { onRowInserted: function (e) {
}, },
onRowUpdating: function(e) { onRowUpdating: function (e) {
SweetAlert.success($translate.instant('ClickEnsureTip')); SweetAlert.success($translate.instant('ClickEnsureTip'));
}, },
onRowUpdated: function(e) { onRowUpdated: function (e) {
}, },
onRowRemoving: function(e) { onRowRemoving: function (e) {
SweetAlert.success($translate.instant('ClickEnsureTip')); SweetAlert.success($translate.instant('ClickEnsureTip'));
}, },
onRowRemoved: function(e) { onRowRemoved: function (e) {
}, },
loadPanel: { loadPanel: {
enabled: false enabled: false
...@@ -257,10 +255,10 @@ controller('editEquityChangeModalController', ['$scope', '$log', '$translate', ' ...@@ -257,10 +255,10 @@ controller('editEquityChangeModalController', ['$scope', '$log', '$translate', '
$(selectedModel).modal('show'); $(selectedModel).modal('show');
}; };
var refreshEquity = function (orgId){ var refreshEquity = function (orgId) {
equityService.getEquityList(orgId).success(function (equityData) { equityService.getEquityList(orgId).success(function (equityData) {
$scope.EquityList = equityData; $scope.EquityList = equityData;
if(equityData){ if (equityData) {
$scope.equityId = equityData[0].id; $scope.equityId = equityData[0].id;
} }
// $scope.equityInfoGridOptions.bindingOptions.dataSource.reload(); // $scope.equityInfoGridOptions.bindingOptions.dataSource.reload();
......
atms-web/src/main/webapp/app/common/controls/edit-equity-modal/edit-equity-modal.ctrl.js
View file @ 40f27bbd
...@@ -125,6 +125,7 @@ controller('editEquityModalController', ['$scope', '$log', '$translate', 'uiGrid ...@@ -125,6 +125,7 @@ controller('editEquityModalController', ['$scope', '$log', '$translate', 'uiGrid
}, },
{ {
dataField: "payableShareholderIdNum", dataField: "payableShareholderIdNum",
visible : false,
caption: $translate.instant('PayableShareholderIdNum'), caption: $translate.instant('PayableShareholderIdNum'),
allowHeaderFiltering: false allowHeaderFiltering: false
}, },
......
atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.ctrl.js
View file @ 40f27bbd
...@@ -198,7 +198,14 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', ' ...@@ -198,7 +198,14 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
return false; return false;
} }
}); });
} };
$('.orgAreaRequired').each( function (index,ele){
if(null==ele.innerText||""===ele.innerText){
SweetAlert.error("请检查必填项");
fail = true;
return false;
}
});
if(fail) return; if(fail) return;
...@@ -481,6 +488,7 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', ' ...@@ -481,6 +488,7 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
}); });
$scope.editOrgModel = orgData; $scope.editOrgModel = orgData;
$scope.editOrgModel.foundationDate=($filter('date')(new Date($scope.editOrgModel.foundationDate), "yyyy-MM-dd"));
// 设置地区 // 设置地区
loadProvinceList(); loadProvinceList();
...@@ -513,6 +521,7 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', ' ...@@ -513,6 +521,7 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
if($scope.isInternational){ if($scope.isInternational){
$('.localRequired').removeAttr("required"); $('.localRequired').removeAttr("required");
$('.orgAreaRequired').removeAttr("required");
} }
// set first active page is basic info // set first active page is basic info
...@@ -955,6 +964,19 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', ' ...@@ -955,6 +964,19 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
// 说明 // 说明
$scope.resources = { $scope.resources = {
OrganizationName: $translate.instant('OrganizationName'), OrganizationName: $translate.instant('OrganizationName'),
OrganizationNameEn: $translate.instant('OrganizationNameEn'),
RegistrationCapital: $translate.instant('RegistrationCapital'),
LegalPersonName: $translate.instant('LegalPersonName'),
NumOfBranches: $translate.instant('NumOfBranches'),
BusinessScope: $translate.instant('BusinessScope'),
UnifiedSocialCreditCode: $translate.instant('UnifiedSocialCreditCode'),
Abbreviation: $translate.instant('Abbreviation'),
RegistrationLocationEn: $translate.instant('RegistrationLocationEn'),
PaidInCapital: $translate.instant('PaidInCapital'),
FoundationDate: $translate.instant('FoundationDate'),
registrationLocation: $translate.instant('RegistrationLocation'),
OrganizationMsgNameRequired: $translate.instant('OrganizationMsgNameRequired'), OrganizationMsgNameRequired: $translate.instant('OrganizationMsgNameRequired'),
OrganizationParent: $translate.instant('OrganizationParent'), OrganizationParent: $translate.instant('OrganizationParent'),
OrganizationLevelType: $translate.instant('OrganizationLevelType'), OrganizationLevelType: $translate.instant('OrganizationLevelType'),
...@@ -1057,12 +1079,14 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', ' ...@@ -1057,12 +1079,14 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
$scope.isLocal = false; $scope.isLocal = false;
$scope.isInternational = true; $scope.isInternational = true;
$('.localRequired').removeAttr("required"); $('.localRequired').removeAttr("required");
$('.orgAreaRequired').removeAttr("required");
}; };
$scope.changeLocal = function () { $scope.changeLocal = function () {
$scope.isLocal = true; $scope.isLocal = true;
$scope.isInternational = false; $scope.isInternational = false;
$('.localRequired').attr("required",true); $('.localRequired').attr("required",true);
$('.orgAreaRequired').attr("required",true);
}; };
// 强制刷新机构控件里的机构 // 强制刷新机构控件里的机构
...@@ -1094,6 +1118,7 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', ' ...@@ -1094,6 +1118,7 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
$scope.trueFalse = constant.trueFalse; $scope.trueFalse = constant.trueFalse;
$scope.countryCNList = constant.countryCNList; $scope.countryCNList = constant.countryCNList;
$('.localRequired').attr("required",true); $('.localRequired').attr("required",true);
$('.orgAreaRequired').attr("required",true);
// $('.localRequired').attr("required","true"); required="required" // $('.localRequired').attr("required","true"); required="required"
}; };
......
atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.less
View file @ 40f27bbd
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
.btn-default { .btn-default {
height: 33px; height: 33px;
width: 250px;
} }
input { input {
......
atms-web/src/main/webapp/app/common/utils/constant.js
View file @ 40f27bbd
...@@ -1486,7 +1486,7 @@ constant.TaxpayerQualificationTypeList = [ ...@@ -1486,7 +1486,7 @@ constant.TaxpayerQualificationTypeList = [
constant.RegStatusList = [ constant.RegStatusList = [
{code: 0, type: "存续"}, {code: 0, type: "存续"},
{code: 1, type: "存续中"}, {code: 1, type: "注销中"},
{code: 2, type: "已注销"} {code: 2, type: "已注销"}
]; ];
......
atms-web/src/main/webapp/app/framework/app-usr-operate-log/app-usr-operate-log.ctrl.js
View file @ 40f27bbd
...@@ -19,6 +19,10 @@ frameworkModule.controller('appUsrOperateLogController', ...@@ -19,6 +19,10 @@ frameworkModule.controller('appUsrOperateLogController',
} }
}); });
} }
if($scope.thisModuleId.length===0){
SweetAlert.warning($translate.instant("NeedChecked"));
return;
}
var config = { var config = {
// params: { // params: {
"ids":$scope.thisModuleId "ids":$scope.thisModuleId
...@@ -32,6 +36,11 @@ frameworkModule.controller('appUsrOperateLogController', ...@@ -32,6 +36,11 @@ frameworkModule.controller('appUsrOperateLogController',
$scope.dataGridUpdate(data); $scope.dataGridUpdate(data);
$scope.thisModuleId=[];//清空查询id $scope.thisModuleId=[];//清空查询id
}) })
if(!$("#usrOperateLogPop").length){
var usrOperateLogPopTemp = $($("#usrOperateLogPopContainer").html());
$("body").append($compile(usrOperateLogPopTemp)($scope));
}
$("#usrOperateLogPop").modal("show");
}; };
// $scope.sniffHelpPopRadio = function(){ // $scope.sniffHelpPopRadio = function(){
// taxDocumentListService.getDocumentsAttrAndType({params: {}}).then(function (data) { // taxDocumentListService.getDocumentsAttrAndType({params: {}}).then(function (data) {
...@@ -182,11 +191,6 @@ frameworkModule.controller('appUsrOperateLogController', ...@@ -182,11 +191,6 @@ frameworkModule.controller('appUsrOperateLogController',
$scope.openUsrOperateLogPop = function(){ $scope.openUsrOperateLogPop = function(){
$scope.loadMainData(); $scope.loadMainData();
if(!$("#usrOperateLogPop").length){
var usrOperateLogPopTemp = $($("#usrOperateLogPopContainer").html());
$("body").append($compile(usrOperateLogPopTemp)($scope));
}
$("#usrOperateLogPop").modal("show");
}; };
$scope.hideUsrOperateLogPop = function(){ $scope.hideUsrOperateLogPop = function(){
$("#usrOperateLogPop").modal("hide"); $("#usrOperateLogPop").modal("hide");
......
atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.ctrl.js
View file @ 40f27bbd
...@@ -329,7 +329,54 @@ taxDocumentManageModule.controller('taxDocumentListController', ...@@ -329,7 +329,54 @@ taxDocumentManageModule.controller('taxDocumentListController',
} }
}; };
}; };
$scope.changeDateRangeError=function(){
var items=$scope.queryFieldModel;
if (!PWC.isNullOrEmpty(items.fileBeginTime) && !PWC.isNullOrEmpty(items.fileEndTTime) &&
items.fileBeginTime > items.fileEndTTime)
{
SweetAlert.warning($translate.instant('DateWarningSearch'));
}
if (!PWC.isNullOrEmpty(items.ownBeginTime) && !PWC.isNullOrEmpty(items.ownEndTime) &&
items.ownBeginTime > items.ownEndTime)
{
SweetAlert.warning($translate.instant('DateWarningSearch'));
}
if (!PWC.isNullOrEmpty(items.effectiveBeginTime) && !PWC.isNullOrEmpty(items.effectiveEndTime) &&
items.effectiveBeginTime > items.effectiveEndTime)
{
SweetAlert.warning($translate.instant('DateWarningSearch'));
}
if (!PWC.isNullOrEmpty(items.uploadBeginTime) && !PWC.isNullOrEmpty(items.uploadEndTime) &&
items.uploadBeginTime > items.uploadEndTime)
{
SweetAlert.warning($translate.instant('DateWarningSearch'));
}
if (!PWC.isNullOrEmpty(items.fileTime) && !PWC.isNullOrEmpty(items.effectiveTime) &&
items.fileTime > items.effectiveTime)
{
SweetAlert.warning($translate.instant('DateWarningSearch'));
}
};
$scope.changeFieldModel=function(){
//新建记录
items=$scope.editFieldModel;
if (!PWC.isNullOrEmpty(items.fileTime) && !PWC.isNullOrEmpty(items.effectiveTime) &&
items.fileTime > items.effectiveTime)
{
SweetAlert.warning($translate.instant('FileTimeDateRangeError'));
}
};
$scope.changeFieldItem=function(){
//批量上传
items=$scope.editFieldItem;
if (!PWC.isNullOrEmpty(items.fileTime) && !PWC.isNullOrEmpty(items.effectiveTime) &&
items.fileTime > items.effectiveTime)
{
SweetAlert.warning($translate.instant('FileTimeDateRangeError'));
}
};
//弹出框 //弹出框
$scope.isCreatePop = false; $scope.isCreatePop = false;
var openSimpleUploadPop = function (rowId) { var openSimpleUploadPop = function (rowId) {
...@@ -370,7 +417,7 @@ taxDocumentManageModule.controller('taxDocumentListController', ...@@ -370,7 +417,7 @@ taxDocumentManageModule.controller('taxDocumentListController',
var simpleUploadSubmit = function () { var simpleUploadSubmit = function () {
var params = angular.copy($scope.editFieldModel); var params = angular.copy($scope.editFieldModel);
if (!PWC.isNullOrEmpty(params.fileTime) && !PWC.isNullOrEmpty(params.fileTime) && if (!PWC.isNullOrEmpty(params.fileTime) && !PWC.isNullOrEmpty(params.effectiveTime) &&
params.fileTime > params.effectiveTime) params.fileTime > params.effectiveTime)
{ {
window.swal($translate.instant('FileTimeDateRangeError')); window.swal($translate.instant('FileTimeDateRangeError'));
...@@ -494,7 +541,7 @@ taxDocumentManageModule.controller('taxDocumentListController', ...@@ -494,7 +541,7 @@ taxDocumentManageModule.controller('taxDocumentListController',
params.filePositionUrl = encodeURIComponent(params.filePositionUrl); params.filePositionUrl = encodeURIComponent(params.filePositionUrl);
taxDocumentListService.verifyDuplicate(params).then(function (result) { taxDocumentListService.verifyDuplicate(params).then(function (result) {
// 例如 修改1为1 不用弹框 修改1本身就好 但是修改1为2 ,就要去掉1并修改2(保留2的id) // 例如 修改1为1 不用弹框 修改1本身就好 但是修改1为2 ,就要去掉1并修改2(保留2的id)
if (result.id==fieldModel.id) { if ((result.id==null|| result.id==undefined)|| (result.id==fieldModel.id)) {
editRecord_Post(fieldModel,type); editRecord_Post(fieldModel,type);
}else{ }else{
var hisCellId=result.id; var hisCellId=result.id;
...@@ -1094,6 +1141,12 @@ taxDocumentManageModule.directive('multiFileUploader', function () { ...@@ -1094,6 +1141,12 @@ taxDocumentManageModule.directive('multiFileUploader', function () {
// $scope.isRequired = function (IT8nField) { // $scope.isRequired = function (IT8nField) {
// return $scope.requiredField.indexOf($translate.instant(IT8nField)) > -1; // return $scope.requiredField.indexOf($translate.instant(IT8nField)) > -1;
// }; // };
if (!PWC.isNullOrEmpty(modelItem.fileTime) && !PWC.isNullOrEmpty(modelItem.effectiveTime) &&
modelItem.fileTime > modelItem.effectiveTime)
{
alertText = $translate.instant("Document") + (i + 1) + "," + "【"+$translate.instant('FileTimeDateRangeError')+"】";
break;
}
if(!modelItem.companyName && $scope.isRequired($translate.instant("CompanyName"))){ if(!modelItem.companyName && $scope.isRequired($translate.instant("CompanyName"))){
alertText += "【"+$translate.instant("CompanyName")+"】" alertText += "【"+$translate.instant("CompanyName")+"】"
} }
...@@ -1711,16 +1764,20 @@ taxDocumentManageModule.directive('tempModule', function () { ...@@ -1711,16 +1764,20 @@ taxDocumentManageModule.directive('tempModule', function () {
controller: ['$scope', 'taxDocumentListService', '$translate', controller: ['$scope', 'taxDocumentListService', '$translate',
function ($scope, taxDocumentListService, $translate) { function ($scope, taxDocumentListService, $translate) {
//税种 //税种
$scope.taxTypeSelects = [ $scope.taxTypeSelects = [];
"纳税申报表", angular.forEach(constant.GroupTypeList, function (item) {
"税票", $scope.taxTypeSelects.push(item.type);
"企业所得税", });
"印花税", // $scope.taxTypeSelects = [
"附加税", // "纳税申报表",
"代扣代缴税", // "税票",
"其它税", // "企业所得税",
"增值税", // "印花税",
]; // "附加税",
// "代扣代缴税",
// "其它税",
// "增值税",
// ];
//审批状态 //审批状态
$scope.auditSelectsMap = { $scope.auditSelectsMap = {
"0":"待审批", "0":"待审批",
......
atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.html
View file @ 40f27bbd
...@@ -415,11 +415,11 @@ ...@@ -415,11 +415,11 @@
<!--<input type="text" class="form-control radius3"--> <!--<input type="text" class="form-control radius3"-->
<!--ng-model="queryFieldModel.AvailabilityDate"/>--> <!--ng-model="queryFieldModel.AvailabilityDate"/>-->
<!--<input type="text" class="form-control radius3" id="period-picker1"/>--> <!--<input type="text" class="form-control radius3" id="period-picker1"/>-->
<input type='text' placeholder="From" <input type='text' placeholder="From" ng-change="changeDateRangeError()"
date-time-picker class="form-control TDL-query-val-multi" date-time-picker class="form-control TDL-query-val-multi"
data-date-format="yyyy/mm/dd" ng-model="queryFieldModel.fileBeginTime" data-date-format="yyyy/mm/dd" ng-model="queryFieldModel.fileBeginTime"
data-min-view-mode="0" /> data-min-view-mode="0" />
<input type='text' placeholder="To" <input type='text' placeholder="To" ng-change="changeDateRangeError()"
date-time-picker class="form-control TDL-query-val-multi" date-time-picker class="form-control TDL-query-val-multi"
data-date-format="yyyy/mm/dd" ng-model="queryFieldModel.fileEndTTime" data-date-format="yyyy/mm/dd" ng-model="queryFieldModel.fileEndTTime"
data-min-view-mode="0" /> data-min-view-mode="0" />
...@@ -433,11 +433,11 @@ ...@@ -433,11 +433,11 @@
<div class="TDL-query-val"> <div class="TDL-query-val">
<!--<input type="text" class="form-control radius3"--> <!--<input type="text" class="form-control radius3"-->
<!--ng-model="queryFieldModel.Duration"/>--> <!--ng-model="queryFieldModel.Duration"/>-->
<input type='text' placeholder="From" <input type='text' placeholder="From" ng-change="changeDateRangeError()"
date-time-picker class="form-control TDL-query-val-multi" date-time-picker class="form-control TDL-query-val-multi"
data-date-format="yyyymm" ng-model="queryFieldModel.ownBeginTime" data-date-format="yyyymm" ng-model="queryFieldModel.ownBeginTime"
data-min-view-mode="1"/> data-min-view-mode="1"/>
<input type='text' placeholder="To" <input type='text' placeholder="To" ng-change="changeDateRangeError()"
date-time-picker class="form-control TDL-query-val-multi" date-time-picker class="form-control TDL-query-val-multi"
data-date-format="yyyymm" ng-model="queryFieldModel.ownEndTime" data-date-format="yyyymm" ng-model="queryFieldModel.ownEndTime"
data-min-view-mode="1"/> data-min-view-mode="1"/>
...@@ -497,11 +497,11 @@ ...@@ -497,11 +497,11 @@
<div class="TDL-query-val"> <div class="TDL-query-val">
<!--<input type="text" class="form-control radius3"--> <!--<input type="text" class="form-control radius3"-->
<!--ng-model="queryFieldModel.DueDate"/>--> <!--ng-model="queryFieldModel.DueDate"/>-->
<input type='text' placeholder="From" <input type='text' placeholder="From" ng-change="changeDateRangeError()"
date-time-picker class="form-control TDL-query-val-multi" date-time-picker class="form-control TDL-query-val-multi"
data-date-format="yyyy/mm/dd" ng-model="queryFieldModel.effectiveBeginTime" data-date-format="yyyy/mm/dd" ng-model="queryFieldModel.effectiveBeginTime"
data-min-view-mode="0"/> data-min-view-mode="0"/>
<input type='text' placeholder="To" <input type='text' placeholder="To" ng-change="changeDateRangeError()"
date-time-picker class="form-control TDL-query-val-multi" date-time-picker class="form-control TDL-query-val-multi"
data-date-format="yyyy/mm/dd" ng-model="queryFieldModel.effectiveEndTime" data-date-format="yyyy/mm/dd" ng-model="queryFieldModel.effectiveEndTime"
data-min-view-mode="0"/> data-min-view-mode="0"/>
...@@ -583,11 +583,11 @@ ...@@ -583,11 +583,11 @@
<!--<input type="text" class="form-control radius3"--> <!--<input type="text" class="form-control radius3"-->
<!--ng-model="queryFieldModel.UploadDate"/>--> <!--ng-model="queryFieldModel.UploadDate"/>-->
<!--<input type="text" class="form-control radius3" id="period-picker4" />--> <!--<input type="text" class="form-control radius3" id="period-picker4" />-->
<input type='text' placeholder="From" <input type='text' placeholder="From" ng-change="changeDateRangeError()"
date-time-picker class="form-control TDL-query-val-multi" date-time-picker class="form-control TDL-query-val-multi"
data-date-format="yyyy/mm/dd" ng-model="queryFieldModel.uploadBeginTime" data-date-format="yyyy/mm/dd" ng-model="queryFieldModel.uploadBeginTime"
data-min-view-mode="0"/> data-min-view-mode="0"/>
<input type='text' placeholder="To" <input type='text' placeholder="To" ng-change="changeDateRangeError()"
date-time-picker class="form-control TDL-query-val-multi" date-time-picker class="form-control TDL-query-val-multi"
data-date-format="yyyy/mm/dd" ng-model="queryFieldModel.uploadEndTime" data-date-format="yyyy/mm/dd" ng-model="queryFieldModel.uploadEndTime"
data-min-view-mode="0"/> data-min-view-mode="0"/>
...@@ -817,7 +817,7 @@ ...@@ -817,7 +817,7 @@
</label> </label>
<div class="col-sm-11" style="width:61.67%"> <div class="col-sm-11" style="width:61.67%">
<input type='text' placeholder="{{'PleaseSelected' | translate}}" date-time-picker <input type='text' placeholder="{{'PleaseSelected' | translate}}" date-time-picker
data-date-format="yyyy/mm/dd" data-date-format="yyyy/mm/dd" ng-change="changeFieldModel()"
ng-required="isRequired('AvailabilityDate')" ng-required="isRequired('AvailabilityDate')"
class="form-control" ng-model="editFieldModel.fileTime"/> class="form-control" ng-model="editFieldModel.fileTime"/>
</div> </div>
...@@ -830,7 +830,7 @@ ...@@ -830,7 +830,7 @@
<div class="col-sm-11" style="width:61.67%"> <div class="col-sm-11" style="width:61.67%">
<input type='text' placeholder="{{'PleaseSelected' | translate}}" date-time-picker <input type='text' placeholder="{{'PleaseSelected' | translate}}" date-time-picker
data-date-format="yyyy/mm/dd" data-date-format="yyyy/mm/dd"
ng-required="isRequired('DueDate')" ng-required="isRequired('DueDate')" ng-change="changeFieldModel()"
class="form-control" ng-model="editFieldModel.effectiveTime"/> class="form-control" ng-model="editFieldModel.effectiveTime"/>
</div> </div>
</div> </div>
...@@ -1057,7 +1057,7 @@ ...@@ -1057,7 +1057,7 @@
{{'AvailabilityDate' | translate}} {{'AvailabilityDate' | translate}}
</label> </label>
<div class="col-sm-11" style="width:61.67%"> <div class="col-sm-11" style="width:61.67%">
<input type='text' placeholder="{{'PleaseSelected' | translate}}" <input type='text' placeholder="{{'PleaseSelected' | translate}}" ng-change="changeFieldItem()"
ng-class="{'upload-fail-mark':isRequired('AvailabilityDate') && !editFieldItem.fileTime}" ng-class="{'upload-fail-mark':isRequired('AvailabilityDate') && !editFieldItem.fileTime}"
date-time-picker data-date-format="yyyy/mm/dd" date-time-picker data-date-format="yyyy/mm/dd"
class="form-control" ng-model="editFieldItem.fileTime"/> class="form-control" ng-model="editFieldItem.fileTime"/>
...@@ -1069,7 +1069,7 @@ ...@@ -1069,7 +1069,7 @@
{{'DueDate' | translate}} {{'DueDate' | translate}}
</label> </label>
<div class="col-sm-11" style="width:61.67%"> <div class="col-sm-11" style="width:61.67%">
<input type='text' placeholder="{{'PleaseSelected' | translate}}" <input type='text' placeholder="{{'PleaseSelected' | translate}}" ng-change="changeFieldItem()"
ng-class="{'upload-fail-mark':isRequired('DueDate') && !editFieldItem.effectiveTime}" ng-class="{'upload-fail-mark':isRequired('DueDate') && !editFieldItem.effectiveTime}"
date-time-picker data-date-format="yyyy/mm/dd" date-time-picker data-date-format="yyyy/mm/dd"
class="form-control" ng-model="editFieldItem.effectiveTime"/> class="form-control" ng-model="editFieldItem.effectiveTime"/>
......
atms-web/src/main/webapp/orangeweb/index.html
View file @ 40f27bbd
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title>didi2</title><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Material+Icons"><link href=js/about.17654e8a.js rel=prefetch><link href=css/app.cf16809e.css rel=preload as=style><link href=css/chunk-vendors.2f35f377.css rel=preload as=style><link href=js/app.2a94701c.js rel=preload as=script><link href=js/chunk-vendors.39b13767.js rel=preload as=script><link href=css/chunk-vendors.2f35f377.css rel=stylesheet><link href=css/app.cf16809e.css rel=stylesheet></head><body><noscript><strong>We're sorry but didi2 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.39b13767.js></script><script src=js/app.2a94701c.js></script></body></html> <!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title>didi2</title><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Material+Icons"><link href=js/about.17654e8a.js rel=prefetch><link href=css/app.cf16809e.css rel=preload as=style><link href=css/chunk-vendors.2f35f377.css rel=preload as=style><link href=js/app.c8b0fed0.js rel=preload as=script><link href=js/chunk-vendors.39b13767.js rel=preload as=script><link href=css/chunk-vendors.2f35f377.css rel=stylesheet><link href=css/app.cf16809e.css rel=stylesheet></head><body><noscript><strong>We're sorry but didi2 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.39b13767.js></script><script src=js/app.c8b0fed0.js></script></body></html>
\ No newline at end of file \ No newline at end of file
atms-web/src/test/draft.properties
View file @ 40f27bbd
...@@ -80,3 +80,47 @@ ...@@ -80,3 +80,47 @@
# #
##税种未返还税金
#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_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_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_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_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_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_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
#
##业务线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_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_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_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_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_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_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_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
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