From 74a67d07e3a3fb93d51fdf0ca96327adb119daec Mon Sep 17 00:00:00 2001
From: wangh <9483>
Date: Mon, 20 May 2024 09:03:12 +0800
Subject: [PATCH] no message

---
 .../reconciliation/tab/trading.vue            | 29 ++++++++++---------
 .../financialStatement/runningWater/list.vue  |  2 +-
 .../runningWater/tab/instituion.vue           | 12 ++++----
 3 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue b/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue
index 44300f60f..f7272e57b 100644
--- a/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue
+++ b/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue
@@ -31,18 +31,18 @@
             placeholder="结束日期">
           </el-date-picker>
         </el-form-item>
-          <el-form-item label="机构：" prop="deptId">
-            <el-select
-              v-model="queryParams.deptId"
-              clearable
-              placeholder="全部"
-            >
-              <el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId">
-              </el-option>
+<!--          <el-form-item label="机构：" prop="deptId">-->
+<!--            <el-select-->
+<!--              v-model="queryParams.deptId"-->
+<!--              clearable-->
+<!--              placeholder="全部"-->
+<!--            >-->
+<!--              <el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId">-->
+<!--              </el-option>-->
 
 
-            </el-select>
-          </el-form-item>
+<!--            </el-select>-->
+<!--          </el-form-item>-->
           <el-form-item label="支付渠道：" prop="payChannel">
             <el-select
               v-model="queryParams.payChannel"
@@ -265,7 +265,7 @@
 <script>
 
 import {
-  exportExcelTradingApi,
+  exportExcelTradingApi, getmyDataApi,
   getRunningWaterByTissueApi,
   getTissueByDataApi,
   getTradingPageApi
@@ -336,8 +336,11 @@ import {
     },
     methods:{
       getDeptList() {
-        getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then( response => {
-          this.deptList = response.data.records;
+        // getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then( response => {
+        //   this.deptList = response.data.records;
+        // })
+        getmyDataApi(this.addDateRange(this.queryParams)).then( response => {
+          this.queryParams.deptId = response.data.deptId;
         })
       },
       exportExcelCashier() {
diff --git a/fuintAdmin/src/views/financialStatement/runningWater/list.vue b/fuintAdmin/src/views/financialStatement/runningWater/list.vue
index dd82a5c57..c5b96bb08 100644
--- a/fuintAdmin/src/views/financialStatement/runningWater/list.vue
+++ b/fuintAdmin/src/views/financialStatement/runningWater/list.vue
@@ -3,7 +3,7 @@
     <div class="app-top">
       <el-card>
         <el-radio-group v-model="radio1">
-          <el-radio-button label="机构流水分析"></el-radio-button>
+<!--          <el-radio-button label="机构流水分析"></el-radio-button>-->
           <el-radio-button label="油站流水分析"></el-radio-button>
           <el-radio-button label="无流水门店"></el-radio-button>
           <el-radio-button label="日流水分析"></el-radio-button>
diff --git a/fuintAdmin/src/views/financialStatement/runningWater/tab/instituion.vue b/fuintAdmin/src/views/financialStatement/runningWater/tab/instituion.vue
index eb1dcb08e..be1a8c50a 100644
--- a/fuintAdmin/src/views/financialStatement/runningWater/tab/instituion.vue
+++ b/fuintAdmin/src/views/financialStatement/runningWater/tab/instituion.vue
@@ -202,8 +202,8 @@ import {
           this.$download.saveAs(blob,'流水订单统计.xLsx')
         })
       },
-      // 获取订单统计信息
 
+      // 获取订单统计信息
       getOrderStatistics() {
         let dateRange = []
         if (this.beginTime && this.endTime) {
@@ -230,11 +230,11 @@ import {
         this.getOrderStatistics()
       },
 
-        getDeptList() {
-          getmyDataApi(this.addDateRange(this.queryParams)).then( response => {
-            this.queryParams.deptId = response.data.deptId;
-          })
-        },
+      getDeptList() {
+        getmyDataApi(this.addDateRange(this.queryParams)).then( response => {
+          this.queryParams.deptId = response.data.deptId;
+        })
+      },
 
       // 搜索按钮操作
       handleQuery() {