Commit 0b04f2c2 by liang ce

部门修改

parent df42af92
import axios from 'axios' import axios from 'axios'
import qs from 'qs' import qs from 'qs'
// axios.defaults.baseURL = 'http://192.168.1.106:8300/v1/isv' // 本地荣 // 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://192.168.1.102:8300/v1/isv' // 本地钱
axios.defaults.baseURL = 'http://139.196.213.18:8300/v1/isv' // beta环境 // axios.defaults.baseURL = 'http://139.196.213.18:8300/v1/isv' // beta环境
let loadingInstance // 创建Loading 的实例 let loadingInstance // 创建Loading 的实例
axios.defaults.headers['Authorization'] = `Bearer ${localStorage.getItem('token')}` // 设置请求头为 Authorization axios.defaults.headers['Authorization'] = `Bearer ${localStorage.getItem('token')}` // 设置请求头为 Authorization
// 配置发送请求前的拦截器可以设置token信息 // 配置发送请求前的拦截器可以设置token信息
......
...@@ -33,14 +33,12 @@ ...@@ -33,14 +33,12 @@
<a-table :columns="columns" :dataSource="accountList" size="default" rowKey="ddUserId" :pagination="pagination" @change="handleTableChange"> <a-table :columns="columns" :dataSource="accountList" size="default" rowKey="ddUserId" :pagination="pagination" @change="handleTableChange">
<span slot="name">姓名</span> <span slot="name">姓名</span>
<span slot="departmentNameList" slot-scope="departmentNameList, record"> <span slot="departmentNameList" slot-scope="departmentNameList, record">
<a-popover v-for="(item,indexOf) in departmentNameList" :key="indexOf"> <a-popover v-if="item" v-for="(item,indexOf) in departmentNameList" :key="indexOf">
<template slot="content"> <template slot="content">
<p>{{record.parentSysDeptNameList[indexOf]}}</p> <p>{{record.parentSysDeptNameList[indexOf]}}</p>
</template> </template>
<span class="deptModel">{{item}}</span> <span class="deptModel">{{item}}</span>
</a-popover> </a-popover>
<!-- <span>{{ departmentNameListToStr(departmentNameList) }}</span>
{{record}} -->
</span> </span>
<span slot="realityBalance">余额</span> <span slot="realityBalance">余额</span>
<span slot="cardNo" slot-scope="cardNo"> <span slot="cardNo" slot-scope="cardNo">
......
...@@ -25,8 +25,13 @@ ...@@ -25,8 +25,13 @@
</div> </div>
<a-table :columns="columns" :dataSource="chargeList" :pagination="pagination" @change="handleTableChange" rowKey="orderNo"> <a-table :columns="columns" :dataSource="chargeList" :pagination="pagination" @change="handleTableChange" rowKey="orderNo">
<span slot="userName">姓名</span> <span slot="userName">姓名</span>
<span slot="departmentNameList" slot-scope="departmentNameList"> <span slot="departmentNameList" slot-scope="departmentNameList, record">
{{ departmentNameListToStr(departmentNameList) }} <a-popover v-if="item" v-for="(item,indexOf) in departmentNameList" :key="indexOf">
<template slot="content">
<p>{{record.parentSysDeptNameList[indexOf]}}</p>
</template>
<span class="deptModel">{{item}}</span>
</a-popover>
</span> </span>
<span slot="chargeAmount">充值金额</span> <span slot="chargeAmount">充值金额</span>
<span slot="agent" slot-scope="agent, record"> <span slot="agent" slot-scope="agent, record">
......
...@@ -24,8 +24,13 @@ ...@@ -24,8 +24,13 @@
</div> </div>
<a-table :columns="columns" :dataSource="recordsList" size="default" rowKey="orderNo" :pagination="pagination" @change="handleTableChange"> <a-table :columns="columns" :dataSource="recordsList" size="default" rowKey="orderNo" :pagination="pagination" @change="handleTableChange">
<span slot="userName">消费人</span> <span slot="userName">消费人</span>
<span slot="departmentNameList" slot-scope="departmentNameList"> <span slot="departmentNameList" slot-scope="departmentNameList, record">
{{ departmentNameListToStr(departmentNameList) }} <a-popover v-if="item" v-for="(item,indexOf) in departmentNameList" :key="indexOf">
<template slot="content">
<p>{{record.parentSysDeptNameList[indexOf]}}</p>
</template>
<span class="deptModel">{{item}}</span>
</a-popover>
</span> </span>
<span slot="agent">收银员</span> <span slot="agent">收银员</span>
<span slot="consumptionAmount">实际消费</span> <span slot="consumptionAmount">实际消费</span>
......
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