From 2abd31e3da82850d093a76b7d37877fd8b73791b Mon Sep 17 00:00:00 2001
From: myTest383 <address>
Date: Thu, 2 Jan 2025 14:56:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue         | 310 +++++------
 src/layout/components/Sidebar/index.vue  |  22 +-
 src/router/index.js                      | 584 ++++++++++----------
 src/views/network/index.vue              | 444 ++++++++--------
 src/views/network/indexAdd.vue           | 380 ++++++-------
 src/views/order/allDistributionCount.vue | 569 ++++++++++----------
 src/views/order/distributionCount.vue    | 647 +++++++++++------------
 src/views/order/index.vue                | 632 +++++++++++-----------
 src/views/order/subBranch.vue            | 599 +++++++++++----------
 9 files changed, 2093 insertions(+), 2094 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index dcb89b9..7448990 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -1,168 +1,172 @@
 <template>
-  <div>
-    <div class="navbar">
-     <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;"/>汇融惠享管理平台</p>
-     <!-- <h3 class="breadcrumb-container">汇融银行供应链贷后监管平台</h3> -->
-      <div class="right-menu">
-<!--        <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
-       <!-- <p>欢迎您，{{name}}</p>
-        <p class="dy" @click="logout()"><img src="@/assets/images/dy.png"></p> -->
-      </div>
+    <div>
+        <div class="navbar">
+            <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png"
+                    style="width: 45px;height: 45px;margin-right: 10px;" />汇融惠享管理平台</p>
+            <!-- <h3 class="breadcrumb-container">汇融银行供应链贷后监管平台</h3> -->
+            <div class="right-menu">
+                <!--        <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
+                <!-- <p>欢迎您：{{pNameAndDepartmentNameAndPostName}}- {{name}}</p> -->
+                <p>欢迎您：系统管理员</p>
+                <!-- <img src="@/assets/images/info.png"> -->
+                <!-- <img src="@/assets/images/dy.png" @click="logout"> -->
+                <span class="backToHome" @click="logout"><i class="el-icon-back"></i>退出登录</span>
+            </div>
+        </div>
+        <el-footer class="footer" height="40px">Copyright © {{ year }} 汇融惠享管理平台 All Rights Reserved</el-footer>
     </div>
-    <el-footer class="footer" height="40px">Copyright © {{ year }} 汇融惠享管理平台 All Rights Reserved</el-footer>
-  </div>
 </template>
 
 <script>
-  export default {
-    data() {
-      return {
-        name: '',
-        year:'',
-      }
-    },
-    mounted() {
-      this.name = window.sessionStorage.getItem('userName')
-      var nowDate = new Date()
-      this.year = nowDate.getFullYear()
-    },
-    methods: {
-      logout() {
-        this.$confirm('确定要退出吗, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-            // this.$store.commit('user/SET_UESRINFO', '')
-            this.$router.push({
-              path: '/login'
-            })
-          })
-      },
+    export default {
+        data() {
+            return {
+                name: '',
+                year: '',
+            }
+        },
+        mounted() {
+            this.name = window.sessionStorage.getItem('userName')
+            var nowDate = new Date()
+            this.year = nowDate.getFullYear()
+        },
+        methods: {
+            logout() {
+                this.$confirm('确定要退出吗, 是否继续?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    // this.$store.commit('user/SET_UESRINFO', '')
+                    this.$router.push({
+                        path: '/login'
+                    })
+                })
+            },
+        }
     }
-  }
 </script>
 
 <style lang="scss" scoped>
-  @import "~@/styles/variables.scss";
-
-  .navbar {
-    height: 60px;
-    overflow: hidden;
-    position: relative;
-    background: $header-bg;
-    padding: 0 30px;
-    box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
-
-    .hamburger-container {
-      line-height: 46px;
-      height: 100%;
-      float: left;
-      cursor: pointer;
-      transition: background .3s;
-      -webkit-tap-highlight-color: transparent;
-
-      &:hover {
-        background: rgba(0, 0, 0, .025)
-      }
-    }
+    @import "~@/styles/variables.scss";
+
+    .navbar {
+        height: 60px;
+        overflow: hidden;
+        position: relative;
+        background: $header-bg;
+        padding: 0 30px;
+        box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
+
+        .hamburger-container {
+            line-height: 46px;
+            height: 100%;
+            float: left;
+            cursor: pointer;
+            transition: background .3s;
+            -webkit-tap-highlight-color: transparent;
 
-   .breadcrumb-container {
-     display: flex;
-     align-items: center;
-     color: #fff;
-     font-size: 26px;
-     line-height: 60px;
-     margin: 0;
-     float: left;
-   }
-
-    .right-menu {
-      float: right;
-      height: 100%;
-      line-height: 60px;
-      color: #fff;
-
-      &:focus {
-        outline: none;
-      }
-
-      p {
-        display: inline-block;
-        margin: 0;
-        padding: 0;
-        padding: 0 15px;
-      }
-
-      img {
-        vertical-align: middle;
-        margin: 0 10px;
-        cursor: pointer;
-      }
-
-      .backToHome {
-        display: inline-block;
-        vertical-align: middle;
-        padding: 0 15px;
-        cursor: pointer;
-      }
-
-      .backToHome:hover {
-        background: #087dba;
-      }
-
-      .right-menu-item {
-        display: inline-block;
-        padding: 0 8px;
-        height: 100%;
-        font-size: 18px;
-        color: #5a5e66;
-        vertical-align: text-bottom;
-
-        &.hover-effect {
-          cursor: pointer;
-          transition: background .3s;
-
-          &:hover {
-            background: rgba(0, 0, 0, .025)
-          }
+            &:hover {
+                background: rgba(0, 0, 0, .025)
+            }
         }
-      }
-
-      .avatar-container {
-        margin-right: 30px;
-
-        .avatar-wrapper {
-          margin-top: 5px;
-          position: relative;
 
-          .user-avatar {
-            cursor: pointer;
-            width: 40px;
-            height: 40px;
-            border-radius: 10px;
-          }
+        .breadcrumb-container {
+            display: flex;
+            align-items: center;
+            color: #fff;
+            font-size: 26px;
+            line-height: 60px;
+            margin: 0;
+            float: left;
+        }
 
-          .el-icon-caret-bottom {
-            cursor: pointer;
-            position: absolute;
-            right: -20px;
-            top: 25px;
-            font-size: 12px;
-          }
+        .right-menu {
+            float: right;
+            height: 100%;
+            line-height: 60px;
+            color: #fff;
+
+            &:focus {
+                outline: none;
+            }
+
+            p {
+                display: inline-block;
+                margin: 0;
+                padding: 0;
+                padding: 0 15px;
+            }
+
+            img {
+                vertical-align: middle;
+                margin: 0 10px;
+                cursor: pointer;
+            }
+
+            .backToHome {
+                display: inline-block;
+                vertical-align: middle;
+                padding: 0 15px;
+                cursor: pointer;
+            }
+
+            .backToHome:hover {
+                background: #087dba;
+            }
+
+            .right-menu-item {
+                display: inline-block;
+                padding: 0 8px;
+                height: 100%;
+                font-size: 18px;
+                color: #5a5e66;
+                vertical-align: text-bottom;
+
+                &.hover-effect {
+                    cursor: pointer;
+                    transition: background .3s;
+
+                    &:hover {
+                        background: rgba(0, 0, 0, .025)
+                    }
+                }
+            }
+
+            .avatar-container {
+                margin-right: 30px;
+
+                .avatar-wrapper {
+                    margin-top: 5px;
+                    position: relative;
+
+                    .user-avatar {
+                        cursor: pointer;
+                        width: 40px;
+                        height: 40px;
+                        border-radius: 10px;
+                    }
+
+                    .el-icon-caret-bottom {
+                        cursor: pointer;
+                        position: absolute;
+                        right: -20px;
+                        top: 25px;
+                        font-size: 12px;
+                    }
+                }
+            }
         }
-      }
     }
-  }
-
-  .footer {
-    position: fixed;
-    bottom: 0;
-    width: 100%;
-    line-height: 40px;
-    background: #E9F1F7;
-    text-align: center;
-    font-size: 14px;
-    color: #666;
-  }
-</style>
+
+    .footer {
+        position: fixed;
+        bottom: 0;
+        width: 100%;
+        line-height: 40px;
+        background: #E9F1F7;
+        text-align: center;
+        font-size: 14px;
+        color: #666;
+    }
+</style>
\ No newline at end of file
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index ba39a09..a252128 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -174,16 +174,16 @@
                         name: "/pickupPoint/index",
                         path: "/pickupPoint/index"
                     },
-                    // {
-                    // 	alwaysShow: true,
-                    // 	component: "network",
-                    // 	meta: {
-                    // 		icon: "el-icon-menu",
-                    // 		title: "支行管理",
-                    // 	},
-                    // 	name: "/network/index",
-                    // 	path: "/network/index"
-                    // },
+                    {
+                        alwaysShow: true,
+                        component: "network",
+                        meta: {
+                            icon: "el-icon-menu",
+                            title: "区域管理",
+                        },
+                        name: "/network/index",
+                        path: "/network/index"
+                    },
                     {
                         alwaysShow: true,
                         component: "commodity",
@@ -229,7 +229,7 @@
                                 component: "subBranch",
                                 meta: {
                                     icon: "el-icon-help",
-                                    title: "支行配货统计",
+                                    title: "区域配货统计",
                                 },
                                 name: "/order/subBranch",
                                 path: "/order/subBranch",
diff --git a/src/router/index.js b/src/router/index.js
index 6dc0bcb..f4dc6a6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -10,320 +10,320 @@ import Layout from '@/layout'
 import codemenu from './modules/codemenu'
 
 export const constantRoutes = [{
-		path: '/',
-		redirect: 'login'
-	},
-	{
-		path: '/login',
-		component: () => import('@/views/login/login.vue'),
-		name: 'login'
+        path: '/',
+        redirect: 'login'
+    },
+    {
+        path: '/login',
+        component: () => import('@/views/login/login.vue'),
+        name: 'login'
 
-	},
+    },
 
 
-	// {
-	//   path: '/',
-	//   redirect: 'userInfo/index'
-	// },
-	//  {
-	//    path: '/index',
-	//    component: () => import('@/views/userInfo/index.vue'),
-	//    name: 'index'
+    // {
+    //   path: '/',
+    //   redirect: 'userInfo/index'
+    // },
+    //  {
+    //    path: '/index',
+    //    component: () => import('@/views/userInfo/index.vue'),
+    //    name: 'index'
 
-	//  }, 
+    //  }, 
 
-	{
-		path: '/index',
-		component: Layout,
-		redirect: '/index',
-		children: [{
-			path: '/index',
-			component: () =>
-				import('@/views/index.vue'),
-			name: 'index',
-			meta: {
-				title: '主页',
-				noCache: true,
-				affix: true
-			}
-		}]
-	},
+    {
+        path: '/index',
+        component: Layout,
+        redirect: '/index',
+        children: [{
+            path: '/index',
+            component: () =>
+                import('@/views/index.vue'),
+            name: 'index',
+            meta: {
+                title: '主页',
+                noCache: true,
+                affix: true
+            }
+        }]
+    },
 
 
-	{
-		path: '/userInfo',
-		component: Layout,
-		redirect: null,
-		meta: {
-			title: '用户信息'
-		},
-		children: [{
-			path: '/userInfo/index',
-			component: () =>
-				import('@/views/userInfo/index.vue'),
-			name: 'index',
-			meta: {
-				title: '用户信息列表'
-			}
-		}, ]
-	}, {
-		path: '/marketingCard',
-		component: Layout,
-		redirect: '/marketingCard/applet',
-		children: [
+    {
+        path: '/userInfo',
+        component: Layout,
+        redirect: null,
+        meta: {
+            title: '用户信息'
+        },
+        children: [{
+            path: '/userInfo/index',
+            component: () =>
+                import('@/views/userInfo/index.vue'),
+            name: 'index',
+            meta: {
+                title: '用户信息列表'
+            }
+        }, ]
+    }, {
+        path: '/marketingCard',
+        component: Layout,
+        redirect: '/marketingCard/applet',
+        children: [
 
-			{
-				path: '/marketingCard/applet',
-				component: () => import('@/views/marketingCard/applet.vue'),
-				name: 'applet',
-				meta: {
-					title: '小程序礼包设置',
-					noCache: true
-				}
-			}, {
-				path: '/marketingCard/index',
-				component: () => import('@/views/marketingCard/index.vue'),
-				name: 'index',
-				meta: {
-					title: '礼包设置',
-					noCache: true
-				}
-			},
+            {
+                path: '/marketingCard/applet',
+                component: () => import('@/views/marketingCard/applet.vue'),
+                name: 'applet',
+                meta: {
+                    title: '小程序礼包设置',
+                    noCache: true
+                }
+            }, {
+                path: '/marketingCard/index',
+                component: () => import('@/views/marketingCard/index.vue'),
+                name: 'index',
+                meta: {
+                    title: '礼包设置',
+                    noCache: true
+                }
+            },
 
-			{
-				path: '/marketingCard/pickupCardSet',
-				component: () => import('@/views/marketingCard/pickupCardSet.vue'),
-				name: 'pickupCardSet',
-				meta: {
-					title: '个人卡设置',
-					noCache: true
-				}
-			},
-			{
-				path: '/marketingCard/corporateCardSet',
-				component: () => import('@/views/marketingCard/corporateCardSet.vue'),
-				name: 'corporateCardSet',
-				meta: {
-					title: '企业卡设置',
-					noCache: true
-				}
-			},
-			// {
-			//   path: '/marketingCard/grantRecords',
-			//   component: () => import('@/views/marketingCard/grantRecords.vue'),
-			//   name: 'grantRecords',
-			//   meta: {
-			//     title: '发放记录',
-			//     noCache: true
-			//   }
-			// },
-			// {
-			//   path: '/marketingCard/carList',
-			//   component: () => import('@/views/marketingCard/carList.vue'),
-			//   name: 'carList',
-			//   meta: {
-			//     title: '提货卡列表',
-			//     noCache: true
-			//   }
-			// },
-		]
-	}, {
-		path: '/cardManage',
-		component: Layout,
-		redirect: '/cardManage/person',
-		children: [{
-				path: '/cardManage/person',
-				component: () => import('@/views/cardManage/person.vue'),
-				name: 'person',
-				meta: {
-					title: '个人卡统计',
-					noCache: true
-				}
-			},
+            {
+                path: '/marketingCard/pickupCardSet',
+                component: () => import('@/views/marketingCard/pickupCardSet.vue'),
+                name: 'pickupCardSet',
+                meta: {
+                    title: '个人卡设置',
+                    noCache: true
+                }
+            },
+            {
+                path: '/marketingCard/corporateCardSet',
+                component: () => import('@/views/marketingCard/corporateCardSet.vue'),
+                name: 'corporateCardSet',
+                meta: {
+                    title: '企业卡设置',
+                    noCache: true
+                }
+            },
+            // {
+            //   path: '/marketingCard/grantRecords',
+            //   component: () => import('@/views/marketingCard/grantRecords.vue'),
+            //   name: 'grantRecords',
+            //   meta: {
+            //     title: '发放记录',
+            //     noCache: true
+            //   }
+            // },
+            // {
+            //   path: '/marketingCard/carList',
+            //   component: () => import('@/views/marketingCard/carList.vue'),
+            //   name: 'carList',
+            //   meta: {
+            //     title: '提货卡列表',
+            //     noCache: true
+            //   }
+            // },
+        ]
+    }, {
+        path: '/cardManage',
+        component: Layout,
+        redirect: '/cardManage/person',
+        children: [{
+                path: '/cardManage/person',
+                component: () => import('@/views/cardManage/person.vue'),
+                name: 'person',
+                meta: {
+                    title: '个人卡统计',
+                    noCache: true
+                }
+            },
 
-			{
-				path: '/cardManage/enterprise',
-				component: () => import('@/views/cardManage/enterprise.vue'),
-				name: 'enterprise',
-				meta: {
-					title: '企业卡统计',
-					noCache: true
-				}
-			},
-			{
-				path: '/cardManage/giftCard',
-				component: () => import('@/views/cardManage/giftCard.vue'),
-				name: 'giftCard',
-				meta: {
-					title: '福利卡统计',
-					noCache: true
-				}
-			},
-		]
-	}, {
-		path: '/pickupPoint',
-		component: Layout,
-		redirect: '/pickupPoint/index',
-		children: [{
-			path: '/pickupPoint/index',
-			component: () =>
-				import('@/views/pickupPoint/index.vue'),
-			name: 'index',
-			meta: {
-				title: '提货点信息'
-			}
-		}, ]
-	},
-	{
-		path: '/network',
-		component: Layout,
-		redirect: '/network/index',
-		children: [{
-			path: '/network/index',
-			component: () =>
-				import('@/views/network/index.vue'),
-			name: 'index',
-			meta: {
-				title: '支行管理'
-			}
-		}, ]
-	},
+            {
+                path: '/cardManage/enterprise',
+                component: () => import('@/views/cardManage/enterprise.vue'),
+                name: 'enterprise',
+                meta: {
+                    title: '企业卡统计',
+                    noCache: true
+                }
+            },
+            {
+                path: '/cardManage/giftCard',
+                component: () => import('@/views/cardManage/giftCard.vue'),
+                name: 'giftCard',
+                meta: {
+                    title: '福利卡统计',
+                    noCache: true
+                }
+            },
+        ]
+    }, {
+        path: '/pickupPoint',
+        component: Layout,
+        redirect: '/pickupPoint/index',
+        children: [{
+            path: '/pickupPoint/index',
+            component: () =>
+                import('@/views/pickupPoint/index.vue'),
+            name: 'index',
+            meta: {
+                title: '提货点信息'
+            }
+        }, ]
+    },
+    {
+        path: '/network',
+        component: Layout,
+        redirect: '/network/index',
+        children: [{
+            path: '/network/index',
+            component: () =>
+                import('@/views/network/index.vue'),
+            name: 'index',
+            meta: {
+                title: '区域管理'
+            }
+        }, ]
+    },
 
-	{
-		path: '/commodity',
-		component: Layout,
-		redirect: '/commodity/index',
-		children: [{
-			path: '/commodity/index',
-			component: () =>
-				import('@/views/commodity/index.vue'),
-			name: 'index',
-			meta: {
-				title: '商品信息'
-			}
-		}, ]
-	},
-	{
-		path: '/order',
-		component: Layout,
-		redirect: '/order/index',
-		children: [{
-				path: '/order/index',
-				component: () =>
-					import('@/views/order/index.vue'),
-				name: 'index',
-				meta: {
-					title: '订单统计'
-				}
-			}, {
-				path: '/order/distributionCount',
-				component: () =>
-					import('@/views/order/distributionCount.vue'),
-				name: 'distributionCount',
-				meta: {
-					title: '网点配货统计'
-				}
-			}, {
-				path: '/order/subBranch',
-				component: () =>
-					import('@/views/order/subBranch.vue'),
-				name: 'subBranch',
-				meta: {
-					title: '支行配货统计'
-				}
-			},
-			{
-				path: '/order/allDistributionCount',
-				component: () =>
-					import('@/views/order/allDistributionCount.vue'),
-				name: 'allDistributionCount',
-				meta: {
-					title: '总配货统计'
-				}
-			}
-		]
-	}, {
-		path: '/statisticalReport',
-		component: Layout,
-		redirect: '/statisticalReport/index',
-		children: [{
-				path: '/statisticalReport/index',
-				component: () => import('@/views/statisticalReport/index.vue'),
-				name: 'index',
-				meta: {
-					title: '提货卡汇总',
-					noCache: true
-				}
-			},
-			{
-				path: '/statisticalReport/collectionSummary',
-				component: () => import('@/views/statisticalReport/collectionSummary.vue'),
-				name: 'collectionSummary',
-				meta: {
-					title: '提货汇总',
-					noCache: true
-				}
-			},
-			{
-				path: '/statisticalReport/deliveryDetails',
-				component: () => import('@/views/statisticalReport/deliveryDetails.vue'),
-				name: 'deliveryDetails',
-				meta: {
-					title: '客户提货明细',
-					noCache: true
-				}
-			}
-		]
-	},
-	{
-		path: '/print',
-		component: Layout,
-		redirect: '/print/index',
-		children: [{
-			path: '/print/index',
-			component: () =>
-				import('@/views/print/index.vue'),
-			name: 'index',
-			meta: {
-				title: '打印电子卡'
-			}
-		}, {
-			path: '/print/enterpriseCrad',
-			component: () =>
-				import('@/views/print/enterpriseCrad.vue'),
-			name: 'enterpriseCrad',
-			meta: {
-				title: '打印企业卡'
-			}
-		},]
-	},
+    {
+        path: '/commodity',
+        component: Layout,
+        redirect: '/commodity/index',
+        children: [{
+            path: '/commodity/index',
+            component: () =>
+                import('@/views/commodity/index.vue'),
+            name: 'index',
+            meta: {
+                title: '商品信息'
+            }
+        }, ]
+    },
+    {
+        path: '/order',
+        component: Layout,
+        redirect: '/order/index',
+        children: [{
+                path: '/order/index',
+                component: () =>
+                    import('@/views/order/index.vue'),
+                name: 'index',
+                meta: {
+                    title: '订单统计'
+                }
+            }, {
+                path: '/order/distributionCount',
+                component: () =>
+                    import('@/views/order/distributionCount.vue'),
+                name: 'distributionCount',
+                meta: {
+                    title: '网点配货统计'
+                }
+            }, {
+                path: '/order/subBranch',
+                component: () =>
+                    import('@/views/order/subBranch.vue'),
+                name: 'subBranch',
+                meta: {
+                    title: '区域配货统计'
+                }
+            },
+            {
+                path: '/order/allDistributionCount',
+                component: () =>
+                    import('@/views/order/allDistributionCount.vue'),
+                name: 'allDistributionCount',
+                meta: {
+                    title: '总配货统计'
+                }
+            }
+        ]
+    }, {
+        path: '/statisticalReport',
+        component: Layout,
+        redirect: '/statisticalReport/index',
+        children: [{
+                path: '/statisticalReport/index',
+                component: () => import('@/views/statisticalReport/index.vue'),
+                name: 'index',
+                meta: {
+                    title: '提货卡汇总',
+                    noCache: true
+                }
+            },
+            {
+                path: '/statisticalReport/collectionSummary',
+                component: () => import('@/views/statisticalReport/collectionSummary.vue'),
+                name: 'collectionSummary',
+                meta: {
+                    title: '提货汇总',
+                    noCache: true
+                }
+            },
+            {
+                path: '/statisticalReport/deliveryDetails',
+                component: () => import('@/views/statisticalReport/deliveryDetails.vue'),
+                name: 'deliveryDetails',
+                meta: {
+                    title: '客户提货明细',
+                    noCache: true
+                }
+            }
+        ]
+    },
+    {
+        path: '/print',
+        component: Layout,
+        redirect: '/print/index',
+        children: [{
+            path: '/print/index',
+            component: () =>
+                import('@/views/print/index.vue'),
+            name: 'index',
+            meta: {
+                title: '打印电子卡'
+            }
+        }, {
+            path: '/print/enterpriseCrad',
+            component: () =>
+                import('@/views/print/enterpriseCrad.vue'),
+            name: 'enterpriseCrad',
+            meta: {
+                title: '打印企业卡'
+            }
+        }, ]
+    },
 
 
-	...codemenu,
-	{
-		path: '/404',
-		component: () =>
-			import('@/views/404'),
-		hidden: true
-	}
-	// 404 page must be placed at the end !!!
-	// { path: '*', redirect: '/404', hidden: true }
+    ...codemenu,
+    {
+        path: '/404',
+        component: () =>
+            import('@/views/404'),
+        hidden: true
+    }
+    // 404 page must be placed at the end !!!
+    // { path: '*', redirect: '/404', hidden: true }
 ]
 
 const createRouter = () => new Router({
-	// mode: 'history', // require service support
-	scrollBehavior: () => ({
-		y: 0
-	}),
-	routes: constantRoutes
+    // mode: 'history', // require service support
+    scrollBehavior: () => ({
+        y: 0
+    }),
+    routes: constantRoutes
 })
 
 const router = createRouter()
 
 // Detail see: https://github.com/vuejs/vue-router/issues/1234#issuecomment-357941465
 export function resetRouter() {
-	const newRouter = createRouter()
-	router.matcher = newRouter.matcher // reset router
+    const newRouter = createRouter()
+    router.matcher = newRouter.matcher // reset router
 }
 
 export default router
\ No newline at end of file
diff --git a/src/views/network/index.vue b/src/views/network/index.vue
index 1f10c11..0b885a0 100644
--- a/src/views/network/index.vue
+++ b/src/views/network/index.vue
@@ -1,230 +1,230 @@
 <template>
-	<div class="app-container">
-		<div v-show="viewState == 1">
-			<button-bar ref="btnbar" view-title="支行列表" :btndisabled="btndisabled" @btnhandle="btnHandle" />
-			<div class="main-content">
-				<div class="searchcon">
-					<el-button size="small" class="searchbtn" @click="clicksearchShow">
-						{{ searchxianshitit }}
-					</el-button>
-					<div v-show="isSearchShow" class="search">
-						<el-form :inline="true" class="tab-header">
-							<el-form-item label="支行名称">
-								<el-input v-model="queryParams.params.name" placeholder="" clearable />
-							</el-form-item>
-							
-						</el-form>
-						<div class="btn" style="text-align: center;">
-							<el-button type="primary" size="small" icon="el-icon-search"
-								@click="dosearch">查询</el-button>
-							<el-button type="primary" size="small" icon="el-icon-refresh"
-								@click="resetQuery">重置</el-button>
-						</div>
-					</div>
-				</div>
-				<!-- Start 项目列表头部 -->
-				<div class="listtop">
-					<div class="tit">支行列表</div>
-				</div>
-				<!-- End 项目列表头部 -->
-				<!-- Start 项目列表 -->
-				<div class="">
-					<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" :row-style="{height: '40px'}">
-						<!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
-						<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
-						<el-table-column label="操作" align="center" width="180">
-							<template slot-scope="scope">
-								<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">编辑</el-button>
-								<el-button type="primary" size="mini" @click="toRelevancyInfo(scope.row)">删除</el-button>
-							</template>
-						</el-table-column>
-						<el-table-column prop="name" label="支行名称" align="center" />
-						<el-table-column prop="shortName" label="支行简称" align="center" />
-						<el-table-column prop="linker" label="联系人" align="center" />
-						<el-table-column prop="linkPhone" label="联系电话" align="center" />
-						<el-table-column prop="address" label="支行地址" align="center" />
-						
-					</el-table>
-				</div>
-				<!-- End 项目列表 -->
-				<div class="pages">
-					<div class="tit" />
-					<!--  翻页  -->
-					<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
-						:limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
-				</div>
-			</div>
-		</div>
-		<!-- 新增修改部分组件 -->
-		<divAdd v-show="viewState == 2|| viewState ==3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
-	</div>
+    <div class="app-container">
+        <div v-show="viewState == 1">
+            <button-bar ref="btnbar" view-title="区域列表" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+            <div class="main-content">
+                <div class="searchcon">
+                    <el-button size="small" class="searchbtn" @click="clicksearchShow">
+                        {{ searchxianshitit }}
+                    </el-button>
+                    <div v-show="isSearchShow" class="search">
+                        <el-form :inline="true" class="tab-header">
+                            <el-form-item label="区域名称">
+                                <el-input v-model="queryParams.params.name" placeholder="" clearable />
+                            </el-form-item>
+
+                        </el-form>
+                        <div class="btn" style="text-align: center;">
+                            <el-button type="primary" size="small" icon="el-icon-search"
+                                @click="dosearch">查询</el-button>
+                            <el-button type="primary" size="small" icon="el-icon-refresh"
+                                @click="resetQuery">重置</el-button>
+                        </div>
+                    </div>
+                </div>
+                <!-- Start 项目列表头部 -->
+                <div class="listtop">
+                    <div class="tit">区域列表</div>
+                </div>
+                <!-- End 项目列表头部 -->
+                <!-- Start 项目列表 -->
+                <div class="">
+                    <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
+                        :row-style="{height: '40px'}">
+                        <!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
+                        <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+                        <el-table-column label="操作" align="center" width="180">
+                            <template slot-scope="scope">
+                                <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">编辑</el-button>
+                                <el-button type="primary" size="mini" @click="toRelevancyInfo(scope.row)">删除</el-button>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="name" label="区域名称" align="center" />
+                        <el-table-column prop="shortName" label="区域简称" align="center" />
+                        <el-table-column prop="linker" label="联系人" align="center" />
+                        <el-table-column prop="linkPhone" label="联系电话" align="center" />
+                        <el-table-column prop="address" label="区域地址" align="center" />
+
+                    </el-table>
+                </div>
+                <!-- End 项目列表 -->
+                <div class="pages">
+                    <div class="tit" />
+                    <!--  翻页  -->
+                    <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
+                        :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
+                </div>
+            </div>
+        </div>
+        <!-- 新增修改部分组件 -->
+        <divAdd v-show="viewState == 2|| viewState ==3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
+    </div>
 </template>
 
 <script>
-	import req from '@/api/network/network.js'
-	import ButtonBar from '@/components/ButtonBar'
-	import Pagination from '@/components/pagination'
-	import pageye from '@/components/pagination/pageye'
-	import divAdd from './indexAdd.vue'
-	export default {
-		name: 'SupplierBankInfoIndex',
-		components: {
-			ButtonBar,
-			Pagination,
-			pageye,
-			divAdd
-		},
-		data() {
-			return {
-				btndisabled: false,
-				viewState: 1, // 1、列表 2、添加 3、修改 4、查看
-				isSearchShow: false,
-				searchxianshitit: '显示查询条件',
-				tableLoading: false,
-				dataList: [],
-				btnList: [
-					{
-						type: 'primary',
-						size: 'small',
-						icon: 'plus',
-						btnKey: 'toAdd',
-						btnLabel: '新增'
-					},
-					{
-						type: 'info',
-						size: 'small',
-						icon: 'cross',
-						btnKey: 'doClose',
-						btnLabel: '关闭'
-					}
-				],
-				queryParams: {
-					current: 1,
-					size: 10,
-					total: 0,
-					params: {
-						name: '',
-						
-					}
-				},
-				sids: []
-			}
-		},
-		mounted() {
-			this.$refs['btnbar'].setButtonList(this.btnList)
-		},
-		created() {
-			this.loadList()
-		},
-		methods: {
-			// 搜索条件效果
-			clicksearchShow() {
-				this.isSearchShow = !this.isSearchShow
-				if (this.isSearchShow) {
-					this.searchxianshitit = '隐藏查询条件'
-				} else {
-					this.searchxianshitit = '显示查询条件'
-				}
-			},
-			btnHandle(btnKey) {
-				switch (btnKey) {
-					case 'toAdd':
-						this.toAdd()
-						break
-					case 'doClose':
-						this.doClose()
-						break
-					default:
-						break
-				}
-			},
-			loadList() {
-				this.tableLoading = true
-				req.bankListPage(this.queryParams).then((resp) => {
-					this.tableLoading = false
-					if (resp.success) {
-						const data = resp.data
-						this.queryParams.total = data.total
-						this.dataList = data.records
-					} else {
-						// 根据resp.code进行异常情况处理
-						this.dataList = []
-						this.queryParams.total = 0
-					}
-				}).catch(() => {
-					this.tableLoading = false
-				})
-			},
-		
-			// 序号
-			indexMethod(index) {
-				var pagestart = (this.queryParams.current - 1) * this.queryParams.size
-				var pageindex = index + 1 + pagestart
-				return pageindex
-			},
-			dosearch() {
-				this.queryParams.current = 1
-				this.loadList()
-			},
-			resetQuery() {
-				this.queryParams = {
-					current: 1,
-					size: 10,
-					total: 0,
-					params: {
-						name: '',
-					}
-				}
-				this.loadList()
-			},
-			toAdd() {
-				this.viewState = 2
-				this.$refs['divadd'].showAdd()
-			},
-			doClose() {
-			  this.$store.dispatch('tagsView/delView', this.$route)
-			  this.$router.go(-1)
-			},
-			toRelevancy(row) {
-				this.viewState = 3
-				this.$refs['divadd'].showEdit(row)
-			},
-			toRelevancyInfo(row) {
+    import req from '@/api/network/network.js'
+    import ButtonBar from '@/components/ButtonBar'
+    import Pagination from '@/components/pagination'
+    import pageye from '@/components/pagination/pageye'
+    import divAdd from './indexAdd.vue'
+    export default {
+        name: 'SupplierBankInfoIndex',
+        components: {
+            ButtonBar,
+            Pagination,
+            pageye,
+            divAdd
+        },
+        data() {
+            return {
+                btndisabled: false,
+                viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+                isSearchShow: false,
+                searchxianshitit: '显示查询条件',
+                tableLoading: false,
+                dataList: [],
+                btnList: [{
+                        type: 'primary',
+                        size: 'small',
+                        icon: 'plus',
+                        btnKey: 'toAdd',
+                        btnLabel: '新增'
+                    },
+                    {
+                        type: 'info',
+                        size: 'small',
+                        icon: 'cross',
+                        btnKey: 'doClose',
+                        btnLabel: '关闭'
+                    }
+                ],
+                queryParams: {
+                    current: 1,
+                    size: 10,
+                    total: 0,
+                    params: {
+                        name: '',
+
+                    }
+                },
+                sids: []
+            }
+        },
+        mounted() {
+            this.$refs['btnbar'].setButtonList(this.btnList)
+        },
+        created() {
+            this.loadList()
+        },
+        methods: {
+            // 搜索条件效果
+            clicksearchShow() {
+                this.isSearchShow = !this.isSearchShow
+                if (this.isSearchShow) {
+                    this.searchxianshitit = '隐藏查询条件'
+                } else {
+                    this.searchxianshitit = '显示查询条件'
+                }
+            },
+            btnHandle(btnKey) {
+                switch (btnKey) {
+                    case 'toAdd':
+                        this.toAdd()
+                        break
+                    case 'doClose':
+                        this.doClose()
+                        break
+                    default:
+                        break
+                }
+            },
+            loadList() {
+                this.tableLoading = true
+                req.bankListPage(this.queryParams).then((resp) => {
+                    this.tableLoading = false
+                    if (resp.success) {
+                        const data = resp.data
+                        this.queryParams.total = data.total
+                        this.dataList = data.records
+                    } else {
+                        // 根据resp.code进行异常情况处理
+                        this.dataList = []
+                        this.queryParams.total = 0
+                    }
+                }).catch(() => {
+                    this.tableLoading = false
+                })
+            },
+
+            // 序号
+            indexMethod(index) {
+                var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+                var pageindex = index + 1 + pagestart
+                return pageindex
+            },
+            dosearch() {
+                this.queryParams.current = 1
+                this.loadList()
+            },
+            resetQuery() {
+                this.queryParams = {
+                    current: 1,
+                    size: 10,
+                    total: 0,
+                    params: {
+                        name: '',
+                    }
+                }
+                this.loadList()
+            },
+            toAdd() {
+                this.viewState = 2
+                this.$refs['divadd'].showAdd()
+            },
+            doClose() {
+                this.$store.dispatch('tagsView/delView', this.$route)
+                this.$router.go(-1)
+            },
+            toRelevancy(row) {
+                this.viewState = 3
+                this.$refs['divadd'].showEdit(row)
+            },
+            toRelevancyInfo(row) {
 
-				const tip = '请确认是否删除所选支行?'
-				this.$confirm(tip, '提示', {
-					confirmButtonText: '确定',
-					cancelButtonText: '取消',
-					type: 'warning'
-				}).then(() => {
-					const loading = this.$loading({
-						lock: true,
-						text: 'Loading',
-						spinner: 'el-icon-loading',
-						background: 'rgba(0, 0, 0, 0.7)'
-					})
-					req.deleteBank(row.sid).then((resp) => {
-						loading.close()
-						if (resp.success) {
-							this.$message({
-								type: 'success',
-								message: resp.msg,
-								showClose: true
-							})
-							this.loadList()
-						} else {
-							// 根据resp.code进行异常情况处理
-						}
-					}).catch(e => {
-						loading.close()
-					})
-				}).catch(() => {})
-			},
-			resetState() {
-				this.viewState = 1
-			}
-		}
-	}
+                const tip = '请确认是否删除所选支行?'
+                this.$confirm(tip, '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    const loading = this.$loading({
+                        lock: true,
+                        text: 'Loading',
+                        spinner: 'el-icon-loading',
+                        background: 'rgba(0, 0, 0, 0.7)'
+                    })
+                    req.deleteBank(row.sid).then((resp) => {
+                        loading.close()
+                        if (resp.success) {
+                            this.$message({
+                                type: 'success',
+                                message: resp.msg,
+                                showClose: true
+                            })
+                            this.loadList()
+                        } else {
+                            // 根据resp.code进行异常情况处理
+                        }
+                    }).catch(e => {
+                        loading.close()
+                    })
+                }).catch(() => {})
+            },
+            resetState() {
+                this.viewState = 1
+            }
+        }
+    }
 </script>
 <style scoped>
 </style>
\ No newline at end of file
diff --git a/src/views/network/indexAdd.vue b/src/views/network/indexAdd.vue
index d0b505a..2cbc841 100644
--- a/src/views/network/indexAdd.vue
+++ b/src/views/network/indexAdd.vue
@@ -1,197 +1,197 @@
 <template>
-	<div>
-
-		<div class="tab-header webtop">
-			<!-- 标题 -->
-			<div>网点信息</div>
-			<!-- start 添加修改按钮 -->
-			<div>
-				<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
-				<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
-			</div>
-			<!-- end 添加修改按钮 -->
-			<!-- end 详情按钮 -->
-		</div>
-
-		<div class="listconadd">
-
-			<el-card class="box-card">
-				<div class="item">
-					<span class="item_text">名称：</span>
-					<el-input v-model="formobj.name" placeholder="" class="item_input" clearable />
-				</div>
-				<div class="item">
-					<span class="item_text">简称：</span>
-					<el-input v-model="formobj.shortName" placeholder="" class="item_input" clearable />
-				</div>
-				<div class="item">
-					<span class="item_text">联系人：</span>
-					<el-input v-model="formobj.linker" placeholder="" class="item_input" clearable />
-				</div>
-				<div class="item">
-					<span class="item_text">电话：</span>
-					<el-input v-model="formobj.linkPhone" placeholder="" class="item_input" clearable />
-				</div>
-
-				<div class="item">
-					<span class="item_text">地址：</span>
-					<el-input v-model="formobj.address" placeholder="" class="item_input" clearable />
-				</div>
-
-			</el-card>
-
-		</div>
-
-	</div>
+    <div>
+
+        <div class="tab-header webtop">
+            <!-- 标题 -->
+            <div>区域信息</div>
+            <!-- start 添加修改按钮 -->
+            <div>
+                <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
+                <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+            </div>
+            <!-- end 添加修改按钮 -->
+            <!-- end 详情按钮 -->
+        </div>
+
+        <div class="listconadd">
+
+            <el-card class="box-card">
+                <div class="item">
+                    <span class="item_text">名称：</span>
+                    <el-input v-model="formobj.name" placeholder="" class="item_input" clearable />
+                </div>
+                <div class="item">
+                    <span class="item_text">简称：</span>
+                    <el-input v-model="formobj.shortName" placeholder="" class="item_input" clearable />
+                </div>
+                <div class="item">
+                    <span class="item_text">联系人：</span>
+                    <el-input v-model="formobj.linker" placeholder="" class="item_input" clearable />
+                </div>
+                <div class="item">
+                    <span class="item_text">电话：</span>
+                    <el-input v-model="formobj.linkPhone" placeholder="" class="item_input" clearable />
+                </div>
+
+                <div class="item">
+                    <span class="item_text">地址：</span>
+                    <el-input v-model="formobj.address" placeholder="" class="item_input" clearable />
+                </div>
+
+            </el-card>
+
+        </div>
+
+    </div>
 </template>
 
 <script>
-	import req from '@/api/network/network.js'
-
-	export default {
-		data() {
-			return {
-				submitdisabled: false,
-				formobj: {
-					sid: "",
-					name: '',
-					shortName: '',
-					linker: '',
-					linkPhone: "",
-					address: "",
-				}
-			}
-		},
-		methods: {
-
-			saveOrUpdate() {
-				console.log('>>>>>>>>>saveOrUpdate', this.formobj)
-				
-				if(this.formobj.sid){
-					req.updateBank(this.formobj)
-						.then(resp => {
-							if (resp.success) {
-								this.$message({
-									showClose: true,
-									type: 'success',
-									message: resp.msg
-								})
-								this.handleReturn('true')
-							} else {
-								// 根据resp.code进行异常情况处理
-							}
-						})
-						.catch(() => {})
-				}else{
-					req.saveBank(this.formobj)
-						.then(resp => {
-							if (resp.success) {
-								this.$message({
-									showClose: true,
-									type: 'success',
-									message: resp.msg
-								})
-								this.handleReturn('true')
-							} else {
-								// 根据resp.code进行异常情况处理
-							}
-						})
-						.catch(() => {})
-				}
-				
-				
-			},
-			handleReturn(isreload) {
-				if (isreload === 'true') this.$emit('reloadlist')
-				this.imgList = []
-				this.formobj = {
-					sid: "",
-					name: '',
-					shortName: '',
-					linker: '',
-					linkPhone: "",
-					address: "",
-				}
-				this.$emit('doback')
-			},
-
-			showAdd() {
-
-			},
-			showEdit(row) {
-				req.bankInit(row.sid)
-					.then(resp => {
-						if (resp.success) {
-							this.formobj = resp.data
-						}
-					})
-					.catch(e => {
-						this.formobj = row
-					})
-			}
-		}
-	}
+    import req from '@/api/network/network.js'
+
+    export default {
+        data() {
+            return {
+                submitdisabled: false,
+                formobj: {
+                    sid: "",
+                    name: '',
+                    shortName: '',
+                    linker: '',
+                    linkPhone: "",
+                    address: "",
+                }
+            }
+        },
+        methods: {
+
+            saveOrUpdate() {
+                console.log('>>>>>>>>>saveOrUpdate', this.formobj)
+
+                if (this.formobj.sid) {
+                    req.updateBank(this.formobj)
+                        .then(resp => {
+                            if (resp.success) {
+                                this.$message({
+                                    showClose: true,
+                                    type: 'success',
+                                    message: resp.msg
+                                })
+                                this.handleReturn('true')
+                            } else {
+                                // 根据resp.code进行异常情况处理
+                            }
+                        })
+                        .catch(() => {})
+                } else {
+                    req.saveBank(this.formobj)
+                        .then(resp => {
+                            if (resp.success) {
+                                this.$message({
+                                    showClose: true,
+                                    type: 'success',
+                                    message: resp.msg
+                                })
+                                this.handleReturn('true')
+                            } else {
+                                // 根据resp.code进行异常情况处理
+                            }
+                        })
+                        .catch(() => {})
+                }
+
+
+            },
+            handleReturn(isreload) {
+                if (isreload === 'true') this.$emit('reloadlist')
+                this.imgList = []
+                this.formobj = {
+                    sid: "",
+                    name: '',
+                    shortName: '',
+                    linker: '',
+                    linkPhone: "",
+                    address: "",
+                }
+                this.$emit('doback')
+            },
+
+            showAdd() {
+
+            },
+            showEdit(row) {
+                req.bankInit(row.sid)
+                    .then(resp => {
+                        if (resp.success) {
+                            this.formobj = resp.data
+                        }
+                    })
+                    .catch(e => {
+                        this.formobj = row
+                    })
+            }
+        }
+    }
 </script>
 <style lang="scss">
-	.box-card {
-		margin-left: 60px;
-		margin-right: 60px;
-		min-width: 70%;
-		margin-top: 20px;
-
-		.item {
-			display: flex;
-			flex-direction: row;
-			align-items: center;
-			margin-top: 15px;
-			height: 40px;
-			line-height: 40px;
-
-			.item_text {
-				flex: 0.8;
-				font-size: 18px;
-				text-align: right;
-			}
-
-			.item_input {
-				flex: 4;
-				font-size: 16px;
-				margin-left: 10px;
-				margin-right: 80px;
-			}
-
-			.item_left_input {
-				width: 20%;
-			}
-
-			.item_left_text {
-				height: 30px;
-				margin-left: 20px;
-				line-height: 30px;
-				color: #018AD2;
-				padding: 0px 15px;
-				border: 1.5px solid #018AD2;
-				border-radius: 5px;
-
-			}
-
-			.item_right {
-				flex: 1;
-				justify-items: center;
-
-				.item_right_list_text {
-					font-size: 16px;
-				}
-
-				.item_right_list_delect {
-					color: #5E94FF;
-					margin-left: 20px;
-					font-size: 16px;
-					text-decoration: underline;
-				}
-			}
-
-		}
-
-	}
+    .box-card {
+        margin-left: 60px;
+        margin-right: 60px;
+        min-width: 70%;
+        margin-top: 20px;
+
+        .item {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            margin-top: 15px;
+            height: 40px;
+            line-height: 40px;
+
+            .item_text {
+                flex: 0.8;
+                font-size: 18px;
+                text-align: right;
+            }
+
+            .item_input {
+                flex: 4;
+                font-size: 16px;
+                margin-left: 10px;
+                margin-right: 80px;
+            }
+
+            .item_left_input {
+                width: 20%;
+            }
+
+            .item_left_text {
+                height: 30px;
+                margin-left: 20px;
+                line-height: 30px;
+                color: #018AD2;
+                padding: 0px 15px;
+                border: 1.5px solid #018AD2;
+                border-radius: 5px;
+
+            }
+
+            .item_right {
+                flex: 1;
+                justify-items: center;
+
+                .item_right_list_text {
+                    font-size: 16px;
+                }
+
+                .item_right_list_delect {
+                    color: #5E94FF;
+                    margin-left: 20px;
+                    font-size: 16px;
+                    text-decoration: underline;
+                }
+            }
+
+        }
+
+    }
 </style>
\ No newline at end of file
diff --git a/src/views/order/allDistributionCount.vue b/src/views/order/allDistributionCount.vue
index c76d0e9..4cedc11 100644
--- a/src/views/order/allDistributionCount.vue
+++ b/src/views/order/allDistributionCount.vue
@@ -1,316 +1,315 @@
 <template>
-	<div class="app-container">
-		<div v-show="viewState == 1">
-			<button-bar ref="btnbar" view-title="总配货统计" :btndisabled="btndisabled" @btnhandle="btnHandle" />
-			<div class="main-content">
-				<div class="searchcon">
-					<el-button size="small" class="searchbtn" @click="clicksearchShow">
-						{{ searchxianshitit }}
-					</el-button>
-					<div v-show="isSearchShow" class="search">
-						<el-form :inline="true" class="tab-header">
-							<el-form-item label="预约开始日期">
-								<el-date-picker v-model="page.params.startDate" @change="selectTime1" type="date"
-									placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-									style="width: 200px;">
-								</el-date-picker>
+    <div class="app-container">
+        <div v-show="viewState == 1">
+            <button-bar ref="btnbar" view-title="总配货统计" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+            <div class="main-content">
+                <div class="searchcon">
+                    <el-button size="small" class="searchbtn" @click="clicksearchShow">
+                        {{ searchxianshitit }}
+                    </el-button>
+                    <div v-show="isSearchShow" class="search">
+                        <el-form :inline="true" class="tab-header">
+                            <el-form-item label="预约日期">
+                                <el-date-picker v-model="page.params.startDate" @change="selectTime1" type="date"
+                                    placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
+                                    style="width: 200px;">
+                                </el-date-picker>
 
-							</el-form-item>
-							<el-form-item label="预约结束日期">
-								<el-date-picker v-model="page.params.endDate" @change="selectTime2" type="date"
-									placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-									style="width: 200px;">
-								</el-date-picker>
+                                至
+                                <el-date-picker v-model="page.params.endDate" @change="selectTime2" type="date"
+                                    placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
+                                    style="width: 200px;">
+                                </el-date-picker>
 
-							</el-form-item>
+                            </el-form-item>
 
-							<el-form-item label="卡券类型">
-								<el-select v-model="page.params.cardType" filterable class="item_input" clearable
-									placeholder="请选择" style="width:100%" @change="cardTypeSelect">
-									<el-option v-for="item in cardTypeList" :key="item.text" :label="item.text"
-										:value="item.sid">
-									</el-option>
-								</el-select>
-							</el-form-item>
+                            <el-form-item label="卡券类型">
+                                <el-select v-model="page.params.cardType" filterable class="item_input" clearable
+                                    placeholder="请选择" style="width:100%" @change="cardTypeSelect">
+                                    <el-option v-for="item in cardTypeList" :key="item.text" :label="item.text"
+                                        :value="item.sid">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
 
 
-						</el-form>
-						<div class="btn" style="text-align: center;">
-							<el-button type="primary" size="small" icon="el-icon-search"
-								@click="dosearch">查询</el-button>
-							<el-button type="primary" size="small" icon="el-icon-refresh"
-								@click="resetQuery">重置</el-button>
-						</div>
-					</div>
-				</div>
-				<!-- Start 项目列表头部 -->
-				<div class="listtop">
-					<div class="tit">配货列表</div>
-				</div>
-				<!-- End 项目列表头部 -->
-				<!-- Start 项目列表 -->
-				<div class="">
-					<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" :cell-style="cell">
-						<!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
-						<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
-						<!-- 	<el-table-column label="操作" align="center" width="120">
+                        </el-form>
+                        <div class="btn" style="text-align: center;">
+                            <el-button type="primary" size="small" icon="el-icon-search"
+                                @click="dosearch">查询</el-button>
+                            <el-button type="primary" size="small" icon="el-icon-refresh"
+                                @click="resetQuery">重置</el-button>
+                        </div>
+                    </div>
+                </div>
+                <!-- Start 项目列表头部 -->
+                <div class="listtop">
+                    <div class="tit">配货列表</div>
+                </div>
+                <!-- End 项目列表头部 -->
+                <!-- Start 项目列表 -->
+                <div class="">
+                    <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" :cell-style="cell">
+                        <!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
+                        <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+                        <!-- 	<el-table-column label="操作" align="center" width="120">
 							<template slot-scope="scope">
 								<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">明细</el-button>
 							</template>
 						</el-table-column> -->
-						<el-table-column prop="cardType" label="卡券类型" align="center" />
-						<el-table-column prop="reserveDate" label="预约日期" align="center" />
-						<el-table-column prop="goodsName" label="商品名称" align="center" />
-						<el-table-column prop="goodsNumber" label="数量(份)" align="center" />
+                        <el-table-column prop="cardType" label="卡券类型" align="center" />
+                        <el-table-column prop="reserveDate" label="预约日期" align="center" />
+                        <el-table-column prop="goodsName" label="商品名称" align="center" />
+                        <el-table-column prop="goodsNumber" label="数量(份)" align="center" />
 
-					</el-table>
-				</div>
-				<!-- End 项目列表 -->
-				<div class="pages">
-					<div class="tit" />
-					<!--  翻页  -->
-					<pagination v-show="dataList.length > 0" :total="page.total" :page.sync="page.current"
-						:limit.sync="page.size" class="pagination" @pagination="loadList" />
-				</div>
-			</div>
-		</div>
-		<!-- End 查询和其列表部分 -->
-		<!-- 新增修改部分组件 -->
-		<divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
-	</div>
+                    </el-table>
+                </div>
+                <!-- End 项目列表 -->
+                <div class="pages">
+                    <div class="tit" />
+                    <!--  翻页  -->
+                    <pagination v-show="dataList.length > 0" :total="page.total" :page.sync="page.current"
+                        :limit.sync="page.size" class="pagination" @pagination="loadList" />
+                </div>
+            </div>
+        </div>
+        <!-- End 查询和其列表部分 -->
+        <!-- 新增修改部分组件 -->
+        <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
+    </div>
 </template>
 
 <script>
-	import req from '@/api/order/order.js'
-	import ButtonBar from '@/components/ButtonBar'
-	import Pagination from '@/components/pagination'
-	import pageye from '@/components/pagination/pageye'
-	import divAdd from './indexInfo.vue'
-	import {
-		getBeforeDate
-	} from '@/utils/index'
-	export default {
-		name: 'SupplierBankInfoIndex',
-		components: {
-			ButtonBar,
-			Pagination,
-			pageye,
-			divAdd,
-		},
-		data() {
-			return {
-				btndisabled: false,
-				viewState: 1, // 1、列表 2、添加 3、修改 4、查看
-				isSearchShow: false,
-				searchxianshitit: '显示查询条件',
-				tableLoading: false,
-				dataList: [],
-				btnList: [{
-						type: 'success',
-						size: 'small',
-						icon: 'export',
-						btnKey: 'build',
-						btnLabel: '导出'
-					},
-					{
-						type: 'info',
-						size: 'small',
-						icon: 'cross',
-						btnKey: 'doClose',
-						btnLabel: '关闭'
-					}
-				],
-				page: {
-					total: 0, // 默认数据总数
-					current: 1, // 默认开始页面
-					size: 10, // 每页的数据条数
-					params: {
-						startDate: "",
-						endDate: "",
-						store: "",
-						cardType: ""
-					},
-				},
-				giftPackList: [],
-				cardTypeList: [{
-						text: "全部",
-						sid: ""
-					},
-					{
-						text: "家庭卡",
-						sid: "1"
-					},
-					{
-						text: "亲情卡",
-						sid: "2"
-					},
-					{
-						text: "企业卡",
-						sid: "3"
-					},
+    import req from '@/api/order/order.js'
+    import ButtonBar from '@/components/ButtonBar'
+    import Pagination from '@/components/pagination'
+    import pageye from '@/components/pagination/pageye'
+    import divAdd from './indexInfo.vue'
+    import {
+        getBeforeDate
+    } from '@/utils/index'
+    export default {
+        name: 'SupplierBankInfoIndex',
+        components: {
+            ButtonBar,
+            Pagination,
+            pageye,
+            divAdd,
+        },
+        data() {
+            return {
+                btndisabled: false,
+                viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+                isSearchShow: false,
+                searchxianshitit: '显示查询条件',
+                tableLoading: false,
+                dataList: [],
+                btnList: [{
+                        type: 'success',
+                        size: 'small',
+                        icon: 'export',
+                        btnKey: 'build',
+                        btnLabel: '导出'
+                    },
+                    {
+                        type: 'info',
+                        size: 'small',
+                        icon: 'cross',
+                        btnKey: 'doClose',
+                        btnLabel: '关闭'
+                    }
+                ],
+                page: {
+                    total: 0, // 默认数据总数
+                    current: 1, // 默认开始页面
+                    size: 10, // 每页的数据条数
+                    params: {
+                        startDate: "",
+                        endDate: "",
+                        store: "",
+                        cardType: ""
+                    },
+                },
+                giftPackList: [],
+                cardTypeList: [{
+                        text: "全部",
+                        sid: ""
+                    },
+                    {
+                        text: "家庭卡",
+                        sid: "1"
+                    },
+                    {
+                        text: "亲情卡",
+                        sid: "2"
+                    },
+                    {
+                        text: "企业卡",
+                        sid: "3"
+                    },
 
-				]
-			}
-		},
-		mounted() {
-			this.$refs['btnbar'].setButtonList(this.btnList)
-		},
-		created() {
-			this.getAllStore()
-			// this.loadList()
-		},
-		methods: {
-			//改变单行蓝色和绿色
-			cell({
-				row,
-				column,
-				rowIndex,
-				columnIndex
-			}) {
-				if (columnIndex == 3) {
-					return 'padding: 0px'
-				}
-			},
-			// 搜索条件效果
-			clicksearchShow() {
-				this.isSearchShow = !this.isSearchShow
-				if (this.isSearchShow) {
-					this.searchxianshitit = '隐藏查询条件'
-				} else {
-					this.searchxianshitit = '显示查询条件'
-				}
-			},
-			btnHandle(btnKey) {
-				switch (btnKey) {
-					case 'build': // 导出
-						this.doBuild()
-						break
-					case 'doClose':
-						this.doClose()
-						break
-					default:
-						break
-				}
-			},
-			selectTime1(val) {
+                ]
+            }
+        },
+        mounted() {
+            this.$refs['btnbar'].setButtonList(this.btnList)
+        },
+        created() {
+            this.getAllStore()
+            // this.loadList()
+        },
+        methods: {
+            //改变单行蓝色和绿色
+            cell({
+                row,
+                column,
+                rowIndex,
+                columnIndex
+            }) {
+                if (columnIndex == 3) {
+                    return 'padding: 0px'
+                }
+            },
+            // 搜索条件效果
+            clicksearchShow() {
+                this.isSearchShow = !this.isSearchShow
+                if (this.isSearchShow) {
+                    this.searchxianshitit = '隐藏查询条件'
+                } else {
+                    this.searchxianshitit = '显示查询条件'
+                }
+            },
+            btnHandle(btnKey) {
+                switch (btnKey) {
+                    case 'build': // 导出
+                        this.doBuild()
+                        break
+                    case 'doClose':
+                        this.doClose()
+                        break
+                    default:
+                        break
+                }
+            },
+            selectTime1(val) {
 
-				console.log('selectTime1:', val)
-				this.page.params.startDate = val
+                console.log('selectTime1:', val)
+                this.page.params.startDate = val
 
-			},
-			selectTime2(val) {
+            },
+            selectTime2(val) {
 
-				console.log('selectTime2:', val)
-				this.page.params.endDate = val
+                console.log('selectTime2:', val)
+                this.page.params.endDate = val
 
-			},
+            },
 
-			giftPackSelect(val) {
-				console.log('>>>>>>>>>giftPackSelect', val)
-				this.page.params.store = val
-			},
-			cardTypeSelect(val) {
-				console.log('>>>>>>>>>cardTypeSelect', val)
-				this.page.params.cardType = val
-			},
-			getAllStore() {
-				req.getAllStore().then((resp) => {
-					if (resp.success) {
-						this.giftPackList = resp.data
-					}
-				}).catch(() => {})
-			},
+            giftPackSelect(val) {
+                console.log('>>>>>>>>>giftPackSelect', val)
+                this.page.params.store = val
+            },
+            cardTypeSelect(val) {
+                console.log('>>>>>>>>>cardTypeSelect', val)
+                this.page.params.cardType = val
+            },
+            getAllStore() {
+                req.getAllStore().then((resp) => {
+                    if (resp.success) {
+                        this.giftPackList = resp.data
+                    }
+                }).catch(() => {})
+            },
 
-			loadList() {
-				this.tableLoading = true
-				req.ZOrderList(this.page).then((resp) => {
-					this.tableLoading = false
-					if (resp.success) {
-						const data = resp.data
-						this.page.total = data.total
-						this.dataList = data.records
-					} else {
-						// 根据resp.code进行异常情况处理
-						this.dataList = []
-						this.page.total = 0
-					}
-				}).catch(() => {
-					this.tableLoading = false
-				})
-			},
+            loadList() {
+                this.tableLoading = true
+                req.ZOrderList(this.page).then((resp) => {
+                    this.tableLoading = false
+                    if (resp.success) {
+                        const data = resp.data
+                        this.page.total = data.total
+                        this.dataList = data.records
+                    } else {
+                        // 根据resp.code进行异常情况处理
+                        this.dataList = []
+                        this.page.total = 0
+                    }
+                }).catch(() => {
+                    this.tableLoading = false
+                })
+            },
 
-			// 序号
-			indexMethod(index) {
-				var pagestart = (this.page.current - 1) * this.page.size
-				var pageindex = index + 1 + pagestart
-				return pageindex
-			},
-			dosearch() {
-				this.page.current = 1
-				this.loadList()
-			},
-			resetQuery() {
-				this.page = {
-					current: 1,
-					size: 10,
-					total: 0,
-					params: {
-						startDate: "",
-						endDate: "",
-						store: "",
-						cardType: ""
-					},
-				}
-				this.loadList()
-			},
+            // 序号
+            indexMethod(index) {
+                var pagestart = (this.page.current - 1) * this.page.size
+                var pageindex = index + 1 + pagestart
+                return pageindex
+            },
+            dosearch() {
+                this.page.current = 1
+                this.loadList()
+            },
+            resetQuery() {
+                this.page = {
+                    current: 1,
+                    size: 10,
+                    total: 0,
+                    params: {
+                        startDate: "",
+                        endDate: "",
+                        store: "",
+                        cardType: ""
+                    },
+                }
+                this.loadList()
+            },
 
-			toRelevancy(row) {
-				this.viewState = 3
-				this.$refs['divadd'].showEdit(row)
-			},
-			resetState() {
-				this.viewState = 1
-			},
-			doClose() {
-				this.$store.dispatch('tagsView/delView', this.$route)
-				this.$router.go(-1)
-			},
+            toRelevancy(row) {
+                this.viewState = 3
+                this.$refs['divadd'].showEdit(row)
+            },
+            resetState() {
+                this.viewState = 1
+            },
+            doClose() {
+                this.$store.dispatch('tagsView/delView', this.$route)
+                this.$router.go(-1)
+            },
 
-			// 导出
-			doBuild() {
-				const loading = this.$loading({
-					lock: true,
-					text: 'Loading',
-					spinner: 'el-icon-loading',
-					background: 'rgba(0, 0, 0, 0.7)'
-				})
+            // 导出
+            doBuild() {
+                const loading = this.$loading({
+                    lock: true,
+                    text: 'Loading',
+                    spinner: 'el-icon-loading',
+                    background: 'rgba(0, 0, 0, 0.7)'
+                })
 
 
-				req.allOrderExportExcel(this.page.params).then((resp) => {
-					loading.close()
-					const blob = new Blob([resp], {
-						type: 'application/vnd.ms-excel'
-					})
-					const fileName = '总配货明细_' + this.page.params.startDate + '.xls'
-					const elink = document.createElement('a')
-					elink.download = fileName
-					elink.style.display = 'nonde'
-					elink.href = URL.createObjectURL(blob)
-					document.body.appendChild(elink)
-					elink.click()
-					URL.revokeObjectURL(elink.href)
-					document.body.removeChild(elink)
-				}).catch(() => {
-					loading.close()
-				})
-			},
+                req.allOrderExportExcel(this.page.params).then((resp) => {
+                    loading.close()
+                    const blob = new Blob([resp], {
+                        type: 'application/vnd.ms-excel'
+                    })
+                    const fileName = '总配货明细_' + this.page.params.startDate + '.xls'
+                    const elink = document.createElement('a')
+                    elink.download = fileName
+                    elink.style.display = 'nonde'
+                    elink.href = URL.createObjectURL(blob)
+                    document.body.appendChild(elink)
+                    elink.click()
+                    URL.revokeObjectURL(elink.href)
+                    document.body.removeChild(elink)
+                }).catch(() => {
+                    loading.close()
+                })
+            },
 
 
-		}
-	}
+        }
+    }
 </script>
 <style scoped>
-	::v-deep .el-table .cell {
-		padding: 0px;
-	}
+    ::v-deep .el-table .cell {
+        padding: 0px;
+    }
 </style>
\ No newline at end of file
diff --git a/src/views/order/distributionCount.vue b/src/views/order/distributionCount.vue
index 36766c8..414ec4d 100644
--- a/src/views/order/distributionCount.vue
+++ b/src/views/order/distributionCount.vue
@@ -1,89 +1,88 @@
 <template>
-	<div class="app-container">
-		<div v-show="viewState == 1">
-			<button-bar ref="btnbar" view-title="配货统计" :btndisabled="btndisabled" @btnhandle="btnHandle" />
-			<div class="main-content">
-				<div class="searchcon">
-					<el-button size="small" class="searchbtn" @click="clicksearchShow">
-						{{ searchxianshitit }}
-					</el-button>
-					<div v-show="isSearchShow" class="search">
-						<el-form :inline="true" class="tab-header">
-							<el-form-item label="预约开始日期">
-								<el-date-picker v-model="page.params.startDate" @change="selectTime1" type="date"
-									placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-									style="width: 200px;">
-								</el-date-picker>
+    <div class="app-container">
+        <div v-show="viewState == 1">
+            <button-bar ref="btnbar" view-title="配货统计" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+            <div class="main-content">
+                <div class="searchcon">
+                    <el-button size="small" class="searchbtn" @click="clicksearchShow">
+                        {{ searchxianshitit }}
+                    </el-button>
+                    <div v-show="isSearchShow" class="search">
+                        <el-form :inline="true" class="tab-header">
+                            <el-form-item label="预约日期">
+                                <el-date-picker v-model="page.params.startDate" @change="selectTime1" type="date"
+                                    placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
+                                    style="width: 200px;">
+                                </el-date-picker>
 
-							</el-form-item>
-							<el-form-item label="预约结束日期">
-								<el-date-picker v-model="page.params.endDate" @change="selectTime2" type="date"
-									placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-									style="width: 200px;">
-								</el-date-picker>
+                                至
+                                <el-date-picker v-model="page.params.endDate" @change="selectTime2" type="date"
+                                    placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
+                                    style="width: 200px;">
+                                </el-date-picker>
 
-							</el-form-item>
-							<el-form-item label="所属支行">
-								<el-select v-model="page.params.bankSid" filterable class="item_input" clearable
-									placeholder="请选择" style="width:100%" @change="bankSelect">
-									<el-option v-for="item in bankList" :key="item.name" :label="item.name"
-										:value="item.sid">
-									</el-option>
-								</el-select>
-							</el-form-item>
-							<el-form-item label="提货门店">
-								<el-select v-model="page.params.store" filterable class="item_input" clearable
-									placeholder="请选择" style="width:100%" @change="giftPackSelect">
-									<el-option v-for="item in giftPackList" :key="item.text" :label="item.text"
-										:value="item.text">
-									</el-option>
-								</el-select>
-							</el-form-item>
-							<el-form-item label="卡券类型">
-								<el-select v-model="page.params.cardType" filterable class="item_input" clearable
-									placeholder="请选择" style="width:100%" @change="cardTypeSelect">
-									<el-option v-for="item in cardTypeList" :key="item.text" :label="item.text"
-										:value="item.sid">
-									</el-option>
-								</el-select>
-							</el-form-item>
+                            </el-form-item>
+                            <el-form-item label="所属区域">
+                                <el-select v-model="page.params.bankSid" filterable class="item_input" clearable
+                                    placeholder="请选择" style="width:100%" @change="bankSelect">
+                                    <el-option v-for="item in bankList" :key="item.name" :label="item.name"
+                                        :value="item.sid">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item label="提货门店">
+                                <el-select v-model="page.params.store" filterable class="item_input" clearable
+                                    placeholder="请选择" style="width:100%" @change="giftPackSelect">
+                                    <el-option v-for="item in giftPackList" :key="item.text" :label="item.text"
+                                        :value="item.text">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item label="卡券类型">
+                                <el-select v-model="page.params.cardType" filterable class="item_input" clearable
+                                    placeholder="请选择" style="width:100%" @change="cardTypeSelect">
+                                    <el-option v-for="item in cardTypeList" :key="item.text" :label="item.text"
+                                        :value="item.sid">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
 
 
-						</el-form>
-						<div class="btn" style="text-align: center;">
-							<el-button type="primary" size="small" icon="el-icon-search"
-								@click="dosearch">查询</el-button>
-							<el-button type="primary" size="small" icon="el-icon-refresh"
-								@click="resetQuery">重置</el-button>
-						</div>
-					</div>
-				</div>
-				<!-- Start 项目列表头部 -->
-				<div class="listtop">
-					<div class="tit">配货列表</div>
-				</div>
-				<!-- End 项目列表头部 -->
-				<!-- Start 项目列表 -->
-				<div class="">
-					<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" :cell-style="cell">
-						<!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
-						<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
-						<!-- 	<el-table-column label="操作" align="center" width="120">
+                        </el-form>
+                        <div class="btn" style="text-align: center;">
+                            <el-button type="primary" size="small" icon="el-icon-search"
+                                @click="dosearch">查询</el-button>
+                            <el-button type="primary" size="small" icon="el-icon-refresh"
+                                @click="resetQuery">重置</el-button>
+                        </div>
+                    </div>
+                </div>
+                <!-- Start 项目列表头部 -->
+                <div class="listtop">
+                    <div class="tit">配货列表</div>
+                </div>
+                <!-- End 项目列表头部 -->
+                <!-- Start 项目列表 -->
+                <div class="">
+                    <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" :cell-style="cell">
+                        <!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
+                        <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+                        <!-- 	<el-table-column label="操作" align="center" width="120">
 							<template slot-scope="scope">
 								<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">明细</el-button>
 							</template>
 						</el-table-column> -->
-						<el-table-column prop="cardType" label="卡券类型" align="center" />
-						<el-table-column prop="reserveDate" label="预约日期" align="center" />
-						<el-table-column prop="bankName" label="所属支行" align="center" />
-						<el-table-column prop="store" label="提货地点" align="center" />
-						<el-table-column prop="goodsName" label="商品名称" align="center" />
-						<el-table-column prop="goodsNumber" label="数量(份)" align="center" />
-						<el-table-column prop="address" label="网点地址" align="center" />
-						<el-table-column prop="linker" label="联系人" align="center" />
-						<el-table-column prop="linkPhone" label="联系电话" align="center" />
+                        <el-table-column prop="cardType" label="卡券类型" align="center" />
+                        <el-table-column prop="reserveDate" label="预约日期" align="center" />
+                        <el-table-column prop="bankName" label="所属区域" align="center" />
+                        <el-table-column prop="store" label="提货地点" align="center" />
+                        <el-table-column prop="goodsName" label="商品名称" align="center" />
+                        <el-table-column prop="goodsNumber" label="数量(份)" align="center" />
+                        <el-table-column prop="address" label="网点地址" align="center" />
+                        <el-table-column prop="linker" label="联系人" align="center" />
+                        <el-table-column prop="linkPhone" label="联系电话" align="center" />
 
-						<!-- <el-table-column label="商品明细" align="center">
+                        <!-- <el-table-column label="商品明细" align="center">
 							<template slot-scope="scope">
 								<div v-for="(item,index) in scope.row.goods" style="width: 100%;height: 100%;">
 									<div style="width: 100%;padding:10px"
@@ -94,273 +93,273 @@
 							</template>
 						</el-table-column> -->
 
-					</el-table>
-				</div>
-				<!-- End 项目列表 -->
-				<div class="pages">
-					<div class="tit" />
-					<!--  翻页  -->
-					<pagination v-show="dataList.length > 0" :total="page.total" :page.sync="page.current"
-						:limit.sync="page.size" class="pagination" @pagination="loadList" />
-				</div>
-			</div>
-		</div>
-		<!-- End 查询和其列表部分 -->
-		<!-- 新增修改部分组件 -->
-		<divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
-	</div>
+                    </el-table>
+                </div>
+                <!-- End 项目列表 -->
+                <div class="pages">
+                    <div class="tit" />
+                    <!--  翻页  -->
+                    <pagination v-show="dataList.length > 0" :total="page.total" :page.sync="page.current"
+                        :limit.sync="page.size" class="pagination" @pagination="loadList" />
+                </div>
+            </div>
+        </div>
+        <!-- End 查询和其列表部分 -->
+        <!-- 新增修改部分组件 -->
+        <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
+    </div>
 </template>
 
 <script>
-	import req from '@/api/order/order.js'
-	import req2 from '@/api/pickupPoint/pickupPoint.js'
-	import ButtonBar from '@/components/ButtonBar'
-	import Pagination from '@/components/pagination'
-	import pageye from '@/components/pagination/pageye'
-	import divAdd from './indexInfo.vue'
-	import {
-		getBeforeDate
-	} from '@/utils/index'
-	export default {
-		name: 'SupplierBankInfoIndex',
-		components: {
-			ButtonBar,
-			Pagination,
-			pageye,
-			divAdd,
-		},
-		data() {
-			return {
-				btndisabled: false,
-				viewState: 1, // 1、列表 2、添加 3、修改 4、查看
-				isSearchShow: false,
-				searchxianshitit: '显示查询条件',
-				tableLoading: false,
-				dataList: [],
-				btnList: [{
-						type: 'success',
-						size: 'small',
-						icon: 'export',
-						btnKey: 'build',
-						btnLabel: '导出'
-					},
-					{
-						type: 'info',
-						size: 'small',
-						icon: 'cross',
-						btnKey: 'doClose',
-						btnLabel: '关闭'
-					}
-				],
-				page: {
-					total: 0, // 默认数据总数
-					current: 1, // 默认开始页面
-					size: 10, // 每页的数据条数
-					params: {
-						startDate: "",
-						endDate: "",
-						store: "",
-						bankSid: "",
-						cardType: ""
-					},
-				},
-				giftPackList: [],
-				bankList: [],
-				cardTypeList: [{
-						text: "全部",
-						sid: ""
-					},
-					{
-						text: "家庭卡",
-						sid: "1"
-					},
-					{
-						text: "亲情卡",
-						sid: "2"
-					},
-					{
-						text: "企业卡",
-						sid: "3"
-					},
+    import req from '@/api/order/order.js'
+    import req2 from '@/api/pickupPoint/pickupPoint.js'
+    import ButtonBar from '@/components/ButtonBar'
+    import Pagination from '@/components/pagination'
+    import pageye from '@/components/pagination/pageye'
+    import divAdd from './indexInfo.vue'
+    import {
+        getBeforeDate
+    } from '@/utils/index'
+    export default {
+        name: 'SupplierBankInfoIndex',
+        components: {
+            ButtonBar,
+            Pagination,
+            pageye,
+            divAdd,
+        },
+        data() {
+            return {
+                btndisabled: false,
+                viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+                isSearchShow: false,
+                searchxianshitit: '显示查询条件',
+                tableLoading: false,
+                dataList: [],
+                btnList: [{
+                        type: 'success',
+                        size: 'small',
+                        icon: 'export',
+                        btnKey: 'build',
+                        btnLabel: '导出'
+                    },
+                    {
+                        type: 'info',
+                        size: 'small',
+                        icon: 'cross',
+                        btnKey: 'doClose',
+                        btnLabel: '关闭'
+                    }
+                ],
+                page: {
+                    total: 0, // 默认数据总数
+                    current: 1, // 默认开始页面
+                    size: 10, // 每页的数据条数
+                    params: {
+                        startDate: "",
+                        endDate: "",
+                        store: "",
+                        bankSid: "",
+                        cardType: ""
+                    },
+                },
+                giftPackList: [],
+                bankList: [],
+                cardTypeList: [{
+                        text: "全部",
+                        sid: ""
+                    },
+                    {
+                        text: "家庭卡",
+                        sid: "1"
+                    },
+                    {
+                        text: "亲情卡",
+                        sid: "2"
+                    },
+                    {
+                        text: "企业卡",
+                        sid: "3"
+                    },
 
-				]
-			}
-		},
-		mounted() {
-			this.$refs['btnbar'].setButtonList(this.btnList)
-		},
-		created() {
-			this.getAllStore()
-			// this.loadList()
-			this.getBankList()
-		},
-		methods: {
-			//改变单行蓝色和绿色
-			cell({
-				row,
-				column,
-				rowIndex,
-				columnIndex
-			}) {
-				if (columnIndex == 3) {
-					return 'padding: 0px'
-				}
-			},
-			// 搜索条件效果
-			clicksearchShow() {
-				this.isSearchShow = !this.isSearchShow
-				if (this.isSearchShow) {
-					this.searchxianshitit = '隐藏查询条件'
-				} else {
-					this.searchxianshitit = '显示查询条件'
-				}
-			},
-			btnHandle(btnKey) {
-				switch (btnKey) {
-					case 'build': // 导出
-						this.doBuild()
-						break
-					case 'doClose':
-						this.doClose()
-						break
-					default:
-						break
-				}
-			},
-			selectTime1(val) {
+                ]
+            }
+        },
+        mounted() {
+            this.$refs['btnbar'].setButtonList(this.btnList)
+        },
+        created() {
+            this.getAllStore()
+            // this.loadList()
+            this.getBankList()
+        },
+        methods: {
+            //改变单行蓝色和绿色
+            cell({
+                row,
+                column,
+                rowIndex,
+                columnIndex
+            }) {
+                if (columnIndex == 3) {
+                    return 'padding: 0px'
+                }
+            },
+            // 搜索条件效果
+            clicksearchShow() {
+                this.isSearchShow = !this.isSearchShow
+                if (this.isSearchShow) {
+                    this.searchxianshitit = '隐藏查询条件'
+                } else {
+                    this.searchxianshitit = '显示查询条件'
+                }
+            },
+            btnHandle(btnKey) {
+                switch (btnKey) {
+                    case 'build': // 导出
+                        this.doBuild()
+                        break
+                    case 'doClose':
+                        this.doClose()
+                        break
+                    default:
+                        break
+                }
+            },
+            selectTime1(val) {
 
-				console.log('selectTime1:', val)
-				this.page.params.startDate = val
+                console.log('selectTime1:', val)
+                this.page.params.startDate = val
 
-			},
-			selectTime2(val) {
+            },
+            selectTime2(val) {
 
-				console.log('selectTime2:', val)
-				this.page.params.endDate = val
+                console.log('selectTime2:', val)
+                this.page.params.endDate = val
 
-			},
+            },
 
-			giftPackSelect(val) {
-				console.log('>>>>>>>>>giftPackSelect', val)
-				this.page.params.store = val
-			},
+            giftPackSelect(val) {
+                console.log('>>>>>>>>>giftPackSelect', val)
+                this.page.params.store = val
+            },
 
-			getBankList() {
-				req2.bankSelect()
-					.then(resp => {
-						console.log('>>>>>>>>>getBankList', resp.data)
-						this.bankList = resp.data
+            getBankList() {
+                req2.bankSelect()
+                    .then(resp => {
+                        console.log('>>>>>>>>>getBankList', resp.data)
+                        this.bankList = resp.data
 
-					})
-					.catch(() => {})
-			},
-			bankSelect(val) {
-				console.log('>>>>>>>>>bankSelect', val)
-				this.page.params.bankSid = val
-			},
-			cardTypeSelect(val) {
-				console.log('>>>>>>>>>cardTypeSelect', val)
-				this.page.params.cardType = val
-			},
-			getAllStore() {
-				req.getAllStore().then((resp) => {
-					if (resp.success) {
-						this.giftPackList = resp.data
-					}
-				}).catch(() => {})
-			},
+                    })
+                    .catch(() => {})
+            },
+            bankSelect(val) {
+                console.log('>>>>>>>>>bankSelect', val)
+                this.page.params.bankSid = val
+            },
+            cardTypeSelect(val) {
+                console.log('>>>>>>>>>cardTypeSelect', val)
+                this.page.params.cardType = val
+            },
+            getAllStore() {
+                req.getAllStore().then((resp) => {
+                    if (resp.success) {
+                        this.giftPackList = resp.data
+                    }
+                }).catch(() => {})
+            },
 
-			loadList() {
-				this.tableLoading = true
-				req.distributionList(this.page).then((resp) => {
-					this.tableLoading = false
-					if (resp.success) {
-						const data = resp.data
-						this.page.total = data.total
-						this.dataList = data.records
-					} else {
-						// 根据resp.code进行异常情况处理
-						this.dataList = []
-						this.page.total = 0
-					}
-				}).catch(() => {
-					this.tableLoading = false
-				})
-			},
+            loadList() {
+                this.tableLoading = true
+                req.distributionList(this.page).then((resp) => {
+                    this.tableLoading = false
+                    if (resp.success) {
+                        const data = resp.data
+                        this.page.total = data.total
+                        this.dataList = data.records
+                    } else {
+                        // 根据resp.code进行异常情况处理
+                        this.dataList = []
+                        this.page.total = 0
+                    }
+                }).catch(() => {
+                    this.tableLoading = false
+                })
+            },
 
-			// 序号
-			indexMethod(index) {
-				var pagestart = (this.page.current - 1) * this.page.size
-				var pageindex = index + 1 + pagestart
-				return pageindex
-			},
-			dosearch() {
-				this.page.current = 1
-				this.loadList()
-			},
-			resetQuery() {
-				this.page = {
-					current: 1,
-					size: 10,
-					total: 0,
-					params: {
-						startDate: "",
-						endDate: "",
-						store: "",
-						bankSid: "",
-						cardType: ""
-					},
-				}
-				this.loadList()
-			},
+            // 序号
+            indexMethod(index) {
+                var pagestart = (this.page.current - 1) * this.page.size
+                var pageindex = index + 1 + pagestart
+                return pageindex
+            },
+            dosearch() {
+                this.page.current = 1
+                this.loadList()
+            },
+            resetQuery() {
+                this.page = {
+                    current: 1,
+                    size: 10,
+                    total: 0,
+                    params: {
+                        startDate: "",
+                        endDate: "",
+                        store: "",
+                        bankSid: "",
+                        cardType: ""
+                    },
+                }
+                this.loadList()
+            },
 
-			toRelevancy(row) {
-				this.viewState = 3
-				this.$refs['divadd'].showEdit(row)
-			},
-			resetState() {
-				this.viewState = 1
-			},
-			doClose() {
-				this.$store.dispatch('tagsView/delView', this.$route)
-				this.$router.go(-1)
-			},
+            toRelevancy(row) {
+                this.viewState = 3
+                this.$refs['divadd'].showEdit(row)
+            },
+            resetState() {
+                this.viewState = 1
+            },
+            doClose() {
+                this.$store.dispatch('tagsView/delView', this.$route)
+                this.$router.go(-1)
+            },
 
-			// 导出
-			doBuild() {
-				const loading = this.$loading({
-					lock: true,
-					text: 'Loading',
-					spinner: 'el-icon-loading',
-					background: 'rgba(0, 0, 0, 0.7)'
-				})
+            // 导出
+            doBuild() {
+                const loading = this.$loading({
+                    lock: true,
+                    text: 'Loading',
+                    spinner: 'el-icon-loading',
+                    background: 'rgba(0, 0, 0, 0.7)'
+                })
 
 
-				req.distributionExportExcel(this.page.params).then((resp) => {
-					loading.close()
-					const blob = new Blob([resp], {
-						type: 'application/vnd.ms-excel'
-					})
-					const fileName = '网点配货明细_' + this.page.params.startDate + '.xls'
-					const elink = document.createElement('a')
-					elink.download = fileName
-					elink.style.display = 'nonde'
-					elink.href = URL.createObjectURL(blob)
-					document.body.appendChild(elink)
-					elink.click()
-					URL.revokeObjectURL(elink.href)
-					document.body.removeChild(elink)
-				}).catch(() => {
-					loading.close()
-				})
-			},
+                req.distributionExportExcel(this.page.params).then((resp) => {
+                    loading.close()
+                    const blob = new Blob([resp], {
+                        type: 'application/vnd.ms-excel'
+                    })
+                    const fileName = '网点配货明细_' + this.page.params.startDate + '.xls'
+                    const elink = document.createElement('a')
+                    elink.download = fileName
+                    elink.style.display = 'nonde'
+                    elink.href = URL.createObjectURL(blob)
+                    document.body.appendChild(elink)
+                    elink.click()
+                    URL.revokeObjectURL(elink.href)
+                    document.body.removeChild(elink)
+                }).catch(() => {
+                    loading.close()
+                })
+            },
 
 
-		}
-	}
+        }
+    }
 </script>
 <style scoped>
-	::v-deep .el-table .cell {
-		padding: 0px;
-	}
+    ::v-deep .el-table .cell {
+        padding: 0px;
+    }
 </style>
\ No newline at end of file
diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index f67d115..e3c9bc0 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -1,342 +1,340 @@
 <template>
-	<div class="app-container">
-		<div v-show="viewState == 1">
-			<button-bar ref="btnbar" view-title="订单列表" :btndisabled="btndisabled" @btnhandle="btnHandle" />
-			<div class="main-content">
-				<div class="searchcon">
-					<el-button size="small" class="searchbtn" @click="clicksearchShow">
-						{{ searchxianshitit }}
-					</el-button>
-					<div v-show="isSearchShow" class="search">
-						<el-form :inline="true" class="tab-header">
-							<el-form-item label="预约开始日期">
-								<el-date-picker v-model="page.params.startDate" @change="selectTime1" type="date"
-									placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-									style="width: 200px;">
-								</el-date-picker>
+    <div class="app-container">
+        <div v-show="viewState == 1">
+            <button-bar ref="btnbar" view-title="订单列表" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+            <div class="main-content">
+                <div class="searchcon">
+                    <el-button size="small" class="searchbtn" @click="clicksearchShow">
+                        {{ searchxianshitit }}
+                    </el-button>
+                    <div v-show="isSearchShow" class="search">
+                        <el-form :inline="true" class="tab-header">
+                            <el-form-item label="预约日期">
+                                <el-date-picker v-model="page.params.startDate" @change="selectTime1" type="date"
+                                    placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
+                                    style="width: 200px;">
+                                </el-date-picker>
 
-							</el-form-item>
-							<el-form-item label="预约结束日期">
-								<el-date-picker v-model="page.params.endDate" @change="selectTime2" type="date"
-									placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-									style="width: 200px;">
-								</el-date-picker>
+                                至
+                                <el-date-picker v-model="page.params.endDate" @change="selectTime2" type="date"
+                                    placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
+                                    style="width: 200px;">
+                                </el-date-picker>
 
-							</el-form-item>
-							<el-form-item label="所属支行">
-								<el-select v-model="page.params.bankSid" filterable class="item_input" clearable
-									placeholder="请选择" style="width:100%" @change="bankSelect">
-									<el-option v-for="item in bankList" :key="item.name" :label="item.name"
-										:value="item.sid">
-									</el-option>
-								</el-select>
-							</el-form-item>
+                            </el-form-item>
+                            <el-form-item label="所属区域">
+                                <el-select v-model="page.params.bankSid" filterable class="item_input" clearable
+                                    placeholder="请选择" style="width:100%" @change="bankSelect">
+                                    <el-option v-for="item in bankList" :key="item.name" :label="item.name"
+                                        :value="item.sid">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
 
-							<el-form-item label="提货门店">
-								<el-select v-model="page.params.store" filterable class="item_input" clearable
-									placeholder="请选择" style="width:100%" @change="giftPackSelect">
-									<el-option v-for="item in giftPackList" :key="item.text" :label="item.text"
-										:value="item.text">
-									</el-option>
-								</el-select>
-							</el-form-item>
-							
-							
-							<el-form-item label="卡券类型">
-								<el-select v-model="page.params.cardType" filterable class="item_input" clearable
-									placeholder="请选择" style="width:100%" @change="cardTypeSelect">
-									<el-option v-for="item in cardTypeList" :key="item.text" :label="item.text"
-										:value="item.sid">
-									</el-option>
-								</el-select>
-							</el-form-item>
-							
+                            <el-form-item label="提货门店">
+                                <el-select v-model="page.params.store" filterable class="item_input" clearable
+                                    placeholder="请选择" style="width:100%" @change="giftPackSelect">
+                                    <el-option v-for="item in giftPackList" :key="item.text" :label="item.text"
+                                        :value="item.text">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
 
-						</el-form>
-						<div class="btn" style="text-align: center;">
-							<el-button type="primary" size="small" icon="el-icon-search"
-								@click="dosearch">查询</el-button>
-							<el-button type="primary" size="small" icon="el-icon-refresh"
-								@click="resetQuery">重置</el-button>
-						</div>
-					</div>
-				</div>
-				<!-- Start 项目列表头部 -->
-				<div class="listtop">
-					<div class="tit">订单列表</div>
-				</div>
-				<!-- End 项目列表头部 -->
-				<!-- Start 项目列表 -->
-				<div class="">
-					<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
-						<!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
-						<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
-						<el-table-column label="操作" align="center" width="120">
-							<template slot-scope="scope">
-								<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">明细</el-button>
-							</template>
-						</el-table-column>
-						<el-table-column prop="cardType" label="卡券类型" align="center" />
-						<el-table-column prop="reserveDate" label="预约日期" align="center" />
-						<el-table-column prop="bankName" label="所属支行" align="center" />
-							<el-table-column prop="store" label="提货地点" align="center" />
-						<el-table-column prop="serialNumber" label="卡券序列号" align="center" />
-						<el-table-column prop="bagName" label="礼包类型" align="center" />
-						<el-table-column prop="userName" label="用户名称" align="center" />
-						<el-table-column prop="userPhone" label="联系电话" align="center" />
-					</el-table>
-				</div>
-				<!-- End 项目列表 -->
-				<div class="pages">
-					<div class="tit" />
-					<!--  翻页  -->
-					<pagination v-show="dataList.length > 0" :total="page.total" :page.sync="page.current"
-						:limit.sync="page.size" class="pagination" @pagination="loadList" />
-				</div>
-			</div>
-		</div>
-		<!-- End 查询和其列表部分 -->
-		<!-- 新增修改部分组件 -->
-		<divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
-	</div>
+
+                            <el-form-item label="卡券类型">
+                                <el-select v-model="page.params.cardType" filterable class="item_input" clearable
+                                    placeholder="请选择" style="width:100%" @change="cardTypeSelect">
+                                    <el-option v-for="item in cardTypeList" :key="item.text" :label="item.text"
+                                        :value="item.sid">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+
+
+                        </el-form>
+                        <div class="btn" style="text-align: center;">
+                            <el-button type="primary" size="small" icon="el-icon-search"
+                                @click="dosearch">查询</el-button>
+                            <el-button type="primary" size="small" icon="el-icon-refresh"
+                                @click="resetQuery">重置</el-button>
+                        </div>
+                    </div>
+                </div>
+                <!-- Start 项目列表头部 -->
+                <div class="listtop">
+                    <div class="tit">订单列表</div>
+                </div>
+                <!-- End 项目列表头部 -->
+                <!-- Start 项目列表 -->
+                <div class="">
+                    <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
+                        <!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
+                        <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+                        <el-table-column label="操作" align="center" width="120">
+                            <template slot-scope="scope">
+                                <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">明细</el-button>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="cardType" label="卡券类型" align="center" />
+                        <el-table-column prop="reserveDate" label="预约日期" align="center" />
+                        <el-table-column prop="bankName" label="所属区域" align="center" />
+                        <el-table-column prop="store" label="提货地点" align="center" />
+                        <el-table-column prop="serialNumber" label="卡券序列号" align="center" />
+                        <el-table-column prop="bagName" label="礼包类型" align="center" />
+                        <el-table-column prop="userName" label="用户名称" align="center" />
+                        <el-table-column prop="userPhone" label="联系电话" align="center" />
+                    </el-table>
+                </div>
+                <!-- End 项目列表 -->
+                <div class="pages">
+                    <div class="tit" />
+                    <!--  翻页  -->
+                    <pagination v-show="dataList.length > 0" :total="page.total" :page.sync="page.current"
+                        :limit.sync="page.size" class="pagination" @pagination="loadList" />
+                </div>
+            </div>
+        </div>
+        <!-- End 查询和其列表部分 -->
+        <!-- 新增修改部分组件 -->
+        <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
+    </div>
 </template>
 
 <script>
-	import req from '@/api/order/order.js'
-	import req2 from '@/api/pickupPoint/pickupPoint.js'
-	import ButtonBar from '@/components/ButtonBar'
-	import Pagination from '@/components/pagination'
-	import pageye from '@/components/pagination/pageye'
-	import divAdd from './indexInfo.vue'
-	import {
-		getBeforeDate
-	} from '@/utils/index'
-	export default {
-		name: 'SupplierBankInfoIndex',
-		components: {
-			ButtonBar,
-			Pagination,
-			pageye,
-			divAdd,
-		},
-		data() {
-			return {
-				btndisabled: false,
-				viewState: 1, // 1、列表 2、添加 3、修改 4、查看
-				isSearchShow: false,
-				searchxianshitit: '显示查询条件',
-				tableLoading: false,
-				dataList: [],
-				btnList: [{
-						type: 'success',
-						size: 'small',
-						icon: 'export',
-						btnKey: 'build',
-						btnLabel: '导出'
-					},
-					{
-						type: 'info',
-						size: 'small',
-						icon: 'cross',
-						btnKey: 'doClose',
-						btnLabel: '关闭'
-					}
-				],
-				page: {
-					total: 0, // 默认数据总数
-					current: 1, // 默认开始页面
-					size: 10, // 每页的数据条数
-					params: {
-						startDate: "",
-						endDate: "",
-						store: "",
-						bankSid:"",
-						cardType:""
-					},
-				},
-				giftPackList: [],
-				bankList: [],
-				cardTypeList:[
-					{
-						text :"全部",
-						sid:""
-					},
-					{
-						text :"家庭卡",
-						sid:"1"
-					},
-					{
-						text :"亲情卡",
-						sid:"2"
-					},
-					{
-						text :"企业卡",
-						sid:"3"
-					},
-					
-				]
-			}
-		},
-		mounted() {
-			this.$refs['btnbar'].setButtonList(this.btnList)
-		},
-		created() {
-			this.getAllStore()
-			// this.loadList()
-			this.getBankList()
-		},
-		methods: {
-			// 搜索条件效果
-			clicksearchShow() {
-				this.isSearchShow = !this.isSearchShow
-				if (this.isSearchShow) {
-					this.searchxianshitit = '隐藏查询条件'
-				} else {
-					this.searchxianshitit = '显示查询条件'
-				}
-			},
-			btnHandle(btnKey) {
-				switch (btnKey) {
-					case 'build': // 导出
-						this.doBuild()
-						break
-					case 'doClose':
-						this.doClose()
-						break
-					default:
-						break
-				}
-			},
-			selectTime1(val) {
+    import req from '@/api/order/order.js'
+    import req2 from '@/api/pickupPoint/pickupPoint.js'
+    import ButtonBar from '@/components/ButtonBar'
+    import Pagination from '@/components/pagination'
+    import pageye from '@/components/pagination/pageye'
+    import divAdd from './indexInfo.vue'
+    import {
+        getBeforeDate
+    } from '@/utils/index'
+    export default {
+        name: 'SupplierBankInfoIndex',
+        components: {
+            ButtonBar,
+            Pagination,
+            pageye,
+            divAdd,
+        },
+        data() {
+            return {
+                btndisabled: false,
+                viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+                isSearchShow: false,
+                searchxianshitit: '显示查询条件',
+                tableLoading: false,
+                dataList: [],
+                btnList: [{
+                        type: 'success',
+                        size: 'small',
+                        icon: 'export',
+                        btnKey: 'build',
+                        btnLabel: '导出'
+                    },
+                    {
+                        type: 'info',
+                        size: 'small',
+                        icon: 'cross',
+                        btnKey: 'doClose',
+                        btnLabel: '关闭'
+                    }
+                ],
+                page: {
+                    total: 0, // 默认数据总数
+                    current: 1, // 默认开始页面
+                    size: 10, // 每页的数据条数
+                    params: {
+                        startDate: "",
+                        endDate: "",
+                        store: "",
+                        bankSid: "",
+                        cardType: ""
+                    },
+                },
+                giftPackList: [],
+                bankList: [],
+                cardTypeList: [{
+                        text: "全部",
+                        sid: ""
+                    },
+                    {
+                        text: "家庭卡",
+                        sid: "1"
+                    },
+                    {
+                        text: "亲情卡",
+                        sid: "2"
+                    },
+                    {
+                        text: "企业卡",
+                        sid: "3"
+                    },
+
+                ]
+            }
+        },
+        mounted() {
+            this.$refs['btnbar'].setButtonList(this.btnList)
+        },
+        created() {
+            this.getAllStore()
+            // this.loadList()
+            this.getBankList()
+        },
+        methods: {
+            // 搜索条件效果
+            clicksearchShow() {
+                this.isSearchShow = !this.isSearchShow
+                if (this.isSearchShow) {
+                    this.searchxianshitit = '隐藏查询条件'
+                } else {
+                    this.searchxianshitit = '显示查询条件'
+                }
+            },
+            btnHandle(btnKey) {
+                switch (btnKey) {
+                    case 'build': // 导出
+                        this.doBuild()
+                        break
+                    case 'doClose':
+                        this.doClose()
+                        break
+                    default:
+                        break
+                }
+            },
+            selectTime1(val) {
 
-				console.log('selectTime1:', val)
-				this.page.params.startDate = val
+                console.log('selectTime1:', val)
+                this.page.params.startDate = val
 
-			},
-			selectTime2(val) {
+            },
+            selectTime2(val) {
 
-				console.log('selectTime2:', val)
-				this.page.params.endDate = val
+                console.log('selectTime2:', val)
+                this.page.params.endDate = val
 
-			},
+            },
 
-			giftPackSelect(val) {
-				console.log('>>>>>>>>>giftPackSelect', val)
-				this.page.params.store = val
-			},
-			getBankList() {
-				req2.bankSelect()
-					.then(resp => {
-						console.log('>>>>>>>>>getBankList', resp.data)
-						this.bankList = resp.data
+            giftPackSelect(val) {
+                console.log('>>>>>>>>>giftPackSelect', val)
+                this.page.params.store = val
+            },
+            getBankList() {
+                req2.bankSelect()
+                    .then(resp => {
+                        console.log('>>>>>>>>>getBankList', resp.data)
+                        this.bankList = resp.data
 
-					})
-					.catch(() => {})
-			},
-			bankSelect(val) {
-				console.log('>>>>>>>>>bankSelect', val)
-				this.page.params.bankSid = val
-			},
-			cardTypeSelect(val){
-				console.log('>>>>>>>>>cardTypeSelect', val)
-				this.page.params.cardType = val
-			},
-			getAllStore() {
-				req.getAllStore().then((resp) => {
-					if (resp.success) {
-						this.giftPackList = resp.data
-					}
-				}).catch(() => {})
-			},
+                    })
+                    .catch(() => {})
+            },
+            bankSelect(val) {
+                console.log('>>>>>>>>>bankSelect', val)
+                this.page.params.bankSid = val
+            },
+            cardTypeSelect(val) {
+                console.log('>>>>>>>>>cardTypeSelect', val)
+                this.page.params.cardType = val
+            },
+            getAllStore() {
+                req.getAllStore().then((resp) => {
+                    if (resp.success) {
+                        this.giftPackList = resp.data
+                    }
+                }).catch(() => {})
+            },
 
-			loadList() {
-				this.tableLoading = true
-				req.orderList(this.page).then((resp) => {
-					this.tableLoading = false
-					if (resp.success) {
-						const data = resp.data
-						this.page.total = data.total
-						this.dataList = data.records
-					} else {
-						// 根据resp.code进行异常情况处理
-						this.dataList = []
-						this.page.total = 0
-					}
-				}).catch(() => {
-					this.tableLoading = false
-				})
-			},
+            loadList() {
+                this.tableLoading = true
+                req.orderList(this.page).then((resp) => {
+                    this.tableLoading = false
+                    if (resp.success) {
+                        const data = resp.data
+                        this.page.total = data.total
+                        this.dataList = data.records
+                    } else {
+                        // 根据resp.code进行异常情况处理
+                        this.dataList = []
+                        this.page.total = 0
+                    }
+                }).catch(() => {
+                    this.tableLoading = false
+                })
+            },
 
-			// 序号
-			indexMethod(index) {
-				var pagestart = (this.page.current - 1) * this.page.size
-				var pageindex = index + 1 + pagestart
-				return pageindex
-			},
-			dosearch() {
-				this.page.current = 1
-				this.loadList()
-			},
-			resetQuery() {
-				this.page = {
-					current: 1,
-					size: 10,
-					total: 0,
-					params: {
-						startDate: "",
-						endDate: "",
-						store: "",
-						bankSid:"",
-						cardType:""
-					},
-				}
-				this.loadList()
-			},
+            // 序号
+            indexMethod(index) {
+                var pagestart = (this.page.current - 1) * this.page.size
+                var pageindex = index + 1 + pagestart
+                return pageindex
+            },
+            dosearch() {
+                this.page.current = 1
+                this.loadList()
+            },
+            resetQuery() {
+                this.page = {
+                    current: 1,
+                    size: 10,
+                    total: 0,
+                    params: {
+                        startDate: "",
+                        endDate: "",
+                        store: "",
+                        bankSid: "",
+                        cardType: ""
+                    },
+                }
+                this.loadList()
+            },
 
-			toRelevancy(row) {
-				this.viewState = 3
-				this.$refs['divadd'].showEdit(row)
-			},
-			resetState() {
-				this.viewState = 1
-			},
-			doClose() {
-				this.$store.dispatch('tagsView/delView', this.$route)
-				this.$router.go(-1)
-			},
+            toRelevancy(row) {
+                this.viewState = 3
+                this.$refs['divadd'].showEdit(row)
+            },
+            resetState() {
+                this.viewState = 1
+            },
+            doClose() {
+                this.$store.dispatch('tagsView/delView', this.$route)
+                this.$router.go(-1)
+            },
 
-			// 导出
-			doBuild() {
-				const loading = this.$loading({
-					lock: true,
-					text: 'Loading',
-					spinner: 'el-icon-loading',
-					background: 'rgba(0, 0, 0, 0.7)'
-				})
+            // 导出
+            doBuild() {
+                const loading = this.$loading({
+                    lock: true,
+                    text: 'Loading',
+                    spinner: 'el-icon-loading',
+                    background: 'rgba(0, 0, 0, 0.7)'
+                })
 
 
-				req.exportExcel(this.page.params).then((resp) => {
-					loading.close()
-					const blob = new Blob([resp], {
-						type: 'application/vnd.ms-excel'
-					})
-					const fileName = '订单明细_' + this.page.params.startDate + '.xls'
-					const elink = document.createElement('a')
-					elink.download = fileName
-					elink.style.display = 'nonde'
-					elink.href = URL.createObjectURL(blob)
-					document.body.appendChild(elink)
-					elink.click()
-					URL.revokeObjectURL(elink.href)
-					document.body.removeChild(elink)
-				}).catch(() => {
-					loading.close()
-				})
-			},
+                req.exportExcel(this.page.params).then((resp) => {
+                    loading.close()
+                    const blob = new Blob([resp], {
+                        type: 'application/vnd.ms-excel'
+                    })
+                    const fileName = '订单明细_' + this.page.params.startDate + '.xls'
+                    const elink = document.createElement('a')
+                    elink.download = fileName
+                    elink.style.display = 'nonde'
+                    elink.href = URL.createObjectURL(blob)
+                    document.body.appendChild(elink)
+                    elink.click()
+                    URL.revokeObjectURL(elink.href)
+                    document.body.removeChild(elink)
+                }).catch(() => {
+                    loading.close()
+                })
+            },
 
 
-		}
-	}
+        }
+    }
 </script>
 <style scoped>
 </style>
\ No newline at end of file
diff --git a/src/views/order/subBranch.vue b/src/views/order/subBranch.vue
index 79ca59c..fbab494 100644
--- a/src/views/order/subBranch.vue
+++ b/src/views/order/subBranch.vue
@@ -1,335 +1,334 @@
 <template>
-	<div class="app-container">
-		<div v-show="viewState == 1">
-			<button-bar ref="btnbar" view-title="支行配货统计" :btndisabled="btndisabled" @btnhandle="btnHandle" />
-			<div class="main-content">
-				<div class="searchcon">
-					<el-button size="small" class="searchbtn" @click="clicksearchShow">
-						{{ searchxianshitit }}
-					</el-button>
-					<div v-show="isSearchShow" class="search">
-						<el-form :inline="true" class="tab-header">
-							<el-form-item label="预约开始日期">
-								<el-date-picker v-model="page.params.startDate" @change="selectTime1" type="date"
-									placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-									style="width: 200px;">
-								</el-date-picker>
+    <div class="app-container">
+        <div v-show="viewState == 1">
+            <button-bar ref="btnbar" view-title="区域配货统计" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+            <div class="main-content">
+                <div class="searchcon">
+                    <el-button size="small" class="searchbtn" @click="clicksearchShow">
+                        {{ searchxianshitit }}
+                    </el-button>
+                    <div v-show="isSearchShow" class="search">
+                        <el-form :inline="true" class="tab-header">
+                            <el-form-item label="预约日期">
+                                <el-date-picker v-model="page.params.startDate" @change="selectTime1" type="date"
+                                    placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
+                                    style="width: 200px;">
+                                </el-date-picker>
 
-							</el-form-item>
-							<el-form-item label="预约结束日期">
-								<el-date-picker v-model="page.params.endDate" @change="selectTime2" type="date"
-									placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-									style="width: 200px;">
-								</el-date-picker>
+                                至
+                                <el-date-picker v-model="page.params.endDate" @change="selectTime2" type="date"
+                                    placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
+                                    style="width: 200px;">
+                                </el-date-picker>
 
-							</el-form-item>
+                            </el-form-item>
 
-							<el-form-item label="支行名称">
-								<el-select v-model="page.params.bankSid" filterable class="item_input" clearable
-									placeholder="请选择" style="width:100%" @change="bankSelect">
-									<el-option v-for="item in bankList" :key="item.name" :label="item.name"
-										:value="item.sid">
-									</el-option>
-								</el-select>
-							</el-form-item>
+                            <el-form-item label="区域名称">
+                                <el-select v-model="page.params.bankSid" filterable class="item_input" clearable
+                                    placeholder="请选择" style="width:100%" @change="bankSelect">
+                                    <el-option v-for="item in bankList" :key="item.name" :label="item.name"
+                                        :value="item.sid">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
 
-							<el-form-item label="卡券类型">
-								<el-select v-model="page.params.cardType" filterable class="item_input" clearable
-									placeholder="请选择" style="width:100%" @change="cardTypeSelect">
-									<el-option v-for="item in cardTypeList" :key="item.text" :label="item.text"
-										:value="item.sid">
-									</el-option>
-								</el-select>
-							</el-form-item>
+                            <el-form-item label="卡券类型">
+                                <el-select v-model="page.params.cardType" filterable class="item_input" clearable
+                                    placeholder="请选择" style="width:100%" @change="cardTypeSelect">
+                                    <el-option v-for="item in cardTypeList" :key="item.text" :label="item.text"
+                                        :value="item.sid">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
 
 
-						</el-form>
-						<div class="btn" style="text-align: center;">
-							<el-button type="primary" size="small" icon="el-icon-search"
-								@click="dosearch">查询</el-button>
-							<el-button type="primary" size="small" icon="el-icon-refresh"
-								@click="resetQuery">重置</el-button>
-						</div>
-					</div>
-				</div>
-				<!-- Start 项目列表头部 -->
-				<div class="listtop">
-					<div class="tit">配货列表</div>
-				</div>
-				<!-- End 项目列表头部 -->
-				<!-- Start 项目列表 -->
-				<div class="">
-					<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" :cell-style="cell">
-						<!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
-						<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
-						<!-- 	<el-table-column label="操作" align="center" width="120">
+                        </el-form>
+                        <div class="btn" style="text-align: center;">
+                            <el-button type="primary" size="small" icon="el-icon-search"
+                                @click="dosearch">查询</el-button>
+                            <el-button type="primary" size="small" icon="el-icon-refresh"
+                                @click="resetQuery">重置</el-button>
+                        </div>
+                    </div>
+                </div>
+                <!-- Start 项目列表头部 -->
+                <div class="listtop">
+                    <div class="tit">配货列表</div>
+                </div>
+                <!-- End 项目列表头部 -->
+                <!-- Start 项目列表 -->
+                <div class="">
+                    <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" :cell-style="cell">
+                        <!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
+                        <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+                        <!-- 	<el-table-column label="操作" align="center" width="120">
 							<template slot-scope="scope">
 								<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">明细</el-button>
 							</template>
 						</el-table-column> -->
-						<el-table-column prop="cardType" label="卡券类型" align="center" />
-						<el-table-column prop="reserveDate" label="预约日期" align="center" />
-						<el-table-column prop="bankName" label="支行名称" align="center" />
-						<el-table-column prop="goodsName" label="商品名称" align="center" />
-						<el-table-column prop="goodsNumber" label="数量(份)" align="center" />
-						<el-table-column prop="address" label="支行地址" align="center" />
-						<el-table-column prop="linker" label="联系人" align="center" />
-						<el-table-column prop="linkPhone" label="联系电话" align="center" />
+                        <el-table-column prop="cardType" label="卡券类型" align="center" />
+                        <el-table-column prop="reserveDate" label="预约日期" align="center" />
+                        <el-table-column prop="bankName" label="区域名称" align="center" />
+                        <el-table-column prop="goodsName" label="商品名称" align="center" />
+                        <el-table-column prop="goodsNumber" label="数量(份)" align="center" />
+                        <el-table-column prop="address" label="区域地址" align="center" />
+                        <el-table-column prop="linker" label="联系人" align="center" />
+                        <el-table-column prop="linkPhone" label="联系电话" align="center" />
 
-					</el-table>
-				</div>
-				<!-- End 项目列表 -->
-				<div class="pages">
-					<div class="tit" />
-					<!--  翻页  -->
-					<pagination v-show="dataList.length > 0" :total="page.total" :page.sync="page.current"
-						:limit.sync="page.size" class="pagination" @pagination="loadList" />
-				</div>
-			</div>
-		</div>
-		<!-- End 查询和其列表部分 -->
-		<!-- 新增修改部分组件 -->
-		<divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
-	</div>
+                    </el-table>
+                </div>
+                <!-- End 项目列表 -->
+                <div class="pages">
+                    <div class="tit" />
+                    <!--  翻页  -->
+                    <pagination v-show="dataList.length > 0" :total="page.total" :page.sync="page.current"
+                        :limit.sync="page.size" class="pagination" @pagination="loadList" />
+                </div>
+            </div>
+        </div>
+        <!-- End 查询和其列表部分 -->
+        <!-- 新增修改部分组件 -->
+        <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
+    </div>
 </template>
 
 <script>
-	import req from '@/api/order/order.js'
-	import req2 from '@/api/pickupPoint/pickupPoint.js'
-	import ButtonBar from '@/components/ButtonBar'
-	import Pagination from '@/components/pagination'
-	import pageye from '@/components/pagination/pageye'
-	import divAdd from './indexInfo.vue'
-	import {
-		getBeforeDate
-	} from '@/utils/index'
-	export default {
-		name: 'SupplierBankInfoIndex',
-		components: {
-			ButtonBar,
-			Pagination,
-			pageye,
-			divAdd,
-		},
-		data() {
-			return {
-				btndisabled: false,
-				viewState: 1, // 1、列表 2、添加 3、修改 4、查看
-				isSearchShow: false,
-				searchxianshitit: '显示查询条件',
-				tableLoading: false,
-				dataList: [],
-				btnList: [{
-						type: 'success',
-						size: 'small',
-						icon: 'export',
-						btnKey: 'build',
-						btnLabel: '导出'
-					},
-					{
-						type: 'info',
-						size: 'small',
-						icon: 'cross',
-						btnKey: 'doClose',
-						btnLabel: '关闭'
-					}
-				],
-				page: {
-					total: 0, // 默认数据总数
-					current: 1, // 默认开始页面
-					size: 10, // 每页的数据条数
-					params: {
-						startDate: "",
-						endDate: "",
-						bankSid: "",
-						cardType: ""
-					},
-				},
-				bankList: [],
-				cardTypeList: [{
-						text: "全部",
-						sid: ""
-					},
-					{
-						text: "家庭卡",
-						sid: "1"
-					},
-					{
-						text: "亲情卡",
-						sid: "2"
-					},
-					{
-						text: "企业卡",
-						sid: "3"
-					},
+    import req from '@/api/order/order.js'
+    import req2 from '@/api/pickupPoint/pickupPoint.js'
+    import ButtonBar from '@/components/ButtonBar'
+    import Pagination from '@/components/pagination'
+    import pageye from '@/components/pagination/pageye'
+    import divAdd from './indexInfo.vue'
+    import {
+        getBeforeDate
+    } from '@/utils/index'
+    export default {
+        name: 'SupplierBankInfoIndex',
+        components: {
+            ButtonBar,
+            Pagination,
+            pageye,
+            divAdd,
+        },
+        data() {
+            return {
+                btndisabled: false,
+                viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+                isSearchShow: false,
+                searchxianshitit: '显示查询条件',
+                tableLoading: false,
+                dataList: [],
+                btnList: [{
+                        type: 'success',
+                        size: 'small',
+                        icon: 'export',
+                        btnKey: 'build',
+                        btnLabel: '导出'
+                    },
+                    {
+                        type: 'info',
+                        size: 'small',
+                        icon: 'cross',
+                        btnKey: 'doClose',
+                        btnLabel: '关闭'
+                    }
+                ],
+                page: {
+                    total: 0, // 默认数据总数
+                    current: 1, // 默认开始页面
+                    size: 10, // 每页的数据条数
+                    params: {
+                        startDate: "",
+                        endDate: "",
+                        bankSid: "",
+                        cardType: ""
+                    },
+                },
+                bankList: [],
+                cardTypeList: [{
+                        text: "全部",
+                        sid: ""
+                    },
+                    {
+                        text: "家庭卡",
+                        sid: "1"
+                    },
+                    {
+                        text: "亲情卡",
+                        sid: "2"
+                    },
+                    {
+                        text: "企业卡",
+                        sid: "3"
+                    },
 
-				]
-			}
-		},
-		mounted() {
-			this.$refs['btnbar'].setButtonList(this.btnList)
-		},
-		created() {
-			this.getAllStore()
-			// this.loadList()
-		},
-		methods: {
+                ]
+            }
+        },
+        mounted() {
+            this.$refs['btnbar'].setButtonList(this.btnList)
+        },
+        created() {
+            this.getAllStore()
+            // this.loadList()
+        },
+        methods: {
 
-			//改变单行蓝色和绿色
-			cell({
-				row,
-				column,
-				rowIndex,
-				columnIndex
-			}) {
-				if (columnIndex == 3) {
-					return 'padding: 0px'
-				}
-			},
-			// 搜索条件效果
-			clicksearchShow() {
-				this.isSearchShow = !this.isSearchShow
-				if (this.isSearchShow) {
-					this.searchxianshitit = '隐藏查询条件'
-				} else {
-					this.searchxianshitit = '显示查询条件'
-				}
-			},
-			btnHandle(btnKey) {
-				switch (btnKey) {
-					case 'build': // 导出
-						this.doBuild()
-						break
-					case 'doClose':
-						this.doClose()
-						break
-					default:
-						break
-				}
-			},
-			selectTime1(val) {
+            //改变单行蓝色和绿色
+            cell({
+                row,
+                column,
+                rowIndex,
+                columnIndex
+            }) {
+                if (columnIndex == 3) {
+                    return 'padding: 0px'
+                }
+            },
+            // 搜索条件效果
+            clicksearchShow() {
+                this.isSearchShow = !this.isSearchShow
+                if (this.isSearchShow) {
+                    this.searchxianshitit = '隐藏查询条件'
+                } else {
+                    this.searchxianshitit = '显示查询条件'
+                }
+            },
+            btnHandle(btnKey) {
+                switch (btnKey) {
+                    case 'build': // 导出
+                        this.doBuild()
+                        break
+                    case 'doClose':
+                        this.doClose()
+                        break
+                    default:
+                        break
+                }
+            },
+            selectTime1(val) {
 
-				console.log('selectTime1:', val)
-				this.page.params.startDate = val
+                console.log('selectTime1:', val)
+                this.page.params.startDate = val
 
-			},
-			selectTime2(val) {
+            },
+            selectTime2(val) {
 
-				console.log('selectTime2:', val)
-				this.page.params.endDate = val
+                console.log('selectTime2:', val)
+                this.page.params.endDate = val
 
-			},
+            },
 
-			bankSelect(val) {
-				console.log('>>>>>>>>>bankSelect', val)
-				this.page.params.bankSid = val
-			},
-			cardTypeSelect(val) {
-				console.log('>>>>>>>>>cardTypeSelect', val)
-				this.page.params.cardType = val
-			},
-			getAllStore() {
-				req2.bankSelect()
-					.then(resp => {
-						console.log('>>>>>>>>>bankSelect', resp)
+            bankSelect(val) {
+                console.log('>>>>>>>>>bankSelect', val)
+                this.page.params.bankSid = val
+            },
+            cardTypeSelect(val) {
+                console.log('>>>>>>>>>cardTypeSelect', val)
+                this.page.params.cardType = val
+            },
+            getAllStore() {
+                req2.bankSelect()
+                    .then(resp => {
+                        console.log('>>>>>>>>>bankSelect', resp)
 
-						this.bankList = resp.data
+                        this.bankList = resp.data
 
-						console.log('>>>>>>>>>bankSelect', this.bankList)
-					})
-					.catch(() => {})
-			},
+                        console.log('>>>>>>>>>bankSelect', this.bankList)
+                    })
+                    .catch(() => {})
+            },
 
-			loadList() {
-				this.tableLoading = true
-				req.bankOrderList(this.page).then((resp) => {
-					this.tableLoading = false
-					if (resp.success) {
-						const data = resp.data
-						this.page.total = data.total
-						this.dataList = data.records
-					} else {
-						// 根据resp.code进行异常情况处理
-						this.dataList = []
-						this.page.total = 0
-					}
-				}).catch(() => {
-					this.tableLoading = false
-				})
-			},
+            loadList() {
+                this.tableLoading = true
+                req.bankOrderList(this.page).then((resp) => {
+                    this.tableLoading = false
+                    if (resp.success) {
+                        const data = resp.data
+                        this.page.total = data.total
+                        this.dataList = data.records
+                    } else {
+                        // 根据resp.code进行异常情况处理
+                        this.dataList = []
+                        this.page.total = 0
+                    }
+                }).catch(() => {
+                    this.tableLoading = false
+                })
+            },
 
-			// 序号
-			indexMethod(index) {
-				var pagestart = (this.page.current - 1) * this.page.size
-				var pageindex = index + 1 + pagestart
-				return pageindex
-			},
-			dosearch() {
-				this.page.current = 1
-				this.loadList()
-			},
-			resetQuery() {
-				this.page = {
-					current: 1,
-					size: 10,
-					total: 0,
-					params: {
-						startDate: "",
-						endDate: "",
-						bankSid: "",
-						cardType: ""
-					},
-				}
-				this.loadList()
-			},
+            // 序号
+            indexMethod(index) {
+                var pagestart = (this.page.current - 1) * this.page.size
+                var pageindex = index + 1 + pagestart
+                return pageindex
+            },
+            dosearch() {
+                this.page.current = 1
+                this.loadList()
+            },
+            resetQuery() {
+                this.page = {
+                    current: 1,
+                    size: 10,
+                    total: 0,
+                    params: {
+                        startDate: "",
+                        endDate: "",
+                        bankSid: "",
+                        cardType: ""
+                    },
+                }
+                this.loadList()
+            },
 
-			toRelevancy(row) {
-				this.viewState = 3
-				this.$refs['divadd'].showEdit(row)
-			},
-			resetState() {
-				this.viewState = 1
-			},
-			doClose() {
-				this.$store.dispatch('tagsView/delView', this.$route)
-				this.$router.go(-1)
-			},
+            toRelevancy(row) {
+                this.viewState = 3
+                this.$refs['divadd'].showEdit(row)
+            },
+            resetState() {
+                this.viewState = 1
+            },
+            doClose() {
+                this.$store.dispatch('tagsView/delView', this.$route)
+                this.$router.go(-1)
+            },
 
-			// 导出
-			doBuild() {
-				const loading = this.$loading({
-					lock: true,
-					text: 'Loading',
-					spinner: 'el-icon-loading',
-					background: 'rgba(0, 0, 0, 0.7)'
-				})
+            // 导出
+            doBuild() {
+                const loading = this.$loading({
+                    lock: true,
+                    text: 'Loading',
+                    spinner: 'el-icon-loading',
+                    background: 'rgba(0, 0, 0, 0.7)'
+                })
 
 
-				req.bankOrderExportExcel(this.page.params).then((resp) => {
-					loading.close()
-					const blob = new Blob([resp], {
-						type: 'application/vnd.ms-excel'
-					})
-					const fileName = '支行配货明细_' + this.page.params.startDate + '.xls'
-					const elink = document.createElement('a')
-					elink.download = fileName
-					elink.style.display = 'nonde'
-					elink.href = URL.createObjectURL(blob)
-					document.body.appendChild(elink)
-					elink.click()
-					URL.revokeObjectURL(elink.href)
-					document.body.removeChild(elink)
-				}).catch(() => {
-					loading.close()
-				})
-			},
+                req.bankOrderExportExcel(this.page.params).then((resp) => {
+                    loading.close()
+                    const blob = new Blob([resp], {
+                        type: 'application/vnd.ms-excel'
+                    })
+                    const fileName = '支行配货明细_' + this.page.params.startDate + '.xls'
+                    const elink = document.createElement('a')
+                    elink.download = fileName
+                    elink.style.display = 'nonde'
+                    elink.href = URL.createObjectURL(blob)
+                    document.body.appendChild(elink)
+                    elink.click()
+                    URL.revokeObjectURL(elink.href)
+                    document.body.removeChild(elink)
+                }).catch(() => {
+                    loading.close()
+                })
+            },
 
 
-		}
-	}
+        }
+    }
 </script>
 <style scoped>
-	::v-deep .el-table .cell {
-		padding: 0px;
-	}
+    ::v-deep .el-table .cell {
+        padding: 0px;
+    }
 </style>
\ No newline at end of file