Skip to content

T
traffic-front
Commit 95d03507 authored by gary's avatar gary
Browse files
Options

1、前端表单调整 

// todo
1、机构国际化修改
2、其他信息补充日志
parent b3ee68f4
Hide whitespace changes
Inline Side-by-side
Showing with 87 additions and 229 deletions
atms-api/src/main/java/pwc/taxtech/atms/dto/organization/OrganizationReturnRateDto.java
View file @ 95d03507
...@@ -57,7 +57,7 @@ public class OrganizationReturnRateDto implements Serializable { ...@@ -57,7 +57,7 @@ public class OrganizationReturnRateDto implements Serializable {
* *
* @mbg.generated * @mbg.generated
*/ */
private Byte returnRate; private Float returnRate;
/** /**
* Database Column Remarks: * Database Column Remarks:
...@@ -180,7 +180,7 @@ public class OrganizationReturnRateDto implements Serializable { ...@@ -180,7 +180,7 @@ public class OrganizationReturnRateDto implements Serializable {
* *
* @mbg.generated * @mbg.generated
*/ */
public Byte getReturnRate() { public Float getReturnRate() {
return returnRate; return returnRate;
} }
...@@ -192,7 +192,7 @@ public class OrganizationReturnRateDto implements Serializable { ...@@ -192,7 +192,7 @@ public class OrganizationReturnRateDto implements Serializable {
* *
* @mbg.generated * @mbg.generated
*/ */
public void setReturnRate(Byte returnRate) { public void setReturnRate(Float returnRate) {
this.returnRate = returnRate; this.returnRate = returnRate;
} }
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/OrgExtraServiceImpl.java
View file @ 95d03507
...@@ -47,7 +47,7 @@ public class OrgExtraServiceImpl extends BaseService{ ...@@ -47,7 +47,7 @@ public class OrgExtraServiceImpl extends BaseService{
OrganizationInvoice organizationInvoice = new OrganizationInvoice(); OrganizationInvoice organizationInvoice = new OrganizationInvoice();
beanUtil.copyProperties(oid,organizationInvoice); beanUtil.copyProperties(oid,organizationInvoice);
organizationInvoice.setId(idService.nextId()); organizationInvoice.setId(idService.nextId());
organizationInvoiceMapper.insert(organizationInvoice); organizationInvoiceMapper.insertSelective(organizationInvoice);
}); });
return new OperationResultDto(true); return new OperationResultDto(true);
} }
...@@ -87,7 +87,7 @@ public class OrgExtraServiceImpl extends BaseService{ ...@@ -87,7 +87,7 @@ public class OrgExtraServiceImpl extends BaseService{
OrganizationAccountingRate organizationAccountingRate = new OrganizationAccountingRate(); OrganizationAccountingRate organizationAccountingRate = new OrganizationAccountingRate();
beanUtil.copyProperties(oard,organizationAccountingRate); beanUtil.copyProperties(oard,organizationAccountingRate);
organizationAccountingRate.setId(idService.nextId()); organizationAccountingRate.setId(idService.nextId());
organizationAccountingRateMapper.insert(organizationAccountingRate); organizationAccountingRateMapper.insertSelective(organizationAccountingRate);
}); });
return new OperationResultDto(true); return new OperationResultDto(true);
} }
...@@ -127,7 +127,7 @@ public class OrgExtraServiceImpl extends BaseService{ ...@@ -127,7 +127,7 @@ public class OrgExtraServiceImpl extends BaseService{
OrganizationReturnRate organizationReturnRate = new OrganizationReturnRate(); OrganizationReturnRate organizationReturnRate = new OrganizationReturnRate();
beanUtil.copyProperties(orrd,organizationReturnRate); beanUtil.copyProperties(orrd,organizationReturnRate);
organizationReturnRate.setId(idService.nextId()); organizationReturnRate.setId(idService.nextId());
organizationReturnRateMapper.insert(organizationReturnRate); organizationReturnRateMapper.insertSelective(organizationReturnRate);
}); });
return new OperationResultDto(true); return new OperationResultDto(true);
} }
...@@ -167,7 +167,7 @@ public class OrgExtraServiceImpl extends BaseService{ ...@@ -167,7 +167,7 @@ public class OrgExtraServiceImpl extends BaseService{
OrganizationApprovedLevyInfo organizationApprovedLevyInfo = new OrganizationApprovedLevyInfo(); OrganizationApprovedLevyInfo organizationApprovedLevyInfo = new OrganizationApprovedLevyInfo();
beanUtil.copyProperties(oali,organizationApprovedLevyInfo); beanUtil.copyProperties(oali,organizationApprovedLevyInfo);
organizationApprovedLevyInfo.setId(idService.nextId()); organizationApprovedLevyInfo.setId(idService.nextId());
organizationApprovedLevyInfoMapper.insert(organizationApprovedLevyInfo); organizationApprovedLevyInfoMapper.insertSelective(organizationApprovedLevyInfo);
}); });
return new OperationResultDto(true); return new OperationResultDto(true);
} }
...@@ -207,7 +207,7 @@ public class OrgExtraServiceImpl extends BaseService{ ...@@ -207,7 +207,7 @@ public class OrgExtraServiceImpl extends BaseService{
OrganizationTaxOfficer organizationTaxOfficer = new OrganizationTaxOfficer(); OrganizationTaxOfficer organizationTaxOfficer = new OrganizationTaxOfficer();
beanUtil.copyProperties(oali,organizationTaxOfficer); beanUtil.copyProperties(oali,organizationTaxOfficer);
organizationTaxOfficer.setId(idService.nextId()); organizationTaxOfficer.setId(idService.nextId());
organizationTaxOfficerMapper.insert(organizationTaxOfficer); organizationTaxOfficerMapper.insertSelective(organizationTaxOfficer);
}); });
return new OperationResultDto(true); return new OperationResultDto(true);
} }
...@@ -247,7 +247,7 @@ public class OrgExtraServiceImpl extends BaseService{ ...@@ -247,7 +247,7 @@ public class OrgExtraServiceImpl extends BaseService{
OrganizationTaxRule organizationTaxRule = new OrganizationTaxRule(); OrganizationTaxRule organizationTaxRule = new OrganizationTaxRule();
beanUtil.copyProperties(otrd,organizationTaxRule); beanUtil.copyProperties(otrd,organizationTaxRule);
organizationTaxRule.setId(idService.nextId()); organizationTaxRule.setId(idService.nextId());
organizationTaxRuleMapper.insert(organizationTaxRule); organizationTaxRuleMapper.insertSelective(organizationTaxRule);
}); });
return new OperationResultDto(true); return new OperationResultDto(true);
} }
......
atms-dao/src/main/java/pwc/taxtech/atms/dao/OrganizationReturnRateMapper.java
View file @ 95d03507
...@@ -4,13 +4,11 @@ import java.util.List; ...@@ -4,13 +4,11 @@ import java.util.List;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.session.RowBounds; import org.apache.ibatis.session.RowBounds;
import org.springframework.stereotype.Repository;
import pwc.taxtech.atms.MyMapper; import pwc.taxtech.atms.MyMapper;
import pwc.taxtech.atms.entity.OrganizationReturnRate; import pwc.taxtech.atms.entity.OrganizationReturnRate;
import pwc.taxtech.atms.entity.OrganizationReturnRateExample; import pwc.taxtech.atms.entity.OrganizationReturnRateExample;
@Mapper @Mapper
@Repository
public interface OrganizationReturnRateMapper extends MyMapper { public interface OrganizationReturnRateMapper extends MyMapper {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
......
atms-dao/src/main/java/pwc/taxtech/atms/entity/OrganizationReturnRate.java
View file @ 95d03507
...@@ -53,7 +53,7 @@ public class OrganizationReturnRate implements Serializable { ...@@ -53,7 +53,7 @@ public class OrganizationReturnRate implements Serializable {
* *
* @mbg.generated * @mbg.generated
*/ */
private Byte returnRate; private Float returnRate;
/** /**
* Database Column Remarks: * Database Column Remarks:
...@@ -176,7 +176,7 @@ public class OrganizationReturnRate implements Serializable { ...@@ -176,7 +176,7 @@ public class OrganizationReturnRate implements Serializable {
* *
* @mbg.generated * @mbg.generated
*/ */
public Byte getReturnRate() { public Float getReturnRate() {
return returnRate; return returnRate;
} }
...@@ -188,7 +188,7 @@ public class OrganizationReturnRate implements Serializable { ...@@ -188,7 +188,7 @@ public class OrganizationReturnRate implements Serializable {
* *
* @mbg.generated * @mbg.generated
*/ */
public void setReturnRate(Byte returnRate) { public void setReturnRate(Float returnRate) {
this.returnRate = returnRate; this.returnRate = returnRate;
} }
......
atms-dao/src/main/java/pwc/taxtech/atms/entity/OrganizationReturnRateExample.java
View file @ 95d03507
...@@ -405,52 +405,52 @@ public class OrganizationReturnRateExample { ...@@ -405,52 +405,52 @@ public class OrganizationReturnRateExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andReturnRateEqualTo(Byte value) { public Criteria andReturnRateEqualTo(Float value) {
addCriterion("return_rate =", value, "returnRate"); addCriterion("return_rate =", value, "returnRate");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andReturnRateNotEqualTo(Byte value) { public Criteria andReturnRateNotEqualTo(Float value) {
addCriterion("return_rate <>", value, "returnRate"); addCriterion("return_rate <>", value, "returnRate");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andReturnRateGreaterThan(Byte value) { public Criteria andReturnRateGreaterThan(Float value) {
addCriterion("return_rate >", value, "returnRate"); addCriterion("return_rate >", value, "returnRate");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andReturnRateGreaterThanOrEqualTo(Byte value) { public Criteria andReturnRateGreaterThanOrEqualTo(Float value) {
addCriterion("return_rate >=", value, "returnRate"); addCriterion("return_rate >=", value, "returnRate");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andReturnRateLessThan(Byte value) { public Criteria andReturnRateLessThan(Float value) {
addCriterion("return_rate <", value, "returnRate"); addCriterion("return_rate <", value, "returnRate");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andReturnRateLessThanOrEqualTo(Byte value) { public Criteria andReturnRateLessThanOrEqualTo(Float value) {
addCriterion("return_rate <=", value, "returnRate"); addCriterion("return_rate <=", value, "returnRate");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andReturnRateIn(List<Byte> values) { public Criteria andReturnRateIn(List<Float> values) {
addCriterion("return_rate in", values, "returnRate"); addCriterion("return_rate in", values, "returnRate");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andReturnRateNotIn(List<Byte> values) { public Criteria andReturnRateNotIn(List<Float> values) {
addCriterion("return_rate not in", values, "returnRate"); addCriterion("return_rate not in", values, "returnRate");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andReturnRateBetween(Byte value1, Byte value2) { public Criteria andReturnRateBetween(Float value1, Float value2) {
addCriterion("return_rate between", value1, value2, "returnRate"); addCriterion("return_rate between", value1, value2, "returnRate");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andReturnRateNotBetween(Byte value1, Byte value2) { public Criteria andReturnRateNotBetween(Float value1, Float value2) {
addCriterion("return_rate not between", value1, value2, "returnRate"); addCriterion("return_rate not between", value1, value2, "returnRate");
return (Criteria) this; return (Criteria) this;
} }
......
atms-dao/src/main/resources/pwc/taxtech/atms/dao/OrganizationReturnRateMapper.xml
View file @ 95d03507
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<id column="id" jdbcType="BIGINT" property="id" /> <id column="id" jdbcType="BIGINT" property="id" />
<result column="organization_id" jdbcType="VARCHAR" property="organizationId" /> <result column="organization_id" jdbcType="VARCHAR" property="organizationId" />
<result column="group_name" jdbcType="VARCHAR" property="groupName" /> <result column="group_name" jdbcType="VARCHAR" property="groupName" />
<result column="return_rate" jdbcType="TINYINT" property="returnRate" /> <result column="return_rate" jdbcType="REAL" property="returnRate" />
<result column="start_date" jdbcType="TIMESTAMP" property="startDate" /> <result column="start_date" jdbcType="TIMESTAMP" property="startDate" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" /> <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" /> <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
return_rate, start_date, create_time, return_rate, start_date, create_time,
update_time) update_time)
values (#{id,jdbcType=BIGINT}, #{organizationId,jdbcType=VARCHAR}, #{groupName,jdbcType=VARCHAR}, values (#{id,jdbcType=BIGINT}, #{organizationId,jdbcType=VARCHAR}, #{groupName,jdbcType=VARCHAR},
#{returnRate,jdbcType=TINYINT}, #{startDate,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, #{returnRate,jdbcType=REAL}, #{startDate,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP}) #{updateTime,jdbcType=TIMESTAMP})
</insert> </insert>
<insert id="insertSelective" parameterType="pwc.taxtech.atms.entity.OrganizationReturnRate"> <insert id="insertSelective" parameterType="pwc.taxtech.atms.entity.OrganizationReturnRate">
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
#{groupName,jdbcType=VARCHAR}, #{groupName,jdbcType=VARCHAR},
</if> </if>
<if test="returnRate != null"> <if test="returnRate != null">
#{returnRate,jdbcType=TINYINT}, #{returnRate,jdbcType=REAL},
</if> </if>
<if test="startDate != null"> <if test="startDate != null">
#{startDate,jdbcType=TIMESTAMP}, #{startDate,jdbcType=TIMESTAMP},
...@@ -225,7 +225,7 @@ ...@@ -225,7 +225,7 @@
group_name = #{record.groupName,jdbcType=VARCHAR}, group_name = #{record.groupName,jdbcType=VARCHAR},
</if> </if>
<if test="record.returnRate != null"> <if test="record.returnRate != null">
return_rate = #{record.returnRate,jdbcType=TINYINT}, return_rate = #{record.returnRate,jdbcType=REAL},
</if> </if>
<if test="record.startDate != null"> <if test="record.startDate != null">
start_date = #{record.startDate,jdbcType=TIMESTAMP}, start_date = #{record.startDate,jdbcType=TIMESTAMP},
...@@ -250,7 +250,7 @@ ...@@ -250,7 +250,7 @@
set id = #{record.id,jdbcType=BIGINT}, set id = #{record.id,jdbcType=BIGINT},
organization_id = #{record.organizationId,jdbcType=VARCHAR}, organization_id = #{record.organizationId,jdbcType=VARCHAR},
group_name = #{record.groupName,jdbcType=VARCHAR}, group_name = #{record.groupName,jdbcType=VARCHAR},
return_rate = #{record.returnRate,jdbcType=TINYINT}, return_rate = #{record.returnRate,jdbcType=REAL},
start_date = #{record.startDate,jdbcType=TIMESTAMP}, start_date = #{record.startDate,jdbcType=TIMESTAMP},
create_time = #{record.createTime,jdbcType=TIMESTAMP}, create_time = #{record.createTime,jdbcType=TIMESTAMP},
update_time = #{record.updateTime,jdbcType=TIMESTAMP} update_time = #{record.updateTime,jdbcType=TIMESTAMP}
...@@ -272,7 +272,7 @@ ...@@ -272,7 +272,7 @@
group_name = #{groupName,jdbcType=VARCHAR}, group_name = #{groupName,jdbcType=VARCHAR},
</if> </if>
<if test="returnRate != null"> <if test="returnRate != null">
return_rate = #{returnRate,jdbcType=TINYINT}, return_rate = #{returnRate,jdbcType=REAL},
</if> </if>
<if test="startDate != null"> <if test="startDate != null">
start_date = #{startDate,jdbcType=TIMESTAMP}, start_date = #{startDate,jdbcType=TIMESTAMP},
...@@ -294,7 +294,7 @@ ...@@ -294,7 +294,7 @@
update organization_return_rate update organization_return_rate
set organization_id = #{organizationId,jdbcType=VARCHAR}, set organization_id = #{organizationId,jdbcType=VARCHAR},
group_name = #{groupName,jdbcType=VARCHAR}, group_name = #{groupName,jdbcType=VARCHAR},
return_rate = #{returnRate,jdbcType=TINYINT}, return_rate = #{returnRate,jdbcType=REAL},
start_date = #{startDate,jdbcType=TIMESTAMP}, start_date = #{startDate,jdbcType=TIMESTAMP},
create_time = #{createTime,jdbcType=TIMESTAMP}, create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP} update_time = #{updateTime,jdbcType=TIMESTAMP}
......
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.ctrl.js
View file @ 95d03507
...@@ -639,47 +639,19 @@ ...@@ -639,47 +639,19 @@
dataField: "groupName", dataField: "groupName",
allowHeaderFiltering: false, allowHeaderFiltering: false,
caption: $translate.instant('TaxGroup'), caption: $translate.instant('TaxGroup'),
cellTemplate: function (container, options) { lookup: {
try { dataSource: $scope.groupTypeList,
$('<div />').dxSelectBox({ displayExpr: "type",
valueExpr: this, valueExpr: "type"
dataSource: $scope.groupTypeList,
value: options.data.groupName,
placeholder : options.data.groupName,
name : "groupName",
//bindingOptions: {
// value: 'invoiceEntity.invoiceSourceType',
//},
height: 25,
showClearButton: true
}).appendTo(container);
}
catch (e) {
$log.error(e);
}
} }
},{ },{
dataField: "taxDecCycle", dataField: "taxDecCycle",
allowHeaderFiltering: true, allowHeaderFiltering: true,
caption: $translate.instant('TaxDecCycle'), caption: $translate.instant('TaxDecCycle'),
cellTemplate: function (container, options) { lookup: {
try { dataSource: $scope.taxDecCycleList,
$('<div />').dxSelectBox({ displayExpr: "type",
valueExpr: this, valueExpr: "type"
dataSource: $scope.taxDecCycleList,
value: options.data.taxDecCycle,
placeholder : options.data.taxDecCycle,
name : "taxDecCycle",
//bindingOptions: {
// value: 'invoiceEntity.invoiceSourceType',
//},
height: 25,
showClearButton: false
}).appendTo(container);
}
catch (e) {
$log.error(e);
}
} }
},{ },{
dataField: "taxDecType", dataField: "taxDecType",
...@@ -828,24 +800,10 @@ ...@@ -828,24 +800,10 @@
dataField: "invoiceTypeName", dataField: "invoiceTypeName",
allowHeaderFiltering: false, allowHeaderFiltering: false,
caption: $translate.instant('InvoiceTypeName'), caption: $translate.instant('InvoiceTypeName'),
cellTemplate: function (container, options) { lookup: {
try { dataSource: $scope.invoiceTypeList,
$('<div />').dxSelectBox({ displayExpr: "type",
valueExpr: this, valueExpr: "type"
dataSource: $scope.invoiceTypeList,
value: options.data.invoiceTypeName,
placeholder : options.data.invoiceTypeName,
name : "invoiceTypeName",
//bindingOptions: {
// value: 'invoiceEntity.invoiceSourceType',
//},
height: 25,
showClearButton: true
}).appendTo(container);
}
catch (e) {
$log.error(e);
}
} }
},{ },{
dataField: "singleInvoiceMaxInvoiceAmount", dataField: "singleInvoiceMaxInvoiceAmount",
...@@ -1014,28 +972,14 @@ ...@@ -1014,28 +972,14 @@
allowHeaderFiltering: false, allowHeaderFiltering: false,
caption: $translate.instant('TaxGroup'), caption: $translate.instant('TaxGroup'),
width : '30%', width : '30%',
cellTemplate: function (container, options) { lookup: {
try { dataSource: $scope.groupTypeList,
$('<div />').dxSelectBox({ displayExpr: "type",
valueExpr: this, valueExpr: "type"
dataSource: $scope.groupTypeList,
value: options.data.groupName,
placeholder : options.data.groupName,
name : "groupName",
//bindingOptions: {
// value: 'invoiceEntity.invoiceSourceType',
//},
height: 25,
showClearButton: isShowClearButton
}).appendTo(container);
}
catch (e) {
$log.error(e);
}
} }
}, },
{ {
dataField: "ReturnRate", dataField: "returnRate",
allowHeaderFiltering: false, allowHeaderFiltering: false,
width : '15%', width : '15%',
caption: $translate.instant('ReturnRate') caption: $translate.instant('ReturnRate')
...@@ -1044,23 +988,8 @@ ...@@ -1044,23 +988,8 @@
dataField: "startDate", dataField: "startDate",
allowHeaderFiltering: false, allowHeaderFiltering: false,
width : '25%', width : '25%',
caption: $translate.instant('StartingDate'), dataType: "date",
cellTemplate: function (container, options) { caption: $translate.instant('StartingDate')
try {
$('<div />')
.attr('id',options.data.id)
.appendTo(container);
$('#' + options.data.id).dxDateBox({
type: "date",
showClearButton: true,
value: new Date()
}).appendTo(container);
}
catch (e) {
$log.error(e);
}
}
} }
], ],
onContentReady: function (e) { onContentReady: function (e) {
...@@ -1214,42 +1143,14 @@ ...@@ -1214,42 +1143,14 @@
dataField: "startDate", dataField: "startDate",
allowHeaderFiltering: false, allowHeaderFiltering: false,
width: '20%', width: '20%',
caption: $translate.instant('StartingDate'), dataType: "date",
cellTemplate: function (container, options) { caption: $translate.instant('StartingDate')
try {
$('<div />')
.attr('id', 'currencyStartDate' + options.data.id)
.appendTo(container);
$('#currencyStartDate' + options.data.id).dxDateBox({
type: "date",
showClearButton: true,
value: new Date()
}).appendTo(container);
} catch (e) {
$log.error(e);
}
}
}, { }, {
dataField: "endDate", dataField: "endDate",
allowHeaderFiltering: false, allowHeaderFiltering: false,
width: '20%', width: '20%',
caption: $translate.instant('EndDate'), dataType: "date",
cellTemplate: function (container, options) { caption: $translate.instant('EndDate')
try {
$('<div />')
.attr('id', 'currencyEndDate' + options.data.id)
.appendTo(container);
$('#currencyEndDate' + options.data.id).dxDateBox({
type: "date",
showClearButton: true,
value: new Date()
}).appendTo(container);
} catch (e) {
$log.error(e);
}
}
}, { }, {
dataField: "rate", dataField: "rate",
allowHeaderFiltering: false, allowHeaderFiltering: false,
...@@ -1385,91 +1286,50 @@ ...@@ -1385,91 +1286,50 @@
}, },
columns: [{ columns: [{
dataField: "id", dataField: "id",
visible : false, visible: false,
allowHeaderFiltering: false, allowHeaderFiltering: false,
caption: $translate.instant('id') caption: $translate.instant('id')
},{ }, {
dataField: "index", dataField: "index",
width : '5%', width: '5%',
allowHeaderFiltering: false, allowHeaderFiltering: false,
caption: $translate.instant('SequenceNoCol') caption: $translate.instant('SequenceNoCol')
},{ }, {
dataField: "approvedLevyProject", dataField: "approvedLevyProject",
allowHeaderFiltering: false, allowHeaderFiltering: false,
caption: $translate.instant('ApprovedLevyProject'), caption: $translate.instant('ApprovedLevyProject'),
width : '15%' width: '15%'
},{ }, {
dataField: "approvedLevyItems", dataField: "approvedLevyItems",
allowHeaderFiltering: false, allowHeaderFiltering: false,
width : '15%', width: '15%',
caption: $translate.instant('ApprovedLevyItems') caption: $translate.instant('ApprovedLevyItems')
},{ }, {
dataField: "startDate", dataField: "approvedValidityPeriodStartTime",
allowHeaderFiltering: false,
width : '20%',
caption: $translate.instant('ApprovedValidityPeriodStartTime'),
cellTemplate: function (container, options) {
try {
$('<div />')
.attr('id','approvedLevyStartDate'+ options.data.id)
.appendTo(container);
$('#approvedLevyStartDate' + options.data.id).dxDateBox({
type: "date",
showClearButton: true,
value: new Date()
}).appendTo(container);
}
catch (e) {
$log.error(e);
}
}
},{
dataField: "endDate",
allowHeaderFiltering: false,
width : '20%',
caption: $translate.instant('ApprovedValidityPeriodEndTime'),
cellTemplate: function (container, options) {
try {
$('<div />')
.attr('id','approvedLevyEndDate'+ options.data.id)
.appendTo(container);
$('#approvedLevyEndDate' + options.data.id).dxDateBox({
type: "date",
showClearButton: true,
value: new Date()
}).appendTo(container);
}
catch (e) {
$log.error(e);
}
}
},{
dataField: "approvedRate",
allowHeaderFiltering: false,
width : '10%',
caption: $translate.instant('ApprovedRate')
},{
dataField: "approvedTaxTerm",
allowHeaderFiltering: false, allowHeaderFiltering: false,
width : '10%', width: '20%',
dataType: "date",
caption: $translate.instant('ApprovedValidityPeriodStartTime')
}, {
dataField: "approvedValidityPeriodEndTime",
allowHeaderFiltering: false,
width: '20%',
dataType: "date",
caption: $translate.instant('ApprovedValidityPeriodEndTime')
}, {
dataField: "approvedRate",
allowHeaderFiltering: false,
width: '10%',
caption: $translate.instant('ApprovedRate')
}, {
dataField: "approvedTaxPeriod",
allowHeaderFiltering: false,
width: '10%',
caption: $translate.instant('ApprovedTaxTerm'), caption: $translate.instant('ApprovedTaxTerm'),
cellTemplate: function (container, options) { lookup: {
try { dataSource: $scope.approvedLevyTermList,
$('<div />').dxSelectBox({ displayExpr: "type",
valueExpr: this, valueExpr: "type"
dataSource: $scope.approvedLevyTermList,
value: options.data.approvedTaxTerm,
placeholder : options.data.approvedTaxTerm,
name : "approvedTaxTerm",
height: 25,
showClearButton: false
}).appendTo(container);
}
catch (e) {
$log.error(e);
}
} }
} }
], ],
...@@ -2849,10 +2709,10 @@ ...@@ -2849,10 +2709,10 @@
$scope.maxTitleLength = 10; $scope.maxTitleLength = 10;
$scope.maxValueLength = 20; $scope.maxValueLength = 20;
$scope.selectCompany = {}; $scope.selectCompany = {};
$scope.groupTypeList = ["增值税","印花税","企业所得税"]; $scope.groupTypeList = [{code:0,type:"增值税"},{code:1,type:"印花税"},{code:2,type:"企业所得税"}];
$scope.invoiceTypeList = ["普通发票","专项发票"]; $scope.invoiceTypeList = [{code:0,type:"普通发票"},{code:1,type:"专项发票"},{code:2,type:"企业所得税"}];
$scope.taxDecCycleList = ["月度","季度","年度"]; $scope.taxDecCycleList = [{code:0,type:"月度"},{code:1,type:"季度"},{code:2,type:"年度"}];
$scope.approvedLevyTermList = ["月","季","半年","年"]; $scope.approvedLevyTermList = [{code:0,type:"月"},{code:1,type:"季"},{code:2,type:"半年"},{code:3,type:"年"}];
$scope.showAttributeDimensionID = 'orgmanage'; $scope.showAttributeDimensionID = 'orgmanage';
......
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