chuangte/bick_back
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.调整

Browse Source
This commit is contained in:
邱贞招 2024-08-08 10:07:36 +08:00
parent bb055e971f
commit 89ffb63be2
5 changed files with 45 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/system/area/areaSet.vue
View File

@ -345,7 +345,7 @@ export default {
areaName: [{ required: true, message: "运营区域不能为空", trigger: "blur" }],
autoReplacementOrder: [{ required: true, message: "最低电量不能为空", trigger: "blur" }],
deptId: [{ required: true, message: "运营商不能为空", trigger: "blur" }],
ruleIds: [{ required: true, message: "收费方式不能为空", trigger: "blur" }],
// ruleIds: [{ required: true, message: "收费方式不能为空", trigger: "blur" }],
deposit: [{ required: true, message: "骑行押金不能为空", trigger: "blur" }],
},

8
src/views/system/area/index.vue
View File

@ -46,11 +46,11 @@
<el-table-column label="运营区域" align="center" prop="areaName" />
<el-table-column label="运营商" align="center" prop="deptName" />
<el-table-column label="车数量" align="center" prop="deviceNum" />
<el-table-column label="运营区设置" align="center" :show-overflow-tooltip="true">
<el-table-column label="运营区域" align="center" :show-overflow-tooltip="true">
<template slot-scope="scope">
<router-link :to="'/system/areaSet/index/' + scope.row.areaId" class="link-type">
<el-button size="mini" type="text" icon="el-icon-edit"
v-hasPermi="['system:area:edit']">修改</el-button>
<el-button size="mini" type="text" class="link-type"
v-hasPermi="['system:area:edit']">修改电子围栏</el-button>
</router-link>
</template>
</el-table-column>
@ -114,7 +114,7 @@
v-hasPermi="['system:area:edit']">修改</el-button>
</router-link> -->
<el-button size="mini" type="text" icon="el-icon-edit" @click="openmaps(scope.row)"
v-hasPermi="['system:area:edit']">修改电子围栏</el-button>
v-hasPermi="['system:area:edit']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:area:remove']">删除</el-button>
</template>

21
src/views/system/device/index.vue
View File

@ -537,9 +537,9 @@
</div>
</el-row>
<el-row>
<order-record v-show="activeIndex == '1'" :sn="form.sn"/>
<repair-record v-show="activeIndex == '2'" :sn="form.sn"/>
<replacement-record v-show="activeIndex == '3'" :sn="form.sn"/>
<order-record v-if="activeIndex == '1'" :key="orderRecordKey" :sn="form.sn"/>
<repair-record v-if="activeIndex == '2'" :key="repairRecordKey" :sn="form.sn"/>
<replacement-record v-if="activeIndex == '3'" :key="replacementRecordKey" :sn="form.sn"/>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
@ -633,6 +633,9 @@ export default {
areaOptions: [],
// 通过key重新渲染area-map组件
// key: 0,
orderRecordKey: 0, // 初始值
repairRecordKey: 0,
replacementRecordKey: 0,
// 查询参数
queryParams: {
pageNum: 1,
@ -953,6 +956,17 @@ export default {
handleSelect(key, keyPath) {
this.activeIndex = key;
console.log(key, keyPath);
// 强制刷新所有组件
if (key === '1') {
this.orderRecordKey += 1;
}
if (key === '2') {
this.repairRecordKey += 1;
}
if (key === '3') {
this.replacementRecordKey += 1;
}
},
/** 查询设备列表 */
getList() {
@ -1054,6 +1068,7 @@ export default {
this.form = row;
this.showPlaceSearchMap = true;
this.key++;
this.orderRecordKey += 1;
},
/** 修改按钮操作 */
handleUpdate(row) {

10
src/views/system/flow/index.vue
View File

@ -47,6 +47,16 @@
/>
</el-select>
</el-form-item>
<el-form-item label="支付方式" prop="payType">
<el-select style="width: 150px" v-model="queryParams.payType" placeholder="请选择业务类型" clearable>
<el-option
v-for="dict in dict.type.et_pay_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="交易时间">
<el-date-picker
v-model="dateRange"

41
src/views/system/order/index.vue
View File

@ -53,6 +53,16 @@
/>
</el-select>
</el-form-item>
<el-form-item label="支付方式" prop="payType">
<el-select v-model="queryParams.payType" placeholder="请选择状态" clearable>
<el-option
v-for="dict in dict.type.et_pay_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -271,7 +281,7 @@
<el-form-item label="计费模板：" >{{ form.rule.name }}</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.etRefunds.length > 0">
<el-row v-if="form.etRefunds && form.etRefunds.length > 0">
<el-col :span="24">
<el-card v-for="(refund, index) in form.etRefunds" :key="index" class="refund-card">
<span style="font-weight: 700">退款{{index+1}}</span>
@ -298,38 +308,11 @@
</el-card>
</el-col>
</el-row>
<!-- <el-row v-if="form.etRefunds.length > 0">-->
<!-- <el-col :span="12">-->
<!-- <el-form-item v-for="(refund, index) in form.etRefunds" :key="index" label="预约费退款：">{{ formatFee(refund.appointmentFee) }}</el-form-item>-->
<!-- <el-form-item v-for="(refund, index) in form.etRefunds" :key="index" label="调度费退款：">{{ formatFee(refund.dispatchFee) }}</el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item v-for="(refund, index) in form.etRefunds" :key="index" label="骑行费用退款：" >{{ formatFee(refund.ridingFee) }}</el-form-item>-->
<!-- <el-form-item v-for="(refund, index) in form.etRefunds" :key="index" label="停车点外调度费退款：" >{{ formatFee(refund.manageFee) }}</el-form-item>-->
<!-- </el-col>-->
<!--&lt;!&ndash; <el-col :span="12">&ndash;&gt;-->
<!--&lt;!&ndash; <el-form-item label="预约费退款：">{{ formatFee(form.etRefund.appointmentFee) }}</el-form-item>&ndash;&gt;-->
<!--&lt;!&ndash; <el-form-item label="调度费退款：">{{ formatFee(form.etRefund.dispatchFee) }}</el-form-item>&ndash;&gt;-->
<!--&lt;!&ndash; </el-col>&ndash;&gt;-->
<!--&lt;!&ndash; <el-col :span="12">&ndash;&gt;-->
<!--&lt;!&ndash; <el-form-item label="骑行费用退款：" >{{ formatFee(form.etRefund.ridingFee) }}</el-form-item>&ndash;&gt;-->
<!--&lt;!&ndash; <el-form-item label="停车点外调度费退款：" >{{ formatFee(form.etRefund.manageFee) }}</el-form-item>&ndash;&gt;-->
<!--&lt;!&ndash; </el-col>&ndash;&gt;-->
<!-- </el-row>-->
<!-- <el-row v-if="form.etRefunds.length > 0">-->
<!-- <el-col :span="12">-->
<!-- <el-form-item v-for="(refund, index) in etRefunds" :key="index" label="退款原因：">{{ refund.reason }}</el-form-item>-->
<!-- <el-form-item v-for="(refund, index) in etRefunds" :key="index" label="退款时间：">{{ refund.createTime }}</el-form-item>-->
<!--&lt;!&ndash; <el-form-item label="退款原因：">{{ form.etRefund.reason }}</el-form-item>&ndash;&gt;-->
<!--&lt;!&ndash; <el-form-item label="退款时间：">{{ form.etRefund.createTime }}</el-form-item>&ndash;&gt;-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-row v-if="form.etRefunds.length > 0">
<el-row v-if="form.etRefunds && form.etRefunds.length > 0">
<el-col :span="12">
<el-form-item label="结算总费用：">
{{ formatFee(calculateNetFee()) }}
</el-form-item>
<!-- <el-form-item label="结算总费用：">{{ formatFee(form.payFee-form.etRefund.appointmentFee-form.etRefund.dispatchFee-form.etRefund.ridingFee-form.etRefund.manageFee) }}</el-form-item>-->
</el-col>
</el-row>
</el-form>