|
|
@@ -5,13 +5,13 @@
|
|
|
<meta charset="utf-8">
|
|
|
<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
|
|
|
<!-- 所有的 css & js 资源 -->
|
|
|
- <link rel="stylesheet" href="https://unpkg.com/element-ui@2.13.0/lib/theme-chalk/index.css">
|
|
|
+ <link rel="stylesheet" href="../../static/kj/element-ui/theme-chalk/index.css">
|
|
|
<link rel="stylesheet" href="../../static/sa.css">
|
|
|
- <script src="https://unpkg.com/vue@2.6.10/dist/vue.js"></script>
|
|
|
- <script src="https://unpkg.com/element-ui@2.13.0/lib/index.js"></script>
|
|
|
- <script src="https://unpkg.com/http-vue-loader@1.4.2/src/httpVueLoader.js"></script>
|
|
|
- <script src="https://unpkg.com/jquery@3.4.1/dist/jquery.js"></script>
|
|
|
- <script src="https://www.layuicdn.com/layer-v3.1.1/layer.js"></script>
|
|
|
+ <script src="../../static/kj/vue.min.js"></script>
|
|
|
+ <script src="../../static/kj/element-ui/index.js"></script>
|
|
|
+ <script src="../../static/kj/httpVueLoader.js"></script>
|
|
|
+ <script src="../../static/kj/jquery.min.js"></script>
|
|
|
+ <script src="../../static/kj/layer/layer.js"></script>
|
|
|
<script src="../../static/sa.js"></script>
|
|
|
</head>
|
|
|
<body>
|
|
|
@@ -21,6 +21,18 @@
|
|
|
<div class="c-title">检索参数</div>
|
|
|
<el-form ref="form" :model='p' @submit.native.prevent>
|
|
|
<div class="c-item">
|
|
|
+ <label class="c-label">收费项目：</label>
|
|
|
+ <el-select v-model="p.feeType" placeholder="请选择" filterable>
|
|
|
+ <el-option label="核酸检测" value="1"></el-option>
|
|
|
+ <el-option label="消杀作业" value="2"></el-option>
|
|
|
+ <el-option label="装卸作业" value="3"></el-option>
|
|
|
+ <el-option label="停车费" value="4"></el-option>
|
|
|
+ <el-option label="过磅费" value="5"></el-option>
|
|
|
+ <el-option label="入场管理费" value="6"> </el-option>
|
|
|
+ <el-option label="充电打冷作业" value="7"> </el-option>
|
|
|
+ </el-select>
|
|
|
+ </div>
|
|
|
+ <div class="c-item">
|
|
|
<label class="c-label">业务类型：</label>
|
|
|
<el-select v-model="p.itemTypeName" placeholder="请选择" filterable>
|
|
|
<el-option v-for="item in itemTypeList" :key="item.id"
|
|
|
@@ -28,10 +40,18 @@
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</div>
|
|
|
+<!-- <div class="c-item">-->
|
|
|
+<!-- <label class="c-label">日期：</label>-->
|
|
|
+<!-- <el-date-picker type="date" value-format="yyyy-MM-dd" v-model="p.payDay"></el-date-picker>-->
|
|
|
+<!-- </div>-->
|
|
|
<div class="c-item">
|
|
|
- <label class="c-label">日期：</label>
|
|
|
- <el-date-picker type="date" value-format="yyyy-MM-dd" v-model="p.payDay"></el-date-picker>
|
|
|
+ <label class="c-label">日期范围：</label>
|
|
|
+ <el-date-picker size="mini" v-model="selectTime" type="daterange" unlink-panels="false"
|
|
|
+ range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
|
|
|
+ format="yyyy 年 MM 月 dd 日" value-format="yyyy-MM-dd">
|
|
|
+ </el-date-picker>
|
|
|
</div>
|
|
|
+
|
|
|
<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
|
|
|
<br />
|
|
|
</el-form>
|
|
|
@@ -44,18 +64,35 @@
|
|
|
<!-- ------------- 数据列表 ------------- -->
|
|
|
<el-table class="data-table" ref="data-table" :data="dataList" >
|
|
|
<sa-td type="selection"></sa-td>
|
|
|
- <sa-td name="业务单号" prop="businessNo" ></sa-td>
|
|
|
- <sa-td name="车牌号" prop="carNo" ></sa-td>
|
|
|
- <sa-td name="收费类型" prop="feeType" type="enum"
|
|
|
+ <sa-td name="业务单号" prop="businessNo" width="140px" ></sa-td>
|
|
|
+ <sa-td name="作业单号" prop="businessItemNo" width="145px" ></sa-td>
|
|
|
+ <sa-td name="车牌号" prop="carNo" width="90px" ></sa-td>
|
|
|
+ <sa-td name="收费项目" prop="feeType" type="enum"
|
|
|
:jv="{1: '核酸检测',2: '消杀作业', 3: '装卸作业', 4: '停车费', 5: '过磅费', 6: '入场管理费', 7: '充电打冷作业'}"></sa-td>
|
|
|
<sa-td name="业务类型" prop="itemTypeName" ></sa-td>
|
|
|
- <sa-td name="业务项" prop="itemName" ></sa-td>
|
|
|
- <sa-td name="作业单位" prop="pickCustomerName" ></sa-td>
|
|
|
- <sa-td name="项目金额" prop="itemPrice" ></sa-td>
|
|
|
- <sa-td name="税率" prop="taxRate" ></sa-td>
|
|
|
- <sa-td name="不含税金额" prop="noTaxPrice" ></sa-td>
|
|
|
- <sa-td name="支付日期" prop="payDay" ></sa-td>
|
|
|
+ <sa-td name="车型" prop="itemName" ></sa-td><!--业务项-->
|
|
|
+ <sa-td name="重量(吨)" prop="weight" ></sa-td>
|
|
|
+ <sa-td name="数量" prop="num" ></sa-td>
|
|
|
+ <sa-td name="单价" prop="unitPrice" ></sa-td>
|
|
|
+ <sa-td name="总价" prop="itemPrice" ></sa-td>
|
|
|
+ <sa-td name="结算状态" prop="isSettle" type="enum" :jv="{0: '未结算',1: '已结算'}"></sa-td>
|
|
|
+ <sa-td name="复核状态" prop="" ></sa-td>
|
|
|
+<!-- <sa-td name="税率(%)" prop="taxRate" ></sa-td>-->
|
|
|
+ <el-table-column label="税率(%)" >
|
|
|
+ <template slot-scope="s">
|
|
|
+ <span>{{s.row.taxRate * 100}}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <sa-td name="税款(元)" prop="taxPrice" ></sa-td>
|
|
|
+ <sa-td name="不含税金额(元)" prop="noTaxPrice" ></sa-td>
|
|
|
<sa-td name="支付方式" prop="payType" type="enum" :jv="{3: '微信支付'}"></sa-td>
|
|
|
+ <sa-td name="收款种类" prop="payMode" type="enum" :jv="{1: '直接收款'}"></sa-td>
|
|
|
+ <sa-td name="系统流水号" prop="" ></sa-td>
|
|
|
+ <sa-td name="作业单位" prop="pickCustomerName" ></sa-td>
|
|
|
+ <sa-td name="生成时间" prop="createTime" width="90px" ></sa-td>
|
|
|
+ <sa-td name="付款时间" prop="payTime" width="90px" ></sa-td>
|
|
|
+ <sa-td name="备注" prop="remark" ></sa-td>
|
|
|
+
|
|
|
<!-- <el-table-column label="操作" fixed="right" width="240px">-->
|
|
|
<!-- <template slot-scope="s">-->
|
|
|
<!-- <el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看</el-button>-->
|
|
|
@@ -91,7 +128,8 @@
|
|
|
p: { // 查询参数
|
|
|
id: '', // 主键
|
|
|
businessNo: '', // 业务单号
|
|
|
- carNo: '', // 车牌号
|
|
|
+ carNo: '', // 车牌号
|
|
|
+ feeType: '', //收费类型
|
|
|
itemTypeId: '', // 业务类型id
|
|
|
itemTypeName: '', // 业务类型
|
|
|
itemId: '', //
|
|
|
@@ -101,12 +139,17 @@
|
|
|
payType: '', // 支付方式(3=微信支付)
|
|
|
createTime: '', // 创建时间
|
|
|
pageNo: 1, // 当前页
|
|
|
- pageSize: 10, // 页大小
|
|
|
- sortType: 9 // 排序方式
|
|
|
+ pageSize: 10, // 页大小
|
|
|
+ sortType: 11 // 排序方式
|
|
|
},
|
|
|
dataCount: 0,
|
|
|
dataList: [], // 数据集合
|
|
|
itemTypeList: [],
|
|
|
+ selectTime:[],
|
|
|
+ selectTimeRange: {
|
|
|
+ beginTime: '', //查询开始时间
|
|
|
+ endTime: '', //查询结束时间
|
|
|
+ },
|
|
|
emodel: {
|
|
|
visible: false,
|
|
|
form: {
|
|
|
@@ -132,7 +175,12 @@
|
|
|
},
|
|
|
// 刷新
|
|
|
f5: function() {
|
|
|
- sa.ajax('/TbFeeDetails/getList', sa.removeNull(this.p), function(res) {
|
|
|
+ if ( this.selectTime != null && this.selectTime.length != 0) {
|
|
|
+ this.selectTimeRange.beginTime = this.selectTime[0];
|
|
|
+ this.selectTimeRange.endTime = this.selectTime[1];
|
|
|
+ }
|
|
|
+ sa.ajax('/TbFeeDetails/getList?beginTime='+this.selectTimeRange.beginTime+'&endTime='+this.selectTimeRange.endTime,
|
|
|
+ sa.removeNull(this.p), function(res) {
|
|
|
this.dataList = res.data; // 数据
|
|
|
this.dataCount = res.dataCount; // 数据总数
|
|
|
sa.f5TableHeight(); // 刷新表格高度
|
lzm