9.11 营收统计（部分）首页统计

src/api/company.js

@@ -107,3 +107,20 @@ export function update_store(id, query) {
     data: query,
   });
 }
+//营收统计列表
+export function revenue_sum_list(query) {
+  return fetch({
+    url: "/api/order/admin/wallet/selectList",
+    method: "get",
+    params: query,
+  });
+}
+
+//营收统计合计
+export function revenue_sum_count(query) {
+  return fetch({
+    url: "/api/order/admin/wallet/sumAmount",
+    method: "get",
+    params: query,
+  });
+}

src/api/vehicle/vehicleSchedulManage.js

@@ -41,7 +41,7 @@ export function cancleBook(obj) {
   return fetch({
     url: '/vehicle/vehicleInfo/unbook/4employee',
     method: 'delete',
-    data:obj
+    data: obj
   });
 }
 
@@ -87,6 +87,15 @@ export function orderStatistics(type) {
     method: 'get',
   });
 }
+/**
+ * 首页统计
+ */
+export function getIndexAllcounts() {
+  return fetch({
+    url: '/api/order/background/statistics/indexOrder',
+    method: 'get',
+  });
+}
 
 
 /**
@@ -102,12 +111,12 @@ export function getUpkeepAll() {
 
 //获取旅游路线
 export function getTourList(param) {
-  if(param){
+  if (param) {
     return fetch({
-      url: '/api/tour/verfication/getList?'+param,
+      url: '/api/tour/verfication/getList?' + param,
       method: 'get',
     });
-  }else{
+  } else {
     return fetch({
       url: '/api/tour/verfication/getList',
       method: 'get',
@@ -118,7 +127,7 @@ export function getTourList(param) {
 //获取核销路线id信息
 export function getTourInfor(id) {
   return fetch({
-    url: '/api/tour/verfication/info/'+id,
+    url: '/api/tour/verfication/info/' + id,
     method: 'get',
   });
 }

src/views/revenue/revenue_sum.vue

@@ -5,7 +5,7 @@
         <el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="80px">
           <el-row>
             <el-form-item label="所属公司">
-              <el-select v-model="listQuery.corporationId" placeholder="请选择">
+              <el-select v-model="listQuery.branchId" placeholder="请选择">
                 <el-option label="全部" :key="undefined" :value="undefined"></el-option>
                 <el-option
                   v-for="val in companys_list"
@@ -45,35 +45,41 @@
         <div class="label_box">
           <div class="label_item top_color_bule">
             <p class="money_p">
-              <span>￥</span>1,000,000.00
+              <span>￥</span>
+              {{all_amount}}
             </p>
             <p class="money_label">总营收金额</p>
           </div>
           <div class="label_item top_color_bule2">
             <p class="money_p">
-              <span>￥</span>1,000,000.00
+              <span>￥</span>
+              {{orderAmount}}
             </p>
             <p class="money_label">订单&服务营收</p>
           </div>
           <div class="label_item top_color_origin">
             <p class="money_p">
-              <span>￥</span>1,000,000.00
+              <span>￥</span>
+              {{otherAmount}}
             </p>
             <p class="money_label">额外赔偿(违约金等)</p>
           </div>
           <div class="label_item top_color_yellow">
             <p class="money_p">
-              <span>￥</span>1,000,000.00
+              <span>￥</span>
+              {{withdrawals}}
             </p>
             <p class="money_label">已提现金额</p>
           </div>
           <div class="label_item top_color_red">
             <p class="money_p">
-              <span>￥</span>1,000,000.00
+              <span>￥</span>
+              {{balance}}
             </p>
             <p class="money_label">
               可提现金额，
-              <a>立即提现 ></a>
+              <a @click="company_withdraw" v-show="elements['company_with']">立即提现 ></a>
+              <a @click="mendian_withdraw" v-show="elements['store_with']">立即提现 ></a>
             </p>
           </div>
         </div>
@@ -85,13 +91,15 @@
                 <el-date-picker
                   type="date"
                   placeholder="开始时间"
-                  v-model="listQuery.daystart"
+                  v-model="startTime"
+                  format="yyyy-MM-dd"
                   style="width: 40%;"
                 ></el-date-picker>&nbsp;—
                 <el-date-picker
                   type="date"
                   placeholder="结束时间"
-                  v-model="listQuery.dayend"
+                  v-model="endTime"
+                  format="yyyy-MM-dd"
                   style="width: 40%;"
                 ></el-date-picker>
               </el-form-item>
@@ -100,20 +108,13 @@
         </div>
       </div>
       <el-table :key="tableKey" :data="list" border fit highlight-current-row style="width: 100%;">
-        <el-table-column align="center" label="公司名称" prop="name"></el-table-column>
-        <el-table-column align="center" label="联系人/电话">
-          <template slot-scope="{row}">
-            <span>{{row.contact}}/{{row.mobile}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="法人姓名" prop="legalPerson"></el-table-column>
-        <el-table-column align="center" label="法人身份证" prop="legalIdNumber"></el-table-column>
-
-        <el-table-column align="center" label="操作">
-          <template slot-scope="{row}">
-            <el-button type="text" @click="withdraw(row)">提现</el-button>
-          </template>
-        </el-table-column>
+        <el-table-column align="center" label="类型" prop="typeName"></el-table-column>
+        <el-table-column align="center" label="订单号/提现号" prop="cono"></el-table-column>
+        <el-table-column align="center" label="收支说明" prop="sourceName"></el-table-column>
+        <el-table-column align="center" label="所属公司" prop="branchName"></el-table-column>
+        <el-table-column align="center" label="所属门店" prop="companyName"></el-table-column>
+        <el-table-column align="center" label="金额" prop="amount"></el-table-column>
+        <el-table-column align="center" label="剩余金额" prop="samount"></el-table-column>
       </el-table>
       <div v-show="!listLoading" class="pagination-container">
         <el-pagination
@@ -127,6 +128,44 @@
         ></el-pagination>
       </div>
     </div>
+    <el-dialog title="公司提现" :visible.sync="c_w_dialog" width="40%" @close="c_w_dialog=false">
+      <el-form>
+        <div style="display:flex;justify-content: space-between;">
+          <el-col :span="10">
+            <el-form-item label="银行账号">
+              <el-input style="width:70%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="全部提现">
+              <el-switch active-color="#13ce66" inactive-color="#ff4949"></el-switch>
+            </el-form-item>
+          </el-col>
+        </div>
+        <el-table></el-table>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="c_w_dialog = false">取 消</el-button>
+        <el-button type="primary">确 定</el-button>
+      </span>
+    </el-dialog>
+    <el-dialog title="门店提现" :visible.sync="m_w_dialog" width="30%" @close="m_w_dialog=false">
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item label="剩余金额">
+          <el-input style="width:60%"></el-input>
+        </el-form-item>
+        <el-form-item label="提现金额">
+          <el-input style="width:60%"></el-input>
+        </el-form-item>
+        <el-form-item label="银行账号">
+          <el-input style="width:60%"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="m_w_dialog = false">取 消</el-button>
+        <el-button type="primary">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -154,7 +193,12 @@ import Element1 from "../admin/menu/components/element";
 import ElRow from "element-ui/packages/row/src/row";
 import ElCol from "element-ui/packages/col/src/col";
 import { getToken } from "utils/auth";
-import { company_all_list, branchCompany_all_list } from "api/company.js";
+import {
+  company_all_list,
+  branchCompany_all_list,
+  revenue_sum_list,
+  revenue_sum_count,
+} from "api/company.js";
 
 export default {
   name: "carApplyList",
@@ -171,19 +215,28 @@ export default {
       list: null,
       total: null,
       listLoading: true,
+      startTime: undefined,
+      endTime: undefined,
       listQuery: {
         page: 1,
         limit: 10,
         companyId: undefined,
-        corporationId: undefined,
-        daystart: "",
-        dayend: "",
+        branchId: undefined,
+        startTime: undefined,
+        endTime: undefined,
       },
       inline: true,
       tableKey: 0,
       btn_disable: null,
       companys_list: [],
       branchCompany_list: [],
+      c_w_dialog: false,
+      m_w_dialog: false,
+      balance: undefined,
+      orderAmount: undefined,
+      otherAmount: undefined,
+      withdrawals: undefined,
+      all_amount: undefined,
     };
   },
   created() {
@@ -223,10 +276,25 @@ export default {
      * */
     getList() {
       this.listLoading = true;
-      company_list(this.listQuery).then((response) => {
-        console.log(response);
+      if (this.startTime) {
+        this.listQuery.startTime = Date.parse(this.startTime);
+      }
+      if (this.endTime) {
+        this.listQuery.endTime = Date.parse(this.endTime);
+      }
+      revenue_sum_count(this.listQuery).then((res) => {
+        this.balance = res.data.balance;
+        this.orderAmount = res.data.orderAmount;
+        this.otherAmount = res.data.otherAmount;
+        this.withdrawals = res.data.withdrawals;
+        this.all_amount = (
+          Number(res.data.otherAmount) + Number(res.data.orderAmount)
+        ).toFixed(2);
+      });
+      revenue_sum_list(this.listQuery).then((response) => {
         let totalCountRs = undefined;
         let listRs = undefined;
+
         if (
           !this.$utils.isEmpty(response.data.data) &&
           this.$utils.isInteger(response.data.totalCount)
@@ -236,6 +304,7 @@ export default {
         }
         this.listLoading = false;
         this.list = listRs;
+        console.log(response.data.data);
         this.total = totalCountRs;
       });
     },
@@ -254,10 +323,12 @@ export default {
         page: 1,
         limit: 10,
         companyId: undefined,
-        corporationId: undefined,
-        daystart: "",
-        dayend: "",
+        branchId: undefined,
+        startTime: undefined,
+        endTime: undefined,
       };
+      this.startTime = undefined;
+      this.endTime = undefined;
       this.getList();
     },
     handleSizeChange(val) {
@@ -268,6 +339,12 @@ export default {
       this.listQuery.page = val;
       this.getList();
     },
+    company_withdraw() {
+      this.c_w_dialog = true;
+    },
+    mendian_withdraw() {
+      this.m_w_dialog = true;
+    },
   },
 };
 </script>
@@ -337,9 +414,7 @@ export default {
   color: rgba(189, 189, 189, 1);
   font-size: 14px;
   a {
-    &:first-child {
-      color: blue;
-    }
+    color: blue;
   }
 }
 .label_filter {