From 86df8bd0f59ec40d88268246018be4015f386478 Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Sun, 23 Apr 2023 16:35:55 +0800
Subject: [PATCH] 2023-04-23

---
 .../src/router/modules/codemenu.js            |  14 --
 .../src/views/enterprise/index.vue            |   2 +-
 supervise-organizational-ui/.env.development  |   4 +-
 .../src/api/brank/brank.js                    |  89 +++++++++
 .../src/api/portal/areaPicker.js              |  34 ++++
 .../src/router/modules/codemenu.js            |  16 +-
 .../src/views/brank/brankAdd.vue              |   4 +-
 .../src/views/brank/brankAddPersonnel.vue     | 187 ++++++++++++++++++
 .../src/views/brank/brankInfo.vue             |  50 ++++-
 .../src/views/brank/brankInfo2.vue            |   0
 .../src/views/brank/index.vue                 |  15 +-
 .../src/api/supervise/salesSummary.js         |  20 +-
 .../src/views/reportCenter/salesSummary.vue   | 145 ++++++++------
 yxt-portal-ui/src/views/Home/Home.vue         |  24 ++-
 14 files changed, 495 insertions(+), 109 deletions(-)
 create mode 100644 supervise-organizational-ui/src/api/brank/brank.js
 create mode 100644 supervise-organizational-ui/src/api/portal/areaPicker.js
 rename {supervise-crm-ui => supervise-organizational-ui}/src/views/brank/brankAdd.vue (99%)
 create mode 100644 supervise-organizational-ui/src/views/brank/brankAddPersonnel.vue
 rename {supervise-crm-ui => supervise-organizational-ui}/src/views/brank/brankInfo.vue (82%)
 rename {supervise-crm-ui => supervise-organizational-ui}/src/views/brank/brankInfo2.vue (100%)
 rename {supervise-crm-ui => supervise-organizational-ui}/src/views/brank/index.vue (92%)

diff --git a/supervise-crm-ui/src/router/modules/codemenu.js b/supervise-crm-ui/src/router/modules/codemenu.js
index 7207f736..98fb2be7 100644
--- a/supervise-crm-ui/src/router/modules/codemenu.js
+++ b/supervise-crm-ui/src/router/modules/codemenu.js
@@ -14,20 +14,6 @@ const codemenu = [{
     }
   }]
 },
-{
-  path: '/brank',
-  component: Layout,
-  redirect: '/index',
-  children: [{
-    path: '/brank/index',
-    component: () => import('@/views//brank/index.vue'),
-    name: 'index',
-    meta: {
-      title: '银行管理',
-      noCache: true
-    }
-  }]
-},
 {
   path: '/enterprise',
   component: Layout,
diff --git a/supervise-crm-ui/src/views/enterprise/index.vue b/supervise-crm-ui/src/views/enterprise/index.vue
index b67b1509..41e6035c 100644
--- a/supervise-crm-ui/src/views/enterprise/index.vue
+++ b/supervise-crm-ui/src/views/enterprise/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div v-show="viewState ==1">
-      <button-bar view-title="企业管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+      <button-bar view-title="企业信息" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle" />
       <div class="main-content">
         <div class="searchcon">
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
diff --git a/supervise-organizational-ui/.env.development b/supervise-organizational-ui/.env.development
index d4d20ecb..01c78fbe 100644
--- a/supervise-organizational-ui/.env.development
+++ b/supervise-organizational-ui/.env.development
@@ -5,5 +5,5 @@ ENV = 'development'
 VUE_APP_BASE_API = '/api'
 
 ## 配置测试和本地开发时的 接口地址
-##VUE_APP_URL = "http://192.168.3.173:8112"
-VUE_APP_URL = "http://8.130.39.13:8112"
+VUE_APP_URL = "http://192.168.3.173:8112"
+##VUE_APP_URL = "http://8.130.39.13:8112"
diff --git a/supervise-organizational-ui/src/api/brank/brank.js b/supervise-organizational-ui/src/api/brank/brank.js
new file mode 100644
index 00000000..d72a4eba
--- /dev/null
+++ b/supervise-organizational-ui/src/api/brank/brank.js
@@ -0,0 +1,89 @@
+import request from '@/utils/request'
+
+export default {
+
+  addInfo: function(data) {
+    return request({
+      baseURL: "/api/crm",
+      url: '/v1/loanbankinformation/save',
+      method: 'post',
+      data: data
+    });
+  },
+
+  fetchBySid: function(sid) {
+    return request({
+      baseURL: '/api/crm',
+      url: '/v1/loanbankinformation/getBankInfBySid/' + sid
+    })
+  },
+
+  updateData: function(data) {
+    return request({
+      baseURL: "/api/crm",
+      url: '/v1/loanbankinformation/update',
+      method: 'post',
+      data: data
+    });
+  },
+
+  delBySids: function(sid) {
+    return request({
+      baseURL: '/api/crm',
+      url: 'v1/loanbankinformation/delete/' + sid,
+      method: 'delete'
+    })
+  },
+
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+      baseURL: '/api/crm',
+      url: '/v1/loanbankinformation/listPage',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+  // 人员信息
+
+  addPersonnelInfo: function(data) {
+    return request({
+      baseURL: "/api/crm",
+      url: '/v1/bankmanager/save',
+      method: 'post',
+      data: data
+    });
+  },
+
+  fetchPersonnelBySid: function(sid) {
+    return request({
+      baseURL: '/api/crm',
+      url: '/v1/bankmanager/getManagerBySid /' + sid
+    })
+  },
+
+  updatePersonnelData: function(data) {
+    return request({
+      baseURL: "/api/crm",
+      url: '/v1/bankmanager/update',
+      method: 'post',
+      data: data
+    });
+  },
+
+  delPersonnelBySids: function(sid) {
+    return request({
+      baseURL: '/api/crm',
+      url: '/v1/bankmanager/delete',
+      method: 'delete',
+      data: sid,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+}
diff --git a/supervise-organizational-ui/src/api/portal/areaPicker.js b/supervise-organizational-ui/src/api/portal/areaPicker.js
new file mode 100644
index 00000000..8a2eee36
--- /dev/null
+++ b/supervise-organizational-ui/src/api/portal/areaPicker.js
@@ -0,0 +1,34 @@
+import request from '@/utils/request'
+
+// 获取省/portal/v1/regions/getProvince
+export function getProvince(data) {
+  return request({
+    url: '/portal/v1/regions/getProvince',data,
+    method: 'get',
+    params:data,
+  })
+}
+// 根据省sid获取该省的所有市
+export function getCity(data) {
+  return request({
+    url: '/portal/v1/regions/getCity',
+    params:data,
+    method: 'get',
+  })
+}
+// 根据市sid获取该市的所有县区
+export function getCounty(data) {
+  return request({
+    url: '/portal/v1/regions/getCounty',
+    method: 'get',
+    params:data,
+  })
+}
+// // 区域列表（省市县均可用）
+// export function selectsList(data) {
+//   return request({
+//     url: '/portal/v1/regions/selectsList', data,
+//     method: 'post',
+//     headers: { 'Content-Type': 'application/json' }
+//   })
+// }
diff --git a/supervise-organizational-ui/src/router/modules/codemenu.js b/supervise-organizational-ui/src/router/modules/codemenu.js
index 001f8dd3..d3edeacb 100644
--- a/supervise-organizational-ui/src/router/modules/codemenu.js
+++ b/supervise-organizational-ui/src/router/modules/codemenu.js
@@ -48,5 +48,19 @@ const codemenu = [{
       noCache: true
     }
   }]
-}]
+},
+{
+  path: '/brank',
+  component: Layout,
+  redirect: '/index',
+  children: [{
+    path: '/brank/index',
+    component: () => import('@/views//brank/index.vue'),
+    name: 'index',
+    meta: {
+      title: '银行信息',
+      noCache: true
+    }
+  }]
+},]
 export default codemenu
diff --git a/supervise-crm-ui/src/views/brank/brankAdd.vue b/supervise-organizational-ui/src/views/brank/brankAdd.vue
similarity index 99%
rename from supervise-crm-ui/src/views/brank/brankAdd.vue
rename to supervise-organizational-ui/src/views/brank/brankAdd.vue
index be8bb049..b7752c98 100644
--- a/supervise-crm-ui/src/views/brank/brankAdd.vue
+++ b/supervise-organizational-ui/src/views/brank/brankAdd.vue
@@ -139,8 +139,8 @@
         console.log(">>>>>>>>>")
         if (isreload === 'true') this.$emit('reloadlist')
         if (this.formobj.psid) {
-          // this.$emit('close', this.formobj.psid)
- this.$emit('doback')
+          this.$emit('close', this.formobj.psid)
+ // this.$emit('doback')
         } else {
 
           this.$emit('doback')
diff --git a/supervise-organizational-ui/src/views/brank/brankAddPersonnel.vue b/supervise-organizational-ui/src/views/brank/brankAddPersonnel.vue
new file mode 100644
index 00000000..4acb5adc
--- /dev/null
+++ b/supervise-organizational-ui/src/views/brank/brankAddPersonnel.vue
@@ -0,0 +1,187 @@
+<template>
+  <div>
+
+    <div class="tab-header webtop">
+      <!-- 标题 -->
+      <div>人员信息</div>
+      <!-- start 添加修改按钮 -->
+      <div>
+        <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
+        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+      </div>
+    </div>
+
+    <div>
+
+      <el-card class="box-card">
+        <div class="item">
+          <span class="item_text">姓名：</span>
+          <el-input v-model="formobj.name" placeholder="" class="item_input" style="width: 520px;" clearable />
+        </div>
+        <div class="item">
+          <span class="item_text">电话：</span>
+          <el-input v-model="formobj.telephone" placeholder="" class="item_input" maxlength="11" style="width: 520px;" clearable />
+        </div>
+        <div class="item">
+          <span class="item_text">职务：</span>
+          <el-input v-model="formobj.post" placeholder="" class="item_input" style="width: 520px;" clearable />
+        </div>
+      </el-card>
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+  import req from '@/api/brank/brank'
+  export default {
+    data() {
+      return {
+        submitdisabled: false,
+        formobj: {
+          bankSid: "",
+          sid: "",
+          post: "",
+          name: "",
+          telephone: ""
+        },
+      }
+    },
+    methods: {
+      saveOrUpdate() {
+
+        console.log(">>>>>>>>>222222", this.formobj)
+
+        if (this.formobj.sid) {
+          req.updatePersonnelData(this.formobj)
+            .then(resp => {
+              if (resp.success) {
+                this.$message({
+                  showClose: true,
+                  type: 'success',
+                  message: resp.msg
+                })
+                this.handleReturn("true")
+              } else {
+                // 根据resp.code进行异常情况处理
+              }
+            })
+            .catch(() => {})
+        } else {
+          req.addPersonnelInfo(this.formobj)
+            .then(resp => {
+              if (resp.success) {
+                this.$message({
+                  showClose: true,
+                  type: 'success',
+                  message: resp.msg
+                })
+                this.handleReturn("true")
+              } else {
+                // 根据resp.code进行异常情况处理
+              }
+            })
+            .catch(() => {})
+        }
+
+      },
+      handleReturn(isreload) {
+        console.log(">>>>>>>>>")
+        if (isreload === 'true') this.$emit('reloadlist')
+        if (this.formobj.bankSid) {
+          this.$emit('close', this.formobj.bankSid)
+          // this.$emit('doback')
+        } else {
+
+          this.$emit('doback')
+        }
+        this.formobj = {
+          bankSid: "",
+          sid: "",
+          post: "",
+          name: "",
+          telephone: ""
+        }
+
+      },
+      showAdd(sid) {
+        this.formobj.bankSid = sid
+      },
+      showEdit(row) {
+        req.fetchPersonnelBySid(row.sid)
+          .then(resp => {
+            if (resp.success) {
+              this.formobj = resp.data
+            }
+
+          })
+          .catch(e => {
+            this.formobj = row
+          })
+      },
+
+    }
+  }
+</script>
+<style lang="scss">
+  .box-card {
+    margin-left: 60px;
+    margin-right: 60px;
+    margin-top: 20px;
+
+    .item {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: center;
+      margin-top: 15px;
+      height: 40px;
+      line-height: 40px;
+
+      .item_text {
+        font-size: 18px;
+        text-align: right;
+      }
+
+      .item_input {
+        font-size: 16px;
+        margin-left: 10px;
+        margin-right: 80px;
+      }
+
+      .item_left_input {
+        width: 20%;
+      }
+
+      .item_left_text {
+        height: 30px;
+        margin-left: 20px;
+        line-height: 30px;
+        color: #018AD2;
+        padding: 0px 15px;
+        border: 1.5px solid #018AD2;
+        border-radius: 5px;
+
+      }
+
+      .item_right {
+        flex: 1;
+        justify-items: center;
+
+        .item_right_list_text {
+          font-size: 16px;
+        }
+
+        .item_right_list_delect {
+          color: #5E94FF;
+          margin-left: 20px;
+          font-size: 16px;
+          text-decoration: underline;
+        }
+      }
+
+    }
+
+  }
+</style>
diff --git a/supervise-crm-ui/src/views/brank/brankInfo.vue b/supervise-organizational-ui/src/views/brank/brankInfo.vue
similarity index 82%
rename from supervise-crm-ui/src/views/brank/brankInfo.vue
rename to supervise-organizational-ui/src/views/brank/brankInfo.vue
index dcd08412..f0cd7c40 100644
--- a/supervise-crm-ui/src/views/brank/brankInfo.vue
+++ b/supervise-organizational-ui/src/views/brank/brankInfo.vue
@@ -81,12 +81,21 @@
           </el-row>
 
           <el-collapse v-model="activeNames">
-            <el-collapse-item title="人员信息" name="1">
-
+            <el-collapse-item name="1">
+              <template slot="title">
+                人员信息<span class="span" @click.stop="add()">添加</span>
+              </template>
               <el-table v-loading="listLoading" :data="temp.managerList" border style="width: 100%;"
                 :row-style="{height: '40px'}">
                 <!-- <el-table-column type="selection" align="center" width="50"/> -->
                 <el-table-column label="序号" type="index" width="80" :index="indexMethod1" align="center" />
+                <el-table-column label="操作" wid align="center" width="150">
+                  <template slot-scope="scope">
+                    <!-- <el-button type="primary" size="mini" @click="toPersonnelDetail(scope.row.sid)">查看</el-button> -->
+                    <!-- <el-button type="primary" size="mini" @click="toEdit(scope.row)">编辑</el-button> -->
+                    <el-button type="primary" size="mini" @click="doPersonnelDel(scope.row,temp.sid)">删除</el-button>
+                  </template>
+                </el-table-column>
                 <el-table-column label="姓名" prop="name" align="center" />
                 <el-table-column label="电话" prop="telephone" align="center" />
                 <el-table-column label="职务" prop="post" align="center" />
@@ -151,8 +160,11 @@
 
 
     methods: {
+      add(){
+         this.$emit('dojump', this.temp.sid)
+      },
       aaa() {
-        this.$emit('dojump', this.temp.sid)
+        this.$emit('dojump2', this.temp.sid)
       },
       toDetail(sid) {
         req.fetchBySid(sid)
@@ -164,8 +176,36 @@
           })
           .catch(e => {})
       },
+      doPersonnelDel(row, sid) {
+        let sids = []
+        sids.push(row.sid)
+        const tip = '请确认是否删除所选记录?'
+        this.$confirm(tip, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          req.delPersonnelBySids(sids).then((response) => {
+            if (response.success) {
+              this.$message({
+                showClose: true,
+                type: 'success',
+                message: '删除成功'
+              })
+              this.toDetail(sid)
+              this.$emit('reloadlist')
+            } else {
+              this.$message({
+                showClose: true,
+                type: 'error',
+                message: '删除失败'
+              })
+            }
+          })
+        })
+      },
       // 根据本行ID删除数据
-      doDel(row,sid) {
+      doDel(row, sid) {
         const tip = '请确认是否删除所选记录?'
         this.$confirm(tip, '提示', {
           confirmButtonText: '确定',
@@ -180,7 +220,7 @@
                 message: '删除成功'
               })
               this.toDetail(sid)
-               this.$emit('reloadlist')
+              this.$emit('reloadlist')
             } else {
               this.$message({
                 showClose: true,
diff --git a/supervise-crm-ui/src/views/brank/brankInfo2.vue b/supervise-organizational-ui/src/views/brank/brankInfo2.vue
similarity index 100%
rename from supervise-crm-ui/src/views/brank/brankInfo2.vue
rename to supervise-organizational-ui/src/views/brank/brankInfo2.vue
diff --git a/supervise-crm-ui/src/views/brank/index.vue b/supervise-organizational-ui/src/views/brank/index.vue
similarity index 92%
rename from supervise-crm-ui/src/views/brank/index.vue
rename to supervise-organizational-ui/src/views/brank/index.vue
index e99263e8..33970e7c 100644
--- a/supervise-crm-ui/src/views/brank/index.vue
+++ b/supervise-organizational-ui/src/views/brank/index.vue
@@ -27,10 +27,11 @@
           <el-table v-loading="listLoading" :data="list" border style="width: 100%;">
             <!-- <el-table-column type="selection" align="center" width="50"/> -->
             <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
-            <el-table-column label="操作" wid align="center" width="220">
+            <el-table-column label="操作" wid align="center" width="210">
               <template slot-scope="scope">
                 <el-button type="primary" size="mini" @click="toDetail(scope.row)">查看</el-button>
                 <el-button type="primary" size="mini" @click="toEdit(scope.row)">编辑</el-button>
+                 <!-- <el-button type="primary" size="mini" @click="toDetail(scope.row)">人员认证</el-button> -->
                 <el-button type="primary" size="mini" @click="doDel(scope.row)">删除</el-button>
               </template>
             </el-table-column>
@@ -55,7 +56,8 @@
       </div>
     </div>
     <brankAdd v-show="viewState ==2 || viewState ==3" ref="divAdd" @doback="resetState" @close="close($event)"  @reloadlist="getList" />
-    <brankInfo v-show="viewState ==4" ref="divInfo" @doback="resetState"  @dojump="jump($event)"  @reloadlist="getList"/>
+    <brankInfo v-show="viewState ==4" ref="divInfo" @doback="resetState"  @dojump="jump($event)"  @dojump2="jump2($event)"  @reloadlist="getList"/>
+    <brankAddPersonnel v-show="viewState ==5" ref="brankAddPersonnel" @doback="resetState" @close="close($event)"  @reloadlist="getList"/>
   </div>
 </template>
 
@@ -65,7 +67,8 @@
   import pageye from '@/components/pagination/pageye'
   import ButtonBar from '@/components/ButtonBar'
   import brankAdd from './brankAdd.vue'
-  import brankInfo from './brankInfo2.vue'
+  import brankAddPersonnel from './brankAddPersonnel.vue'
+  import brankInfo from './brankInfo.vue'
   export default {
     name: 'CustomerManagement',
     components: {
@@ -73,6 +76,7 @@
       pageye,
       ButtonBar,
       brankAdd,
+      brankAddPersonnel,
       brankInfo,
 
     },
@@ -224,6 +228,11 @@
         this.viewState = 1
       },
       jump(sid) {
+        console.log("jump",sid)
+        this.viewState = 5
+         this.$refs['brankAddPersonnel'].showAdd(sid)
+      },
+      jump2(sid) {
         console.log("jump",sid)
         this.viewState = 2
          this.$refs['divAdd'].showAdd(sid)
diff --git a/supervise-report-ui/src/api/supervise/salesSummary.js b/supervise-report-ui/src/api/supervise/salesSummary.js
index 23e35ebc..9d340ff5 100644
--- a/supervise-report-ui/src/api/supervise/salesSummary.js
+++ b/supervise-report-ui/src/api/supervise/salesSummary.js
@@ -1,12 +1,12 @@
 import request from '@/utils/request'
 
 // 导出
-export function exportExcel(params) {
+export function exportExcel(data) {
   return request({
-    url: '/report/exportStoreSalesReport',
+    baseURL: '/api',
+    url: '/report/reportsaleslog/getFullUrlByOrderDate',
+    data,
     method: 'post',
-    responseType: 'blob', // 表明返回服务器返回的数据类型
-    data: params,
     headers: {
       'Content-Type': 'application/json'
     }
@@ -23,7 +23,8 @@ export function countinfo() {
 //  门店销售明细表
 export function logPagerList(data) {
   return request({
-    url: '/report/getStoreSalesReport',
+    baseURL: '/api',
+    url: '/report/reportsalesdaystore/getReportSalesDayStore',
     data,
     method: 'post',
     headers: {
@@ -35,7 +36,8 @@ export function logPagerList(data) {
 // 门店商品销售明细表
 export function in112PagerList(data) {
   return request({
-    url: '/report/getGoodsSalesReport',
+    baseURL: '/api',
+    url: '/report/reportproduct/getRepoSalesDayStoreProd',
     data,
     method: 'post',
     headers: {
@@ -47,7 +49,8 @@ export function in112PagerList(data) {
 // 门店销售明细表（烟草）
 export function inallPagerList(data) {
   return request({
-    url: '/report/getStoreSalesReportYc',
+    baseURL: '/api',
+    url: '/report/reporttobaccostore/getSalesTobaccoStore',
     data,
     method: 'post',
     headers: {
@@ -59,7 +62,8 @@ export function inallPagerList(data) {
 // 门店商品销售明细表（烟草）
 export function inall4PagerList(data) {
   return request({
-    url: '/report/getGoodsSalesReportYc',
+    baseURL: '/api',
+    url: '/report/reporttobaccoproduct/getSalesStoreProduct',
     data,
     method: 'post',
     headers: {
diff --git a/supervise-report-ui/src/views/reportCenter/salesSummary.vue b/supervise-report-ui/src/views/reportCenter/salesSummary.vue
index 740fe962..d0ee4ff6 100644
--- a/supervise-report-ui/src/views/reportCenter/salesSummary.vue
+++ b/supervise-report-ui/src/views/reportCenter/salesSummary.vue
@@ -24,36 +24,38 @@
           <el-tabs v-model="tabActiveName" @tab-click="handleOrder">
             <el-tab-pane label="门店销售明细表" name="uplog">
               <div>
-                <span style="display: flex;width: 100%; margin-bottom: 10px; padding-right: 20px; color: #D9251C;justify-content: end;"
-                v-show="logList.length==500">
-                当前数据量过大,只展示前500条数据。详细数据请点击右上角‘导出’</span>
+                <span
+                  style="display: flex;width: 100%; margin-bottom: 10px; padding-right: 20px; color: #D9251C;justify-content: end;"
+                  v-show="logList.length==500">
+                  当前数据量过大,只展示前500条数据。详细数据请点击右上角‘导出’</span>
                 <el-table v-loading="tableLoading1" :data="logList" border style="width: 100%">
                   <el-table-column fixed width="100" label="序号" type="index" :index="indexMethod" align="center" />
-                  <el-table-column prop="storeName" label="销售渠道" align="center" />
-                  <el-table-column prop="salesVolume" label="销售额(元)" align="center" />
+                  <el-table-column prop="storeCodeName" label="销售渠道" align="center" />
+                  <el-table-column prop="saleAmount" label="销售额(元)" align="center" />
                 </el-table>
               </div>
               <!-- <div class="pages"> -->
-                <!-- 翻页 -->
-             <!--   <pagination v-show="logListTotal > 0" :total="logListTotal" :page.sync="logListQuery.current"
+              <!-- 翻页 -->
+              <!--   <pagination v-show="logListTotal > 0" :total="logListTotal" :page.sync="logListQuery.current"
                   :limit.sync="logListQuery.size" class="pagination" @pagination="loadLogList" />
               </div> -->
             </el-tab-pane>
             <el-tab-pane label="门店商品销售明细表" name="k112">
               <div>
-                <span style="display: flex;width: 100%; margin-bottom: 10px; padding-right: 20px; color: #D9251C;justify-content: end;"
-                v-show="in112List.length==500">
+                <span
+                  style="display: flex;width: 100%; margin-bottom: 10px; padding-right: 20px; color: #D9251C;justify-content: end;"
+                  v-show="in112List.length==500">
                   当前数据量过大,只展示前500条数据。详细数据请点击右上角‘导出’</span>
                 <el-table v-loading="tableLoading2" :data="in112List" border style="width: 100%">
                   <el-table-column fixed width="100" label="序号" type="index" :index="indexMethod2" align="center" />
-                  <el-table-column prop="storeName" label="销售渠道" align="center" />
-                  <el-table-column prop="orderType" label="类型" width="100" align="center" />
-                  <el-table-column prop="orderNo" label="销售订单号" width="200" align="center" />
-                  <el-table-column prop="prodCode" label="商品编码" width="200" align="center" />
-                  <el-table-column prop="prodName" label="商品名称" align="center" />
-                  <el-table-column prop="saleNum" label="数量" width="100" align="center" />
+                  <el-table-column prop="storeCodeName" label="销售渠道" align="center" />
+                  <el-table-column prop="saleType" label="类型" width="100" align="center" />
+                  <el-table-column prop="saleCode" label="销售订单号" width="200" align="center" />
+                  <el-table-column prop="productCode" label="商品编码" width="200" align="center" />
+                  <el-table-column prop="prodproductNameName" label="商品名称" align="center" />
+                  <el-table-column prop="saleNumber" label="数量" width="100" align="center" />
                   <el-table-column prop="salePrice" label="价格" width="100" align="center" />
-                  <el-table-column prop="total" label="小计" width="100" align="center" />
+                  <el-table-column prop="saleAmount" label="小计" width="100" align="center" />
                 </el-table>
               </div>
               <!-- <div class="pages"> -->
@@ -64,41 +66,43 @@
             </el-tab-pane>
             <el-tab-pane label="门店销售明细表（烟草）" name="all">
               <div>
-                <span style="display: flex;width: 100%; margin-bottom: 10px; padding-right: 20px; color: #D9251C;justify-content: end;"
-                 v-show="inallList.length==500">
-                 当前数据量过大,只展示前500条数据。详细数据请点击右上角‘导出’</span>
+                <span
+                  style="display: flex;width: 100%; margin-bottom: 10px; padding-right: 20px; color: #D9251C;justify-content: end;"
+                  v-show="inallList.length==500">
+                  当前数据量过大,只展示前500条数据。详细数据请点击右上角‘导出’</span>
                 <el-table v-loading="tableLoading3" :data="inallList" border style="width: 100%">
                   <el-table-column fixed width="100" label="序号" type="index" :index="indexMethod3" align="center" />
-                  <el-table-column prop="storeName" label="销售渠道" align="center" />
-                  <el-table-column prop="salesVolume" label="销售额(元)" align="center" :show-overflow-tooltip="true" />
+                  <el-table-column prop="storeCodeName" label="销售渠道" align="center" />
+                  <el-table-column prop="saleAmount" label="销售额(元)" align="center" :show-overflow-tooltip="true" />
                 </el-table>
               </div>
               <!-- <div class="pages"> -->
-                <!-- 翻页 -->
-               <!-- <pagination v-show="inallListTotal > 0" :total="inallListTotal" :page.sync="inallListQuery.current"
+              <!-- 翻页 -->
+              <!-- <pagination v-show="inallListTotal > 0" :total="inallListTotal" :page.sync="inallListQuery.current"
                   :limit.sync="inallListQuery.size" class="pagination" @pagination="loadInallList" />
               </div> -->
             </el-tab-pane>
             <el-tab-pane label="门店商品销售明细表（烟草）" name="hz">
               <div>
-                <span style="display: flex;width: 100%; margin-bottom: 10px; padding-right: 20px; color: #D9251C;justify-content: end;"
-                 v-show="inall4List.length==500">
-                 当前数据量过大,只展示前500条数据。详细数据请点击右上角‘导出’</span>
-                <el-table v-loading="tableLoading4" :data="inall4List" height="350" border style="width: 100%">
-                  <el-table-column fixed width="100" label="序号" type="index" :index="indexMethod2" align="center" />
-                  <el-table-column prop="storeName" label="销售渠道" align="center" />
-                  <el-table-column prop="orderType" label="类型" width="100" align="center" />
-                  <el-table-column prop="orderNo" label="销售订单号" width="200" align="center" />
-                  <el-table-column prop="prodCode" label="商品编码" width="200" align="center" />
-                  <el-table-column prop="prodName" label="商品名称" align="center" />
-                  <el-table-column prop="saleNum" label="数量" width="100" align="center" />
+                <span
+                  style="display: flex;width: 100%; margin-bottom: 10px; padding-right: 20px; color: #D9251C;justify-content: end;"
+                  v-show="inall4List.length==500">
+                  当前数据量过大,只展示前500条数据。详细数据请点击右上角‘导出’</span>
+                <el-table v-loading="tableLoading4" :data="inall4List" border style="width: 100%">
+                  <el-table-column fixed width="100" label="序号" type="index" :index="indexMethod4" align="center" />
+                  <el-table-column prop="storeCodeName" label="销售渠道" align="center" />
+                  <el-table-column prop="saleType" label="类型" width="100" align="center" />
+                  <el-table-column prop="saleCode" label="销售订单号" width="200" align="center" />
+                  <el-table-column prop="productCode" label="商品编码" width="200" align="center" />
+                  <el-table-column prop="productName" label="商品名称" align="center" />
+                  <el-table-column prop="saleNumber" label="数量" width="100" align="center" />
                   <el-table-column prop="salePrice" label="价格" width="100" align="center" />
-                  <el-table-column prop="total" label="小计" width="100" align="center" />
+                  <el-table-column prop="saleAmount" label="小计" width="100" align="center" />
                 </el-table>
               </div>
               <!-- <div class="pages"> -->
-                <!-- 翻页 -->
-               <!-- <pagination v-show="inall4ListTotal > 0" :total="inall4ListTotal" :page.sync="inall4List.current"
+              <!-- 翻页 -->
+              <!-- <pagination v-show="inall4ListTotal > 0" :total="inall4ListTotal" :page.sync="inall4List.current"
                   :limit.sync="inall4List.size" class="pagination" @pagination="inall4List" />
               </div> -->
             </el-tab-pane>
@@ -286,11 +290,11 @@
           current: this.logListQuery.current,
           size: this.logListQuery.size,
           params: {
-            date: "2023-01-07"
+            date: "2023-04-21"
           }
         }).then(response => {
           this.tableLoading1 = false
-          if (response.code === '200' && response.data ) {
+          if (response.code === '200' && response.data) {
             this.logList = response.data
             // this.logListTotal = response.data.total
             // this.logListQuery.current = response.data.current
@@ -313,7 +317,7 @@
           current: this.in112ListQuery.current,
           size: this.in112ListQuery.size,
           params: {
-            date: "2023-01-07"
+            date: "2023-04-21"
           }
         }).then(response => {
           this.tableLoading2 = false
@@ -343,11 +347,11 @@
           current: this.inallListQuery.current,
           size: this.inallListQuery.size,
           params: {
-            date: "2023-01-07"
+            date: "2023-04-21"
           }
         }).then(response => {
           this.tableLoading3 = false
-          if (response.code === '200' && response.data ) {
+          if (response.code === '200' && response.data) {
             this.inallList = response.data
             // this.inallListTotal = response.data.total
             // this.inallListQuery.current = response.data.current
@@ -370,11 +374,11 @@
           current: this.inall4ListQuery.current,
           size: this.inall4ListQuery.size,
           params: {
-            date: "2023-01-07"
+            date: "2023-04-21"
           }
         }).then(response => {
           this.tableLoading4 = false
-          if (response.code === '200' && response.data ) {
+          if (response.code === '200' && response.data) {
             this.inall4List = response.data
             // this.inall4ListTotal = response.data.total
             // this.inall4ListQuery.current = response.data.current
@@ -444,29 +448,40 @@
         //   }
         // }
 
-        const loading = this.$loading({
-          lock: true,
-          text: 'Loading',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        })
+        // const loading = this.$loading({
+        //   lock: true,
+        //   text: 'Loading',
+        //   spinner: 'el-icon-loading',
+        //   background: 'rgba(0, 0, 0, 0.7)'
+        // })
+
+        exportExcel({
+          current: 1,
+          size: 1,
+          params: {
+            date: "2023-04-21"
+          }
+        }).then((resp) => {
+          // loading.close
+
+          console.log(">>>>>11111111111111111", resp)
+          console.log(">>>>>222222222", process.env.VUE_APP_BASE_API + resp.data.fullUrl)
 
-        exportExcel(this.jmdListQuery).then((resp) => {
-          loading.close()
-          const blob = new Blob([resp], {
-            type: 'application/vnd.ms-excel;charset=UTF-8'
-          })
-          const fileName = '库存明细列表' + '.xls'
-          const elink = document.createElement('a')
-          elink.download = fileName
-          elink.style.display = 'nonde'
-          elink.href = URL.createObjectURL(blob)
-          document.body.appendChild(elink)
-          elink.click()
-          URL.revokeObjectURL(elink.href)
-          document.body.removeChild(elink)
+          window.location.href =resp.data.fullUrl
+          // const blob = new Blob([resp], {
+          //   type: 'application/vnd.ms-excel;charset=UTF-8'
+          // })
+          // const fileName = '库存明细列表' + '.xls'
+          // const elink = document.createElement('a')
+          // elink.download = fileName
+          // elink.style.display = 'nonde'
+          // elink.href = URL.createObjectURL(blob)
+          // document.body.appendChild(elink)
+          // elink.click()
+          // URL.revokeObjectURL(elink.href)
+          // document.body.removeChild(elink)
         }).catch(() => {
-          loading.close()
+          // loading.close()
         })
 
       },
diff --git a/yxt-portal-ui/src/views/Home/Home.vue b/yxt-portal-ui/src/views/Home/Home.vue
index 48ed08a7..1717f156 100644
--- a/yxt-portal-ui/src/views/Home/Home.vue
+++ b/yxt-portal-ui/src/views/Home/Home.vue
@@ -254,7 +254,11 @@
           },
           {
             imgUrl: require('@/assets/home/bIcon9.png'),
-            title: '客户管理'
+            title: '企业管理'
+          },
+          {
+            imgUrl: require('@/assets/home/bIcon9.png'),
+            title: '仓库管控'
           },
           {
             imgUrl: require('@/assets/home/bIcon8.png'),
@@ -429,14 +433,14 @@
           defaultOrgPathName: this.defaultOrgPathName,
           defaultOrgPath: this.defaultOrgPath
         }
-        if (index === 9) {
+        if (index === 10) {
           window.open('/#/index', '_blank')
         } else if (index === 0) {
-          window.open('http://192.168.3.8:9532/#/' + '?token=' + getStorage(), '_blank')
-           // window.open('http://jianguan.yyundong.com/customer/#/' + '?token=' + getStorage(), '_blank')
+          // window.open('http://192.168.3.8:9532/#/' + '?token=' + getStorage(), '_blank')
+           window.open('http://jianguan.yyundong.com/customer/#/' + '?token=' + getStorage(), '_blank')
         } else if (index === 1) {
-          window.open('http://192.168.3.8:9531#/' + '?token=' + getStorage(), '_blank')
-           // window.open('http://jianguan.yyundong.com/report/#/' + '?token=' + getStorage(), '_blank')
+          // window.open('http://192.168.3.8:9531#/' + '?token=' + getStorage(), '_blank')
+           window.open('http://jianguan.yyundong.com/report/#/' + '?token=' + getStorage(), '_blank')
         } else if (index === 2) {
           window.open('http://jianguan.yyundong.com/business/#/' + '?token=' + getStorage(), '_blank')
         } else if (index === 3) {
@@ -448,10 +452,14 @@
         } else if (index === 6) {
           window.open('http://jianguan.yyundong.com/message/#/' + '?token=' + getStorage(), '_blank')
         } else if (index === 7) {
-          window.open('http://jianguan.yyundong.com/organizational/#/' + '?token=' + getStorage(), '_blank')
+            window.open('http://192.168.3.8:9531/#/' + '?token=' + getStorage(), '_blank')
+          // window.open('http://jianguan.yyundong.com/organizational/#/' + '?token=' + getStorage(), '_blank')
         } else if (index === 8) {
+            window.open('http://192.168.3.8:9532/#/' + '?token=' + getStorage(), '_blank')
+          // window.open('http://jianguan.yyundong.com/crm/#/' + '?token=' + getStorage(), '_blank')
+        } else if (index === 9) {
             // window.open('http://192.168.3.8:9532/#/' + '?token=' + getStorage(), '_blank')
-          window.open('http://jianguan.yyundong.com/crm/#/' + '?token=' + getStorage(), '_blank')
+          // window.open('http://jianguan.yyundong.com/crm/#/' + '?token=' + getStorage(), '_blank')
         }
       }
     }