Skip to content

M
mingPayPc
Commit 9891e837 by liang ce
Options

token和orgId封装

parent 58a97299
Showing with 205 additions and 66 deletions
src/api/axios.js
...@@ -38,14 +38,15 @@ axios.interceptors.response.use(res => { ...@@ -38,14 +38,15 @@ axios.interceptors.response.use(res => {
if (err && err.response) { if (err && err.response) {
switch (err.response.status) { switch (err.response.status) {
case 401: case 401:
message.error('网络异常请重试')
refreshToken().then(res => { refreshToken().then(res => {
console.log('refreshToken1', res) console.log('refreshToken1', res)
resolve(err) resolve(err)
}) })
break break
case 426: case 426:
message.error('网络异常请重试')
getToken().then((res) => { getToken().then((res) => {
console.log('getToken1', res)
resolve(err) resolve(err)
}) })
break break
......
src/api/generateOrRefreshToken.js
...@@ -2,6 +2,7 @@ import * as dd from 'dingtalk-jsapi' ...@@ -2,6 +2,7 @@ import * as dd from 'dingtalk-jsapi'
import router from '../router' import router from '../router'
import axios from 'axios' import axios from 'axios'
import qs from 'qs' import qs from 'qs'
import { message } from 'ant-design-vue'
var instance = axios.create() var instance = axios.create()
const BASE_URL = process.env.VUE_APP_API_URL const BASE_URL = process.env.VUE_APP_API_URL
......
src/components/pages/PaymentManagement/AllowanceDetails.vue
<template> <template>
<div class="allowanceDetails"> <a-spin :spinning="spinning" :delay="delayTime">
<a-button type="primary" @click="back()"><img style="margin-top:-4px;margin-right: 6px;width: 14px" src="../../../assets/back.png"/>返回</a-button> <div class="allowanceDetails">
<div class="title">津贴详情</div> <a-button type="primary" @click="back()"><img style="margin-top:-4px;margin-right: 6px;width: 14px" src="../../../assets/back.png"/>返回</a-button>
<div class="allowanceDetailsBox" v-if="allowanceDetails"> <div class="title">津贴详情</div>
<div> <div class="allowanceDetailsBox" v-if="allowanceDetails">
<label>津贴类型</label> <div>
<div>{{allowanceDetails.subsidyType === 'TRAVEL' ? '交通补贴' : '餐补'}}</div> <label>津贴类型</label>
<div>{{allowanceDetails.subsidyType === 'TRAVEL' ? '交通补贴' : '餐补'}}</div>
</div>
<div>
<label>截止日期</label>
<div>{{ allowanceDetails.endTime }} <span class="changeEndTime" @click="changeEndTimeModel">修改</span></div>
</div>
<div>
<label>单号</label>
<div>{{allowanceDetails.grantNumber}}</div>
</div>
<div>
<label>经办人</label>
<div>{{allowanceDetails.agentName}}</div>
</div>
<div>
<label>发放时间</label>
<div>{{ allowanceDetails.createTime }}</div>
</div>
<div>
<label>备注</label>
<div>{{allowanceDetails.remark}}</div>
</div>
<div>
<label>单笔金额</label>
<div>{{allowanceDetails.subsidyAmount.toFixed(2)}}</div>
</div>
<div>
<label>发放笔数</label>
<div>共{{allowanceDetails.subsidyQuantity}}笔</div>
</div>
<div>
<label>发放对象</label>
<div>{{allowanceDetails.recipient}}</div>
</div>
</div> </div>
<div> <div class="clickshowsearchUserMessage" @click="changeIsShow"><a href="javascript:;">查看具体成员</a></div>
<label>截止日期</label> <div class="searchUserMessage" v-if="isshow">
<div>{{ allowanceDetails.endTime }}</div> <div class="positionDiv"></div>
</div> <div style="margin-bottom: 8px">
<div> <label>请输入查询人员：</label><a-input style="width:220px" v-model="searchData" placeholder="" />
<label>单号</label> </div>
<div>{{allowanceDetails.grantNumber}}</div> <div class="userList">
</div> <span v-for="(item,index) in allowanceDetails.grantSubsidyUserName" :class="searchData.trim() === item ? 'searchData': ''" :key="index">{{item}}</span>
<div> </div>
<label>经办人</label>
<div>{{allowanceDetails.agentName}}</div>
</div>
<div>
<label>发放时间</label>
<div>{{ allowanceDetails.createTime }}</div>
</div>
<div>
<label>备注</label>
<div>{{allowanceDetails.remark}}</div>
</div>
<div>
<label>单笔金额</label>
<div>{{allowanceDetails.subsidyAmount.toFixed(2)}}</div>
</div>
<div>
<label>发放笔数</label>
<div>共{{allowanceDetails.subsidyQuantity}}笔</div>
</div>
<div>
<label>发放对象</label>
<div>{{allowanceDetails.recipient}}</div>
</div>
</div>
<div class="clickshowsearchUserMessage" @click="changeIsShow"><a href="javascript:;">查看具体成员</a></div>
<div class="searchUserMessage" v-if="isshow">
<div class="positionDiv"></div>
<div style="margin-bottom: 8px">
<label>请输入查询人员：</label><a-input style="width:220px" v-model="searchData" placeholder="" />
</div>
<div class="userList">
<span v-for="(item,index) in allowanceDetails.grantSubsidyUserName" :class="searchData.trim() === item ? 'searchData': ''" :key="index">{{item}}</span>
</div> </div>
<a-modal title="修改截止日期" v-model="visible" @ok="changeEndTime()">
<a-form :form="form">
<a-form-item
v-bind="formItemLayout"
label="截止日期"
>
<a-date-picker
placeholder="请选择截止日期"
:disabledDate="disabledDate"
:showToday="false"
v-decorator="['date-picker', config]"
/>
</a-form-item>
</a-form>
</a-modal>
</div> </div>
</div> </a-spin>
</template> </template>
<script> <script>
import { $http } from './../../../api/axios.js' import { $http } from './../../../api/axios.js'
import moment from 'moment'
export default { export default {
name: 'allowanceDetails', name: 'allowanceDetails',
data () { data () {
return { return {
moment,
grantNumber: '', grantNumber: '',
allowanceDetails: '', allowanceDetails: '',
searchData: '', searchData: '',
isshow: false isshow: false,
visible: false,
spinning: false,
delayTime: 100,
form: this.$form.createForm(this),
config: {
rules: [{ type: 'object', required: true, message: '请选择时间' }]
},
formItemLayout: {
labelCol: {
xs: { span: 24 },
sm: { span: 5 }
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 }
}
}
} }
}, },
watch: {}, watch: {},
...@@ -72,6 +108,11 @@ export default { ...@@ -72,6 +108,11 @@ export default {
this.getStatisticalProductPage() this.getStatisticalProductPage()
}, },
methods: { methods: {
disabledDate (current) {
// Can not select days before today and today
console.log(moment().endOf('day'))
return current < moment(Date.now()).add(-1, 'day')
},
getStatisticalProductPage () { getStatisticalProductPage () {
let data = { let data = {
grantNumber: this.grantNumber grantNumber: this.grantNumber
...@@ -86,6 +127,38 @@ export default { ...@@ -86,6 +127,38 @@ export default {
}, },
changeIsShow () { changeIsShow () {
this.isshow = !this.isshow this.isshow = !this.isshow
},
changeEndTimeModel () {
this.visible = !this.visible
},
changeEndTime () {
let that = this
this.form.validateFields((err, fieldsValue) => {
if (err) {
this.$message.error('请完整填写津贴相关信息')
return
}
this.visible = false
this.spinning = true
// Should format date value before submit.
const values = {
...fieldsValue,
'date-picker': fieldsValue['date-picker'].format('YYYY-MM-DD')
}
let RecordData = {
endTime: `${values['date-picker']} 23:59:59`,
grantNumber: this.grantNumber
}
$http.post(`/mingpay/v1/isv/account/update_coupon_record`, RecordData).then((res) => {
if (res.data.resultCode === 0) {
that.allowanceDetails.endTime = `${values['date-picker']} 23:59:59`
that.spinning = !that.spinning
that.$message.success('修改成功')
} else {
that.$message.error('修改失败')
}
})
})
} }
} }
} }
...@@ -147,4 +220,9 @@ export default { ...@@ -147,4 +220,9 @@ export default {
.clickshowsearchUserMessage{ .clickshowsearchUserMessage{
margin-bottom: 20px; margin-bottom: 20px;
} }
.changeEndTime{
margin-left: 15px;
color: #1890ff;
cursor: pointer;
}
</style> </style>
src/components/pages/PaymentManagement/AllowancePayment.vue
...@@ -2,15 +2,36 @@ ...@@ -2,15 +2,36 @@
<a-spin :spinning="spinning" :delay="delayTime"> <a-spin :spinning="spinning" :delay="delayTime">
<div class="AllowancePayment"> <div class="AllowancePayment">
<div class="searchBox"> <div class="searchBox">
<a-select placeholder="津贴类型" :allowClear="true" style="width: 120px;margin-right: 20px;" @change="selectHandType"> <div style="width: 75px">截止时间：</div>
<a-date-picker
:disabledDate="disabledStartDate"
format="YYYY-MM-DD"
v-model="startValue"
style="120px"
placeholder="开始日期"
@change="onChangeStartValue"
@openChange="handleStartOpenChange"
/>
<div>～</div>
<a-date-picker
:disabledDate="disabledEndDate"
format="YYYY-MM-DD"
placeholder="结束日期"
style="120px"
@change="onChangeEndValue"
v-model="endValue"
:open="endOpen"
@openChange="handleEndOpenChange"
/>
<a-select placeholder="津贴类型" :allowClear="true" style="width: 100px;margin-left: 15px;" @change="selectHandType">
<a-select-option value="TRAVEL">交通补助</a-select-option> <a-select-option value="TRAVEL">交通补助</a-select-option>
<a-select-option value="MEAL">餐补</a-select-option> <a-select-option value="MEAL">餐补</a-select-option>
</a-select> </a-select>
<a-select placeholder="经办人" :allowClear="true" style="width: 120px;margin-right: 20px;" @change="selectAgent"> <a-select placeholder="经办人" :allowClear="true" style="width: 100px;margin-left: 15px;" @change="selectAgent">
<a-select-option v-for="(item, index) in agentList" :key="index" :value="item.ddUserId">{{ item.name }}</a-select-option> <a-select-option v-for="(item, index) in agentList" :key="index" :value="item.ddUserId">{{ item.name }}</a-select-option>
</a-select> </a-select>
<a-button type="primary" @click="search()">查询</a-button> <a-button type="primary" @click="search()" style="margin-left: 15px;">查询</a-button>
<a-button type="primary" @click="changeModel()" style="margin-left: 20px;"><a-icon type="pay-circle" />发放津贴</a-button> <a-button type="primary" @click="changeModel()" style="margin-left: 15px;"><a-icon type="pay-circle" />发放津贴</a-button>
</div> </div>
<a-table :columns="columns" :dataSource="recordsList" size="default" rowKey="grantNumber" :pagination="pagination" @change="handleTableChange"> <a-table :columns="columns" :dataSource="recordsList" size="default" rowKey="grantNumber" :pagination="pagination" @change="handleTableChange">
<span slot="recipient">成员</span> <span slot="recipient">成员</span>
...@@ -19,7 +40,7 @@ ...@@ -19,7 +40,7 @@
</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="createTime">时间</span> <span slot="endTime">截止时间</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="审批中" />
...@@ -128,8 +149,8 @@ export default { ...@@ -128,8 +149,8 @@ export default {
title: '备注', title: '备注',
dataIndex: 'remark' dataIndex: 'remark'
}, { }, {
title: '时间', title: '截止时间',
dataIndex: 'createTime' dataIndex: 'endTime'
}, { }, {
title: '操作', title: '操作',
dataIndex: 'action', dataIndex: 'action',
...@@ -159,14 +180,49 @@ export default { ...@@ -159,14 +180,49 @@ export default {
}, },
userIdListObj: [], userIdListObj: [],
departmentIdListObj: [], departmentIdListObj: [],
agentList: [] agentList: [],
startValue: null,
endValue: null,
startTime: '',
endTime: '',
endOpen: false
} }
}, },
created: function () { created: function () {
this.queryRecordList() this.queryCouponRecordList()
this.getAgentList() this.getAgentList()
}, },
methods: { methods: {
// 时间筛选
moment,
disabledStartDate (startValue) {
const endValue = this.endValue
if (!startValue || !endValue) {
return false
}
return startValue.valueOf() > endValue.valueOf() || startValue.valueOf() >= moment().endOf('day').valueOf()
},
disabledEndDate (endValue) {
const startValue = this.startValue
if (!endValue || !startValue) {
return false
}
return startValue.valueOf() > endValue.valueOf()
},
handleStartOpenChange (open) {
if (!open) {
this.endOpen = true
}
},
handleEndOpenChange (open) {
this.endOpen = open
},
onChangeStartValue (date, dateString) {
this.startTime = dateString
},
onChangeEndValue (date, dateString) {
this.endTime = dateString
},
// 获取收银员列表 // 获取收银员列表
getAgentList () { getAgentList () {
let AgentData = { let AgentData = {
...@@ -187,13 +243,15 @@ export default { ...@@ -187,13 +243,15 @@ export default {
console.log(moment().endOf('day')) console.log(moment().endOf('day'))
return current < moment(Date.now()).add(-1, 'day') return current < moment(Date.now()).add(-1, 'day')
}, },
// 获取消费列表 // 获取津贴列表
queryRecordList () { queryCouponRecordList () {
let RecordData = { let RecordData = {
currentPage: this.pagination.current, currentPage: this.pagination.current,
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,
endTime: this.endTime
} }
$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
...@@ -248,7 +306,7 @@ export default { ...@@ -248,7 +306,7 @@ export default {
}, },
handleTableChange (pagination, filters, sorter) { handleTableChange (pagination, filters, sorter) {
this.pagination.current = pagination.current this.pagination.current = pagination.current
this.queryRecordList() this.queryCouponRecordList()
}, },
// 搜索条件津贴类型 // 搜索条件津贴类型
selectHandType (value) { selectHandType (value) {
...@@ -304,7 +362,7 @@ export default { ...@@ -304,7 +362,7 @@ export default {
this.departmentIdListObj = [] this.departmentIdListObj = []
this.spinning = false this.spinning = false
this.$message.success(res.data.data) this.$message.success(res.data.data)
this.queryRecordList() this.queryCouponRecordList()
} else { } else {
this.spinning = false this.spinning = false
this.$message.error(res.data.message) this.$message.error(res.data.message)
...@@ -324,7 +382,7 @@ export default { ...@@ -324,7 +382,7 @@ export default {
}, },
search () { search () {
this.pagination.current = 1 this.pagination.current = 1
this.queryRecordList() this.queryCouponRecordList()
} }
} }
} }
...@@ -333,6 +391,7 @@ export default { ...@@ -333,6 +391,7 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
.searchBox{ .searchBox{
display: flex; display: flex;
align-items: center;
margin-bottom: 20px; margin-bottom: 20px;
} }
.searchBox > input { .searchBox > input {
......
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