Skip to content

M
mingPayPc
Commit b0bad550 by liang ce
Options

mingpayPC新版本

parent 64efcad8
Showing with 188 additions and 105 deletions
src/api/axios.js
import axios from 'axios'
import qs from 'qs'
axios.defaults.baseURL = 'http://192.168.1.106:8400' // 本地荣
// axios.defaults.baseURL = 'http://192.168.1.102:8300' // 本地钱
// axios.defaults.baseURL = 'http://139.196.213.18:8300' // beta环境
// axios.defaults.baseURL = 'http://192.168.1.106:8300/v1/isv' // 本地荣
// axios.defaults.baseURL = 'http://192.168.1.102:8300/v1/isv' // 本地钱
axios.defaults.baseURL = 'http://139.196.213.18:8300/v1/isv' // beta环境
let loadingInstance // 创建Loading 的实例
axios.defaults.headers['Authorization'] = `Bearer ${localStorage.getItem('token')}` // 设置请求头为 Authorization
// 配置发送请求前的拦截器可以设置token信息
......@@ -35,21 +35,3 @@ const $http = {
}
}
export { $http }
// // 配置响应拦截器
// axios.interceptors.response.use(res => {
// //loading结束
// loadingInstance.close();
// //这里面写所需要的代码
// if(res.data.code =='401'){
// //全局登陆过滤，当判读token失效或者没有登录时 返回登陆页面
// return false;
// };
// return Promise.resolve(res);
// }, error => {
// loadingInstance.close();
// return Promise.reject(error);
// }
// return Promise.reject(error);
// };
// return axios;
// )
src/api/config.js
......@@ -5,18 +5,16 @@ import { MINGPAY_CONSTANT } from './constant'
axios.defaults.headers['Authorization'] = `Bearer ${localStorage.getItem('token')}`
const config = {
ddconfig: () => {
return new Promise((resolve, reject) => {
let senddate = qs.stringify({
version: MINGPAY_CONSTANT.MINGPAY_CONSTANT_VERSION,
url: location.href.replace(window.location.hash, ''),
agentId: 25255,
orgId: localStorage.getItem('orgId')
})
return axios.post(`http://192.168.1.106:8400/v1/auth/getJsAuthenticationParameter?${senddate}`).then((res) => {
let agentId = 25255
return axios.post(`http://139.196.213.18:8300/v1/auth/getJsAuthenticationParameter?${senddate}`).then((res) => {
let timeStamp = res.data.data.timeStamp
let nonceStr = res.data.data.nonceStr
let signature = res.data.data.signature
let agentId = res.data.data.agentId
dd.config({
agentId: agentId, // 必填，微应用ID
corpId: localStorage.getItem('orgId'), // 必填，企业ID
......@@ -35,7 +33,6 @@ const config = {
return 'no'
})
})
})
},
ddready: (item) => {
return new Promise((resolve, reject) => {
......@@ -68,6 +65,9 @@ const config = {
}).catch((err) => {
console.log(err)
})
},
onFail: function (err) {
console.log(err)
}
})
})
......
src/components/pages/PaymentManagement/AccountManagement.vue
......@@ -2,7 +2,7 @@
<a-spin :spinning="spinning">
<div class="AccountManagement">
<div class="searchBox">
<a-input placeholder="选择成员" disabled @click="choosePeople" style="width: 120px"/>
<div class="choosePeople" @click="choosePeople" style="width: 120px">选择成员</div>
<a-input placeholder="输入卡号" v-model="searchSource.cardNum" style="width: 120px"/>
<a-select placeholder="卡片状态" style="width: 120px;margin-right: 20px;" :allowClear="true" @change="selectHandleChangeCard">
<a-select-option value="ACTIVE">已绑卡</a-select-option>
......@@ -30,7 +30,7 @@
</div>
</div>
</div>
<a-table :columns="columns" :dataSource="accountList" size="default" rowKey="userId" :pagination="pagination" @change="handleTableChange">
<a-table :columns="columns" :dataSource="accountList" size="default" rowKey="ddUserId" :pagination="pagination" @change="handleTableChange">
<span slot="name">姓名</span>
<span slot="departmentNameList" slot-scope="departmentNameList">
{{ departmentNameListToStr(departmentNameList) }}
......@@ -50,7 +50,7 @@
</span>
<span slot="action" slot-scope="text, record, index" class="operationTable">
<a href="javascript:;" @click="ToViewAllowances(record)">查看津贴</a>
<a v-if="record.status === MINGPAY_ACCOUNT_STATUS.ACTIVE" href="javascript:;" @click="showModal(record.userId, record.name, index)">充值</a>
<a v-if="record.status === MINGPAY_ACCOUNT_STATUS.ACTIVE" href="javascript:;" @click="showModal(record.ddUserId, record.name, index)">充值</a>
<a v-else href="javascript:;" style="color:#cccccc">充值</a>
<a-dropdown v-if="record.status === MINGPAY_ACCOUNT_STATUS.ACTIVE">
<a class="ant-dropdown-link" href="javascript:;">
......@@ -58,19 +58,19 @@
</a>
<a-menu slot="overlay">
<a-menu-item v-if="record.cardStatus === MINGPAY_ACCOUNT_STATUS.ACTIVE && record.cardNo ">
<a href="javascript:;" @click="showConfirm(record.userId, 1, index)">冻结实体卡</a>
<a href="javascript:;" @click="showConfirm(record.ddUserId, 1, index)">冻结实体卡</a>
</a-menu-item>
<a-menu-item v-if="record.cardStatus === MINGPAY_ACCOUNT_STATUS.UNACTIVE && record.cardNo">
<a href="javascript:;" @click="showConfirm(record.userId, 2, index)">解冻实体卡</a>
<a href="javascript:;" @click="showConfirm(record.ddUserId, 2, index)">解冻实体卡</a>
</a-menu-item>
<a-menu-item v-if="record.cardNo">
<a href="javascript:;" @click="confimBindSure(record.userId, index)">解绑实体卡</a>
<a href="javascript:;" @click="confimBindSure(record.ddUserId, index)">解绑实体卡</a>
</a-menu-item>
<a-menu-item v-else>
<a href="javascript:;" @click="changeVisible2(record.userId, index)">绑定实体卡</a>
<a href="javascript:;" @click="changeVisible2(record.ddUserId, index)">绑定实体卡</a>
</a-menu-item>
<a-menu-item v-if="record.status != MINGPAY_ACCOUNT_STATUS.LOG_OFF">
<a href="javascript:;" @click="showConfirm(record.userId, 3, index)">注销</a>
<a href="javascript:;" @click="showConfirm(record.ddUserId, 3, index)">注销</a>
</a-menu-item>
</a-menu>
</a-dropdown>
......@@ -161,8 +161,8 @@ export default {
}],
accountList: [],
rechargeData: {
userId: '',
userName: '',
ddUserId: '',
username: '',
orderPrice: '',
remark: ''
},
......@@ -198,16 +198,16 @@ export default {
queryAccountList () {
const _that = this
let AccountData = this.$qs.stringify({
pageNum: this.pagination.current,
numPerPage: this.pagination.defaultPageSize,
departmentIdList: this.searchSource.ddchoosePeople.departmentIdList,
userIdList: this.searchSource.ddchoosePeople.userIdList,
currentPage: this.pagination.current,
pageNumber: this.pagination.defaultPageSize,
ddDeptIds: this.searchSource.ddchoosePeople.departmentIdList,
ddUserIds: this.searchSource.ddchoosePeople.userIdList,
status: this.searchSource.accountStatus,
cardNo: this.searchSource.cardNum,
cardStatus: this.searchSource.cardStatus,
orgId: localStorage.getItem('orgId')
})
$http.get(`/v1/account/queryAccountList?${AccountData}`).then((res) => {
$http.get(`/account/queryAccountList?${AccountData}`).then((res) => {
_that.accountList = res.data.data.recordList
_that.pagination.total = parseInt(res.data.data.totalCount)
}).catch((err) => {
......@@ -321,7 +321,7 @@ export default {
},
// 查看津贴
ToViewAllowances (str) {
this.$router.push({ name: 'viewAllowances', params: { userId: str.userId } })
this.$router.push({ name: 'viewAllowances', params: { ddUserId: str.ddUserId } })
},
// 内部充值接口
internalRecharge () {
......@@ -338,7 +338,7 @@ export default {
this.rechargeData.remark = this.form.getFieldsValue().remark
this.rechargeData.orgId = localStorage.getItem('orgId')
let rechargeData = this.$qs.stringify(this.rechargeData)
$http.get(`/v1/charge/charge?${rechargeData}`).then((res) => {
$http.get(`/charge/charge?${rechargeData}`).then((res) => {
if (res.data.resultCode === '0') {
this.form.resetFields()
this.$message.success(res.data.data.message)
......@@ -356,21 +356,30 @@ export default {
},
// 充值modal
showModal (userId, userName, index) {
this.rechargeData.userId = userId
this.rechargeData.userName = userName
this.rechargeData.ddUserId = userId
this.rechargeData.username = userName
this.selsctIndex = index
this.visible = true
},
// 账户操作和卡片操作
accountOperation (type, userId, status, index) {
let accountOperationData = this.$qs.stringify({
userId: userId,
status: status,
let accountOperationData
let url = type === 3 ? 'update_account_status' : 'update_card_status'
if (type === 3) {
accountOperationData = this.$qs.stringify({
ddUserId: userId,
accountStatus: status,
orgId: localStorage.getItem('orgId')
})
let url = type === 3 ? 'update_account_status' : 'update_card_status'
$http.get(`/v1/account/${url}?${accountOperationData}`).then((res) => {
if (res.data.message === 'SUCCESS') {
} else {
accountOperationData = this.$qs.stringify({
ddUserId: userId,
cardStatus: status,
orgId: localStorage.getItem('orgId')
})
}
$http.get(`/account/${url}?${accountOperationData}`).then((res) => {
if (res.data.resultCode === '0') {
this.queryAccountList()
this.$message.success('操作成功')
}
......@@ -437,17 +446,17 @@ export default {
if (type === 2) {
cardOperationData = this.$qs.stringify({
cardNo: this.updateBindCardStatusForm.getFieldsValue().cardNo,
userId: this.selsctUserId,
ddUserId: this.selsctUserId,
orgId: localStorage.getItem('orgId')
})
} else if (type === 1) {
cardOperationData = this.$qs.stringify({
cardNo: '',
userId: this.selsctUserId,
ddUserId: this.selsctUserId,
orgId: localStorage.getItem('orgId')
})
}
$http.get(`/v1/account/update_bind_card_status?${cardOperationData}`).then((res) => {
$http.get(`/account/update_bind_card_status?${cardOperationData}`).then((res) => {
if (res.data.resultCode === '0') {
this.queryAccountList()
this.visible2 = false
......@@ -532,4 +541,18 @@ export default {
display: block;
text-align: center;
}
.choosePeople{
line-height: 32px;
width: 120px;
margin-right: 20px;
padding-left: 11px;
height: 32px;
border: 1px solid #d9d9d9;
border-radius: 4px;
color: #bfbfbf;
cursor: pointer;
}
.choosePeople:hover{
border: 1px solid #1890ff;
}
</style>
src/components/pages/PaymentManagement/AllowancePayment.vue
<template>
<a-spin :spinning="spinning" :delay="delayTime">
<div class="AllowancePayment">
<div class="searchBox">
<a-select placeholder="津贴类型" :allowClear="true" style="width: 120px;margin-right: 20px;" @change="selectHandType">
......@@ -6,7 +7,7 @@
<a-select-option value="MEAL">餐补</a-select-option>
</a-select>
<a-select placeholder="经办人" :allowClear="true" style="width: 120px;margin-right: 20px;" @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.userName }}</a-select-option>
</a-select>
<a-button type="primary" @click="search()">查询</a-button>
<a-button type="primary" @click="changeModel()" style="margin-left: 20px;"><a-icon type="pay-circle" />发放津贴</a-button>
......@@ -39,7 +40,6 @@
<a href="javascript:;" @click="toAllowanceDetails(record, text, index)">查看详情</a>
</span>
</a-table>
<a-spin :spinning="spinning" :delay="delayTime">
<a-modal title="发放津贴" v-model="visible" @ok="createSubsidy()">
<a-form :form="form">
<a-form-item
......@@ -88,8 +88,8 @@
</a-form-item>
</a-form>
</a-modal>
</a-spin>
</div>
</a-spin>
</template>
<script>
......@@ -184,8 +184,8 @@ export default {
let AgentData = this.$qs.stringify({
orgId: localStorage.getItem('orgId')
})
$http.get(`/v1/account/query_user_admin_list?${AgentData}`).then((res) => {
this.agentList = res.data.data.recordList
$http.get(`/account/query_user_admin_list?${AgentData}`).then((res) => {
this.agentList = res.data.data
})
},
toAllowanceDetails (record, text, index) {
......@@ -204,11 +204,11 @@ export default {
let RecordData = this.$qs.stringify({
currentPage: this.pagination.current,
pageNumber: this.pagination.defaultPageSize,
type: this.searchSource.type,
subsidyType: this.searchSource.type,
agentId: this.searchSource.agentId,
orgId: localStorage.getItem('orgId')
})
$http.get(`/v1/account/list_couponRecord?${RecordData}`).then((res) => {
$http.get(`/account/list_couponRecord?${RecordData}`).then((res) => {
let data = res.data.data
this.recordsList = data.list
this.pagination.total = parseInt(data.total)
......@@ -278,6 +278,7 @@ export default {
return str.substring(0, str.length - 1)
},
createSubsidy () {
this.visible = false
this.spinning = true
this.form.validateFields((err, fieldsValue) => {
if (err) {
......@@ -297,17 +298,16 @@ export default {
departmentIdList.push(item.id)
})
let RecordData = this.$qs.stringify({
userIds: userIdList,
departmentIds: departmentIdList,
ddUserIds: userIdList,
ddDeptIds: departmentIdList,
money: values.orderPrice,
endTime: `${values['date-picker']} 23:59:59`,
remark: values.remark,
type: values.select,
subsidyEnumType: values.select,
orgId: localStorage.getItem('orgId')
})
$http.get(`/v1/account/batch_create_subsidy?${RecordData}`).then((res) => {
$http.get(`/account/batch_create_subsidy?${RecordData}`).then((res) => {
if (res.data.resultCode === '0') {
this.visible = false
this.form.resetFields()
this.userIdListObj = []
this.departmentIdListObj = []
......
src/components/pages/PaymentManagement/CashierManagement.vue
......@@ -81,11 +81,11 @@ export default {
},
deleteCashier (record) {
let DeleteCashierData = this.$qs.stringify({
userId: record.userId,
status: '1',
ddUserId: record.userId,
cashierStatus: '1',
orgId: localStorage.getItem('orgId')
})
$http.get(`/v1/cashier/delete_cashier?${DeleteCashierData}`).then((res) => {
$http.get(`/cashier/delete_cashier?${DeleteCashierData}`).then((res) => {
if (res.data.resultCode === '0') {
this.$message.success('操作成功')
this.getCashierList()
......@@ -102,7 +102,7 @@ export default {
currentPage: this.pagination.current,
orgId: localStorage.getItem('orgId')
})
$http.get(`/v1/cashier/list_cashier?${CashierListData}`).then((res) => {
$http.get(`/cashier/list_cashier?${CashierListData}`).then((res) => {
this.pagination.total = parseInt(res.data.data.total)
this.cashierManagementList = res.data.data.list
}).catch(() => {
......@@ -121,12 +121,12 @@ export default {
choosePeople () {
config.ddready('ddchooseOne').then((res) => {
let insertCashierData = this.$qs.stringify({
name: res[0].name,
userId: res[0].emplId,
status: '0',
cashierName: res[0].name,
ddUserId: res[0].emplId,
cashierStatus: '0',
orgId: localStorage.getItem('orgId')
})
$http.get(`v1/cashier/insert_cashier?${insertCashierData}`).then((res) => {
$http.get(`/cashier/insert_cashier?${insertCashierData}`).then((res) => {
if (res.data.resultCode === '0') {
this.$message.success('添加成功')
this.getCashierList()
......
src/components/pages/PaymentManagement/PaymentManagementHome.vue
......@@ -9,13 +9,13 @@
style="height: 100%"
@click="routerPush"
>
<a-menu-item key="accountManagement">账户中心</a-menu-item>
<a-menu-item key="rechargeRecord">充值记录</a-menu-item>
<a-menu-item key="allowancePayment">津贴发放</a-menu-item>
<a-menu-item key="recordsOfConsumption">消费记录</a-menu-item>
<a-menu-item key="cashierManagement">收银员管理</a-menu-item>
<a-menu-item key="systemReconciliation">系统对账</a-menu-item>
<a-menu-item key="paymentManagementSetting">设置中心</a-menu-item>
<a-menu-item key="accountManagement"><div :class="[chooseMenuList === 'accountManagement' ? 'menuIcon menuIcon1_1' : 'menuIcon menuIcon1_2']"></div>账户中心</a-menu-item>
<a-menu-item key="rechargeRecord"><div :class="[chooseMenuList === 'rechargeRecord' ? 'menuIcon menuIcon2_1' : 'menuIcon menuIcon2_2']"></div>充值记录</a-menu-item>
<a-menu-item key="allowancePayment"><div :class="[chooseMenuList === 'allowancePayment' ? 'menuIcon menuIcon3_1' : 'menuIcon menuIcon3_2']"></div>津贴发放</a-menu-item>
<a-menu-item key="recordsOfConsumption"><div :class="[chooseMenuList === 'recordsOfConsumption' ? 'menuIcon menuIcon4_1' : 'menuIcon menuIcon4_2']"></div>消费记录</a-menu-item>
<a-menu-item key="cashierManagement"><div :class="[chooseMenuList === 'cashierManagement' ? 'menuIcon menuIcon5_1' : 'menuIcon menuIcon5_2']"></div>设置管理员</a-menu-item>
<a-menu-item key="systemReconciliation"><div :class="[chooseMenuList === 'systemReconciliation' ? 'menuIcon menuIcon6_1' : 'menuIcon menuIcon6_2']"></div>系统对账</a-menu-item>
<a-menu-item key="paymentManagementSetting"><div :class="[chooseMenuList === 'paymentManagementSetting' ? 'menuIcon menuIcon7_1' : 'menuIcon menuIcon7_2']"></div>设置中心</a-menu-item>
<!-- <a-menu-item key="operationLog">操作日志</a-menu-item> -->
</a-menu>
</a-layout-sider>
......@@ -31,7 +31,8 @@ export default {
name: 'paymentManagementHome',
data () {
return {
defaultSelectedKeys: 'defaultSelectedKeys'
defaultSelectedKeys: 'defaultSelectedKeys',
chooseMenuList: 'accountManagement'
}
},
created () {
......@@ -44,6 +45,7 @@ export default {
},
methods: {
routerPush (obj) {
this.chooseMenuList = obj.key
this.$router.push({ name: obj.key })
}
}
......@@ -51,5 +53,54 @@ export default {
</script>
<style lang="less" scoped>
.menuIcon{
width: 13px;
height: 13px;
margin-right: 5px;
margin-top: 3px;
background-size: cover;
display: inline-block;
}
.menuIcon1_1{
background-image: url('../../../assets/menuIcon/accountManagement1.png');
}
.menuIcon1_2{
background-image: url('../../../assets/menuIcon/accountManagement2.png');
}
.menuIcon2_1{
background-image: url('../../../assets/menuIcon/rechargeRecord1.png');
}
.menuIcon2_2{
background-image: url('../../../assets/menuIcon/rechargeRecord2.png');
}
.menuIcon3_1{
background-image: url('../../../assets/menuIcon/allowancePayment1.png');
}
.menuIcon3_2{
background-image: url('../../../assets/menuIcon/allowancePayment2.png');
}
.menuIcon4_1{
background-image: url('../../../assets/menuIcon/recordsOfConsumption1.png');
}
.menuIcon4_2{
background-image: url('../../../assets/menuIcon/recordsOfConsumption2.png');
}
.menuIcon5_1{
background-image: url('../../../assets/menuIcon/cashierManagement1.png');
}
.menuIcon5_2{
background-image: url('../../../assets/menuIcon/cashierManagement2.png');
}
.menuIcon6_1{
background-image: url('../../../assets/menuIcon/systemReconciliation1.png');
}
.menuIcon6_2{
background-image: url('../../../assets/menuIcon/systemReconciliation2.png');
}
.menuIcon7_1{
background-image: url('../../../assets/menuIcon/paymentManagementSetting1.png');
}
.menuIcon7_2{
background-image: url('../../../assets/menuIcon/paymentManagementSetting2.png');
}
</style>
src/components/pages/PaymentManagement/PaymentManagementSetting.vue
......@@ -7,12 +7,12 @@
<div class="paymentManagementSettingContent">
<div>
<label>现金充值：</label>
<a-input v-model="OrgSettingData.chargeProcessInstanceId" placeholder="请输入审批模板ID" style="width: 510px"/>
<a-input disabled v-model="OrgSettingData.chargeProcessInstanceId" placeholder="请输入审批模板ID" style="width: 510px"/>
<a-switch checkedChildren="开" unCheckedChildren="关" defaultChecked :checked="OrgSettingData.chargeSwitch !== '' && OrgSettingData.chargeSwitch !== 'CLOSE'" @change='chargeSwitchOnChange'/>
</div>
<div>
<label>津贴发放：</label>
<a-input v-model="OrgSettingData.provideSubsidyId" placeholder="请输入审批模板ID" style="width: 510px"/>
<a-input disabled v-model="OrgSettingData.provideSubsidyId" placeholder="请输入审批模板ID" style="width: 510px"/>
<a-switch checkedChildren="开" unCheckedChildren="关" defaultChecked :checked="OrgSettingData.provideSubsidySwitch !== '' && OrgSettingData.provideSubsidySwitch !== 'CLOSE'" @change='provideSubsidySwitchOnChange'/>
</div>
<!-- <div>
......@@ -69,7 +69,7 @@ export default {
let querySettingData = this.$qs.stringify({
orgId: localStorage.getItem('orgId')
})
$http.post(`/v1/org_setting/query_org_setting_by_org_id?${querySettingData}`).then((res) => {
$http.post(`/org_setting/query_org_setting_by_org_id?${querySettingData}`).then((res) => {
console.log(res)
this.OrgSettingData = res.data.data
}).catch((err) => {
......@@ -83,7 +83,7 @@ export default {
} else if (this.OrgSettingData.provideSubsidyId === '' && this.OrgSettingData.provideSubsidySwitch === 'OPEN') {
this.$message.error('打开审批开关后必须填写审批模版ID')
} else {
$http.post(`/v1/org_setting/update_org_setting_by_org_id?${updateSettingData}`).then((res) => {
$http.post(`/org_setting/update_org_setting_by_org_id?${updateSettingData}`).then((res) => {
if (res.data.resultCode === '0') {
this.$message.success('保存成功')
} else {
......
src/components/pages/PaymentManagement/RechargeRecord.vue
<template>
<div class="RechargeRecord">
<div class="searchBox">
<a-input placeholder="选择成员" disabled @click="choosePeople"/>
<div class="choosePeople" @click="choosePeople" style="width: 120px">选择成员</div>
<a-select placeholder="经办人" :allowClear="true" style="width: 120px;margin-right: 20px;" @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.userName }}</a-select-option>
</a-select>
<a-select placeholder="状态" :allowClear="true" style="width: 120px;margin-right: 20px;" @change="selectHandlestatus">
<a-select-option value="SUCCESS">已完成</a-select-option>
......@@ -114,8 +114,8 @@ export default {
let AgentData = this.$qs.stringify({
orgId: localStorage.getItem('orgId')
})
$http.get(`/v1/account/query_user_admin_list?${AgentData}`).then((res) => {
this.agentList = res.data.data.recordList
$http.get(`/account/query_user_admin_list?${AgentData}`).then((res) => {
this.agentList = res.data.data
})
},
// 选人组件调用
......@@ -172,10 +172,10 @@ export default {
currentPage: this.pagination.current,
agentId: this.searchSource.agentId,
status: this.searchSource.status,
userId: this.searchSource.UserMessage.emplId,
ddUserId: this.searchSource.UserMessage.emplId,
orgId: localStorage.getItem('orgId')
})
$http.get(`/v1/charge/list_charge?${RechargeData}`).then((res) => {
$http.get(`/charge/list_charge?${RechargeData}`).then((res) => {
let data = res.data.data
this.pagination.total = parseInt(data.totalCount)
this.chargeList = data.recordList
......@@ -259,4 +259,18 @@ export default {
display: block;
text-align: center;
}
.choosePeople{
line-height: 32px;
width: 120px;
margin-right: 20px;
padding-left: 11px;
height: 32px;
border: 1px solid #d9d9d9;
border-radius: 4px;
color: #bfbfbf;
cursor: pointer;
}
.choosePeople:hover{
border: 1px solid #1890ff;
}
</style>
src/components/pages/PaymentManagement/RecordsOfConsumption.vue
<template>
<div class="RecordsOfConsumption">
<div class="searchBox">
<a-input placeholder="消费人" @click="choosePeople" disabled style="width: 120px"/>
<div class="choosePeople" @click="choosePeople" style="width: 120px">选择成员</div>
<a-select placeholder="状态" :allowClear="true" style="width: 120px;margin-right: 20px;" @change="selectHandRecords">
<a-select-option value="SUCCESS">已消费</a-select-option>
<a-select-option value="REFUND_SUCCESS">已退款</a-select-option>
......@@ -138,7 +138,7 @@ export default {
let CashierListData = this.$qs.stringify({
orgId: localStorage.getItem('orgId')
})
$http.get(`/v1/cashier/list_cashier_all?${CashierListData}`).then((res) => {
$http.get(`/cashier/list_cashier_all?${CashierListData}`).then((res) => {
this.agentList = res.data.data.list
}).catch(() => {
this.$message.error('获取操作员信息失败')
......@@ -160,11 +160,11 @@ export default {
} else {
let refundData = this.$qs.stringify({
orderNo: this.refundSelect.orderNo,
userId: this.refundSelect.userId,
ddUserId: this.refundSelect.ddUserId,
remark: this.form.getFieldsValue().remark || '',
orgId: localStorage.getItem('orgId')
})
$http.get(`/v1/consume/refund?${refundData}`).then((res) => {
$http.get(`/consume/refund?${refundData}`).then((res) => {
if (res.data.message === 'SUCCESS') {
this.$message.success('退款成功')
this.visible = false
......@@ -195,11 +195,11 @@ export default {
currentPage: this.pagination.current,
pageNumber: this.pagination.defaultPageSize,
status: this.searchSource.status,
userId: this.searchSource.UserMessage.emplId,
ddUserId: this.searchSource.UserMessage.emplId,
agentId: this.searchSource.agentId,
orgId: localStorage.getItem('orgId')
})
$http.get(`/v1/consume/list_expense_record?${RecordListData}`).then((res) => {
$http.get(`/consume/list_expense_record?${RecordListData}`).then((res) => {
let data = res.data.data
this.recordsList = data.recordList
this.pagination.total = parseInt(data.totalCount)
......@@ -326,4 +326,18 @@ export default {
display: block;
text-align: center;
}
.choosePeople{
line-height: 32px;
width: 120px;
margin-right: 20px;
padding-left: 11px;
height: 32px;
border: 1px solid #d9d9d9;
border-radius: 4px;
color: #bfbfbf;
cursor: pointer;
}
.choosePeople:hover{
border: 1px solid #1890ff;
}
</style>
src/components/pages/PaymentManagement/SystemReconciliation.vue
......@@ -171,7 +171,7 @@ export default {
endTime: this.endTime,
orgId: localStorage.getItem('orgId')
})
$http.get(`v1/account/accountCheck?${SubsidyListData}`).then((res) => {
$http.get(`/account/accountCheck?${SubsidyListData}`).then((res) => {
console.log(res.data.data)
if (res.data.resultCode === '0') {
this.systemReconciliationDetails = res.data.data
......
src/components/pages/PaymentManagement/ViewAllowances.vue
......@@ -24,7 +24,7 @@ export default {
name: 'viewAllowances',
data () {
return {
userId: '',
ddUserId: '',
columns: [{
title: '津贴类型',
dataIndex: 'type',
......@@ -57,18 +57,18 @@ export default {
watch: {},
computed: {},
created: function () {
this.userId = this.$route.params.userId
this.ddUserId = this.$route.params.ddUserId
this.querySubsidyList()
},
methods: {
querySubsidyList () {
let SubsidyListData = this.$qs.stringify({
userId: this.userId,
ddUserId: this.ddUserId,
currentPage: this.pagination.current,
pageNumber: this.pagination.defaultPageSize,
orgId: localStorage.getItem('orgId')
})
$http.get(`/v1/account/query_subsidyList_by_user_id?${SubsidyListData}`).then((res) => {
$http.get(`/account/query_subsidyList_by_user_id?${SubsidyListData}`).then((res) => {
let data = res.data.data
this.subsidyList = data.recordList
this.pagination.total = parseInt(data.totalCount)
......
src/main.js
......@@ -39,7 +39,6 @@ Vue.prototype.$message = message
router.beforeEach(function (to, from, next) {
// 项目初始化进行鉴权
console.log('main')
if (to.name === 'noPermission' || to.name === 'configError') {
next()
} else {
......
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