Commit a2701f09 by liang ce

津贴时间修改

parent 9891e837
...@@ -40,7 +40,9 @@ ...@@ -40,7 +40,9 @@
</span> </span>
<span slot="type" slot-scope="type">{{ type === 'TRAVEL' ? '交通补助' : '餐补' }}</span> <span slot="type" slot-scope="type">{{ type === 'TRAVEL' ? '交通补助' : '餐补' }}</span>
<span slot="agentId">经办人</span> <span slot="agentId">经办人</span>
<span slot="endTime">截止时间</span> <span slot="endTime" slot-scope="endTime">
{{ endTime.split(" ")[0] }}
</span>
<span slot="remark">备注</span> <span slot="remark">备注</span>
<span slot="couponRecordStatus" slot-scope="couponRecordStatus"> <span slot="couponRecordStatus" slot-scope="couponRecordStatus">
<a-badge v-if="couponRecordStatus === MINGPAY_SUBSIDY_STATUS.WAITING_PERMIT" status="processing" text="审批中" /> <a-badge v-if="couponRecordStatus === MINGPAY_SUBSIDY_STATUS.WAITING_PERMIT" status="processing" text="审批中" />
...@@ -150,7 +152,8 @@ export default { ...@@ -150,7 +152,8 @@ export default {
dataIndex: 'remark' dataIndex: 'remark'
}, { }, {
title: '截止时间', title: '截止时间',
dataIndex: 'endTime' dataIndex: 'endTime',
scopedSlots: { customRender: 'endTime' }
}, { }, {
title: '操作', title: '操作',
dataIndex: 'action', dataIndex: 'action',
...@@ -250,8 +253,8 @@ export default { ...@@ -250,8 +253,8 @@ export default {
pageNumber: this.pagination.defaultPageSize, pageNumber: this.pagination.defaultPageSize,
subsidyType: this.searchSource.type, subsidyType: this.searchSource.type,
agentId: this.searchSource.agentId, agentId: this.searchSource.agentId,
startTime: this.startTime, startTime: this.startTime ? `${this.startTime} 00:00:00` : '',
endTime: this.endTime endTime: this.endTime ? `${this.endTime} 23:59:59` : ''
} }
$http.get(`/mingpay/v1/isv/account/list_couponRecord`, RecordData).then((res) => { $http.get(`/mingpay/v1/isv/account/list_couponRecord`, RecordData).then((res) => {
let data = res.data.data let data = res.data.data
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment