修改

.env.development

+# 页面标题
+VUE_APP_TITLE = 百饮社群团购系统
+
+# 开发环境配置
+ENV = 'development'
+
+# 百饮社群团购系统/开发环境
+VUE_APP_BASE_API = ''
+
+# 网址
+#VUE_APP_BASE_URL = 'http://192.168.0.150:8955/'
+VUE_APP_BASE_URL = 'http://family.yyinhong.cn/'
+
+
+# 路由懒加载
+VUE_CLI_BABEL_TRANSPILE_MODULES = true
\ No newline at end of file

.env.production

+# 页面标题
+VUE_APP_TITLE = 百饮社群团购系统
+
+# 开发环境配置
+ENV = 'development'
+
+# 百饮社群团购系统/开发环境
+VUE_APP_BASE_API = ''
+
+# 网址
+#VUE_APP_BASE_URL = 'http://192.168.0.150:8955/'
+VUE_APP_BASE_URL = 'http://family.yyinhong.cn/'
+
+
+# 路由懒加载
+VUE_CLI_BABEL_TRANSPILE_MODULES = true
\ No newline at end of file

package.json

@@ -58,6 +58,7 @@
     "vab-icon": "^0.0.1",
     "vab-icon": "^0.0.1",
     "vue": "~2.6.14",
     "vue": "~2.6.14",
     "vue-echarts": "5.0.0-beta.0",
     "vue-echarts": "5.0.0-beta.0",
+    "vue-pdf": "^4.3.0",
     "vue-router": "^3.5.3",
     "vue-router": "^3.5.3",
     "vue-template-compiler": "~2.6.14",
     "vue-template-compiler": "~2.6.14",
     "vuex": "^3.6.2",
     "vuex": "^3.6.2",

src/App.vue

 <template>
 <template>
   <div id="vue-admin-beautiful">
   <div id="vue-admin-beautiful">
+    <Fixedbtn v-show="$route.path != '/'" />
     <router-view />
     <router-view />
   </div>
   </div>
 </template>
 </template>
 
 
 <script>
 <script>
+  import Fixedbtn from '@/views/index/components/Fixedbtn.vue'
   export default {
   export default {
     name: 'App',
     name: 'App',
+    components: { Fixedbtn },
     mounted() {},
     mounted() {},
   }
   }
 </script>
 </script>
+<style>
+  .side-bar-container {
+    background: #304156 !important;
+  }
+  .el-menu {
+    background: #304156 !important;
+  }
+  .el-loading-spinner .circular {
+    width: 42px;
+    height: 42px;
+    animation: loading-rotate 2s linear infinite;
+    display: none;
+  }
+  .el-loading-spinner {
+    /* 图片替换为你自定义的即可 */
+    background: url('https://suppliervip.chinalawson.com.cn/webvip/static/img/timg.12d47b83.gif')
+      no-repeat;
+
+    background-size: 120px 120px;
+    /* width: 100%; */
+    width: 70%;
+    height: 100%;
+    position: relative;
+    top: 50%;
+    left: 50%;
+  }
+  .d-flex {
+    display: flex;
+  }
+  .j-center {
+    justify-content: center;
+  }
+  .px-1 {
+    padding: 0 10px;
+  }
+</style>

src/api/purchase.js

+import request from '@/utils/request'
+//查询返利明细列表
+export function orderList(data) {
+  return request({
+    url: `orderGain/list?pageNum=${data.pageNum}&pageSize=${
+      data.pageSize
+    }&supplierName=${data.supplierName}&dhNumber=${data.dhNumber}&shUnit=${
+      data.shUnit
+    }&dlType=${data.dlType}&zdStatus=${data.zdStatus}&dhTimeStart=${
+      data.deliveryDate && data.deliveryDate[0] ? data.deliveryDate[0] : ''
+    }&dhTimeEnd=${
+      data.deliveryDate && data.deliveryDate[1] ? data.deliveryDate[1] : ''
+    }&jhTimeStart=${
+      data.orderDate && data.orderDate[0] ? data.orderDate[0] : ''
+    }&jhTimeEnd=${
+      data.orderDate && data.orderDate[1] ? data.orderDate[1] : ''
+    }`,
+    method: 'GET',
+  })
+}
+
+//详情页接口
+const detailPage = (params) => request.get('orderGainDetailed/list', { params })
+
+// 下载返利明细列表
+const uploadDetail = (params) =>
+  request.post('orderGainDetailed/exportExcel', params, {
+    responseType: 'blob',
+  })
+
+// 订单进度跟踪列表
+const orderProcgress = (params) => request.get('orderTail/list', { params })
+
+//订单进度跟踪导入
+const progressExport = (params) =>
+  request.post('orderTail/exportExcel', params, {
+    responseType: 'blob',
+  })
+// 订单进度跟踪导入名字
+const progressUploadName = () => request.get('orderTail/randomExcelName')
+// 订单进度跟踪详情
+const progressDetail = (params) =>
+  request.get('orderTailDetail/list', { params })
+
+//订单进度跟踪详情下载
+const proDetailUpload = (params) =>
+  request.post('orderTailDetail/exportExcel', params, {
+    responseType: 'blob',
+  })
+// 订单进度跟踪详情下载名字
+const proDetailUploadName = (params) =>
+  request.get('orderTailDetail/randomExcelName', { params })
+
+export {
+  detailPage,
+  uploadDetail,
+  orderProcgress,
+  progressExport,
+  progressUploadName,
+  progressDetail,
+  proDetailUpload,
+  proDetailUploadName,
+}

src/api/rebateDetail.js

+import request from '@/utils/request'
+//查询返利明细列表
+export function rebateList(data) {
+  return request({
+    url: `rebateDetail/list?pageNum=${data.pageNum}&pageSize=${
+      data.pageSize
+    }&supplierName=${data.supplierName}&rebateType=${
+      data.rebateType
+    }&ticketKou=${data.ticketKou}&rebateProject=${
+      data.rebateProject
+    }&paymentType=${data.paymentType}&dealStatus=${
+      data.dealStatus
+    }&fullTimeStart=${
+      data.date && data.date[0] ? data.date[0] : ''
+    }&fullTimeEnd=${data.date && data.date[1] ? data.date[1] : ''}`,
+    method: 'GET',
+  })
+}
+// 下载返利明细列表
+export function uploadRebate(data) {
+  return request({
+    url: `rebateDetail/exportExcel?supplierName=${
+      data.supplierName
+    }&rebateType=${data.rebateType}&ticketKou=${data.ticketKou}&rebateProject=${
+      data.rebateProject
+    }&paymentType=${data.paymentType}&dealStatus=${
+      data.dealStatus
+    }&fullTimeStart=${
+      data.date && data.date[0] ? data.date[0] : ''
+    }&fullTimeEnd=${data.date && data.date[1] ? data.date[1] : ''}`,
+    method: 'GET',
+    responseType: 'blob',
+  })
+}
+// 下载名字
+export function downPDFTitleGet(data) {
+  return request({
+    url: `rebateDetail/randomExcelName?fullTimeStart=${
+      data.date && data.date[0] ? data.date[0] : ''
+    }&fullTimeEnd=${data.date && data.date[1] ? data.date[1] : ''}`,
+    method: 'GET',
+  })
+}
+
+//对账单查询列表
+export function listRe(data) {
+  return request({
+    url: `rebateDetail/listRe?pageNum=${data.pageNum}&pageSize=${
+      data.pageSize
+    }&supplierName=${data.supplierName}&receiptsType=${
+      data.receiptsType
+    }&closeStatus=${data.closeStatus}&timeType=${data.timeType}&logisticsName=${
+      data.logisticsName
+    }&receiptsNumber=${data.receiptsNumber}&fullTimeStart=${
+      data.date && data.date[0] ? data.date[0] : ''
+    }&fullTimeEnd=${data.date && data.date[1] ? data.date[1] : ''}`,
+    method: 'GET',
+  })
+}
+//对账单查询列表下载
+export function uploadBill(data) {
+  return request({
+    url: `rebateDetail/exportExcelRe?supplierName=${
+      data.supplierName
+    }&receiptsType=${data.receiptsType}&closeStatus=${
+      data.closeStatus
+    }&timeType=${data.timeType}&logisticsName=${
+      data.logisticsName
+    }&receiptsNumber=${data.receiptsNumber}&fullTimeStart=${
+      data.date && data.date[0] ? data.date[0] : ''
+    }&fullTimeEnd=${data.date && data.date[1] ? data.date[1] : ''}`,
+    method: 'GET',
+    responseType: 'blob',
+  })
+}
+//对账单查询列表下载名字
+export function downPDFBill() {
+  return request({
+    url: `rebateDetail/randomExcelNameRe`,
+    method: 'GET',
+  })
+}

src/components/VabUpload/index.vue

@@ -60,7 +60,13 @@
           imgErrorNum
           imgErrorNum
         }}张
         }}张
       </div>
       </div>
-      <el-button type="primary" @click="handleClose">关闭</el-button>
+      <el-button
+        type="primary"
+        style="background: #0187fb; border: none"
+        @click="handleClose"
+      >
+        关闭
+      </el-button>
       <el-button
       <el-button
         :loading="loading"
         :loading="loading"
         size="small"
         size="small"

src/config/net.config.js

@@ -3,10 +3,9 @@
  **/
  **/
 const network = {
 const network = {
   // 默认的接口地址 如果是开发环境和生产环境走vab-mock-server，当然你也可以选择自己配置成需要的接口地址
   // 默认的接口地址 如果是开发环境和生产环境走vab-mock-server，当然你也可以选择自己配置成需要的接口地址
-  baseURL:
-    process.env.NODE_ENV === 'development'
-      ? 'vab-mock-server'
-      : 'vab-mock-server',
+  // baseURL: process.env.NODE_ENV === 'development' ? '' : '',
+  // baseURL: '',
+  baseURL: 'api',
   //配后端数据的接收方式application/json;charset=UTF-8或者application/x-www-form-urlencoded;charset=UTF-8
   //配后端数据的接收方式application/json;charset=UTF-8或者application/x-www-form-urlencoded;charset=UTF-8
   contentType: 'application/json;charset=UTF-8',
   contentType: 'application/json;charset=UTF-8',
   //消息框消失时间
   //消息框消失时间

src/config/setting.config.js

@@ -47,9 +47,9 @@ const setting = {
   //是否显示在页面高亮错误
   //是否显示在页面高亮错误
   errorLog: ['development', 'production'],
   errorLog: ['development', 'production'],
   //是否开启登录拦截
   //是否开启登录拦截
-  loginInterception: true,
+  loginInterception: false,
   //是否开启登录RSA加密
   //是否开启登录RSA加密
-  loginRSA: true,
+  loginRSA: false,
   //intelligence和all两种方式，前者后端权限只控制permissions不控制view文件的import（前后端配合，减轻后端工作量），all方式完全交给后端前端只负责加载
   //intelligence和all两种方式，前者后端权限只控制permissions不控制view文件的import（前后端配合，减轻后端工作量），all方式完全交给后端前端只负责加载
   authentication: 'intelligence',
   authentication: 'intelligence',
   //vertical布局时是否只保持一个子菜单的展开
   //vertical布局时是否只保持一个子菜单的展开

src/layouts/components/VabAvatar/index.vue

@@ -2,10 +2,16 @@
   <el-dropdown @command="handleCommand">
   <el-dropdown @command="handleCommand">
     <span class="avatar-dropdown">
     <span class="avatar-dropdown">
       <!--<el-avatar class="user-avatar" :src="avatar"></el-avatar>-->
       <!--<el-avatar class="user-avatar" :src="avatar"></el-avatar>-->
-      <img class="user-avatar" :src="avatar" alt="" />
-      <div class="user-name">
-        {{ username }}
-        <i class="el-icon-arrow-down el-icon--right"></i>
+      <!-- <img class="user-avatar" :src="avatar" alt="" /> -->
+      <img
+        class="user-avatar"
+        src="https://thirdwx.qlogo.cn/mmopen/vi_32/DYAIOgq83epibHqWEX3sxJA42jvt4iaToTf0iaAd5icWxzY1drQsW4hl8bOYH0xHRGnKxZVHMv2uicOtIRibRibFQE6rw/132"
+        alt=""
+      />
+      <div class="user-name" style="white-space: nowrap">
+        <!-- {{ username }} -->
+        沈辉清
+        <!-- <i class="el-icon-arrow-down el-icon--right"></i> -->
       </div>
       </div>
     </span>
     </span>
 
 

src/layouts/components/VabLogo/index.vue

@@ -38,6 +38,7 @@
     height: $base-top-bar-height;
     height: $base-top-bar-height;
     overflow: hidden;
     overflow: hidden;
     line-height: $base-top-bar-height;
     line-height: $base-top-bar-height;
+    // background: $base-menu-background;
     background: $base-menu-background;
     background: $base-menu-background;
   }
   }
 
 

src/layouts/components/VabNavBar/index.vue

@@ -24,7 +24,7 @@
             src="@/assets/qr_logo/book.png"
             src="@/assets/qr_logo/book.png"
             alt=""
             alt=""
           />
           />
-          <vab-error-log />
+          <!-- <vab-error-log /> -->
           <!-- <vab-full-screen-bar @refresh="refreshRoute" /> -->
           <!-- <vab-full-screen-bar @refresh="refreshRoute" /> -->
           <!-- <vab-theme-bar class="hidden-xs-only" /> -->
           <!-- <vab-theme-bar class="hidden-xs-only" /> -->
           <!-- <vab-icon title="重载所有路由" :pulse="pulse" :icon="['fas', 'redo']" @click="refreshRoute" /> -->
           <!-- <vab-icon title="重载所有路由" :pulse="pulse" :icon="['fas', 'redo']" @click="refreshRoute" /> -->

src/layouts/components/VabThemeBar/index.vue

@@ -56,7 +56,13 @@
       </el-scrollbar>
       </el-scrollbar>
 
 
       <div class="el-drawer__footer">
       <div class="el-drawer__footer">
-        <el-button type="primary" @click="handleSaveTheme">保存</el-button>
+        <el-button
+          type="primary"
+          style="background: #0187fb; border: none"
+          @click="handleSaveTheme"
+        >
+          保存
+        </el-button>
         <el-button type="" @click="drawerVisible = false">取消</el-button>
         <el-button type="" @click="drawerVisible = false">取消</el-button>
       </div>
       </div>
     </el-drawer>
     </el-drawer>

src/layouts/index.vue

@@ -43,7 +43,7 @@
           <vab-nav-bar />
           <vab-nav-bar />
           <vab-tabs-bar v-if="tabsBar === 'true' || tabsBar === true" />
           <vab-tabs-bar v-if="tabsBar === 'true' || tabsBar === true" />
         </div>
         </div>
-        <vab-ad />
+        <!-- <vab-ad /> -->
         <vab-app-main />
         <vab-app-main />
       </div>
       </div>
     </div>
     </div>
@@ -252,9 +252,9 @@
 
 
           .app-main-container {
           .app-main-container {
             // width: calc(100% - #{$base-padding} - #{$base-padding});
             // width: calc(100% - #{$base-padding} - #{$base-padding});
-            margin: $base-padding auto;
+            // margin: $base-padding auto;
             background: $base-color-white;
             background: $base-color-white;
-            border-radius: $base-border-radius;
+            // border-radius: $base-border-radius;
           }
           }
         }
         }
 
 

src/router/index.js

+/*
+ * @Author: ‘巴博尔’ 2164119982@qq.com
+ * @Date: 2023-01-12 20:11:32
+ * @LastEditors: ‘巴博尔’ 2164119982@qq.com
+ * @LastEditTime: 2023-01-13 15:47:40
+ * @FilePath: \vipSupplier\src\router\index.js
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 /**
 /**
  * @author https://vue-admin-beautiful.com （不想保留author可删除）
  * @author https://vue-admin-beautiful.com （不想保留author可删除）
  * @description router全局配置，如有必要可分文件抽离，其中asyncRoutes只有在intelligence模式下才会用到，vip文档中已提供路由的基础图标与小清新图标的配置方案，请仔细阅读
  * @description router全局配置，如有必要可分文件抽离，其中asyncRoutes只有在intelligence模式下才会用到，vip文档中已提供路由的基础图标与小清新图标的配置方案，请仔细阅读
@@ -38,8 +46,12 @@ export const constantRoutes = [
 export const asyncRoutes = [
 export const asyncRoutes = [
   {
   {
     path: '/',
     path: '/',
+    component: () => import('@/views/loginCustom/index'),
+  },
+  {
+    path: '/index',
     component: Layout,
     component: Layout,
-    redirect: '/index',
+    // redirect: '/index',
     children: [
     children: [
       {
       {
         path: 'index',
         path: 'index',
@@ -47,7 +59,7 @@ export const asyncRoutes = [
         component: () => import('@/views/index/index'),
         component: () => import('@/views/index/index'),
         meta: {
         meta: {
           title: '首页',
           title: '首页',
-          icon: 'home',
+          icon: 'tachometer-alt',
           affix: true,
           affix: true,
         },
         },
       },
       },
@@ -315,6 +327,14 @@ export const asyncRoutes = [
         },
         },
       },
       },
       {
       {
+        path: 'orderDetail',
+        component: () => import('@/views/vab/getOrder/detail'),
+        // meta: {
+        //   title: '订单获取详情',
+        //   icon: 'dot-circle',
+        // },
+      },
+      {
         path: 'orderProgress',
         path: 'orderProgress',
         name: 'orderProgress',
         name: 'orderProgress',
         component: () => import('@/views/vab/orderProgress/index'),
         component: () => import('@/views/vab/orderProgress/index'),
@@ -324,6 +344,14 @@ export const asyncRoutes = [
         },
         },
       },
       },
       {
       {
+        path: 'ProgressDetail',
+        component: () => import('@/views/vab/orderProgress/detail'),
+        // meta: {
+        //   title: '订单获取详情',
+        //   icon: 'dot-circle',
+        // },
+      },
+      {
         path: 'orderDownload',
         path: 'orderDownload',
         name: 'orderDownload',
         name: 'orderDownload',
         component: () => import('@/views/vab/orderDownload/index'),
         component: () => import('@/views/vab/orderDownload/index'),
@@ -334,6 +362,91 @@ export const asyncRoutes = [
       },
       },
     ],
     ],
   },
   },
+
+  {
+    path: '/wu',
+    component: Layout,
+    redirect: 'noRedirect',
+    name: 'personnelManagement',
+    alwaysShow: true,
+    meta: {
+      title: '供应商和生产商管理',
+      icon: 'box-open',
+    },
+    children: [
+      {
+        path: 'aa',
+        name: 'aa',
+        component: () => import('@/views/vab/kong/aa'),
+        meta: {
+          title: '供应商新建和维护',
+          icon: 'edit',
+        },
+      },
+      {
+        path: 'bb',
+        name: 'bb',
+        component: () => import('@/views/vab/kong/bb'),
+
+        meta: {
+          title: '生产商检索',
+          icon: 'search',
+        },
+      },
+      {
+        path: 'cc',
+        name: '',
+        component: () => import('@/views/vab/kong/cc'),
+
+        meta: {
+          title: '生产商新建和维护',
+          icon: 'edit',
+        },
+      },
+    ],
+  },
+  {
+    path: '/bbb',
+    component: Layout,
+    redirect: 'noRedirect',
+    name: 'personnelManagement',
+    alwaysShow: true,
+    meta: {
+      title: '商品管理',
+      icon: 'box-open',
+    },
+    children: [
+      {
+        path: 'a',
+        name: '',
+        component: () => import('@/views/vab/kong/a'),
+        meta: {
+          title: '商品查询',
+          icon: 'search',
+        },
+      },
+      {
+        path: 'b',
+        name: '',
+        component: () => import('@/views/vab/kong/b'),
+
+        meta: {
+          title: '进货资质上传',
+          icon: 'search',
+        },
+      },
+      {
+        path: 'c',
+        name: '',
+        component: () => import('@/views/vab/kong/c'),
+
+        meta: {
+          title: '进货资质查询',
+          icon: 'search',
+        },
+      },
+    ],
+  },
   {
   {
     path: '/personnelManagement',
     path: '/personnelManagement',
     component: Layout,
     component: Layout,
@@ -359,7 +472,7 @@ export const asyncRoutes = [
         name: 'profitDetailsQuery',
         name: 'profitDetailsQuery',
         component: () => import('@/views/vab/profitDetailsQuery/index'),
         component: () => import('@/views/vab/profitDetailsQuery/index'),
         meta: {
         meta: {
-          title: '返利明细直询',
+          title: '返利明细查询',
           icon: 'search',
           icon: 'search',
         },
         },
       },
       },
@@ -368,7 +481,7 @@ export const asyncRoutes = [
         name: 'billQuery',
         name: 'billQuery',
         component: () => import('@/views/vab/billQuery/index'),
         component: () => import('@/views/vab/billQuery/index'),
         meta: {
         meta: {
-          title: '对账单直询',
+          title: '对账单查询',
           icon: 'search',
           icon: 'search',
         },
         },
       },
       },
@@ -408,8 +521,18 @@ export const asyncRoutes = [
           icon: 'search',
           icon: 'search',
         },
         },
       },
       },
+      {
+        path: 'notAccount',
+        name: 'notAccount',
+        component: () => import('@/views/vab/notAccount/index'),
+        meta: {
+          title: '未对账明细报表',
+          icon: 'search',
+        },
+      },
     ],
     ],
   },
   },
+
   // {
   // {
   //   path: '/personnelManagement',
   //   path: '/personnelManagement',
   //   component: Layout,
   //   component: Layout,

src/styles/vab.scss

@@ -269,7 +269,8 @@ html {
       }
       }
 
 
       &.is-active {
       &.is-active {
-        background: $base-color-default !important;
+        // background: $base-color-default !important;
+        background:#afa !important;
       }
       }
     }
     }
   }
   }

src/styles/variables.scss

@@ -5,15 +5,15 @@
 /* stylelint-disable */
 /* stylelint-disable */
 @charset "utf-8";
 @charset "utf-8";
 //框架默认主题色
 //框架默认主题色
-$base-color-default: #0187fb;
+$base-color-default: #304156;
 //默认层级
 //默认层级
 $base-z-index: 999;
 $base-z-index: 999;
 //横向布局纵向布局时菜单背景色
 //横向布局纵向布局时菜单背景色
-$base-menu-background: #21252b;
+$base-menu-background: #304156;
 //菜单文字颜色
 //菜单文字颜色
 $base-menu-color: hsla(0, 0%, 100%, 0.95);
 $base-menu-color: hsla(0, 0%, 100%, 0.95);
 //菜单选中文字颜色
 //菜单选中文字颜色
-$base-menu-color-active: hsla(0, 0%, 100%, 0.95);
+$base-menu-color-active: #0187fb;
 //菜单选中背景色
 //菜单选中背景色
 $base-menu-background-active: $base-color-default;
 $base-menu-background-active: $base-color-default;
 //标题颜色
 //标题颜色

src/utils/request.js

@@ -76,50 +76,50 @@ instance.interceptors.request.use(
   }
   }
 )
 )
 
 
-instance.interceptors.response.use(
-  (response) => {
-    if (loadingInstance) loadingInstance.close()
+// instance.interceptors.response.use(
+//   (response) => {
+//     if (loadingInstance) loadingInstance.close()
 
 
-    const { data, config } = response
-    const { code, msg } = data
-    // 操作正常Code数组
-    const codeVerificationArray = isArray(successCode)
-      ? [...successCode]
-      : [...[successCode]]
-    // 是否操作正常
-    if (codeVerificationArray.includes(code)) {
-      return data
-    } else {
-      handleCode(code, msg)
-      return Promise.reject(
-        'vue-admin-beautiful请求异常拦截:' +
-          JSON.stringify({ url: config.url, code, msg }) || 'Error'
-      )
-    }
-  },
-  (error) => {
-    if (loadingInstance) loadingInstance.close()
-    const { response, message } = error
-    if (error.response && error.response.data) {
-      const { status, data } = response
-      handleCode(status, data.msg || message)
-      return Promise.reject(error)
-    } else {
-      let { message } = error
-      if (message === 'Network Error') {
-        message = '后端接口连接异常'
-      }
-      if (message.includes('timeout')) {
-        message = '后端接口请求超时'
-      }
-      if (message.includes('Request failed with status code')) {
-        const code = message.substr(message.length - 3)
-        message = '后端接口' + code + '异常'
-      }
-      Vue.prototype.$baseMessage(message || `后端接口未知异常`, 'error')
-      return Promise.reject(error)
-    }
-  }
-)
+//     const { data, config } = response
+//     const { code, msg } = data
+//     // 操作正常Code数组
+//     const codeVerificationArray = isArray(successCode)
+//       ? [...successCode]
+//       : [...[successCode]]
+//     // 是否操作正常
+//     if (codeVerificationArray.includes(code)) {
+//       return data
+//     } else {
+//       handleCode(code, msg)
+//       return Promise.reject(
+//         'vue-admin-beautiful请求异常拦截:' +
+//           JSON.stringify({ url: config.url, code, msg }) || 'Error'
+//       )
+//     }
+//   },
+//   (error) => {
+//     if (loadingInstance) loadingInstance.close()
+//     const { response, message } = error
+//     if (error.response && error.response.data) {
+//       const { status, data } = response
+//       handleCode(status, data.msg || message)
+//       return Promise.reject(error)
+//     } else {
+//       let { message } = error
+//       if (message === 'Network Error') {
+//         message = '后端接口连接异常'
+//       }
+//       if (message.includes('timeout')) {
+//         message = '后端接口请求超时'
+//       }
+//       if (message.includes('Request failed with status code')) {
+//         const code = message.substr(message.length - 3)
+//         message = '后端接口' + code + '异常'
+//       }
+//       Vue.prototype.$baseMessage(message || `后端接口未知异常`, 'error')
+//       return Promise.reject(error)
+//     }
+//   }
+// )
 
 
 export default instance
 export default instance

src/views/index/components/Fixedbtn.vue

+<template>
+  <div>
+    <div class="fixed-btn" @click="handleOpen">
+      <i class="el-icon-s-operation"></i>
+    </div>
+    <el-drawer
+      title="任务中心"
+      :visible.sync="drawer"
+      :direction="direction"
+      :before-close="handleClose"
+      :show-close="false"
+    >
+      <div class="tips-text">点击刷新按钮获取最新处理结果</div>
+      <div class="d-flex j-center">
+        <el-button
+          type="primary"
+          style="background: #0187fb; border: none"
+          size="mini"
+        >
+          刷新
+        </el-button>
+      </div>
+      <div class="drae-box">
+        <el-table
+          key="popper"
+          class="poper-table-index mt-1"
+          :data="tableData"
+          border
+          style="width: 98%"
+          :header-cell-style="{
+            background: '#4091ff',
+          }"
+        >
+          <el-table-column
+            align="center"
+            prop="date"
+            label="任务名称"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            prop="date"
+            label="任务状态"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            prop="date"
+            label="开始时间"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            prop="date"
+            label="结束时间"
+          ></el-table-column>
+          <el-table-column prop="date" label="任务日志" align="center">
+            <template slot-scope="scope">
+              <el-button
+                type="primary"
+                style="background: #0187fb; border: none"
+                size="mini"
+              >
+                详情
+              </el-button>
+            </template>
+          </el-table-column>
+          <el-table-column prop="date" label="资源下载" align="center">
+            <template slot-scope="scope">
+              <el-button size="mini" type="success">下载</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        drawer: false, //弹出框是否展示
+        direction: 'rtl',
+        tableData: [],
+      }
+    },
+    methods: {
+      //打开弹出层
+      handleOpen() {
+        this.drawer = true
+      },
+      // 关闭弹出层
+      handleClose(done) {
+        done()
+      },
+    },
+  }
+</script>
+
+<style>
+  .fixed-btn {
+    width: 48px;
+    height: 48px;
+    background: rgb(24, 144, 255);
+    font-size: 24px;
+    text-align: center;
+    line-height: 48px;
+    color: #fff;
+    position: fixed;
+    top: 130px;
+    right: 0;
+    z-index: 999 !important;
+  }
+  .tips-text {
+    color: red;
+    text-align: center;
+    margin-bottom: 10px;
+  }
+  .el-drawer__header {
+    text-align: center;
+    color: #000;
+    font-size: 16px;
+    font-weight: bold;
+    margin-bottom: 10px !important;
+  }
+</style>

src/views/index/index.vue

 <template>
 <template>
-  <div></div>
+  <div class="p-1">
+    <!-- 滚动消息通知 -->
+
+    <div>
+      <marquee loop="infinite">
+        <div class="d-flex">
+          <div
+            v-for="(info, ix) in noticeList"
+            :key="ix"
+            class="d-flex a-center ml-2"
+          >
+            <img
+              class="notice-img"
+              src="data:image/png;base64,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"
+              alt=""
+            />
+            <div class="ml-1">{{ info.text }}</div>
+          </div>
+        </div>
+      </marquee>
+    </div>
+    <div class="mt-2 d-flex">
+      <!-- 左侧 -->
+      <div class="span-10">
+        <!-- 左侧轮播图 -->
+        <el-carousel height="300px">
+          <el-carousel-item v-for="(item, index) in swiperList" :key="index">
+            <img class="swiper-item-img" :src="item" alt="" />
+          </el-carousel-item>
+        </el-carousel>
+        <div class="mt-2">
+          <div class="notice-vip-msg">重要通知</div>
+          <el-table
+            key="two"
+            :data="tableDataLeft"
+            :height="400"
+            border
+            style="width: 98%"
+            :header-cell-style="{
+              background: '#f5f7fa',
+              color: '#9ca7c0',
+            }"
+          >
+            <el-table-column prop="address" label="标题">
+              <template slot-scope="scope">
+                <div class="d-flex" @click="handleDetail">
+                  <div class="title-blue">{{ scope.row.title }}</div>
+                  <div class="ml-2">
+                    <img
+                      v-if="scope.row.isMust"
+                      class="must-look-img"
+                      src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHsAAAAxCAIAAAB1ZkEiAAAACXBIWXMAAAsTAAALEwEAmpwYAAAF0WlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS42LWMxNDUgNzkuMTYzNDk5LCAyMDE4LzA4LzEzLTE2OjQwOjIyICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxuczpzdEV2dD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlRXZlbnQjIiB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iIHhtbG5zOnBob3Rvc2hvcD0iaHR0cDovL25zLmFkb2JlLmNvbS9waG90b3Nob3AvMS4wLyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiIHhtcDpDcmVhdGVEYXRlPSIyMDIwLTEwLTI3VDExOjMwOjI2KzA4OjAwIiB4bXA6TWV0YWRhdGFEYXRlPSIyMDIwLTEwLTI3VDExOjMwOjI2KzA4OjAwIiB4bXA6TW9kaWZ5RGF0ZT0iMjAyMC0xMC0yN1QxMTozMDoyNiswODowMCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpjMmUyMzMyYi01MDJiLTExNDEtOWM3ZS01NjEwNTlhNzdkYTEiIHhtcE1NOkRvY3VtZW50SUQ9ImFkb2JlOmRvY2lkOnBob3Rvc2hvcDo2MDQzZGMyMC1mMTNkLTBjNDItODFk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"
+                      alt=""
+                    />
+                    <img
+                      v-else
+                      class="fujian-img"
+                      src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAWCAYAAADAQbwGAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAECSURBVDhP7ZPBqkVQFIbvQ3sF4g1MGKCMlYGSogwoiQ7KUBmIkYGU8J/2zj13YjulO7in7jdbe+2+9tqt/wu/zIcLH48HTNOE67rHyXuYwr7vYRgGLMuCpmmI4/joXMMU5nmOKIqw7zuWZYEgCEfnGqYwyzIkSYJxHGnN8zzWdcU0TbRmcSmsqgqyLGPbNoiiSL/Btu3jxjmXwrIsoarqSzgMAxzHOW6c8y/84TOERVHQpHieR8VkbW4LSVLSNEXXdXQXm6ZB27b3hXVdIwgCGr1vSHLCMDyqc5jCeZ7py8iLiNT3fUiS9IoiC6aQQEbUdR0cx0FRFDr2Oy6Fd/jrQuAJjNyYYusNv+EAAAAASUVORK5CYII="
+                      alt=""
+                    />
+                  </div>
+                </div>
+              </template>
+            </el-table-column>
+
+            <el-table-column
+              prop="date"
+              label="日期"
+              width="180"
+            ></el-table-column>
+          </el-table>
+        </div>
+      </div>
+      <!-- 右侧 -->
+      <div class="span-10 ml-2">
+        <div class="notice-vip-msg">重要通知</div>
+        <el-table
+          key="one"
+          :data="tableDataRight"
+          height="660"
+          border
+          style="width: 98%"
+          :header-cell-style="{
+            background: '#f5f7fa',
+            color: '#9ca7c0 ',
+          }"
+        >
+          <el-table-column prop="address" label="标题">
+            <template slot-scope="scope">
+              <div class="d-flex">
+                <div class="title-blue">{{ scope.row.title }}</div>
+                <div class="ml-2">
+                  <img
+                    v-if="scope.row.isMust"
+                    class="must-look-img"
+                    src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHsAAAAxCAIAAAB1ZkEiAAAACXBIWXMAAAsTAAALEwEAmpwYAAAF0WlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS42LWMxNDUgNzkuMTYzNDk5LCAyMDE4LzA4LzEzLTE2OjQwOjIyICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxuczpzdEV2dD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlRXZlbnQjIiB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iIHhtbG5zOnBob3Rvc2hvcD0iaHR0cDovL25zLmFkb2JlLmNvbS9waG90b3Nob3AvMS4wLyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiIHhtcDpDcmVhdGVEYXRlPSIyMDIwLTEwLTI3VDExOjMwOjI2KzA4OjAwIiB4bXA6TWV0YWRhdGFEYXRlPSIyMDIwLTEwLTI3VDExOjMwOjI2KzA4OjAwIiB4bXA6TW9kaWZ5RGF0ZT0iMjAyMC0xMC0yN1QxMTozMDoyNiswODowMCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpjMmUyMzMyYi01MDJiLTExNDEtOWM3ZS01NjEwNTlhNzdkYTEiIHhtcE1NOkRvY3VtZW50SUQ9ImFkb2JlOmRvY2lkOnBob3Rvc2hvcDo2MDQzZGMyMC1mMTNkLTBjNDItODFk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"
+                    alt=""
+                  />
+                  <img
+                    v-else
+                    class="fujian-img"
+                    src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAWCAYAAADAQbwGAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAECSURBVDhP7ZPBqkVQFIbvQ3sF4g1MGKCMlYGSogwoiQ7KUBmIkYGU8J/2zj13YjulO7in7jdbe+2+9tqt/wu/zIcLH48HTNOE67rHyXuYwr7vYRgGLMuCpmmI4/joXMMU5nmOKIqw7zuWZYEgCEfnGqYwyzIkSYJxHGnN8zzWdcU0TbRmcSmsqgqyLGPbNoiiSL/Btu3jxjmXwrIsoarqSzgMAxzHOW6c8y/84TOERVHQpHieR8VkbW4LSVLSNEXXdXQXm6ZB27b3hXVdIwgCGr1vSHLCMDyqc5jCeZ7py8iLiNT3fUiS9IoiC6aQQEbUdR0cx0FRFDr2Oy6Fd/jrQuAJjNyYYusNv+EAAAAASUVORK5CYII="
+                    alt=""
+                  />
+                </div>
+              </div>
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            prop="date"
+            label="日期"
+            width="180"
+          ></el-table-column>
+        </el-table>
+      </div>
+      <div>
+        <el-dialog
+          title="详情"
+          :visible.sync="dialogVisible"
+          width="80%"
+          :before-close="handleCloseDialog"
+        >
+          <div class="dislog-height">
+            <iframe
+              style="width: 100%; height: 100%"
+              :src="src"
+              frameborder="0"
+            ></iframe>
+          </div>
+          <!-- <span slot="footer" class="dialog-footer">
+          <el-button @click="dialogVisible = false">取 消</el-button>
+          <el-button type="primary" style="background: #0187fb; border: none" @click="dialogVisible = false">
+            确 定
+          </el-button>
+        </span> -->
+        </el-dialog>
+      </div>
+    </div>
+    <div class="d-flex j-center">
+      <img
+        class="bottom-img1"
+        src="https://suppliervip.chinalawson.com.cn/webvip/static/img/mail.e65b1fdb.png"
+        alt=""
+      />
+      <img
+        class="bottom-img2"
+        src="https://suppliervip.chinalawson.com.cn/webvip/static/img/phone.dd43ffab.png"
+        alt=""
+      />
+    </div>
+  </div>
 </template>
 </template>
 
 
 <script>
 <script>
+  import pdf from 'vue-pdf'
   export default {
   export default {
-    name: 'Index',
+    // name: 'PayRecord',
+    components: { pdf },
+    data() {
+      return {
+        src: 'http://family.yyinhong.cn//houtai//guanyu.pdf',
+        // src: 'http://storage.xuetangx.com/public_assets/xuetangx/PDF/PlayerAPI_v1.0.6.pdf',
+        // src: '../../../../public/pdf/dialog1.pdf',
+        noticeList: [
+          { text: '喜迎上海罗森2022年供应商大会！' },
+          { text: '供应商VIP系统已通过了信息安全等级保护2.0！' },
+          { text: '罗森×三菱商事 为便利店引进可再生能源！' },
+          { text: '中国罗森喜迎5000+家店！' },
+        ], //滚动消息同志列表
+        swiperList: [
+          'https://suppliervip.chinalawson.com.cn/webvipapi//ResourcesFile/Carousel/shop.b7324bf620220128105934766.jpg',
+          'https://suppliervip.chinalawson.com.cn/webvipapi//ResourcesFile/Carousel/23147101120220128110134311.jpg',
+          'https://suppliervip.chinalawson.com.cn/webvipapi//ResourcesFile/Carousel/n23147096820220128110251331.jpg',
+          'https://suppliervip.chinalawson.com.cn/webvipapi//ResourcesFile/Carousel/42022012811025687820220615161057743.jpg',
+        ], //轮播图列表
+        tableDataRight: [
+          { title: '[上海]上海财务电话', date: '2022-11-10', isMust: true },
+          {
+            title: '[上海]供应商VIP对账时间通知函',
+            date: '2021-03-02',
+            isMust: false,
+          },
+        ], //右侧的数据
+        tableData: [],
+        tableDataLeft: [
+          {
+            title: '[全部]VIP系统版本1.0.0.36更新说明',
+            date: '2023-01-11',
+            isMust: false,
+          },
+          {
+            title: '[全部]供应商对账手册',
+            date: '2022-06-09',
+            isMust: false,
+          },
+          {
+            title: '[全部]供应商VIP系统操作说明_供应商',
+            date: '2022-06-08',
+            isMust: false,
+          },
+          {
+            title: '[全部]如何修改手机号及解绑微信',
+            date: '2022-06-06',
+            isMust: false,
+          },
+          {
+            title: '[全部]2022年01月04日，供应VIP系统全国更新版本至：V1.0.0.19',
+            date: '2022-01-04',
+            isMust: false,
+          },
+          {
+            title: '[全部]2021年6月07日，供应VIP系统全国更新版本至：V1.0.0.9',
+            date: '2022-01-04',
+            isMust: false,
+          },
+          {
+            title: '[全部]VIP系统版本1.0.0.36更新说明',
+            date: '2023-01-11',
+            isMust: false,
+          },
+          {
+            title: '[全部]VIP系统版本1.0.0.36更新说明',
+            date: '2023-01-11',
+            isMust: false,
+          },
+          {
+            title: '[全部]VIP系统版本1.0.0.36更新说明',
+            date: '2023-01-11',
+            isMust: false,
+          },
+        ], //左侧表格数据
+        drawer: false, //弹出框是否展示
+        dialogVisible: true, //对话框(默认不展示)
+      }
+    },
+    created() {
+      // 示例
+      const loading = this.$loading({
+        lock: true,
+        text: '',
+        spinner: '',
+        background: 'rgba(255,255,255,0.7)',
+      })
+
+      // 两秒后关闭
+      setTimeout(() => {
+        loading.close()
+      }, 2000)
+    },
+    methods: {
+      handleDetail() {
+        this.dialogVisible = true
+      },
+      handleCloseDialog(done) {
+        done()
+      },
+    },
   }
   }
 </script>
 </script>
 
 
-<style lang="scss" scoped></style>
+<style>
+  .drae-box .el-table th .cell {
+    color: #fff !important;
+  }
+  .d-flex {
+    display: flex;
+  }
+  .p-1 {
+    padding: 10px;
+    box-sizing: border-box;
+  }
+  .j-center {
+    justify-content: center;
+  }
+  .ml-1 {
+    margin-left: 10px;
+  }
+  .ml-2 {
+    margin-left: 20px;
+  }
+  .mt-1 {
+    margin-top: 10px;
+  }
+  .mt-2 {
+    margin-top: 20px;
+  }
+  .a-center {
+    align-items: center;
+  }
+  .span-10 {
+    width: 50%;
+  }
+  .el-carousel__item {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  .swiper-item-img {
+    width: 617px;
+    height: 100%;
+  }
+  .notice-img {
+    width: 18px;
+    height: 18px;
+  }
+  .must-look-img {
+    width: 50px;
+    height: 20px;
+  }
+  .fujian-img {
+    width: 18px;
+    height: 20px;
+  }
+  .notice-vip-msg {
+    width: 98%;
+    height: 44px;
+    line-height: 44px;
+    background: #f5f7fa;
+    color: #606266;
+    font-size: 14px;
+    padding-left: 10px;
+    box-sizing: border-box;
+    border: 1px solid #ebeef5;
+  }
+
+  .dislog-height {
+    height: 80vh !important;
+  }
+  .el-dialog__body {
+    border-top: none !important;
+  }
+  .el-dialog {
+    /* margin-top: 0 !important; */
+    margin-top: 5vh !important;
+  }
+
+  .bottom-img1 {
+    width: 140px;
+    height: 65px;
+  }
+  .bottom-img2 {
+    width: 155px;
+    height: 65px;
+  }
+  .title-blue {
+    color: #1890ff !important;
+  }
+</style>

src/views/loginCustom/index.vue

+<template>
+  <div class="container" @click="handleGoIndex">
+    <div class="login-box">
+      <div>
+        <img
+          class="box-top-img"
+          src="https://suppliervip.chinalawson.com.cn/webvip/static/img/shop.b7324bf6.jpg"
+          alt=""
+        />
+      </div>
+      <div class="login-title mt-1">VIP供应商信息平台</div>
+      <div class="login-tips-text">微信登录</div>
+      <div class="code-img">
+        <img src="../../assets/code.jpg" alt="" />
+      </div>
+      <div class="use-text">使用微信扫一扫登录</div>
+      <div class="use-text">VIP供应商信息平台</div>
+      <div class="bottom-box-sys use-text">
+        <div class="must-look-tips">
+          *推荐使用浏览器(当前最新的2个版本)：CHROME、SAFARI、FIREFOX
+        </div>
+        <div>推荐使用浏览器(当前最新的2个版本)：CHROME、SAFARI、FIREFOX</div>
+        <div>邮件地址/メール： xiaoqing.zhu@chinalawson.com.cn</div>
+        <div>
+          <span>沪公网安备 31010102002337号</span>
+          <span>|</span>
+          <span>沪ICP备12047692号</span>
+        </div>
+        <!-- <div class="d-flex j-center">
+          <div>沪公网安备 31010102002337号</div>
+          <div>|</div>
+          <div>沪ICP备12047692号</div>
+        </div> -->
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {}
+    },
+    methods: {
+      handleGoIndex() {
+        console.log('进')
+        this.$router.push('/index/index')
+      },
+    },
+  }
+</script>
+
+<style lang="scss" scoped>
+  .mt-1 {
+    margin: 10px;
+  }
+  .d-flex {
+    display: flex;
+  }
+  .j-center {
+    justify-content: center;
+  }
+  .container {
+    width: 100%;
+    height: 100vh;
+    background: #003466;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  .login-box {
+    width: 30%;
+    height: 85vh;
+    background: #fff;
+  }
+  .box-top-img {
+    width: 100%;
+    height: 230px;
+  }
+  .login-title {
+    text-align: center;
+    font-weight: bold;
+    font-size: 30px;
+    color: #026;
+  }
+  .login-tips-text {
+    text-align: center;
+    font-size: 20px;
+    color: #373737;
+  }
+  .code-img {
+    width: 282px;
+    height: 282px;
+    text-align: center;
+    margin: 10px auto;
+  }
+  .code-img img {
+    width: 100%;
+    height: 100%;
+  }
+  .use-text {
+    text-align: center;
+    font-size: 13px;
+    color: #373737;
+  }
+  .bottom-box-sys {
+    text-align: center;
+    margin-top: 30px;
+  }
+  .bottom-box-sys div:nth-of-type(odd) {
+    margin: 10px 0;
+  }
+  .must-look-tips {
+    color: red;
+  }
+</style>

src/views/mall/pay/components/Step1.vue

@@ -18,7 +18,13 @@
       </el-form-item>
       </el-form-item>
     </el-form>
     </el-form>
     <div class="pay-button-group">
     <div class="pay-button-group">
-      <el-button type="primary" @click="handleSubmit">下一步</el-button>
+      <el-button
+        type="primary"
+        style="background: #0187fb; border: none"
+        @click="handleSubmit"
+      >
+        下一步
+      </el-button>
     </div>
     </div>
   </div>
   </div>
 </template>
 </template>

src/views/mall/pay/components/Step2.vue

@@ -25,7 +25,12 @@
       </el-form-item>
       </el-form-item>
     </el-form>
     </el-form>
     <div class="pay-button-group">
     <div class="pay-button-group">
-      <el-button type="primary" :loading="loading" @click="handleSubmit">
+      <el-button
+        type="primary"
+        style="background: #0187fb; border: none"
+        :loading="loading"
+        @click="handleSubmit"
+      >
         提交
         提交
       </el-button>
       </el-button>
       <el-button @click="handlePrev">上一步</el-button>
       <el-button @click="handlePrev">上一步</el-button>

src/views/mall/pay/components/Step3.vue

@@ -27,7 +27,13 @@
       </el-form-item>
       </el-form-item>
     </el-form>
     </el-form>
     <div class="pay-button-group">
     <div class="pay-button-group">
-      <el-button type="primary" @click="handlePrev">再转一笔</el-button>
+      <el-button
+        type="primary"
+        style="background: #0187fb; border: none"
+        @click="handlePrev"
+      >
+        再转一笔
+      </el-button>
     </div>
     </div>
   </div>
   </div>
 </template>
 </template>

src/views/personnelManagement/menuManagement/components/MenuManagementEdit.vue

@@ -18,7 +18,13 @@
     </el-form>
     </el-form>
     <div slot="footer" class="dialog-footer">
     <div slot="footer" class="dialog-footer">
       <el-button @click="close">取 消</el-button>
       <el-button @click="close">取 消</el-button>
-      <el-button type="primary" @click="save">确 定</el-button>
+      <el-button
+        type="primary"
+        style="background: #0187fb; border: none"
+        @click="save"
+      >
+        确 定
+      </el-button>
     </div>
     </div>
   </el-dialog>
   </el-dialog>
 </template>
 </template>

src/views/personnelManagement/roleManagement/components/RoleManagementEdit.vue

@@ -12,7 +12,13 @@
     </el-form>
     </el-form>
     <div slot="footer" class="dialog-footer">
     <div slot="footer" class="dialog-footer">
       <el-button @click="close">取 消</el-button>
       <el-button @click="close">取 消</el-button>
-      <el-button type="primary" @click="save">确 定</el-button>
+      <el-button
+        type="primary"
+        style="background: #0187fb; border: none"
+        @click="save"
+      >
+        确 定
+      </el-button>
     </div>
     </div>
   </el-dialog>
   </el-dialog>
 </template>
 </template>

src/views/personnelManagement/userManagement/components/UserManagementEdit.vue

@@ -28,7 +28,13 @@
     </el-form>
     </el-form>
     <div slot="footer" class="dialog-footer">
     <div slot="footer" class="dialog-footer">
       <el-button @click="close">取 消</el-button>
       <el-button @click="close">取 消</el-button>
-      <el-button type="primary" @click="save">确 定</el-button>
+      <el-button
+        type="primary"
+        style="background: #0187fb; border: none"
+        @click="save"
+      >
+        确 定
+      </el-button>
     </div>
     </div>
   </el-dialog>
   </el-dialog>
 </template>
 </template>

src/views/personnelManagement/userManagement/index.vue

@@ -52,7 +52,11 @@
 
 
       <el-table-column show-overflow-tooltip label="权限">
       <el-table-column show-overflow-tooltip label="权限">
         <template #default="{ row }">
         <template #default="{ row }">
-          <el-tag v-for="(item, index) in row.permissions" :key="index">
+          <el-tag
+            color="#aff"
+            v-for="(item, index) in row.permissions"
+            :key="index"
+          >
             {{ item }}
             {{ item }}
           </el-tag>
           </el-tag>
         </template>
         </template>

src/views/vab/accountInfoConfirm/index.vue

 <template>
 <template>
+  <div class="table-content">
     <el-table border :data="tableData" style="width: 100%">
     <el-table border :data="tableData" style="width: 100%">
       <el-table-column type="expand">
       <el-table-column type="expand">
         <template slot-scope="props">
         <template slot-scope="props">
@@ -74,6 +75,7 @@
         align="center"
         align="center"
       ></el-table-column>
       ></el-table-column>
     </el-table>
     </el-table>
+  </div>
 </template>
 </template>
 
 
 <script>
 <script>
@@ -81,53 +83,12 @@
     name: 'AccountInfoConfirm',
     name: 'AccountInfoConfirm',
     data() {
     data() {
       return {
       return {
-        tableData: [
-          {
-            id: '12987122',
-            name: '好滋好味鸡蛋仔',
-            category: '江浙小吃、小吃零食',
-            desc: '荷兰优质淡奶，奶香浓而不腻',
-            address: '上海市普陀区真北路',
-            shop: '王小虎夫妻店',
-            status: '在线',
-            shopId: '10333',
-          },
-          {
-            id: '12987123',
-            name: '好滋好味鸡蛋仔',
-            category: '江浙小吃、小吃零食',
-            desc: '荷兰优质淡奶，奶香浓而不腻',
-            status: '在线',
-            address: '上海市普陀区真北路',
-            shop: '王小虎夫妻店',
-            shopId: '10333',
-          },
-          {
-            id: '12987125',
-            name: '好滋好味鸡蛋仔',
-            category: '江浙小吃、小吃零食',
-            desc: '荷兰优质淡奶，奶香浓而不腻',
-            address: '上海市普陀区真北路',
-            shop: '王小虎夫妻店',
-            shopId: '10333',
-            status: '在线',
-          },
-          {
-            id: '12987126',
-            name: '好滋好味鸡蛋仔',
-            category: '江浙小吃、小吃零食',
-            desc: '荷兰优质淡奶，奶香浓而不腻',
-            address: '上海市普陀区真北路',
-            shop: '王小虎夫妻店',
-            shopId: '10333',
-            status: '在线',
-          },
-        ],
+        tableData: [],
       }
       }
     },
     },
   }
   }
 </script>
 </script>
-<style>
+<style scope>
   .demo-table-expand {
   .demo-table-expand {
     font-size: 0;
     font-size: 0;
   }
   }
@@ -143,11 +104,11 @@
     width: 50%;
     width: 50%;
   }
   }
 
 
-  .el-table th.el-table__cell {
+  .table-content .el-table th.el-table__cell {
     background: #4091ff;
     background: #4091ff;
   }
   }
 
 
-  .el-table th .cell {
+  .table-content .el-table th .cell {
     color: #fff !important;
     color: #fff !important;
   }
   }
 </style>
 </style>

src/views/vab/accountProtection/index.vue

@@ -23,9 +23,24 @@
               <el-button type="danger" @click="handleClick(scope.row)">
               <el-button type="danger" @click="handleClick(scope.row)">
                 禁用
                 禁用
               </el-button>
               </el-button>
-              <el-button type="primary">付费</el-button>
-              <el-button type="primary">修改</el-button>
-              <el-button type="primary">编辑权限</el-button>
+              <el-button
+                type="primary"
+                style="background: #0187fb; border: none"
+              >
+                付费
+              </el-button>
+              <el-button
+                type="primary"
+                style="background: #0187fb; border: none"
+              >
+                修改
+              </el-button>
+              <el-button
+                type="primary"
+                style="background: #0187fb; border: none"
+              >
+                编辑权限
+              </el-button>
             </template>
             </template>
           </el-table-column>
           </el-table-column>
         </el-table>
         </el-table>

src/views/vab/billDetailsQuery/index.vue

@@ -55,8 +55,12 @@
         <el-input v-model="form.supplierName" style="width: 15.5vw"></el-input>
         <el-input v-model="form.supplierName" style="width: 15.5vw"></el-input>
       </el-form-item>
       </el-form-item>
       <div class="btn_container">
       <div class="btn_container">
-        <el-button type="primary">查询</el-button>
-        <el-button type="primary">下载</el-button>
+        <el-button type="primary" style="background: #0187fb; border: none">
+          查询
+        </el-button>
+        <el-button type="primary" style="background: #0187fb; border: none">
+          下载
+        </el-button>
       </div>
       </div>
     </el-form>
     </el-form>
     <div class="table_container">
     <div class="table_container">
@@ -194,7 +198,7 @@
 
 
   .table_container {
   .table_container {
     border-top: 4px solid #f1f1f1;
     border-top: 4px solid #f1f1f1;
-    padding: 0.5vh 0.5vw;
+    padding: 0.5vh 0;
     box-sizing: border-box;
     box-sizing: border-box;
 
 
     .el-pagination {
     .el-pagination {

src/views/vab/billQuery/index.vue

 <template>
 <template>
   <div>
   <div>
-    <el-form :model="form">
+    <el-form :model="queryParams" class="px-1">
       <el-form-item label="供应商:" style="margin-right: 1vw">
       <el-form-item label="供应商:" style="margin-right: 1vw">
         <div class="supplier_container">
         <div class="supplier_container">
-          <el-input v-model="form.supplier"></el-input>
+          <el-input v-model="queryParams.supplierName" clearable></el-input>
           <i class="el-icon-search"></i>
           <i class="el-icon-search"></i>
         </div>
         </div>
       </el-form-item>
       </el-form-item>
       <el-form-item>
       <el-form-item>
         <el-input
         <el-input
-          v-model="form.supplierName"
+          v-model="queryParams.supplierName"
           disabled
           disabled
-          style="width: 20vw"
+          style="width: 17vw"
+          clearable
         ></el-input>
         ></el-input>
       </el-form-item>
       </el-form-item>
       <el-form-item label="单据类型:">
       <el-form-item label="单据类型:">
         <el-select
         <el-select
-          v-model="form.company"
+          v-model="queryParams.receiptsType"
           style="width: 14vw"
           style="width: 14vw"
           placeholder="请选择单据类型"
           placeholder="请选择单据类型"
-        ></el-select>
+          clearable
+        >
+          <el-option
+            v-for="item in billsTypeList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
       </el-form-item>
       </el-form-item>
       <el-form-item label="事业公司:">
       <el-form-item label="事业公司:">
         <el-select
         <el-select
-          v-model="form.company"
+          v-model="queryParams.company"
+          clearable
           style="width: 14vw"
           style="width: 14vw"
           placeholder="请选择事业公司"
           placeholder="请选择事业公司"
-        ></el-select>
+        >
+          <el-option
+            v-for="item in companyList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
       </el-form-item>
       </el-form-item>
       <el-form-item label="日期区间:">
       <el-form-item label="日期区间:">
         <el-select
         <el-select
-          v-model="form.dateType"
-          style="width: 12vw"
+          v-model="queryParams.timeType"
+          clearable
+          style="width: 7vw; margin-right: 1vw"
           placeholder="请选择日期区间"
           placeholder="请选择日期区间"
-        ></el-select>
-      </el-form-item>
-      <el-form-item>
+        >
+          <el-option
+            v-for="item in dataList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
         <el-date-picker
         <el-date-picker
-          v-model="form.date"
+          v-model="queryParams.date"
+          clearable
           type="daterange"
           type="daterange"
           range-separator="-"
           range-separator="-"
           start-placeholder="开始日期"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           end-placeholder="结束日期"
-          style="width: 25vw"
+          style="width: 18vw"
+          value-format="yyyy-MM-dd"
         ></el-date-picker>
         ></el-date-picker>
       </el-form-item>
       </el-form-item>
+      <!-- <el-form-item>
+        
+      </el-form-item> -->
+      <el-form-item style="margin-left: 1.8vw">
+        <el-checkbox v-model="queryParams.checked">
+          店铺直送单据汇总表示
+        </el-checkbox>
+      </el-form-item>
       <el-form-item label="物流中心:">
       <el-form-item label="物流中心:">
         <el-select
         <el-select
-          v-model="form.company"
-          style="width: 14vw"
+          v-model="queryParams.logisticsName"
+          clearable
+          style="width: 10vw"
           placeholder="请选择物流中心"
           placeholder="请选择物流中心"
-        ></el-select>
+        >
+          <el-option
+            v-for="item in logisticsList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
       </el-form-item>
       </el-form-item>
       <el-form-item label="结算状态:">
       <el-form-item label="结算状态:">
         <el-select
         <el-select
-          v-model="form.company"
-          style="width: 14vw"
+          v-model="queryParams.closeStatus"
+          clearable
+          style="width: 10vw"
           placeholder="请选择结算状态"
           placeholder="请选择结算状态"
-        ></el-select>
+        >
+          <el-option
+            v-for="item in statusList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
       </el-form-item>
       </el-form-item>
       <el-form-item label="门店:" style="margin-right: 1vw">
       <el-form-item label="门店:" style="margin-right: 1vw">
-        <div class="supplier_container" style="width: 12vw">
-          <el-input
-            v-model="form.supplier"
-            placeholder="请输入门店编号"
-          ></el-input>
+        <div class="supplier_container" style="width: 10vw">
+          <el-input clearable placeholder="请输入门店编号"></el-input>
           <i class="el-icon-search"></i>
           <i class="el-icon-search"></i>
         </div>
         </div>
       </el-form-item>
       </el-form-item>
       <el-form-item>
       <el-form-item>
+        <el-input disabled style="width: 12vw"></el-input>
+      </el-form-item>
+
+      <el-form-item label="单据编号:">
         <el-input
         <el-input
-          v-model="form.supplierName"
-          disabled
-          style="width: 12vw"
+          v-model="queryParams.receiptsNumber"
+          style="width: 14vw"
         ></el-input>
         ></el-input>
       </el-form-item>
       </el-form-item>
-      <el-form-item style="margin-left: 4.2vw">
-        <el-checkbox v-model="form.checked">店铺直送单据汇总表示</el-checkbox>
-      </el-form-item>
-      <el-form-item label="单据编号:">
-        <el-input v-model="form.supplierName" style="width: 14vw"></el-input>
+      <el-form-item label="区域事业公司:">
+        <el-select
+          clearable
+          style="width: 14vw"
+          placeholder="请选择区域事业公司"
+          :disabled="true"
+        ></el-select>
       </el-form-item>
       </el-form-item>
       <div class="btn_container">
       <div class="btn_container">
-        <el-button type="primary">查询</el-button>
-        <el-button type="primary">下载</el-button>
+        <el-button
+          type="primary"
+          style="background: #0187fb; border: none"
+          @click="handleSearch"
+        >
+          查询
+        </el-button>
+        <el-button
+          type="primary"
+          style="background: #0187fb; border: none"
+          @click="handleUpload"
+        >
+          下载
+        </el-button>
       </div>
       </div>
     </el-form>
     </el-form>
     <div class="table_container">
     <div class="table_container">
       <div class="money_container">
       <div class="money_container">
         <div class="money_item">
         <div class="money_item">
           <span class="money_title">进货金额(未税) 合计:</span>
           <span class="money_title">进货金额(未税) 合计:</span>
-          <span>0.00</span>
+          <span>
+            {{
+              tableData && tableData[0]
+                ? tableData[0].stockNotMoneyCount
+                : '0.00'
+            }}
+          </span>
         </div>
         </div>
         <div class="money_item">
         <div class="money_item">
           <span class="money_title">税额合计:</span>
           <span class="money_title">税额合计:</span>
-          <span>0.00</span>
+          <span>
+            {{
+              tableData && tableData[0] ? tableData[0].theAmountCount : '0.00'
+            }}
+          </span>
         </div>
         </div>
         <div class="money_item">
         <div class="money_item">
           <span class="money_title">进货金额 (含税) 合计:</span>
           <span class="money_title">进货金额 (含税) 合计:</span>
-          <span>0.00</span>
+          <span>
+            {{
+              tableData && tableData[0] ? tableData[0].stockMoneyCount : '0.00'
+            }}
+          </span>
         </div>
         </div>
       </div>
       </div>
       <el-table
       <el-table
-        :data="table"
+        key="one"
+        v-loading="loading"
+        height="53vh"
+        :data="tableData"
         border
         border
         :header-cell-style="headerStyle"
         :header-cell-style="headerStyle"
         :cell-style="rowStyle"
         :cell-style="rowStyle"
       >
       >
         <el-table-column type="index" label="序号" width="80"></el-table-column>
         <el-table-column type="index" label="序号" width="80"></el-table-column>
-        <el-table-column prop="buyer" label="供应商"></el-table-column>
-        <el-table-column prop="user" label="结算厂编"></el-table-column>
-        <el-table-column prop="content" label="单据类型"></el-table-column>
-        <el-table-column prop="status" label="单据编号"></el-table-column>
-        <el-table-column prop="money" label="账表日"></el-table-column>
         <el-table-column
         <el-table-column
-          prop="purchaseDate"
+          prop="supplierName"
+          label="供应商"
+          width="290"
+        ></el-table-column>
+        <el-table-column prop="closeNo" label="结算厂编"></el-table-column>
+        <el-table-column
+          prop="receiptsType"
+          label="单据类型"
+          width="110"
+        ></el-table-column>
+        <el-table-column
+          prop="receiptsNumber"
+          label="单据编号"
+          width="190"
+        ></el-table-column>
+        <el-table-column
+          prop="fullTime"
+          label="账表日"
+          width="110"
+        ></el-table-column>
+        <el-table-column
+          prop="logisticsName"
           label="物流中心/店铺"
           label="物流中心/店铺"
+          width="190"
+        ></el-table-column>
+        <el-table-column
+          prop="orderTime"
+          label="订购日期"
+          width="110"
+        ></el-table-column>
+        <el-table-column
+          prop="reserveTime"
+          label="预定到货日"
+          width="110"
         ></el-table-column>
         ></el-table-column>
-        <el-table-column prop="eTime" label="订购日期"></el-table-column>
-        <el-table-column prop="way" label="预定到货日"></el-table-column>
-        <el-table-column prop="invoicing" label="验收日期"></el-table-column>
-        <el-table-column prop="invoicing" label="税率"></el-table-column>
         <el-table-column
         <el-table-column
-          prop="invoicing"
+          prop="acceptanceTime"
+          label="验收日期"
+          width="110"
+        ></el-table-column>
+        <el-table-column prop="taxRate" label="税率"></el-table-column>
+        <el-table-column
+          prop="stockNotMoney"
           label="进货金额(未税)"
           label="进货金额(未税)"
         ></el-table-column>
         ></el-table-column>
-        <el-table-column prop="invoicing" label="税额"></el-table-column>
+        <el-table-column prop="theAmount" label="税额"></el-table-column>
+        <el-table-column
+          prop="stockMoney"
+          label="进货税额(含税)"
+        ></el-table-column>
+        <el-table-column prop="closeStatus" label="结算状态"></el-table-column>
+        <el-table-column
+          prop="closeOdd"
+          label="结算单号"
+          width="120"
+        ></el-table-column>
+        <el-table-column
+          prop="area"
+          label="区域事业公司"
+          width="120"
+        ></el-table-column>
       </el-table>
       </el-table>
       <el-pagination
       <el-pagination
-        :current-page="currentPage"
-        :page-sizes="[100, 200, 300, 400]"
-        :page-size="pageSize"
+        :current-page="queryParams.pageNum"
+        :page-sizes="[50, 100, 200, 300]"
+        :page-size="queryParams.pageSize"
         layout="total, sizes, prev, pager, next, jumper"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total"
         :total="total"
         @size-change="handleSizeChange"
         @size-change="handleSizeChange"
@@ -141,29 +265,319 @@
 </template>
 </template>
 
 
 <script>
 <script>
+  import { listRe, uploadBill, downPDFBill } from '../../../api/rebateDetail'
   export default {
   export default {
     name: 'BillQuery',
     name: 'BillQuery',
     data() {
     data() {
       return {
       return {
-        form: {},
-        table: [],
-        currentPage: 1,
-        total: 100,
-        pageSize: 8,
+        tableData: [],
+        total: 0,
+        companyList: [
+          {
+            value: '上海',
+            label: '上海',
+          },
+        ], //公司列表
+        billsTypeList: [
+          {
+            value: '物流进货单',
+            label: '物流进货单',
+          },
+          {
+            value: '物流紧急进货单',
+            label: '物流紧急进货单',
+          },
+          {
+            value: '物流退货单',
+            label: '物流退货单',
+          },
+          {
+            value: '供应商欠货单',
+            label: '供应商欠货单',
+          },
+          {
+            value: '店铺进货单',
+            label: '店铺进货单',
+          },
+          {
+            value: '店铺紧急进货单',
+            label: '店铺紧急进货单',
+          },
+          {
+            value: '物流出库欠货单',
+            label: '物流出库欠货单',
+          },
+          {
+            value: '店铺验收欠货单',
+            label: '店铺验收欠货单',
+          },
+          {
+            value: '店铺进货拒收单',
+            label: '店铺进货拒收单',
+          },
+          {
+            value: '店铺计划退货单',
+            label: '店铺计划退货单',
+          },
+          {
+            value: '店铺不良品退货单',
+            label: '店铺不良品退货单',
+          },
+          {
+            value: '店铺巡回补货单',
+            label: '店铺巡回补货单',
+          },
+          {
+            value: '店铺巡回退货单',
+            label: '店铺巡回退货单',
+          },
+          {
+            value: '店铺香烟进货单',
+            label: '店铺香烟进货单',
+          },
+          {
+            value: '店间转货单',
+            label: '店间转货单',
+          },
+          {
+            value: '店铺赠品入库单',
+            label: '店铺赠品入库单',
+          },
+          {
+            value: '物流库存欠货单(旧)',
+            label: '物流库存欠货单(旧)',
+          },
+          {
+            value: '物流调拨单',
+            label: '物流调拨单',
+          },
+        ],
+        logisticsList: [
+          {
+            value: '800101 上海虹梅常温',
+            label: '800101 上海虹梅常温',
+          },
+          {
+            value: '800102 上海虹梅冷藏',
+            label: '800102 上海虹梅冷藏',
+          },
+          {
+            value: '800103 上海虹梅冷冻',
+            label: '800103 上海虹梅冷冻',
+          },
+          {
+            value: '800201 杭州常温物流',
+            label: '800201 杭州常温物流',
+          },
+          {
+            value: '800202 金山冷藏物流',
+            label: '800202 金山冷藏物流',
+          },
+          {
+            value: '800203 金山冷冻物流',
+            label: '800203 金山冷冻物流',
+          },
+          {
+            value: '800301 江阴常温',
+            label: '800301 江阴常温',
+          },
+          {
+            value: '800302 江阴冷藏',
+            label: '800302 江阴冷藏',
+          },
+          {
+            value: '800303 江阴冷冻',
+            label: '800303 江阴冷冻',
+          },
+          {
+            value: '800401 上海青浦常温',
+            label: '800401 上海青浦常温',
+          },
+          {
+            value: '800402 上海青浦冷藏',
+            label: '800402 上海青浦冷藏',
+          },
+          {
+            value: '800403 上海青浦冷冻',
+            label: '800403 上海青浦冷冻',
+          },
+          {
+            value: '800501 南京常温',
+            label: '800501 南京常温',
+          },
+          {
+            value: '800502 南京冷藏',
+            label: '800502 南京冷藏',
+          },
+          {
+            value: '800503 南京冷冻',
+            label: '800503 南京冷冻',
+          },
+          {
+            value: '800601 上海常温中央仓(红梅)',
+            label: '800601 上海常温中央仓(红梅)',
+          },
+          {
+            value: '900001 直送常温',
+            label: '900001 直送常温',
+          },
+          {
+            value: '900002 直送冷冻',
+            label: '900002 直送冷冻',
+          },
+          {
+            value: '900003 直送冷藏',
+            label: '900003 直送冷藏',
+          },
+          {
+            value: '900004 上海直送香烟',
+            label: '900004 上海直送香烟',
+          },
+          {
+            value: '900005 江苏直送香烟',
+            label: '900005 江苏直送香烟',
+          },
+          {
+            value: '900006 浙江直送香烟',
+            label: '900006 浙江直送香烟',
+          },
+          {
+            value: '900007 浙江香烟-吉森',
+            label: '900007 浙江香烟-吉森',
+          },
+          {
+            value: '900008 浙江香烟-和华',
+            label: '900008 浙江香烟-和华',
+          },
+          {
+            value: '900009 上海代售香烟',
+            label: '900009 上海代售香烟',
+          },
+        ],
+        statusList: [
+          {
+            value: '未对账',
+            label: '未对账',
+          },
+          {
+            value: '已对账',
+            label: '已对账',
+          },
+          {
+            value: '已特损',
+            label: '已特损',
+          },
+        ],
+        dataList: [
+          {
+            value: '1账表日',
+            label: '1账表日',
+          },
+          {
+            value: '2验收日',
+            label: '2验收日',
+          },
+          {
+            value: '3预定到货日',
+            label: '3预定到货日',
+          },
+        ],
+        queryParams: {
+          pageNum: 1,
+          pageSize: 50,
+          supplierName: '', //供应商
+          receiptsType: '', //单据类型
+          fullTimeStart: '', //账表月开始时间
+          fullTimeEnd: '', //账表月结束时间
+          logisticsName: '', //物流中心店铺
+          receiptsNumber: '', //单据编号
+          closeStatus: '', //结算状态
+          timeType: '', //日期区间
+          date: [],
+          checked: false,
+          company: '上海',
+        },
+        loading: false,
+        fixedHeight: 400,
       }
       }
     },
     },
+    //获取屏幕高度
+
+    beforeMount() {
+      var h =
+        document.documentElement.clientHeight || document.body.clientHeight
+      console.log(h - this.fixedHeight, '大什么呢')
+      this.tableHeight = h - this.fixedHeight
+    },
     methods: {
     methods: {
+      // 获取列表
+      getBillList() {
+        this.loading = true
+        listRe(this.queryParams)
+          .then((res) => {
+            this.tableData = res.data.list
+            this.total = res.data.totalRecord
+          })
+          .finally(() => {
+            this.loading = false
+          })
+      },
       headerStyle() {
       headerStyle() {
         return 'background:#409eff;text-align:center;color:#fff;'
         return 'background:#409eff;text-align:center;color:#fff;'
       },
       },
       rowStyle() {
       rowStyle() {
-        return 'text-align:center;'
+        // return 'text-align:center;'
       },
       },
+      //切换每页数据事件
       handleSizeChange(val) {
       handleSizeChange(val) {
-        this.pageSize = val
+        this.queryParams.pageSize = val
+        this.getBillList()
       },
       },
+      //修改当前页码
       handleCurrentChange(val) {
       handleCurrentChange(val) {
-        this.currentPage = val
+        this.queryParams.pageNum = val
+        this.getBillList()
+      },
+      // 查询
+      handleSearch() {
+        let indexDate = new Date(this.queryParams.date[0]).getTime()
+        let tipsDate = new Date('2022-09-01').getTime()
+        console.log(indexDate < tipsDate, '搭建')
+        if (indexDate < tipsDate) {
+          this.$confirm('没有查询到结果', '提示', {
+            confirmButtonText: '确定',
+            type: 'warning',
+            showCancelButton: false,
+          })
+            .then(() => {})
+            .catch(() => {})
+        } else {
+          console.log('大于')
+        }
+        this.getBillList()
+      },
+      // 下载
+      handleUpload() {
+        let self = this
+        downPDFBill().then((res) => {
+          // console.log('=========downPDFTitleGet', res)
+          if (res.data.code === 200) {
+            self.uploadRebateAxios(res.data.msg)
+          }
+        })
+      },
+      uploadRebateAxios(title) {
+        uploadBill(this.queryParams).then((res) => {
+          let blob = new Blob([res.data], { type: res.data.type })
+          let downloadElement = document.createElement('a')
+          let href = window.URL.createObjectURL(blob)
+          downloadElement.href = href
+          downloadElement.download = title
+          document.body.appendChild(downloadElement)
+          downloadElement.click()
+          document.body.removeChild(downloadElement) //移除元素；防止连续点击创建多个a标签
+          window.URL.revokeObjectURL(href)
+        })
       },
       },
     },
     },
   }
   }
@@ -178,7 +592,7 @@
     box-sizing: border-box;
     box-sizing: border-box;
 
 
     .btn_container {
     .btn_container {
-      margin-left: 5vw;
+      margin-left: 3vw;
       line-height: 4vh;
       line-height: 4vh;
     }
     }
 
 
@@ -186,11 +600,13 @@
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
       height: 4vh;
       height: 4vh;
+      margin-right: 1vw;
 
 
       .el-form-item__label {
       .el-form-item__label {
         font-size: calc(100vh * 28 / 1920);
         font-size: calc(100vh * 28 / 1920);
         font-weight: bold;
         font-weight: bold;
-        width: 6vw;
+
+        // width: 7vw;
       }
       }
 
 
       .el-input__inner {
       .el-input__inner {
@@ -226,7 +642,7 @@
 
 
   .table_container {
   .table_container {
     border-top: 4px solid #f1f1f1;
     border-top: 4px solid #f1f1f1;
-    padding: 0.5vh 0.5vw;
+    padding: 0.5vh 0;
     box-sizing: border-box;
     box-sizing: border-box;
 
 
     .el-pagination {
     .el-pagination {
@@ -262,4 +678,7 @@
   ::v-deep .el-table td .cell {
   ::v-deep .el-table td .cell {
     font-size: calc(100vh * 24 / 1920);
     font-size: calc(100vh * 24 / 1920);
   }
   }
+  ::v-deep .el-table .cell {
+    line-height: normal !important;
+  }
 </style>
 </style>

src/views/vab/directOrder/index.vue

@@ -32,7 +32,9 @@
     </el-form>
     </el-form>
     <div class="btn_container">
     <div class="btn_container">
       <el-button type="success">汇总下载</el-button>
       <el-button type="success">汇总下载</el-button>
-      <el-button type="primary">明细下载</el-button>
+      <el-button type="primary" style="background: #0187fb; border: none">
+        明细下载
+      </el-button>
       <el-button type="info">明细Excel下载</el-button>
       <el-button type="info">明细Excel下载</el-button>
       <el-button type="info">打印订单批量下载</el-button>
       <el-button type="info">打印订单批量下载</el-button>
     </div>
     </div>

src/views/vab/editor/index.vue

@@ -18,8 +18,20 @@
         ></vab-quill>
         ></vab-quill>
       </el-form-item>
       </el-form-item>
       <el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="handleSee">预览效果</el-button>
-        <el-button type="primary" @click="handleSave">保存</el-button>
+        <el-button
+          type="primary"
+          style="background: #0187fb; border: none"
+          @click="handleSee"
+        >
+          预览效果
+        </el-button>
+        <el-button
+          type="primary"
+          style="background: #0187fb; border: none"
+          @click="handleSave"
+        >
+          保存
+        </el-button>
       </el-form-item>
       </el-form-item>
     </el-form>
     </el-form>
     <el-dialog title="预览效果" :visible.sync="dialogTableVisible">
     <el-dialog title="预览效果" :visible.sync="dialogTableVisible">

src/views/vab/element/index.vue

@@ -2,7 +2,11 @@
   <div class="element-container">
   <div class="element-container">
     <el-row :gutter="20">
     <el-row :gutter="20">
       <el-col :xs="24" :sm="24" :md="18" :lg="18" :xl="16">
       <el-col :xs="24" :sm="24" :md="18" :lg="18" :xl="16">
-        <el-button type="primary" @click="dialogVisible = !dialogVisible">
+        <el-button
+          type="primary"
+          style="background: #0187fb; border: none"
+          @click="dialogVisible = !dialogVisible"
+        >
           element全部文档点这里
           element全部文档点这里
         </el-button>
         </el-button>
         <el-dialog
         <el-dialog
@@ -100,44 +104,93 @@
           </a>
           </a>
         </el-divider>
         </el-divider>
         <el-button>默认按钮</el-button>
         <el-button>默认按钮</el-button>
-        <el-button type="primary">主要按钮</el-button>
+        <el-button type="primary" style="background: #0187fb; border: none">
+          主要按钮
+        </el-button>
         <el-button type="success">成功按钮</el-button>
         <el-button type="success">成功按钮</el-button>
         <el-button type="info">信息按钮</el-button>
         <el-button type="info">信息按钮</el-button>
         <el-button type="warning">警告按钮</el-button>
         <el-button type="warning">警告按钮</el-button>
         <el-button type="danger">危险按钮</el-button>
         <el-button type="danger">危险按钮</el-button>
         <el-button plain>朴素按钮</el-button>
         <el-button plain>朴素按钮</el-button>
-        <el-button type="primary" plain>主要按钮</el-button>
+        <el-button
+          type="primary"
+          style="background: #0187fb; border: none"
+          plain
+        >
+          主要按钮
+        </el-button>
         <el-button type="success" plain>成功按钮</el-button>
         <el-button type="success" plain>成功按钮</el-button>
         <el-button type="info" plain>信息按钮</el-button>
         <el-button type="info" plain>信息按钮</el-button>
         <el-button type="warning" plain>警告按钮</el-button>
         <el-button type="warning" plain>警告按钮</el-button>
         <el-button type="danger" plain>危险按钮</el-button>
         <el-button type="danger" plain>危险按钮</el-button>
         <el-button round>圆角按钮</el-button>
         <el-button round>圆角按钮</el-button>
-        <el-button type="primary" round>主要按钮</el-button>
+        <el-button
+          type="primary"
+          style="background: #0187fb; border: none"
+          round
+        >
+          主要按钮
+        </el-button>
         <el-button type="success" round>成功按钮</el-button>
         <el-button type="success" round>成功按钮</el-button>
         <el-button type="info" round>信息按钮</el-button>
         <el-button type="info" round>信息按钮</el-button>
         <el-button type="warning" round>警告按钮</el-button>
         <el-button type="warning" round>警告按钮</el-button>
         <el-button type="danger" round>危险按钮</el-button>
         <el-button type="danger" round>危险按钮</el-button>
         <el-button icon="el-icon-search" circle></el-button>
         <el-button icon="el-icon-search" circle></el-button>
-        <el-button type="primary" icon="el-icon-edit" circle></el-button>
+        <el-button
+          type="primary"
+          style="background: #0187fb; border: none"
+          icon="el-icon-edit"
+          circle
+        ></el-button>
         <el-button type="success" icon="el-icon-check" circle></el-button>
         <el-button type="success" icon="el-icon-check" circle></el-button>
         <el-button type="info" icon="el-icon-message" circle></el-button>
         <el-button type="info" icon="el-icon-message" circle></el-button>
         <el-button type="warning" icon="el-icon-star-off" circle></el-button>
         <el-button type="warning" icon="el-icon-star-off" circle></el-button>
         <el-button type="danger" icon="el-icon-delete" circle></el-button>
         <el-button type="danger" icon="el-icon-delete" circle></el-button>
         <el-button disabled>默认按钮</el-button>
         <el-button disabled>默认按钮</el-button>
-        <el-button type="primary" disabled>主要按钮</el-button>
+        <el-button
+          type="primary"
+          style="background: #0187fb; border: none"
+          disabled
+        >
+          主要按钮
+        </el-button>
         <el-button type="success" disabled>成功按钮</el-button>
         <el-button type="success" disabled>成功按钮</el-button>
         <el-button type="info" disabled>信息按钮</el-button>
         <el-button type="info" disabled>信息按钮</el-button>
         <el-button type="warning" disabled>警告按钮</el-button>
         <el-button type="warning" disabled>警告按钮</el-button>
         <el-button type="danger" disabled>危险按钮</el-button>
         <el-button type="danger" disabled>危险按钮</el-button>
-        <el-button type="primary" icon="el-icon-edit"></el-button>
-        <el-button type="primary" icon="el-icon-share"></el-button>
-        <el-button type="primary" icon="el-icon-delete"></el-button>
-        <el-button type="primary" icon="el-icon-search">搜索</el-button>
-        <el-button type="primary">
+        <el-button
+          type="primary"
+          style="background: #0187fb; border: none"
+          icon="el-icon-edit"
+        ></el-button>
+        <el-button
+          type="primary"
+          style="background: #0187fb; border: none"
+          icon="el-icon-share"
+        ></el-button>
+        <el-button
+          type="primary"
+          style="background: #0187fb; border: none"
+          icon="el-icon-delete"
+        ></el-button>
+        <el-button
+          type="primary"
+          style="background: #0187fb; border: none"
+          icon="el-icon-search"
+        >
+          搜索
+        </el-button>
+        <el-button type="primary" style="background: #0187fb; border: none">
           上传
           上传
           <i class="el-icon-upload el-icon--right"></i>
           <i class="el-icon-upload el-icon--right"></i>
         </el-button>
         </el-button>
-        <el-button type="primary" :loading="true">加载中</el-button>
+        <el-button
+          type="primary"
+          style="background: #0187fb; border: none"
+          :loading="true"
+        >
+          加载中
+        </el-button>
 
 
         <el-divider content-position="left">
         <el-divider content-position="left">
           文字链接
           文字链接

src/views/vab/errorLog/index.vue

@@ -3,7 +3,11 @@
     <el-divider content-position="left">
     <el-divider content-position="left">
       这里会在顶部navbar上模拟一个控制台错误日志
       这里会在顶部navbar上模拟一个控制台错误日志
     </el-divider>
     </el-divider>
-    <el-button type="primary" @click="handleError">
+    <el-button
+      type="primary"
+      style="background: #0187fb; border: none"
+      @click="handleError"
+    >
       点击模拟一个chuzhixinjiayou的错误
       点击模拟一个chuzhixinjiayou的错误
     </el-button>
     </el-button>
     <error-test v-if="show" />
     <error-test v-if="show" />

src/views/vab/form/index.vue

@@ -39,7 +39,11 @@
             <el-input v-model="ruleForm.desc" type="textarea"></el-input>
             <el-input v-model="ruleForm.desc" type="textarea"></el-input>
           </el-form-item>
           </el-form-item>
           <el-form-item>
           <el-form-item>
-            <el-button type="primary" @click="submitForm('ruleForm')">
+            <el-button
+              type="primary"
+              style="background: #0187fb; border: none"
+              @click="submitForm('ruleForm')"
+            >
               立即创建
               立即创建
             </el-button>
             </el-button>
             <el-button @click="resetForm('ruleForm')">重置</el-button>
             <el-button @click="resetForm('ruleForm')">重置</el-button>

src/views/vab/getOrder/detail.vue

+<template>
+  <div class="container">
+    <div class="d-flex">
+      <div class="span-3">
+        <div class="d-flex">
+          <div class="left-title-text">供应商：</div>
+          <div>{{ detailData.supplierName }}</div>
+        </div>
+        <div class="d-flex">
+          <div class="left-title-text">主单号：</div>
+          <div>{{ detailData.dhNumber }}</div>
+        </div>
+        <div class="d-flex">
+          <div class="left-title-text">单类：</div>
+          <div>{{ detailData.dlType }}</div>
+        </div>
+        <div class="d-flex">
+          <div class="left-title-text">订货日期：</div>
+          <div>{{ detailData.dhTime }}</div>
+        </div>
+        <div class="d-flex">
+          <div class="left-title-text">交货预订日：</div>
+          <div>{{ detailData.jhTime }}</div>
+        </div>
+      </div>
+      <div class="span-3">
+        <div class="d-flex">
+          <div class="left-title-text">收货单位：</div>
+          <div>{{ detailData.shUnit }}</div>
+        </div>
+        <div class="d-flex">
+          <div class="left-title-text">仓库名称：</div>
+          <div>{{ detailData.ckName }}</div>
+        </div>
+        <div class="d-flex">
+          <div class="left-title-text">仓库地址：</div>
+          <div>{{ detailData.ckAddress }}</div>
+        </div>
+        <div class="d-flex">
+          <div class="left-title-text">仓库备注：</div>
+          <div></div>
+        </div>
+        <div class="d-flex">
+          <div class="left-title-text">供应商电话：</div>
+          <div></div>
+        </div>
+      </div>
+    </div>
+    <div class="btn_container">
+      <el-pagination
+        :current-page="currentPage"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="pageSize"
+        layout="sizes, prev, pager, next, jumper"
+        :total="total"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      ></el-pagination>
+      <el-button
+        size="mini"
+        type="primary"
+        @click="handleExport"
+        style="background: #0187fb; border: none"
+      >
+        报表
+      </el-button>
+      <el-button size="mini">刷新</el-button>
+    </div>
+    <el-table
+      :data="table"
+      :header-cell-style="headerStyle"
+      :cell-style="rowStyle"
+    >
+      <el-table-column type="index" label="序号" width="80"></el-table-column>
+      <el-table-column prop="spNumber" label="商品编码"></el-table-column>
+      <el-table-column prop="txNumber" label="条形码"></el-table-column>
+      <el-table-column prop="goodsName" label="商品名称"></el-table-column>
+      <el-table-column
+        prop="dgUnitNum"
+        label="基本订购单位数"
+      ></el-table-column>
+      <el-table-column prop="xiangNum" label="箱数"></el-table-column>
+      <el-table-column prop="hanMoney" label="含税进价"></el-table-column>
+      <el-table-column prop="hanShouMoney" label="含税售价"></el-table-column>
+      <el-table-column prop="num" label="数量"></el-table-column>
+      <el-table-column prop="unit" label="单位"></el-table-column>
+      <el-table-column
+        prop="purchasingMoney"
+        label="进价金额"
+      ></el-table-column>
+      <el-table-column prop="sellingMoney" label="售价金额"></el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+  import { detailPage, uploadDetail } from '../../../api/purchase'
+
+  export default {
+    name: 'GetOrder',
+    data() {
+      return {
+        form: {
+          company: '',
+          supplier: '',
+          main: '',
+          receive: '',
+          type: '',
+          status: '',
+          orderDate: '',
+          deliveryDate: '',
+        },
+        table: [],
+        currentPage: 1,
+        pageSize: 8,
+        total: 0,
+        detailData: {},
+      }
+    },
+    created() {
+      console.log(this.$route.query)
+      this.detailData = this.$route.query
+      this.detailPageAxios()
+    },
+    methods: {
+      detailPageAxios() {
+        detailPage({
+          dhNumber: this.detailData.dhNumber,
+          pageSize: this.pageSize,
+          pageNum: this.currentPage,
+        }).then((res) => {
+          console.log(res, 'Dsanm ')
+          if (res.data && res.data.list && res.data.list.length) {
+            this.table = res.data.list
+            this.total = res.data.totalRecord
+          }
+        })
+      },
+      handleSizeChange(val) {
+        this.pageSize = val
+        this.detailPageAxios()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        this.detailPageAxios()
+      },
+      headerStyle() {
+        return 'text-align:center;'
+      },
+      rowStyle() {
+        return 'text-align:right;'
+      },
+      //导入按钮事件
+      handleExport() {
+        let data = {
+          supplierName: this.detailData.supplierName,
+          shUnit: this.detailData.shUnit,
+          dhNumber: this.detailData.dhNumber,
+          ckName: this.detailData.ckName,
+          dlType: this.detailData.dlType,
+          ckAddress: this.detailData.ckAddress,
+          dhTime: this.detailData.dhTime,
+          jhTime: this.detailData.jhTime,
+          list: this.table,
+        }
+        uploadDetail(data).then((res) => {
+          console.log(res, '下载')
+          let blob = new Blob([res.data], { type: res.data.type })
+          let downloadElement = document.createElement('a')
+          let href = window.URL.createObjectURL(blob)
+          downloadElement.href = href
+          document.body.appendChild(downloadElement)
+          downloadElement.click()
+          document.body.removeChild(downloadElement) //移除元素；防止连续点击创建多个a标签
+          window.URL.revokeObjectURL(href)
+        })
+      },
+    },
+  }
+</script>
+
+<style lang="scss" scoped>
+  .d-flex {
+    display: flex;
+  }
+  .span-3 {
+    width: 33%;
+  }
+  .span-3 .d-flex:nth-child(odd) {
+    margin: 20px 0;
+  }
+  .left-title-text {
+    width: 100px;
+    text-align: right;
+  }
+  .container::v-deep {
+    padding: 1.5vh 1vw;
+    box-sizing: border-box;
+
+    .el-form {
+      width: 89%;
+      display: flex;
+      flex-wrap: wrap;
+
+      .el-form-item {
+        width: 50%;
+        display: flex;
+        align-items: center;
+        height: 4vh;
+
+        .el-form-item__label {
+          font-size: calc(100vh * 28 / 1920);
+          font-weight: bold;
+          width: 5.5vw;
+        }
+
+        .el-input__inner {
+          font-size: calc(100vh * 26 / 1920);
+          height: 3.5vh;
+        }
+
+        .supplier_container {
+          display: flex;
+          align-items: center;
+          width: 25vw;
+          height: 3.5vh;
+          border: 1px solid #dcdfe6;
+          border-radius: 4px;
+
+          .left_supplier {
+            width: 89%;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+
+            .el-input__inner {
+              border: none;
+            }
+
+            i {
+              font-size: calc(100vh * 32 / 1920);
+              margin-right: 0.8vw;
+            }
+          }
+
+          .right_supplier {
+            border-left: 1px solid #dcdfe6;
+            width: 11%;
+            height: 100%;
+            background: #f1f1f1;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+
+            i {
+              font-size: calc(100vh * 32 / 1920);
+            }
+          }
+        }
+      }
+    }
+
+    .tip_content {
+      width: 81%;
+      display: flex;
+      justify-content: space-between;
+      .left_tip {
+        font-size: calc(100vh * 45 / 1920);
+      }
+      .right_tip {
+        font-size: calc(100vh * 30 / 1920);
+        color: #e60000;
+      }
+    }
+    .btn_container {
+      display: flex;
+      align-items: center;
+      .el-pagination {
+        text-align: left;
+        margin-bottom: 1.5vh;
+        width: 75%;
+      }
+      .el-button {
+        width: 4vw;
+        height: 3vh;
+        line-height: 3vh;
+        padding: 0;
+      }
+    }
+  }
+  ::v-deep .el-table th .cell {
+    font-size: calc(100vh * 28 / 1920);
+  }
+  ::v-deep .el-table td .cell {
+    font-size: calc(100vh * 24 / 1920);
+  }
+</style>

src/views/vab/getOrder/index.vue

 <template>
 <template>
   <div class="container">
   <div class="container">
-    <el-form :model="form">
+    <el-form :model="queryParams">
       <el-form-item label="事业公司:">
       <el-form-item label="事业公司:">
         <el-select
         <el-select
-          v-model="form.company"
+          v-model="queryParams.company"
           placeholder="请选择事业公司"
           placeholder="请选择事业公司"
-          style="width: 25vw"
+          style="width: 20vw"
         >
         >
-          <!-- <el-option></el-option> -->
+          <el-option
+            v-for="item in companyList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
         </el-select>
         </el-select>
       </el-form-item>
       </el-form-item>
       <el-form-item label="供应商:">
       <el-form-item label="供应商:">
         <div class="supplier_container">
         <div class="supplier_container">
           <div class="left_supplier">
           <div class="left_supplier">
-            <el-input v-model="form.supplier"></el-input>
+            <el-input v-model="queryParams.supplierName"></el-input>
             <i class="el-icon-edit"></i>
             <i class="el-icon-edit"></i>
           </div>
           </div>
           <div class="right_supplier">
           <div class="right_supplier">
@@ -22,132 +27,374 @@
         </div>
         </div>
       </el-form-item>
       </el-form-item>
       <el-form-item label="主单号:">
       <el-form-item label="主单号:">
-        <el-input v-model="form.main" style="width: 25vw"></el-input>
+        <el-input v-model="queryParams.dhNumber" style="width: 20vw"></el-input>
       </el-form-item>
       </el-form-item>
       <el-form-item label="收货单位:">
       <el-form-item label="收货单位:">
         <el-select
         <el-select
-          v-model="form.receive"
+          v-model="queryParams.shUnit"
           placeholder="请选择收货单位"
           placeholder="请选择收货单位"
-          style="width: 25vw"
-        ></el-select>
+          style="width: 20vw"
+        >
+          <el-option
+            v-for="item in shLocalList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
       </el-form-item>
       </el-form-item>
       <el-form-item label="单类:">
       <el-form-item label="单类:">
         <el-select
         <el-select
-          v-model="form.type"
+          v-model="queryParams.dlType"
           placeholder="请选择单类"
           placeholder="请选择单类"
-          style="width: 25vw"
-        ></el-select>
+          style="width: 20vw"
+        >
+          <el-option
+            v-for="item in danList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
       </el-form-item>
       </el-form-item>
       <el-form-item label="主单状态:">
       <el-form-item label="主单状态:">
         <el-select
         <el-select
-          v-model="form.status"
+          v-model="queryParams.zdStatus"
           placeholder="请选择状态"
           placeholder="请选择状态"
-          style="width: 25vw"
-        ></el-select>
+          style="width: 20vw"
+        >
+          <el-option
+            v-for="item in zhuStatusList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
+        <span class="right_tip">
+          * 如需查询历史单据，请修改“订货日”日期
+          <!-- *如需下载EXCEL，请点击[单号] 进入主单查询，再点击[报表] -->
+        </span>
       </el-form-item>
       </el-form-item>
       <el-form-item label="订货日:">
       <el-form-item label="订货日:">
         <el-date-picker
         <el-date-picker
-          v-model="form.orderDate"
+          v-model="queryParams.orderDate"
           type="daterange"
           type="daterange"
           range-separator="-"
           range-separator="-"
           start-placeholder="开始日期"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           end-placeholder="结束日期"
-          style="width: 25vw"
+          style="width: 20vw"
         ></el-date-picker>
         ></el-date-picker>
       </el-form-item>
       </el-form-item>
       <el-form-item label="交货预定日:">
       <el-form-item label="交货预定日:">
         <el-date-picker
         <el-date-picker
-          v-model="form.deliveryDate"
+          v-model="queryParams.deliveryDate"
           type="daterange"
           type="daterange"
           range-separator="-"
           range-separator="-"
           start-placeholder="开始日期"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           end-placeholder="结束日期"
-          style="width: 25vw"
+          style="width: 20vw"
         ></el-date-picker>
         ></el-date-picker>
-      </el-form-item>
-    </el-form>
-    <div class="tip_content">
-      <span class="left_tip">2022年12月16日订单已经可以正常下载</span>
         <span class="right_tip">
         <span class="right_tip">
           *如需下载EXCEL，请点击[单号] 进入主单查询，再点击[报表]
           *如需下载EXCEL，请点击[单号] 进入主单查询，再点击[报表]
         </span>
         </span>
+      </el-form-item>
+    </el-form>
+    <div class="tip_content">
+      <span class="left_tip">{{ getNowDate() }}订单已经可以正常下载</span>
     </div>
     </div>
     <div class="btn_container">
     <div class="btn_container">
       <el-pagination
       <el-pagination
-        :current-page="currentPage"
-        :page-sizes="[100, 200, 300, 400]"
-        :page-size="pageSize"
+        :current-page="queryParams.pageNum"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="queryParams.pageSize"
         layout="sizes, prev, pager, next, jumper"
         layout="sizes, prev, pager, next, jumper"
         :total="total"
         :total="total"
         @size-change="handleSizeChange"
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         @current-change="handleCurrentChange"
       ></el-pagination>
       ></el-pagination>
-      <el-button type="primary">查询</el-button>
+      <el-button
+        type="primary"
+        style="background: #0187fb; border: none"
+        @click="handleSearch"
+      >
+        查询
+      </el-button>
     </div>
     </div>
     <el-table
     <el-table
-      :data="table"
+      v-loading="loading"
+      :data="tableDate"
       border
       border
       :header-cell-style="headerStyle"
       :header-cell-style="headerStyle"
       :cell-style="rowStyle"
       :cell-style="rowStyle"
+      height="42vh"
     >
     >
       <el-table-column type="index" label="序号" width="80"></el-table-column>
       <el-table-column type="index" label="序号" width="80"></el-table-column>
-      <el-table-column prop="orderDate" label="订货日"></el-table-column>
-      <el-table-column prop="deliveryDate" label="交货预定日"></el-table-column>
-      <el-table-column prop="mainStatus" label="主单状态"></el-table-column>
-      <el-table-column prop="branchStatus" label="分单状态"></el-table-column>
-      <el-table-column prop="type" label="单类"></el-table-column>
-      <el-table-column prop="number" label="单号"></el-table-column>
-      <el-table-column prop="factoryNo" label="结算厂编"></el-table-column>
-      <el-table-column prop="supplier" label="供应商"></el-table-column>
-      <el-table-column prop="receive" label="收货单位"></el-table-column>
-      <el-table-column prop="storeName" label="仓库名称"></el-table-column>
-      <el-table-column prop="address" label="仓库地址"></el-table-column>
-      <el-table-column prop="money" label="进价金额"></el-table-column>
-      <el-table-column prop="branchOrder" label="分单"></el-table-column>
-      <el-table-column label="操作"></el-table-column>
+      <el-table-column prop="dhTime" label="订货日"></el-table-column>
+      <el-table-column prop="jhTime" label="交货预定日"></el-table-column>
+      <el-table-column prop="zdStatus" label="主单状态"></el-table-column>
+      <el-table-column prop="fdStatus" label="分单状态" align="center">
+        <template slot-scope="scope">
+          <div v-if="scope.row.fdStatus">{{ scope.row.fdStatus }}</div>
+          <div v-else>-</div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="dlType" label="单类"></el-table-column>
+      <el-table-column prop="dhNumber" label="单号">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            style="color: #0187fb; border: none"
+            @click="handleDetail(scope.row)"
+          >
+            {{ scope.row.dhNumber }}
+          </el-button>
+        </template>
+      </el-table-column>
+      <el-table-column prop="closeNumber" label="结算厂编"></el-table-column>
+      <el-table-column prop="supplierName" label="供应商"></el-table-column>
+      <el-table-column prop="shUnit" label="收货单位"></el-table-column>
+      <el-table-column prop="ckName" label="仓库名称"></el-table-column>
+      <el-table-column prop="ckAddress" label="仓库地址"></el-table-column>
+      <el-table-column prop="jinMoney" label="进价金额"></el-table-column>
+      <el-table-column prop="fd" label="分单" align="center">
+        <template slot-scope="scope">
+          <div v-if="scope.row.fd">{{ scope.row.fd }}</div>
+          <div v-else>-</div>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作">
+        <el-button type="text">主单下载</el-button>
+      </el-table-column>
     </el-table>
     </el-table>
+    <!-- <button @click="handleDetail">行</button> -->
   </div>
   </div>
 </template>
 </template>
 
 
 <script>
 <script>
+  import { orderList } from '../../../api/purchase'
   export default {
   export default {
     name: 'GetOrder',
     name: 'GetOrder',
     data() {
     data() {
       return {
       return {
-        form: {
-          company: '',
-          supplier: '',
-          main: '',
-          receive: '',
-          type: '',
-          status: '',
-          orderDate: '',
-          deliveryDate: '',
-        },
-        table: [],
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          dhTimeStart: '', //订货日开始时间
+          dhTimeEnd: '', //订货日结束时间
+          supplierName: '', //供应商
+          dhNumber: '', // 主单号
+          shUnit: '', //收货单位
+          dlType: '', // 单类
+          zdStatus: '', //主单状态
+          jhTimeStart: '', //交货预定日开始时间
+          jhTimeEnd: '', //交货预定日结束时间
+          orderDate: [], //交货
+          deliveryDate: [], //订货
+          company: '上海',
+        },
+        tableDate: [],
         currentPage: 1,
         currentPage: 1,
-        pageSize: 8,
-        total: 100,
+        pageSize: 10,
+        total: 0,
+        companyList: [
+          {
+            value: '上海',
+            label: '上海',
+          },
+        ],
+        shLocalList: [
+          {
+            value: '上海虹梅常温',
+            label: '上海虹梅常温',
+          },
+          {
+            value: '上海虹梅冷藏',
+            label: '上海虹梅冷藏',
+          },
+          {
+            value: '上海虹梅冷冻',
+            label: '上海虹梅冷冻',
+          },
+          {
+            value: '杭州常温物流',
+            label: '杭州常温物流',
+          },
+          {
+            value: '金山冷藏物流',
+            label: '金山冷藏物流',
+          },
+          {
+            value: '金山冷冻物流',
+            label: '金山冷冻物流',
+          },
+          {
+            value: '江阴常温',
+            label: '江阴常温',
+          },
+          {
+            value: '江阴冷藏',
+            label: '江阴冷藏',
+          },
+          {
+            value: '江阴冷冻',
+            label: '江阴冷冻',
+          },
+          {
+            value: '上海青浦常温',
+            label: '上海青浦常温',
+          },
+          {
+            value: '上海青浦冷藏',
+            label: '上海青浦冷藏',
+          },
+          {
+            value: '上海青浦冷冻',
+            label: '上海青浦冷冻',
+          },
+          {
+            value: '南京常温',
+            label: '南京常温',
+          },
+          {
+            value: '南京冷藏',
+            label: '南京冷藏',
+          },
+          {
+            value: '南京冷冻',
+            label: '南京冷冻',
+          },
+          {
+            value: '上海常温中央仓(红梅)',
+            label: '上海常温中央仓(红梅)',
+          },
+          {
+            value: '直送常温',
+            label: '直送常温',
+          },
+          {
+            value: '直送冷冻',
+            label: '直送冷冻',
+          },
+          {
+            value: '直送冷藏',
+            label: '直送冷藏',
+          },
+          {
+            value: '上海直送香烟',
+            label: '900004 上海直送香烟',
+          },
+          {
+            value: '江苏直送香烟',
+            label: '江苏直送香烟',
+          },
+          {
+            value: '浙江直送香烟',
+            label: '浙江直送香烟',
+          },
+          {
+            value: '浙江香烟-吉森',
+            label: '浙江香烟-吉森',
+          },
+          {
+            value: '浙江香烟-和华',
+            label: '浙江香烟-和华',
+          },
+          {
+            value: '上海代售香烟',
+            label: '上海代售香烟',
+          },
+        ],
+        zhuStatusList: [
+          {
+            value: '未下载',
+            label: '未下载',
+          },
+          {
+            value: '已下载',
+            label: '已下载',
+          },
+        ],
+        danList: [
+          {
+            value: '物流进货单',
+            label: '物流进货单',
+          },
+          {
+            value: '物流紧急进货单',
+            label: '物流紧急进货单',
+          },
+          {
+            value: '物流退货单',
+            label: '物流退货单',
+          },
+          {
+            value: '供应商欠货单',
+            label: '供应商欠货单',
+          },
+        ],
+        loading: false,
       }
       }
     },
     },
+    mounted() {
+      this.getNowDate()
+    },
     methods: {
     methods: {
+      //获取列表
+      getOrderList() {
+        this.loading = true
+        orderList(this.queryParams)
+          .then((res) => {
+            console.log(res.data, '段时间客户端')
+            this.tableDate = res.data.list
+            this.total = res.data.totalRecord
+          })
+          .finally(() => {
+            this.loading = false
+          })
+      },
       handleSizeChange(val) {
       handleSizeChange(val) {
-        this.pageSize = val
+        this.queryParams.pageSize = val
+        this.getOrderList()
       },
       },
       handleCurrentChange(val) {
       handleCurrentChange(val) {
-        this.currentPage = val
+        this.queryParams.pageNum = val
+        this.getOrderList()
       },
       },
       headerStyle() {
       headerStyle() {
         return 'text-align:center;'
         return 'text-align:center;'
       },
       },
       rowStyle() {
       rowStyle() {
-        return 'text-align:center;'
+        // return 'text-align:center;'
+      },
+      handleDetail(info) {
+        console.log(info.dhNumber, '段时间看看')
+        this.$router.push({
+          path: 'orderDetail',
+          query: info,
+        })
+      },
+      handleSearch() {
+        this.getOrderList()
+      },
+      getNowDate() {
+        const timeOne = new Date()
+        const year = timeOne.getFullYear()
+        let month = timeOne.getMonth() + 1
+        let day = timeOne.getDate()
+        month = month < 10 ? '0' + month : month
+        day = day < 10 ? '0' + day : day
+        const NOW_MONTHS_AGO = `${year}年${month}月${day}日`
+        return NOW_MONTHS_AGO
       },
       },
     },
     },
   }
   }
 </script>
 </script>
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>
+  .right_tip {
+    font-size: calc(100vh * 30 / 1920);
+    color: #e60000;
+  }
   .container::v-deep {
   .container::v-deep {
     padding: 1.5vh 1vw;
     padding: 1.5vh 1vw;
     box-sizing: border-box;
     box-sizing: border-box;
@@ -158,7 +405,7 @@
       flex-wrap: wrap;
       flex-wrap: wrap;
 
 
       .el-form-item {
       .el-form-item {
-        width: 50%;
+        // width: 40%;
         display: flex;
         display: flex;
         align-items: center;
         align-items: center;
         height: 4vh;
         height: 4vh;
@@ -222,10 +469,6 @@
       .left_tip {
       .left_tip {
         font-size: calc(100vh * 45 / 1920);
         font-size: calc(100vh * 45 / 1920);
       }
       }
-      .right_tip {
-        font-size: calc(100vh * 30 / 1920);
-        color: #e60000;
-      }
     }
     }
     .btn_container {
     .btn_container {
       display: flex;
       display: flex;

src/views/vab/kong/a.vue

+<template>
+  <div>暂无法访问，请联系管理员</div>
+</template>
+
+<script>
+  export default {}
+</script>
+
+<style lang="stylus" scoped></style>

src/views/vab/kong/aa.vue

+<template>
+  <div>暂无法访问，请联系管理员</div>
+</template>
+
+<script>
+  export default {}
+</script>
+
+<style lang="stylus" scoped></style>

src/views/vab/kong/b.vue

+<template>
+  <div>暂无法访问，请联系管理员</div>
+</template>
+
+<script>
+  export default {}
+</script>
+
+<style lang="stylus" scoped></style>

src/views/vab/kong/bb.vue

+<template>
+  <div>暂无法访问，请联系管理员</div>
+</template>
+
+<script>
+  export default {}
+</script>
+
+<style lang="stylus" scoped></style>

src/views/vab/kong/c.vue

+<template>
+  <div class="">暂无法访问，请联系管理员</div>
+</template>
+
+<script>
+  export default {}
+</script>
+
+<style lang="stylus" scoped></style>

src/views/vab/kong/cc.vue

+<template>
+  <div>暂无法访问，请联系管理员</div>
+</template>
+
+<script>
+  export default {}
+</script>
+
+<style lang="stylus" scoped></style>

src/views/vab/loading/index.vue

 <template>
 <template>
   <div class="loading-container">
   <div class="loading-container">
     <el-divider content-position="left">传统loading</el-divider>
     <el-divider content-position="left">传统loading</el-divider>
-    <el-button type="primary" @click="handleLoading()">默认效果</el-button>
-    <el-button type="primary" @click="handleLoading(1)">效果1</el-button>
-    <el-button type="primary" @click="handleLoading(2)">效果2</el-button>
-    <el-button type="primary" @click="handleLoading(3)">效果3</el-button>
-    <el-button type="primary" @click="handleLoading(4)">效果4</el-button>
-    <el-button type="primary" @click="handleLoading(5)">效果5</el-button>
-    <el-button type="primary" @click="handleLoading(6)">效果6</el-button>
-    <el-button type="primary" @click="handleLoading(7)">效果7</el-button>
-    <el-button type="primary" @click="handleLoading(8)">效果8</el-button>
-    <el-button type="primary" @click="handleLoading(9)">效果9</el-button>
+    <el-button
+      type="primary"
+      style="background: #0187fb; border: none"
+      @click="handleLoading()"
+    >
+      默认效果
+    </el-button>
+    <el-button
+      type="primary"
+      style="background: #0187fb; border: none"
+      @click="handleLoading(1)"
+    >
+      效果1
+    </el-button>
+    <el-button
+      type="primary"
+      style="background: #0187fb; border: none"
+      @click="handleLoading(2)"
+    >
+      效果2
+    </el-button>
+    <el-button
+      type="primary"
+      style="background: #0187fb; border: none"
+      @click="handleLoading(3)"
+    >
+      效果3
+    </el-button>
+    <el-button
+      type="primary"
+      style="background: #0187fb; border: none"
+      @click="handleLoading(4)"
+    >
+      效果4
+    </el-button>
+    <el-button
+      type="primary"
+      style="background: #0187fb; border: none"
+      @click="handleLoading(5)"
+    >
+      效果5
+    </el-button>
+    <el-button
+      type="primary"
+      style="background: #0187fb; border: none"
+      @click="handleLoading(6)"
+    >
+      效果6
+    </el-button>
+    <el-button
+      type="primary"
+      style="background: #0187fb; border: none"
+      @click="handleLoading(7)"
+    >
+      效果7
+    </el-button>
+    <el-button
+      type="primary"
+      style="background: #0187fb; border: none"
+      @click="handleLoading(8)"
+    >
+      效果8
+    </el-button>
+    <el-button
+      type="primary"
+      style="background: #0187fb; border: none"
+      @click="handleLoading(9)"
+    >
+      效果9
+    </el-button>
     <br />
     <br />
     <br />
     <br />
     <br />
     <br />
     <el-divider content-position="left">多彩loading</el-divider>
     <el-divider content-position="left">多彩loading</el-divider>
-    <el-button type="primary" @click="handleColorfullLoading(1)">
+    <el-button
+      type="primary"
+      style="background: #0187fb; border: none"
+      @click="handleColorfullLoading(1)"
+    >
       效果1
       效果1
     </el-button>
     </el-button>
-    <el-button type="primary" @click="handleColorfullLoading(2)">
+    <el-button
+      type="primary"
+      style="background: #0187fb; border: none"
+      @click="handleColorfullLoading(2)"
+    >
       效果2
       效果2
     </el-button>
     </el-button>
-    <el-button type="primary" @click="handleColorfullLoading(3)">
+    <el-button
+      type="primary"
+      style="background: #0187fb; border: none"
+      @click="handleColorfullLoading(3)"
+    >
       效果3
       效果3
     </el-button>
     </el-button>
-    <el-button type="primary" @click="handleColorfullLoading(4)">
+    <el-button
+      type="primary"
+      style="background: #0187fb; border: none"
+      @click="handleColorfullLoading(4)"
+    >
       效果4
       效果4
     </el-button>
     </el-button>
   </div>
   </div>

src/views/vab/notAccount/index.vue

+<template>
+  <div>暂无法访问，请联系管理员</div>
+</template>
+
+<script>
+  export default {}
+</script>
+
+<style lang="stylus" scoped></style>

src/views/vab/orderProgress/detail.vue

+<template>
+  <div class="container">
+    <div class="d-flex">
+      <div class="span-3">
+        <div class="d-flex">
+          <div class="left-title-text">供应商：</div>
+          <div>{{ detailData.supplierName }}</div>
+        </div>
+
+        <div class="d-flex">
+          <div class="left-title-text">门店：</div>
+          <div></div>
+        </div>
+      </div>
+      <div class="span-3">
+        <div class="d-flex">
+          <div class="left-title-text">物流中心：</div>
+          <div></div>
+        </div>
+        <div class="d-flex">
+          <div class="left-title-text">单据编号:</div>
+          <div>{{ detailData.djNumber }}</div>
+        </div>
+      </div>
+    </div>
+    <div class="btn_container">
+      <el-pagination
+        :current-page="currentPage"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="pageSize"
+        layout="sizes, prev, pager, next, jumper"
+        :total="total"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      ></el-pagination>
+      <el-button
+        size="mini"
+        type="primary"
+        style="background: #0187fb; border: none"
+        @click="handleExport"
+      >
+        下载
+      </el-button>
+    </div>
+    <div class="d-flex j-sb my-2">
+      <div>
+        进货金额(未税)合计：{{
+          table && table[0] ? table[0].jhMoneyCount : '0.00'
+        }}
+      </div>
+      <div>
+        税额合计：{{ table && table[0] ? table[0].shuieCount : '0.00' }}
+      </div>
+      <div>
+        进货金额(含税)合计:{{
+          table && table[0] ? table[0].jhHanMoneyCount : '0.00'
+        }}
+      </div>
+    </div>
+    <el-table
+      :data="table"
+      :header-cell-style="headerStyle"
+      :cell-style="rowStyle"
+    >
+      <el-table-column type="index" label="序号" width="80"></el-table-column>
+      <el-table-column prop="huohao" label="货号"></el-table-column>
+      <el-table-column prop="pinming" label="品名"></el-table-column>
+      <el-table-column prop="dgNum" label="订购数"></el-table-column>
+      <el-table-column prop="ysNum" label="验收数"></el-table-column>
+      <el-table-column prop="cyNum" label="差异数"></el-table-column>
+      <el-table-column prop="jinjia" label="进价"></el-table-column>
+      <el-table-column prop="jhMoney" label="进货金额(未税)"></el-table-column>
+      <el-table-column prop="shuie" label="税额"></el-table-column>
+      <el-table-column
+        prop="jhHanMoney"
+        label="进货金额(含税)"
+      ></el-table-column>
+      <el-table-column prop="guige" label="规格"></el-table-column>
+      <el-table-column prop="dgUnit" label="订购单位"></el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+  import {
+    progressDetail,
+    proDetailUpload,
+    proDetailUploadName,
+  } from '../../../api/purchase'
+
+  export default {
+    name: 'GetOrder',
+    data() {
+      return {
+        form: {
+          company: '',
+          supplier: '',
+          main: '',
+          receive: '',
+          type: '',
+          status: '',
+          orderDate: '',
+          deliveryDate: '',
+        },
+        table: [],
+        currentPage: 1,
+        pageSize: 8,
+        total: 0,
+        detailData: {},
+      }
+    },
+    created() {
+      console.log(this.$route.query, '大数据可能的卡萨')
+      this.detailData = this.$route.query
+      this.detailPageAxios()
+    },
+    methods: {
+      detailPageAxios() {
+        progressDetail({
+          djNumber: this.detailData.djNumber,
+          pageSize: this.pageSize,
+          pageNum: this.currentPage,
+        }).then((res) => {
+          console.log(res, '的时间啊看大家啊看 ')
+          if (res.data && res.data.list && res.data.list.length) {
+            this.table = res.data.list
+            this.total = res.data.totalRecord
+          }
+        })
+      },
+      handleSizeChange(val) {
+        this.pageSize = val
+        this.detailPageAxios()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        this.detailPageAxios()
+      },
+      headerStyle() {
+        return 'text-align:center;'
+      },
+      rowStyle() {
+        return 'text-align:right;'
+      },
+      //导入按钮事件
+      // handleExport() {
+      //   console.log('大家啊三年级')
+      //   proDetailUpload({ list: this.table }).then((res) => {
+      //     console.log(res, '下载')
+      //     let blob = new Blob([res.data], { type: res.data.type })
+      //     let downloadElement = document.createElement('a')
+      //     let href = window.URL.createObjectURL(blob)
+      //     downloadElement.href = href
+      //     document.body.appendChild(downloadElement)
+      //     downloadElement.click()
+      //     document.body.removeChild(downloadElement) //移除元素；防止连续点击创建多个a标签
+      //     window.URL.revokeObjectURL(href)
+      //   })
+      // },
+      handleExport() {
+        let self = this
+        proDetailUploadName({ djNumber: this.detailData.djNumber }).then(
+          (res) => {
+            // console.log('=========downPDFTitleGet', res)
+            if (res.data.code === 200) {
+              self.uploadRebateAxios(res.data.msg)
+            }
+          }
+        )
+      },
+      uploadRebateAxios(title) {
+        proDetailUpload({ list: this.table }).then((res) => {
+          console.log(res, '但')
+          let blob = new Blob([res.data], {
+            type: res.data.type,
+          })
+          let downloadElement = document.createElement('a')
+          let href = window.URL.createObjectURL(blob)
+          downloadElement.href = href
+          downloadElement.download = title
+          document.body.appendChild(downloadElement)
+          downloadElement.click()
+          document.body.removeChild(downloadElement) //移除元素；防止连续点击创建多个a标签
+          window.URL.revokeObjectURL(href)
+        })
+      },
+    },
+  }
+</script>
+
+<style lang="scss" scoped>
+  .d-flex {
+    display: flex;
+  }
+  .j-sb {
+    justify-content: space-between;
+  }
+  .my-2 {
+    margin: 10px 0;
+  }
+  .span-3 {
+    width: 33%;
+  }
+  .span-3 .d-flex:nth-child(odd) {
+    margin: 20px 0;
+  }
+  .left-title-text {
+    width: 100px;
+    text-align: right;
+  }
+  .container::v-deep {
+    padding: 1.5vh 1vw;
+    box-sizing: border-box;
+
+    .el-form {
+      width: 89%;
+      display: flex;
+      flex-wrap: wrap;
+
+      .el-form-item {
+        width: 50%;
+        display: flex;
+        align-items: center;
+        height: 4vh;
+
+        .el-form-item__label {
+          font-size: calc(100vh * 28 / 1920);
+          font-weight: bold;
+          width: 5.5vw;
+        }
+
+        .el-input__inner {
+          font-size: calc(100vh * 26 / 1920);
+          height: 3.5vh;
+        }
+
+        .supplier_container {
+          display: flex;
+          align-items: center;
+          width: 25vw;
+          height: 3.5vh;
+          border: 1px solid #dcdfe6;
+          border-radius: 4px;
+
+          .left_supplier {
+            width: 89%;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+
+            .el-input__inner {
+              border: none;
+            }
+
+            i {
+              font-size: calc(100vh * 32 / 1920);
+              margin-right: 0.8vw;
+            }
+          }
+
+          .right_supplier {
+            border-left: 1px solid #dcdfe6;
+            width: 11%;
+            height: 100%;
+            background: #f1f1f1;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+
+            i {
+              font-size: calc(100vh * 32 / 1920);
+            }
+          }
+        }
+      }
+    }
+
+    .tip_content {
+      width: 81%;
+      display: flex;
+      justify-content: space-between;
+      .left_tip {
+        font-size: calc(100vh * 45 / 1920);
+      }
+      .right_tip {
+        font-size: calc(100vh * 30 / 1920);
+        color: #e60000;
+      }
+    }
+    .btn_container {
+      display: flex;
+      align-items: center;
+      .el-pagination {
+        text-align: left;
+        margin-bottom: 1.5vh;
+        width: 75%;
+      }
+      .el-button {
+        width: 4vw;
+        height: 3vh;
+        line-height: 3vh;
+        padding: 0;
+      }
+    }
+  }
+  ::v-deep .el-table th .cell {
+    font-size: calc(100vh * 28 / 1920);
+  }
+  ::v-deep .el-table td .cell {
+    font-size: calc(100vh * 24 / 1920);
+  }
+</style>

src/views/vab/orderProgress/index.vue

@@ -3,7 +3,7 @@
     <el-form :model="form">
     <el-form :model="form">
       <el-form-item label="供应商:" style="margin-right: 0.6vw">
       <el-form-item label="供应商:" style="margin-right: 0.6vw">
         <div class="supplier_container">
         <div class="supplier_container">
-          <el-input v-model="form.supplier"></el-input>
+          <el-input v-model="form.supplier" clearable></el-input>
           <i class="el-icon-search"></i>
           <i class="el-icon-search"></i>
         </div>
         </div>
       </el-form-item>
       </el-form-item>
@@ -17,6 +17,7 @@
       <el-form-item label="事业公司:">
       <el-form-item label="事业公司:">
         <el-select
         <el-select
           v-model="form.company"
           v-model="form.company"
+          clearable
           style="width: 12vw"
           style="width: 12vw"
           placeholder="请选择事业公司"
           placeholder="请选择事业公司"
         ></el-select>
         ></el-select>
@@ -24,89 +25,159 @@
       <el-form-item label="物流中心:">
       <el-form-item label="物流中心:">
         <el-select
         <el-select
           v-model="form.logistics"
           v-model="form.logistics"
+          clearable
           style="width: 16vw"
           style="width: 16vw"
           placeholder="请选择物流中心"
           placeholder="请选择物流中心"
-        ></el-select>
+        >
+          <el-option
+            v-for="item in logisticsList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
       </el-form-item>
       </el-form-item>
       <el-form-item label="日期区间:">
       <el-form-item label="日期区间:">
         <el-select
         <el-select
           v-model="form.dateType"
           v-model="form.dateType"
+          clearable
           style="width: 12vw"
           style="width: 12vw"
           placeholder="请选择日期区间"
           placeholder="请选择日期区间"
-        ></el-select>
+        >
+          <el-option
+            v-for="item in yanshoyList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
       </el-form-item>
       </el-form-item>
       <el-form-item>
       <el-form-item>
         <el-date-picker
         <el-date-picker
           v-model="form.date"
           v-model="form.date"
+          clearable
           type="daterange"
           type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
           style="width: 25vw"
           style="width: 25vw"
+          value-format="yyyy-MM-dd"
+          @change="changeDate"
         ></el-date-picker>
         ></el-date-picker>
       </el-form-item>
       </el-form-item>
-      <el-form-item label="城市:">
+      <el-form-item label="城市:" clearable>
         <el-select
         <el-select
           v-model="form.city"
           v-model="form.city"
+          clearable
           style="width: 12vw"
           style="width: 12vw"
           placeholder="请选择城市"
           placeholder="请选择城市"
-        ></el-select>
+        >
+          <el-option
+            v-for="item in cityList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
       </el-form-item>
       </el-form-item>
       <el-form-item label="门店:">
       <el-form-item label="门店:">
         <div class="supplier_container">
         <div class="supplier_container">
-          <el-input v-model="form.store"></el-input>
+          <el-input v-model="form.store" clearable></el-input>
           <i class="el-icon-search"></i>
           <i class="el-icon-search"></i>
         </div>
         </div>
       </el-form-item>
       </el-form-item>
       <el-form-item label="罗森订单号:">
       <el-form-item label="罗森订单号:">
-        <el-input v-model="form.lawSonOrder" style="width: 12vw"></el-input>
+        <el-input
+          v-model="form.lawSonOrder"
+          clearable
+          style="width: 12vw"
+        ></el-input>
       </el-form-item>
       </el-form-item>
       <el-form-item label="供应商单号:">
       <el-form-item label="供应商单号:">
-        <el-input v-model="form.supplierOrder" style="width: 12vw"></el-input>
+        <el-input
+          v-model="form.supplierOrder"
+          clearable
+          style="width: 12vw"
+        ></el-input>
       </el-form-item>
       </el-form-item>
       <el-form-item label="状态:">
       <el-form-item label="状态:">
         <el-select
         <el-select
           v-model="form.city"
           v-model="form.city"
+          clearable
           style="width: 12vw"
           style="width: 12vw"
           placeholder="请选择状态"
           placeholder="请选择状态"
-        ></el-select>
+        >
+          <el-option
+            v-for="item in statusList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
       </el-form-item>
       </el-form-item>
       <span class="tip">只提供查询近2个月 (上月和本月)的订单明细</span>
       <span class="tip">只提供查询近2个月 (上月和本月)的订单明细</span>
       <div class="btn_container">
       <div class="btn_container">
-        <el-button type="primary">查询</el-button>
-        <el-button type="primary">下载</el-button>
+        <el-button
+          type="primary"
+          style="background: #0187fb; border: none"
+          @click="handleSearch"
+        >
+          查询
+        </el-button>
+        <el-button
+          type="primary"
+          style="background: #0187fb; border: none"
+          @click="handleUpload"
+        >
+          下载
+        </el-button>
       </div>
       </div>
     </el-form>
     </el-form>
     <div class="table_container">
     <div class="table_container">
       <el-table
       <el-table
+        v-loading="loading"
         :data="table"
         :data="table"
         border
         border
         :header-cell-style="headerStyle"
         :header-cell-style="headerStyle"
         :cell-style="rowStyle"
         :cell-style="rowStyle"
+        height="52vh"
       >
       >
         <el-table-column type="index" label="序号" width="80"></el-table-column>
         <el-table-column type="index" label="序号" width="80"></el-table-column>
-        <el-table-column prop="payment" label="供应商编号"></el-table-column>
-        <el-table-column prop="buyer" label="供应商"></el-table-column>
-        <el-table-column prop="user" label="送货地址"></el-table-column>
-        <el-table-column prop="content" label="进/退"></el-table-column>
-        <el-table-column prop="status" label="单据编号"></el-table-column>
-        <el-table-column prop="money" label="预定送货日"></el-table-column>
-        <el-table-column prop="purchaseDate" label="验收日"></el-table-column>
-        <el-table-column prop="eTime" label="应送品相数"></el-table-column>
-        <el-table-column prop="way" label="实收品相数"></el-table-column>
         <el-table-column
         <el-table-column
-          prop="invoicing"
+          prop="supplierNumber"
+          label="供应商编号"
+        ></el-table-column>
+        <el-table-column prop="supplierName" label="供应商"></el-table-column>
+        <el-table-column
+          prop="deliverAddress"
+          label="送货地址"
+        ></el-table-column>
+        <el-table-column prop="jtType" label="进/退"></el-table-column>
+        <el-table-column prop="djNumber" label="单据编号">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              style="color: #0187fb"
+              @click="handleDetail(scope.row)"
+            >
+              {{ scope.row.djNumber }}
+            </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column prop="ydTime" label="预定送货日"></el-table-column>
+        <el-table-column prop="ysTime" label="验收日"></el-table-column>
+        <el-table-column prop="yspNum" label="应送品相数"></el-table-column>
+        <el-table-column prop="ssNum" label="实收品相数"></el-table-column>
+        <el-table-column
+          prop="ysGoodsNum"
           label="应送商品数量"
           label="应送商品数量"
         ></el-table-column>
         ></el-table-column>
         <el-table-column
         <el-table-column
-          prop="invoicing"
+          prop="ssGoodsNum"
           label="实收商品数量"
           label="实收商品数量"
         ></el-table-column>
         ></el-table-column>
-        <el-table-column prop="invoicing" label="入账日"></el-table-column>
+        <el-table-column prop="rzTime" label="入账日"></el-table-column>
       </el-table>
       </el-table>
       <el-pagination
       <el-pagination
         :current-page="currentPage"
         :current-page="currentPage"
-        :page-sizes="[100, 200, 300, 400]"
+        :page-sizes="[10, 20, 50, 100]"
         :page-size="pageSize"
         :page-size="pageSize"
         layout="total, sizes, prev, pager, next, jumper"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total"
         :total="total"
@@ -118,16 +189,23 @@
 </template>
 </template>
 
 
 <script>
 <script>
+  import {
+    orderProcgress,
+    progressExport,
+    progressUploadName,
+  } from '../../../api/purchase'
+
   export default {
   export default {
     name: 'OrderProgress',
     name: 'OrderProgress',
     data() {
     data() {
       return {
       return {
+        loading: false,
         form: {
         form: {
           supplier: '',
           supplier: '',
           supplierName: '',
           supplierName: '',
           company: '',
           company: '',
           logistics: '',
           logistics: '',
-          date: '',
+          date: [],
           dateType: '',
           dateType: '',
           city: '',
           city: '',
           store: '',
           store: '',
@@ -137,11 +215,239 @@
         },
         },
         table: [],
         table: [],
         currentPage: 1,
         currentPage: 1,
-        total: 100,
-        pageSize: 8,
+        total: 0,
+        pageSize: 10,
+        logisticsList: [
+          {
+            value: '800101 上海虹梅常温',
+            label: '800101 上海虹梅常温',
+          },
+          {
+            value: '800102 上海虹梅冷藏',
+            label: '800102 上海虹梅冷藏',
+          },
+          {
+            value: '800103 上海虹梅冷冻',
+            label: '800103 上海虹梅冷冻',
+          },
+          {
+            value: '800201 杭州常温物流',
+            label: '800201 杭州常温物流',
+          },
+          {
+            value: '800202 金山冷藏物流',
+            label: '800202 金山冷藏物流',
+          },
+          {
+            value: '800203 金山冷冻物流',
+            label: '800203 金山冷冻物流',
+          },
+          {
+            value: '800301 江阴常温',
+            label: '800301 江阴常温',
+          },
+          {
+            value: '800302 江阴冷藏',
+            label: '800302 江阴冷藏',
+          },
+          {
+            value: '800303 江阴冷冻',
+            label: '800303 江阴冷冻',
+          },
+          {
+            value: '800401 上海青浦常温',
+            label: '800401 上海青浦常温',
+          },
+          {
+            value: '800402 上海青浦冷藏',
+            label: '800402 上海青浦冷藏',
+          },
+          {
+            value: '800403 上海青浦冷冻',
+            label: '800403 上海青浦冷冻',
+          },
+          {
+            value: '800501 南京常温',
+            label: '800501 南京常温',
+          },
+          {
+            value: '800502 南京冷藏',
+            label: '800502 南京冷藏',
+          },
+          {
+            value: '800503 南京冷冻',
+            label: '800503 南京冷冻',
+          },
+          {
+            value: '800601 上海常温中央仓(红梅)',
+            label: '800601 上海常温中央仓(红梅)',
+          },
+          {
+            value: '900001 直送常温',
+            label: '900001 直送常温',
+          },
+          {
+            value: '900002 直送冷冻',
+            label: '900002 直送冷冻',
+          },
+          {
+            value: '900003 直送冷藏',
+            label: '900003 直送冷藏',
+          },
+          {
+            value: '900004 上海直送香烟',
+            label: '900004 上海直送香烟',
+          },
+          {
+            value: '900005 江苏直送香烟',
+            label: '900005 江苏直送香烟',
+          },
+          {
+            value: '900006 浙江直送香烟',
+            label: '900006 浙江直送香烟',
+          },
+          {
+            value: '900007 浙江香烟-吉森',
+            label: '900007 浙江香烟-吉森',
+          },
+          {
+            value: '900008 浙江香烟-和华',
+            label: '900008 浙江香烟-和华',
+          },
+          {
+            value: '900009 上海代售香烟',
+            label: '900009 上海代售香烟',
+          },
+        ],
+        statusList: [
+          {
+            value: '待验收',
+            label: '待验收',
+          },
+          {
+            value: '已验收',
+            label: '已验收',
+          },
+          {
+            value: '已入账',
+            label: '已入账',
+          },
+        ],
+        yanshoyList: [
+          {
+            value: '送货日',
+            label: '送货日',
+          },
+          {
+            value: '验收日',
+            label: '验收日',
+          },
+          {
+            value: '确认日',
+            label: '确认日',
+          },
+        ],
+        cityList: [
+          {
+            value: '上海',
+            label: '上海',
+          },
+          {
+            value: '苏州',
+            label: '苏州',
+          },
+          {
+            value: '无锡',
+            label: '无锡',
+          },
+          {
+            value: '嘉兴',
+            label: '嘉兴',
+          },
+          {
+            value: '杭州',
+            label: '杭州',
+          },
+          {
+            value: '宁波',
+            label: '宁波',
+          },
+          {
+            value: '镇江',
+            label: '镇江',
+          },
+          {
+            value: '常州',
+            label: '常州',
+          },
+          {
+            value: '江阴',
+            label: '江阴',
+          },
+          {
+            value: '张家巷',
+            label: '张家巷',
+          },
+          {
+            value: '南京',
+            label: '南京',
+          },
+          {
+            value: '昆山',
+            label: '昆山',
+          },
+          {
+            value: '绍兴',
+            label: '绍兴',
+          },
+          {
+            value: '扬州',
+            label: '扬州',
+          },
+          {
+            value: '湖州',
+            label: '湖州',
+          },
+          {
+            value: '常熟',
+            label: '常熟',
+          },
+          {
+            value: '高速',
+            label: '高速',
+          },
+        ],
       }
       }
     },
     },
     methods: {
     methods: {
+      changeDate(e) {
+        console.log(e, '大胜靠德么')
+        this.$set(this.form, 'date', e)
+      },
+      getProgressList() {
+        this.loading = true
+        let startTime =
+          this.form.date && this.form.date[0] ? this.form.date[0] : ''
+        let endTime =
+          this.form.date && this.form.date[1] ? this.form.date[1] : ''
+        let query = {
+          pageSize: this.pageSize,
+          pageNum: this.currentPage,
+          startTime: startTime,
+          endTime: endTime,
+        }
+        orderProcgress(query)
+          .then((res) => {
+            if (res.data && res.data.list && res.data.list.length) {
+              this.table = res.data.list
+              this.total = res.data.totalRecord
+            }
+            console.log(res, '进度')
+          })
+          .finally(() => {
+            this.loading = false
+          })
+      },
       headerStyle() {
       headerStyle() {
         return 'background:#409eff;text-align:center;color:#fff;'
         return 'background:#409eff;text-align:center;color:#fff;'
       },
       },
@@ -150,9 +456,54 @@
       },
       },
       handleSizeChange(val) {
       handleSizeChange(val) {
         this.pageSize = val
         this.pageSize = val
+        this.getProgressList()
       },
       },
       handleCurrentChange(val) {
       handleCurrentChange(val) {
         this.currentPage = val
         this.currentPage = val
+        this.getProgressList()
+      },
+      handleSearch() {
+        this.getProgressList()
+      },
+      handleUpload() {
+        let self = this
+        progressUploadName().then((res) => {
+          // console.log('=========downPDFTitleGet', res)
+          if (res.data.code === 200) {
+            self.uploadRebateAxios(res.data.msg)
+          }
+        })
+      },
+      uploadRebateAxios(title) {
+        let startTime =
+          this.form.date && this.form.date[0] ? this.form.date[0] : ''
+        let endTime =
+          this.form.date && this.form.date[1] ? this.form.date[1] : ''
+        let queryParams = {
+          startTime: startTime,
+          endTime: endTime,
+        }
+        progressExport(queryParams).then((res) => {
+          console.log(res, '但')
+          let blob = new Blob([res.data], {
+            type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+          })
+          let downloadElement = document.createElement('a')
+          let href = window.URL.createObjectURL(blob)
+          downloadElement.href = href
+          downloadElement.download = title
+          document.body.appendChild(downloadElement)
+          downloadElement.click()
+          document.body.removeChild(downloadElement) //移除元素；防止连续点击创建多个a标签
+          window.URL.revokeObjectURL(href)
+        })
+      },
+      handleDetail(info) {
+        console.log('想去')
+        this.$router.push({
+          path: 'ProgressDetail',
+          query: info,
+        })
       },
       },
     },
     },
   }
   }
@@ -222,7 +573,7 @@
   }
   }
   .table_container {
   .table_container {
     border-top: 4px solid #f1f1f1;
     border-top: 4px solid #f1f1f1;
-    padding: 0.5vh 0.5vw;
+    padding: 0.5vh 0;
     box-sizing: border-box;
     box-sizing: border-box;
     .el-pagination {
     .el-pagination {
       text-align: left;
       text-align: left;

src/views/vab/permissions/index.vue

@@ -14,7 +14,11 @@
       </el-form-item>
       </el-form-item>
 
 
       <el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="handleChangePermission">
+        <el-button
+          type="primary"
+          style="background: #0187fb; border: none"
+          @click="handleChangePermission"
+        >
           切换权限
           切换权限
         </el-button>
         </el-button>
       </el-form-item>
       </el-form-item>

src/views/vab/profitDetailsQuery/index.vue

 <template>
 <template>
   <div>
   <div>
-    <el-form :model="form">
-      <el-form-item label="供应商:" style="margin-right: 0.6vw">
+    <el-form :model="queryForm" class="px-1">
+      <el-form-item
+        label="供应商:"
+        style="margin-right: 0.3vw"
+        prop="supplierName"
+      >
         <div class="supplier_container">
         <div class="supplier_container">
-          <el-input v-model="form.supplier"></el-input>
+          <el-input v-model="queryForm.supplierName"></el-input>
           <i class="el-icon-search"></i>
           <i class="el-icon-search"></i>
         </div>
         </div>
       </el-form-item>
       </el-form-item>
       <el-form-item>
       <el-form-item>
         <el-input
         <el-input
-          v-model="form.supplierName"
-          disabled
+          v-model="queryForm.supplierName"
+          clearable
+          :disabled="true"
           style="width: 20vw"
           style="width: 20vw"
         ></el-input>
         ></el-input>
       </el-form-item>
       </el-form-item>
       <el-form-item label="事业公司:">
       <el-form-item label="事业公司:">
         <el-select
         <el-select
-          v-model="form.company"
+          v-model="queryForm.company"
+          clearable
           style="width: 12vw"
           style="width: 12vw"
           placeholder="请选择事业公司"
           placeholder="请选择事业公司"
-        ></el-select>
+        >
+          <el-option
+            v-for="item in companyList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
       </el-form-item>
       </el-form-item>
       <el-form-item label="返利类型:">
       <el-form-item label="返利类型:">
         <el-select
         <el-select
-          v-model="form.type"
+          v-model="queryForm.rebateType"
+          clearable
           style="width: 12vw"
           style="width: 12vw"
           placeholder="请选择返利类型"
           placeholder="请选择返利类型"
-        ></el-select>
+        >
+          <el-option
+            v-for="item in rebateTypeList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
       </el-form-item>
       </el-form-item>
       <el-form-item label="账表月:">
       <el-form-item label="账表月:">
         <el-date-picker
         <el-date-picker
-          v-model="form.date"
+          v-model="queryForm.date"
           type="monthrange"
           type="monthrange"
           range-separator="-"
           range-separator="-"
           start-placeholder="开始日期"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           end-placeholder="结束日期"
-          style="width: 25vw"
+          style="width: 17vw"
+          value-format="yyyy-MM"
         ></el-date-picker>
         ></el-date-picker>
       </el-form-item>
       </el-form-item>
       <el-form-item label="采购组:">
       <el-form-item label="采购组:">
         <el-select
         <el-select
-          v-model="form.purchaseGroup"
-          style="width: 24vw"
+          v-model="queryForm.purchaseGroup"
+          clearable
+          style="width: 14vw"
           placeholder="请选择采购组"
           placeholder="请选择采购组"
+        >
+          <el-option
+            v-for="item in purchaseGroupList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="区域事业公司:">
+        <el-select
+          v-model="queryForm.purchaseGroup"
+          clearable
+          style="width: 15vw"
+          placeholder="请选择区域事业公司"
+          :disabled="true"
         ></el-select>
         ></el-select>
       </el-form-item>
       </el-form-item>
       <el-form-item label="票扣/账扣:">
       <el-form-item label="票扣/账扣:">
         <el-select
         <el-select
-          v-model="form.bill"
+          v-model="queryForm.ticketKou"
+          clearable
           style="width: 12vw"
           style="width: 12vw"
           placeholder="请选择票扣/账扣"
           placeholder="请选择票扣/账扣"
-        ></el-select>
+        >
+          <el-option
+            v-for="item in ticketKouList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
       </el-form-item>
       </el-form-item>
       <el-form-item label="返利项目:">
       <el-form-item label="返利项目:">
         <el-select
         <el-select
-          v-model="form.project"
-          style="width: 16vw"
+          v-model="queryForm.rebateProject"
+          clearable
+          style="width: 14vw"
           placeholder="请选择返利项目"
           placeholder="请选择返利项目"
-        ></el-select>
+        >
+          <el-option
+            v-for="item in rebateProjectList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
       </el-form-item>
       </el-form-item>
       <el-form-item label="支付方式:">
       <el-form-item label="支付方式:">
         <el-select
         <el-select
-          v-model="form.payWay"
+          v-model="queryForm.paymentType"
+          clearable
           style="width: 14vw"
           style="width: 14vw"
           placeholder="请选择支付方式"
           placeholder="请选择支付方式"
-        ></el-select>
+        >
+          <el-option
+            v-for="item in paymentTypeList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
       </el-form-item>
       </el-form-item>
       <el-form-item label="应付状态:">
       <el-form-item label="应付状态:">
         <el-select
         <el-select
-          v-model="form.status"
+          v-model="queryForm.dealStatus"
+          clearable
           style="width: 12vw"
           style="width: 12vw"
           placeholder="请选择应付状态"
           placeholder="请选择应付状态"
-        ></el-select>
+        >
+          <el-option
+            v-for="item in dealStatusList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
       </el-form-item>
       </el-form-item>
       <div class="btn_container">
       <div class="btn_container">
-        <el-button type="primary">查询</el-button>
-        <el-button type="primary">下载</el-button>
+        <el-button
+          type="primary"
+          style="background: #0187fb; border: none"
+          @click="handleSearch"
+        >
+          查询
+        </el-button>
+        <el-button
+          type="primary"
+          style="background: #0187fb; border: none"
+          @click="handleUpload"
+        >
+          下载
+        </el-button>
       </div>
       </div>
     </el-form>
     </el-form>
     <div class="table_container">
     <div class="table_container">
       <div class="money_container">
       <div class="money_container">
         <div class="money_item">
         <div class="money_item">
           <span class="money_title">票扣金额 (末税)合计:</span>
           <span class="money_title">票扣金额 (末税)合计:</span>
-          <span>0.00</span>
+          <span>{{ table && table[0] ? table[0].pnotMoney : '0.00' }}</span>
         </div>
         </div>
         <div class="money_item">
         <div class="money_item">
           <span class="money_title">税额合计:</span>
           <span class="money_title">税额合计:</span>
-          <span>0.00</span>
+          <span>{{ table && table[0] ? table[0].ptheAmount : '0.00' }}</span>
         </div>
         </div>
         <div class="money_item">
         <div class="money_item">
           <span class="money_title">票扣金额 (含税) 合计:</span>
           <span class="money_title">票扣金额 (含税) 合计:</span>
-          <span>0.00</span>
+          <span>{{ table && table[0] ? table[0].pmoney : '0.00' }}</span>
         </div>
         </div>
         <div class="money_item">
         <div class="money_item">
           <span class="money_title">账扣金额(未税)合计:</span>
           <span class="money_title">账扣金额(未税)合计:</span>
-          <span>0.00</span>
+          <span>{{ table && table[0] ? table[0].znotMoney : '0.00' }}</span>
         </div>
         </div>
         <div class="money_item">
         <div class="money_item">
           <span class="money_title">税额合计:</span>
           <span class="money_title">税额合计:</span>
-          <span>0.00</span>
+          <span>{{ table && table[0] ? table[0].ztheAmount : '0.00' }}</span>
         </div>
         </div>
         <div class="money_item">
         <div class="money_item">
           <span class="money_title">账扣金额 (含税) 合计:</span>
           <span class="money_title">账扣金额 (含税) 合计:</span>
-          <span>0.00</span>
+          <span>{{ table && table[0] ? table[0].zmoney : '0.00' }}</span>
         </div>
         </div>
       </div>
       </div>
       <el-table
       <el-table
+        v-loading="loading"
         :data="table"
         :data="table"
         border
         border
         :header-cell-style="headerStyle"
         :header-cell-style="headerStyle"
         :cell-style="rowStyle"
         :cell-style="rowStyle"
+        height="52vh"
       >
       >
         <el-table-column type="index" label="序号" width="80"></el-table-column>
         <el-table-column type="index" label="序号" width="80"></el-table-column>
-        <el-table-column prop="payment" label="供应商编号"></el-table-column>
-        <el-table-column prop="buyer" label="供应商"></el-table-column>
-        <el-table-column prop="user" label="结算厂编"></el-table-column>
-        <el-table-column prop="content" label="返利类型"></el-table-column>
-        <el-table-column prop="status" label="票扣/账扣"></el-table-column>
-        <el-table-column prop="money" label="返利项目"></el-table-column>
-        <el-table-column prop="purchaseDate" label="账表月"></el-table-column>
-        <el-table-column prop="eTime" label="返利金额(未税)"></el-table-column>
-        <el-table-column prop="way" label="税率"></el-table-column>
-        <el-table-column prop="invoicing" label="支付方式"></el-table-column>
-        <el-table-column prop="invoicing" label="追湖月"></el-table-column>
-        <el-table-column prop="invoicing" label="备注"></el-table-column>
-        <el-table-column prop="invoicing" label="确认状态"></el-table-column>
-        <el-table-column prop="invoicing" label="应付状态"></el-table-column>
+        <el-table-column prop="supplierNo" label="供应商编号"></el-table-column>
+        <el-table-column
+          prop="supplierName"
+          label="供应商"
+          width="290"
+        ></el-table-column>
+        <el-table-column prop="closeNo" label="结算厂编"></el-table-column>
+        <el-table-column
+          prop="rebateType"
+          label="返利类型"
+          width="120"
+        ></el-table-column>
+        <el-table-column prop="ticketKou" label="票扣/账扣"></el-table-column>
+        <el-table-column
+          prop="rebateProject"
+          label="返利项目"
+        ></el-table-column>
+        <el-table-column prop="fullTime" label="账表月"></el-table-column>
+        <el-table-column
+          prop="rebateNotMoney"
+          label="返利金额(未税)"
+        ></el-table-column>
+        <el-table-column prop="theAmount" label="税额"></el-table-column>
+        <el-table-column
+          prop="rebateMoney"
+          label="返利金额(含税)"
+        ></el-table-column>
+        <el-table-column prop="taxRate" label="税率"></el-table-column>
+        <el-table-column prop="paymentType" label="支付方式"></el-table-column>
+        <el-table-column
+          prop="retrospectMonth"
+          label="追溯月"
+        ></el-table-column>
+        <el-table-column
+          prop="remark"
+          label="备注"
+          width="140"
+        ></el-table-column>
+        <el-table-column prop="affirmStatus" label="确认状态"></el-table-column>
+        <el-table-column prop="dealStatus" label="应付状态"></el-table-column>
+        <el-table-column
+          prop="closeNumber"
+          label="结算单号"
+          width="120"
+        ></el-table-column>
+        <el-table-column
+          prop="area"
+          label="区域事业公司"
+          width="120"
+        ></el-table-column>
       </el-table>
       </el-table>
       <el-pagination
       <el-pagination
-        :current-page="currentPage"
-        :page-sizes="[100, 200, 300, 400]"
-        :page-size="pageSize"
+        :current-page="queryForm.pageNum"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="queryForm.pageSize"
         layout="total, sizes, prev, pager, next, jumper"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total"
         :total="total"
         @size-change="handleSizeChange"
         @size-change="handleSizeChange"
@@ -141,29 +262,278 @@
 </template>
 </template>
 
 
 <script>
 <script>
+  import {
+    rebateList,
+    uploadRebate,
+    downPDFTitleGet,
+  } from '../../../api/rebateDetail'
   export default {
   export default {
     name: 'ProfitDetailsQuery',
     name: 'ProfitDetailsQuery',
     data() {
     data() {
       return {
       return {
+        loading: false,
         form: {},
         form: {},
         table: [],
         table: [],
         currentPage: 1,
         currentPage: 1,
-        total: 100,
-        pageSize: 8,
+        total: 0,
+        queryForm: {
+          pageNum: 1, //当前页
+          pageSize: 10, //每页数量
+          supplierName: '', //供应商
+          rebateType: '', //返利类型
+          ticketKou: '', //票扣/账扣
+          rebateProject: '', //返利项目
+          paymentType: '', //支付方式
+          dealStatus: '', //应付状态
+          // fullTimeStart: '', //开始时间
+          // fullTimeEnd: '', //结束时间
+          date: [],
+          company: '上海',
+        }, //查询列表传的参数
+        companyList: [
+          {
+            value: '上海',
+            label: '上海',
+          },
+        ], //公司列表
+        rebateTypeList: [
+          {
+            value: '追溯',
+            label: '追溯',
+          },
+          {
+            value: '合约',
+            label: '合约',
+          },
+          {
+            value: '临时返利',
+            label: '临时返利',
+          },
+          {
+            value: '促销返利',
+            label: '促销返利',
+          },
+          {
+            value: '新品返利',
+            label: '新品返利',
+          },
+          {
+            value: 'WF导入(上海)',
+            label: 'WF导入(上海)',
+          },
+        ], //返利类型列表
+        purchaseGroupList: [
+          {
+            value: '书籍',
+            label: '书籍',
+          },
+          {
+            value: '冷冻食品',
+            label: '冷冻食品',
+          },
+          {
+            value: '杂志',
+            label: '杂志',
+          },
+          {
+            value: '冷藏饮料',
+            label: '冷藏饮料',
+          },
+          {
+            value: '金融服务',
+            label: '金融服务',
+          },
+          {
+            value: '无酒精',
+            label: '无酒精',
+          },
+          {
+            value: '塑料袋',
+            label: '塑料袋',
+          },
+          {
+            value: '啤酒',
+            label: '啤酒',
+          },
+          {
+            value: '消耗品',
+            label: '消耗品',
+          },
+          {
+            value: '调味料',
+            label: '调味料',
+          },
+          {
+            value: '方便面',
+            label: '方便面',
+          },
+        ],
+        rebateProjectList: [
+          {
+            value: '01信息登录服务费',
+            label: '01信息登录服务费',
+          },
+          {
+            value: '02新品废弃补贴',
+            label: '02新品废弃补贴',
+          },
+          {
+            value: '03特定商品销售区域装饰费',
+            label: '03特定商品销售区域装饰费',
+          },
+          {
+            value: '04活动赞助费',
+            label: '04活动赞助费',
+          },
+          {
+            value: '05活动赞助费',
+            label: '05活动赞助费',
+          },
+          {
+            value: '06活动赞助费',
+            label: '06活动赞助费',
+          },
+          {
+            value: '07活动赞助费',
+            label: '07活动赞助费',
+          },
+          {
+            value: '08活动赞助费',
+            label: '08活动赞助费',
+          },
+          {
+            value: '09网络信息服务费',
+            label: '09网络信息服务费',
+          },
+          {
+            value: '10包店服务费',
+            label: '10包店服务费',
+          },
+          {
+            value: '11主档维护费',
+            label: '11主档维护费',
+          },
+        ],
+        ticketKouList: [
+          {
+            value: '票扣',
+            label: '票扣',
+          },
+          {
+            value: '账扣',
+            label: '账扣',
+          },
+        ], //票扣账扣列表
+        paymentTypeList: [
+          {
+            value: '账扣支付',
+            label: '账扣支付',
+          },
+          {
+            value: '支票支付',
+            label: '支票支付',
+          },
+          {
+            value: '转账支付',
+            label: '转账支付',
+          },
+        ], //支付方式
+        dealStatusList: [
+          {
+            value: '应付',
+            label: '应付',
+          },
+          {
+            value: '未付',
+            label: '未付',
+          },
+        ], //应付状态
+        fixedHeight: 400, //固定高度
       }
       }
     },
     },
+    beforeMount() {
+      var h =
+        document.documentElement.clientHeight || document.body.clientHeight
+      console.log(h - this.fixedHeight, '大什么呢')
+      this.tableHeight = h - this.fixedHeight
+    },
+    // mounted() {
+    //   this.getList()
+    // },
+
     methods: {
     methods: {
+      //获取表格列表
+      getList() {
+        this.loading = true
+        rebateList(this.queryForm)
+          .then((res) => {
+            this.table = res.data.list
+            this.total = res.data.totalRecord
+          })
+          .finally(() => {
+            this.loading = false
+          })
+      },
       headerStyle() {
       headerStyle() {
         return 'background:#409eff;text-align:center;color:#fff;'
         return 'background:#409eff;text-align:center;color:#fff;'
       },
       },
       rowStyle() {
       rowStyle() {
-        return 'text-align:center;'
+        // return 'text-align:center;'
       },
       },
+      changeDate(e) {
+        console.log(e, '弹幕')
+        if (!e) {
+          // this.queryForm.
+        }
+      },
+      //切换每页数据事件
       handleSizeChange(val) {
       handleSizeChange(val) {
-        this.pageSize = val
+        this.queryForm.pageSize = val
+        this.getList()
       },
       },
+      //修改当前页码
       handleCurrentChange(val) {
       handleCurrentChange(val) {
-        this.currentPage = val
+        this.queryForm.pageNum = val
+        this.getList()
+      },
+      //查询
+      handleSearch() {
+        this.getList()
+      },
+      // 下载按钮事件
+      // handleUpload() {
+      //   uploadRebate(this.queryForm).then((res) => {
+      //     let blob = new Blob([res.data], { type: res.data.type })
+      //     let downloadElement = document.createElement('a')
+      //     let href = window.URL.createObjectURL(blob)
+      //     downloadElement.href = href
+      //     document.body.appendChild(downloadElement)
+      //     downloadElement.click()
+      //     document.body.removeChild(downloadElement) //移除元素；防止连续点击创建多个a标签
+      //     window.URL.revokeObjectURL(href)
+      //   })
+      // },
+      handleUpload() {
+        let self = this
+        downPDFTitleGet(this.queryForm).then((res) => {
+          // console.log('=========downPDFTitleGet', res)
+          if (res.data.code === 200) {
+            self.uploadRebateAxios(res.data.msg)
+          }
+        })
+      },
+      uploadRebateAxios(title) {
+        uploadRebate(this.queryForm).then((res) => {
+          let blob = new Blob([res.data], { type: res.data.type })
+          let downloadElement = document.createElement('a')
+          let href = window.URL.createObjectURL(blob)
+          downloadElement.href = href
+          downloadElement.download = title
+          document.body.appendChild(downloadElement)
+          downloadElement.click()
+          document.body.removeChild(downloadElement) //移除元素；防止连续点击创建多个a标签
+          window.URL.revokeObjectURL(href)
+        })
       },
       },
     },
     },
   }
   }
@@ -178,7 +548,7 @@
     box-sizing: border-box;
     box-sizing: border-box;
 
 
     .btn_container {
     .btn_container {
-      margin-left: 5vw;
+      margin-left: 3vw;
       line-height: 4vh;
       line-height: 4vh;
     }
     }
 
 
@@ -186,11 +556,12 @@
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
       height: 4vh;
       height: 4vh;
+      margin-right: 1vw;
 
 
       .el-form-item__label {
       .el-form-item__label {
         font-size: calc(100vh * 28 / 1920);
         font-size: calc(100vh * 28 / 1920);
         font-weight: bold;
         font-weight: bold;
-        width: 6vw;
+        // width: 6vw;
       }
       }
 
 
       .el-input__inner {
       .el-input__inner {
@@ -225,7 +596,7 @@
   }
   }
   .table_container {
   .table_container {
     border-top: 4px solid #f1f1f1;
     border-top: 4px solid #f1f1f1;
-    padding: 0.5vh 0.5vw;
+    padding: 0.5vh 0;
     box-sizing: border-box;
     box-sizing: border-box;
     .el-pagination {
     .el-pagination {
       text-align: left;
       text-align: left;
@@ -255,4 +626,8 @@
   ::v-deep .el-table td .cell {
   ::v-deep .el-table td .cell {
     font-size: calc(100vh * 24 / 1920);
     font-size: calc(100vh * 24 / 1920);
   }
   }
+  ::v-deep .el-button {
+    background: #0187fb;
+    border: none;
+  }
 </style>
 </style>

src/views/vab/profitQuery/index.vue

@@ -32,8 +32,12 @@
         ></el-date-picker>
         ></el-date-picker>
       </el-form-item>
       </el-form-item>
       <div class="btn_container">
       <div class="btn_container">
-        <el-button type="primary">查询</el-button>
-        <el-button type="primary">下载</el-button>
+        <el-button type="primary" style="background: #0187fb; border: none">
+          查询
+        </el-button>
+        <el-button type="primary" style="background: #0187fb; border: none">
+          下载
+        </el-button>
       </div>
       </div>
     </el-form>
     </el-form>
     <div class="table_container">
     <div class="table_container">
@@ -93,11 +97,29 @@
         },
         },
         table: [],
         table: [],
         currentPage: 1,
         currentPage: 1,
-        total: 100,
+        total: 0,
         pageSize: 8,
         pageSize: 8,
       }
       }
     },
     },
+    mounted() {
+      this.getTest()
+    },
     methods: {
     methods: {
+      getTest() {
+        let a = [2, 56, 5, 3, 15, 16, 29, 3, 15],
+          b = [4, 0, 17, 35, 15],
+          c = [9, 0, 5, 8, 3, 56, 100, 34]
+        // let total = a.concat(b, c)
+        console.log(total, '合并')
+
+        let sort = total.sort((a, b) => {
+          return a - b
+        })
+        console.log(sort, '排序')
+        var setNew = new Set(sort)
+        var newArr = [...setNew]
+        console.log('最终', newArr)
+      },
       headerStyle() {
       headerStyle() {
         return 'background:#409eff;text-align:center;color:#fff;'
         return 'background:#409eff;text-align:center;color:#fff;'
       },
       },
@@ -170,7 +192,7 @@
   }
   }
   .table_container {
   .table_container {
     border-top: 4px solid #f1f1f1;
     border-top: 4px solid #f1f1f1;
-    padding: 0.5vh 0.5vw;
+    padding: 0.5vh 0;
     box-sizing: border-box;
     box-sizing: border-box;
     .el-pagination {
     .el-pagination {
       text-align: left;
       text-align: left;

src/views/vab/supplierInvoicing/index.vue

@@ -2,10 +2,20 @@
   <div>
   <div>
     <div class="top_container">
     <div class="top_container">
       <div class="left_btn">
       <div class="left_btn">
-        <el-button type="primary">①查询</el-button>
+        <el-button type="primary" style="background: #0187fb; border: none">
+          ①查询
+        </el-button>
         <el-button type="success" plain>④保存</el-button>
         <el-button type="success" plain>④保存</el-button>
-        <el-button type="primary">对账明细下载</el-button>
-        <el-button type="primary" plain>发票录入</el-button>
+        <el-button type="primary" style="background: #0187fb; border: none">
+          对账明细下载
+        </el-button>
+        <el-button
+          type="primary"
+          style="background: #0187fb; border: none"
+          plain
+        >
+          发票录入
+        </el-button>
         <el-button type="danger" plain>取消</el-button>
         <el-button type="danger" plain>取消</el-button>
       </div>
       </div>
       <div class="right_text">
       <div class="right_text">
@@ -305,7 +315,7 @@
   }
   }
 
 
   .table_container {
   .table_container {
-    padding: 0.5vh 0.5vw;
+    padding: 0.5vh 0;
     box-sizing: border-box;
     box-sizing: border-box;
 
 
     .el-pagination {
     .el-pagination {

src/views/vab/supplierInvoicingQuery/index.vue

 <template>
 <template>
   <div>
   <div>
-    <el-button type="primary">下载</el-button>
+    <el-button type="primary" style="background: #0187fb; border: none">
+      下载
+    </el-button>
     <el-form :model="form">
     <el-form :model="form">
       <el-form-item label="供应商:">
       <el-form-item label="供应商:">
         <div class="supplier_container">
         <div class="supplier_container">
@@ -48,7 +50,9 @@
           placeholder="请输入结算单号"
           placeholder="请输入结算单号"
         ></el-input>
         ></el-input>
       </el-form-item>
       </el-form-item>
-      <el-button type="primary">查询</el-button>
+      <el-button type="primary" style="background: #0187fb; border: none">
+        查询
+      </el-button>
     </el-form>
     </el-form>
     <div class="table_container">
     <div class="table_container">
       <div class="money_container">
       <div class="money_container">
@@ -211,7 +215,7 @@
   }
   }
   .table_container {
   .table_container {
     border-top: 4px solid #f1f1f1;
     border-top: 4px solid #f1f1f1;
-    padding: 0.5vh 0.5vw;
+    padding: 0.5vh 0;
     box-sizing: border-box;
     box-sizing: border-box;
 
 
     .el-pagination {
     .el-pagination {

src/views/vab/table/components/TableEdit.vue

@@ -15,7 +15,13 @@
     </el-form>
     </el-form>
     <div slot="footer" class="dialog-footer">
     <div slot="footer" class="dialog-footer">
       <el-button @click="close">取 消</el-button>
       <el-button @click="close">取 消</el-button>
-      <el-button type="primary" @click="save">确 定</el-button>
+      <el-button
+        type="primary"
+        style="background: #0187fb; border: none"
+        @click="save"
+      >
+        确 定
+      </el-button>
     </div>
     </div>
   </el-dialog>
   </el-dialog>
 </template>
 </template>

src/views/vab/table/index.vue

@@ -8,10 +8,34 @@
         <el-button icon="el-icon-delete" type="danger" @click="handleDelete">
         <el-button icon="el-icon-delete" type="danger" @click="handleDelete">
           删除
           删除
         </el-button>
         </el-button>
-        <el-button type="primary" @click="testMessage">baseMessage</el-button>
-        <el-button type="primary" @click="testALert">baseAlert</el-button>
-        <el-button type="primary" @click="testConfirm">baseConfirm</el-button>
-        <el-button type="primary" @click="testNotify">baseNotify</el-button>
+        <el-button
+          type="primary"
+          style="background: #0187fb; border: none"
+          @click="testMessage"
+        >
+          baseMessage
+        </el-button>
+        <el-button
+          type="primary"
+          style="background: #0187fb; border: none"
+          @click="testALert"
+        >
+          baseAlert
+        </el-button>
+        <el-button
+          type="primary"
+          style="background: #0187fb; border: none"
+          @click="testConfirm"
+        >
+          baseConfirm
+        </el-button>
+        <el-button
+          type="primary"
+          style="background: #0187fb; border: none"
+          @click="testNotify"
+        >
+          baseNotify
+        </el-button>
       </vab-query-form-left-panel>
       </vab-query-form-left-panel>
       <vab-query-form-right-panel>
       <vab-query-form-right-panel>
         <el-form
         <el-form

src/views/vab/tree/index.vue

@@ -213,7 +213,13 @@
       </el-form>
       </el-form>
       <div slot="footer" class="dialog-footer">
       <div slot="footer" class="dialog-footer">
         <el-button @click="treeDialogVisible = false">取 消</el-button>
         <el-button @click="treeDialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="saveTree">确 定</el-button>
+        <el-button
+          type="primary"
+          style="background: #0187fb; border: none"
+          @click="saveTree"
+        >
+          确 定
+        </el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
     <!--添加/编辑节点弹框-------------------end-->
     <!--添加/编辑节点弹框-------------------end-->

src/views/vab/upload/index.vue

@@ -8,7 +8,11 @@
       :limit="50"
       :limit="50"
       :size="2"
       :size="2"
     ></vab-upload>
     ></vab-upload>
-    <el-button type="primary" @click="handleShow({ key: 'value' })">
+    <el-button
+      type="primary"
+      style="background: #0187fb; border: none"
+      @click="handleShow({ key: 'value' })"
+    >
       模拟上传
       模拟上传
     </el-button>
     </el-button>
   </div>
   </div>

src/views/vab/webSocket/index.vue

@@ -14,7 +14,13 @@
             <el-input v-model="form.message"></el-input>
             <el-input v-model="form.message"></el-input>
           </el-form-item>
           </el-form-item>
           <el-form-item>
           <el-form-item>
-            <el-button type="primary" @click="submit">发送消息</el-button>
+            <el-button
+              type="primary"
+              style="background: #0187fb; border: none"
+              @click="submit"
+            >
+              发送消息
+            </el-button>
           </el-form-item>
           </el-form-item>
           <el-form-item label="返回信息汇总">
           <el-form-item label="返回信息汇总">
             {{ data }}
             {{ data }}

vue.config.js

@@ -46,15 +46,20 @@ module.exports = {
 
 
   transpileDependencies,
   transpileDependencies,
   devServer: {
   devServer: {
-    hot: true,
-    port: devPort,
+    host: '0.0.0.0',
+    port: 8955,
     open: true,
     open: true,
-    noInfo: false,
-    overlay: {
-      warnings: true,
-      errors: true,
+    proxy: {
+      [process.env.VUE_APP_BASE_API]: {
+        target: process.env.VUE_APP_BASE_URL, //测试服
+        changeOrigin: true,
+        secure: true, // 如果是https接口，需要配置这个参数
+        pathRewrite: {
+          ['^' + process.env.VUE_APP_BASE_API]: '',
         },
         },
-    after: mockServer(),
+      },
+    },
+    disableHostCheck: true,
   },
   },
   configureWebpack() {
   configureWebpack() {
     return {
     return {