dianliang/lanan-system-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11.03

Browse Source
This commit is contained in:
sunhaoyuan 2025-11-03 15:40:15 +08:00
parent 77beb80e4e
commit 0015298eda
3 changed files with 41 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/rescue/checkpointMoney.vue
View File

@ -69,8 +69,8 @@
</el-table-column>
<el-table-column label="救援车车牌" prop="driverCarNum" align="center" min-width="120" />
<el-table-column label="被施救车车牌" prop="licenseNum" align="center" min-width="140" />
<el-table-column label="金额(元)" align="center" min-width="100">
<template slot-scope="scope">{{ (scope.row.setMoney / 100).toFixed(2) }}</template>
<el-table-column label="过关费(元)" align="center" min-width="100">
<template slot-scope="scope">{{ scope.row.checkpointMoney }}</template>
</el-table-column>
<!-- 取消固定列，避免右侧空白 -->
<!-- <el-table-column label="操作" align="center" min-width="120">

47
src/views/rescue/index.vue
View File

@ -66,9 +66,9 @@
</el-select>
</el-form-item>
<!-- 调度员 -->
<el-form-item label="调度员">
<el-select v-model="queryParams.secondDispatchName" placeholder="请选择调度员" filterable clearable
<!-- 调度 -->
<el-form-item label="调度">
<el-select v-model="queryParams.secondDispatchName" placeholder="请选择调度" filterable clearable
style="width:240px" @visible-change="loadAllDispatchers">
<!-- @change="onDispatcherChange" -->
<el-option v-for="p in dispatcherList" :key="p.id" :label="p.nickname" :value="p.nickname" />
@ -158,7 +158,6 @@
<el-table-column width="100" label="出发里程表" align="center" prop="startScale" />
<el-table-column width="100" label="结束里程表" align="center" prop="endScale" />
<el-table-column width="100" label="施救里程数" align="center" prop="endScale">
<el-table-column width="100" label="过关费" align="center" prop="checkpointMoney" />
<template slot-scope="scope">
<span v-if="Number.isFinite(scope.row.startScale) &&
Number.isFinite(scope.row.endScale) &&
@ -167,6 +166,7 @@
</span>
</template>
</el-table-column>
<el-table-column width="100" label="过关费" align="center" prop="checkpointMoney" />
<el-table-column label="收费类型" align="center" prop="feeType">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.FEE_TYPE" :value="scope.row.feeType" />
@ -216,6 +216,7 @@
</template>
</el-table-column>
<el-table-column label="确认收款人" align="center" width="100" prop="confirmPaymentPersonName" />
<el-table-column label="收款账号" align="center" width="100" prop="accountNumber" />
<el-table-column label="确认收款时间" align="center" width="100" prop="confirmPaymentTime" />
<el-table-column label="确认收款备注" align="center" width="100" prop="confirmPaymentPersonRemark"
show-overflow-tooltip />
@ -301,7 +302,7 @@
<el-form ref="billedFormRef" :model="billedForm" label-width="120px">
<!-- 操作人（只读） -->
<el-form-item label="操作人">
<el-input v-model="billedForm.billedUsername" :disabled="true" placeholder="—" />
<el-input v-model="billedForm.billedUsername" :disabled="true" />
</el-form-item>
<!-- 开票二维码：展示 + 预览 -->
<el-form-item label="开票二维码">
@ -313,7 +314,7 @@
<!-- 发票备注（只读） -->
<el-form-item label="发票备注">
<el-input v-model="billedForm.billedRemark" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }"
:disabled="true" placeholder="—" />
:disabled="true" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -669,8 +670,18 @@
<el-dialog title="确认收款" :visible.sync="confirmPaymentOpen" width="600px" append-to-body>
<el-form ref="confirmPaymentForm" :model="confirmPaymentForm" :rules="rules" label-width="120px">
<el-form-item label="实收金额" prop="payMoney">
<el-input-number v-model="confirmPaymentForm.payMoney" placeholder="请输入实收金额" />
<el-form-item label="实收金额" prop="payMoney">
<el-input-number v-model="confirmPaymentForm.payMoney" placeholder="请输入实收金额" />
</el-form-item>
<el-form-item label="收款账号" prop="accountNumber">
<el-select v-model="confirmPaymentForm.accountNumber" placeholder="请选择收款账号">
<el-option
v-for="item in accountList"
:key="item.id"
:label="item.accountNumber"
:value="item.accountNumber"
/>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="confirmPaymentPersonRemark">
<el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" placeholder="请输入备注"
@ -693,6 +704,9 @@
<el-form-item label="确认收款人">
<el-input v-model="viewPaymentForm.confirmPaymentPersonName" :disabled="true" />
</el-form-item>
<el-form-item label="收款账号">
<el-input v-model="viewPaymentForm.accountNumber" :disabled="true" />
</el-form-item>
<el-form-item label="确认收款时间">
<el-input v-model="viewPaymentForm.confirmPaymentTime" :disabled="true" />
</el-form-item>
@ -740,7 +754,7 @@ import Map from '../../components/Map/index'
import PrintButton from "@/components/PrintButton";
import { getTenantId } from '@/utils/auth'
import dayjs from 'dayjs'
import { getAccounts } from '@/views/company/account/api/accountApi'
export default {
name: 'Info',
@ -756,7 +770,6 @@ export default {
// ❶ 这里把环境变量取出来，模板里直接用 imageUrl
imageUrl: process.env.VUE_APP_PREVIEW_URL,
// channelList:[],
// sourceList:[],
countNum: {
yingskNum: 0, // 应收款
@ -847,6 +860,7 @@ export default {
viewPaymentOpen: false,
viewPaymentForm: {
confirmPaymentPersonName: '',
accountNumber:'',
confirmPaymentTime: '',
payMoney: 0,
confirmPaymentPersonRemark: ''
@ -897,6 +911,15 @@ export default {
this.getList()
},
methods: {
async loadAccountList() {
try {
const res = await getAccounts({ pageNo: 1, pageSize: 100, systemCode: 'rescue'});
this.accountList = res.data?.records || [];
} catch (err) {
this.$message.error('收款账号加载失败');
}
},
/** 下拉第一次展开时，把两种角色合并拉取 */
async loadAllDispatchers(visible) {
if (!visible || this.dispatcherLoaded) return
@ -1115,8 +1138,9 @@ export default {
}
})
},
confirmPayment(data) {
async confirmPayment(data) {
this.getLoginUserInfo()
await this.loadAccountList(); // 打开弹框时加载收款账号
this.confirmPaymentOpen = true
this.confirmPaymentForm.id = data.rescueOrderId
this.confirmPaymentForm.payMoney = (data.setMoney / 100).toFixed(2)
@ -1128,6 +1152,7 @@ export default {
this.viewPaymentOpen = true
this.viewPaymentForm = {
confirmPaymentPersonName: data.confirmPaymentPersonName,
accountNumber: data.accountNumber,
confirmPaymentTime: data.confirmPaymentTime,
payMoney: data.payMoney,
confirmPaymentPersonRemark: data.confirmPaymentPersonRemark

5
src/views/rescue/refuelRecord.vue
View File

@ -8,6 +8,7 @@
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="车牌号" prop="carId">
<el-input
@ -25,9 +26,9 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
clearable
@change="handleQuery"
@change="handleQuery"
/>
</el-form-item>