Commit adaaf5ea by liang ce

时间组件和津贴详情更新

parent 7bfdc932
const MINGPAY_CONSTANT = {
MINGPAY_CONSTANT_URL: 'http://mingpay-web-beta.mingwork.com:8888/',
// MINGPAY_CONSTANT_URL: 'http://ming.vaiwan.com/',
// MINGPAY_CONSTANT_URL: 'http://mingpay-web-beta.mingwork.com:8888/',
MINGPAY_CONSTANT_URL: 'http://ming.vaiwan.com/',
MINGPAY_CONSTANT_AGENTID: 270198704,
MINGPAY_CONSTANT_VERSION: 'v1'
}
......
......@@ -250,6 +250,10 @@ export default {
departments: [],
users: []
}
this.searchSource.ddchoosePeople = {
userIdList: [],
departmentIdList: []
}
},
// 用户头像处理
avatarCanvasFn (name) {
......
......@@ -182,7 +182,8 @@ export default {
},
disabledDate (current) {
// Can not select days before today and today
return current && current < moment().endOf('day')
console.log(moment().endOf('day'))
return current < moment(Date.now()).add(-1, 'day')
},
// 获取消费列表
queryRecordList () {
......
......@@ -10,8 +10,8 @@
</div>
<a-table :columns="columns" :dataSource="cashierManagementList" size="default" rowKey="id" :pagination="pagination" @change="handleTableChange">
<span slot="name">成员</span>
<span slot="createTime" slot-scope="createTime">
{{ createTimeToStr(createTime) }}
<span slot="createDate" slot-scope="createDate">
{{ createTimeToStr(createDate) }}
</span>
<span slot="action" slot-scope="text, record, index">
<a v-if="record.status === '0'" href="javascript:;" @click="showModel(record, text, index)">删除</a>
......
......@@ -7,7 +7,7 @@
<a-select-option value="REFUND_SUCCESS">已退款</a-select-option>
</a-select>
<a-select placeholder="收银员" :allowClear="true" style="width: 120px;margin-right: 20px;" @change="selectagent">
<a-select-option v-for="item in agentList" :value="item.userId" :key="item">{{item.name}}</a-select-option>
<a-select-option v-for="item in agentList" :value="item.userId" :key="item.userId">{{item.name}}</a-select-option>
</a-select>
<a-button type="primary" @click="search()">查询</a-button>
</div>
......
......@@ -2,7 +2,7 @@
<div class="viewAllowances">
<a-button type="primary" @click="back()"><img style="margin-top:-4px;margin-right: 6px;width: 14px" src="../../../assets/back.png"/>返回</a-button>
<div class="title">查看津贴</div>
<a-table :columns="columns" :dataSource="subsidyList" size="default" rowKey="grantNumber" :pagination="pagination" @change="handleTableChange">
<a-table :columns="columns" :dataSource="subsidyList" size="default" rowKey="couponId" :pagination="pagination" @change="handleTableChange">
<span slot="type" slot-scope="type">
{{ type === 'travel' ? '交通补贴' : '餐补'}}
</span>
......@@ -11,6 +11,9 @@
<span slot="endTime" slot-scope="endTime">
{{ timeToStr(endTime) }}
</span>
<span slot="creatTime" slot-scope="creatTime">
{{ timeToStr(creatTime) }}
</span>
</a-table>
</div>
</template>
......@@ -36,6 +39,10 @@ export default {
title: '截止日期',
dataIndex: 'endTime',
scopedSlots: { customRender: 'endTime' }
}, {
title: '创建日期',
dataIndex: 'creatTime',
scopedSlots: { customRender: 'creatTime' }
}],
pagination: {
current: 1,
......
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