diff --git a/supervise-business-ui/src/assets/loginImg/logo.png b/supervise-business-ui/src/assets/loginImg/logo.png
index 8c88f09d..346b6ae3 100644
Binary files a/supervise-business-ui/src/assets/loginImg/logo.png and b/supervise-business-ui/src/assets/loginImg/logo.png differ
diff --git a/supervise-business-ui/src/layout/components/Navbar.vue b/supervise-business-ui/src/layout/components/Navbar.vue
index 484e595e..b8433534 100644
--- a/supervise-business-ui/src/layout/components/Navbar.vue
+++ b/supervise-business-ui/src/layout/components/Navbar.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="navbar">
-    <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;"/>汇融供应链贷后监管平台p>
+    <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;"/>汇融云眼贷后监管平台p>
     <!-- <h3 class="breadcrumb-container">汇融供应链贷后监管平台h3> -->
       <div class="right-menu">
         <!--        <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
diff --git a/supervise-business-ui/src/settings.js b/supervise-business-ui/src/settings.js
index 0dc7efda..adef8a7c 100644
--- a/supervise-business-ui/src/settings.js
+++ b/supervise-business-ui/src/settings.js
@@ -1,6 +1,6 @@
 module.exports = {
 
-  title: '汇融供应链贷后监管平台
+  title: '汇融云眼贷后监管平台',
 
   /**
    * @type {boolean} true | false
diff --git a/supervise-business-ui/vue.config.js b/supervise-business-ui/vue.config.js
index 9c03144d..cf596d0c 100644
--- a/supervise-business-ui/vue.config.js
+++ b/supervise-business-ui/vue.config.js
@@ -6,7 +6,7 @@ function resolve(dir) {
   return path.join(__dirname, dir)
 }
 
-const name = defaultSettings.title || '汇融供应链贷后监管平台// page title
+const name = defaultSettings.title || '汇融云眼贷后监管平台'// page title
 
 // 如果端口设置为80，
 // 使用管理员权限执行命令行。
diff --git a/supervise-crm-ui/src/assets/loginImg/logo.png b/supervise-crm-ui/src/assets/loginImg/logo.png
index 8c88f09d..346b6ae3 100644
Binary files a/supervise-crm-ui/src/assets/loginImg/logo.png and b/supervise-crm-ui/src/assets/loginImg/logo.png differ
diff --git a/supervise-crm-ui/src/layout/components/Navbar.vue b/supervise-crm-ui/src/layout/components/Navbar.vue
index 9eb2a987..d669d6e0 100644
--- a/supervise-crm-ui/src/layout/components/Navbar.vue
+++ b/supervise-crm-ui/src/layout/components/Navbar.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="navbar">
-     <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;"/>汇融银行供应链贷后监管平台</p>
+     <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;"/>汇融云眼贷后监管平台</p>
      <!-- <h3 class="breadcrumb-container">汇融银行供应链贷后监管平台</h3> -->
       <div class="right-menu">
 <!--        <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
@@ -11,7 +11,7 @@
         <span class="backToHome" @click="logout"><i class="el-icon-back"></i>返回首页</span>
       </div>
     </div>
-    <el-footer class="footer" height="40px">Copyright © {{ year }} 汇融银行供应链贷后监管平台 All Rights Reserved</el-footer>
+    <el-footer class="footer" height="40px">Copyright © {{ year }} 汇融云眼贷后监管平台 All Rights Reserved</el-footer>
   </div>
 </template>
 
diff --git a/supervise-crm-ui/src/settings.js b/supervise-crm-ui/src/settings.js
index d29191e3..adef8a7c 100644
--- a/supervise-crm-ui/src/settings.js
+++ b/supervise-crm-ui/src/settings.js
@@ -1,6 +1,6 @@
 module.exports = {
 
-  title: '汇融银行供应链贷后监管平台',
+  title: '汇融云眼贷后监管平台',
 
   /**
    * @type {boolean} true | false
diff --git a/supervise-crm-ui/src/views/brank/brankAdd.vue b/supervise-crm-ui/src/views/brank/brankAdd.vue
index 867b55c0..be8bb049 100644
--- a/supervise-crm-ui/src/views/brank/brankAdd.vue
+++ b/supervise-crm-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('close', this.formobj.psid)
+ this.$emit('doback')
         } else {
 
           this.$emit('doback')
diff --git a/supervise-crm-ui/src/views/brank/brankInfo2.vue b/supervise-crm-ui/src/views/brank/brankInfo2.vue
new file mode 100644
index 00000000..356a3317
--- /dev/null
+++ b/supervise-crm-ui/src/views/brank/brankInfo2.vue
@@ -0,0 +1,315 @@
+<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>
+          <span class="item_input" style="width: 520px;">{{formobj.bankName}}</span>
+          <!-- <el-input v-model="formobj.bankName" placeholder="" class="item_input" style="width: 520px;" clearable /> -->
+        </div>
+        <div class="item">
+          <span class="item_text">银行简称：</span>
+           <span class="item_input"  style="width: 520px;">{{formobj.bankAbbreviation}}</span>
+          <!-- <el-input v-model="formobj.bankAbbreviation" placeholder="" class="item_input" style="width: 520px;"
+            clearable />-->
+        </div>
+
+        <div class="item">
+          <span class="item_text">省-市-县：</span>
+          <div class="item_input"  style="width: 520px;">
+            <span>{{ formobj.province }}</span>
+            <span>-{{ formobj.city }}-</span>
+            <span>{{ formobj.county }}</span>
+
+          </div>
+
+           <!-- <span class="item_text">{{formobj.bankName}}</span> -->
+         <!-- <div class="item_input">
+            <el-select v-model="formobj.province" filterable placeholder="请选择省" class="addinputw" style="width:160px"
+              @change="getShen">
+              <el-option v-for="item in inputProvinceList" :key="item.sid" :label="item.name" :value="item.sid" />
+            </el-select>
+            <el-select v-model="formobj.city" filterable placeholder="请选择市" class="addinputw"
+              style="width:160px;margin-left: 20px;margin-right: 20px;" @change="getShi">
+              <el-option v-for="item in inputCityList" :key="item.sid" :label="item.name" :value="item.sid" />
+            </el-select>
+            <el-select v-model="formobj.county" filterable placeholder="请选择县" class="addinputw" style="width:160px"
+              @change="getXian">
+              <el-option v-for="item in inputCountyList" :key="item.sid" :label="item.name" :value="item.sid" />
+            </el-select>
+
+          </div> -->
+
+        </div>
+
+        <div class="item">
+          <span class="item_text">银行地址：</span>
+           <span class="item_input" style="width: 520px;">{{formobj.address}}</span>
+          <!-- <el-input v-model="formobj.address" placeholder="" class="item_input" style="width: 520px;" clearable /> -->
+        </div>
+        <div class="item">
+          <span class="item_text">联系人员：</span>
+           <span class="item_input" style="width: 520px;">{{formobj.contacts}}</span>
+          <!-- <el-input v-model="formobj.contacts" placeholder="" class="item_input" style="width: 520px;" clearable /> -->
+        </div>
+        <div class="item">
+          <span class="item_text">联系电话：</span>
+           <span class="item_input" style="width: 520px;">{{formobj.telephone}}</span>
+          <!-- <el-input v-model="formobj.telephone" placeholder="" maxlength="11" class="item_input" style="width: 520px;"
+            clearable />-->
+        </div>
+
+
+      </el-card>
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+  import req from '@/api/brank/brank'
+  import {
+    getCity,
+    getCounty,
+    getProvince
+  } from '@/api/portal/areaPicker' // 省市区
+  export default {
+    data() {
+      return {
+        submitdisabled: false,
+        formobj: {
+          sid: "",
+          psid: "",
+          bankName: "",
+          bankAbbreviation: "",
+          province: '',
+          city: "",
+          county: "",
+          address: "",
+          contacts: "",
+          telephone: ""
+        },
+        inputProvinceList: [],
+        inputCityList: [],
+        inputCountyList: [],
+      }
+    },
+    created() {
+      // this.huoquSheng()
+    },
+    methods: {
+      saveOrUpdate() {
+
+        console.log(">>>>>>>>>222222", this.formobj)
+
+        if (this.formobj.sid) {
+          req.updateData(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.addInfo(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) {
+          this.$emit('doback')
+      },
+      showAdd(sid) {
+        req.fetchBySid(sid)
+          .then(resp => {
+            if (resp.success) {
+              this.formobj = resp.data
+            }
+
+          })
+          .catch(e => {
+            this.formobj = row
+          })
+      },
+      showEdit(row) {
+        req.fetchBySid(row.sid)
+          .then(resp => {
+            if (resp.success) {
+              this.formobj = resp.data
+            }
+
+          })
+          .catch(e => {
+            this.formobj = row
+          })
+      },
+      // -------------------------获取省市县方法-------------------------
+      huoquSheng() {
+        getProvince().then((res) => {
+          if (res.success) {
+            this.inputProvinceList = res.data
+          }
+        })
+      },
+      getShen(value) {
+        let bb = ''
+        this.inputProvinceList.forEach((e) => {
+          if (e.sid === value) {
+            bb = {
+              name: e.name,
+              districtCode: e.districtCode,
+              sid: e.sid
+            }
+          }
+        })
+        // 这里是把code的值赋给province省字段
+        this.formobj.province = bb.name
+        this.formobj.city = ""
+        this.formobj.county = ""
+        this.huoquShi(bb.sid)
+      },
+      huoquShi(sid1) {
+        var sid = {
+          sid: sid1
+        }
+        getCity(sid).then((res) => {
+          if (res.success) {
+            this.inputCityList = res.data
+          }
+        })
+      },
+      getShi(value) {
+        let bb = ''
+        this.inputCityList.forEach((e) => {
+          if (e.sid === value) {
+            bb = {
+              name: e.name,
+              districtCode: e.districtCode,
+              sid: e.sid
+            }
+          }
+        })
+        this.formobj.city = bb.name
+        this.formobj.county = ""
+        this.huoquXian(bb.sid)
+      },
+      huoquXian(sid1) {
+        var sid = {
+          sid: sid1
+        }
+        getCounty(sid).then((res) => {
+          if (res.success) {
+            this.inputCountyList = res.data
+          }
+        })
+      },
+      getXian(value) {
+        let bb = ''
+        this.inputCountyList.forEach((e) => {
+          if (e.sid === value) {
+            bb = {
+              name: e.name,
+              districtCode: e.districtCode,
+              sid: e.sid
+            }
+          }
+        })
+        this.formobj.county = bb.name
+      },
+
+    }
+  }
+</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/index.vue b/supervise-crm-ui/src/views/brank/index.vue
index de8efa03..e99263e8 100644
--- a/supervise-crm-ui/src/views/brank/index.vue
+++ b/supervise-crm-ui/src/views/brank/index.vue
@@ -34,7 +34,7 @@
                 <el-button type="primary" size="mini" @click="doDel(scope.row)">删除</el-button>
               </template>
             </el-table-column>
-            <el-table-column label="银行名称" prop="bankName" align="center" />
+            <el-table-column label="银行名称" prop="bankName"  width="300"align="center" />
             <el-table-column label="银行简称" prop="bankAbbreviation" width="180" align="center" />
             <el-table-column label="省 - 市 - 县" width="200" align="center">
               <template slot-scope="scope">
@@ -43,8 +43,8 @@
                 <span>{{ scope.row.county }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="地址" prop="address" align="center" />
-            <el-table-column label="联系人" prop="contacts" width="120" align="center" />
+            <el-table-column label="地址" prop="address" width="350" align="center" />
+            <el-table-column label="联系人" prop="contacts" width="140" align="center" />
             <el-table-column label="联系电话" prop="telephone" width="180" align="center" />
           </el-table>
         </div>
@@ -65,7 +65,7 @@
   import pageye from '@/components/pagination/pageye'
   import ButtonBar from '@/components/ButtonBar'
   import brankAdd from './brankAdd.vue'
-  import brankInfo from './brankInfo.vue'
+  import brankInfo from './brankInfo2.vue'
   export default {
     name: 'CustomerManagement',
     components: {
diff --git a/supervise-crm-ui/vue.config.js b/supervise-crm-ui/vue.config.js
index 2886d5bb..254becbe 100644
--- a/supervise-crm-ui/vue.config.js
+++ b/supervise-crm-ui/vue.config.js
@@ -6,7 +6,7 @@ function resolve(dir) {
   return path.join(__dirname, dir)
 }
 
-const name = defaultSettings.title || '汇融银行供应链贷后监管平台' // page title
+const name = defaultSettings.title || '汇融云眼贷后监管平台' // page title
 
 // 如果端口设置为80，
 // 使用管理员权限执行命令行。
diff --git a/supervise-customer-ui/src/assets/loginImg/logo.png b/supervise-customer-ui/src/assets/loginImg/logo.png
index 8c88f09d..346b6ae3 100644
Binary files a/supervise-customer-ui/src/assets/loginImg/logo.png and b/supervise-customer-ui/src/assets/loginImg/logo.png differ
diff --git a/supervise-customer-ui/src/layout/components/Navbar.vue b/supervise-customer-ui/src/layout/components/Navbar.vue
index d4bf2d24..999d3382 100644
--- a/supervise-customer-ui/src/layout/components/Navbar.vue
+++ b/supervise-customer-ui/src/layout/components/Navbar.vue
@@ -1,17 +1,17 @@
 <template>
   <div>
     <div class="navbar">
-      <p class="breadcrumb-container">汇融供应链贷后监管平台</p>
-      <!-- <h3 class="breadcrumb-container">汇融供应链贷后监管平台h3> -->
-      <div class="right-menu">
-        <!--        <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
-        <p>欢迎您，{{name}}</p>
-        <img src="@/assets/images/info.png">
-        <!-- <img src="@/assets/images/dy.png" @click="logout"> -->
+     <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;"/>汇融云眼贷后监管平台
+        <!-- <h3 class="breadcrumb-container">汇融供应链贷后监管平台h3> -->
+           <div class="right-menu">
+     <!--        <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
+             <p>欢迎您，{{name}}</p>
+             <img src="@/assets/images/info.png">
+             <!-- <img src="@/assets/images/dy.png" @click="logout"> -->
         <span class="backToHome" @click="logout"><i class="el-icon-back"></i>返回首页</span>
       </div>
     </div>
-    <el-footer class="footer" height="40px">Copyright © {{ year }} 汇融供应链贷后监管平台ll Rights Reserved</el-footer>
+    <el-footer class="footer" height="40px">Copyright © {{ year }} 汇融云眼贷后监管平台ll Rights Reserved</el-footer>
   </div>
 </template>
 
diff --git a/supervise-customer-ui/src/settings.js b/supervise-customer-ui/src/settings.js
index 9f78bf67..adef8a7c 100644
--- a/supervise-customer-ui/src/settings.js
+++ b/supervise-customer-ui/src/settings.js
@@ -1,6 +1,6 @@
 module.exports = {
 
-  title: '汇融供应链贷后监管平台',
+  title: '汇融云眼贷后监管平台',
 
   /**
    * @type {boolean} true | false
diff --git a/supervise-customer-ui/vue.config.js b/supervise-customer-ui/vue.config.js
index 56cc795a..d8ef3e23 100644
--- a/supervise-customer-ui/vue.config.js
+++ b/supervise-customer-ui/vue.config.js
@@ -6,7 +6,7 @@ function resolve(dir) {
   return path.join(__dirname, dir)
 }
 
-const name = defaultSettings.title || '汇融供应链贷后监管平台'// page title
+const name = defaultSettings.title || '汇融云眼贷后监管平台'// page title
 
 // 如果端口设置为80，
 // 使用管理员权限执行命令行。
diff --git a/supervise-message-ui/src/assets/loginImg/logo.png b/supervise-message-ui/src/assets/loginImg/logo.png
index 8c88f09d..346b6ae3 100644
Binary files a/supervise-message-ui/src/assets/loginImg/logo.png and b/supervise-message-ui/src/assets/loginImg/logo.png differ
diff --git a/supervise-message-ui/src/layout/components/Navbar.vue b/supervise-message-ui/src/layout/components/Navbar.vue
index e8c9b594..b8f8db33 100644
--- a/supervise-message-ui/src/layout/components/Navbar.vue
+++ b/supervise-message-ui/src/layout/components/Navbar.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="navbar">
-   <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;"/>汇融供应链贷后监管平台p>
+   <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;"/>汇融云眼贷后监管平台
    <!-- <h3 class="breadcrumb-container">汇融供应链贷后监管平台h3> -->
       <div class="right-menu">
 <!--        <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
diff --git a/supervise-message-ui/src/settings.js b/supervise-message-ui/src/settings.js
index 9f78bf67..adef8a7c 100644
--- a/supervise-message-ui/src/settings.js
+++ b/supervise-message-ui/src/settings.js
@@ -1,6 +1,6 @@
 module.exports = {
 
-  title: '汇融供应链贷后监管平台',
+  title: '汇融云眼贷后监管平台',
 
   /**
    * @type {boolean} true | false
diff --git a/supervise-message-ui/vue.config.js b/supervise-message-ui/vue.config.js
index 68dba461..d3cf0e99 100644
--- a/supervise-message-ui/vue.config.js
+++ b/supervise-message-ui/vue.config.js
@@ -6,7 +6,7 @@ function resolve(dir) {
   return path.join(__dirname, dir)
 }
 
-const name = defaultSettings.title || '汇融供应链贷后监管平台'// page title
+const name = defaultSettings.title || '汇融云眼贷后监管平台'// page title
 
 // 如果端口设置为80，
 // 使用管理员权限执行命令行。
diff --git a/supervise-monitor-ui/src/assets/loginImg/logo.png b/supervise-monitor-ui/src/assets/loginImg/logo.png
index 8c88f09d..346b6ae3 100644
Binary files a/supervise-monitor-ui/src/assets/loginImg/logo.png and b/supervise-monitor-ui/src/assets/loginImg/logo.png differ
diff --git a/supervise-monitor-ui/src/layout/components/Navbar.vue b/supervise-monitor-ui/src/layout/components/Navbar.vue
index bf09b050..9e19b73f 100644
--- a/supervise-monitor-ui/src/layout/components/Navbar.vue
+++ b/supervise-monitor-ui/src/layout/components/Navbar.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="navbar">
-    <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;"/>汇融银行供应链贷后监管平台</p>
+    <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;"/>汇融云眼贷后监管平台</p>
     <!-- <h3 class="breadcrumb-container">汇融银行供应链贷后监管平台</h3> -->
       <div class="right-menu">
 <!--        <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
diff --git a/supervise-monitor-ui/src/settings.js b/supervise-monitor-ui/src/settings.js
index d29191e3..adef8a7c 100644
--- a/supervise-monitor-ui/src/settings.js
+++ b/supervise-monitor-ui/src/settings.js
@@ -1,6 +1,6 @@
 module.exports = {
 
-  title: '汇融银行供应链贷后监管平台',
+  title: '汇融云眼贷后监管平台',
 
   /**
    * @type {boolean} true | false
diff --git a/supervise-monitor-ui/vue.config.js b/supervise-monitor-ui/vue.config.js
index 41ce80ea..35f96afb 100644
--- a/supervise-monitor-ui/vue.config.js
+++ b/supervise-monitor-ui/vue.config.js
@@ -6,7 +6,7 @@ function resolve(dir) {
   return path.join(__dirname, dir)
 }
 
-const name = defaultSettings.title || '汇融银行供应链贷后监管平台' // page title
+const name = defaultSettings.title || '汇融云眼贷后监管平台' // page title
 
 // 如果端口设置为80，
 // 使用管理员权限执行命令行。
diff --git a/supervise-organizational-ui/src/assets/loginImg/logo.png b/supervise-organizational-ui/src/assets/loginImg/logo.png
index 8c88f09d..346b6ae3 100644
Binary files a/supervise-organizational-ui/src/assets/loginImg/logo.png and b/supervise-organizational-ui/src/assets/loginImg/logo.png differ
diff --git a/supervise-organizational-ui/src/layout/components/Navbar.vue b/supervise-organizational-ui/src/layout/components/Navbar.vue
index dbdc45d6..efc750b6 100644
--- a/supervise-organizational-ui/src/layout/components/Navbar.vue
+++ b/supervise-organizational-ui/src/layout/components/Navbar.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="navbar">
-      <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;"/>汇融供应链贷后监管平台>
+      <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;"/>汇融云眼贷后监管平台
       <!-- <h3 class="breadcrumb-container">汇融供应链贷后监管平台h3> -->
       <div class="right-menu">
 <!--        <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
diff --git a/supervise-organizational-ui/src/settings.js b/supervise-organizational-ui/src/settings.js
index 9f78bf67..adef8a7c 100644
--- a/supervise-organizational-ui/src/settings.js
+++ b/supervise-organizational-ui/src/settings.js
@@ -1,6 +1,6 @@
 module.exports = {
 
-  title: '汇融供应链贷后监管平台',
+  title: '汇融云眼贷后监管平台',
 
   /**
    * @type {boolean} true | false
diff --git a/supervise-organizational-ui/vue.config.js b/supervise-organizational-ui/vue.config.js
index 58fc600f..abaa0899 100644
--- a/supervise-organizational-ui/vue.config.js
+++ b/supervise-organizational-ui/vue.config.js
@@ -6,7 +6,7 @@ function resolve(dir) {
   return path.join(__dirname, dir)
 }
 
-const name = defaultSettings.title || '汇融供应链贷后监管平台'// page title
+const name = defaultSettings.title || '汇融云眼贷后监管平台'// page title
 
 // 如果端口设置为80，
 // 使用管理员权限执行命令行。
diff --git a/supervise-report-ui/src/api/inventorySummary/inventorySummary.js b/supervise-report-ui/src/api/inventorySummary/inventorySummary.js
index 3908b9a5..b76f80f7 100644
--- a/supervise-report-ui/src/api/inventorySummary/inventorySummary.js
+++ b/supervise-report-ui/src/api/inventorySummary/inventorySummary.js
@@ -15,7 +15,7 @@ export function countinfo() {
   })
 }
 
-// 112仓入库信息分页查询
+// 商品到货明细表
 export function in112PagerList(data) {
   return request({
     url: '/ruku/in112PagerList',
@@ -27,10 +27,10 @@ export function in112PagerList(data) {
   })
 }
 
-// 所有入库信息分页查询
+// 订单明细表
 export function inallPagerList(data) {
   return request({
-    url: '/ruku/inallPagerList',
+    url: '/supplierarrivalreport/supplierOrder',
     data,
     method: 'post',
     headers: {
@@ -39,10 +39,10 @@ export function inallPagerList(data) {
   })
 }
 
-// 入库单导入日志分页查询
+// 供货商到货汇总
 export function logPagerList(data) {
   return request({
-    url: '/ruku/logPagerList',
+    url: '/supplierarrivalreport/listPage',
     data,
     method: 'post',
     headers: {
@@ -51,10 +51,22 @@ export function logPagerList(data) {
   })
 }
 
-// 加盟店入库明细表按天查询
-export function jmdRkmxList(data) {
+// 烟草到货明细表
+export function inall4PagerList(data) {
   return request({
-    url: '/ruku/jmdRkmxList',
+    url: '/supplierarrivalreport/arrivalGoodsYc',
+    data,
+    method: 'post',
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
+
+// 烟草订单明细表
+export function inall5PagerList(data) {
+  return request({
+    url: '/supplierarrivalreport/listPage',
     data,
     method: 'post',
     headers: {
diff --git a/supervise-report-ui/src/assets/loginImg/logo.png b/supervise-report-ui/src/assets/loginImg/logo.png
index 8c88f09d..346b6ae3 100644
Binary files a/supervise-report-ui/src/assets/loginImg/logo.png and b/supervise-report-ui/src/assets/loginImg/logo.png differ
diff --git a/supervise-report-ui/src/layout/components/Navbar.vue b/supervise-report-ui/src/layout/components/Navbar.vue
index 92010517..f0753f97 100644
--- a/supervise-report-ui/src/layout/components/Navbar.vue
+++ b/supervise-report-ui/src/layout/components/Navbar.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="navbar">
       <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png"
-          style="width: 45px;height: 45px;margin-right: 10px;" />汇融供应链贷后监管平台</p>
+          style="width: 45px;height: 45px;margin-right: 10px;" />汇融云眼贷后监管平台</p>
       <div class="right-menu">
         <!--        <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
         <p>欢迎您，{{name}}</p>
diff --git a/supervise-report-ui/src/settings.js b/supervise-report-ui/src/settings.js
index 9f78bf67..adef8a7c 100644
--- a/supervise-report-ui/src/settings.js
+++ b/supervise-report-ui/src/settings.js
@@ -1,6 +1,6 @@
 module.exports = {
 
-  title: '汇融供应链贷后监管平台',
+  title: '汇融云眼贷后监管平台',
 
   /**
    * @type {boolean} true | false
diff --git a/supervise-report-ui/src/utils/request.js b/supervise-report-ui/src/utils/request.js
index 0a274f5d..345e22a0 100644
--- a/supervise-report-ui/src/utils/request.js
+++ b/supervise-report-ui/src/utils/request.js
@@ -13,7 +13,7 @@ import {
 const service = axios.create({
   baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
   // withCredentials: true, // send cookies when cross-domain requests
-  timeout: 300000 // request timeout
+  timeout: 600000 // request timeout
 })
 
 // request interceptor
diff --git a/supervise-report-ui/src/views/reportCenter/inTransitSummary.vue b/supervise-report-ui/src/views/reportCenter/inTransitSummary.vue
index e8d63646..88fa9229 100644
--- a/supervise-report-ui/src/views/reportCenter/inTransitSummary.vue
+++ b/supervise-report-ui/src/views/reportCenter/inTransitSummary.vue
@@ -1,425 +1,535 @@
 <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">
-          <el-tab-pane label="供应商到货汇总表" name="uplog">
-            <div>
-              <el-date-picker v-model="jmdListQuery.orderDate" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" size="small" />
-              <el-button style="margin-left: 20px;" size="small" type="primary" @click="loadJmdList">搜索</el-button>
-            </div>
-            <div style="margin-top: 20px;">
-              <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-column prop="validNum" label="在途货价值" />
-                <el-table-column prop="validNum" label="超出货价值" />
-                <el-table-column prop="validNum" label="全部到货日期" />
-                <el-table-column prop="validNum" label="是否延期到货" />
-              </el-table>
-            </div>
-            <div class="pages">
-              <!-- 翻页 -->
-              <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>
-             <el-date-picker v-model="jmdListQuery.orderDate" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" size="small" />
-             <el-button style="margin-left: 20px;" size="small" type="primary" @click="loadJmdList">搜索</el-button>
-           </div>
-           <div style="margin-top: 20px;">
-              <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-column prop="colr17" label="订单商品价值" />
-                <el-table-column prop="colr17" label="实际到货数量" />
-                <el-table-column prop="colr17" label="实际到货价值" />
-                <el-table-column prop="colr17" label="在途货数量" />
-                <el-table-column prop="colr17" label="在途货价值" />
-                <el-table-column prop="colr17" 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-tab-pane label="供应商订单明细表" name="all">
-          <div>
-            <el-date-picker v-model="jmdListQuery.orderDate" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" size="small" />
-            <el-button style="margin-left: 20px;" size="small" type="primary" @click="loadJmdList">搜索</el-button>
+    <button-bar ref="btnbar" view-title="在途商品汇总统计表" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+    <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="jmdListQuery" :inline="true" class="tab-header">
+            <el-form-item label="日期">
+              <el-date-picker v-model="jmdListQuery.date" 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 style="margin-top: 20px;">
-              <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>
-            </div>
-            <div class="pages">
-              <!-- 翻页 -->
-              <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>
+      </div>
+      <el-row style="margin-left: 20px;margin-right: 20px;">
+        <el-col>
+          <el-tabs @tab-click="handleOrder">
+            <el-tab-pane label="到货汇总表" name="uplog">
               <div>
-                <el-date-picker v-model="jmdListQuery.orderDate" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" size="small" />
-                <el-button style="margin-left: 20px;" size="small" type="primary" @click="loadJmdList">搜索</el-button>
+                <el-table v-loading="tableLoading1" :data="logList" border style="width: 100%">
+                  <el-table-column fixed width="100" type="index" label="序号" :index="indexMethod" align="center" />
+                  <el-table-column prop="createTime" label="供应商名称" align="center" />
+                  <el-table-column prop="orderDate" label="贷款金额" align="center" />
+                  <el-table-column prop="allNum" label="订单金额" align="center" />
+                  <el-table-column prop="validNum" label="实际到货价值" align="center" />
+                  <el-table-column prop="validNum" label="在途货价值" align="center" />
+                  <el-table-column prop="validNum" label="超出货价值" align="center" />
+                  <el-table-column prop="validNum" label="全部到货日期" align="center" />
+                  <el-table-column prop="validNum" label="是否延期到货" align="center" />
+                </el-table>
+              </div>
+              <div class="pages">
+                <!-- 翻页 -->
+                <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>
+                <el-table v-loading="tableLoading2" :data="in112List" border style="width: 100%">
+                  <el-table-column fixed width="100" type="index" label="序号" :index="indexMethod2" align="center" />
+                  <el-table-column prop="supplierName" label="供应商名称" align="center" />
+                  <el-table-column prop="code" label="商品编码" align="center" />
+                  <el-table-column prop="proName" label="商品名称" align="center" />
+                  <el-table-column prop="number" label="单品数量" align="center" />
+                  <el-table-column prop="orderAmount" label="订单商品价值" align="center" />
+                  <el-table-column prop="actualArrivalNumber" label="实际到货数量" align="center" />
+                  <el-table-column prop="actualArrival" label="实际到货价值" align="center" />
+                  <el-table-column prop="transitNumber" label="在途货数量" align="center" />
+                  <el-table-column prop="transit" label="在途货价值" align="center" />
+                  <el-table-column prop="exceed" label="超出货价值" align="center" />
+                </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-tab-pane label="订单明细表" name="all">
+              <div>
+                <el-table v-loading="tableLoading3" :data="inallList" border style="width: 100%">
+                  <el-table-column fixed width="100" type="index" label="序号" :index="indexMethod3" align="center" />
+                  <el-table-column prop="supplierName" label="供应商名称" align="center" />
+                  <el-table-column prop="code" label="订单编号" align="center" />
+                  <el-table-column prop="orderAmount" label="订单金额" align="center" />
+                  <el-table-column prop="purchaseDate" label="订单日期" align="center" />
+                  <el-table-column prop="arrivalDate" label="到货日期" align="center" />
+                </el-table>
               </div>
-              <div style="margin-top: 20px;">
-                <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-column prop="prodCode" label="实际到货价值" />
-                  <el-table-column prop="prodCode" label="在途货价值" />
-                  <el-table-column prop="prodCode" label="超出货价值" />
+              <div class="pages">
+                <!-- 翻页 -->
+                <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>
+                <el-table v-loading="tableLoading4" :data="inall4List" border style="width: 100%">
+                  <el-table-column fixed width="100" type="index" label="序号" :index="indexMethod4" align="center" />
+                  <el-table-column prop="supplierName" label="供应商名称" align="center" />
+                  <el-table-column prop="storeName" label="销售渠道" align="center" />
+                  <el-table-column prop="orderAmount" label="订单商品价值" align="center" />
+                  <el-table-column prop="orderArrivalAmount" label="订单到货价值" align="center" />
+                  <el-table-column prop="actualArrival" label="实际到货价值" align="center" />
+                  <el-table-column prop="transit" label="在途货价值" align="center" />
+                  <el-table-column prop="exceed" label="超出货价值" align="center" />
                 </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"
-                />
+                <pagination v-show="inall4ListTotal > 0" :total="inall4ListTotal" :page.sync="inall4ListQuery.current"
+                  :limit.sync="inall4ListQuery.size" class="pagination" @pagination="inall4List" />
+              </div>
+            </el-tab-pane>
+            <el-tab-pane label="订单明细表（烟草）" name="jmd">
+              <div>
+                <el-table v-loading="tableLoading5" :data="inall5List" border style="width: 100%">
+                  <el-table-column fixed width="100" type="index" label="序号" :index="indexMethod5" align="center" />
+                  <el-table-column prop="supplierName" label="供应商名称" align="center" />
+                  <el-table-column prop="code" label="订单编号" align="center" />
+                  <el-table-column prop="loanAmount" label="放款金额" align="center" />
+                  <el-table-column prop="orderAmount" label="订单金额" align="center" />
+                  <el-table-column prop="purchaseDate" label="订单日期" align="center" />
+                  <el-table-column prop="arrivalDate" label="到货日期" align="center" />
+                  <el-table-column prop="actualArrival;" label="实际到货价值" align="center" />
+                  <el-table-column prop="transit" label="在途货价值" align="center" />
+                </el-table>
               </div>
-          </el-tab-pane>
-          <el-tab-pane label="供应商订单明细表（烟草）" name="jmd">
-            <div>
-              <el-date-picker v-model="jmdListQuery.orderDate" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" size="small" />
-              <el-button style="margin-left: 20px;" size="small" type="primary" @click="loadJmdList">搜索</el-button>
-            </div>
-            <div style="margin-top: 20px;">
-            <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-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="pages">
+                <!-- 翻页 -->
+                <pagination v-show="inall5ListTotal > 0" :total="inall5ListTotal" :page.sync="inall5ListQuery.current"
+                  :limit.sync="inall5ListQuery.size" class="pagination" @pagination="inall5List" />
+              </div>
+            </el-tab-pane>
+          </el-tabs>
+        </el-col>
+      </el-row>
+    </div>
   </div>
 </template>
 
 <script>
-import { recount, countinfo, in112PagerList, inallPagerList, logPagerList, jmdRkmxList, jmdRkmxListDownload, ztsjZhengli, buildExcelZaiTu } from '@/api/inventorySummary/inventorySummary'
-import Pagination from '@/components/pagination'
-import { parseTime } from '@/utils/index'
-import ButtonBar from '@/components/ButtonBar'
-export default {
-  name: 'KucunRkmxIndex',
-  components: {
-     ButtonBar,Pagination },
-  data() {
-    return {
-      btnList: [ // 右上角按钮
-        {
-          type: 'success',
-          size: 'small',
-          icon: 'export',
-          btnKey: 'build',
-          btnLabel: '导出'
+  import {
+    in112PagerList,
+    inallPagerList, 
+    logPagerList,
+    inall4PagerList,
+    inall5PagerList,
+  } from '@/api/inventorySummary/inventorySummary'
+  import Pagination from '@/components/pagination'
+  import {
+    parseTime
+  } from '@/utils/index'
+  import ButtonBar from '@/components/ButtonBar'
+  export default {
+    components: {
+      ButtonBar,
+      Pagination
+    },
+    data() {
+      return {
+        index: "0",
+        isSearchShow: false,
+        searchxianshitit: '显示查询条件',
+        btndisabled: false,
+        tableLoading1: false,
+        tableLoading2: false,
+        tableLoading3: false,
+        tableLoading4: false,
+        tableLoading5: false,
+        btnList: [ // 右上角按钮
+          {
+            type: 'success',
+            size: 'small',
+            icon: 'export',
+            btnKey: 'build',
+            btnLabel: '导出'
+          },
+          {
+            type: 'info',
+            size: 'small',
+            icon: 'cross',
+            btnKey: 'doClose',
+            btnLabel: '关闭'
+          }
+        ],
+        logList: [],
+        logListQuery: {
+          current: 1,
+          size: 10
+        },
+        logListTotal: 1,
+        in112List: [],
+        in112ListQuery: {
+          current: 1,
+          size: 10
         },
-        {
-          type: 'info',
-          size: 'small',
-          icon: 'cross',
-          btnKey: 'doClose',
-          btnLabel: '关闭'
+        in112ListTotal: 1,
+        inallList: [],
+        inallListQuery: {
+          current: 1,
+          size: 10
+        },
+        inallListTotal: 1,
+        inall4List: [],
+        inall4ListQuery: {
+          current: 1,
+          size: 10
+        },
+        inall4ListTotal: 1,
+        inall5List: [],
+        inall5ListQuery: {
+          current: 1,
+          size: 10
+        },
+        inall5ListTotal: 1,
+        jmdListQuery: {
+          date: parseTime(new Date(), '{y}-{m}-{d}')
         }
-      ],
-      updateAction: "",
-      name: '入库明细',
-      tabActiveName: 'uplog',
-      fileList: [],
-      uploadResultMesssage: '',
-      fullscreenloading: null,
-      logList: [],
-      logListQuery: {
-        current: 1,
-        size: 5
-      },
-      logListTotal: 1,
-      in112List: [],
-      in112ListQuery: {
-        current: 1,
-        size: 5
-      },
-      in112ListTotal: 1,
-      inallList: [],
-      inallListQuery: {
-        current: 1,
-        size: 5
-      },
-      inallListTotal: 1,
-      countInfo: {
-        countLog: null,
-        countList: []
-      },
-      countInfoMessage: '无汇总信息',
-      jmdList: [],
-      jmdListQuery: {
-        orderDate: ''
-      }
-    }
-  },
-  mounted() {
-    // 初始化按钮
-    this.$refs['btnbar'].setButtonList(this.btnList)
-  },
-  created() {
-    // 初始化变量
-    this.init()
-  },
-  methods: {
-    // 右上角点击事件
-    btnHandle(btnKey) {
-      switch (btnKey) {
-        case 'build': // 导出
-          this.doBuild()
-          break
-        case 'doClose': // 关闭
-          this.doClose()
-          break
-        default:
-          break
       }
     },
-    init() {
-      this.loadLogList()
-      this.loadIn112List()
-      this.loadInallList()
-      this.loadCountInfo()
-      this.jmdListQuery.orderDate = parseTime(new Date(), '{y}-{m}-{d}')
-      this.loadJmdList()
+    mounted() {
+      // 初始化按钮
+      this.$refs['btnbar'].setButtonList(this.btnList)
     },
-    loadLogList() {
-      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
+    created() {
+      // 初始化变量
+      this.init()
+    },
+    methods: {
+      // 搜索条件效果
+      clicksearchShow() {
+        this.isSearchShow = !this.isSearchShow
+        if (this.isSearchShow) {
+          this.searchxianshitit = '隐藏查询条件'
         } else {
-          this.logList = []
-          this.logListTotal = 0
+          this.searchxianshitit = '显示查询条件'
         }
-      })
-    },
-    loadIn112List() {
-      in112PagerList({
-        current: this.in112ListQuery.current,
-        size: this.in112ListQuery.size,
-        params: {
-          orderDate: ''
+      },
+      dosearch() {
+        this.jmdListQuery = {
+          date: parseTime(new Date(), '{y}-{m}-{d}')
         }
-      }).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
-        } else {
-          this.in112List = []
-          this.in112ListTotal = 0
+        if (this.index == "0") {
+          this.loadLogList()
+        } else if (this.index == "1") {
+          this.loadInallList()
+        } else if (this.index == "2") {
+          this.loadIn112List()
+        } else if (this.index == "3") {
+          this.loadInall4List()
+        } else if (this.index == "4") {
+          this.loadInall5List()
         }
-      })
-    },
-    loadInallList() {
-      inallPagerList({
-        current: this.inallListQuery.current,
-        size: this.inallListQuery.size,
-        params: {
-          orderDate: ''
+
+      },
+      resetQuery() {
+        this.jmdListQuery = {
+          date: parseTime(new Date(), '{y}-{m}-{d}')
         }
-      }).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
+      },
+      // 右上角点击事件
+      btnHandle(btnKey) {
+        switch (btnKey) {
+          case 'build': // 导出
+            this.doBuild()
+            break
+          case 'doClose': // 关闭
+            this.doClose()
+            break
+          default:
+            break
         }
-      })
-    },
-    loadCountInfo() {
-      countinfo()
-        .then(res => {
-          if (res.msg === '没有统计入库明细！') {
-            this.countInfoMessage = res.msg
+      },
+      init() {
+        this.loadLogList()
+      },
+      handleOrder(tab, event) {
+        console.log("tab", tab)
+        // this.listQuery.status = tab.name;
+        // this.getList();
+        // this.orderDatas(tab.name);
+
+        this.index = tab.index
+
+        switch (tab.index) {
+          // 供应商到货汇总表
+          case "0":
+            if (this.logList.length == 0)
+              this.loadLogList()
+
+            break;
+            // 商品到货明细表
+          case "1":
+            if (this.in112List.length == 0)
+              this.loadIn112List()
+            break;
+            // 订单明细
+          case "2":
+            if (this.inallList.length == 0)
+              this.loadInallList()
+            break;
+            // 商品到货明细（烟草）
+          case "3":
+            if (this.inall4List.length === 0)
+              this.loadInall4List()
+            break;
+            //  订单明细（烟草）
+          case "4":
+            if (this.inall5List.length === 0)
+              this.loadInall5List()
+            break;
+          default:
+            break;
+        }
+
+      },
+      loadLogList() {
+        logPagerList({
+          current: this.logListQuery.current,
+          size: this.logListQuery.size,
+          params: {
+            date: ''
+          }
+        }).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
           } else {
-            this.countInfo = res.data
-            this.countInfoMessage = '最新统计时间：' + res.data.countLog.createTime + ', 统计用时：' + res.data.countLog.durations + ' 毫秒！'
+            this.logList = []
+            this.logListTotal = 0
           }
         })
-        .catch(e => {
-          console.log(e)
+      },
+      // 序号
+      indexMethod(index) {
+        var pagestart = (this.logListQuery.current - 1) * this.logListQuery.size
+        var pageindex = index + 1 + pagestart
+        return pageindex
+      },
+      loadIn112List() {
+        in112PagerList({
+          current: this.in112ListQuery.current,
+          size: this.in112ListQuery.size,
+          params: {
+            date: ''
+          }
+        }).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
+          } else {
+            this.in112List = []
+            this.in112ListTotal = 0
+          }
         })
-    },
-    loadJmdList() {
-      jmdRkmxList(this.jmdListQuery)
-        .then(res => {
-          this.jmdList = res.data
+      },
+      // 序号
+      indexMethod2(index) {
+        var pagestart = (this.in112ListQuery.current - 1) * this.in112ListQuery.size
+        var pageindex = index + 1 + pagestart
+        return pageindex
+      },
+      loadInallList() {
+        inallPagerList({
+          current: this.inallListQuery.current,
+          size: this.inallListQuery.size,
+          params: {
+            date: ''
+          }
+        }).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
+          }
         })
-        .catch(e => {
-          console.log(e)
+      },
+      // 序号
+      indexMethod3(index) {
+        var pagestart = (this.inallListQuery.current - 1) * this.inallListQuery.size
+        var pageindex = index + 1 + pagestart
+        return pageindex
+      },
+      loadInall4List() {
+        this.tableLoading4 = true
+        inall4PagerList({
+          current: this.inall4ListQuery.current,
+          size: this.inall4ListQuery.size,
+          params: {
+            date: ""
+          }
+        }).then(response => {
+          this.tableLoading4 = false
+          if (response.code === '200' && response.data && response.data.total > 0) {
+            this.inall4List = response.data.records
+            this.inall4ListTotal = response.data.total
+            this.inall4ListQuery.current = response.data.current
+            this.inall4ListQuery.size = response.data.size
+          } else {
+            this.inall4List = []
+            this.inall4ListTotal = 0
+          }
         })
-    },
-    downJmdList() {
-      jmdRkmxListDownload(this.jmdListQuery)
-        .then(res => {
-          console.log('mmmm', res)
-          if (res.msg == '数据为空') {
-            this.$message({
-              message: '无数据，不能导出！',
-              type: 'error'
-            })
+      },
+      // 序号
+      indexMethod4(index) {
+        var pagestart = (this.inall4ListQuery.current - 1) * this.inall4ListQuery.size
+        var pageindex = index + 1 + pagestart
+        return pageindex
+      },
+
+      loadInall5List() {
+        this.tableLoading5 = true
+        inall5PagerList({
+          current: this.inall5ListQuery.current,
+          size: this.inall5ListQuery.size,
+          params: {
+            date: ""
+          }
+        }).then(response => {
+          this.tableLoading5 = false
+          if (response.code === '200' && response.data && response.data.total > 0) {
+            this.inall5List = response.data.records
+            this.inall5ListTotal = response.data.total
+            this.inall5ListQuery.current = response.data.current
+            this.inall5ListQuery.size = response.data.size
           } else {
-            window.open(res.data, '_blank')
+            this.inall5List = []
+            this.inall5ListTotal = 0
           }
         })
-        .catch(e => {
-          console.log(e)
+      },
+      // 序号
+      indexMethod5(index) {
+        var pagestart = (this.inall5ListQuery.current - 1) * this.inall5ListQuery.size
+        var pageindex = index + 1 + pagestart
+        return pageindex
+      },
+
+      // 导出文件
+      doBuild() {
+
+        // var url = ""
+        // var fileName = ""
+
+        // if (this.index == "0") {
+        //   url = ""
+        //   fileName = "" + '.xls'
+        //   if (this.logList.length == 0) {
+        //     this.$message({
+        //       message: '暂无数据可导出！',
+        //       type: 'warning',
+        //       duration: 1000
+        //     });
+        //     return
+        //   }
+        // } else if (this.index == "1") {
+        //   url = ""
+        //   fileName = "" + '.xls'
+        //   if (this.in112List.length == 0) {
+        //     this.$message({
+        //       message: '暂无数据可导出！',
+        //       type: 'warning',
+        //       duration: 1000
+        //     });
+        //     return
+        //   }
+        // } else if (this.index == "2") {
+        //   url = ""
+        //   fileName = "" + '.xls'
+        //   if (this.inallList.length == 0) {
+        //     this.$message({
+        //       message: '暂无数据可导出！',
+        //       type: 'warning',
+        //       duration: 1000
+        //     });
+        //     return
+        //   }
+        // } else if (this.index == "3") {
+        //   url = ""
+        //   fileName = "" + '.xls'
+        //   if (this.inall4List.length == 0) {
+        //     this.$message({
+        //       message: '暂无数据可导出！',
+        //       type: 'warning',
+        //       duration: 1000
+        //     });
+        //     return
+        //   }
+        // }
+
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
         })
-    },
-    recountRk() {
-      recount()
-        .then(res => {
-          this.$message({
-            message: '入库信息已经重新汇总完成！',
-            type: 'success'
+
+        exportExcel(this.jmdListQuery).then((resp) => {
+          loading.close()
+          const blob = new Blob([resp], {
+            type: 'application/vnd.ms-excel;charset=UTF-8'
           })
-          this.loadCountInfo()
-          this.tabActiveName = 'hz'
-        })
-        .catch(e => {
-          console.log(e)
+          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()
         })
-    },
-    submitUpload() {
-      this.$refs.upload.submit()
-    },
-    handleProgress(event, file, fileList) {
-      const _this = this
-      this.fullscreenloading = this.$loading({
-        lock: true,
-        text: '文件正在上传',
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)'
-      })
-      if (event.percent >= 100) {
-        _this.fullscreenloading.text = '上传完成，正在导入数据库'
-      }
-    },
-    handleSuccess(resp, file, fileList) {
-      console.log('222', resp)
-      if (this.fullscreenloading) this.fullscreenloading.close()
-      this.fullscreenloading = null
-      if (resp.success) {
-        const rdata = resp.data
-        this.uploadResultMesssage = '共导入数据：' + rdata.allNum + ' 条，【112】仓库记录数：' + rdata.validNum + ' 条；用时：' + rdata.durations + ' 毫秒。'
 
-        this.loadLogList()
-        this.tabActiveName = 'uplog'
-      } else {
-        this.uploadResultMesssage = resp.msg
-      }
-    },
-    downloadZtsj() {
-      ztsjZhengli()
-        .then(res => {
-          console.log('2222', res)
-          buildExcelZaiTu()
-            .then(resp => {
-              console.log('3333', resp)
-              window.open(resp.data, '_blank')
-            })
-            .catch(ee => {
-              console.log(ee)
-            })
-        })
-        .catch(e => {
-          console.log(e)
-        })
+      },
     }
   }
-}
 </script>
 <style scoped>
-.wenjiantit {
-  font-size: 16px;
-  font-weight: bold;
-  margin: 25px 0 10px 0;
-}
-.forminfo {
-  margin: 0;
-  padding: 0;
-}
-.listcon {
-  height: calc(100vh - 250px);
-  overflow-y: auto;
-  overflow-x: hidden;
-}
+  .wenjiantit {
+    font-size: 16px;
+    font-weight: bold;
+    margin: 25px 0 10px 0;
+  }
+
+  .forminfo {
+    margin: 0;
+    padding: 0;
+  }
+
+  .listcon {
+    height: calc(100vh - 250px);
+    overflow-y: auto;
+    overflow-x: hidden;
+  }
 </style>
diff --git a/supervise-report-ui/src/views/reportCenter/salesSummary.vue b/supervise-report-ui/src/views/reportCenter/salesSummary.vue
index a2bb34eb..740fe962 100644
--- a/supervise-report-ui/src/views/reportCenter/salesSummary.vue
+++ b/supervise-report-ui/src/views/reportCenter/salesSummary.vue
@@ -184,11 +184,6 @@
           size: 10
         },
         inall4ListTotal: 1,
-        countInfo: {
-          countLog: null,
-          countList: []
-        },
-        countInfoMessage: '无汇总信息',
         jmdList: [],
         jmdListQuery: {
           date: parseTime(new Date(), '{y}-{m}-{d}')
@@ -227,8 +222,6 @@
           this.loadInall4List()
         }
 
-
-
       },
       resetQuery() {
         this.jmdListQuery = {
diff --git a/supervise-report-ui/vue.config.js b/supervise-report-ui/vue.config.js
index 5f0a788c..05fbe005 100644
--- a/supervise-report-ui/vue.config.js
+++ b/supervise-report-ui/vue.config.js
@@ -6,7 +6,7 @@ function resolve(dir) {
   return path.join(__dirname, dir)
 }
 
-const name = defaultSettings.title || '汇融供应链贷后监管平台' // page title
+const name = defaultSettings.title || '汇融云眼贷后监管平台' // page title
 
 // 如果端口设置为80，
 // 使用管理员权限执行命令行。
diff --git a/supervise-risk-ui/src/assets/loginImg/logo.png b/supervise-risk-ui/src/assets/loginImg/logo.png
index 8c88f09d..346b6ae3 100644
Binary files a/supervise-risk-ui/src/assets/loginImg/logo.png and b/supervise-risk-ui/src/assets/loginImg/logo.png differ
diff --git a/supervise-risk-ui/src/layout/components/Navbar.vue b/supervise-risk-ui/src/layout/components/Navbar.vue
index fe21a9e6..cd6b6d4f 100644
--- a/supervise-risk-ui/src/layout/components/Navbar.vue
+++ b/supervise-risk-ui/src/layout/components/Navbar.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="navbar">
       <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png"
-          style="width: 45px;height: 45px;margin-right: 10px;" />汇融供应链贷后监管平台p>
+          style="width: 45px;height: 45px;margin-right: 10px;" />汇融云眼贷后监管平台
       <!-- <h3 class="breadcrumb-container">汇融供应链贷后监管平台h3> -->
       <div class="right-menu">
         <!--        <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
diff --git a/supervise-risk-ui/src/settings.js b/supervise-risk-ui/src/settings.js
index 0dc7efda..adef8a7c 100644
--- a/supervise-risk-ui/src/settings.js
+++ b/supervise-risk-ui/src/settings.js
@@ -1,6 +1,6 @@
 module.exports = {
 
-  title: '汇融供应链贷后监管平台
+  title: '汇融云眼贷后监管平台',
 
   /**
    * @type {boolean} true | false
diff --git a/supervise-risk-ui/vue.config.js b/supervise-risk-ui/vue.config.js
index 5afd4108..f4037e33 100644
--- a/supervise-risk-ui/vue.config.js
+++ b/supervise-risk-ui/vue.config.js
@@ -6,7 +6,7 @@ function resolve(dir) {
   return path.join(__dirname, dir)
 }
 
-const name = defaultSettings.title || '汇融供应链贷后监管平台// page title
+const name = defaultSettings.title || '汇融云眼贷后监管平台'// page title
 
 // 如果端口设置为80，
 // 使用管理员权限执行命令行。
diff --git a/supervise-work-ui/src/assets/loginImg/logo.png b/supervise-work-ui/src/assets/loginImg/logo.png
index 8c88f09d..346b6ae3 100644
Binary files a/supervise-work-ui/src/assets/loginImg/logo.png and b/supervise-work-ui/src/assets/loginImg/logo.png differ
diff --git a/supervise-work-ui/src/layout/components/Navbar.vue b/supervise-work-ui/src/layout/components/Navbar.vue
index 0dda75c7..c03fedff 100644
--- a/supervise-work-ui/src/layout/components/Navbar.vue
+++ b/supervise-work-ui/src/layout/components/Navbar.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="navbar">
-    <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;"/>汇融供应链贷后监管平台p>
+    <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;"/>汇融云眼贷后监管平台
     <!-- <h3 class="breadcrumb-container">汇融供应链贷后监管平台h3> -->
       <div class="right-menu">
 <!--        <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
diff --git a/supervise-work-ui/src/settings.js b/supervise-work-ui/src/settings.js
index 0dc7efda..adef8a7c 100644
--- a/supervise-work-ui/src/settings.js
+++ b/supervise-work-ui/src/settings.js
@@ -1,6 +1,6 @@
 module.exports = {
 
-  title: '汇融供应链贷后监管平台
+  title: '汇融云眼贷后监管平台',
 
   /**
    * @type {boolean} true | false
diff --git a/supervise-work-ui/vue.config.js b/supervise-work-ui/vue.config.js
index 72f544bc..55480fdf 100644
--- a/supervise-work-ui/vue.config.js
+++ b/supervise-work-ui/vue.config.js
@@ -6,7 +6,7 @@ function resolve(dir) {
   return path.join(__dirname, dir)
 }
 
-const name = defaultSettings.title || '汇融供应链贷后监管平台// page title
+const name = defaultSettings.title || '汇融云眼贷后监管平台'// page title
 
 // 如果端口设置为80，
 // 使用管理员权限执行命令行。
diff --git a/yxt-portal-ui/src/assets/loginImg/logo.png b/yxt-portal-ui/src/assets/loginImg/logo.png
index 8c88f09d..346b6ae3 100644
Binary files a/yxt-portal-ui/src/assets/loginImg/logo.png and b/yxt-portal-ui/src/assets/loginImg/logo.png differ
diff --git a/yxt-portal-ui/src/layout/components/Navbar.vue b/yxt-portal-ui/src/layout/components/Navbar.vue
index baa9b89a..d37b8079 100644
--- a/yxt-portal-ui/src/layout/components/Navbar.vue
+++ b/yxt-portal-ui/src/layout/components/Navbar.vue
@@ -1,7 +1,7 @@
 <template>
 	<div>
   <div class="navbar">
-     <p class="breadcrumb-container">汇融供应链贷后监管平台</p>
+     <p class="breadcrumb-container">汇融云眼贷后监管平台</p>
     <div class="right-menu">
 <!--      <p>{{Orgname}}  欢迎, {{name}}</p> &lt;!&ndash;{{departmentName}}&ndash;&gt;-->
       <p>欢迎您，{{pNameAndDepartmentNameAndPostName}} {{name}}</p>
@@ -10,7 +10,7 @@
       <span class="backToHome" @click="logout"><i class="el-icon-back"></i>返回首页</span>
     </div>
   </div>
-  <el-footer class="footer" height="40px">Copyright © {{ year }} 汇融供应链贷后监管平台 All Rights Reserved</el-footer>
+  <el-footer class="footer" height="40px">Copyright © {{ year }} 汇融云眼贷后监管平台 All Rights Reserved</el-footer>
 </div>
 </template>
 
diff --git a/yxt-portal-ui/src/settings.js b/yxt-portal-ui/src/settings.js
index 9f78bf67..adef8a7c 100644
--- a/yxt-portal-ui/src/settings.js
+++ b/yxt-portal-ui/src/settings.js
@@ -1,6 +1,6 @@
 module.exports = {
 
-  title: '汇融供应链贷后监管平台',
+  title: '汇融云眼贷后监管平台',
 
   /**
    * @type {boolean} true | false
diff --git a/yxt-portal-ui/src/views/Home/Home.vue b/yxt-portal-ui/src/views/Home/Home.vue
index 96337597..fd05299e 100644
--- a/yxt-portal-ui/src/views/Home/Home.vue
+++ b/yxt-portal-ui/src/views/Home/Home.vue
@@ -2,7 +2,7 @@
   <div style="height: 100%;">
     <div class="header">
       <p class="title">
-        汇融供应链贷后监管平台
+        汇融云眼贷后监管平台
       </p>
       <div class="head_info">
         <p>欢迎您：</p>
@@ -80,7 +80,7 @@
           <p>{{ item.title }}</p>
         </li>
       </ul>
-      <p class="copy">Copyright © {{ year }} 汇融供应链贷后监管平台 All Rights Reserved</p>
+      <p class="copy">Copyright © {{ year }} 汇融云眼贷后监管平台 All Rights Reserved</p>
     </div>
     <!--<ul class="nav-box">-->
     <!--<li style="background-color: #e87861;" @click="toNavbar('http://39.104.100.138:8081/')">
@@ -448,7 +448,7 @@
         } else if (index === 7) {
           window.open('http://jianguan.yyundong.com/#/index' + '?token=' + getStorage(), '_blank')
         } else if (index === 8) {
-            window.open('http://192.168.3.8:9531/#/' + '?token=' + getStorage(), '_blank')
+            window.open('http://192.168.3.8:9532/#/' + '?token=' + getStorage(), '_blank')
           // window.open('http://jianguan.yyundong.com/crm/#/' + '?token=' + getStorage(), '_blank')
         }
       }
diff --git a/yxt-portal-ui/vue.config.js b/yxt-portal-ui/vue.config.js
index bd70a4bf..6bd8555c 100644
--- a/yxt-portal-ui/vue.config.js
+++ b/yxt-portal-ui/vue.config.js
@@ -6,7 +6,7 @@ function resolve(dir) {
   return path.join(__dirname, dir)
 }
 
-const name = defaultSettings.title || '汇融供应链贷后监管平台' // page title
+const name = defaultSettings.title || '汇融云眼贷后监管平台' // page title
 
 // 如果端口设置为80，
 // 使用管理员权限执行命令行。