班结报表修改

package.json

@@ -37,6 +37,7 @@
   ],
   "dependencies": {
     "@riophae/vue-treeselect": "^0.4.0",
+    "af-table-column": "^1.0.3",
     "axios": "^0.21.1",
     "clipboard": "2.0.4",
     "core-js": "3.6.5",

src/main.js

@@ -5,6 +5,8 @@ import Cookies from 'js-cookie'
 import 'normalize.css/normalize.css' // a modern alternative to CSS resets
 
 import Element from 'element-ui'
+import AFTableColumn from 'af-table-column'
+
 import './assets/styles/element-variables.scss'
 
 import '@/assets/styles/index.scss' // global css
@@ -64,6 +66,7 @@ Vue.use(permission)
 Vue.use(Element, {
   size: Cookies.get('size') || 'medium' // set element-ui default size
 })
+Vue.use(AFTableColumn)
 
 Vue.mixin({
   computed:{

src/views/overview/accountingReport.vue

@@ -4,7 +4,6 @@
       :model="queryParams"
       ref="queryForm"
       :inline="true"
-      v-show="showSearch"
       label-width="98px"
     >
       <el-form-item label="班次号" prop="classesNo">
@@ -56,65 +55,58 @@
       </el-form-item>
     </el-form>
 
-    <el-table 
-      v-loading="loading" 
-      :data="summaryList"
-      :fit="true"
-    >
-      <el-table-column
+    <el-table v-loading="loading" :data="summaryList" :fit="true">
+      <af-table-column
         label="班结主键id"
         align="center"
         prop="id"
         v-if="false"
       />
-      <el-table-column label="班次号" align="center" prop="classesNo" />
-      <el-table-column
+      <af-table-column label="班次号" align="center" prop="classesNo" />
+      <af-table-column
         label="班次开始时间"
         align="center"
         prop="startDate"
-        width="150"
       >
-      </el-table-column>
-      <el-table-column
+      </af-table-column>
+      <af-table-column
         label="班次结束时间"
         align="center"
         prop="endDate"
-        width="150"
       >
-      </el-table-column>
-      <el-table-column
+      </af-table-column>
+      <af-table-column
         label="油站id"
         align="center"
         prop="stationId"
         v-if="false"
       />
-      <el-table-column label="油站名称" align="center" prop="stationName" />
-      <el-table-column label="订单数" align="center" prop="orderNum" />
-      <el-table-column
+      <af-table-column label="油站名称" align="center" prop="stationName" />
+      <af-table-column label="订单数" align="center" prop="orderNum" />
+      <af-table-column
         label="小票数量"
         align="center"
         prop="printNum"
-        width="50"
       />
-      <el-table-column label="销量L" align="center" prop="saleLiters" />
-      <el-table-column label="应收金额" align="center" prop="saleAmt" />
-      <el-table-column label="实收金额" align="center" prop="amt" />
-      <el-table-column label="优惠金额" align="center" prop="discountAmt" />
-      <el-table-column label="微信支付金额" align="center" prop="wxAmt" />
-      <el-table-column
+      <af-table-column label="销量L" align="center" prop="saleLiters" />
+      <af-table-column label="应收金额" align="center" prop="saleAmt" />
+      <af-table-column label="实收金额" align="center" prop="amt" />
+      <af-table-column label="优惠金额" align="center" prop="discountAmt" />
+      <af-table-column label="微信支付金额" align="center" prop="wxAmt" />
+      <af-table-column
         label="支付支付金额"
         align="center"
         prop="zfbAmt"
         v-if="false"
       />
-      <el-table-column
+      <af-table-column
         label="电子卡支付金额"
         align="center"
         prop="dzkAmt"
         v-if="false"
       />
-      <el-table-column label="班结人" align="center" prop="classesMan" />
-      <el-table-column
+      <af-table-column label="班结人" align="center" prop="classesMan" />
+      <af-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
@@ -136,7 +128,7 @@
             >下载</el-button
           >
         </template>
-      </el-table-column>
+      </af-table-column>
     </el-table>
     <pagination
       v-show="total > 0"
@@ -145,6 +137,7 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+
     <!-- 查看班结数据 -->
     <el-dialog :title="title" :visible.sync="open" append-to-body class="uncon">
       <el-form
@@ -169,11 +162,11 @@
         :data="structureList"
         :summary-method="getTotal"
       >
-        <el-table-column label="员工姓名" align="center" prop="oilPersonnel" />
-        <el-table-column label="负责枪号" align="center" prop="oilGun" />
-        <el-table-column label="销量" align="center" prop="orderLiters" />
-        <el-table-column label="销额" align="center" prop="amt" />
-        <el-table-column label="销售笔数" align="center" prop="orderNo" />
+        <af-table-column label="员工姓名" align="center" prop="oilPersonnel" />
+        <af-table-column label="负责枪号" align="center" prop="oilGun" />
+        <af-table-column label="销量" align="center" prop="orderLiters" />
+        <af-table-column label="销额" align="center" prop="amt" />
+        <af-table-column label="销售笔数" align="center" prop="orderNo" />
       </el-table>
       <!--按油品汇总-->
       <span style="color: #ff9955; font-size: 15px">|</span
@@ -184,11 +177,11 @@
         show-summary
         :summary-method="getTotal2"
       >
-        <el-table-column label="油品" align="center" prop="oilName" />
-        <el-table-column label="负责枪号" align="center" prop="oilGun" />
-        <el-table-column label="销量" align="center" prop="orderLiters" />
-        <el-table-column label="销额" align="center" prop="amt" />
-        <el-table-column label="销售笔数" align="center" prop="orderNo" />
+        <af-table-column label="油品" align="center" prop="oilName" />
+        <af-table-column label="负责枪号" align="center" prop="oilGun" />
+        <af-table-column label="销量" align="center" prop="orderLiters" />
+        <af-table-column label="销额" align="center" prop="amt" />
+        <af-table-column label="销售笔数" align="center" prop="orderNo" />
       </el-table>
       <!--按员工/支付方式汇总：    -->
       <span style="color: #ff9955; font-size: 15px">|</span
@@ -200,21 +193,21 @@
         :summary-method="getTotal3"
         max-height="h-180"
       >
-        <el-table-column label="员工姓名" align="center" prop="oilPersonnel" />
-        <el-table-column label="负责枪号" align="center" prop="oilGun" />
-        <el-table-column label="微信笔数" align="center" prop="wxNum" />
-        <el-table-column label="支付宝笔数" align="center" prop="zfbNum" />
-        <el-table-column label="现金笔数" align="center" prop="xjNum" />
-        <el-table-column label="优惠" align="center" prop="discountAmt" />
-        <el-table-column
+        <af-table-column label="员工姓名" align="center" prop="oilPersonnel" />
+        <af-table-column label="负责枪号" align="center" prop="oilGun" />
+        <af-table-column label="微信笔数" align="center" prop="wxNum" />
+        <af-table-column label="支付宝笔数" align="center" prop="zfbNum" />
+        <af-table-column label="现金笔数" align="center" prop="xjNum" />
+        <af-table-column label="优惠" align="center" prop="discountAmt" />
+        <af-table-column
           label="优惠劵"
           align="center"
           prop="discountCouponAmt"
         />
-        <el-table-column label="微信金额" align="center" prop="wxAmt" />
-        <el-table-column label="支付宝金额" align="center" prop="zfbAmt" />
-        <el-table-column label="现金金额" align="center" prop="xjAmt" />
-        <el-table-column label="会员卡支付" align="center" prop="memberAmt" />
+        <af-table-column label="微信金额" align="center" prop="wxAmt" />
+        <af-table-column label="支付宝金额" align="center" prop="zfbAmt" />
+        <af-table-column label="现金金额" align="center" prop="xjAmt" />
+        <af-table-column label="会员卡支付" align="center" prop="memberAmt" />
       </el-table>
     </el-dialog>
   </div>
@@ -230,13 +223,11 @@ import {
   listOilStructure,
 } from "@/api/station/structure";
 export default {
-  name: "Summary",
+  name: "accountingReport",
   data() {
     return {
       // 遮罩层
       loading: true,
-      // 显示搜索条件
-      showSearch: true,
       // 总条数
       total: 0,
       // 【请填写功能名称】表格数据
@@ -338,9 +329,12 @@ export default {
       ) {
         this.queryParams.stationId = this.$store.state.user.deptId;
       }
+      console.log("这个",this.queryParams, this.dateRangeCreatedDate)
+
       listSummary(
         this.addDateRange(this.queryParams, this.dateRangeCreatedDate)
       ).then((response) => {
+        console.log("条件",response)
         this.summaryList = response.rows;
         console.log("summaryList", this.summaryList);
         this.total = response.total;

src/views/overview/daily.vue

@@ -65,19 +65,19 @@
         <span style="color:#ff9955;font-size:25px;">|</span>
         <span style="font-size:20px;">详情：</span>
         <el-table v-loading="loading" :data="dayReportList">
-          <el-table-column label="日期" align="center" prop="payDate">
+          <af-table-column label="日期" align="center" prop="payDate">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createdDate, '{y}-{m}-{d}') }}</span>
             </template>
-          </el-table-column>
-          <el-table-column label="销额" align="center" prop="amt" />
-          <el-table-column label="销量（L）" align="center" prop="orderLiters" v-if="false" />
-          <el-table-column label="汽油" align="center" prop="qyAmt" />
-          <el-table-column label="柴油" align="center" prop="cyAmt" />
-          <el-table-column label="订单数" align="center" prop="orderNo" />
-          <el-table-column label="应收（元）" align="center" prop="receivableAmt" />
-          <el-table-column label="实收（元）" align="center" prop ="amt"/>
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          </af-table-column>
+          <af-table-column label="销额" align="center" prop="amt" />
+          <af-table-column label="销量（L）" align="center" prop="orderLiters" v-if="false" />
+          <af-table-column label="汽油" align="center" prop="qyAmt" />
+          <af-table-column label="柴油" align="center" prop="cyAmt" />
+          <af-table-column label="订单数" align="center" prop="orderNo" />
+          <af-table-column label="应收（元）" align="center" prop="receivableAmt" />
+          <af-table-column label="实收（元）" align="center" prop ="amt"/>
+          <af-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button
                 size="mini"
@@ -86,7 +86,7 @@
                 @click="handleLook(scope.row)"
               >详情</el-button>
             </template>
-          </el-table-column>
+          </af-table-column>
         </el-table>
         <pagination
           v-show="total>0"
@@ -98,18 +98,18 @@
       </div>
       <el-dialog :title="title" width="800px"  :visible.sync="open" append-to-body>
         <el-table v-loading="loading" :data="dayReportDetailsList" show-summary   :summary-method="getTotal" >
-          <el-table-column label="油品" align="center" prop="oilName" />
-          <el-table-column label="油枪号" align="center" prop="oilGun" />
-          <el-table-column label="销量（L）" align="center" prop="orderLiters" />
-          <el-table-column label="应收金额（元）" align="center" prop="receivableAmt" />
-          <el-table-column label="实收金额（元）" align="center" prop="amt" />
-          <el-table-column label="优惠金额（元）" align="center" prop="discountAmt"  />
-          <el-table-column label="优惠劵" align="center" prop="discountCouponAmt" v-if="false"/>
-          <el-table-column label="会员支付" align="center" prop="menberAmt" v-if="false" />
-          <el-table-column label="微信支付" align="center" prop="wxAmt" v-if="false" />
-          <el-table-column label="支付宝支付" align="center" prop="zfbAmt" v-if="false" />
-          <el-table-column label="会员充值" align="center" prop v-if="false" />
-          <el-table-column label="积分消费" align="center" prop v-if="false" />
+          <af-table-column label="油品" align="center" prop="oilName" />
+          <af-table-column label="油枪号" align="center" prop="oilGun" />
+          <af-table-column label="销量（L）" align="center" prop="orderLiters" />
+          <af-table-column label="应收金额（元）" align="center" prop="receivableAmt" />
+          <af-table-column label="实收金额（元）" align="center" prop="amt" />
+          <af-table-column label="优惠金额（元）" align="center" prop="discountAmt"  />
+          <af-table-column label="优惠劵" align="center" prop="discountCouponAmt" v-if="false"/>
+          <af-table-column label="会员支付" align="center" prop="menberAmt" v-if="false" />
+          <af-table-column label="微信支付" align="center" prop="wxAmt" v-if="false" />
+          <af-table-column label="支付宝支付" align="center" prop="zfbAmt" v-if="false" />
+          <af-table-column label="会员充值" align="center" prop v-if="false" />
+          <af-table-column label="积分消费" align="center" prop v-if="false" />
         </el-table>
         <!-- <pagination
           v-show="total1>0"