Tartarus 2 rokov pred
rodič
commit
0844ef2eca

+ 15 - 9
src/router/index.js

xqd xqd xqd
@@ -80,13 +80,13 @@ export const constantRoutes = [
       meta: { title: '合同详情'},
       hidden:true,
       },
-     {
-       path: 'contracts/addcontract',
-       name: 'addcontract',
-      component: () => import('@/views/contracts/addcontract'),
-      meta: { title: '上传合同' },
-      hidden:true
-     },
+     // {
+     //   path: 'contracts/addcontract',
+     //   name: 'addcontract',
+     //  component: () => import('@/views/contracts/addcontract'),
+     //  meta: { title: '上传合同' },
+     //  hidden:true
+     // },
     {
       path: 'contracts/addnewbill',
       name: 'addnewbill',
@@ -101,7 +101,13 @@ export const constantRoutes = [
 		 meta: { title: '汇票详情' },
 		 hidden:true
 		},
-
+		{
+			path:'contracts/addcontract',
+			name:'addcontract',
+			component:()=>import('@/views/contracts/new_file'),
+			meta:{title:"新增合同"},
+			hidden:true
+		}
    ]
  },
 
@@ -119,7 +125,7 @@ export const constantRoutes = [
        meta: { title: '承兑人列表', icon: 'el-icon-s-help' },
       },
       {
-        path: 'table/addAcceptor',
+        path: '/table/addAcceptor',
         name: 'Table',
        component: () => import('@/views/table/addAcceptor'),
        meta: { title: '新增承兑人' },

+ 67 - 21
src/views/contracts/billDetail.vue

xqd xqd
@@ -1,34 +1,76 @@
 <template>
-	<el-descriptions title="汇票详情">
-	    <el-descriptions-item label="汇票名">{{list[0].name}}</el-descriptions-item>
-	    <el-descriptions-item label="汇票编号">{{list[0].draftNo}}</el-descriptions-item>
-	    <el-descriptions-item label="承兑人">{{list[0].acceptorName}}</el-descriptions-item>
-		<el-descriptions-item label="出票人">{{list[0].drawersName}}</el-descriptions-item>
-		<el-descriptions-item label="金额">{{list[0].money}}</el-descriptions-item>
-		<el-descriptions-item label="服务费率">{{list[0].serviceRate}}</el-descriptions-item>
-		<el-descriptions-item label="服务费">{{list[0].serviceMoney}}</el-descriptions-item>
-		<el-descriptions-item label="利率">{{list[0].interestRate}}</el-descriptions-item>
-		<el-descriptions-item label="利息">{{list[0].interest}}</el-descriptions-item>
-		<el-descriptions-item label="acceptDate">{{list[0].acceptDate}}</el-descriptions-item>
-	    <!-- <el-descriptions-item label="备注">
-	      <el-tag size="small">学校</el-tag>
-	    </el-descriptions-item> -->
-	    <el-descriptions-item label="expectDiscountDate">{{list[0].expectDiscountDate}}</el-descriptions-item>
-		<el-descriptions-item label="picList">
-		<el-image style="width: 100px; height: 100px" :src="list[0].picList" :preview-src-list="list[0].picList">
-		</el-image>
-		</el-descriptions-item>
-	</el-descriptions>
+	<div>
+		<el-descriptions title="汇票详情">
+		    <el-descriptions-item label="汇票名">{{list[0].name}}</el-descriptions-item>
+		    <el-descriptions-item label="汇票编号">{{list[0].draftNo}}</el-descriptions-item>
+		    <el-descriptions-item label="承兑人">{{list[0].acceptorName}}</el-descriptions-item>
+			<el-descriptions-item label="出票人">{{list[0].drawersName}}</el-descriptions-item>
+			<el-descriptions-item label="金额">{{list[0].money}}</el-descriptions-item>
+			<el-descriptions-item label="最高贷款额度">{{list[0].loanLimit}}</el-descriptions-item>
+			<el-descriptions-item label="服务费率">{{list[0].serviceRate}}</el-descriptions-item>
+			<el-descriptions-item label="服务费">{{list[0].serviceMoney}}</el-descriptions-item>
+			<el-descriptions-item label="利率">{{list[0].interestRate}}</el-descriptions-item>
+			<el-descriptions-item label="利息">{{list[0].interest}}</el-descriptions-item>
+			<el-descriptions-item label="承兑日期">{{list[0].acceptDate}}</el-descriptions-item>
+			<el-descriptions-item label="出票日期">{{list[0].expireDate}}</el-descriptions-item>
+		    <el-descriptions-item label="预计贴现日">{{list[0].expectDiscountDate}}</el-descriptions-item>
+			<el-descriptions-item label="附件">
+			<el-image style="width: 100px; height: 100px" :src="list[0].picList" :preview-src-list="list[0].picList">
+			</el-image>
+			</el-descriptions-item>
+			<el-descriptions-item label="审核状态" >{{list[0].statusText}}</el-descriptions-item>
+			<el-descriptions-item label="审核反馈" v-if="checked==1">{{list[0].feedback}}</el-descriptions-item>
+			<el-descriptions-item label="反馈截图" v-if="checked==1">
+			<el-image style="width: 100px; height: 100px" :src="list[0].feedbackPicList" :preview-src-list="list[0].picList">
+			</el-image>
+			</el-descriptions-item>
+		</el-descriptions>
+		<el-input
+		  type="textarea"
+		  placeholder="请输入审核反馈内容"
+		  style="width: 200px;"
+		  v-model="feedback"
+		  v-if="checked==0">
+		</el-input>
+		<el-row v-if="checked==0">
+			<el-col  style="margin:0 auto;">
+				<div class="titlesa">
+					<span>上传反馈截图</span>
+				</div>
+				<div>
+					<el-upload accept=".pdf, .jpg, .jpeg, .png" action="#" :file-list="fileArr" list-type="picture-card"
+						:show-file-list="true" :auto-upload="false" :before-upload="beforeUpload"
+						:on-success="upSuccess" :on-error="upError" :on-change="imgPreview">
+		
+						<i class="el-icon-plus"></i>
+					</el-upload>
+					<el-dialog :visible.sync="dialogVisible">
+						<img width="100%" :src="feedbackPicList" alt="">
+					</el-dialog>
+				</div>
+			</el-col>
+		</el-row>
+		<div class="btn">
+			<el-button type="success" v-if="checked==0">审核成功</el-button>
+			<el-button type="danger" v-if="checked==0">审核失败</el-button>
+		</div>
+	</div>
+	
+
 </template>
 
 <script>
 	export default{
 		data(){
 			return{
+				feedback:'',
+				feedbackPicList:[],
 				list:[],
+				checked:'',
 			}
 		},
 		mounted() {
+			this.checked = this.$store.state.user.checked
 			let id=this.$route.query.id
 			this.$request({
 				url:'/api/Contract/contractDraft/'+id,
@@ -41,5 +83,9 @@
 	}
 </script>
 
-<style>
+<style lang="scss">
+	.btn{
+		display: flex;
+		// justify-content: space-around;
+	}
 </style>

+ 59 - 57
src/views/contracts/detail.vue

xqd xqd xqd xqd xqd xqd xqd
@@ -108,50 +108,44 @@
 				<el-button type="danger" style="float: right; ">删除</el-button>
 				<el-button type="primary" style="float: right;margin-right: 10px; " @click="addNewBill"
 					v-if="checked==1">新增</el-button>
-				<el-button type="primary" style="float: right; ">导出</el-button>
-				<el-button type="warning" style="float: right; ">审核失败</el-button>
-				<el-button type="success" style="float: right; ">审核成功</el-button>
+				<el-button type="primary" style="float: right; " @click="Exports">导出</el-button>
+				<el-button type="warning" style="float: right; " v-if="checked==0">审核失败</el-button>
+				<el-button type="success" style="float: right; " v-if="checked==0">审核成功</el-button>
 			</div>
 		</el-card>
 		<el-card class="box-card">
 			<el-table v-loading="listLoading" :data="temporaryList" element-loading-text="Loading" border fit
-				highlight-current-row>
+				@select="handleSelectionChange" highlight-current-row>
 				<el-table-column align="center" label="" width="55" type="selection">
 
 				</el-table-column>
 				<el-table-column label="汇票名称" align="center" prop="name">
-					<!-- <template slot-scope="scope">
-         汇票名称
-       </template> -->
+
 				</el-table-column>
 				<el-table-column label="汇票编号" align="center" prop="draftNo">
-					<!-- <template slot-scope="scope">
-         <span>合同编号</span>
-       </template> -->
+
 				</el-table-column>
 				<el-table-column label="承兑人" align="center" prop="acceptorName">
-					<!-- <template slot-scope="scope">
-         承兑人
-       </template> -->
+
 				</el-table-column>
-				<el-table-column label="金额" width="170" align="center">
+				<el-table-column label="金额" align="center">
 					<template slot-scope="scope">
 						{{scope.row.money}}
 					</template>
 				</el-table-column>
-				<el-table-column label="服务费" width="180" align="center">
+				<el-table-column label="服务费" align="center">
 					<template slot-scope="scope">
 						{{scope.row.serviceMoney}}
 					</template>
 				</el-table-column>
-				<el-table-column label="汇票状态" width="180" align="center" prop="status">
+				<el-table-column label="汇票状态" align="center" prop="draftStatusText">
 				</el-table-column>
 				<el-table-column label="审核状态" align="center">
 					<template slot-scope="scope">
 						{{scope.row.statusText}}
 					</template>
 				</el-table-column>
-				<el-table-column align="center" prop="created_at" label="操作" width="380">
+				<el-table-column align="center" prop="created_at" label="操作" width="250">
 					<template slot-scope="scope">
 						<el-tag type="primary" style="cursor: pointer;margin-right: 15px;"
 							@click="tapDetail(scope.row.id)">查看详情</el-tag>
@@ -161,32 +155,16 @@
 				</el-table-column>
 			</el-table>
 			<div class="pagesip">
-			  <el-button
-			    type="primary"
-			    size="small"
-			    style="background-color: #d8ab5a; border-color: #d8ab5a; margin: 0 20px"
-			    @click="jumpFirstPage"
-			    >首页
-			  </el-button>
-			  <el-pagination
-			    background
-			    @current-change="handleCurrentChange"
-			    layout="prev, pager, next"
-			    :total="list.length"
-			    :page-size="10"
-			    prev-text="上一页"
-			    next-text="下一页"
-			    :hide-on-single-page="false"
-			    ref="pagination"
-			  >
-			  </el-pagination>
-			  <el-button
-			    type="primary"
-			    size="small"
-			    style="background-color: #d8ab5a; border-color: #d8ab5a; margin: 0 20px"
-			    @click="jumpLastPage"
-			    >尾页
-			  </el-button>
+				<el-button type="primary" size="small"
+					style="background-color: #d8ab5a; border-color: #d8ab5a; margin: 0 20px" @click="jumpFirstPage">首页
+				</el-button>
+				<el-pagination background @current-change="handleCurrentChange" layout="prev, pager, next"
+					:total="list.length" :page-size="10" prev-text="上一页" next-text="下一页" :hide-on-single-page="false"
+					ref="pagination">
+				</el-pagination>
+				<el-button type="primary" size="small"
+					style="background-color: #d8ab5a; border-color: #d8ab5a; margin: 0 20px" @click="jumpLastPage">尾页
+				</el-button>
 			</div>
 		</el-card>
 	</div>
@@ -197,6 +175,9 @@
 	import {
 		getList
 	} from '@/api/table'
+	import {
+		dataConversionUtil
+	} from '../../utils/Excel.js'
 	export default {
 		data() {
 			return {
@@ -205,6 +186,7 @@
 				list: [],
 				contract: {},
 				currentPage: 1,
+				multipleSelection: [],
 				pagesize: 11,
 				listLoading: false,
 				checked: '',
@@ -213,8 +195,7 @@
 				picList: []
 			}
 		},
-		created() {
-		},
+		created() {},
 		mounted() {
 			this.checked = this.$store.state.user.checked
 			let id = this.$route.query.id
@@ -225,7 +206,7 @@
 				this.contract = res.data
 				this.url = this.contract.invoicePicList
 				this.picList = this.contract.picList
-				this.list=res.data.contractDraft.result
+				this.list = res.data.contractDraft.result
 				this.getPageData()
 				// console.log(this.list)
 			})
@@ -250,25 +231,46 @@
 					}
 				})
 			},
+			handleAll(data) {
+				this.multipleSelection = data
+				console.log(this.multipleSelection)
+			},
+			handleSelectionChange(data) {
+				this.multipleSelection = data;
+				console.log(this.multipleSelection);
+			},
 			handleCurrentChange(val) {
-			  this.currentPage = val;
-			  this.getPageData();
+				this.currentPage = val;
+				this.getPageData();
 			},
 			jumpFirstPage() {
-			  this.$refs.pagination.handleCurrentChange(1);
-			  this.$emit("handleCurrentChange", 1);
+				this.$refs.pagination.handleCurrentChange(1);
+				this.$emit("handleCurrentChange", 1);
 			},
 			jumpLastPage() {
-			  let font = this.$refs.pagination;
-			  let cpage = Math.ceil(font.total / font.pageSize);
-			  font.handleCurrentChange(cpage);
+				let font = this.$refs.pagination;
+				let cpage = Math.ceil(font.total / font.pageSize);
+				font.handleCurrentChange(cpage);
 			},
 			getPageData() {
-			  let start = (this.currentPage - 1) * this.pagesize;
-			  let end = start + this.pagesize;
-			  this.srcList = this.list.slice(start, end);
-			  this.temporaryList = this.srcList;
+				let start = (this.currentPage - 1) * this.pagesize;
+				let end = start + this.pagesize;
+				this.srcList = this.list.slice(start, end);
+				this.temporaryList = this.srcList;
 			},
+			Exports(){
+				var tableHeader = [
+					['序号', '汇票名称', '汇票编号', '承兑人', '金额', '服务费','汇票状态','审核状态'],
+				]
+				var dataList = []
+				this.multipleSelection.forEach((item, index) => {
+					dataList.push([index + 1, item.name, item.draftNo, item.acceptorName,item.money,item.serviceMoney, item.draftStatusText, item
+						.statusText
+					]);
+				})
+				dataConversionUtil.dataToExcel('出票人列表', tableHeader, dataList)
+				this.$message.success('导出成功!');
+			}
 		}
 	}
 </script>

+ 5 - 11
src/views/contracts/index.vue

xqd xqd xqd
@@ -75,7 +75,7 @@
 			</div>
 		</el-row>
 		<el-table v-loading="listLoading" :data="temporaryList" element-loading-text="Loading" border fit
-			highlight-current-row @select="handleSelectionChange">
+			highlight-current-row @select="handleSelectionChange"  @select-all="handleAll">
 			<el-table-column align="center" label="" width="55" type="selection">
 			</el-table-column>
 			<el-table-column label="合同名称" align="center" prop="name">
@@ -273,6 +273,10 @@
 				this.multipleSelection = data;
 				console.log(this.multipleSelection);
 			},
+			handleAll(data) {
+				this.multipleSelection = data
+				console.log(this.multipleSelection)
+			},
 			handleCurrentChange(val) {
 				this.currentPage = val;
 				this.getPageData();
@@ -316,16 +320,6 @@
 			recover(id) {
 				let recovered = this.list.filter(item => item.id == id)
 				console.log(recovered[0].id)
-				// this.$request({
-				// 	url: '/api/Supplier/manage',
-				// 	method: 'post',
-				// 	data: {
-				// 		ids: [recovered[0].id],
-				// 		operateType: 2
-				// 	}
-				// }).then((res) => {
-				// 	console.log(res)
-				// })
 			}
 		},
 	};

+ 426 - 0
src/views/contracts/new_file.vue

xqd
@@ -0,0 +1,426 @@
+<template>
+	<div class="app-container">
+		<el-card class="box-card" style="padding: 20px 10px;margin-bottom: 20px;">
+			<div class="contract">
+				<div>
+					<p>合同名称</p>
+					<el-input v-model='form.name' placeholder="请输入合同名称" style="width: 500px;" @input='getContractNo' clearable></el-input>
+				</div>
+				<div>
+					<p>合同编号</p>
+					<el-input v-model='form.contractNo' placeholder="请输入合同编号" style="width: 500px;" disabled></el-input>
+				</div>
+			</div>
+
+			<div class="titlesa">
+				<span>合同附件</span>
+				<span style="color: #D05C39;">*支持上传pdf、jpg/jpeg、png格式</span>
+			</div>
+			<div>
+				<el-upload action="https://ht.9026.com/api/File" list-type="picture-card" :auto-upload="false" :on-change="handlepics">
+					<i slot="default" class="el-icon-plus"></i>
+					<div slot="file" slot-scope="{file}">
+						<img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
+						<!-- <span class="el-upload-list__item-actions">
+							<span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
+								<i class="el-icon-zoom-in"></i>
+							</span>
+							<span v-if="!disabled" class="el-upload-list__item-delete"
+								@click="handleDownload(file)">
+								<i class="el-icon-download"></i>
+							</span>
+							<span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(file)">
+								<i class="el-icon-delete"></i>
+							</span>
+						</span> -->
+					</div>
+				</el-upload>
+				<el-dialog :visible.sync="dialogVisible">
+					<img width="100%" :src="form.pics" alt="">
+				</el-dialog>
+			</div>
+			<div class="titlesa">
+				<span>发票附件</span>
+				<span style="color: #D05C39;">*支持上传pdf、jpg/jpeg、png格式</span>
+			</div>
+			<div>
+				<el-upload action="https://ht.9026.com/api/File" list-type="picture-card" :auto-upload="false" :on-change="handleinvoicePics">
+					<i slot="default" class="el-icon-plus"></i>
+					<div slot="file" slot-scope="{file}">
+						<img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
+						<!-- <span class="el-upload-list__item-actions">
+							<span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
+								<i class="el-icon-zoom-in"></i>
+							</span>
+							<span v-if="!disabled" class="el-upload-list__item-delete" @click="handleDownload(file)">
+								<i class="el-icon-download"></i>
+							</span>
+							<span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(file)">
+								<i class="el-icon-delete"></i>
+							</span>
+						</span> -->
+					</div>
+				</el-upload>
+				<el-dialog :visible.sync="dialogVisible" >
+					<img width="100%" :src="form.invoicePics" alt="">
+				</el-dialog>
+			</div>
+			<div class="titlesa">
+				<span>贸易合同</span>
+				<span style="color: #D05C39;">*支持上传pdf、jpg/jpeg、png格式</span>
+			</div>
+			<div>
+				<el-upload action="https://ht.9026.com/api/File" list-type="picture-card" :auto-upload="false"   :on-change=handletradePics :file-list="form.tradePics">
+					<i slot="default" class="el-icon-plus" ></i>
+					<div slot="file" slot-scope="{file}">
+						<img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
+						<span class="el-upload-list__item-actions">
+							<span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
+								<i class="el-icon-zoom-in"></i>
+							</span>
+							<span v-if="!disabled" class="el-upload-list__item-delete" @click="handleDownload(file)">
+								<i class="el-icon-download"></i>
+							</span>
+							<span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(file)">
+								<i class="el-icon-delete"></i>
+							</span>
+						</span>
+					</div>
+				</el-upload>
+				<el-dialog :visible.sync="dialogVisible">
+					<img width="100%" :src="form.tradePics" alt="">
+				</el-dialog>
+			</div>
+		</el-card>
+	
+		<div class="form" v-for="(item,index) in form.contractDrafts">
+			<el-form ref="form" :model="item" label-width="90px" >
+				<el-form-item label="汇票名称">
+					<el-input v-model="item.name" class="ipwidth" placeholder="请填写汇票名称"
+						style="width: 220px;" />
+				</el-form-item>
+				
+				<el-form-item label="预计贴现日">
+					<el-date-picker v-model="item.expectDiscountDate" type="date" placeholder="选择日期">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="出票日期">
+					<el-date-picker v-model="item.acceptDate" type="date" placeholder="选择日期" class="ipwidth">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="承兑日期">
+					<el-date-picker v-model="item.issueDate" type="date" placeholder="选择日期">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="到期日期">
+					<el-date-picker v-model="item.expireDate" type="date" placeholder="选择日期">
+					</el-date-picker>
+				</el-form-item>
+			</el-form>
+			<el-form ref="form" :model="form" label-width="100px" >
+				<el-form-item label="汇票号码">
+					<el-input v-model="item.draftNo" class="ipwidth" placeholder="请填写汇票号码"
+						style="width: 220px;" />
+				</el-form-item>
+				<el-form-item label="金额">
+					<el-input v-model="item.money"  class="ipwidth" placeholder="请填写金额"
+						style="width: 220px;" @change='computed'/>
+				</el-form-item>
+				<el-form-item label="服务费">
+					<el-input v-model="item.serviceMoney" class="ipwidth" placeholder="计算得出服务费"
+						style="width: 220px;" />
+				</el-form-item>
+				<el-form-item label="最高贷款额度">
+					<el-input v-model="item.loanLimit" class="ipwidth" placeholder="计算得出最高贷款额度"
+						style="width: 220px;" />
+				</el-form-item>
+				<el-form-item label="利息">
+					<el-input v-model="item.interest" class="ipwidth" placeholder="计算得出利息"
+						style="width: 220px;" />
+				</el-form-item>
+			</el-form>
+			<el-form ref="form" :model="form" label-width="90px" >
+				<el-form-item label="出票人">
+					<el-select v-model="form.drawersName" placeholder="请选择出票人" >
+						<el-option label="新增出票人" @click.native="addDrawer" value="" style="color: darkorange;"></el-option>
+					    <el-option v-for="item in drawersName" :label="item" :value="item"></el-option>
+					  </el-select>
+				</el-form-item>
+				<el-form-item label="承兑人" >
+					  <el-select v-model="form.acceptorName" placeholder="请选择承兑人" >
+						  <el-option label='新增承兑人' @click.native="addAcceptor" value="" style="color: darkorange;"></el-option>
+					      <el-option v-for="val in acceptorName" :label="val" :value="val" @click.native="getRate"></el-option>
+					    </el-select>
+				</el-form-item>
+				
+				<el-form-item label="服务费率">
+					<el-input v-model="item.serviceRate" class="ipwidth" placeholder="服务费率"
+						style="width: 220px;" />
+				</el-form-item>
+				<el-form-item label="利率">
+					<el-input v-model="item.serviceMoney" class="ipwidth" placeholder="利率"
+						style="width: 220px;" />
+				</el-form-item>
+				
+			</el-form>
+			<div>
+				<el-row>
+					<el-col  style="margin:0 auto;">
+						<div class="titlesa">
+							<span>附件</span>
+							<span style="color: #D05C39;">*支持上传pdf、jpg/jpeg、png格式</span>
+						</div>
+						<div>
+							<el-upload accept=".pdf, .jpg, .jpeg, .png" action="https://ht.9026.com/api/File" :file-list="fileArr" list-type="picture-card"
+								:show-file-list="true" :auto-upload="false" :before-upload="beforeUpload"
+								:on-change="handlepicUrls">
+								<i class="el-icon-plus"></i>
+							</el-upload>
+							<el-dialog :visible.sync="dialogVisible">
+								<img width="100%" :src="form.contractDrafts.picUrls" alt="">
+							</el-dialog>
+						</div>
+					</el-col>
+					
+				</el-row>
+				
+			</div>
+		</div>
+		
+		<div class="commit">
+			
+			<div class="addnew">
+				<el-button type="primary" @click="adddraft">新增汇票</el-button>
+				<el-button type="primary" @click="deletedraft">删除汇票</el-button>
+			</div>
+			<div class="addall">
+				<el-button type="warning" style="width: 180px;height: 45px;font-size: 16px;" @click="onSubmit">确认上传
+				</el-button>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				dialogVisible: false,
+				disabled: false,
+				drawersList:[],
+				acceptorList:[],
+				contractList:[],
+				form: {
+					// 承兑人列表
+					acceptorName: [],
+					// 出票人列表
+					drawersName: [],
+					contractNo: '',
+					supplierId: 2,
+					name: "",
+					invoicePics: [
+						"https:\/\/easygolf.oss-ap-southeast-6.aliyuncs.com\/golf\/2022-03\/18\/88df7532ff7de229b617.jpg",
+						"https:\/\/easygolf.oss-ap-southeast-6.aliyuncs.com\/golf\/2022-03\/18\/ab37cbd176e12cef2f82.jpg"
+					],
+					pics: [
+						"https:\/\/easygolf.oss-ap-southeast-6.aliyuncs.com\/golf\/2022-03\/18\/88df7532ff7de229b617.jpg",
+						"https:\/\/easygolf.oss-ap-southeast-6.aliyuncs.com\/golf\/2022-03\/18\/ab37cbd176e12cef2f82.jpg"
+					],
+					tradePics: [
+						"https:\/\/easygolf.oss-ap-southeast-6.aliyuncs.com\/golf\/2022-03\/18\/88df7532ff7de229b617.jpg"
+					],
+					contractDrafts: [{
+						name: "",
+						draftNo: "HP20220709-0958-02356",
+						acceptorId: '',
+						drawersId: '',
+						money: '',
+						acceptDate: "",
+						loanLimit: "",
+						serviceRate: '',
+						serviceMoney: '',
+						interestRate: '',
+						interest: '',
+						picUrls: [
+							"https:\/\/easygolf.oss-ap-southeast-6.aliyuncs.com\/golf\/2022-03\/18\/88df7532ff7de229b617.jpg"
+						],
+						expectDiscountDate: "",
+						issueDate: "",
+						expireDate: ""
+					}, ],
+				},
+				pickerOptions: {
+					disabledDate(time) {
+						return time.getTime() > Date.now();
+					},
+					shortcuts: [{
+						text: '今天',
+						onClick(picker) {
+							picker.$emit('pick', new Date());
+						}
+					}, {
+						text: '昨天',
+						onClick(picker) {
+							const date = new Date();
+							date.setTime(date.getTime() - 3600 * 1000 * 24);
+							picker.$emit('pick', date);
+						}
+					}, {
+						text: '一周前',
+						onClick(picker) {
+							const date = new Date();
+							date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
+							picker.$emit('pick', date);
+						}
+					}]
+				},
+
+
+			}
+		},
+		
+		mounted() {
+			this.$request({
+				url:'/api/Contract/search',
+				method:'post',
+				data:{
+					pageIndex:1,
+					pageSize:100
+				}
+			}).then((res)=>{
+				this.contractList=res.data.result
+			})
+			this.$request({
+				url:'/api/Acceptor/search',
+				method:'post',
+				data:{
+					pageIndex:1,
+					pageSize:100
+				}
+			}).then((res)=>{
+				this.acceptorList=res.data.result
+				this.acceptorName=Array.from(this.acceptorList,({name})=>name)
+				console.log(this.acceptorName)
+				// 去除重复的承兑人
+				//  for (var i = 0; i < this.acceptorName.length; i++) {    // 首次遍历数组
+				//         for (var j = i + 1; j < this.acceptorName.length; j++) {   // 再次遍历数组
+				//             if (this.acceptorName[i] == this.acceptorName[j]) {          // 判断连个值是否相等
+				//                 this.acceptorName.splice(j, 1);           // 相等删除后者
+				//                 j--;
+				//             }
+				//         }
+				//     }
+				// console.log(this.acceptorName)
+			})
+			this.$request({
+				url:'/api/Drawer/search',
+				method:'post',
+				data:{
+					pageIndex:1,
+					pageSize:100
+				}
+			}).then((res)=>{
+				this.drawersList=res.data.result
+				this.drawersName=Array.from(this.drawersList,({name})=>name)
+				// 去除重复的出票人
+				 for (var i = 0; i < this.drawersName.length; i++) {    // 首次遍历数组
+				        for (var j = i + 1; j < this.drawersName.length; j++) {   // 再次遍历数组
+				            if (this.drawersName[i] == this.drawersName[j]) {          // 判断连个值是否相等
+				                this.drawersName.splice(j, 1);           // 相等删除后者
+				                j--;
+				            }
+				        }
+				    }
+				console.log(this.drawersName)
+			})
+		},
+		methods: {
+			onSubmit() {
+				this.$request({
+					url: '/api/Contract',
+					method: 'post',
+					data: this.form
+				}).then((res) => {
+					console.log(res)
+					this.$message({
+						message:'上传成功',
+						type:'success'
+					})
+				})
+			},
+			handlepics(file){
+				// this.form.pics.push(file)
+				console.log(this.form.pics)
+			},
+			handleinvoicePics(file){
+				// this.form.invoicePics.push(file)
+				console.log(this.form.invoicePics)
+			},
+			handletradePics(file){
+				// this.form.tradePics.push(file)
+				console.log(this.form.tradePics)
+			},
+			handlepicUrls(file){
+				// this.form.contractDrafts[0].picUrls.push(file)
+				console.log(this.form.contractDrafts[0].picUrls)
+			},
+			getContractNo(){
+				let temporaryList=this.contractList.filter(item=>item.name==this.form.name)
+				if(this.form.name==""||temporaryList==''){
+					this.form.contractNo=''
+				}else{
+					this.form.contractNo=temporaryList[0].contractNo
+				}
+				
+			},
+			getRate(){
+				let list=this.acceptorList.filter(item=>item.name==this.form.acceptorName)
+				this.form.contractDrafts[0].interestRate=list[0].interest
+				this.form.contractDrafts[0].serviceRate=list[0].serviceRate
+			},
+			computed(){
+				console.log(this.form.contractDrafts[0].money)
+				
+			},
+			addDrawer(){
+				this.$router.push({
+					path: "/form/addTicketdrawer",
+				});
+			},
+			addAcceptor(){
+				this.$router.push({
+					path: '/table/addAcceptor'
+				})
+			}
+		},
+	}
+</script>
+
+<style lang="scss">
+	.contract {
+		display: flex;
+		justify-content: space-between;
+		margin-bottom: 20px;
+	}
+
+	.form {
+		display: flex;
+		justify-content: space-around;
+	}
+
+
+	.addnew {
+		display: flex;
+		justify-content: flex-end;
+	}
+
+	.addall {
+		display: flex;
+		justify-content: center;
+	}
+
+	.commit {
+
+		margin: 20px 0;
+	}
+</style>

+ 5 - 1
src/views/delivery/index.vue

xqd xqd
@@ -61,7 +61,7 @@
 				</div>
 		</el-row>
 		<el-table v-loading="listLoading" :data="temporaryList" element-loading-text="Loading" border fit
-			highlight-current-row  @selection-change="handleSelectionChange">
+			highlight-current-row  @selection-change="handleSelectionChange" @select-all="handleAll">
 			<el-table-column   type="selection">
 			</el-table-column>
 			<el-table-column label="供应商名称" align="center" prop="name" width="200">
@@ -194,6 +194,10 @@
 				this.multipleSelection = data;
 				console.log(this.multipleSelection);
 			},
+			handleAll(data) {
+				this.multipleSelection = data
+				console.log(this.multipleSelection)
+			},
 			PhandleCommand(command) {
 				this.providerStatus = command
 				if(this.providerStatus=="正常"||this.providerStatus=="删除"){

+ 263 - 307
src/views/form/index.vue

xqd xqd
@@ -1,37 +1,31 @@
 <template>
-  <div class="app-container">
-    <el-row type="flex" justify="space-between" style="margin-bottom: 20px">
-      <div class="grid-content bg-purple">
-        <el-dropdown @command="handleCommand">
-          <div class="pulldown">
-            <span class="el-dropdown-link" v-if="!status"> 出票人状态 </span>
-            <span class="el-dropdown-link" v-if="status">
-              {{ status }}
-            </span>
-            <i class="el-icon-arrow-down el-icon--right"></i>
-          </div>
-          <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item command="出票人状态">出票人状态</el-dropdown-item>
-            <el-dropdown-item command="正常">正常</el-dropdown-item>
-            <el-dropdown-item command="删除">删除</el-dropdown-item>
-          </el-dropdown-menu>
-        </el-dropdown>
-      </div>
-      <div class="grid-content bg-purple">
-        <div class="grid-content bg-purple" style="margin-left: 30px">
-          <el-input
-            placeholder="请输入出票人名称"
-            v-model="search"
-            @change="Search"
-            clearable
-            style="width: 100%"
-          >
-            <i slot="prefix" class="el-input__icon el-icon-search"></i>
-          </el-input>
-        </div>
-      </div>
+	<div class="app-container">
+		<el-row type="flex" justify="space-between" style="margin-bottom: 20px">
+			<div class="grid-content bg-purple">
+				<el-dropdown @command="handleCommand">
+					<div class="pulldown">
+						<span class="el-dropdown-link" v-if="!status"> 出票人状态 </span>
+						<span class="el-dropdown-link" v-if="status">
+							{{ status }}
+						</span>
+						<i class="el-icon-arrow-down el-icon--right"></i>
+					</div>
+					<el-dropdown-menu slot="dropdown">
+						<el-dropdown-item command="出票人状态">出票人状态</el-dropdown-item>
+						<el-dropdown-item command="正常">正常</el-dropdown-item>
+						<el-dropdown-item command="删除">删除</el-dropdown-item>
+					</el-dropdown-menu>
+				</el-dropdown>
+			</div>
+			<div class="grid-content bg-purple">
+				<div class="grid-content bg-purple" style="margin-left: 30px">
+					<el-input placeholder="请输入出票人名称" v-model="search" @change="Search" clearable style="width: 100%">
+						<i slot="prefix" class="el-input__icon el-icon-search"></i>
+					</el-input>
+				</div>
+			</div>
 
-      <!-- <el-col :xs="24" :sm="11" :md="9" :lg="7" :xl="5" >
+			<!-- <el-col :xs="24" :sm="11" :md="9" :lg="7" :xl="5" >
         <div class="grid-content bg-purple">
           <div class="block">
             <el-date-picker v-model="value2" type="daterange" align="right" unlink-panels range-separator="至"
@@ -42,310 +36,272 @@
         </div>
       </el-col> -->
 
-      <!-- <el-col :span="1">
+			<!-- <el-col :span="1">
         <div class="grid-content bg-purple"></div>
       </el-col> -->
-      <div
-        class="grid-content bg-purple"
-        style="display: flex; justify-content: flex-end"
-      >
-        <el-button type="primary" @click="addTicketdrawer"
-          >新增出票人</el-button
-        >
-        <el-button type="primary" @click="Exports">批量导出</el-button>
-        <!--         <el-button type="success">复原</el-button>
+			<div class="grid-content bg-purple" style="display: flex; justify-content: flex-end">
+				<el-button type="primary" @click="addTicketdrawer">新增出票人</el-button>
+				<el-button type="primary" @click="Exports">批量导出</el-button>
+				<!--         <el-button type="success">复原</el-button>
           <el-button type="danger">删除</el-button> -->
-      </div>
-    </el-row>
-    <el-table
-      v-loading="listLoading"
-      :data="temporaryList"
-      element-loading-text="Loading"
-      border
-      fit
-      highlight-current-row
-      @select="handleSelectionChange"
-    >
-      <el-table-column align="center" type="selection"> </el-table-column>
-      <el-table-column label="出票人名称" align="center" prop="name">
-        <!-- <template slot-scope="scope" >
+			</div>
+		</el-row>
+		<el-table v-loading="listLoading" :data="temporaryList" element-loading-text="Loading" border fit
+			highlight-current-row @select="handleSelectionChange" @select-all="handleAll">
+			<el-table-column align="center" type="selection"> </el-table-column>
+			<el-table-column label="出票人名称" align="center" prop="name">
+				<!-- <template slot-scope="scope" >
 
         </template> -->
-      </el-table-column>
-      <el-table-column label="账号" align="center" prop="bankAccount">
-        <!-- <template slot-scope="scope">
+			</el-table-column>
+			<el-table-column label="账号" align="center" prop="bankAccount">
+				<!-- <template slot-scope="scope">
           XXXXXXXXXXX
         </template> -->
-      </el-table-column>
-      <el-table-column align="center" prop="bankName" label="开户行名称">
-        <!-- <template slot-scope="scope">
+			</el-table-column>
+			<el-table-column align="center" prop="bankName" label="开户行名称">
+				<!-- <template slot-scope="scope">
           <span>XXX</span>
         </template> -->
-      </el-table-column>
+			</el-table-column>
 
-      <el-table-column align="center" prop="statusText" label="状态">
-      </el-table-column>
-      <el-table-column align="center" prop="createdAt" label="时间">
-        <!-- <template slot-scope="scope">
+			<el-table-column align="center" prop="statusText" label="状态">
+			</el-table-column>
+			<el-table-column align="center" prop="createdAt" label="时间">
+				<!-- <template slot-scope="scope">
           <i class="el-icon-time" />
           <span>{{ scope.row.display_time }}</span>
         </template> -->
-      </el-table-column>
-      <el-table-column
-        align="center"
-        prop="created_at"
-        label="操作"
-        width="250"
-      >
-        <template slot-scope="scope">
-          <el-tag
-            type="primary"
-            style="cursor: pointer; margin-right: 15px"
-            @click="todetail(scope.row.id)"
-          >
-            详情</el-tag
-          >
-          <el-tag type="success" style="cursor: pointer; margin-right: 15px"
-          @click="recover(scope.row.id)"
-            >复原</el-tag
-          >
-          <el-tag
-            type="danger"
-            style="cursor: pointer; margin-right: 15px"
-            @click="deletestatus(scope.row.id)"
-            >删除</el-tag
-          >
-        </template>
-      </el-table-column>
-    </el-table>
-    <div class="pagesip">
-      <el-button
-        type="primary"
-        size="small"
-        style="background-color: #d8ab5a; border-color: #d8ab5a; margin: 0 20px"
-        @click="jumpFirstPage"
-        >首页
-      </el-button>
-      <el-pagination
-        background
-        @current-change="handleCurrentChange"
-        layout="prev, pager, next"
-        :total="list.length"
-        :page-size="10"
-        prev-text="上一页"
-        next-text="下一页"
-        :hide-on-single-page="false"
-        ref="pagination"
-      >
-      </el-pagination>
-      <el-button
-        type="primary"
-        size="small"
-        style="background-color: #d8ab5a; border-color: #d8ab5a; margin: 0 20px"
-        @click="jumpLastPage"
-        >尾页
-      </el-button>
-    </div>
-  </div>
+			</el-table-column>
+			<el-table-column align="center" prop="created_at" label="操作" width="250">
+				<template slot-scope="scope">
+					<el-tag type="primary" style="cursor: pointer; margin-right: 15px" @click="todetail(scope.row.id)">
+						详情</el-tag>
+					<el-tag type="success" style="cursor: pointer; margin-right: 15px" @click="recover(scope.row.id)">复原
+					</el-tag>
+					<el-tag type="danger" style="cursor: pointer; margin-right: 15px"
+						@click="deletestatus(scope.row.id)">删除</el-tag>
+				</template>
+			</el-table-column>
+		</el-table>
+		<div class="pagesip">
+			<el-button type="primary" size="small"
+				style="background-color: #d8ab5a; border-color: #d8ab5a; margin: 0 20px" @click="jumpFirstPage">首页
+			</el-button>
+			<el-pagination background @current-change="handleCurrentChange" layout="prev, pager, next"
+				:total="list.length" :page-size="10" prev-text="上一页" next-text="下一页" :hide-on-single-page="false"
+				ref="pagination">
+			</el-pagination>
+			<el-button type="primary" size="small"
+				style="background-color: #d8ab5a; border-color: #d8ab5a; margin: 0 20px" @click="jumpLastPage">尾页
+			</el-button>
+		</div>
+	</div>
 </template>
 
 <script>
-import { getList } from "@/api/table";
+	import {
+		getList
+	} from "@/api/table";
 	import {
 		dataConversionUtil
 	} from '../../utils/Excel.js'
-export default {
-  filters: {
-    statusFilter(status) {
-      const statusMap = {
-        published: "success",
-        draft: "gray",
-        deleted: "danger",
-      };
-      return statusMap[status];
-    },
-  },
-  data() {
-    return {
-      request: {
-        pageIndex: 1,
-        pageSize: 100,
-        // startTime:'',
-        // endTime:'',
-        // name:'',
-        // status:,
-      },
-      srcList: [],
-      list: [],
-      temporaryList: [],
-      listLoading: false,
-      status: "",
-      hpstatus: "",
-      search: "",
-      currentPage: 1,
-      pagesize: 11,
-      checked: "",
-      pickerOptions: {
-        shortcuts: [
-          {
-            text: "最近一周",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-              picker.$emit("pick", [start, end]);
-            },
-          },
-          {
-            text: "最近一个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-              picker.$emit("pick", [start, end]);
-            },
-          },
-          {
-            text: "最近三个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-              picker.$emit("pick", [start, end]);
-            },
-          },
-        ],
-      },
-      value1: "",
-      value2: "",
-    };
-  },
-  created() {
-    // this.fetchData()
-  },
-  mounted() {
-    this.$request({
-      url: "/api/Drawer/search",
-      method: "post",
-      data: this.request,
-    }).then((res) => {
-      console.log(res.data.result);
-      this.list = res.data.result.reverse();
-      this.getPageData();
-    });
-  },
-  methods: {
-    handleSelectionChange(data) {
-      this.multipleSelection = data;
-      console.log(this.multipleSelection);
-    },
-    handleCommand(command) {
-      this.status = command;
-      if (this.status == "正常" || this.status == "删除") {
-        this.temporaryList = this.srcList.filter(
-          (item) => item.statusText == this.status
-        );
-      } else {
-        this.temporaryList = this.srcList;
-      }
-      console.log(this.srcList, "command");
-    },
-    handlehpCommand(command) {
-      this.hpstatus = command;
-    },
-    addTicketdrawer() {
-      this.$router.push({
-        path: "/form/addTicketdrawer",
-      });
-    },
-    todetail(id) {
-      console.log(id);
-      this.$router.push({
-        path: "/form/detail",
-        query: {
-          id: id,
-        },
-      });
-    },
-    recover(id){
-      let recoverd=this.list.filter(item=>item.id==id)
-      recoverd[0].statusText='正常'
-    },
-    deletestatus(id) {
-      let deleted=this.list.filter(item=>item.id==id)
-      deleted[0].statusText='删除'
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val;
-      this.getPageData();
-    },
-    jumpFirstPage() {
-      this.$refs.pagination.handleCurrentChange(1);
-      this.$emit("handleCurrentChange", 1);
-    },
-    jumpLastPage() {
-      let font = this.$refs.pagination;
-      let cpage = Math.ceil(font.total / font.pageSize);
-      font.handleCurrentChange(cpage);
-    },
-    getPageData() {
-      let start = (this.currentPage - 1) * this.pagesize;
-      let end = start + this.pagesize;
-      this.srcList = this.list.slice(start, end);
-      this.temporaryList = this.srcList;
-    },
-    Search() {
-      if (this.search == "") {
-        this.temporaryList = this.srcList;
-      } else {
-        this.temporaryList = this.list.filter(
-          (item) => item.name == this.search
-        );
-      }
-    },
-		Exports(){
-			var tableHeader = [
-					['序号','出票人名称', '账号', '开户行名称',  '状态', '时间'],
+	export default {
+		filters: {
+			statusFilter(status) {
+				const statusMap = {
+					published: "success",
+					draft: "gray",
+					deleted: "danger",
+				};
+				return statusMap[status];
+			},
+		},
+		data() {
+			return {
+				request: {
+					pageIndex: 1,
+					pageSize: 100,
+					// startTime:'',
+					// endTime:'',
+					// name:'',
+					// status:,
+				},
+				srcList: [],
+				list: [],
+				temporaryList: [],
+				listLoading: false,
+				status: "",
+				hpstatus: "",
+				search: "",
+				currentPage: 1,
+				pagesize: 11,
+				checked: "",
+				pickerOptions: {
+					shortcuts: [{
+							text: "最近一周",
+							onClick(picker) {
+								const end = new Date();
+								const start = new Date();
+								start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+								picker.$emit("pick", [start, end]);
+							},
+						},
+						{
+							text: "最近一个月",
+							onClick(picker) {
+								const end = new Date();
+								const start = new Date();
+								start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+								picker.$emit("pick", [start, end]);
+							},
+						},
+						{
+							text: "最近三个月",
+							onClick(picker) {
+								const end = new Date();
+								const start = new Date();
+								start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+								picker.$emit("pick", [start, end]);
+							},
+						},
+					],
+				},
+				value1: "",
+				value2: "",
+			};
+		},
+		created() {
+			// this.fetchData()
+		},
+		mounted() {
+			this.$request({
+				url: "/api/Drawer/search",
+				method: "post",
+				data: this.request,
+			}).then((res) => {
+				console.log(res.data.result);
+				this.list = res.data.result.reverse();
+				this.getPageData();
+			});
+		},
+		methods: {
+			handleSelectionChange(data) {
+				this.multipleSelection = data;
+				console.log(this.multipleSelection);
+			},
+			handleAll(data) {
+				this.multipleSelection = data
+				console.log(this.multipleSelection)
+			},
+			handleCommand(command) {
+				this.status = command;
+				if (this.status == "正常" || this.status == "删除") {
+					this.temporaryList = this.srcList.filter(
+						(item) => item.statusText == this.status
+					);
+				} else {
+					this.temporaryList = this.srcList;
+				}
+				console.log(this.srcList, "command");
+			},
+			handlehpCommand(command) {
+				this.hpstatus = command;
+			},
+			addTicketdrawer() {
+				this.$router.push({
+					path: "/form/addTicketdrawer",
+				});
+			},
+			todetail(id) {
+				console.log(id);
+				this.$router.push({
+					path: "/form/detail",
+					query: {
+						id: id,
+					},
+				});
+			},
+			recover(id) {
+				let recoverd = this.list.filter(item => item.id == id)
+				recoverd[0].statusText = '正常'
+			},
+			deletestatus(id) {
+				let deleted = this.list.filter(item => item.id == id)
+				deleted[0].statusText = '删除'
+			},
+			handleCurrentChange(val) {
+				this.currentPage = val;
+				this.getPageData();
+			},
+			jumpFirstPage() {
+				this.$refs.pagination.handleCurrentChange(1);
+				this.$emit("handleCurrentChange", 1);
+			},
+			jumpLastPage() {
+				let font = this.$refs.pagination;
+				let cpage = Math.ceil(font.total / font.pageSize);
+				font.handleCurrentChange(cpage);
+			},
+			getPageData() {
+				let start = (this.currentPage - 1) * this.pagesize;
+				let end = start + this.pagesize;
+				this.srcList = this.list.slice(start, end);
+				this.temporaryList = this.srcList;
+			},
+			Search() {
+				if (this.search == "") {
+					this.temporaryList = this.srcList;
+				} else {
+					this.temporaryList = this.list.filter(
+						(item) => item.name == this.search
+					);
+				}
+			},
+			Exports() {
+				var tableHeader = [
+					['序号', '出票人名称', '账号', '开户行名称', '状态', '时间'],
 				]
 				var dataList = []
 				this.multipleSelection.forEach((item, index) => {
-					dataList.push([index + 1, item.name, item.bankAccount, item.bankName,  item.statusText, item.createdAt
+					dataList.push([index + 1, item.name, item.bankAccount, item.bankName, item.statusText, item
+						.createdAt
 					]);
 				})
 				dataConversionUtil.dataToExcel('出票人列表', tableHeader, dataList)
 				this.$message.success('导出成功!');
-			
-		}
-  },
-};
+
+			}
+		},
+	};
 </script>
 <style lang="scss">
-.pulldown {
-  width: 185px;
-  height: 40px;
-  border: 1px solid #e8e8e8;
-  border-radius: 10px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  justify-content: space-between;
-  padding: 0 20px;
-  color: #999999;
-}
+	.pulldown {
+		width: 185px;
+		height: 40px;
+		border: 1px solid #e8e8e8;
+		border-radius: 10px;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		justify-content: space-between;
+		padding: 0 20px;
+		color: #999999;
+	}
 
-.pagesip {
-  width: 100%;
-  margin: 20px auto;
-  display: flex;
-  // align-items: center;
-  justify-content: flex-end;
-}
+	.pagesip {
+		width: 100%;
+		margin: 20px auto;
+		display: flex;
+		// align-items: center;
+		justify-content: flex-end;
+	}
 
-.el-pagination.is-background .el-pager li:not(.disabled).active {
-  background-color: #d8ab5a;
-}
+	.el-pagination.is-background .el-pager li:not(.disabled).active {
+		background-color: #d8ab5a;
+	}
 
-.el-col {
-  margin-bottom: 20px;
-}
+	.el-col {
+		margin-bottom: 20px;
+	}
 </style>

+ 6 - 2
src/views/table/index.vue

xqd xqd xqd
@@ -41,7 +41,7 @@
 
 		</el-row>
 		<el-table v-loading="listLoading" :data="temporaryList" element-loading-text="Loading" border fit
-			highlight-current-row @select="handleSelectionChange">
+			highlight-current-row @select="handleSelectionChange" @select-all="handleAll">
 			<el-table-column align="center" label="" width="55" type="selection">
 
 			</el-table-column>
@@ -191,6 +191,10 @@
 				this.multipleSelection = data
 				console.log(this.multipleSelection)
 			},
+			handleAll(data){
+				this.multipleSelection=data
+				console.log(this.multipleSelection)
+			},
 			Search() {
 				if (this.search == "") {
 					this.temporaryList = this.srcList
@@ -202,7 +206,7 @@
 				let confirm = window.confirm("你确定新增承兑人")
 				if (confirm) {
 					this.$router.push({
-						path: 'table/addAcceptor'
+						path: '/table/addAcceptor'
 					})
 				} else {