Skip to content

M
mingPayPc
Commit 88bd95e6 by liang ce
Options

更新bug

parent 0df90a54
Showing with 61 additions and 59 deletions
src/components/pages/CanteenManagement/ConsumptionOrder.vue
......@@ -33,7 +33,9 @@
</a-popover>
</span>
<span slot="agentName">经办人</span>
<span slot="orderAmount">消费总额(元)</span>
<span slot="orderAmount" slot-scope="orderAmount">
{{ orderAmount.toFixed(2) }}
</span>
<span slot="mingPayOrderDetailList" slot-scope="mingPayOrderDetailList">
<a-popover>
<template slot="content">
......@@ -44,7 +46,7 @@
<div>X{{ item.productQuantity }}</div>
</div>
<div>
¥{{ item.productPrice }}
¥{{ item.productPrice.toFixed(2) }}
</div>
</div>
</template>
......@@ -93,11 +95,11 @@ export default {
scopedSlots: { customRender: 'buyerSysDeptNameList' }
}, {
title: '经办人',
dataIndex: 'agentName',
scopedSlots: { customRender: 'agentName' }
dataIndex: 'agentName'
}, {
title: '消费总额',
dataIndex: 'orderAmount'
title: '消费总额(元)',
dataIndex: 'orderAmount',
scopedSlots: { customRender: 'orderAmount' }
}, {
title: '消费菜品',
dataIndex: 'mingPayOrderDetailList',
......
src/components/pages/CanteenManagement/ConsumptionStatistics.vue
......@@ -27,8 +27,10 @@
<img style="width: 100px" :src="productIcon" alt="" />
</span>
<span slot="productName"></span>
<span slot="productPrice"></span>
<span slot="productPrice"></span>
<span slot="productPrice" slot-scope="productPrice">
{{ productPrice.toFixed(2) }}
</span>
<span slot="productStatisticalQuantity"></span>
</a-table>
</div>
</template>
......@@ -61,7 +63,8 @@ export default {
dataIndex: 'productName',
}, {
title: '价格(元)',
dataIndex: 'productPrice'
dataIndex: 'productPrice',
scopedSlots: { customRender: 'productPrice' }
}, {
title: '售出(份数)',
dataIndex: 'productStatisticalQuantity'
......
src/components/pages/CanteenManagement/MenuManagement.vue
......@@ -12,7 +12,9 @@
<img style="width: 100px" :src="productIcon" alt="" />
</span>
<span slot="productName"></span>
<span slot="productPrice"></span>
<span slot="productPrice" slot-scope="productPrice">
{{ productPrice.toFixed(2) }}
</span>
<span slot="productStatus" slot-scope="productStatus">
<a-badge v-if="productStatus === 'UP'" status="success" text="已上架" />
<a-badge v-else-if="productStatus === 'DOWN'" status="error" text="已下架" />
......@@ -103,7 +105,8 @@ export default {
dataIndex: 'productName'
}, {
title: '价格(元)',
dataIndex: 'productPrice'
dataIndex: 'productPrice',
scopedSlots: { customRender: 'productPrice' }
}, {
title: '排序值',
dataIndex: 'sort'
......
src/components/pages/PaymentManagement/AccountManagement.vue
......@@ -42,7 +42,7 @@
</a-popover>
</div>
</span>
<span slot="realityBalance" slot-scope="realityBalance">余额
<span slot="realityBalance" slot-scope="realityBalance">
{{ realityBalance.toFixed(2) }}
</span>
<span slot="cardNo" slot-scope="cardNo">
......@@ -149,7 +149,8 @@ export default {
width: '140px'
}, {
title: '余额',
dataIndex: 'realityBalance'
dataIndex: 'realityBalance',
scopedSlots: { customRender: 'realityBalance' }
}, {
title: '卡号',
dataIndex: 'cardNo',
......
src/components/pages/PaymentManagement/AllowanceDetails.vue
......@@ -9,11 +9,11 @@
</div>
<div>
<label>金额</label>
<div>{{allowanceDetails.money}}</div>
<div>{{allowanceDetails.money.toFixed(2)}}</div>
</div>
<div>
<label>截止日期</label>
<div>{{mwUtils.timeToStr(allowanceDetails.endTime) }}</div>
<div>{{ allowanceDetails.endTime }}</div>
</div>
<div>
<label>津贴类型</label>
......@@ -29,7 +29,7 @@
</div>
<div>
<label>发放时间</label>
<div>{{mwUtils.timeToStr(allowanceDetails.createTime) }}</div>
<div>{{ allowanceDetails.createTime }}</div>
</div>
<div>
<label>备注</label>
......@@ -40,12 +40,10 @@
</template>
<script>
import { mwUtils } from './../../../lib/utils.js'
export default {
name: 'allowanceDetails',
data () {
return {
mwUtils: mwUtils,
allowanceDetails: ''
}
},
......
src/components/pages/PaymentManagement/AllowancePayment.vue
......@@ -12,24 +12,14 @@
<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>
</div>
<!-- <div class="searchUserMessage" v-if="searchSource.UserMessage.emplId">
<div class="positionDiv"></div>
<div class="clearUserMessage"><a href="javascript:;" @click="clearUserMessage">清除</a></div>
<div style="text-align: center">
<img v-if="searchSource.UserMessage.avatar" :src="searchSource.UserMessage.avatar" :alt="searchSource.UserMessage.name"/>
<img v-else :src="this.avatarCanvasFn(searchSource.UserMessage.name)" :alt="searchSource.UserMessage.name">
<span>{{ searchSource.UserMessage.name }}</span>
</div>
</div> -->
<a-table :columns="columns" :dataSource="recordsList" size="default" rowKey="grantNumber" :pagination="pagination" @change="handleTableChange">
<span slot="recipient">成员</span>
<span slot="money">金额</span>
<span slot="money" slot-scope="money">
{{ money.toFixed(2) }}
</span>
<span slot="type" slot-scope="type">{{ type === 'TRAVEL' ? '交通补助' : '餐补' }}</span>
<!-- <span slot="grantNumber">单号</span> -->
<span slot="agentId">经办人</span>
<span slot="createTime" slot-scope="createTime">
{{ mwUtils.timeToStr(createTime) }}
</span>
<span slot="createTime">时间</span>
<span slot="remark">备注</span>
<span slot="couponRecordStatus" slot-scope="couponRecordStatus">
<a-badge v-if="couponRecordStatus === MINGPAY_SUBSIDY_STATUS.WAITING_PERMIT" status="processing" text="审批中" />
......@@ -97,12 +87,10 @@ import { config } from './../../../api/config.js'
import { $http } from './../../../api/axios.js'
import { MINGPAY_SUBSIDY_STATUS } from './../../../api/constant'
import moment from 'moment'
import { mwUtils } from './../../../lib/utils.js'
export default {
name: 'AllowancePayment',
data () {
return {
mwUtils: mwUtils,
MINGPAY_SUBSIDY_STATUS: MINGPAY_SUBSIDY_STATUS,
spinning: false,
delayTime: 100,
......@@ -122,7 +110,8 @@ export default {
width: '200px'
}, {
title: '金额',
dataIndex: 'money'
dataIndex: 'money',
scopedSlots: { customRender: 'money' }
}, {
title: '津贴类型',
dataIndex: 'type',
......@@ -140,8 +129,7 @@ export default {
dataIndex: 'remark'
}, {
title: '时间',
dataIndex: 'createTime',
scopedSlots: { customRender: 'createTime' }
dataIndex: 'createTime'
}, {
title: '操作',
dataIndex: 'action',
......
src/components/pages/PaymentManagement/RechargeRecord.vue
......@@ -26,14 +26,16 @@
<a-table :columns="columns" :dataSource="chargeList" :pagination="pagination" @change="handleTableChange" rowKey="orderNo">
<span slot="userName">姓名</span>
<span slot="departmentNameList" slot-scope="departmentNameList, record">
<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>
<div v-if="departmentNameList.length > 0">
<a-popover v-for="(item,indexOf) in departmentNameList" :key="indexOf">
<template slot="content">
<p>{{record.parentSysDeptNameList[indexOf]}}</p>
</template>
<span class="deptModel">{{item}}</span>
</a-popover>
</div>
</span>
<span slot="chargeAmount">充值金额</span>
<span slot="chargeAmount"></span>
<span slot="agent" slot-scope="agent, record">
{{ agent === '' && record.payTypeCode === 'EXTERNAL_ALI_RECHAGE' ? '支付宝自充' : agent }}
</span>
......@@ -42,9 +44,7 @@
<a-badge v-else-if="orderStatus === MINGPAY_CHARGE_ORDERSTATUS.SUCCESS" status="success" text="已完成" />
<a-badge v-else-if="orderStatus === MINGPAY_CHARGE_ORDERSTATUS.FAILED" status="error" text="审批未通过" />
</span>
<span slot="createTime" slot-scope="createTime">
{{ createTime }}
</span>
<span slot="createTime">时间</span>
<span slot="remark">备注</span>
</a-table>
</div>
......@@ -81,8 +81,7 @@ export default {
scopedSlots: { customRender: 'orderStatus' }
}, {
title: '时间',
dataIndex: 'createTime',
scopedSlots: { customRender: 'createTime' }
dataIndex: 'createTime'
}, {
title: '备注',
dataIndex: 'remark'
......
src/components/pages/PaymentManagement/RecordsOfConsumption.vue
......@@ -25,16 +25,22 @@
<a-table :columns="columns" :dataSource="recordsList" size="default" rowKey="orderNo" :pagination="pagination" @change="handleTableChange">
<span slot="userName">消费人</span>
<span slot="departmentNameList" slot-scope="departmentNameList, record">
<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>
<div v-if="departmentNameList.length > 0">
<a-popover v-for="(item,indexOf) in departmentNameList" :key="indexOf">
<template slot="content">
<p>{{record.parentSysDeptNameList[indexOf]}}</p>
</template>
<span class="deptModel">{{item}}</span>
</a-popover>
</div>
</span>
<span slot="agent">收银员</span>
<span slot="consumptionAmount">实际消费</span>
<span slot="consumptionSubsidyAmount">津贴消费</span>
<span slot="consumptionAmount" slot-scope="consumptionAmount">
{{ consumptionAmount.toFixed(2) }}
</span>
<span slot="consumptionSubsidyAmount" slot-scope="consumptionSubsidyAmount">
{{ consumptionSubsidyAmount.toFixed(2) }}
</span>
<!-- <span slot="orderNo">单号</span> -->
<span slot="orderStatus" slot-scope="orderStatus">
<a-badge v-if="orderStatus === MINGPAY_RECORDS_STATUS.SUCCESS" status="success" text="已消费" />
......@@ -85,11 +91,13 @@ export default {
dataIndex: 'agent'
}, {
title: '实际消费',
dataIndex: 'consumptionAmount'
dataIndex: 'consumptionAmount',
scopedSlots: { customRender: 'consumptionAmount' }
},
{
title: '津贴消费',
dataIndex: 'consumptionSubsidyAmount'
dataIndex: 'consumptionSubsidyAmount',
scopedSlots: { customRender: 'consumptionSubsidyAmount' }
},
// {
// title: '单号',
......
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