|
|
@@ -1,6 +1,7 @@
|
|
|
<template>
|
|
|
<div class="app-container">
|
|
|
- <!-- <el-card class="box-card">
|
|
|
+ <div v-if="showHistory">
|
|
|
+ <!-- <el-card class="box-card">
|
|
|
<el-row>
|
|
|
<h4>通用经销商工程机押金比例配置</h4>
|
|
|
<h4>
|
|
|
@@ -12,280 +13,284 @@
|
|
|
</h4>
|
|
|
</el-row>
|
|
|
</el-card> -->
|
|
|
- <!-- 筛选条件 -->
|
|
|
- <div>
|
|
|
- <el-form
|
|
|
- ref="searchForm"
|
|
|
- :model="searchForm"
|
|
|
- label-width="100px"
|
|
|
- size="small"
|
|
|
- label-position="left"
|
|
|
- >
|
|
|
- <el-row :gutter="20">
|
|
|
- <el-col :xs="24" :sm="12" :lg="6">
|
|
|
- <el-form-item label="经销商名称" prop="customerName">
|
|
|
- <el-input
|
|
|
- v-model="searchForm.customerName"
|
|
|
- placeholder="请输入经销商名称"
|
|
|
- ></el-input>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
-
|
|
|
- <el-col :xs="24" :sm="12" :lg="18">
|
|
|
- <el-form-item label="" class="fr">
|
|
|
- <el-button size="small" @click="clearFn">清空</el-button>
|
|
|
- <el-button size="small" type="primary" @click="searchFn"
|
|
|
- >搜索</el-button
|
|
|
- >
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- </el-row>
|
|
|
- </el-form>
|
|
|
- </div>
|
|
|
- <!-- 按钮 -->
|
|
|
- <div class="btn-group clearfix">
|
|
|
- <div class="fl">
|
|
|
- <el-button
|
|
|
- v-if="$checkBtnRole('add', $route.meta.roles)"
|
|
|
- type="primary"
|
|
|
+ <!-- 筛选条件 -->
|
|
|
+ <div>
|
|
|
+ <el-form
|
|
|
+ ref="searchForm"
|
|
|
+ :model="searchForm"
|
|
|
+ label-width="100px"
|
|
|
size="small"
|
|
|
- @click="addFn"
|
|
|
- >新增</el-button
|
|
|
+ label-position="left"
|
|
|
>
|
|
|
+ <el-row :gutter="20">
|
|
|
+ <el-col :xs="24" :sm="12" :lg="6">
|
|
|
+ <el-form-item label="经销商名称" prop="customerName">
|
|
|
+ <el-input
|
|
|
+ v-model="searchForm.customerName"
|
|
|
+ placeholder="请输入经销商名称"
|
|
|
+ ></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+
|
|
|
+ <el-col :xs="24" :sm="12" :lg="18">
|
|
|
+ <el-form-item label="" class="fr">
|
|
|
+ <el-button size="small" @click="clearFn">清空</el-button>
|
|
|
+ <el-button size="small" type="primary" @click="searchFn"
|
|
|
+ >搜索</el-button
|
|
|
+ >
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ </el-form>
|
|
|
+ </div>
|
|
|
+ <!-- 按钮 -->
|
|
|
+ <div class="btn-group clearfix">
|
|
|
+ <div class="fl">
|
|
|
+ <el-button
|
|
|
+ v-if="$checkBtnRole('add', $route.meta.roles)"
|
|
|
+ type="primary"
|
|
|
+ size="small"
|
|
|
+ @click="addFn"
|
|
|
+ >新增</el-button
|
|
|
+ >
|
|
|
+ </div>
|
|
|
</div>
|
|
|
- </div>
|
|
|
|
|
|
- <div class="mymain-container">
|
|
|
- <!-- 列表 -->
|
|
|
- <div class="table">
|
|
|
- <el-table
|
|
|
- v-loading="listLoading"
|
|
|
- :data="dataList"
|
|
|
- element-loading-text="Loading"
|
|
|
- border
|
|
|
- fit
|
|
|
- highlight-current-row
|
|
|
- stripe
|
|
|
- >
|
|
|
- <el-table-column
|
|
|
- align="center"
|
|
|
- label="经销商编码"
|
|
|
- prop="customerNumber"
|
|
|
- min-width="160"
|
|
|
- show-overflow-tooltip
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- align="center"
|
|
|
- label="经销商名称"
|
|
|
- prop="customerName"
|
|
|
- min-width="160"
|
|
|
- show-overflow-tooltip
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- align="center"
|
|
|
- label="押金比例"
|
|
|
- prop="rate"
|
|
|
- min-width="160"
|
|
|
- show-overflow-tooltip
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- align="center"
|
|
|
- label="押金"
|
|
|
- prop="amount"
|
|
|
- min-width="160"
|
|
|
- show-overflow-tooltip
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- align="center"
|
|
|
- label="开始时间"
|
|
|
- prop="startTime"
|
|
|
- min-width="160"
|
|
|
- show-overflow-tooltip
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- align="center"
|
|
|
- label="结束时间"
|
|
|
- prop="endTime"
|
|
|
- min-width="160"
|
|
|
- show-overflow-tooltip
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- align="center"
|
|
|
- label="备注"
|
|
|
- prop="remark"
|
|
|
- min-width="160"
|
|
|
- show-overflow-tooltip
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- align="center"
|
|
|
- label="创建人"
|
|
|
- prop="createBy"
|
|
|
- min-width="160"
|
|
|
- show-overflow-tooltip
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- align="center"
|
|
|
- label="创建时间"
|
|
|
- prop="createTime"
|
|
|
- min-width="160"
|
|
|
- show-overflow-tooltip
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- align="center"
|
|
|
- label="更新人"
|
|
|
- prop="updateBy"
|
|
|
- min-width="160"
|
|
|
- show-overflow-tooltip
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- align="center"
|
|
|
- label="更新时间"
|
|
|
- prop="updateTime"
|
|
|
- min-width="160"
|
|
|
- show-overflow-tooltip
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- align="center"
|
|
|
- label="操作"
|
|
|
- min-width="200"
|
|
|
- show-overflow-tooltip
|
|
|
- fixed="right"
|
|
|
+ <div class="mymain-container">
|
|
|
+ <!-- 列表 -->
|
|
|
+ <div class="table">
|
|
|
+ <el-table
|
|
|
+ v-loading="listLoading"
|
|
|
+ :data="dataList"
|
|
|
+ element-loading-text="Loading"
|
|
|
+ border
|
|
|
+ fit
|
|
|
+ highlight-current-row
|
|
|
+ stripe
|
|
|
>
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-button
|
|
|
- type="text"
|
|
|
- class="textColor"
|
|
|
- v-if="$checkBtnRole('edit', $route.meta.roles)"
|
|
|
- @click="editFn(scope.row.id)"
|
|
|
- >编辑</el-button
|
|
|
- >
|
|
|
- <el-button
|
|
|
- type="text"
|
|
|
- class="textColor"
|
|
|
- @click="logFn(scope.row.id)"
|
|
|
- >记录</el-button
|
|
|
- >
|
|
|
- <el-popconfirm
|
|
|
- @onConfirm="deleFn(scope.row.id)"
|
|
|
- v-if="$checkBtnRole('del', $route.meta.roles)"
|
|
|
- title="这是一段内容确定删除吗？"
|
|
|
- >
|
|
|
- <el-button type="text" class="textColor" slot="reference"
|
|
|
- >删除</el-button
|
|
|
+ <el-table-column
|
|
|
+ align="center"
|
|
|
+ label="经销商编码"
|
|
|
+ prop="customerNumber"
|
|
|
+ min-width="160"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="center"
|
|
|
+ label="经销商名称"
|
|
|
+ prop="customerName"
|
|
|
+ min-width="160"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="center"
|
|
|
+ label="押金比例"
|
|
|
+ prop="rate"
|
|
|
+ min-width="160"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="center"
|
|
|
+ label="押金"
|
|
|
+ prop="amount"
|
|
|
+ min-width="160"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="center"
|
|
|
+ label="开始时间"
|
|
|
+ prop="startTime"
|
|
|
+ min-width="160"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="center"
|
|
|
+ label="结束时间"
|
|
|
+ prop="endTime"
|
|
|
+ min-width="160"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="center"
|
|
|
+ label="备注"
|
|
|
+ prop="remark"
|
|
|
+ min-width="160"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="center"
|
|
|
+ label="创建人"
|
|
|
+ prop="createBy"
|
|
|
+ min-width="160"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="center"
|
|
|
+ label="创建时间"
|
|
|
+ prop="createTime"
|
|
|
+ min-width="160"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="center"
|
|
|
+ label="更新人"
|
|
|
+ prop="updateBy"
|
|
|
+ min-width="160"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="center"
|
|
|
+ label="更新时间"
|
|
|
+ prop="updateTime"
|
|
|
+ min-width="160"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="center"
|
|
|
+ label="操作"
|
|
|
+ min-width="200"
|
|
|
+ show-overflow-tooltip
|
|
|
+ fixed="right"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-button
|
|
|
+ type="text"
|
|
|
+ class="textColor"
|
|
|
+ v-if="$checkBtnRole('edit', $route.meta.roles)"
|
|
|
+ @click="editFn(scope.row.id)"
|
|
|
+ >编辑</el-button
|
|
|
>
|
|
|
- </el-popconfirm>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- </el-table>
|
|
|
- </div>
|
|
|
- <!-- 分页 -->
|
|
|
- <div class="fr">
|
|
|
- <el-pagination
|
|
|
- @size-change="handleSizeChange"
|
|
|
- @current-change="handleCurrentChange"
|
|
|
- :current-page="currentPage"
|
|
|
- :page-sizes="[10, 20, 30, 50]"
|
|
|
- :page-size="10"
|
|
|
- layout="total, sizes, prev, pager, next, jumper"
|
|
|
- :total="listTotal"
|
|
|
- >
|
|
|
- </el-pagination>
|
|
|
+ <el-button
|
|
|
+ type="text"
|
|
|
+ class="textColor"
|
|
|
+ @click="logFn(scope.row.id)"
|
|
|
+ >记录</el-button
|
|
|
+ >
|
|
|
+ <el-popconfirm
|
|
|
+ @onConfirm="deleFn(scope.row.id)"
|
|
|
+ v-if="$checkBtnRole('del', $route.meta.roles)"
|
|
|
+ title="这是一段内容确定删除吗？"
|
|
|
+ >
|
|
|
+ <el-button type="text" class="textColor" slot="reference"
|
|
|
+ >删除</el-button
|
|
|
+ >
|
|
|
+ </el-popconfirm>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ </div>
|
|
|
+ <!-- 分页 -->
|
|
|
+ <div class="fr">
|
|
|
+ <el-pagination
|
|
|
+ @size-change="handleSizeChange"
|
|
|
+ @current-change="handleCurrentChange"
|
|
|
+ :current-page="currentPage"
|
|
|
+ :page-sizes="[10, 20, 30, 50]"
|
|
|
+ :page-size="10"
|
|
|
+ layout="total, sizes, prev, pager, next, jumper"
|
|
|
+ :total="listTotal"
|
|
|
+ >
|
|
|
+ </el-pagination>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
- </div>
|
|
|
|
|
|
- <!-- 弹窗 -->
|
|
|
- <el-dialog
|
|
|
- :title="title"
|
|
|
- :visible.sync="showDialog"
|
|
|
- width="30%"
|
|
|
- :show-close="false"
|
|
|
- :close-on-click-modal="false"
|
|
|
- >
|
|
|
- <el-form
|
|
|
- ref="dialogForm"
|
|
|
- :model="dialogForm"
|
|
|
- :rules="rules"
|
|
|
- label-width="110px"
|
|
|
- label-position="right"
|
|
|
+ <!-- 弹窗 -->
|
|
|
+ <el-dialog
|
|
|
+ :title="title"
|
|
|
+ :visible.sync="showDialog"
|
|
|
+ width="30%"
|
|
|
+ :show-close="false"
|
|
|
+ :close-on-click-modal="false"
|
|
|
>
|
|
|
- <el-form-item label="经销商名称" prop="customerId">
|
|
|
- <el-select
|
|
|
- class="inputStyle"
|
|
|
- v-model="dialogForm.customerId"
|
|
|
- placeholder="请选择"
|
|
|
- filterable
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in dealerList"
|
|
|
- :key="item.id"
|
|
|
- :label="item.name"
|
|
|
- :value="item.id"
|
|
|
+ <el-form
|
|
|
+ ref="dialogForm"
|
|
|
+ :model="dialogForm"
|
|
|
+ :rules="rules"
|
|
|
+ label-width="110px"
|
|
|
+ label-position="right"
|
|
|
+ >
|
|
|
+ <el-form-item label="经销商名称" prop="customerId">
|
|
|
+ <el-select
|
|
|
+ class="inputStyle"
|
|
|
+ v-model="dialogForm.customerId"
|
|
|
+ placeholder="请选择"
|
|
|
+ filterable
|
|
|
>
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
+ <el-option
|
|
|
+ v-for="item in dealerList"
|
|
|
+ :key="item.id"
|
|
|
+ :label="item.name"
|
|
|
+ :value="item.id"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
|
|
|
- <el-form-item label="押金比例" prop="rate">
|
|
|
- <el-input
|
|
|
- placeholder="请输入押金比例"
|
|
|
- v-model.number="dialogForm.rate"
|
|
|
- class="inputStyle"
|
|
|
- >
|
|
|
- <i class="el-input__icon" slot="suffix">% </i>
|
|
|
- </el-input>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="" prop="">
|
|
|
- <el-slider
|
|
|
- class="inputStyle"
|
|
|
- v-model="dialogForm.rate"
|
|
|
- :marks="marks"
|
|
|
- >
|
|
|
- </el-slider>
|
|
|
- </el-form-item>
|
|
|
+ <el-form-item label="押金比例" prop="rate">
|
|
|
+ <el-input
|
|
|
+ placeholder="请输入押金比例"
|
|
|
+ v-model.number="dialogForm.rate"
|
|
|
+ class="inputStyle"
|
|
|
+ >
|
|
|
+ <i class="el-input__icon" slot="suffix">% </i>
|
|
|
+ </el-input>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="" prop="">
|
|
|
+ <el-slider
|
|
|
+ class="inputStyle"
|
|
|
+ v-model="dialogForm.rate"
|
|
|
+ :marks="marks"
|
|
|
+ >
|
|
|
+ </el-slider>
|
|
|
+ </el-form-item>
|
|
|
|
|
|
- <el-form-item label="押金定额金额" prop="amount">
|
|
|
- <el-input
|
|
|
- placeholder="请输入押金定额"
|
|
|
- v-model.number="dialogForm.amount"
|
|
|
- class="inputStyle"
|
|
|
- ></el-input>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="开始时间" prop="startTime">
|
|
|
- <el-date-picker
|
|
|
- class="inputStyle"
|
|
|
- v-model="dialogForm.startTime"
|
|
|
- type="datetime"
|
|
|
- placeholder="选择日期时间"
|
|
|
- default-time="00:00:00"
|
|
|
- value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
- >
|
|
|
- </el-date-picker>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="结束时间" prop="">
|
|
|
- <el-date-picker
|
|
|
- class="inputStyle"
|
|
|
- v-model="dialogForm.endTime"
|
|
|
- type="datetime"
|
|
|
- placeholder="选择日期时间"
|
|
|
- default-time="23:59:59"
|
|
|
- value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
- >
|
|
|
- </el-date-picker>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="备注" prop="remark">
|
|
|
- <el-input
|
|
|
- type="textarea"
|
|
|
- v-model="dialogForm.remark"
|
|
|
- placeholder="请输入备注信息"
|
|
|
- class="inputStyle"
|
|
|
- ></el-input>
|
|
|
- </el-form-item>
|
|
|
- </el-form>
|
|
|
- <div slot="footer" class="dialog-footer">
|
|
|
- <el-button @click="cancelFn">取 消</el-button>
|
|
|
- <el-button type="primary" @click="addDataListFn">确 定</el-button>
|
|
|
- </div>
|
|
|
- </el-dialog>
|
|
|
+ <el-form-item label="押金定额金额" prop="amount">
|
|
|
+ <el-input
|
|
|
+ placeholder="请输入押金定额"
|
|
|
+ v-model.number="dialogForm.amount"
|
|
|
+ class="inputStyle"
|
|
|
+ ></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="开始时间" prop="startTime">
|
|
|
+ <el-date-picker
|
|
|
+ class="inputStyle"
|
|
|
+ v-model="dialogForm.startTime"
|
|
|
+ type="datetime"
|
|
|
+ placeholder="选择日期时间"
|
|
|
+ default-time="00:00:00"
|
|
|
+ value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ >
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="结束时间" prop="">
|
|
|
+ <el-date-picker
|
|
|
+ class="inputStyle"
|
|
|
+ v-model="dialogForm.endTime"
|
|
|
+ type="datetime"
|
|
|
+ placeholder="选择日期时间"
|
|
|
+ default-time="23:59:59"
|
|
|
+ value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ >
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="备注" prop="remark">
|
|
|
+ <el-input
|
|
|
+ type="textarea"
|
|
|
+ v-model="dialogForm.remark"
|
|
|
+ placeholder="请输入备注信息"
|
|
|
+ class="inputStyle"
|
|
|
+ ></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-form>
|
|
|
+ <div slot="footer" class="dialog-footer">
|
|
|
+ <el-button @click="cancelFn">取 消</el-button>
|
|
|
+ <el-button type="primary" @click="addDataListFn">确 定</el-button>
|
|
|
+ </div>
|
|
|
+ </el-dialog>
|
|
|
+ </div>
|
|
|
+
|
|
|
+ <!-- 记录页面 -->
|
|
|
+ <DealerDepositHistory :historyId="historyId" v-else />
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -298,11 +303,17 @@ import {
|
|
|
editDealerDeposit,
|
|
|
infoDealerDeposit,
|
|
|
} from "@/api/basic_data/dealer";
|
|
|
-import { number } from "echarts";
|
|
|
+// import { number } from "echarts";
|
|
|
+import DealerDepositHistory from "./components/dealer_deposit_history";
|
|
|
|
|
|
export default {
|
|
|
+ components: {
|
|
|
+ DealerDepositHistory,
|
|
|
+ },
|
|
|
data() {
|
|
|
return {
|
|
|
+ historyId: "",
|
|
|
+ showHistory: true,
|
|
|
marks: {
|
|
|
0: "0%",
|
|
|
20: "20%",
|
|
|
@@ -418,7 +429,10 @@ export default {
|
|
|
// },
|
|
|
|
|
|
//记录
|
|
|
- logFn() {},
|
|
|
+ logFn(id) {
|
|
|
+ this.historyId = id;
|
|
|
+ this.showHistory = false;
|
|
|
+ },
|
|
|
//取消
|
|
|
async cancelFn() {
|
|
|
this.dialogForm = {
|
chen