项目日志：7.28 第一次合并修改

src/views/contracts/billDetail.vue

@@ -1,5 +1,6 @@
 <template>
   <div>
+
     <el-descriptions title="汇票详情">
       <el-descriptions-item label="汇票名">{{
         list[0].name
@@ -46,6 +47,7 @@
       <el-descriptions-item label="到期日期">{{
         list[0].issueDate
       }}</el-descriptions-item>
+
       <el-descriptions-item label="附件">
         <el-image
           style="width: 100px; height: 100px"
@@ -56,24 +58,26 @@
       <el-descriptions-item label="审核状态">{{
         list[0].statusText
       }}</el-descriptions-item>
-      <el-descriptions-item label="审核反馈">{{
+      <el-descriptions-item  label="审核反馈">{{
         list[0].feedback
       }}</el-descriptions-item>
-      <el-descriptions-item label="反馈截图">
+      <el-descriptions-item  label="反馈截图">
         <el-image
           style="width: 100px; height: 100px"
           :src="list[0].feedbackPicList"
+  
         />
       </el-descriptions-item>
     </el-descriptions>
+
     <el-input
-      v-model="feed.feedback"
       v-permission="['admin']"
+      v-model="feed.feedback"
       type="textarea"
       placeholder="请输入审核反馈内容"
       style="width: 200px"
     />
-
+    
     <el-row v-permission="['admin']">
       <el-col style="margin: 0 auto">
         <div class="titlesa">
@@ -88,22 +92,19 @@
             <i class="el-icon-plus" />
           </el-upload>
           <el-dialog :visible.sync="dialogVisible">
-            <img width="100%" :src="feed.feedbackPicList">
+            <img width="100%" :src="feed.feedbackPicList" />
           </el-dialog>
         </div>
       </el-col>
     </el-row>
+
     <div class="btn">
-      <el-button
-        v-permission="['admin']"
-        type="success"
-        @click="success"
-      >审核成功</el-button>
-      <el-button
-        v-permission="['admin']"
-        type="danger"
-        @click="failed"
-      >审核失败</el-button>
+      <el-button v-permission="['admin']" type="success" @click="success"
+        >审核成功</el-button
+      >
+      <el-button v-permission="['admin']" type="danger" @click="failed"
+        >审核失败</el-button
+      >
       <el-button type="primary" @click="back">返回</el-button>
     </div>
   </div>
@@ -114,101 +115,101 @@ export default {
   data() {
     return {
       dialogVisible: false,
-      role: '',
+      role: "",
       list: [],
-      checked: '',
+      checked: "",
       /* 审核反馈和审核截图的数据 */
       feedbackPicListArray: [],
       feed: {
-        feedback: '',
+        feedback: "",
         feedbackPicList: [],
-        id: '',
-        approveStatus: ''
-      }
-    }
+        id: "",
+        approveStatus: "",
+      },
+    };
   },
   mounted() {
-    this.feed.id = this.$route.query.id
-    this.role = this.$store.state.user.userInfo.type
-    this.getData()
+    this.feed.id = this.$route.query.id;
+    this.role = this.$store.state.user.userInfo.type;
+    this.getData();
   },
   methods: {
 
     /* 反馈图片图片上传成功 */
-    handleFeedbackPicList(res) {
-      // 解构
-      const { file } = res.data
-      this.feedbackPicListArray.push(file)
-      this.feed.feedbackPicList = this.feedbackPicListArray
+    handleFeedbackPicList(res){
+      //解构
+      const { file } = res.data;
+      this.feedbackPicListArray.push(file);
+      this.feed.feedbackPicList = this.feedbackPicListArray;
     },
     getData() {
-      const id = this.$route.query.id
+      const id = this.$route.query.id;
       this.$request({
-        url: '/api/Contract/contractDraft/' + id,
-        method: 'get'
+        url: "/api/Contract/contractDraft/" + id,
+        method: "get",
       }).then((res) => {
-        this.list.push(res.data)
-        console.log(this.list)
-      })
+        this.list.push(res.data);
+        console.log(this.list);
+      });
     },
 
     success() {
-      /* 反馈图片赋值 */
-      this.feed.feedbackPicList = this.picList
+        /* 反馈图片赋值 */
+      this.feed.feedbackPicList = this.picList;
       /* 合同id赋值 */
-      this.feed.id = this.$route.query.id
-      this.feed.approveStatus = 1
+      this.feed.id = this.$route.query.id;
+      this.feed.approveStatus = 1;
       this.$request({
-        url: 'api/Contract/approveContractDraft',
-        method: 'post',
-        data: this.feed
+        url: "api/Contract/approveContractDraft",
+        method: "post",
+        data: this.feed,
       }).then((res) => {
         if (res.code == 200) {
           this.$message({
-            type: 'success',
-            message: '提交成功'
-          })
-          this.$router.go(0)
+            type: "success",
+            message: "提交成功",
+          });
+          this.$router.go(0);
         } else {
           this.$message({
-            type: 'success',
-            message: '提交失败'
-          })
-          this.$router.go(0)
+            type: "success",
+            message: "提交失败",
+          });
+          this.$router.go(0);
         }
-      })
+      });
     },
     failed() {
-      /* 反馈图片赋值 */
-      this.feed.feedbackPicList = this.picList
+        /* 反馈图片赋值 */
+      this.feed.feedbackPicList = this.picList;
       /* 合同id赋值 */
-      this.feed.id = this.$route.query.id
-      this.feed.approveStatus = 2
+      this.feed.id = this.$route.query.id;
+      this.feed.approveStatus = 2;
       this.$request({
-        url: 'api/Contract/approveContractDraft',
-        method: 'post',
-        data: this.feed
+        url: "api/Contract/approveContractDraft",
+        method: "post",
+        data: this.feed,
       }).then((res) => {
         if (res.code == 200) {
           this.$message({
-            type: 'success',
-            message: '提交成功'
-          })
-          this.$router.go(0)
+            type: "success",
+            message: "提交成功",
+          });
+          this.$router.go(0);
         } else {
           this.$message({
-            type: 'success',
-            message: '提交失败'
-          })
-          this.$router.go(0)
+            type: "success",
+            message: "提交失败",
+          });
+          this.$router.go(0);
         }
-      })
+      });
     },
     back() {
-      this.$router.go(-1)
-    }
-  }
-}
+      this.$router.go(-1);
+    },
+  },
+};
 </script>
 
 <style lang="scss">

src/views/form/detail.vue

@@ -1,16 +1,15 @@
 <template>
-	<div class="form" style="margin-top: 50px;">
-
+	<div  >
+		<el-descriptions title="出票人详情" :column="3" :size="size" border style="margin: 20px;">
+			<el-descriptions-item label="id">{{ tableData.id }}</el-descriptions-item>
+			<el-descriptions-item label="起始时间">{{ tableData.createdAt }}</el-descriptions-item>
+			<el-descriptions-item label="状态">{{ tableData.statusText }}</el-descriptions-item>
+			<el-descriptions-item label="姓名">{{ tableData.name }}</el-descriptions-item>
+			<el-descriptions-item label="银行账户">{{ tableData.bankAccount }}</el-descriptions-item>
+			<el-descriptions-item label="银行名称">{{ tableData.bankName }}</el-descriptions-item>
+		</el-descriptions>
+		<el-dialog title="修改出票人" :visible.sync="dialogVisible" width="30%">
 		<el-form ref="form" :model="tableData" label-width="80px">
-			<el-form-item label="id" prop="tableData.id">
-				<el-input v-model="tableData.id" style="width: 300px;" disabled></el-input>
-			</el-form-item>
-			<el-form-item label="起始时间" prop="tableData.createdAt">
-				<el-input v-model="tableData.createdAt" style="width: 300px;" disabled></el-input>
-			</el-form-item>
-			<el-form-item label="状态" prop="tableData.statusText">
-				<el-input v-model="tableData.statusText" style="width: 300px;" disabled></el-input>
-			</el-form-item>
 			<el-form-item label="姓名" prop="tableData.name">
 				<el-input v-model="tableData.name" style="width: 300px;"></el-input>
 			</el-form-item>
@@ -20,12 +19,18 @@
 			<el-form-item label="银行名称" prop="tableData.bankName">
 				<el-input v-model="tableData.bankName" style="width: 300px;"></el-input>
 			</el-form-item>
-			<el-form-item>
-				<el-button type="primary" @click="onSubmit">提交修改</el-button>
-			</el-form-item>
+			
 		</el-form>
-
-
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="dialogVisible = false">取 消</el-button>
+			<el-button type="primary" @click="onSubmit">提交修改</el-button>
+		</span>
+		</el-dialog>
+		<div style="display: flex;justify-content: center;">
+			<el-button type="primary" style="width: 100px;" @click="dialogVisible = true">修改信息</el-button>
+			<el-button type="primary" style="width: 100px;" @click="back">返回</el-button>
+		</div>
+			
 	</div>
 </template>
 
@@ -33,6 +38,7 @@
 	export default {
 		data() {
 			return {
+				dialogVisible:false,
 				tableData: {
 					name: '',
 					bankAccount: '',
@@ -74,6 +80,10 @@
 						})
 					}
 				})
+				this.dialogVisible=false
+			},
+			back(){
+				this.$router.go(-1)
 			}
 		}
 	}

src/views/register/index.vue

@@ -176,6 +176,9 @@
 									style="background-color: transparent; margin: 0; padding: 0">
 									授权委托书
 								</span>
+									<span class="svg-container" style="float: right;">
+										委托书模板下载
+									</span>
 								<div class="boximg">
 									<el-upload action="https://ht.9026.com/api/File" list-type="picture-card"
 										:on-success="handleSuccess">
@@ -436,7 +439,9 @@
 				}
 			}
 		}
-
+		.el-input .el-input__inner {
+		  color: #030303;
+		}
 		.el-form-item {
 			border: 1px solid rgba(255, 255, 255, 0.1);
 			background: #f6f6f6;
@@ -648,4 +653,6 @@
 		padding-top: 50px;
 		box-sizing: border-box;
 	}
+	
+
 </style>

src/views/shipments/index.vue

@@ -218,7 +218,6 @@ export default {
 
 
 
-
     handlehpCommand(command) {
       this.hpstatus = command;
     },

src/views/sucuirtyaudit/annexList.vue

@@ -8,70 +8,70 @@
 					</el-input>
 				</div>
 			</div>
-				<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-menu>
-					</el-dropdown>
-				</div>
-
-
-				<div class="grid-content bg-purple">
-					<div class="block">
-						<el-date-picker v-model="value2" type="daterange" align="right" unlink-panels
-							range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
-							:picker-options="pickerOptions">
-						</el-date-picker>
+			<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-menu>
+				</el-dropdown>
+			</div>
 
+
+			<div class="grid-content bg-purple">
+				<div class="block">
+					<el-date-picker v-model="value2" type="daterange" align="right" unlink-panels range-separator="至"
+						start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions">
+					</el-date-picker>
 				</div>
-				
-				<div class="grid-content bg-purple" style="display: flex;justify-content: flex-end;">
-					<el-button type="primary" @click="toindex">操作日志</el-button>
-					<el-button type="primary" disabled>附件列表</el-button>
-					<el-button type="primary" >批量下载</el-button>
-				</div>
+
+			</div>
+
+			<div class="grid-content bg-purple" style="display: flex;justify-content: flex-end;">
+				<el-button type="primary" @click="toindex">操作日志</el-button>
+				<el-button type="primary" disabled>附件列表</el-button>
+				<el-button type="primary">批量下载</el-button>
+			</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" label="" width="55" type="selection">
-				
+
 			</el-table-column>
-			<el-table-column align="center"  label="合同名称" width="200" prop="name">
-				
+			<el-table-column align="center" label="合同名称" width="200" prop="name">
+
 			</el-table-column>
-			
+
 			<el-table-column label="供应商" align="center" width="340" prop="supplierName">
-				
+
 			</el-table-column>
 			<el-table-column label="日期" width="200" align="center">
 				<template slot-scope="scope">
 					<i class="el-icon-time" />
 					<span>{{ scope.row.createdAt }}</span>
 				</template>
-				
+
 			</el-table-column>
-			<el-table-column align="center"  label="合同附件" width="800" prop="attachments">
+			<el-table-column align="center" label="合同附件" width="800" prop="attachments">
 				<template slot-scope="scope">
-					<img width='100' height="100" v-for="item in scope.row.attachments" :src="item"  >
+					<img width='100' height="100" v-for="item in scope.row.attachments" :src="item">
 				</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="">查看详情</el-tag>
-					<el-tag type="primary" style="cursor: pointer;margin-right: 15px;" @click="download(scope.row)">下载</el-tag>
+					<el-tag type="primary" style="cursor: pointer;margin-right: 15px;" @click="download(scope.row.id)">
+						下载</el-tag>
 				</template>
 			</el-table-column>
 		</el-table>
@@ -108,7 +108,7 @@
 		},
 		data() {
 			return {
-				temporaryList:[],
+				temporaryList: [],
 				srcList: [],
 				list: [],
 				listLoading: false,
@@ -149,18 +149,17 @@
 				value2: ''
 			}
 		},
-		created() {
-		},
+		created() {},
 		mounted() {
 			this.$request({
-				url:'/api/AuditLog/attachments',
-				method:'post',
-				data:{
-					pageIndex:1,
-					pageSize:100
+				url: '/api/AuditLog/attachments',
+				method: 'post',
+				data: {
+					pageIndex: 1,
+					pageSize: 100
 				}
-			}).then((res)=>{
-				this.list=res.data.result
+			}).then((res) => {
+				this.list = res.data.result
 				console.log(res)
 				this.getPageData();
 			})
@@ -211,8 +210,33 @@
 				this.srcList = this.list.slice(start, end);
 				this.temporaryList = this.srcList;
 			},
-			download(row){
-				console.log(row)
+			download(id) {
+				this.$request({
+					url: '/api/AuditLog/attachments/download',
+					method: 'post',
+					data: {
+						contractIds: [id]
+					}
+				}).then((res) => {
+					var zipName = "Bulk_Download"; // 下载的文件名
+					let blob = new Blob([res.data], {
+						type: "application/zip"
+					}); // 下载格式为zip
+					if ("download" in document.createElement("a")) {
+						非IE下载
+						let elink = document.createElement("a"); // 创建一个<a>标签
+						elink.style.display = "none"; // 隐藏标签
+						elink.href = window.URL.createObjectURL(blob); // 配置href
+						window.open(elink.href)
+						// elink.download = zipName;
+						// elink.click();
+						// URL.revokeObjectURL(elink.href); // 释放URL 对象
+						// document.body.removeChild(elink); // 移除<a>标签
+					} else {
+						//IE10+
+						navigator.msSaveBlob(blob, zipName);
+					}
+				})
 			}
 		}
 	}

src/views/table/detail.vue

@@ -1,5 +1,13 @@
 <template>
-	<div class="form" style="margin-top: 50px;">
+	<div  >
+		<el-descriptions title="承兑人详情" :column="3" :size="size" border style="margin: 20px;">
+			<el-descriptions-item label="姓名">{{ tableData.name }}</el-descriptions-item>
+			<el-descriptions-item label="服务费率">{{ tableData.serviceRate }}</el-descriptions-item>
+			<el-descriptions-item label="利率">{{ tableData.interest }}</el-descriptions-item>
+			<el-descriptions-item label="银行账户">{{ tableData.bankAccount }}</el-descriptions-item>
+			<el-descriptions-item label="银行名称">{{ tableData.bankName }}</el-descriptions-item>
+		</el-descriptions>
+		<el-dialog title="修改供应商" :visible.sync="dialogVisible" width="40%">
 		<el-form ref="form" :model="tableData" label-width="80px" >
 		  <el-form-item label="姓名" prop="tableData.name">
 		    <el-input v-model="tableData.name" style="width: 300px;"></el-input>
@@ -16,11 +24,18 @@
 		  <el-form-item label="银行名称" prop="tableData.bankName">
 		    <el-input v-model="tableData.bankName" style="width: 300px;"></el-input>
 		  </el-form-item>
-		   <el-form-item>
-		      <el-button type="primary" @click="onSubmit">提交修改</el-button>
-			  <el-button type="primary" @click="back">返回</el-button>
-		    </el-form-item>
 		</el-form>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="dialogVisible = false">取 消</el-button>
+			<el-button type="primary" @click="onSubmit">提交修改</el-button>
+		</span>
+		</el-dialog>
+		<div style="display: flex;justify-content: center;">
+			<el-button type="primary" @click="dialogVisible = true">修改信息</el-button>
+			<el-button type="primary" @click="back">返回</el-button>
+		</div>
+		
+		
 	</div>
 	
 </template>
@@ -29,6 +44,7 @@
 	export default {
 		data() {
 			return {
+				dialogVisible:false,
 				tableData: {
 					name:'',
 					serviceRate:'',
@@ -69,6 +85,7 @@
 						})
 					}
 				})
+				this.dialogVisible = false
 			},
 			back(){
 				this.$router.go(-1)
@@ -78,9 +95,5 @@
 </script>
 
 <style lang="scss">
-	.form{
-		margin: auto 0;
-		display: flex;
-		justify-content: center;
-	}
+
 </style>

src/views/table/index.vue

@@ -1,409 +1,371 @@
 <template>
 
-  <div class="app-container">
-    <el-row type="flex" justify="space-between" style="margin-bottom: 20px">
-      <div class="grid-content bg-purple">
-        <div class="grid-content bg-purple">
-          <el-input
-            placeholder="请输入承兑人名称"
-            v-model="formData.name"
-            @change="Search"
-            clearable
-            style="width: 100%"
-          >
-            <i slot="prefix" class="el-input__icon el-icon-search"></i>
-          </el-input>
-        </div>
-      </div>
-      <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"
-        style="display: flex; justify-content: flex-end"
-      >
-        <el-button type="primary" @click="addAcceptor">新增承兑人</el-button>
-        <el-button type="primary" @click="Exports">批量导出</el-button>
-      </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" label="" width="55" type="selection">
-      </el-table-column>
-      <el-table-column label="承兑人名称" align="center" prop="name">
-      </el-table-column>
-      <el-table-column label="账号" align="center" prop="bankAccount">
-      </el-table-column>
-      <el-table-column align="center" label="开户行名称" prop="bankName">
-      </el-table-column>
-      <el-table-column align="center" label="服务费率">
-        <template slot-scope="scope"> {{ scope.row.serviceRate }}% </template>
-      </el-table-column>
-      <el-table-column align="center" label="利率" prop="interest">
-        <template slot-scope="scope"> {{ scope.row.interest }}% </template>
-      </el-table-column>
-      <el-table-column align="center" label="状态" prop="statusText">
-      </el-table-column>
-      <el-table-column align="center" label="时间" prop="createdAt">
-      </el-table-column>
-      <el-table-column
-        align="center"
-        prop="created_at"
-        label="操作"
-        width="300"
-      >
-        <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)"
-            v-if="scope.row.status == 1"
-            >恢复
-          </el-tag>
-          <el-tag
-            type="danger"
-            style="cursor: pointer; margin-right: 15px"
-            @click="deleteStatus(scope.row.id)"
-            v-if="scope.row.status == 0"
-            >删除</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="total,prev, pager, next"
-        :total="total"
-        :page-size="pagesize"
-        :current-page="currentPage"
-        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>
+	<div class="app-container">
+		<el-row type="flex" justify="space-between" style="margin-bottom: 20px">
+				<div class="grid-content bg-purple">
+					<div class="grid-content bg-purple">
+						<el-input placeholder="请输入承兑人名称" v-model="formData.name" @change="Search" clearable
+							style="width: 100%">
+							<i slot="prefix" class="el-input__icon el-icon-search"></i>
+						</el-input>
+					</div>
+				</div>
+			<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" style="display: flex; justify-content: flex-end">
+				<el-button type="primary" @click="addAcceptor">新增承兑人</el-button>
+				<el-button type="primary" @click="Exports">批量导出</el-button>
+			</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" label="" width="55" type="selection">
+			</el-table-column>
+			<el-table-column label="承兑人名称" align="center" prop="name">
+			</el-table-column>
+			<el-table-column label="账号" align="center" prop="bankAccount">
+			</el-table-column>
+			<el-table-column align="center" label="开户行名称" prop="bankName">
+			</el-table-column>
+			<el-table-column align="center" label="服务费率">
+				<template slot-scope="scope"> {{ scope.row.serviceRate }}% </template>
+			</el-table-column>
+			<el-table-column align="center" label="利率" prop="interest">
+				<template slot-scope="scope"> {{ scope.row.interest }}% </template>
+			</el-table-column>
+			<el-table-column align="center" label="状态" prop="statusText">
+			</el-table-column>
+			<el-table-column align="center" label="时间" prop="createdAt">
+			</el-table-column>
+			<el-table-column align="center" prop="created_at" label="操作" width="300">
+				<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)"
+						v-if="scope.row.status == 1">恢复
+					</el-tag>
+					<el-tag type="danger" style="cursor: pointer; margin-right: 15px"
+						@click="deleteStatus(scope.row.id)" v-if="scope.row.status == 0">删除</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="total,prev, pager, next"
+				:total="total" :page-size="pagesize" :current-page="currentPage" 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 { dataConversionUtil } from "../../utils/Excel.js";
-import { getAcceptorSearch } from "@/api/acceptor";
-export default {
-  filters: {
-    statusFilter(status) {
-      const statusMap = {
-        published: "success",
-        draft: "gray",
-        deleted: "danger",
-      };
-      return statusMap[status];
-    },
-  },
-  data() {
-    return {
-      // 表单数据
-      formData: {
-        startTime: "",
-        endTime: "",
-        name: "", // 承兑人名称
-        status: "", // 承兑人状态
-      },
-      /* 当前页数 */
-      currentPage: 1,
-      /* 每页显示个数 */
-      pagesize: 10,
-      /* 总条数 */
-      total: 20,
-      srcList: [],
-      list: [],
-      listLoading: false,
-      status: "",
-      search: "",
-      temporaryList: [],
-      multipleSelection: [],
-      hpstatus: "",
-      checked: false,
-      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: "",
-    };
-  },
-  mounted() {
-    this.checked = this.$store.state.user.checked;
-    this.getAllList();
-  },
-  methods: {
-    /* 获取列表数据 */
-    getAllList(searchForm = {}) {
-      const params = {
-        pageIndex: this.currentPage,
-        pageSize: this.pagesize,
-      };
-      getAcceptorSearch({ ...params, ...searchForm }).then((res) => {
-        const { data } = res;
-        this.temporaryList = data.result;
-        this.srcList = data.result;
-        this.total = res.data.total;
-      });
-    },
+	import {
+		getList
+	} from "@/api/table";
+	import {
+		dataConversionUtil
+	} from "../../utils/Excel.js";
+	import {
+		getAcceptorSearch
+	} from "@/api/acceptor";
+	export default {
+		filters: {
+			statusFilter(status) {
+				const statusMap = {
+					published: "success",
+					draft: "gray",
+					deleted: "danger",
+				};
+				return statusMap[status];
+			},
+		},
+		data() {
+			return {
+				// 表单数据
+				formData: {
+					startTime: "",
+					endTime: "",
+					name: "", // 承兑人名称
+					status: "", // 承兑人状态
+				},
+				/* 当前页数 */
+				currentPage: 1,
+				/* 每页显示个数 */
+				pagesize: 10,
+				/* 总条数 */
+				total: 20,
+				srcList: [],
+				list: [],
+				listLoading: false,
+				status: "",
+				search: "",
+				temporaryList: [],
+				multipleSelection: [],
+				hpstatus: "",
+				checked: false,
+				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: "",
+			};
+		},
+		mounted() {
+			this.checked = this.$store.state.user.checked;
+			this.getAllList();
+		},
+		methods: {
+			/* 获取列表数据 */
+			getAllList(searchForm = {}) {
+				const params = {
+					pageIndex: this.currentPage,
+					pageSize: this.pagesize,
+				};
+				getAcceptorSearch({
+					...params,
+					...searchForm
+				}).then((res) => {
+					const {
+						data
+					} = res;
+					this.temporaryList = data.result;
+					this.srcList = data.result;
+					this.total = res.data.total;
+				});
+			},
 
-	
-    handlehpCommand(command) {
-      this.hpstatus = command;
-    },
-    handleSelectionChange(data) {
-      this.multipleSelection = data;
-      console.log(this.multipleSelection);
-    },
-    handleAll(data) {
-      this.multipleSelection = data;
-      console.log(this.multipleSelection);
-    },
-    addAcceptor() {
-      this.$router.push({
-        path: "/table/addAcceptor",
-      });
-    },
-    toDetail(id) {
-      this.$router.push({
-        path: "table/detail",
-        query: {
-          id: id,
-        },
-      });
-    },
-    recover(id) {
-      this.$request({
-        url: "/api/Acceptor/manager",
-        method: "post",
-        data: {
-          ids: [id],
-          operateType: 2,
-        },
-      }).then((res) => {
-        if (res.code == 200) {
-          this.$message({
-            type: "success",
-            message: "恢复成功",
-          });
-          this.getAllList();
-        } else {
-          this.$message({
-            type: "danger",
-            message: "恢复失败",
-          });
-          this.getAllList();
-        }
-      });
-    },
-    deleteStatus(id) {
-      this.$request({
-        url: "/api/Acceptor/manager",
-        method: "post",
-        data: {
-          ids: [id],
-          operateType: 1,
-        },
-      }).then((res) => {
-        if (res.code == 200) {
-          this.$message({
-            type: "success",
-            message: "删除成功",
-          });
-          this.getAllList();
-        } else {
-          this.$message({
-            type: "danger",
-            message: "删除失败",
-          });
-          this.getAllList();
-        }
-      });
-    },
 
+			handlehpCommand(command) {
+				this.hpstatus = command;
+			},
+			handleSelectionChange(data) {
+				this.multipleSelection = data;
+				console.log(this.multipleSelection);
+			},
+			handleAll(data) {
+				this.multipleSelection = data;
+				console.log(this.multipleSelection);
+			},
+			addAcceptor() {
+				this.$router.push({
+					path: "/table/addAcceptor",
+				});
+			},
+			toDetail(id) {
+				this.$router.push({
+					path: "table/detail",
+					query: {
+						id: id,
+					},
+				});
+			},
+			recover(id) {
+				this.$request({
+					url: "/api/Acceptor/manager",
+					method: "post",
+					data: {
+						ids: [id],
+						operateType: 2,
+					},
+				}).then((res) => {
+					if (res.code == 200) {
+						this.$message({
+							type: "success",
+							message: "恢复成功",
+						});
+						this.getAllList();
+					} else {
+						this.$message({
+							type: "danger",
+							message: "恢复失败",
+						});
+						this.getAllList();
+					}
+				});
+			},
+			deleteStatus(id) {
+				this.$request({
+					url: "/api/Acceptor/manager",
+					method: "post",
+					data: {
+						ids: [id],
+						operateType: 1,
+					},
+				}).then((res) => {
+					if (res.code == 200) {
+						this.$message({
+							type: "success",
+							message: "删除成功",
+						});
+						this.getAllList();
+					} else {
+						this.$message({
+							type: "danger",
+							message: "删除失败",
+						});
+						this.getAllList();
+					}
+				});
+			},
 
-	/* 输入承兑人状态查询 */
-    handleCommand(command) {
-      this.status = command
-        if (command === '正常') {
-        this.formData.status = 5
-      }
-      if (command === '删除') {
-        this.formData.status = 4
-      }
-       this.currentPage = 1;
-      this.searchForm = { ...this.formData };
-      this.getAllList(this.searchForm);
-    },
-    /* 输入承兑人名称查询 */
-    Search() {
-      this.currentPage = 1;
-      this.searchForm = { ...this.formData };
-      this.getAllList(this.searchForm);
-    },
 
 
-    /* 分页功能，改变当前页 */
-    handleCurrentChange(val) {
-      this.currentPage = val;
-      this.getAllList(this.searchForm);
-    },
+			/* 输入承兑人状态查询 */
+			handleCommand(command) {
+				this.status = command
+				//     if (command === '正常') {
+				//     this.formData.status = 0
+				//   }
+				//   if (command === '删除') {
+				//     this.formData.status = 1
+				//   }
+				this.formData.status = 0
+				this.currentPage = 1;
+				this.searchForm = {
+					...this.formData
+				};
+				this.getAllList(this.searchForm);
+			},
+			/* 输入承兑人名称查询 */
+			Search() {
+				this.currentPage = 1;
+				this.searchForm = {
+					...this.formData
+				};
+				this.getAllList(this.searchForm);
+			},
 
-    /* 分页功能去首页 */
-    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);
-    },
-    /* 导出 */
-    Exports() {
-      if (this.multipleSelection == "") {
-        this.$message({
-          type: "warning",
-          message: "请选择数据!",
-        });
-      } else {
-        var tableHeader = [
-          [
-            "序号",
-            "承兑人名称",
-            "账号",
-            "开户行名称",
-            "服务费率(%)",
-            "利率(%)",
-            "状态",
-            "时间",
-          ],
-        ];
-        var dataList = [];
-        this.multipleSelection.forEach((item, index) => {
-          dataList.push([
-            index + 1,
-            item.name,
-            item.bankAccount,
-            item.bankName,
-            item.serviceRate,
-            item.interest,
-            item.statusText,
-            item.createdAt,
-          ]);
-        });
-        dataConversionUtil.dataToExcel("承兑人列表", tableHeader, dataList);
-        this.$message.success("导出成功!");
-      }
-    },
-  },
-};
 
+			/* 分页功能，改变当前页 */
+			handleCurrentChange(val) {
+				this.currentPage = val;
+				this.getAllList(this.searchForm);
+			},
 
+			/* 分页功能去首页 */
+			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);
+			},
+			/* 导出 */
+			Exports() {
+				if (this.multipleSelection == "") {
+					this.$message({
+						type: "warning",
+						message: "请选择数据!",
+					});
+				} else {
+					var tableHeader = [
+						[
+							"序号",
+							"承兑人名称",
+							"账号",
+							"开户行名称",
+							"服务费率(%)",
+							"利率(%)",
+							"状态",
+							"时间",
+						],
+					];
+					var dataList = [];
+					this.multipleSelection.forEach((item, index) => {
+						dataList.push([
+							index + 1,
+							item.name,
+							item.bankAccount,
+							item.bankName,
+							item.serviceRate,
+							item.interest,
+							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%;
-  display: flex;
-  justify-content: flex-end;
-}
+	.pagesip {
+		width: 100%;
+		display: flex;
+		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>