前端

src/api/settlementManagement.js

@@ -31,6 +31,14 @@ export function getListpadsettleaccounts(data) {
      params: data,
   })
 }
+// 统计报表利润图表
+export function getListselectProfit(data) {
+  return request({
+    url: '/freightInfo/selectProfit',
+    method: 'get',
+     params: data,
+  })
+}
 // 货主提现批量审核
 export function batchAduit(data) {
   return request({
@@ -47,6 +55,7 @@ export function deferpay(data) {
      data: data,
   })
 }
+
 // 司机运费结算批量付款
 export function batchpay(data) {
   return request({

src/views/driverManagement/identityExamine.vue

@@ -52,21 +52,21 @@
         </el-row>
       </div>
       <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border highlight-current-row>
-        <el-table-column prop="driverName" label="司机姓名" min-width="130"></el-table-column>
-        <el-table-column prop="driverPhone" label="账号" min-width="110"></el-table-column>
+        <el-table-column prop="driverName" label="司机姓名" min-width="110"></el-table-column>
+        <el-table-column prop="driverPhone" label="账号" min-width="90"></el-table-column>
         <el-table-column prop="numberCard" label="身份证号" min-width="165"></el-table-column>
         <el-table-column prop="shipmentsNumber" label="承运次数">
           <template scope="scope">
             {{ scope.row.shipmentsNumber ? scope.row.shipmentsNumber : 0 }}
           </template>
         </el-table-column>
-        <el-table-column prop="favorableRate" label="好评率" min-width="170">
+        <el-table-column prop="favorableRate" label="好评率" min-width="90">
           <!-- <template slot-scope="scope">
             <el-rate v-model="scope.row.count" disabled show-score text-color="#ff9900" score-template="{value}">
             </el-rate>
           </template> -->
         </el-table-column>
-        <el-table-column prop="complaintsNumber" label="投诉和举报">
+        <el-table-column min-width="110" prop="complaintsNumber" label="投诉和举报">
           <template scope="scope">
             <span>{{
               scope.row.complaintsNumber ? scope.row.complaintsNumber : 0
@@ -77,7 +77,7 @@
             }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="accumulatedFreight" label="累计支付运费(元)" min-width="130"></el-table-column>
+        <el-table-column prop="accumulatedFreight" label="累计收款(元)" min-width="110"></el-table-column>
         <el-table-column prop="advancePayment" label="垫付比例(%)" min-width="100">
           <template scope="scope">
             <div class="input_css">
@@ -109,7 +109,7 @@
         </el-table-column>
         <el-table-column prop="paymentDate" label="附件">
           <template slot-scope="scope" style="text-align: center" v-if="scope.row.backStageStatus !='未认证'">
-            <span class="btn_css btn_css1" @click="fujianLook(scope.row)">查看</span>
+            <span class="btn_css" @click="fujianLook(scope.row)">查看</span>
             <el-tooltip placement="top" v-if="
                 scope.row.overdueFlag == 1 ||
                 scope.row.driverOverdueFlag == 1 ||
@@ -131,7 +131,7 @@
         </el-table-column>
         <el-table-column prop="createDate" label="注册日期" min-width="100"></el-table-column>
         <el-table-column prop="backStageStatus" label="状态"></el-table-column>
-        <el-table-column label="操作" min-width="300">
+        <el-table-column label="操作" min-width="200">
           <template slot-scope="scope">
             <el-link target="_blank" @click="adopt(scope.row)" type="primary" :underline="false"
               :disabled="scope.row.authenticationStatus != '审核中'">通过</el-link>
@@ -237,7 +237,12 @@
           </div> -->
         </div>
         <div class="file_tips">
-          <span v-if="count == 1">有效期：{{file.cardValidityDate}} </span><span v-if="count == 2"> 准驾车型：{{file.quasiDrivingVehicle}} </span> <span v-if="count == 2"> 发证机关：{{file.lssuingAuthority}} </span> <span v-if="count == 4"> 从业资格证号：{{file.qualificationCertificateNumber}}</span>
+          <span v-if="count == 1">有效期：{{file.cardValidityDate}} </span>
+          <span v-if="count == 2"> 准驾车型：{{file.quasiDrivingVehicle}} </span> 
+          <span v-if="count == 2"> 发证机关：{{file.lssuingAuthority}} </span>
+          <span v-if="count == 2"> 有效期：{{file.driverLicenseValidityStartDate}} ~ {{file.driverLicenseValidityDate}} </span> 
+          <span v-if="count == 4"> 从业资格证号：{{file.qualificationCertificateNumber}}</span>
+          <span v-if="count == 4"> 有效期：{{file.qualificationCertificateValidityDate}}</span>
         </div>
         <div class="file_img">
           <img :src="img[index]" class="img_css" @click="enlarge(img[index])"/>
@@ -939,7 +944,8 @@
     }
     .file_tips{
         margin: 10px auto;
-       width: 50%;
+      //  width: 50%;
+      text-align:center;
     }
 
     .file_img {

src/views/settlementManagement/advancePaymentAndRepaymentSettlement.vue

@@ -50,7 +50,7 @@
         <el-table-column prop="cargoOwnerName" label="货主" />
          <el-table-column prop="accountNumber" label="账号" />
         <el-table-column prop="affiliatedEnterprise" label="所属企业" />
-        <el-table-column prop="updateDate" label="垫付金额（元）" />
+        <el-table-column prop="padmoney" label="垫付金额（元）" />
         <el-table-column prop="overdueFee" label="超期金额（元）" />
         <el-table-column prop="totalRepayable" label="合计应还（元）" />
         <el-table-column prop="alreadyRepaid" label="已还金额（元）" />
@@ -85,7 +85,7 @@ import {
         pageSize: 10,
         deptBudgetTotal: 0,
         deptCircularPage: {},
-        search: '',
+        search: '1',
         disabled: false,
       }
     },

src/views/settlementManagement/driverFeeSettlement.vue

@@ -51,17 +51,17 @@
                 <!-- <span v-else>{{scope.$index}}</span> -->
             </template>
         </el-table-column>
-        <el-table-column prop="orderNo" label="订单编号" >
+        <el-table-column min-width="100" prop="orderNo" label="订单编号" >
           <template scope="scope">
-              <span>{{scope.row.orderNo}}</span>
-              <span class="pad_css" v-if="scope.row.freightAdvance == '1'">垫</span>
-            </template>
+            <span>{{scope.row.orderNo}}</span>
+            <span class="pad_css" v-if="scope.row.freightAdvance == '1'">垫</span>
+          </template>
         </el-table-column>
         <el-table-column prop="driverName" label="司机姓名" />
-         <el-table-column prop="issuingDate" label="开户行" >
-            <template scope="scope">
-              <span>{{scope.row.bankDeposit}}-{{scope.row.bankDepositBranch}}</span>
-            </template>
+        <el-table-column min-width="160" prop="issuingDate" label="开户行" >
+          <template scope="scope">
+            <span>{{scope.row.bankDeposit}}-{{scope.row.bankDepositBranch}}</span>
+          </template>
         </el-table-column>
         <el-table-column prop="bankCard" label="银行卡号" />
         <el-table-column prop="paymentType" label="付款类型" />
@@ -72,7 +72,7 @@
             <span>{{scope.row.status}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" min-width="300">
+        <el-table-column label="操作" min-width="50">
           <template slot-scope="scope">
             <el-link v-if='scope.row.status!="已付款"' target="_blank" type="primary" :underline="false" @click="payment(scope.row)">付款</el-link>
           </template>

src/views/settlementManagement/statisticalReport.vue

@@ -5,9 +5,9 @@
         <div style='position:absolute;z-index:999;right:0;width:100%;'>
           <div class='title'>毛利润（万元）</div>
           <div class="right" style='position:absolute;right:4%;'>
-            <el-button :class='{"active":status==1}' @click='statuschange(1)' type="text">按天</el-button>
-            <el-button :class='{"active":status==2}' @click='statuschange(2)' type="text">按月</el-button>
-            <el-button :class='{"active":status==3}' @click='statuschange(3)' type="text">按年</el-button>
+            <el-button :class='{"active":search==1}' @click='statuschange(1)' type="text">按天</el-button>
+            <el-button :class='{"active":search==2}' @click='statuschange(2)' type="text">按月</el-button>
+            <el-button :class='{"active":search==3}' @click='statuschange(3)' type="text">按年</el-button>
           </div>
           
           <!-- <el-button type="primary">按天</el-button>
@@ -20,7 +20,7 @@
         <div calss='table-top' style='width:95%;margin:10px auto 30px;display:flex;justify-content: space-between;align-items: center;'>
           <el-date-picker v-model="value1" type="year" placeholder="选择年"></el-date-picker>
           <div>
-            合计
+            合计{{tabledata.total}}万元
             <span class="svg-container">
               <svg-icon @click='showchange' :icon-class="show?'eye':'eye-open'" />
             </span>
@@ -33,22 +33,22 @@
               利润（万元）
             </el-form-item>
             <el-form-item label="1月">
-              利润（万元）
+              {{show?tabledata.jan:'******'}}
             </el-form-item>
             <el-form-item label="2月">
-              利润（万元）
+              {{show?tabledata.feb:'******'}}
             </el-form-item>
             <el-form-item label="3月">
-              利润（万元）
+              {{show?tabledata.mar:'******'}}
             </el-form-item>
             <el-form-item label="4月">
-              利润（万元）
+              {{show?tabledata.apr:'******'}}
             </el-form-item>
             <el-form-item label="5月">
-              利润（万元）
+              {{show?tabledata.may:'******'}}
             </el-form-item>
             <el-form-item label="6月">
-              利润（万元）
+              {{show?tabledata.june:'******'}}
             </el-form-item>
           </div>
           
@@ -57,22 +57,22 @@
               利润（万元）
             </el-form-item>
             <el-form-item label="7月">
-              利润（万元）
+              {{show?tabledata.july:'******'}}
             </el-form-item>
             <el-form-item label="8月">
-              利润（万元）
+              {{show?tabledata.aug:'******'}}
             </el-form-item>
             <el-form-item label="9月">
-              利润（万元）
+              {{show?tabledata.sept:'******'}}
             </el-form-item>
             <el-form-item label="10月">
-              利润（万元）
+              {{show?tabledata.oct:'******'}}
             </el-form-item>
             <el-form-item label="11月">
-              利润（万元）
+              {{show?tabledata.nov:'******'}}
             </el-form-item>
             <el-form-item label="12月">
-              利润（万元）
+              {{show?tabledata.dece:'******'}}
             </el-form-item>
           </div>
       </el-form>
@@ -86,86 +86,111 @@
 </template>
 <script>
 import {
-  getListwithdrawal
+  getListselectProfit
 } from '@/api/settlementManagement'
 export default {
   name: 'hello',
   data () {
     return {
       formInline:{},
+      tabledata:{},
+      linexaxis:[],
+      linedata:[],
       status:1,
-      value1:'',
-      show:true
+      value1:'2022',
+      show:true,
+      search:'1'
     }
   },
   mounted(){//⭐在mounted中定义
+
     this.drawLine();
     this.drawBar()
   },
   methods: {
     statuschange(status){
-      this.status=status
+      this.search=status
+      this.drawLine();
     },
     showchange(){
-      console.log(11111)
+      this.show=!this.show
     },
     drawLine(){
-      // 基于准备好的dom，初始化echarts实例
-      console.log(this.$echarts)
-      var echart = this.$echarts.init(document.getElementById("container"))//⭐注意是id选择器
-		  var option = {
-        xAxis: {
-          type: 'category',
-          boundaryGap: false,
-          data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
-          axisLine:{
-            show:false
-          },
-          axisTick:{
-            show:false
-          },
-          axisLabel:{
-            color:'#9E9E9E'
-          }
-        },
-        yAxis: {
-          type: 'value',
-          // name:'毛利润（万元）',
-          nameTextStyle:{
-            fontWeight:'700',
-            fontSize:'16'
-          },
-          axisLine:{
-            show:false
-          },
-          axisTick:{
-            show:false
-          },
-          axisLabel:{
-            color:'#9E9E9E'
-          }
-        },
-        series: [
-          {
-            
-            lineStyle: {
-              color:'#2F53EB'
-            },
-            data: [150, 230, 224, 218, 135, 147, 260],
-            type: 'line',
-            areaStyle: {
-              color:'rgba(207, 219, 254, 1)'
+      var that=this
+      this.linexaxis=[]
+      this.linedata=[]
+      const _obj = {}
+        _obj.year= this.value1
+        _obj.searchType = this.search
+        getListselectProfit(_obj).then(response => {
+          this.tabledata=response.data.formList[0]
+          if(response.data.dataList.length>0){
+            for (let i = 0; i < response.data.dataList.length; i++) {
+              this.linexaxis.unshift(response.data.dataList[i].date)
+              this.linedata.unshift(response.data.dataList[i].profit)
             }
           }
-        ],
-        grid: {
-          left: '3%',
-          right: '4%',
-          bottom: '3%',
-          containLabel: true
-        },
-      };
-      echart.setOption(option);
+           var echart = that.$echarts.init(document.getElementById("container"))//⭐注意是id选择器
+            var option = {
+              xAxis: {
+                type: 'category',
+                boundaryGap: false,
+                data: that.linexaxis,
+                axisLine:{
+                  show:false
+                },
+                axisTick:{
+                  show:false
+                },
+                axisLabel:{
+                  color:'#9E9E9E'
+                }
+              },
+              yAxis: {
+                type: 'value',
+                // name:'毛利润（万元）',
+                nameTextStyle:{
+                  fontWeight:'700',
+                  fontSize:'16'
+                },
+                axisLine:{
+                  show:false
+                },
+                axisTick:{
+                  show:false
+                },
+                axisLabel:{
+                  color:'#9E9E9E'
+                }
+              },
+              series: [
+                {
+                  
+                  lineStyle: {
+                    color:'#2F53EB'
+                  },
+                  data: that.linedata,
+                  type: 'line',
+                  areaStyle: {
+                    color:'rgba(207, 219, 254, 1)'
+                  }
+                }
+              ],
+              grid: {
+                left: '3%',
+                right: '4%',
+                bottom: '3%',
+                containLabel: true
+              },
+            };
+            echart.setOption(option);
+          })
+          .catch(() => {
+            this.loading = false
+          })
+      // 基于准备好的dom，初始化echarts实例
+      console.log(this.$echarts)
+     
     },
     drawBar(){
       var echart1 = this.$echarts.init(document.getElementById("container2"))//⭐注意是id选择器