From c4e5f4720aa39a2bb38160b1cced5ffc5c0d93e9 Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Thu, 29 Jun 2023 08:32:00 +0800
Subject: [PATCH] 2023-6-29

---
 .../api/inventorySummary/inventorySummary.js  |  59 ++-
 .../views/reportCenter/inventorySummary.vue   | 366 +++++++++---------
 supervise-wx-mp/common/config.js              |   4 +-
 supervise-wx-mp/common/req.js                 |  10 +
 supervise-wx-mp/common/request.api.js         |  27 +-
 supervise-wx-mp/pages.json                    |  25 +-
 supervise-wx-mp/pages/index/auditReport.vue   | 198 ++++++++++
 .../pages/index/enterpriseRisk.vue            |  22 +-
 .../pages/index/inventoryReport.vue           | 200 ++++++++++
 supervise-wx-mp/pages/login/index.vue         |   6 +-
 10 files changed, 714 insertions(+), 203 deletions(-)
 create mode 100644 supervise-wx-mp/pages/index/auditReport.vue
 create mode 100644 supervise-wx-mp/pages/index/inventoryReport.vue

diff --git a/supervise-report-ui/src/api/inventorySummary/inventorySummary.js b/supervise-report-ui/src/api/inventorySummary/inventorySummary.js
index 32596aef..0c32b802 100644
--- a/supervise-report-ui/src/api/inventorySummary/inventorySummary.js
+++ b/supervise-report-ui/src/api/inventorySummary/inventorySummary.js
@@ -39,7 +39,7 @@ export function inallPagerList(data) {
   })
 }
 
-// 到货汇总表
+// 库存汇总表
 export function logPagerList(data) {
   return request({
     url: '/supplierarrivalreport/supplierArrivalSummary',
@@ -96,5 +96,60 @@ export function ztsjZhengli() {
 }
 
 export function buildExcelZaiTu() {
-  return request({ url: '/ruku/buildExcelZaiTu' })
+  return request({
+    url: '/ruku/buildExcelZaiTu'
+  })
+}
+
+///////////////////////////////////////////////////////////
+//  2023-6-26
+
+// 库存汇总日报表
+
+// 库存汇总表
+export function getReportInventoryDayGather(data) {
+  return request({
+    baseURL: "api/report/",
+    url: '/reportinventory/getReportInventoryDayGather/' + data,
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
 }
+
+// 仓库库存明细表
+export function getReportInventoryDayStore(data) {
+  return request({
+    baseURL: "api/report/",
+    url: '/reportinventory/getReportInventoryDayStore/' + data,
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
+
+// 烟草仓库库存明细表
+export function getReportInventoryDayToStore(data) {
+  return request({
+    baseURL: "api/report/",
+    url: '/reportinventory/getReportInventoryDayToStore/' + data,
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
+
+// 导出
+export function exportExcel(data) {
+  return request({
+    baseURL: "api/report/",
+    url: '/reportinventory/downloadExcel/' + data,
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
\ No newline at end of file
diff --git a/supervise-report-ui/src/views/reportCenter/inventorySummary.vue b/supervise-report-ui/src/views/reportCenter/inventorySummary.vue
index ac771c9e..8e5b581b 100644
--- a/supervise-report-ui/src/views/reportCenter/inventorySummary.vue
+++ b/supervise-report-ui/src/views/reportCenter/inventorySummary.vue
@@ -1,89 +1,99 @@
 <template>
   <div class="app-container">
     <button-bar ref="btnbar" view-title="库存汇总表" :btndisabled="btndisabled" @btnhandle="btnHandle" />
-    <el-row style="margin-left: 20px;margin-right: 20px;">
-      <el-col>
-        <el-tabs v-model="tabActiveName" @tab-click="handleClick">
-          <el-tab-pane label="库存汇总日报表" name="uplog">
-            <div>
-              <el-table :data="logList" border style="width: 100%">
-                <el-table-column prop="createTime" label="仓库类型" />
-                <el-table-column prop="orderDate" label="仓库数量" />
-                <el-table-column prop="allNum" label="品种数量" />
-                <el-table-column prop="validNum" label="货值" />
-              </el-table>
-            </div>
-          </el-tab-pane>
-          <el-tab-pane label="仓库库存明细表" name="k112">
-            <div>
-              <el-table :data="in112List" border style="width: 100%">
-                <el-table-column prop="supplierCodeUnified" label="仓库名称" />
-                <el-table-column prop="colex" label="仓库类型" />
-                <el-table-column prop="colh7" label="品种数量" />
-                <el-table-column prop="colr17" label="货值" />
-              </el-table>
-            </div>
-          </el-tab-pane>
-          <el-tab-pane label="仓库商品明细表" name="all">
-            <div>
-              <el-table :data="inallList" border style="width: 100%">
-                <el-table-column prop="supplierCodeUnified" label="仓库编号" />
-                <el-table-column prop="colex" label="仓库名称" />
-                <el-table-column prop="cole4" label="仓库类型" :show-overflow-tooltip="true" />
-                <el-table-column prop="colh7" label="商品编码" />
-                <el-table-column prop="coli8" label="商品条码" :show-overflow-tooltip="true" />
-                <el-table-column prop="colr17" label="商品名称" />
-                <el-table-column prop="colq16" label="商品数量" />
-                <el-table-column prop="colq16" label="商品货值" />
-              </el-table>
-            </div>
-          </el-tab-pane>
-          <el-tab-pane label="烟草仓库库存明细表" name="hz">
-            <div>
-              <el-table :data="countInfo.countList" height="350" border style="width: 100%">
-                <el-table-column prop="supplierCodeUnified" label="仓库名称" />
-                <el-table-column prop="supplierCode" label="仓库类型" />
-                <el-table-column prop="supplierName" label="品种数量" :show-overflow-tooltip="true" />
-                <el-table-column prop="prodCode" label="货值" />
-              </el-table>
-            </div>
-          </el-tab-pane>
-          <el-tab-pane label="烟草库存商品明细表" name="jmd">
-            <div>
-              <el-table :data="jmdList" height="400" border style="width: 100%">
-                <el-table-column prop="colb1" label="仓库编号" />
-                <el-table-column prop="colc2" label="仓库名称" :show-overflow-tooltip="true" />
-                <el-table-column prop="cole4" label="仓库类型" :show-overflow-tooltip="true" />
-                <el-table-column prop="colh7" label="商品编码" />
-                <el-table-column prop="coli8" label="商品条码" :show-overflow-tooltip="true" />
-                <el-table-column prop="colr17" label="商品名称" />
-                <el-table-column prop="colq16" label="商品数量" />
-                <el-table-column prop="colq16" label="商品货值" />
-              </el-table>
-            </div>
-            <div class="pages">
-              <!-- 翻页 -->
-              <pagination v-show="in112ListTotal > 0" :total="in112ListTotal" :page.sync="in112ListQuery.current"
-                :limit.sync="in112ListQuery.size" class="pagination" @pagination="loadIn112List" />
-            </div>
-          </el-tab-pane>
-        </el-tabs>
-      </el-col>
-    </el-row>
+    <div class="main-content">
+      <div class="searchcon">
+        <el-button size="small" class="searchbtn" @click="clicksearchShow">
+          {{ searchxianshitit }}
+        </el-button>
+        <div v-show="isSearchShow" class="search">
+          <el-form ref="queryParams" :model="orderDate" :inline="true" class="tab-header">
+            <el-form-item label="日期">
+              <el-date-picker v-model="orderDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期" />
+            </el-form-item>
+          </el-form>
+          <div class="btn" style="text-align: center;">
+            <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
+            <el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+          </div>
+        </div>
+      </div>
+      <el-row style="margin-left: 20px;margin-right: 20px;">
+        <el-col>
+          <el-tabs v-model="tabActiveName" @tab-click="handleClick">
+            <el-tab-pane label="库存汇总日报表" name="uplog">
+              <div
+                style="display: flex;flex-direction: row;width: 100%;justify-content: space-between;margin-right: 50px; margin-bottom: 10px;">
+                <span>编号:{{logInfo.serialNumber}}</span>
+                <span>上报时间:{{logInfo.reportTime}}</span>
+                <span>货值合计:{{logInfo.countAmount}}</span>
+              </div>
+
+              <div>
+                <el-table :data="logList" border style="width: 100%">
+                  <el-table-column fixed width="100" label="序号" type="index" :index="indexMethod" align="center" />
+                  <el-table-column prop="storeType" align="center" label="仓库类型" />
+                  <el-table-column prop="storeNumber" align="center" label="仓库数量" />
+                  <el-table-column prop="productCountNumber" align="center" label="品种数量" />
+                  <el-table-column prop="productAmount" align="center" label="货值" />
+                </el-table>
+              </div>
+            </el-tab-pane>
+            <el-tab-pane label="仓库库存明细表" name="k112">
+              <div
+                style="display: flex;flex-direction: row;width: 100%;justify-content: space-between;margin-right: 50px; margin-bottom: 10px;">
+                <span>商品数量合计:{{logInfo2.countProductNumber}}</span>
+                <span>商品货值合计:{{logInfo2.countAmount}}</span>
+              </div>
+              <div>
+                <el-table :data="logList2" border style="width: 100%">
+                  <el-table-column fixed width="100" label="序号" type="index" :index="indexMethod2" align="center" />
+                  <el-table-column prop="storeCodeName" align="center" label="仓库名称" />
+                  <el-table-column prop="productCountNumber" align="center" label="商品数量" />
+                  <el-table-column prop="productAmount" align="center" label="商品货值" />
+                </el-table>
+              </div>
+            </el-tab-pane>
+
+            <el-tab-pane label="烟草仓库库存明细表" name="hz">
+              <div
+                style="display: flex;flex-direction: row;width: 100%;justify-content: space-between;margin-right: 50px; margin-bottom: 10px;">
+                <span>商品数量合计:{{logInfo3.countProductNumber}}</span>
+                <span>商品货值合计:{{logInfo3.countAmount}}</span>
+              </div>
+              <div>
+                <el-table :data="logList3" border style="width: 100%">
+                  <el-table-column fixed width="100" label="序号" type="index" :index="indexMethod3" align="center" />
+                  <el-table-column prop="storeCodeName" align="center" label="仓库名称" />
+                  <el-table-column prop="productCountNumber" align="center" label="品种数量" />
+                  <el-table-column prop="productAmount" align="center" label="品种货值" />
+                </el-table>
+              </div>
+            </el-tab-pane>
+
+          </el-tabs>
+        </el-col>
+      </el-row>
+
+    </div>
   </div>
 </template>
 
 <script>
   import {
-    recount,
-    countinfo,
-    in112PagerList,
-    inallPagerList,
-    logPagerList,
-    jmdRkmxList,
-    jmdRkmxListDownload,
-    ztsjZhengli,
-    buildExcelZaiTu
+    // recount,
+    // countinfo,
+    // in112PagerList,
+    // inallPagerList,
+    // logPagerList,
+    // jmdRkmxList,
+    // jmdRkmxListDownload,
+    // ztsjZhengli,
+    // buildExcelZaiTu
+    getReportInventoryDayGather,
+    getReportInventoryDayStore,
+    getReportInventoryDayToStore,
+    exportExcel,
   } from '@/api/inventorySummary/inventorySummary'
   import Pagination from '@/components/pagination'
   import {
@@ -98,6 +108,10 @@
     },
     data() {
       return {
+        tabActiveName: 'uplog',
+        index: "0",
+        isSearchShow: false,
+        searchxianshitit: '显示查询条件',
         btndisabled: false,
         btnList: [ // 右上角按钮
           {
@@ -115,11 +129,24 @@
             btnLabel: '关闭'
           }
         ],
-       
-        jmdList: [],
-        jmdListQuery: {
-          orderDate: ''
-        }
+        logInfo: {
+          serialNumber: "",
+          reportTime: "",
+          countAmount: "",
+        },
+        logList: [],
+        logInfo2: {
+          countProductNumber: "",
+          countAmount: "",
+        },
+        logList2: [],
+        logInfo3: {
+          countProductNumber: "",
+          countAmount: "",
+        },
+        logList3: [],
+        // orderDate: "2023-06-26"
+        orderDate: parseTime(new Date(), '{y}-{m}-{d}')
       }
     },
     mounted() {
@@ -131,6 +158,29 @@
       this.init()
     },
     methods: {
+      // 搜索条件效果
+      clicksearchShow() {
+        this.isSearchShow = !this.isSearchShow
+        if (this.isSearchShow) {
+          this.searchxianshitit = '隐藏查询条件'
+        } else {
+          this.searchxianshitit = '显示查询条件'
+        }
+      },
+      dosearch() {
+        if (this.index == "0") {
+          this.loadLogList1()
+        } else if (this.index == "1") {
+          this.loadLogList2()
+        } else if (this.index == "2") {
+          this.loadLogList3()
+        }
+
+      },
+      resetQuery() {
+        this.orderDate = ""
+      },
+
       // 右上角点击事件
       btnHandle(btnKey) {
         switch (btnKey) {
@@ -147,31 +197,22 @@
       // 标签点击事件
       handleClick(tab, event) {
         console.log(tab, event);
+        this.index = tab.index
         switch (tab.index) {
           case "0":
             // 库存汇总日报表
             console.log("库存汇总日报表");
-             this.loadLogList1()
+            this.loadLogList1()
             break;
           case "1":
             // 仓库库存明细表
             console.log("仓库库存明细表");
-             this.loadLogList2()
+            this.loadLogList2()
             break;
           case "2":
-            // 仓库商品明细表
-            console.log("仓库商品明细表");
-             this.loadLogList3()
-            break;
-          case "3":
             // 烟草仓库库存明细表
             console.log("烟草仓库库存明细表");
-             this.loadLogList4()
-            break;
-          case "4":
-            // 烟草库存商品明细表
-            console.log("烟草库存商品明细表");
-             this.loadLogList5()
+            this.loadLogList3()
             break;
           default:
             break;
@@ -179,111 +220,72 @@
       },
       init() {
         this.loadLogList1()
-        this.jmdListQuery.orderDate = parseTime(new Date(), '{y}-{m}-{d}')
+        this.loadLogList2()
+        this.loadLogList3()
+
       },
       loadLogList1() {
-        logPagerList({
-          current: this.logListQuery.current,
-          size: this.logListQuery.size,
-          params: {
-            orderDate: ''
-          }
-        }).then(response => {
-          if (response.code === '200' && response.data && response.data.total > 0) {
-            this.logList = response.data.records
-            this.logListTotal = response.data.total
-            this.logListQuery.current = response.data.current
-            this.logListQuery.size = response.data.size
+        getReportInventoryDayGather(this.orderDate).then(response => {
+          if (response.code === '200' && response.data) {
+            this.logList = response.data.list
+            this.logInfo = {
+              serialNumber: response.data.serialNumber,
+              reportTime: response.data.reportTime,
+              countAmount: response.data.countAmount,
+            }
           } else {
             this.logList = []
-            this.logListTotal = 0
           }
         })
       },
+      // 序号
+      indexMethod(index) {
+        return index + 1
+      },
       loadLogList2() {
-        in112PagerList({
-          current: this.in112ListQuery.current,
-          size: this.in112ListQuery.size,
-          params: {
-            orderDate: ''
-          }
-        }).then(response => {
-          if (response.code === '200' && response.data && response.data.total > 0) {
-            this.in112List = response.data.records
-            this.in112ListTotal = response.data.total
-            this.in112ListQuery.current = response.data.current
-            this.in112ListQuery.size = response.data.size
+        getReportInventoryDayStore(this.orderDate).then(response => {
+          if (response.code === '200' && response.data) {
+            this.logList2 = response.data.list
+            this.logInfo2 = {
+              countProductNumber: response.data.countProductNumber,
+              countAmount: response.data.countAmount,
+            }
           } else {
-            this.in112List = []
-            this.in112ListTotal = 0
+            this.logList2 = []
           }
         })
       },
+      // 序号
+      indexMethod2(index) {
+        return index + 1
+      },
       loadLogList3() {
-        inallPagerList({
-          current: this.inallListQuery.current,
-          size: this.inallListQuery.size,
-          params: {
-            orderDate: ''
-          }
-        }).then(response => {
-          if (response.code === '200' && response.data && response.data.total > 0) {
-            this.inallList = response.data.records
-            this.inallListTotal = response.data.total
-            this.inallListQuery.current = response.data.current
-            this.inallListQuery.size = response.data.size
+        getReportInventoryDayToStore(this.orderDate).then(response => {
+          if (response.code === '200' && response.data) {
+            this.logList3 = response.data.list
+            this.logInfo3 = {
+              countProductNumber: response.data.countProductNumber,
+              countAmount: response.data.countAmount,
+            }
           } else {
-            this.inallList = []
-            this.inallListTotal = 0
+            this.logList3 = []
           }
         })
       },
-      loadLogList4() {
-        inallPagerList({
-          current: this.inallListQuery.current,
-          size: this.inallListQuery.size,
-          params: {
-            orderDate: ''
-          }
-        }).then(response => {
-          if (response.code === '200' && response.data && response.data.total > 0) {
-            this.inallList = response.data.records
-            this.inallListTotal = response.data.total
-            this.inallListQuery.current = response.data.current
-            this.inallListQuery.size = response.data.size
-          } else {
-            this.inallList = []
-            this.inallListTotal = 0
-          }
-        })
+      // 序号
+      indexMethod3(index) {
+        return index + 1
       },
-      loadLogList5() {
-        inallPagerList({
-          current: this.inallListQuery.current,
-          size: this.inallListQuery.size,
-          params: {
-            orderDate: ''
-          }
-        }).then(response => {
-          if (response.code === '200' && response.data && response.data.total > 0) {
-            this.inallList = response.data.records
-            this.inallListTotal = response.data.total
-            this.inallListQuery.current = response.data.current
-            this.inallListQuery.size = response.data.size
-          } else {
-            this.inallList = []
-            this.inallListTotal = 0
-          }
+      // 导出文件
+      doBuild() {
+        exportExcel(this.orderDate).then((resp) => {
+           console.log(">>>>>11111111111111111", resp)
+          // console.log(">>>>>222222222", process.env.VUE_APP_BASE_API + resp.data.fullUrl)
+          window.location.href = resp.data
+        }).catch(() => {
+          // loading.close()
         })
-      },
-      loadJmdList() {
-        jmdRkmxList(this.jmdListQuery)
-          .then(res => {
-            this.jmdList = res.data
-          })
-          .catch(e => {
-            console.log(e)
-          })
+
       },
     }
   }
diff --git a/supervise-wx-mp/common/config.js b/supervise-wx-mp/common/config.js
index adabe196..825b3c5d 100644
--- a/supervise-wx-mp/common/config.js
+++ b/supervise-wx-mp/common/config.js
@@ -6,8 +6,8 @@
  * loginTimeoutPage = "/pages/login/index", // 登录超时或失效的情况下，跳转到的登录页面
  */
 module.exports = {
-	// baseUrl: 'http://192.168.1.105:8001',
-	baseUrl: 'https://jianguan.yyundong.com/wxmpapi',
+	// baseUrl: 'http://192.168.1.193:7009',
+	baseUrl: 'https://jianguan.yyundong.com',
 	// baseUrl: 'http://jianguan.yyundong.com/api',
 	tokenName: "Authorization", // 请求头中token的名字，与服务器端对应
 	loginTimeoutCode: "5001", // 登录超时或失效的情况下，服务器端返回的错误码
diff --git a/supervise-wx-mp/common/req.js b/supervise-wx-mp/common/req.js
index 4b02b485..bf8d4058 100644
--- a/supervise-wx-mp/common/req.js
+++ b/supervise-wx-mp/common/req.js
@@ -13,4 +13,14 @@ export default {
 	
 	// 查看预警信息
 	selectBusinessRiskInfo: (params = {}) => http.post("/v1/businessData/selectBusinessRiskInfo", params)
+	
+	
+	// 获取审核报告内容
+	getReportInfo: (params = {}) => request.post("/v1/csmcashreport/getCsmReportByComSid", params),
+	// 获取今日回款明细
+	getCsmReportTodayByComSid: (params = {}) => request.post("/v1/csmcashreportcashed/getCsmReportTodayByComSid",
+		params),
+	// 获取昨日销售报表
+	getCsmReportYesterdayByComSid: (params = {}) => request.post("/v1/csmcashreportsales/getCsmReportYesterdayByComSid",
+		params)
 }
diff --git a/supervise-wx-mp/common/request.api.js b/supervise-wx-mp/common/request.api.js
index 819cda8a..2f5f1aa1 100644
--- a/supervise-wx-mp/common/request.api.js
+++ b/supervise-wx-mp/common/request.api.js
@@ -1,12 +1,35 @@
 import request from '@/utils/requester.js'
 
 export default {
-	login: (params = {}) => request.post("/sysuser/login", params),
+	login: (params = {}) => request.post("/wxmpapi/sysuser/login", params),
 	sayhello: (params = {}) => request.get("/sayb", params),
 	getSalesReport: (params = {}) => request.get("/system/reportCenter/getSalesReport", params),
 	getGoodsOnWay: (params = {}) => request.get("/system/reportCenter/getGoodsOnWay", params),
 	getThresholdAnalysis: (params = {}) => request.get("/system/risk/getThresholdAnalysis", params),
 
 	// 查看预警信息
-	selectBusinessRiskInfo: (params = {}) => request.post("/v1/businessData/selectBusinessRiskInfo", params)
+	selectBusinessRiskInfo: (params = {}) => request.post("/wxmpapi/v1/businessData/selectBusinessRiskInfo", params),
+
+	// 获取审核报告内容
+	getReportInfo: (params = {}) => request.post("/reportwxmpapi/v1/csmcashreport/getCsmReportByComSid", params),
+	// 获取今日回款明细
+	getCsmReportTodayByComSid: (params = {}) => request.post(
+		"/reportwxmpapi/v1/csmcashreportcashed/getCsmReportTodayByComSid",
+		params),
+	// 获取昨日销售报表
+	getCsmReportYesterdayByComSid: (params = {}) => request.post(
+		"/reportwxmpapi/v1/csmcashreportsales/getCsmReportYesterdayByComSid",
+		params),
+
+	// 库存汇总表
+	getReportInventoryDayGather: (params = {}) => request.get("/reportwxmpapi/reportinventory//getReportInventoryDayGather/" +
+		params,
+		params),
+	// 仓库库存明细表
+	getReportInventoryDayStore: (params = {}) => request.get(
+		"/reportwxmpapi/reportinventory/getReportInventoryDayStore/" + params, params),
+	// 烟草仓库库存明细表
+	getReportInventoryDayToStore: (params = {}) => request.get(
+		"/reportwxmpapi/reportinventory/getReportInventoryDayToStore/" + params, params)
+
 }
\ No newline at end of file
diff --git a/supervise-wx-mp/pages.json b/supervise-wx-mp/pages.json
index f45c6c19..9ce06676 100644
--- a/supervise-wx-mp/pages.json
+++ b/supervise-wx-mp/pages.json
@@ -1,11 +1,26 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
+			"path": "pages/index/inventoryReport",
+			"style": {
+				"navigationBarTitleText": "库存日报表"
+			}
+		},{
 			"path": "pages/login/index",
 			"style": {
 				"navigationBarTitleText": "登录"
 			}
-		},		{
+		},{
+			"path": "pages/index/auditReport",
+			"style": {
+				"navigationBarTitleText": "回款报告"
+			}
+		},{
+			"path": "pages/index/enterpriseRisk",
+			"style": {
+				"navigationBarTitleText": "企业经营异常核查"
+			}
+		},	{
 			"path": "pages/login/fwxy",
 			"style": {
 				"navigationBarTitleText": "服务协议"
@@ -16,12 +31,8 @@
 				"navigationBarTitleText": "隐私政策"
 			}
 		},
-		{
-			"path": "pages/index/enterpriseRisk",
-			"style": {
-				"navigationBarTitleText": "企业经营异常核查"
-			}
-		},
+		
+		
 		{
 			"path": "pages/index/index",
 			"style": {
diff --git a/supervise-wx-mp/pages/index/auditReport.vue b/supervise-wx-mp/pages/index/auditReport.vue
new file mode 100644
index 00000000..186d2feb
--- /dev/null
+++ b/supervise-wx-mp/pages/index/auditReport.vue
@@ -0,0 +1,198 @@
+<template>
+
+	<view style="margin-left: 20px; margin-right: 20px;padding-bottom: 50px">
+		<view
+			style="display: flex;width: 100%;justify-content: center;size: 25px;font-family: sans-serif;font-weight: 600;margin-top: 20px;">
+			每日回款审核报告
+		</view>
+
+		<view style="margin-top: 20px;font-family: sans-serif;font-weight: 600;">石家庄汇融农村合作银行振头支行：</view>
+
+		<view style=" line-height: 30px; margin-top: 10px;text-indent:2em;">
+			<text style="font-family: sans-serif;font-weight: 600;">{{info.companyName}}</text>
+			<text>昨日销售及今日回款情况如下：昨日销售总计：</text>
+			<text style="font-family: sans-serif;font-weight: 600;">{{info.totalSales}}</text>
+			<text> 元，今日应回款：</text>
+			<text style="font-family: sans-serif;font-weight: 600;">{{info.collection}}</text>
+			<text> 元，今日实际回款：</text>
+			<text style="font-family: sans-serif;font-weight: 600;">{{info.actualCollection}}</text>
+			<text> 元，回款差额：</text>
+			<text style="font-family: sans-serif;font-weight: 600;">{{info.difference}}</text>
+			<text> 元，未回款原因平台扣除手续费、服务费等。具体原因详见附件今日回款明细。</text>
+
+			<view >
+				<text>截至</text>
+				<text style="font-family: sans-serif;font-weight: 600;">{{info.endTime}}</text>
+				<text>，今日支付完毕款项后，账户余额为：</text>
+				<text style="font-family: sans-serif;font-weight: 600;">{{info.balance}}</text>
+				<text> 元。</text>
+			</view>
+
+		</view>
+		
+		<view style="display: flex;flex-direction: column;margin-top: 15px; line-height: 30px;">
+			<text style="size: 25px;font-family: sans-serif;font-weight: 600;">审核结果：</text>
+			<text style="text-indent:2em;">{{info.auditResult}}</text>
+			<!-- <view>
+				<text
+					style="margin-top: 10px;text-indent:2em;">实际回款资金已按要求回到{{info.companyName}}{{info.account}}（账号为</text>
+				<text style="font-family: sans-serif;font-weight: 600;">{{info.accountNumber}}</text>
+				<text>）。</text>
+			</view> -->
+		
+		</view>
+		
+		
+		<view style="display: flex;flex-direction: column;width: 100%;align-items: flex-end; margin-top: 30px;">
+		
+			<text style="font-family: sans-serif;font-weight: 600;">{{info.reviewedBy}}</text>
+			<text style="margin-top:10px ; font-family: sans-serif;font-weight: 600;">{{info.date}}</text>
+		
+		</view>
+		
+
+		<view style="margin-top: 50px; display: flex; flex-direction: column;">
+			<text style="size: 25px;font-family: sans-serif;font-weight: 600;padding-bottom: 10px;">附件：今日回款明细</text>
+			<uni-table ref="table1"  border stripe emptyText="暂无更多数据">
+				<uni-tr>
+					<uni-th align="center">销售日期</uni-th>
+					<uni-th align="center">支付渠道</uni-th>
+					<uni-th align="center">金额（元）</uni-th>
+					<uni-th align="center">对应公司主体</uni-th>
+					<uni-th align="center">回款金额</uni-th>
+					<uni-th align="center">回款差额</uni-th>
+					<uni-th align="center">备注</uni-th>
+				</uni-tr>
+				<uni-tr v-for="(item, index) in tableData1" :key="index">
+					<uni-td align="center">{{ item.salesDate }}</uni-td>
+					<uni-td align="center">{{ item.payChannels }}</uni-td>
+					<uni-td align="center">{{ item.money }}</uni-td>
+					<uni-td align="center">{{ item.mainBody }}</uni-td>
+					<uni-td align="center">{{ item.collection }}</uni-td>
+					<uni-td align="center">{{ item.different }}</uni-td>
+					<uni-td align="center">{{ item.notes }}</uni-td>
+				</uni-tr>
+
+			</uni-table>
+
+		</view>
+
+		<view style="margin-top: 30px; display: flex; flex-direction: column;">
+			<text style="size: 25px;font-family: sans-serif;font-weight: 600;padding-bottom: 10px;">附件：昨日销售报表</text>
+
+			<uni-table ref="table2" border stripe emptyText="暂无更多数据">
+
+				<uni-tr>
+					<uni-th align="center">支付渠道</uni-th>
+					<uni-th align="center">金额（元）</uni-th>
+					<uni-th align="center">对应公司主体</uni-th>
+					<uni-th align="center">到账周期</uni-th>
+				</uni-tr>
+				<uni-tr v-for="(item, index) in tableData2" :key="index">
+					<uni-td align="center">{{ item.payChannels }}</uni-td>
+					<uni-td align="center">{{ item.money }}</uni-td>
+					<uni-td align="center">{{ item.mainBody }}</uni-td>
+					<uni-td align="center">{{ item.cycle }}</uni-td>
+				</uni-tr>
+
+			</uni-table>
+		</view>
+
+
+
+	</view>
+
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				queryParams: {
+					dataDate: "",
+					companyName: ""
+				},
+				loading1: false,
+				loading2: false,
+				info: {
+					companyName: "",
+					totalSales: "",
+					collection: "",
+					actualCollection: "",
+					different: "",
+					endTime: "",
+					balance: "",
+					account: "",
+					accountNumber: "",
+					reviewedBy: "",
+					date: "",
+				},
+
+				tableData1: [
+				// 	{
+				// 	"salesDate": "2023年6月7日",
+				// 	"payChannels": "批发-京东",
+				// 	"money": "397.09",
+				// 	"mainBody": "源蜂-汇融",
+				// 	"collection": "357.87",
+				// 	"different": "39.22",
+				// 	"notes": "6.7回小时购150.12"
+				// },
+				],
+				tableData2: [
+				// 	{
+				// 	"payChannels": "现金",
+				// 	"money": "63094.88",
+				// 	"mainBody": "-",
+				// 	"cycle": "每月19号归集"
+				// },
+				],
+			};
+		},
+		onLoad(option) {
+
+			this.queryParams = {
+				dataDate: option.dataDate,
+				companyName: option.companyName
+			}
+
+			console.log('1111', this.queryParams)
+			this.getData()
+
+		},
+		methods: {
+			getData() {
+				console.log('getData', this.queryParams)
+				this.$api.getReportInfo(this.queryParams).then((resp) => {
+					console.log('1111>>>>>>', resp)
+				
+					this.info = resp
+
+				}).catch(e => {
+					console.log('eeeee', e)
+				})
+
+				this.$api.getCsmReportTodayByComSid(this.queryParams).then((resp) => {
+					console.log('2222>>>>>>', resp)
+					this.loading1 = true
+					this.tableData1 = resp
+
+				}).catch(e => {
+					console.log('eeeee', e)
+				})
+
+				this.$api.getCsmReportYesterdayByComSid(this.queryParams).then((resp) => {
+					console.log('3333>>>>>>', resp)
+						this.loading2 = true
+					this.tableData2 = resp
+
+				}).catch(e => {
+					console.log('eeeee', e)
+				})
+			},
+		}
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/supervise-wx-mp/pages/index/enterpriseRisk.vue b/supervise-wx-mp/pages/index/enterpriseRisk.vue
index 5a02e803..d1cbc488 100644
--- a/supervise-wx-mp/pages/index/enterpriseRisk.vue
+++ b/supervise-wx-mp/pages/index/enterpriseRisk.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="charts-box">
+	<view class="charts-box" style="padding-bottom: 50px;">
 
 		<view class="top" style="margin-top: 15px;">
 			<text>企业名称：</text>
@@ -78,8 +78,20 @@
 		},
 		onLoad(option) {
 
-			this.queryParams = JSON.stringify(option)
-			console.log('1111',this.queryParams)
+			// var data = JSON.stringify(option)
+
+			this.queryParams = {
+				businessName: option.businessName,
+				executionTime: option.executionTime
+			}
+
+			console.log('1111', this.queryParams)
+
+			// this.setData({
+			// 	queryParams: JSON.stringify(option)
+			// })
+
+			// console.log('setData', this.queryParams)
 			this.getData()
 
 			// console.log('App onLoad', JSON.stringify(option))
@@ -93,8 +105,8 @@
 		},
 		methods: {
 			getData() {
-				var _this = this
-				this.$api.selectBusinessRiskInfo(_this.queryParams).then((resp) => {
+				console.log('getData', this.queryParams)
+				this.$api.selectBusinessRiskInfo(this.queryParams).then((resp) => {
 					console.log('1111>>>>>>', resp)
 					this.list = resp
 					console.log('2222>>>>>>', this.list.length)
diff --git a/supervise-wx-mp/pages/index/inventoryReport.vue b/supervise-wx-mp/pages/index/inventoryReport.vue
new file mode 100644
index 00000000..6cfe704f
--- /dev/null
+++ b/supervise-wx-mp/pages/index/inventoryReport.vue
@@ -0,0 +1,200 @@
+<template>
+
+	<view style="margin-left: 20px; margin-right: 20px;padding-bottom: 50px">
+		<view style="display: flex; width: 100%;justify-content: center; size: 25px;font-family: sans-serif;font-weight: 600;margin: 10px;">{{date}}</view>
+
+		<view style="margin-top: 20px; display: flex; flex-direction: column;">
+			<text style="size: 25px;font-family: sans-serif;font-weight: 600;padding-bottom: 10px;">库存日报汇总表</text>
+			<text>编号:{{logInfo.serialNumber}}</text>
+			<text>上报时间:{{logInfo.reportTime}}</text>
+			<text style="margin-bottom: 10px;">货值合计:{{logInfo.countAmount}}</text>
+
+			<uni-table ref="table1" border stripe emptyText="暂无更多数据">
+				<uni-tr>
+					<!-- <uni-th align="center">序号</uni-th> -->
+					<uni-th align="center" width="180">仓库类型</uni-th>
+					<uni-th align="center"width="80">仓库数量</uni-th>
+					<uni-th align="center"width="80">品种数量</uni-th>
+					<uni-th align="center"width="100">品种货值</uni-th>
+				</uni-tr>
+				<uni-tr v-for="(item, index) in tableData1" :key="index">
+					<!-- <uni-td align="center">{{ index+1}}</uni-td> -->
+					<uni-td align="center">{{ item.storeType }}</uni-td>
+					<uni-td align="center">{{ item.storeNumber }}</uni-td>
+					<uni-td align="center">{{ item.productCountNumber }}</uni-td>
+					<uni-td align="center">{{ item.productAmount }}</uni-td>
+				</uni-tr>
+
+			</uni-table>
+
+		</view>
+
+		<view style="margin-top: 50px; display: flex; flex-direction: column;">
+			<text style="size: 25px;font-family: sans-serif;font-weight: 600;padding-bottom: 10px;">仓库库存明细表</text>
+			<text>商品数量合计:{{logInfo2.countProductNumber}}</text>
+			<text style="margin-bottom: 10px;">商品货值合计:{{logInfo2.countAmount}}</text>
+			<uni-table ref="table1" border stripe emptyText="暂无更多数据">
+				<uni-tr>
+					<!-- <uni-th align="center" width="50">序号</uni-th> -->
+					<uni-th align="center" width="180">仓库名称</uni-th>
+					<uni-th align="center" width="80">商品数量</uni-th>
+					<uni-th align="center" width="100">商品货值</uni-th>
+				</uni-tr>
+				<uni-tr v-for="(item, index) in tableData2" :key="index">
+					<!-- <uni-td align="center">{{ index+1 }}</uni-td> -->
+					<uni-td align="center">{{ item.storeCodeName }}</uni-td>
+					<uni-td align="center">{{ item.productCountNumber }}</uni-td>
+					<uni-td align="center">{{ item.productAmount }}</uni-td>
+				</uni-tr>
+
+			</uni-table>
+
+		</view>
+
+		<view style="margin-top: 50px; display: flex; flex-direction: column;">
+			<text style="size: 25px;font-family: sans-serif;font-weight: 600;padding-bottom: 10px;">烟草库存明细表</text>
+			<text>商品数量合计:{{logInfo3.countProductNumber}}</text>
+			<text style="margin-bottom: 10px;">商品货值合计:{{logInfo3.countAmount}}</text>
+			<uni-table ref="table1" border stripe emptyText="暂无更多数据">
+				<uni-tr>
+					<!-- <uni-th align="center">序号</uni-th> -->
+					<uni-th align="center"  width="180">仓库名称</uni-th>
+					<uni-th align="center"  width="80">品种数量</uni-th>
+					<uni-th align="center"  width="100">品种货值</uni-th>
+				</uni-tr>
+				<uni-tr v-for="(item, index) in tableData3" :key="index">
+					<!-- <uni-td align="center">{{ index+1 }}</uni-td> -->
+					<uni-td align="center">{{ item.storeCodeName }}</uni-td>
+					<uni-td align="center">{{ item.productCountNumber }}</uni-td>
+					<uni-td align="center">{{ item.productAmount }}</uni-td>
+				</uni-tr>
+
+			</uni-table>
+
+		</view>
+	</view>
+
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				date: "2023-06-25",
+				logInfo: {
+					serialNumber: "",
+					reportTime: "",
+					countAmount: "",
+				},
+				logInfo2: {
+					countProductNumber: "",
+					countAmount: "",
+				},
+				logInfo3: {
+					countProductNumber: "",
+					countAmount: "",
+				},
+				tableData1: [],
+				tableData2: [],
+				tableData3: [],
+			};
+		},
+		onLoad(option) {
+
+			// this.date = option.orderDate
+
+			// console.log('1111', this.queryParams)
+			this.getData()
+
+		},
+		methods: {
+			getData() {
+				console.log('getData', this.date)
+				this.$api.getReportInventoryDayGather(this.date).then((resp) => {
+					console.log('1111>>>>>>', resp)
+
+					this.tableData1 = resp.list
+					this.logInfo = {
+						serialNumber: resp.serialNumber,
+						reportTime: resp.reportTime,
+						countAmount: resp.countAmount,
+					}
+
+				}).catch(e => {
+					console.log('eeeee', e)
+				})
+
+				this.$api.getReportInventoryDayStore(this.date).then((resp) => {
+					console.log('2222>>>>>>', resp)
+					this.tableData2 = resp.list
+					this.logInfo2 = {
+						countProductNumber: resp.countProductNumber,
+						countAmount: resp.countAmount,
+					}
+				}).catch(e => {
+					console.log('eeeee', e)
+				})
+
+				this.$api.getReportInventoryDayToStore(this.date).then((resp) => {
+					console.log('3333>>>>>>', resp)
+					this.tableData3 = resp.list
+					this.logInfo3 = {
+						countProductNumber: resp.countProductNumber,
+						countAmount: resp.countAmount,
+					}
+				}).catch(e => {
+					console.log('eeeee', e)
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.title {
+		width: 100%;
+		height: 100rpx;
+		background: white;
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+	}
+
+	.titleSel {
+		color: #5f6fee;
+		font-size: 32rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+
+
+	.headerLineSel {
+		background: #5f6fee;
+		height: 6rpx;
+		width: 220rpx;
+		margin-top: 10rpx;
+	}
+
+	.headerLineUnsel {
+		background: #fff;
+		height: 6rpx;
+		width: 40rpx;
+		position: relative;
+		margin-top: 10rpx;
+	}
+
+	.swiper {
+		width: 100%;
+		flex: 1;
+		height: 100vh;
+		overflow: scroll;
+	}
+
+	.recordItem {
+		margin-top: 10rpx;
+		background-color: white;
+		padding-bottom: 20rpx;
+		padding-top: 20rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/supervise-wx-mp/pages/login/index.vue b/supervise-wx-mp/pages/login/index.vue
index f8195df1..2c201381 100644
--- a/supervise-wx-mp/pages/login/index.vue
+++ b/supervise-wx-mp/pages/login/index.vue
@@ -40,8 +40,8 @@
 				avatar: 'https://jianguan.yyundong.com/wx/logo-hryy.png',
 				// 表单数据
 				formData: {
-					userName: 'admin',
-					password: 'admin'
+					userName: '13131100001',
+					password: '123456'
 				},
 				rules: {
 					// 对name字段进行必填验证
@@ -90,7 +90,7 @@
 							.then(uinfo => {
 								console.log('MMMM:', uinfo)
 								getApp().globalData.username = uinfo.name
-								getApp().globalData.token = uinfo.tokenValue
+								getApp().globalData.token = uinfo.token
 								//存
 								uni.setStorageSync('tokenValue', uinfo.tokenValue);
 								console.log('gd--:', getApp().globalData)