2023-12-17

2023-12-17 16:30:01 +08:00
parent 8745009add
commit e59ba641d0
10 changed files with 853 additions and 49 deletions
--- a/.env.development
+++ b/.env.development
@@ -8,6 +8,6 @@ VUE_APP_BASE_API = '/api'
 # VUE_APP_URL = "http://jianguan.yyundong.com/shgfapi"


-VUE_APP_URL = "http://192.168.2.106:7201"
+VUE_APP_URL = "http://5sbheh.natappfree.cc"
 VUE_APP_REPORT_URL = "http://192.168.2.106:7202"
 ##VUE_APP_URL = "http://8.130.39.13:8112"
--- a/src/api/marketingCard/marketingCard.js
+++ b/src/api/marketingCard/marketingCard.js
@@ -13,6 +13,14 @@ export default {
 		});
 	},
 	
+	// 修改上架/下架状态
+	updateIsEnable: function(sid,isEnable) {
+		return request({
+			url: '/lpkgiftbag/isGrounding/'+sid+"/"+isEnable
+		});
+	},
+	
+	
 	// 获取发放网点列表
 	bankList: function(data) {
 		return request({
--- a/src/api/order/order.js
+++ b/src/api/order/order.js
@@ -56,5 +56,50 @@ export default {
 		});
 	},
 	
+	
+	// 获取支行汇总列表
+	bankOrderList: function(data) {
+		return request({
+			url: '/lpksreservoorder/orderListByBank',
+			method: 'post',
+			data: data
+		});
+	},
+	
+	// 导出支行报表
+	bankOrderExportExcel: function(data) {
+		return request({
+			url: '/lpksreservoorder/exportExcelByBank',
+			method: 'post',
+			responseType: 'blob', // 表明返回服务器返回的数据类型
+			data: data,
+			headers: {
+				'Content-Type': 'application/json'
+			}
+		});
+	},
+	
+	// 获取支行汇总列表
+	ZOrderList: function(data) {
+		return request({
+			url: '/lpksreservoorder/orderListByZ',
+			method: 'post',
+			data: data
+		});
+	},
+	
+	// 导出总报表
+	allOrderExportExcel: function(data) {
+		return request({
+			url: '/lpksreservoorder/exportExcelByZ',
+			method: 'post',
+			responseType: 'blob', // 表明返回服务器返回的数据类型
+			data: data,
+			headers: {
+				'Content-Type': 'application/json'
+			}
+		});
+	},
+	

 }
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -174,23 +174,23 @@
 						},
 						{
 							alwaysShow: true,
-							component: "distributionCount",
+							component: "subBranch",
 							meta: {
 								icon: "el-icon-help",
 								title: "支行配货统计",
 							},
-							name: "/order/distributionCount",
-							path: "/order/distributionCount",
+							name: "/order/subBranch",
+							path: "/order/subBranch",
 						},
 						{
 							alwaysShow: true,
-							component: "distributionCount",
+							component: "allDistributionCount",
 							meta: {
 								icon: "el-icon-help",
 								title: "总配货统计",
 							},
-							name: "/order/distributionCount",
-							path: "/order/distributionCount",
+							name: "/order/allDistributionCount",
+							path: "/order/allDistributionCount",
 						},
 						
 					]
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -183,19 +183,19 @@ export const constantRoutes = [
          title: '网点配货统计'
        }
      },{
-        path: '/order/distributionCount',
+        path: '/order/subBranch',
        component: () =>
-          import('@/views/order/distributionCount.vue'),
-        name: 'distributionCount',
+          import('@/views/order/subBranch.vue'),
+        name: 'subBranch',
        meta: {
          title: '支行配货统计'
        }
      },
 	  {
-	    path: '/order/distributionCount',
+	    path: '/order/allDistributionCount',
 	    component: () =>
-	      import('@/views/order/distributionCount.vue'),
-	    name: 'distributionCount',
+	      import('@/views/order/allDistributionCount.vue'),
+	    name: 'allDistributionCount',
 	    meta: {
 	      title: '总配货统计'
 	    }
--- a/src/views/marketingCard/pickupCardSet.vue
+++ b/src/views/marketingCard/pickupCardSet.vue
@@ -53,7 +53,7 @@
 							</el-table-column>
 							<el-table-column prop="bagName" label="绑定礼包" align="center">
 							</el-table-column>
-						<!-- 	<el-table-column prop="bagName" label="发放数量" align="center">
+							<!-- 	<el-table-column prop="bagName" label="发放数量" align="center">
 							</el-table-column> -->
 						</el-table>

@@ -119,7 +119,7 @@
 							</el-table-column>
 							<el-table-column prop="buildDate" label="发放网点" align="center">
 							</el-table-column>
-						
+
 						</el-table>

 						<pagination :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size"
@@ -162,6 +162,59 @@



+					</el-card>
+
+				</div>
+			</el-tab-pane>
+
+			<el-tab-pane label="批量发行" name="batch">
+
+				<div class="listconadd">
+
+					<el-card class="box-card">
+						<div class="item">
+							<span class="item_text">起始日期：</span>
+							<el-date-picker v-model="batchInfo.startDate" @change="selectbatchInfo1" type="date"
+								placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" class="item_input">
+							</el-date-picker>
+						</div>
+						<div class="item">
+							<span class="item_text">终止日期：</span>
+							<el-date-picker v-model="batchInfo.endDate" @change="selectbatchInfo2" type="date"
+								placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" class="item_input">
+							</el-date-picker>
+						</div>
+						<div class="item" style="margin-top: 30px;">
+							<span class="item_text">导入数据：</span>
+							<div class="item_input">
+								<el-upload ref="upload" class="upload-demo" :action="updateAction"
+									:on-success="handleSuccess" :on-remove="handleRemove" :file-list="uploadFileList"
+									accept=".xls,.xlsx" name="file" :auto-upload="false" :multiple="false" :limit="1"
+									:data="batchInfo">
+
+									<span v-if="batchInfo.startDate==''&& batchInfo.endDate==''"
+										style="color: #999;">请先选择日期</span>
+
+									<el-button slot="trigger" v-if="batchInfo.startDate!=''&& batchInfo.endDate!=''"
+										size="small" type="primary">选取文件</el-button>
+									<el-button style="margin-left: 10px;" size="small" type="success"
+										v-if="batchInfo.startDate!=''&& batchInfo.endDate!=''"
+										@click="submitUpload">上传</el-button>
+								</el-upload>
+								<!-- <span style="color: #018AD2; border-bottom: 1px #018AD2 solid;" @click="importFile">{{batchInfo.urlName}}</span> -->
+							</div>
+
+						</div>
+
+						<!-- 	<div
+							style="width: 100%;display: flex;flex-direction: row;justify-content: center;margin-top: 20px;">
+							<span
+								style="background: #018AD2; color: #fff;padding: 5px 15px;border-radius: 5px;font-size: 16px;"
+								@click="confirmImport">确定</span>
+						</div> -->
+
+
+
 					</el-card>

 				</div>
@@ -268,7 +321,13 @@
 					end: "",
 					bankSid: ""
 				},
-				bankList: []
+				bankList: [],
+				batchInfo: {
+					startDate: "",
+					endDate: "",
+				},
+				updateAction: process.env.VUE_APP_BASE_API + '/lpkgiftcard/getExcelInfo2',
+				uploadFileList: [],
 			}
 		},
 		created() {
@@ -293,7 +352,7 @@

 				if (tab.name == 'addrole') {
 					this.giftBagList()
-				} else {
+				} else if (tab.name == 'roleList') {
 					this.getPageList()
 				}
 			},
@@ -319,7 +378,14 @@
 				this.page.params.endDate = val

 			},
-
+			selectbatchInfo1(val) {
+				console.log('selectbatchInfo1:', val)
+				this.batchInfo.startDate = val
+			},
+			selectbatchInfo2(val) {
+				console.log('selectbatchInfo2:', val)
+				this.batchInfo.endDate = val
+			},
 			getPageList() {
 				req.recordListPage(this.page)
 					.then(resp => {
@@ -506,6 +572,52 @@
 				this.editDialog = false
 			},

+			handleSuccess(resp, file, fileList) {
+
+				if (resp.success) {
+					this.$message({
+						showClose: true,
+						type: "success",
+						message: resp.msg
+					})
+
+				} else {
+					this.$message({
+						showClose: true,
+						type: "error",
+						message: resp.msg
+					})
+				}
+
+				// console.log('handleSuccess----', resp)
+				// const _this = this
+				// const upfile = {
+				// 	fileTypeId: 6, // '文件类型: 1=帐户余额;2=应收账款;3=库存货值;4=在途货值;5=预付款;',
+				// 	fileTypeName: '报表文件', // '文件类型名: 1=帐户余额;2=应收账款;3=库存货值;4=在途货值;5=预付款',
+				// 	fileSrcName: resp.data.sourceFileName, // '原文件名',
+				// 	filePath: resp.data.filePath, // '文件的相对路径',
+				// 	fullUrl: resp.data.fullUrl, // '文件完整的访问URL',
+				// 	fileuid: file.uid // '文件完整的访问URL',
+				// }
+				// _this.reportFileList.push(upfile)
+			},
+			handleRemove(file, fileList) {
+				const _this = this
+				let delete_index = 0
+				for (let i = 0, len = _this.reportFileList.length; i < len; i++) {
+					if (file.uid === _this.reportFileList[i].fileuid) {
+						delete_index = i
+						break
+					}
+				}
+				_this.reportFileList.splice(delete_index, 1)
+			},
+			
+			submitUpload() {
+				this.$refs.upload.submit()
+
+			}
+
 		}
 	}
 </script>
--- a/src/views/order/allDistributionCount.vue
+++ b/src/views/order/allDistributionCount.vue
@@ -0,0 +1,282 @@
+<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>
+
+							</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-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">
+							<template slot-scope="scope">
+								<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">明细</el-button>
+							</template>
+						</el-table-column> -->
+						<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>
+</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: ""
+					},
+				},
+				giftPackList: []
+			}
+		},
+		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
+
+			},
+			selectTime2(val) {
+
+				console.log('selectTime2:', val)
+				this.page.params.endDate = val
+
+			},
+
+			giftPackSelect(val) {
+				console.log('>>>>>>>>>giftPackSelect', val)
+				this.page.params.store = 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
+				})
+			},
+
+			// 序号
+			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: ""
+					},
+				}
+				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)
+			},
+
+			// 导出
+			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()
+				})
+			},
+
+
+		}
+	}
+</script>
+<style scoped>
+	::v-deep .el-table .cell {
+		padding: 0px;
+	}
+</style>
--- a/src/views/order/distributionCount.vue
+++ b/src/views/order/distributionCount.vue
@@ -23,7 +23,14 @@
 								</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">
@@ -52,26 +59,28 @@
 					<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-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="reserveDate" label="预约日期" align="center" />
-						<el-table-column prop="store" label="提货门店" align="center" />
-						<!-- <el-table-column prop="goodsInfo" label="商品明细" align="center" /> -->
-						
-						  <el-table-column label="商品明细" align="center"  >
-						    <!-- 分行显示 -->
-						    <template slot-scope="scope">
+						<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 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"
-										:style="{'border-bottom':(index!=scope.row.goods.length-1?'1px solid #DFE6EC':'none')}">{{item}}</div>
+									<div style="width: 100%;padding:10px"
+										:style="{'border-bottom':(index!=scope.row.goods.length-1?'1px solid #DFE6EC':'none')}">
+										{{item}}</div>
 								</div>
-							
-						    </template>
-						  </el-table-column>
-						
+
+							</template>
+						</el-table-column> -->
+
 					</el-table>
 				</div>
 				<!-- End 项目列表 -->
@@ -91,6 +100,7 @@

 <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'
@@ -136,10 +146,12 @@
 					params: {
 						startDate: "",
 						endDate: "",
-						store: ""
+						store: "",
+						bankSid: ""
 					},
 				},
-				giftPackList: []
+				giftPackList: [],
+				bankList: [],
 			}
 		},
 		mounted() {
@@ -148,14 +160,20 @@
 		created() {
 			this.getAllStore()
 			this.loadList()
+			this.getBankList()
 		},
 		methods: {
-			 //改变单行蓝色和绿色
-			        cell({row , column , rowIndex , columnIndex}){
-			          if(columnIndex==3){
-			            return 'padding: 0px'
-			          }
-			        },
+			//改变单行蓝色和绿色
+			cell({
+				row,
+				column,
+				rowIndex,
+				columnIndex
+			}) {
+				if (columnIndex == 3) {
+					return 'padding: 0px'
+				}
+			},
 			// 搜索条件效果
 			clicksearchShow() {
 				this.isSearchShow = !this.isSearchShow
@@ -195,6 +213,20 @@
 				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
+			},
+
 			getAllStore() {
 				req.getAllStore().then((resp) => {
 					if (resp.success) {
@@ -239,7 +271,8 @@
 					params: {
 						startDate: "",
 						endDate: "",
-						store: ""
+						store: "",
+						bankSid: ""
 					},
 				}
 				this.loadList()
@@ -272,7 +305,7 @@
 					const blob = new Blob([resp], {
 						type: 'application/vnd.ms-excel'
 					})
-					const fileName = '配货明细_' + this.page.params.startDate + '.xls'
+					const fileName = '网点配货明细_' + this.page.params.startDate + '.xls'
 					const elink = document.createElement('a')
 					elink.download = fileName
 					elink.style.display = 'nonde'
@@ -292,6 +325,6 @@
 </script>
 <style scoped>
 	::v-deep .el-table .cell {
-		padding:  0px 	;
+		padding: 0px;
 	}
 </style>
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -23,6 +23,14 @@
 								</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
@@ -57,10 +65,11 @@
 								<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">明细</el-button>
 							</template>
 						</el-table-column>
-						<el-table-column prop="code" 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="code" label="提货序列号" align="center" />
 						<el-table-column prop="bagName" label="礼包类型" align="center" />
-						<el-table-column prop="reserveDate" label="预约时间" align="center" />
-						<el-table-column prop="store" label="提货门店" align="center" />
 						<el-table-column prop="userName" label="用户名称" align="center" />
 						<el-table-column prop="userPhone" label="联系电话" align="center" />
 					</el-table>
@@ -82,6 +91,7 @@

 <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'
@@ -127,10 +137,12 @@
 					params: {
 						startDate: "",
 						endDate: "",
-						store: ""
+						store: "",
+						bankSid:""
 					},
 				},
-				giftPackList: []
+				giftPackList: [],
+				bankList: [],
 			}
 		},
 		mounted() {
@@ -139,6 +151,7 @@
 		created() {
 			this.getAllStore()
 			this.loadList()
+			this.getBankList()
 		},
 		methods: {
 			// 搜索条件效果
@@ -179,7 +192,19 @@
 				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
+			},
 			getAllStore() {
 				req.getAllStore().then((resp) => {
 					if (resp.success) {
@@ -224,7 +249,8 @@
 					params: {
 						startDate: "",
 						endDate: "",
-						store: ""
+						store: "",
+						bankSid:""
 					},
 				}
 				this.loadList()
--- a/src/views/order/subBranch.vue
+++ b/src/views/order/subBranch.vue
@@ -0,0 +1,298 @@
+<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>
+
+							</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-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>
+						<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="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>
+				</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: ""
+					},
+				},
+				bankList: []
+			}
+		},
+		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
+
+			},
+			selectTime2(val) {
+
+				console.log('selectTime2:', val)
+				this.page.params.endDate = val
+
+			},
+
+			bankSelect(val) {
+				console.log('>>>>>>>>>bankSelect', val)
+				this.page.params.bankSid = val
+			},
+
+			getAllStore() {
+				req2.bankSelect()
+					.then(resp => {
+						console.log('>>>>>>>>>bankSelect', resp)
+
+						this.bankList = resp.data
+
+						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
+				})
+			},
+
+			// 序号
+			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: ""
+					},
+				}
+				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)
+			},
+
+			// 导出
+			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()
+				})
+			},
+
+
+		}
+	}
+</script>
+<style scoped>
+	::v-deep .el-table .cell {
+		padding: 0px;
+	}
+</style>