项目日志：7.29第一次

src/api/database.js

@@ -0,0 +1,11 @@
+
+import request from '@/utils/request'
+
+/* 获取数据库备份数据 */
+export function getDatabase(data) {
+  return request({
+    url: '/api/Database/backups',
+    method: 'post',
+    data
+  })
+}

src/api/report.js

@@ -1,5 +1,7 @@
 import request from '@/utils/request'
 
+
+/* 承兑人分类报表 */
 export function getReportSearch(params) {
   return request({
     url:'/api/Report/acceptorClassification',
@@ -7,6 +9,8 @@ export function getReportSearch(params) {
     params
   })
 }
+
+/* 出票人分类报表 */
 export function getReportDrawerClassification(params) {
   return request({
     url:'/api/Report/drawerClassification',
@@ -15,6 +19,16 @@ export function getReportDrawerClassification(params) {
   })
 }
 
+/* 合同统计报表 */
+export function getReportContractReport(params) {
+  return request({
+    url:'/api/Report/contractReport',
+    method: 'get',
+    params
+  })
+}
+
+/* 供应商统计报表 */
 export function getReportSupplierReport(params) {
   return request({
     url:'/api/Report/supplierReport',
@@ -22,3 +36,6 @@ export function getReportSupplierReport(params) {
     params
   })
 }
+
+
+

src/utils/request.js

@@ -77,7 +77,6 @@ service.interceptors.response.use(
   response => {
     const res = response.data
     // if the custom code is not 20000, it is judged as an error.
-	console.log(res)
     if (res.code !== 200) {
       Message({
         message: res.msg || 'Error',

src/views/databackup/index.vue

@@ -1,311 +1,401 @@
 <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" style="margin-left: 30px;">
-					<el-input placeholder="请输入查询内容" v-model="search" style="width: 80%;">
-						<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-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>
-				<div class="grid-content bg-purple" style="display: flex;justify-content: flex-end;">
-					<el-button type="primary">下载</el-button>
-					<el-button type="danger" @click="moreDelete">删除</el-button>
-				</div>
-		</el-row>
-		<el-table v-loading="listLoading" :data="srcList" 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='fileName'>
-				
-			</el-table-column>
-			<el-table-column label="存储对象" align="center" prop="storeType">
-				
-			</el-table-column>
-			<el-table-column label="文件大小"  align="center" prop="fileSize">
-				
-			</el-table-column>
-			<el-table-column align="center"  label="时间" prop="backupTime">
-				
-			</el-table-column>
-			<el-table-column label="备注" align="center" prop="remark">
-				
-			</el-table-column>
-			<el-table-column align="center" prop="created_at" label="操作" width="250">
-				<template slot-scope="scope">
-					<el-tag type="success" style="cursor: pointer;margin-right: 15px;" @click="recover(scope.row.fileName)">恢复</el-tag>
-					<el-tag type="warning" style="margin-right: 15px;cursor: pointer;" @click="download(scope.row.fileUrl)">下载</el-tag>
-					<el-tag type="danger" style="cursor: pointer;" @click="deleted(scope.row.fileName)">删除</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="11" 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" style="margin-left: 30px">
+          <el-input
+            placeholder="请输入查询内容"
+            v-model="formData.fileName"
+            @change="Search"
+            style="width: 80%"
+          >
+            <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-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="结束日期"
+            value-format="yyyy-MM-dd"
+            :picker-options="pickerOptions"
+            @change="startEndTime"
+          >
+          </el-date-picker>
+        </div>
+      </div>
+      <div
+        class="grid-content bg-purple"
+        style="display: flex; justify-content: flex-end"
+      >
+        <el-button type="primary">下载</el-button>
+        <el-button type="danger" @click="moreDelete">删除</el-button>
+      </div>
+    </el-row>
+    <el-table
+      v-loading="listLoading"
+      :data="srcList"
+      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="fileName">
+      </el-table-column>
+      <el-table-column label="存储对象" align="center" prop="storeType">
+      </el-table-column>
+      <el-table-column label="文件大小" align="center" prop="fileSize">
+      </el-table-column>
+      <el-table-column align="center" label="时间" prop="backupTime">
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark">
+      </el-table-column>
+      <el-table-column
+        align="center"
+        prop="created_at"
+        label="操作"
+        width="250"
+      >
+        <template slot-scope="scope">
+          <el-tag
+            type="success"
+            style="cursor: pointer; margin-right: 15px"
+            @click="recover(scope.row.fileName)"
+            >恢复</el-tag
+          >
+          <el-tag
+            type="warning"
+            style="margin-right: 15px; cursor: pointer"
+            @click="download(scope.row.fileUrl)"
+            >下载</el-tag
+          >
+          <el-tag
+            type="danger"
+            style="cursor: pointer"
+            @click="deleted(scope.row.fileName)"
+            >删除</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
+        ref="pagination"
+        background
+        layout="total,prev, pager, next"
+        :total="total"
+        :page-size="pagesize"
+        :current-page="currentPage"
+        prev-text="上一页"
+        next-text="下一页"
+        @current-change="handleCurrentChange"
+      />
+      <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 { getDatabase } from '@/api/database';
+export default {
+  filters: {
+    statusFilter(status) {
+      const statusMap = {
+        published: "success",
+        draft: "gray",
+        deleted: "danger",
+      };
+      return statusMap[status];
+    },
+  },
+  data() {
+    return {
+      // 表单数据
+      formData: {
+        startTime: "",
+        endTime: "",
+        fileName:'',//文件名
+      },
+      /* 当前页数 */
+      currentPage: 1,
+      /* 每页显示个数 */
+      pagesize: 10,
+      /* 总条数 */
+      total: 20,
+      srcList: [],
+      list: [],
+      temporaryList: [],
+      listLoading: false,
+      status: "",
+      hpstatus: "",
+      removeList: [],
+      search: "",
+      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: "",
+    };
+  },
 
-	export default {
-		filters: {
-			statusFilter(status) {
-				const statusMap = {
-					published: 'success',
-					draft: 'gray',
-					deleted: 'danger'
-				}
-				return statusMap[status]
-			}
-		},
-		data() {
-			return {
-				srcList: [],
-				list: [],
-				temporaryList: [],
-				listLoading: false,
-				status: '',
-				hpstatus: '',
-				removeList:[],
-				currentPage: 1,
-				pagesize: 11,
-				search: '',
-				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.getAllList();
+  },
+  methods: {
+	/* 获取列表数据 */
+    getAllList(searchForm = {}) {
+      const params = {
+        pageIndex: this.currentPage,
+        pageSize: this.pagesize,
+      };
+      getDatabase({ ...params, ...searchForm }).then((res) => {
+        const { data } = res;
+        console.log(data);
+        this.temporaryList = data.result;
+        this.srcList = data.result;
+        this.total = res.data.total;
+      });
+	},
+
+
+    handleCommand(command) {
+      this.status = command;
+    },
+	  /* 请输入查询内容 */
+    Search() {
+      this.currentPage = 1;
+      this.searchForm = { ...this.formData };
+      this.getAllList(this.searchForm);
+    },
 	
-		mounted() {
-			this.$request({
-				url:"/api/Database/backups",
-				method:'post',
-				data:{
-					pageIndex:1,
-					pageSize:100
-				}
-			}).then((res)=>{
-				console.log(res)
-				this.list=res.data.result
-				this.getPageData();
-			})
-		},
-		methods: {
-			handleCommand(command) {
-				this.status = command
 
-			},
-			handlehpCommand(command) {
-				this.hpstatus = command
+	 // 日期审核状态查询
+    startEndTime() {
+      this.formData.startTime = this.value2[0];
+      this.formData.endTime = this.value2[1];
+      this.currentPage = 1;
+      this.searchForm = { ...this.formData };
+      this.getAllList(this.searchForm);
+    },
+
+    /* 分页功能，改变当前页 */
+    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);
+    },
+	
+
+
 
-			},
-			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;
-			},
-			handleCurrentChange(val) {
-				this.currentPage = val;
-				this.getPageData();
-			},
-			handleSelectionChange(data) {
-				this.multipleSelection = data;
-				console.log(this.multipleSelection);
-			},
-			handleAll(data) {
-				this.multipleSelection = data
-				console.log(this.multipleSelection)
-			},
-			download(url){
-				// window.open('https://ht.9026.com/api/Database/export?fileName='+fileName)
-				window.open(url)
-				// this.$request({
-				// 	url:'/api/Database/export',
-				// 	method:'post',
-				// 	data:{
-				// 		fileName:fileName
-				// 	}
-				// }).then((res)=>{
-				// 	console.log(res)
-				// })
-			},
-			recover(fileName){
-				this.$request({
-					url:'/api/Database/restore',
-					method:'post',
-					headers: { 
-					      'Content-Type': 'application/json'
-					   },
-					data:{
-						fileName:fileName
-					}
-				}).then((res)=>{
-					console.log(res)
-					if(res.code==200){
-						this.$message({
-							type:'success',
-							message:'恢复成功'
-						})
-					}else{
-						this.$message({
-							type:'danger',
-							message:'恢复失败'
-						})
-					}
-				})
-			},
-			deleted(fileName){
-				this.$request({
-					url:'/api/Database/delete',
-					method:'post',
-					data:{
-						fileNameList:[fileName]
-					}
-				}).then((res)=>{
-					if(res.code==200){
-						this.$message({
-							type:'success',
-							message:'删除成功!'
-						})
-					}else{
-						this.$message({
-							type:'danger',
-							message:'删除失败!'
-						})
-					}
-				})
-			},
-			moreDelete(){
-			 let fileNameList=Array.from(this.multipleSelection,({fileName})=>fileName)
-			 this.$request({
-				 url:'/api/Database/delete',
-				 method:'post',
-				 data:{
-					 fileNameList:fileNameList
-				 }
-			 }).then((res)=>{
-				 if(res.code==200){
-				 	this.$message({
-				 		type:'success',
-				 		message:'删除成功!'
-				 	})
-				 }else{
-				 	this.$message({
-				 		type:'danger',
-				 		message:'删除失败!'
-				 	})
-				 }
-			 })
-			}
-		}
-	}
+    handleCurrentChange(val) {
+      this.currentPage = val;
+      this.getPageData();
+    },
+    handleSelectionChange(data) {
+      this.multipleSelection = data;
+      console.log(this.multipleSelection);
+    },
+    handleAll(data) {
+      this.multipleSelection = data;
+      console.log(this.multipleSelection);
+    },
+    download(url) {
+      // window.open('https://ht.9026.com/api/Database/export?fileName='+fileName)
+      window.open(url);
+      // this.$request({
+      // 	url:'/api/Database/export',
+      // 	method:'post',
+      // 	data:{
+      // 		fileName:fileName
+      // 	}
+      // }).then((res)=>{
+      // 	console.log(res)
+      // })
+    },
+    recover(fileName) {
+      this.$request({
+        url: "/api/Database/restore",
+        method: "post",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        data: {
+          fileName: fileName,
+        },
+      }).then((res) => {
+        console.log(res);
+        if (res.code == 200) {
+          this.$message({
+            type: "success",
+            message: "恢复成功",
+          });
+        } else {
+          this.$message({
+            type: "danger",
+            message: "恢复失败",
+          });
+        }
+      });
+    },
+    deleted(fileName) {
+      this.$request({
+        url: "/api/Database/delete",
+        method: "post",
+        data: {
+          fileNameList: [fileName],
+        },
+      }).then((res) => {
+        if (res.code == 200) {
+          this.$message({
+            type: "success",
+            message: "删除成功!",
+          });
+        } else {
+          this.$message({
+            type: "danger",
+            message: "删除失败!",
+          });
+        }
+      });
+    },
+    moreDelete() {
+      let fileNameList = Array.from(
+        this.multipleSelection,
+        ({ fileName }) => fileName
+      );
+      this.$request({
+        url: "/api/Database/delete",
+        method: "post",
+        data: {
+          fileNameList: fileNameList,
+        },
+      }).then((res) => {
+        if (res.code == 200) {
+          this.$message({
+            type: "success",
+            message: "删除成功!",
+          });
+        } else {
+          this.$message({
+            type: "danger",
+            message: "删除失败!",
+          });
+        }
+      });
+    },
+  },
+};
 </script>
 <style lang="scss">
-	.app-container {
-		position: relative;
-	}
+.app-container {
+  position: relative;
+}
 
-	.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>

src/views/delivery/index.vue

@@ -12,16 +12,17 @@
           <i slot="prefix" class="el-input__icon el-icon-search"></i>
         </el-input>
       </div>
+      <!-- 审核状态 -->
       <div class="grid-content bg-purple">
         <el-dropdown @command="handleCommand">
           <div class="pulldown">
-            <span class="el-dropdown-link" v-if="!providerStatus">
+            <span v-if="!providerStatus" class="el-dropdown-link">
               审核状态
             </span>
-            <span class="el-dropdown-link" v-if="providerStatus">
+            <span v-if="providerStatus" class="el-dropdown-link">
               {{ providerStatus }}
             </span>
-            <i class="el-icon-arrow-down el-icon--right"></i>
+            <i class="el-icon-arrow-down el-icon--right" />
           </div>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item command="审核状态">审核状态</el-dropdown-item>
@@ -30,10 +31,13 @@
           </el-dropdown-menu>
         </el-dropdown>
       </div>
+      <!-- 供应商状态 -->
       <div class="grid-content bg-purple">
         <el-dropdown @command="AhandleCommand">
           <div class="pulldown">
-            <span v-if="!Auditstatus" class="el-dropdown-link"> 供应商状态 </span>
+            <span v-if="!Auditstatus" class="el-dropdown-link">
+              供应商状态
+            </span>
             <span v-if="Auditstatus" class="el-dropdown-link">
               {{ Auditstatus }}
             </span>
@@ -46,7 +50,7 @@
           </el-dropdown-menu>
         </el-dropdown>
       </div>
-	  <!-- 日期查询 -->
+      <!-- 日期查询 -->
       <div class="grid-content bg-purple">
         <div class="block">
           <el-date-picker
@@ -57,88 +61,165 @@
             range-separator="至"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
-			value-format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
             :picker-options="pickerOptions"
-			@change="startEndTime"
+            @change="startEndTime"
           >
           </el-date-picker>
         </div>
       </div>
     </el-row>
-		<el-table v-loading="listLoading" :data="temporaryList" element-loading-text="Loading" border fit
-			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">
-			</el-table-column>
-			<el-table-column label="社会统一信用代码" width="200" align="center" prop="socialCode">
-			</el-table-column>
-			<el-table-column label="账号" width="150" align="center" prop="account">
-			</el-table-column>
-			<el-table-column label="法人名称" width="180" align="center" prop="legalPerson">
-			</el-table-column>
-			<el-table-column label="联系人" width="180" align="center" prop="contacts">
-			</el-table-column>
+    <el-table
+      v-loading="listLoading"
+      :data="temporaryList"
+      element-loading-text="Loading"
+      border
+      fit
+      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"
+      >
+      </el-table-column>
+      <el-table-column
+        label="社会统一信用代码"
+        width="200"
+        align="center"
+        prop="socialCode"
+      >
+      </el-table-column>
+      <el-table-column label="账号" width="150" align="center" prop="account">
+      </el-table-column>
+      <el-table-column
+        label="法人名称"
+        width="180"
+        align="center"
+        prop="legalPerson"
+      >
+      </el-table-column>
+      <el-table-column
+        label="联系人"
+        width="180"
+        align="center"
+        prop="contacts"
+      >
+      </el-table-column>
 
-			<el-table-column label="电话" width="180" align="center" prop="contactsMobile">
-			</el-table-column>
-			<el-table-column label="供应商状态" width="180" align="center" prop="statusText">
-			</el-table-column>
-			<el-table-column label="状态" align="center" prop="isDeletedText">
-			</el-table-column>
-			<el-table-column align="center" prop="createdAt" label="时间" width="180">
-			</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="toedit(scope.row.id)">编辑
-					</el-tag>
-					<el-tag type="success" style="margin-right: 15px; cursor: pointer" @click="Srecover(scope.row.id)"
-						v-if="scope.row.isDeleted == 1">恢复</el-tag>
-					<el-tag type="danger" style="margin-right: 15px; cursor: pointer" @click="Sdeleted(scope.row.id)"
-						v-if="scope.row.isDeleted == 0">禁用</el-tag>
-					<el-tag type="primary" style="margin-right: 15px; cursor: pointer" @click="reset(scope.row.id)"
-						v-permission="['admin']">重置密码</el-tag>
-				</template>
-			</el-table-column>
-		</el-table>
-		<div style="display: flex; justify-content: space-between">
-			<el-row type="flex" justify="end">
-				<div class="btn" style="display: flex; justify-content: flex-end">
-					<el-button type="primary" @click="failed">审核失败</el-button>
-					<el-button type="primary" @click="success">审核成功</el-button>
-					<el-button type="primary" @click="Exports">批量导出</el-button>
-					<el-button type="success" @click="recover">恢复</el-button>
-					<el-button type="danger" @click="deleted">禁用</el-button>
-				</div>
-			</el-row>
-			<div class="pagesip">
-				<el-button type="primary" size="small" style="
+      <el-table-column
+        label="电话"
+        width="180"
+        align="center"
+        prop="contactsMobile"
+      >
+      </el-table-column>
+      <el-table-column
+        label="供应商状态"
+        width="180"
+        align="center"
+        prop="statusText"
+      >
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="isDeletedText">
+      </el-table-column>
+      <el-table-column align="center" prop="createdAt" label="时间" width="180">
+      </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="toedit(scope.row.id)"
+            >编辑
+          </el-tag>
+          <el-tag
+            type="success"
+            style="margin-right: 15px; cursor: pointer"
+            @click="Srecover(scope.row.id)"
+            v-if="scope.row.isDeleted == 1"
+            >恢复</el-tag
+          >
+          <el-tag
+            type="danger"
+            style="margin-right: 15px; cursor: pointer"
+            @click="Sdeleted(scope.row.id)"
+            v-if="scope.row.isDeleted == 0"
+            >禁用</el-tag
+          >
+          <el-tag
+            type="primary"
+            style="margin-right: 15px; cursor: pointer"
+            @click="reset(scope.row.id)"
+            v-permission="['admin']"
+            >重置密码</el-tag
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <div style="display: flex; justify-content: space-between">
+      <el-row type="flex" justify="end">
+        <div class="btn" style="display: flex; justify-content: flex-end">
+          <el-button type="primary" @click="failed">审核失败</el-button>
+          <el-button type="primary" @click="success">审核成功</el-button>
+          <el-button type="primary" @click="Exports">批量导出</el-button>
+          <el-button type="success" @click="recover">恢复</el-button>
+          <el-button type="danger" @click="deleted">禁用</el-button>
+        </div>
+      </el-row>
+      <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="
+          "
+          @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>
+          "
+          @click="jumpLastPage"
+          >尾页
+        </el-button>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
-	import {
-		dataConversionUtil
-	} from "../../utils/Excel.js";
-	import {
-		getSupplierSearch
-	} from "@/api/supplier";
+import { dataConversionUtil } from "../../utils/Excel.js";
+import { getSupplierSearch } from "@/api/supplier";
 
 export default {
   filters: {
@@ -161,7 +242,7 @@ export default {
         status: "",
         socialCode: "",
         legalPerson: "",
-        isDeleted:'',//供应商状态 0代表未认证，1代表已认证
+        isDeleted: "",
       },
       /* 当前页数 */
       currentPage: 1,
@@ -175,7 +256,7 @@ export default {
       listLoading: false,
       providerStatus: "",
       search: "",
-      Auditstatus:'',
+      Auditstatus: "",
       multipleSelection: [],
       checked: false,
       pickerOptions: {
@@ -229,7 +310,6 @@ export default {
         this.temporaryList = data.result;
         this.srcList = data.result;
         this.total = res.data.total;
-		
       });
     },
     handleSelectionChange(data) {
@@ -240,7 +320,7 @@ export default {
       this.multipleSelection = data;
       console.log(this.multipleSelection);
     },
-    
+
     toedit(id) {
       this.$router.push({
         path: "/edit",
@@ -250,388 +330,344 @@ export default {
       });
     },
 
-	 // 日期审核状态查询
+    // 日期审核状态查询
     startEndTime() {
-      this.formData.startTime = this.value2[0]
-      this.formData.endTime = this.value2[1]
-      this.currentPage = 1
-      this.searchForm = { ...this.formData }
-      this.getAllList(this.searchForm)
+      this.formData.startTime = this.value2[0];
+      this.formData.endTime = this.value2[1];
+      this.currentPage = 1;
+      this.searchForm = { ...this.formData };
+      this.getAllList(this.searchForm);
     },
-	/* 审核状态查询 */
+    /* 审核状态查询 */
     handleCommand(command) {
       this.providerStatus = command;
-      if(command === '审核状态'){
-        this.formData.isDeleted=''
-      }
-          if (command === '正常') {
-          this.formData.isDeleted = 0
-        }
-        if (command === '删除') {
-          this.formData.isDeleted = 1
+        if(command === '审核状态'){
+          this.formData.isDeleted=''
         }
-      this.currentPage = 1;
-      this.searchForm = { ...this.formData };
-      this.getAllList(this.searchForm);
+            if (command === '正常') {
+            this.formData.isDeleted = 0
+          }
+          if (command === '删除') {
+            this.formData.isDeleted = 1
+          }
+        this.currentPage = 1;
+        this.searchForm = { ...this.formData };
+        this.getAllList(this.searchForm);
     },
 
     // 输入供应商状态查询
-    AhandleCommand(command){
-      this.Auditstatus=command
-      if(command === '供应商状态'){
-        this.formData.status=''
+    AhandleCommand(command) {
+      this.Auditstatus = command;
+      if (command === "供应商状态") {
+        this.formData.status = "";
+      }
+      if (command === "已认证") {
+        this.formData.status = 2;
+      }
+      if (command === "未认证") {
+        this.formData.status = 1;
       }
-       if (command === '已认证') {
-          this.formData.status = 2
-        }
-        if (command === '未认证') {
-          this.formData.status = 1
-        }
       this.currentPage = 1;
       this.searchForm = { ...this.formData };
       this.getAllList(this.searchForm);
-      
     },
 
-			// 日期审核状态查询
-			startEndTime() {
-				this.formData.startTime = this.value2[0]
-				this.formData.endTime = this.value2[1]
-				this.currentPage = 1
-				this.searchForm = {
-					...this.formData
-				}
-				this.getAllList(this.searchForm)
-			},
-			/* 输入供应商状态查询 */
-			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);
-			},
-
-			/* 审核状态查询 */
-			AhandleCommand(command) {
-				this.Auditstatus = command
-				if (command === '已认证') {
-					this.formData.status = 5
-				}
-				if (command === '未认证') {
-					this.formData.status = 4
-				}
-				this.currentPage = 1;
-				this.searchForm = {
-					...this.formData
-				};
-				this.getAllList(this.searchForm);
-
-			},
+    // 日期审核状态查询
+    startEndTime() {
+      this.formData.startTime = this.value2[0];
+      this.formData.endTime = this.value2[1];
+      this.currentPage = 1;
+      this.searchForm = {
+        ...this.formData,
+      };
+      this.getAllList(this.searchForm);
+    },
 
-			/* 输入出票人名称查询 */
-			Search() {
-				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);
-			},
+    /* 分页功能，改变当前页 */
+    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);
-			},
+    /* 分页功能去首页 */
+    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.socialCode,
-							item.account,
-							item.legalPerson,
-							item.contacts,
-							item.contactsMobile,
-							item.statusText,
-							item.createdAt,
-						]);
-					});
-					dataConversionUtil.dataToExcel("供应商列表", tableHeader, dataList);
-					this.$message.success("导出成功!");
-				}
-			},
-			success() {
-				let ids = Array.from(this.multipleSelection, ({
-					id
-				}) => id);
-				this.$request({
-					url: "/api/Supplier/manage",
-					method: "post",
-					data: {
-						ids: ids,
-						operateType: 3,
-					},
-				}).then((res) => {
-					if (res.code == 200) {
-						this.$message({
-							type: "success",
-							message: res.msg,
-						});
-						this.getAllList();
-					} else {
-						this.$message({
-							type: "danger",
-							message: res.msg,
-						});
-						this.getAllList();
-					}
-				});
-			},
-			failed() {
-				let ids = Array.from(this.multipleSelection, ({
-					id
-				}) => id);
-				this.$request({
-					url: "/api/Supplier/manage",
-					method: "post",
-					data: {
-						ids: ids,
-						operateType: 4,
-					},
-				}).then((res) => {
-					if (res.code == 200) {
-						this.$message({
-							type: "success",
-							message: res.msg,
-						});
-						this.getAllList();
-					} else {
-						this.$message({
-							type: "danger",
-							message: res.msg,
-						});
-						this.getAllList();
-					}
-				});
-			},
-			recover() {
-				let ids = Array.from(this.multipleSelection, ({
-					id
-				}) => id);
-				this.$request({
-					url: "/api/Supplier/manage",
-					method: "post",
-					data: {
-						ids: ids,
-						operateType: 2,
-					},
-				}).then((res) => {
-					if (res.code == 200) {
-						this.$message({
-							type: "success",
-							message: res.msg,
-						});
-						this.getAllList();
-					} else {
-						this.$message({
-							type: "danger",
-							message: res.msg,
-						});
-						this.getAllList();
-					}
-				});
-			},
-			Srecover(id) {
-				this.$request({
-					url: "/api/Supplier/manage",
-					method: "post",
-					data: {
-						ids: [id],
-						operateType: 2,
-					},
-				}).then((res) => {
-					if (res.code == 200) {
-						this.$message({
-							type: "success",
-							message: res.msg,
-						});
-						this.getAllList();
-					} else {
-						this.$message({
-							type: "danger",
-							message: res.msg,
-						});
-						this.getAllList();
-					}
-				});
-			},
-			deleted() {
-				let ids = Array.from(this.multipleSelection, ({
-					id
-				}) => id);
-				this.$request({
-					url: "/api/Supplier/manage",
-					method: "post",
-					data: {
-						ids: ids,
-						operateType: 1,
-					},
-				}).then((res) => {
-					if (res.code == 200) {
-						this.$message({
-							type: "success",
-							message: res.msg,
-						});
-						this.getAllList();
-					} else {
-						this.$message({
-							type: "danger",
-							message: res.msg,
-						});
-						this.getAllList();
-					}
-				});
-			},
-			Sdeleted(id) {
-				this.$request({
-					url: "/api/Supplier/manage",
-					method: "post",
-					data: {
-						ids: [id],
-						operateType: 1,
-					},
-				}).then((res) => {
-					if (res.code == 200) {
-						this.$message({
-							type: "success",
-							message: res.msg,
-						});
-						this.getAllList();
-					} else {
-						this.$message({
-							type: "danger",
-							message: res.msg,
-						});
-						this.getAllList();
-					}
-				});
-			},
-			reset(id) {
-				this.$prompt("请输入密码", "重置密码", {
-						confirmButtonText: "确定",
-						cancleButtonText: "取消",
-					})
-					.then(({
-						value
-					}) => {
-						if(value.length <6){
-							this.$message({
-								type:'error',
-								message:'密码至少六位!'
-							})
-						}else{
-							this.$request({
-								url: "/api/Account/password/resetSupplier",
-								method: "post",
-								data: {
-									password: value,
-									supplierId: id,
-								},
-							}).then((res) => {
-								console.log(res);
-								if (res.code === 200) {
-									this.$message({
-										type: "success",
-										message: "重置成功",
-									});
-								}
-							});
-						}
-						
-					})
-					.catch(() => {
-						this.$message({
-							type: "info",
-							message: "取消重置密码",
-						});
-					});
-			}
-		},
-	};
+    /* 导出 */
+    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.socialCode,
+            item.account,
+            item.legalPerson,
+            item.contacts,
+            item.contactsMobile,
+            item.statusText,
+            item.createdAt,
+          ]);
+        });
+        dataConversionUtil.dataToExcel("供应商列表", tableHeader, dataList);
+        this.$message.success("导出成功!");
+      }
+    },
+    success() {
+      let ids = Array.from(this.multipleSelection, ({ id }) => id);
+      this.$request({
+        url: "/api/Supplier/manage",
+        method: "post",
+        data: {
+          ids: ids,
+          operateType: 3,
+        },
+      }).then((res) => {
+        if (res.code == 200) {
+          this.$message({
+            type: "success",
+            message: res.msg,
+          });
+          this.getAllList();
+        } else {
+          this.$message({
+            type: "danger",
+            message: res.msg,
+          });
+          this.getAllList();
+        }
+      });
+    },
+    failed() {
+      let ids = Array.from(this.multipleSelection, ({ id }) => id);
+      this.$request({
+        url: "/api/Supplier/manage",
+        method: "post",
+        data: {
+          ids: ids,
+          operateType: 4,
+        },
+      }).then((res) => {
+        if (res.code == 200) {
+          this.$message({
+            type: "success",
+            message: res.msg,
+          });
+          this.getAllList();
+        } else {
+          this.$message({
+            type: "danger",
+            message: res.msg,
+          });
+          this.getAllList();
+        }
+      });
+    },
+    recover() {
+      let ids = Array.from(this.multipleSelection, ({ id }) => id);
+      this.$request({
+        url: "/api/Supplier/manage",
+        method: "post",
+        data: {
+          ids: ids,
+          operateType: 2,
+        },
+      }).then((res) => {
+        if (res.code == 200) {
+          this.$message({
+            type: "success",
+            message: res.msg,
+          });
+          this.getAllList();
+        } else {
+          this.$message({
+            type: "danger",
+            message: res.msg,
+          });
+          this.getAllList();
+        }
+      });
+    },
+    Srecover(id) {
+      this.$request({
+        url: "/api/Supplier/manage",
+        method: "post",
+        data: {
+          ids: [id],
+          operateType: 2,
+        },
+      }).then((res) => {
+        if (res.code == 200) {
+          this.$message({
+            type: "success",
+            message: res.msg,
+          });
+          this.getAllList();
+        } else {
+          this.$message({
+            type: "danger",
+            message: res.msg,
+          });
+          this.getAllList();
+        }
+      });
+    },
+    deleted() {
+      let ids = Array.from(this.multipleSelection, ({ id }) => id);
+      this.$request({
+        url: "/api/Supplier/manage",
+        method: "post",
+        data: {
+          ids: ids,
+          operateType: 1,
+        },
+      }).then((res) => {
+        if (res.code == 200) {
+          this.$message({
+            type: "success",
+            message: res.msg,
+          });
+          this.getAllList();
+        } else {
+          this.$message({
+            type: "danger",
+            message: res.msg,
+          });
+          this.getAllList();
+        }
+      });
+    },
+    Sdeleted(id) {
+      this.$request({
+        url: "/api/Supplier/manage",
+        method: "post",
+        data: {
+          ids: [id],
+          operateType: 1,
+        },
+      }).then((res) => {
+        if (res.code == 200) {
+          this.$message({
+            type: "success",
+            message: res.msg,
+          });
+          this.getAllList();
+        } else {
+          this.$message({
+            type: "danger",
+            message: res.msg,
+          });
+          this.getAllList();
+        }
+      });
+    },
+    reset(id) {
+      this.$prompt("请输入密码", "重置密码", {
+        confirmButtonText: "确定",
+        cancleButtonText: "取消",
+      })
+        .then(({ value }) => {
+          if (value.length < 6) {
+            this.$message({
+              type: "error",
+              message: "密码至少六位!",
+            });
+          } else {
+            this.$request({
+              url: "/api/Account/password/resetSupplier",
+              method: "post",
+              data: {
+                password: value,
+                supplierId: id,
+              },
+            }).then((res) => {
+              console.log(res);
+              if (res.code === 200) {
+                this.$message({
+                  type: "success",
+                  message: "重置成功",
+                });
+              }
+            });
+          }
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消重置密码",
+          });
+        });
+    },
+  },
+};
 </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;
+}
 
-	.btn {
-		padding: 20px;
-	}
+.btn {
+  padding: 20px;
+}
 </style>

src/views/shipments/index.vue

@@ -85,7 +85,7 @@
         ref="pagination"
         background
         layout="total,prev, pager, next"
-        :total="srcList.length"
+        :total="total"
         :page-size="pagesize"
         :current-page="currentPage"
         prev-text="上一页"
@@ -181,15 +181,19 @@ export default {
   },
   methods: {
     /* 获取承兑人分类报表 */
-    getReportList(number,startDate,endDate) {
+    getReportList(number,startDate,endDate,pageSize,
+        pageIndex) {
       let params = {
         frequency: number || 1,
         startDate,
-        endDate
+        endDate,
+        pageSize,//页大小
+        pageIndex//页面
       };
       getReportSearch({ ...params }).then((res) => {
         const { data } = res;
-        this.srcList = data;
+        this.srcList = data.result;
+        this.total = data.total
       });
     },
 
@@ -222,8 +226,29 @@ export default {
     startEndTime() {
       this.formData.startTime = this.value2[0]
       this.formData.endTime = this.value2[1]
-       this.getReportList(this.number,this.formData.startTime,this.formData.endTime);
+      this.currentPage = 1
+       this.getReportList(this.number,this.formData.startTime,this.formData.endTime,this.pagesize,this.currentPage);
     },
+      /* 分页功能，改变当前页 */
+    handleCurrentChange(val) {
+      this.currentPage = val
+      this.getReportList(this.number,this.formData.startTime,this.formData.endTime,this.pagesize,this.currentPage)
+    },
+
+    /* 分页功能：去首页 */
+    jumpFirstPage() {
+      this.$refs.pagination.handleCurrentChange(1)
+      this.$emit('handleCurrentChange', 1)
+    },
+
+    /* 分页功能：去尾页 */
+    jumpLastPage() {
+      const font = this.$refs.pagination
+      const cpage = Math.ceil(font.total / font.pageSize)
+      font.handleCurrentChange(cpage)
+    },
+
+
 
 
     shipments1() {
@@ -276,24 +301,6 @@ export default {
         this.$message.success("导出成功!");
       }
     },
-    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);
-    },
   },
 };
 </script>

src/views/shipments/shipments1.vue

@@ -86,7 +86,7 @@
         ref="pagination"
         background
         layout="total,prev, pager, next"
-        :total="srcList.length"
+        :total="total"
         :page-size="pagesize"
         :current-page="currentPage"
         prev-text="上一页"
@@ -183,16 +183,19 @@ export default {
     this.getReportList();
   },
   methods: {
-    /* 获取承兑人分类报表 */
-    getReportList(number, startDate, endDate) {
+    /* 获取出票人分类报表 */
+    getReportList(number, startDate, endDate, pageSize, pageIndex) {
       let params = {
         frequency: number || 1,
         startDate,
         endDate,
+        pageSize, //页大小
+        pageIndex, //页面
       };
       getReportDrawerClassification({ ...params }).then((res) => {
         const { data } = res;
-        this.srcList = data;
+        this.srcList = data.result;
+        this.total = data.total;
       });
     },
 
@@ -221,7 +224,7 @@ export default {
     },
     // *  报表频率查询*/
     handleCommand(command) {
-       this.status = command;
+      this.status = command;
       if (command === "月度") {
         this.formData.frequency = 1;
       }
@@ -231,16 +234,47 @@ export default {
       if (command === "年度") {
         this.formData.frequency = 3;
       }
-      this.number = this.formData.frequency
+      this.number = this.formData.frequency;
       this.getReportList(this.formData.frequency);
     },
-	// 日期审核状态查询
+    // 日期审核状态查询
     startEndTime() {
-      this.formData.startTime = this.value2[0]
-      this.formData.endTime = this.value2[1]
-       this.getReportList(this.number,this.formData.startTime,this.formData.endTime);
+      this.formData.startTime = this.value2[0];
+      this.formData.endTime = this.value2[1];
+      this.currentPage = 1;
+      this.getReportList(
+        this.number,
+        this.formData.startTime,
+        this.formData.endTime,
+        this.pagesize,
+        this.currentPage
+      );
     },
- 
+    /* 分页功能，改变当前页 */
+    handleCurrentChange(val) {
+      this.currentPage = val;
+      this.getReportList(
+        this.number,
+        this.formData.startTime,
+        this.formData.endTime,
+        this.pagesize,
+        this.currentPage
+      );
+    },
+
+    /* 分页功能：去首页 */
+    jumpFirstPage() {
+      this.$refs.pagination.handleCurrentChange(1);
+      this.$emit("handleCurrentChange", 1);
+    },
+
+    /* 分页功能：去尾页 */
+    jumpLastPage() {
+      const font = this.$refs.pagination;
+      const cpage = Math.ceil(font.total / font.pageSize);
+      font.handleCurrentChange(cpage);
+    },
+
     /* 导出 */
     Export() {
       if (this.multipleSelection == "") {
@@ -276,24 +310,6 @@ export default {
         this.$message.success("导出成功!");
       }
     },
-    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);
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val;
-      this.getPageData();
-    },
-    getPageData() {
-      let start = (this.currentPage - 1) * this.pagesize;
-      let end = start + this.pagesize;
-      this.srcList = this.list.slice(start, end);
-    },
   },
 };
 </script>

src/views/shipments/shipments2.vue

@@ -22,7 +22,9 @@
             range-separator="至"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
+            value-format="yyyy-MM-dd"
             :picker-options="pickerOptions"
+            @change="startEndTime"
           >
           </el-date-picker>
         </div>
@@ -50,7 +52,7 @@
     >
       <el-table-column align="center" label="" width="55" type="selection">
       </el-table-column>
-      <el-table-column label="合同名称" align="center" prop="supplierName">
+      <el-table-column label="合同名称" align="center" prop="contractName">
       </el-table-column>
       <el-table-column label="汇票承兑日" align="center" prop="acceptDate">
       </el-table-column>
@@ -81,7 +83,7 @@
         ref="pagination"
         background
         layout="total,prev, pager, next"
-        :total="srcList.length"
+        :total="total"
         :page-size="pagesize"
         :current-page="currentPage"
         prev-text="上一页"
@@ -101,7 +103,7 @@
 
 <script>
 import { dataConversionUtil } from "../../utils/Excel.js";
-import { getReportSupplierReport } from "@/api/report";
+import { getReportContractReport } from "@/api/report";
 export default {
   filters: {
     statusFilter(status) {
@@ -131,7 +133,6 @@ export default {
       srcList: [],
       string: "", //区分是合同名称
       listLoading: false,
-
       list: [],
       status: "",
       hpstatus: "",
@@ -176,16 +177,20 @@ export default {
     this.getReportList();
   },
   methods: {
-    /* 获取承兑人分类报表 */
-    getReportList(string, startDate, endDate) {
+    /* 获取合同统计列表 */
+    getReportList(contractName, startDate, endDate, pageSize, pageIndex) {
       let params = {
-        contractName: string || "",
+        contractName,
         startDate,
         endDate,
+        pageSize, //页大小
+        pageIndex, //页面
       };
-      getReportSupplierReport({ ...params }).then((res) => {
+      getReportContractReport({ ...params }).then((res) => {
         const { data } = res;
-        this.srcList = data;
+        this.srcList = data.result;
+        this.total = data.total;
+
       });
     },
 
@@ -213,24 +218,55 @@ export default {
       });
     },
 
-    /* 合同名称  */
-    // 合同名称/编号/承兑人名称/出票查询
+    // 合同查询
     Search() {
-      console.log(this.string);
-      this.getReportList(this.string,'2022-10-25','2023-01-05');
+      this.getReportList(
+        this.string,
+        this.formData.startTime,
+        this.formData.endTime
+      );
     },
 
     // 日期审核状态查询
     startEndTime() {
       this.formData.startTime = this.value2[0];
       this.formData.endTime = this.value2[1];
+      this.currentPage = 1;
       this.getReportList(
-        this.number,
+        this.string,
         this.formData.startTime,
-        this.formData.endTime
+        this.formData.endTime,
+        this.pagesize,
+        this.currentPage
       );
     },
 
+    /* 分页功能，改变当前页 */
+    handleCurrentChange(val) {
+      this.currentPage = val;
+      this.getReportList(
+        this.string,
+        this.formData.startTime,
+        this.formData.endTime,
+        this.pagesize,
+        this.currentPage
+      );
+    },
+
+    /* 分页功能：去首页 */
+    jumpFirstPage() {
+      this.$refs.pagination.handleCurrentChange(1);
+      this.$emit("handleCurrentChange", 1);
+    },
+
+    /* 分页功能：去尾页 */
+    jumpLastPage() {
+      const font = this.$refs.pagination;
+      const cpage = Math.ceil(font.total / font.pageSize);
+      font.handleCurrentChange(cpage);
+    },
+
+    /* 导出 */
     Export() {
       // window.open('http://123.207.180.167:8700/api/Report/export/contractReport?contractName=&startDate=&endDate=')
       if (this.multipleSelection == "") {
@@ -268,24 +304,6 @@ export default {
         this.$message.success("导出成功!");
       }
     },
-    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);
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val;
-      this.getPageData();
-    },
-    getPageData() {
-      let start = (this.currentPage - 1) * this.pagesize;
-      let end = start + this.pagesize;
-      this.srcList = this.list.slice(start, end);
-    },
   },
 };
 </script>

src/views/shipments/shipments3.vue

@@ -1,263 +1,333 @@
 <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="input4" 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">
+        <div class="grid-content bg-purple">
+          <el-input
+            placeholder="请输入查询内容"
+            v-model="string"
+            @change="Search"
+            style="width: 100%"
+          >
+            <i slot="prefix" class="el-input__icon el-icon-search"></i>
+          </el-input>
+        </div>
+      </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>
-			<!-- <el-col :xs="24" :sm="10" :md="8" :lg="5" :xl="5">
-     <div class="grid-content bg-purple">
-       <div class="grid-content bg-purple" style="margin-left: 30px;">
-         <el-input
-             placeholder="请输入查询内容"
-             v-model="input4" style="width: 80%;">
-             <i slot="prefix" class="el-input__icon el-icon-search"></i>
-           </el-input>
-       </div>
-     </div>
-     </el-col> -->
-			<!-- <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="index">承兑人分类报表</el-button>
-					<el-button type="primary" @click="shipments1">出票人分类报表</el-button>
-					<el-button type="primary" @click="shipments2">合同统计列表</el-button>
-					<el-button type="primary" disabled>供应商统计列表</el-button>
-					<el-button type="primary" @click="Export">导出</el-button>
-				</div>
-			<!-- <el-col :xs="13" :sm="7" :md="6" :lg="8" :xl="16">
-       <div class="grid-content bg-purple" style="display: flex;justify-content: flex-end;">
-
-         <el-button type="primary">导出</el-button>
-
-       </div>
-     </el-col> -->
-
-		</el-row>
-		<el-table v-loading="listLoading" :data="srcList" 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="supplierName">
-
-			</el-table-column>
-			<el-table-column label="汇票承兑日" align="center" prop="acceptDate">
+      <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="结束日期"
+            value-format="yyyy-MM-dd"
+            :picker-options="pickerOptions"
+            @change="startEndTime"
+          >
+          </el-date-picker>
+        </div>
+      </div>
+      <div
+        class="grid-content bg-purple"
+        style="display: flex; justify-content: flex-end"
+      >
+        <el-button type="primary" @click="index">承兑人分类报表</el-button>
+        <el-button type="primary" @click="shipments1">出票人分类报表</el-button>
+        <el-button type="primary" @click="shipments2">合同统计列表</el-button>
+        <el-button type="primary" disabled>供应商统计列表</el-button>
+        <el-button type="primary" @click="Export">导出</el-button>
+      </div>
+    </el-row>
+    <el-table
+      v-loading="listLoading"
+      :data="srcList"
+      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="supplierName">
+      </el-table-column>
+      <el-table-column label="汇票承兑日" align="center" prop="acceptDate">
+      </el-table-column>
+      <el-table-column
+        label="汇票贴现日"
+        align="center"
+        prop="expectDiscountDate"
+      >
+      </el-table-column>
+      <el-table-column label="汇票笔数" align="center" prop="count">
+      </el-table-column>
+      <el-table-column label="汇票金额" align="center" prop="money">
+      </el-table-column>
+      <el-table-column label="服务费" align="center" prop="serviceMoney">
+      </el-table-column>
+      <el-table-column label="利息" align="center" prop="interest">
+      </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
+        ref="pagination"
+        background
+        layout="total,prev, pager, next"
+        :total="total"
+        :page-size="pagesize"
+        :current-page="currentPage"
+        prev-text="上一页"
+        next-text="下一页"
+        @current-change="handleCurrentChange"
+      />
+      <el-button
+        type="primary"
+        size="small"
+        style="background-color: #d8ab5a; border-color: #d8ab5a; margin: 0 20px"
+        @click="jumpLastPage"
+        >尾页
+      </el-button>
+    </div>
+  </div>
+</template>
 
-			</el-table-column>
-			<el-table-column label="汇票贴现日"  align="center" prop="expectDiscountDate">
+<script>
+import { getReportSupplierReport } from "@/api/report";
+import { dataConversionUtil } from "../../utils/Excel.js";
+export default {
+  filters: {
+    statusFilter(status) {
+      const statusMap = {
+        published: "success",
+        draft: "gray",
+        deleted: "danger",
+      };
+      return statusMap[status];
+    },
+  },
+  data() {
+    return {
+         // 表单数据
+      formData: {
+        startTime: "",
+        endTime: "",
+        supplierName: "",
+      },
+      /* 当前页数 */
+      currentPage: 1,
+      /* 每页显示个数 */
+      pagesize: 10,
+      /* 总条数 */
+      total: 20,
+      /* 列表数据 */
+      list: [],
+      listLoading: false,
+      status: "",
+      hpstatus: "",
+      srcList: [],
+      string: "",
+      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]);
+            },
+          },
+        ],
+      },
+      value2: "",
+    };
+  },
 
-			</el-table-column>
-			<el-table-column label="汇票笔数"  align="center" prop="count">
+  mounted() {
+    this.getReportList();
+  },
+  methods: {
+    /* 获取供应商统计列表 */
+    getReportList(supplierName, startDate, endDate,pageSize,
+        pageIndex) {
+      let params = {
+        supplierName,
+        startDate,
+        endDate,
+         pageSize,//页大小
+        pageIndex//页面
+      };
+      getReportSupplierReport({ ...params }).then((res) => {
+        const { data } = res;
+        this.srcList = data.result;
+        this.total = data.total;
+      });
+    },
 
-			</el-table-column>
-			<el-table-column label="汇票金额"  align="center" prop="money">
+    handleCommand(command) {
+      this.status = command;
+      console.log(this.status);
+    },
+    handleSelectionChange(data) {
+      this.multipleSelection = data;
+      console.log(this.multipleSelection);
+    },
+    handleAll(data) {
+      this.multipleSelection = data;
+      console.log(this.multipleSelection);
+    },
+    index() {
+      this.$router.push({
+        path: "/shipments/index",
+      });
+    },
+    shipments1() {
+      this.$router.push({
+        path: "/shipments1",
+      });
+    },
+    shipments2() {
+      this.$router.push({
+        path: "/shipments2",
+      });
+    },
+    
+    // 供应商查询
+    Search() {
+      this.getReportList(this.string,this.formData.startTime,this.formData.endTime);
+    },
 
-			</el-table-column>
-			<el-table-column label="服务费"  align="center" prop="serviceMoney">
+    // 日期审核状态查询
+    startEndTime() {
+      this.formData.startTime = this.value2[0]
+      this.formData.endTime = this.value2[1]
+       this.currentPage = 1
+      this.getReportList(this.string,this.formData.startTime,this.formData.endTime,this.pagesize,this.currentPage);
+    },
+        /* 分页功能，改变当前页 */
+    handleCurrentChange(val) {
+      this.currentPage = val;
+      this.getReportList(
+        this.string,
+        this.formData.startTime,
+        this.formData.endTime,
+        this.pagesize,
+        this.currentPage
+      );
+    },
 
-			</el-table-column>
-			<el-table-column label="利息"  align="center" prop="interest">
+    /* 分页功能：去首页 */
+    jumpFirstPage() {
+      this.$refs.pagination.handleCurrentChange(1);
+      this.$emit("handleCurrentChange", 1);
+    },
 
-			</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>
+    /* 分页功能：去尾页 */
+    jumpLastPage() {
+      const font = this.$refs.pagination;
+      const cpage = Math.ceil(font.total / font.pageSize);
+      font.handleCurrentChange(cpage);
+    },
 
-<script>
-	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 {
-				list: [],
-				listLoading: false,
-				status: '',
-				hpstatus: '',
-				srcList:[],
-				currentPage: 1,
-				pagesize: 11,
-				input4: '',
-				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]);
-						}
-					}]
-				},
-				value2: ''
-			}
-		},
-		created() {
-		},
-		mounted() {
-			this.$request({
-				url: '/api/Report/supplierReport?supplierName=&startDate=&endDate=',
-				method: 'get',
-			}).then((res) => {
-				this.list = res.data
-				this.getPageData()
-			})
-		},
-		methods: {
-			handleCommand(command) {
-				this.status = command
-				console.log(this.status)
-			},
-			handleSelectionChange(data) {
-			  this.multipleSelection = data;
-			  console.log(this.multipleSelection);
-			},
-			handleAll(data) {
-				this.multipleSelection = data
-				console.log(this.multipleSelection)
-			},
-			index() {
-				this.$router.push({
-					path: '/shipments/index'
-				})
-			},
-			shipments1() {
-				this.$router.push({
-					path: "/shipments1"
-				})
-			},
-			shipments2() {
-				this.$router.push({
-					path: "/shipments2"
-				})
-			},
-			Export() {
-				// window.open('http://123.207.180.167:8700/api/Report/export/supplierReport?supplierName=&startDate=&endDate=')
-				if(this.multipleSelection==""){
-						this.$message({
-							type:'warning',
-							message:'请选择数据!'
-						})
-					}else{
-						var tableHeader = [
-							['序号', '供应商名称', '汇票承兑日', '汇票贴现日','汇票笔数', '汇票金额', '服务费','利息'],
-						]
-						var dataList = []
-						this.multipleSelection.forEach((item, index) => {
-							dataList.push([index + 1, item.supplierName, item.acceptDate,item.expectDiscountDate, item.count, item.money, item
-								.serviceMoney,item.interest
-							]);
-						})
-						dataConversionUtil.dataToExcel('供应商统计列表', tableHeader, dataList)
-						this.$message.success('导出成功!');
-						}
-			},
-			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);
-			},
-			handleCurrentChange(val) {
-				this.currentPage = val;
-				this.getPageData();
-			},
-			getPageData() {
-				let start = (this.currentPage - 1) * this.pagesize;
-				let end = start + this.pagesize;
-				this.srcList = this.list.slice(start, end);
-			},
-		}
-	}
+    /* 导出 */
+    Export() {
+      // window.open('http://123.207.180.167:8700/api/Report/export/supplierReport?supplierName=&startDate=&endDate=')
+      if (this.multipleSelection == "") {
+        this.$message({
+          type: "warning",
+          message: "请选择数据!",
+        });
+      } else {
+        var tableHeader = [
+          [
+            "序号",
+            "供应商名称",
+            "汇票承兑日",
+            "汇票贴现日",
+            "汇票笔数",
+            "汇票金额",
+            "服务费",
+            "利息",
+          ],
+        ];
+        var dataList = [];
+        this.multipleSelection.forEach((item, index) => {
+          dataList.push([
+            index + 1,
+            item.supplierName,
+            item.acceptDate,
+            item.expectDiscountDate,
+            item.count,
+            item.money,
+            item.serviceMoney,
+            item.interest,
+          ]);
+        });
+        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>

src/views/sucuirtyaudit/index.vue

@@ -14,44 +14,29 @@
         </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> -->
         <el-input
-            placeholder="操作人员查询"
-            v-model="formData.operateUser"
-            @change="SearchOperateUser"
-            style="width: 100%"
-          >
-            <i slot="prefix" class="el-input__icon el-icon-search"></i>
-          </el-input>
-
-
+          placeholder="操作人员查询"
+          v-model="formData.operateUser"
+          @change="SearchOperateUser"
+          style="width: 100%"
+        >
+          <i slot="prefix" class="el-input__icon el-icon-search"></i>
+        </el-input>
       </div>
 
       <div class="grid-content bg-purple">
         <div class="block">
           <el-date-picker
             v-model="value2"
-            type="daterange"
+            type="datetimerange"
             align="right"
             unlink-panels
             range-separator="至"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
-			value-format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd HH:mm:ss"
             :picker-options="pickerOptions"
-			@change="startEndTime"
+            @change="startEndTime"
           >
           </el-date-picker>
         </div>
@@ -111,16 +96,16 @@
         >首页
       </el-button>
       <el-pagination
-          ref="pagination"
-          background
-          layout="total,prev, pager, next"
-          :total="total"
-          :page-size="pagesize"
-          :current-page="currentPage"
-          prev-text="上一页"
-          next-text="下一页"
-          @current-change="handleCurrentChange"
-        />
+        ref="pagination"
+        background
+        layout="total,prev, pager, next"
+        :total="total"
+        :page-size="pagesize"
+        :current-page="currentPage"
+        prev-text="上一页"
+        next-text="下一页"
+        @current-change="handleCurrentChange"
+      />
       <el-button
         type="primary"
         size="small"
@@ -133,7 +118,7 @@
 </template>
 
 <script>
-import { getAuditLogSearch } from '@/api/auditlog';
+import { getAuditLogSearch } from "@/api/auditlog";
 
 export default {
   filters: {
@@ -156,7 +141,7 @@ export default {
         operateUser: "", //操作人员
         content: "", //查询内容
       },
-	  /* 当前页数 */
+      /* 当前页数 */
       currentPage: 1,
       /* 每页显示个数 */
       pagesize: 10,
@@ -206,10 +191,10 @@ export default {
     };
   },
   mounted() {
-       this.getAllList();
+    this.getAllList();
   },
   methods: {
-	 /* 获取列表数据 */
+    /* 获取列表数据 */
     getAllList(searchForm = {}) {
       const params = {
         pageIndex: this.currentPage,
@@ -217,12 +202,12 @@ export default {
       };
       getAuditLogSearch({ ...params, ...searchForm }).then((res) => {
         const { data } = res;
-		    console.log(data);
+        console.log(data);
         this.temporaryList = data.result;
         this.srcList = data.result;
         this.total = res.data.total;
-      })
-	},
+      });
+    },
 
     todetail(id) {
       this.$router.push({ path: "/logdetail", query: { id: id } });
@@ -233,31 +218,32 @@ export default {
       });
     },
 
-     /* 请输入查询内容 */
+    /* 请输入查询内容 */
     Search() {
       this.currentPage = 1;
       this.searchForm = { ...this.formData };
       this.getAllList(this.searchForm);
-    },  
-     /* 操作人员查询*/
-    SearchOperateUser(){
+    },
+    /* 操作人员查询*/
+    SearchOperateUser() {
       console.log("我是操作人员");
+      this.currentPage = 1;
+      this.searchForm = {
+        ...this.formData,
+      };
+      this.getAllList(this.searchForm);
     },
 
-     // 日期审核状态查询
+    // 日期审核状态查询
     startEndTime() {
-      this.formData.startTime = this.value2[0]
-      this.formData.endTime = this.value2[1]
-      this.currentPage = 1
-      this.searchForm = { ...this.formData }
-     this.getAllList(this.searchForm);
+      this.formData.startTime = this.value2[0];
+      this.formData.endTime = this.value2[1];
+      this.currentPage = 1;
+      this.searchForm = { ...this.formData };
+      this.getAllList(this.searchForm);
     },
 
-
-
-
-
-	 /* 分页功能，改变当前页 */
+    /* 分页功能，改变当前页 */
     handleCurrentChange(val) {
       this.currentPage = val;
       this.getAllList(this.searchForm);

yarn.lock

@@ -2468,6 +2468,11 @@ big.js@^5.2.2:
   resolved "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
   integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
 
+big.js@^6.2.1:
+  version "6.2.1"
+  resolved "https://registry.npmmirror.com/big.js/-/big.js-6.2.1.tgz#7205ce763efb17c2e41f26f121c420c6a7c2744f"
+  integrity sha512-bCtHMwL9LeDIozFn+oNhhFoq+yQ3BNdnsLSASUxLciOb1vgvpHsIO1dsENiGMgbb4SkP5TrzWzRiLddn8ahVOQ==
+
 binary-extensions@^1.0.0:
   version "1.13.1"
   resolved "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"