Browse Source

7.18的代码

Tartarus 3 years ago
parent
commit
defde49bce

+ 2 - 1
src/main.js

xqd
@@ -4,13 +4,14 @@ import 'normalize.css/normalize.css' // A modern alternative to CSS resets
 import request from '@/utils/request'
 import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
-import locale from 'element-ui/lib/locale/lang/en' // lang i18n
+// import locale from 'element-ui/lib/locale/lang/en' // lang i18n
 Vue.prototype.$request=request
 import '@/styles/index.scss' // global css
 import '@/styles/flex.scss' // global css
 import App from './App'
 import store from './store'
 import router from './router'
+import locale from 'element-ui/lib/locale/lang/zh-CN'
 
 import '@/icons' // icon
 import '@/permission' // permission control

+ 17 - 11
src/views/contracts/addcontract.vue

xqd xqd xqd xqd xqd
@@ -5,11 +5,11 @@
 				<div class="contract">
 					<div>
 						<p>合同名称</p>
-						<el-input v-model='contractName' placeholder="请输入合同名称" style="width: 500px;"></el-input>
+						<el-input v-model='list.contractName' placeholder="请输入合同名称" style="width: 500px;"></el-input>
 					</div>
 					<div>
 						<p>合同编号</p>
-						<el-input v-model='contractNumber' placeholder="请输入合同编号" style="width: 500px;"></el-input>
+						<el-input v-model='list.contractNumber' placeholder="请输入合同编号" style="width: 500px;"></el-input>
 					</div>
 				</div>
 
@@ -144,10 +144,10 @@
 					<el-form ref="form" :model="form" label-width="80px">
 
 						<el-form-item label="承兑人">
-							<el-select v-model="form.accepetper" placeholder="请选择承兑人" class="ipwidth">
-								<el-option label="区域一" value="shanghai"></el-option>
-								<el-option label="区域二" value="beijing"></el-option>
-							</el-select>
+							<el-input v-model="form.accepetper" placeholder="请选择承兑人" class="ipwidth">
+								<!-- <el-option label="区域一" value="shanghai"></el-option>
+								<el-option label="区域二" value="beijing"></el-option> -->
+							</el-input>
 						</el-form-item>
 						<el-form-item label="出票日期">
 							<el-date-picker v-model="value3" type="date" placeholder="选择日期" class="ipwidth">
@@ -163,10 +163,10 @@
 				<el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" style="padding:0 15px;">
 					<el-form ref="form" :model="form.drawper" label-width="85px">
 						<el-form-item label="出票人">
-							<el-select v-model="form.region" placeholder="请选择出票人" class="ipwidth">
-								<el-option label="区域一" value="shanghai"></el-option>
-								<el-option label="区域二" value="beijing"></el-option>
-							</el-select>
+							<el-input v-model="form.region" placeholder="请选择出票人" class="ipwidth">
+								<!-- <el-option label="区域一" value="shanghai"></el-option>
+								<el-option label="区域二" value="beijing"></el-option> -->
+							</el-input>
 						</el-form-item>
 						<el-form-item label="汇票到期日">
 							<el-date-picker v-model="value4" type="date" placeholder="选择日期" class="ipwidth">
@@ -203,7 +203,8 @@
 		</el-card>
 		<div class="commit">
 			<div class="addnew">
-				<el-button type="info" @click="adddraft">新增汇票</el-button>
+				<el-button type="primary" @click="adddraft">新增汇票</el-button>
+				<el-button type="primary" @click="deletedraft">删除汇票</el-button>
 			</div>
 			<div class="addall">
 				<el-button type="warning" style="width: 180px;height: 45px;font-size: 16px;" @click="onSubmit">确认上传
@@ -388,7 +389,12 @@
 					drawper: '',
 					accepetper: ''
 				}
+				console.log(this.list)
 				this.list.push(form)
+			},
+			deletedraft(){
+				this.list.pop()
+				console.log(this.list)
 			}
 		}
 	}

+ 62 - 13
src/views/contracts/index.vue

xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -14,15 +14,15 @@
 							<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-item command="删除">删除</el-dropdown-item>
 						</el-dropdown-menu>
 					</el-dropdown>
 				</div>
 			</el-col>
 			<el-col :xs="24" :sm="24" :md="24" :lg="4" :xl="3">
 				<div class="grid-content bg-purple">
-					<el-dropdown @command="handlehpCommand()">
+					<el-dropdown @command="handlehpCommand">
 						<div class="pulldown">
 							<span class="el-dropdown-link" v-if="!hpstatus">
 								汇票状态
@@ -33,6 +33,26 @@
 							<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>
+			</el-col>
+			<el-col :xs="24" :sm="24" :md="12" :lg="4" :xl="3">
+				<div class="grid-content bg-purple">
+					<el-dropdown @command="handleCommandAuditstatus">
+						<div class="pulldown">
+							<span class="el-dropdown-link" v-if="!Auditstatus">
+								审核状态
+							</span>
+							<span class="el-dropdown-link" v-if="Auditstatus">
+								{{Auditstatus}}
+							</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>
@@ -42,10 +62,20 @@
 			<el-col :xs="24" :sm="24" :md="24" :lg="6" :xl="5">
 				<div class="grid-content bg-purple">
 					<div class="block">
-						<el-date-picker v-model="value2" type="daterange" align="right" unlink-panels
+						<!-- <el-date-picker v-model="value2" type="daterange" align="right" unlink-panels
 							range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
 							:picker-options="pickerOptions">
-						</el-date-picker>
+						</el-date-picker> -->
+						<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>
@@ -69,7 +99,7 @@
 			</el-col>
 
 		</el-row>
-		<el-table v-loading="listLoading" :data="list" element-loading-text="Loading" border fit highlight-current-row
+		<el-table v-loading="listLoading" :data="srcList" element-loading-text="Loading" border fit highlight-current-row
 			@select="handleSelectionChange">
 			<el-table-column align="center" label="" width="55" type="selection">
 
@@ -102,9 +132,13 @@
 			<el-table-column align="center" label="时间" prop="createdAt">
 
 			</el-table-column>
-			<el-table-column align="center" prop="created_at" label="操作" width="200">
+			<el-table-column align="center" prop="created_at" label="操作" width="250">
 				<template slot-scope="scope">
-					<el-tag type="success" style="cursor: pointer;" @click="tapDetail">查看详情</el-tag>
+					<el-tag type="primary" style="cursor: pointer;" @click="tapDetail">查看详情</el-tag>
+					<el-tag type="success" style="cursor: pointer;" @click="tapDetail" v-if="checked==0">审核成功</el-tag>
+					<el-tag type="danger" style="cursor: pointer;" @click="tapDetail"v-if="checked==0">审核失败</el-tag>
+					<el-tag type="success" style="cursor: pointer;" v-if="checked==1">复用</el-tag>
+					<el-tag type="danger" style="cursor: pointer;" v-if="checked==1">删除</el-tag>
 				</template>
 			</el-table-column>
 		</el-table>
@@ -112,7 +146,7 @@
 			<el-button type="primary" size="small"
 				style="background-color:#D8AB5A ;border-color:#D8AB5A ; margin: 0 20px;" @click="jumpFirstPage">首页
 			</el-button>
-			<el-pagination background layout="prev, pager, next" :total="100" :size="5" prev-text="上一页" next-text="下一页"
+			<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"
@@ -145,21 +179,26 @@
 				method: 'post',
 				data: {
 					pageIndex: 1,
-					pageSize: 10
+					pageSize: 10,
 				}
 			}).then((res) => {
 				console.log(res)
 				this.list = res.data.result
+				this.getPageData();
 			})
 
 		},
 		data() {
 			return {
+				srcList: [],
 				list: [],
 				listLoading: false,
 				status: '',
-				hpstatus: '',
+				hpstatus:'',
+				Auditstatus:'',
 				input4: '',
+				currentPage: 1,
+				pagesize: 11,
 				checked: '',
 				pickerOptions: {
 					shortcuts: [{
@@ -188,13 +227,11 @@
 						}
 					}]
 				},
-				value1: '',
 				value2: ''
 			}
 		},
 		created() {},
 		methods: {
-
 			addNewContract() {
 				this.$router.push({
 					path: 'contracts/addcontract'
@@ -213,10 +250,17 @@
 				this.hpstatus = command
 
 			},
+			handleCommandAuditstatus(command){
+				this.Auditstatus=command
+			},
 			handleSelectionChange(data) {
 				this.multipleSelection = data
 				console.log(this.multipleSelection)
 			},
+			handleCurrentChange(val) {
+				this.currentPage = val;
+				this.getPageData();
+			},
 			jumpFirstPage() {
 				this.$refs.pagination.handleCurrentChange(1);
 				this.$emit('handleCurrentChange', 1);
@@ -226,6 +270,11 @@
 				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>

+ 218 - 213
src/views/databackup/index.vue

xqd
@@ -1,233 +1,238 @@
 <template>
-  <div class="app-container"  >
-   <el-row>
-     <el-col :xs="24" :sm="7" :md="6" :lg="4" :xl="3">
-       <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>
-     </el-col>
+	<div class="app-container">
+		<el-row>
+			<el-col :xs="24" :sm="7" :md="6" :lg="4" :xl="3">
+				<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>
+			</el-col>
 
 
-     <el-col :xs="24" :sm="11" :md="9" :lg="7" :xl="5" >
-       <div class="grid-content bg-purple">
-         <div class="block">
-           <el-date-picker v-model="value2" type="daterange" align="right" unlink-panels range-separator="至"
-             start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions">
-           </el-date-picker>
-         </div>
+			<el-col :xs="24" :sm="11" :md="9" :lg="7" :xl="5">
+				<div class="grid-content bg-purple">
+					<div class="block">
+						<el-date-picker v-model="value2" type="daterange" align="right" unlink-panels
+							range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
+							:picker-options="pickerOptions">
+						</el-date-picker>
+					</div>
 
-       </div>
-     </el-col>
-   <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>
+			</el-col>
+			<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> -->
-     <el-col :xs="13" :sm="7" :md="6" :lg="8" :xl="11">
-       <div class="grid-content bg-purple" style="display: flex;justify-content: flex-end;">
+			<el-col :xs="13" :sm="7" :md="6" :lg="8" :xl="11">
+				<div class="grid-content bg-purple" style="display: flex;justify-content: flex-end;">
 
-         <el-button type="primary">下载</el-button>
-		 <el-button type="danger">删除</el-button>
-       </div>
-     </el-col>
+					<el-button type="primary">下载</el-button>
+					<el-button type="danger">删除</el-button>
+				</div>
+			</el-col>
 
-   </el-row>
-    <el-table v-loading="listLoading" :data="list" element-loading-text="Loading" border fit highlight-current-row >
-      <el-table-column align="center" label="" width="55">
-        <template slot-scope="scope">
-         <el-checkbox v-model="checked"></el-checkbox>
-        </template>
-      </el-table-column>
-      <el-table-column label="文件名称"  align="center">
-        <template slot-scope="scope">
-          DNDFDFN_20220244
-        </template>
-      </el-table-column>
-      <el-table-column label="存储对象" width="180" align="center">
-        <template slot-scope="scope">
-          <span>本地</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="文件大小" width="150" align="center">
-        <template slot-scope="scope">
-          10.05KB
-        </template>
-      </el-table-column>
-      <el-table-column align="center" prop="created_at" label="时间">
-        <template slot-scope="scope">
-          <i class="el-icon-time" />
-          <span>{{ scope.row.display_time }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注"  align="center">
-        <template slot-scope="scope">
-          无
-        </template>
-      </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;">恢复</el-tag>
-         <el-tag type="warning" style="margin-right: 15px;cursor: pointer;">下载</el-tag>
-          <el-tag type="danger" style="cursor: pointer;">删除</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
-        layout="prev, pager, next"
-        :total="100"
-    	:size="5"
-    	prev-text="上一页"
-    	next-text="下一页"
-    	:hide-on-single-page="false"
-    	ref="pagination">
-      </el-pagination>
-       <el-button type="primary" size="small" style="background-color:#D8AB5A ;border-color:#D8AB5A ;margin: 0 20px;" @click="jumpLastPage">尾页</el-button>
-    </div>
-  </div>
+		</el-row>
+		<el-table v-loading="listLoading" :data="srcList" element-loading-text="Loading" border fit highlight-current-row>
+			<el-table-column align="center" label="" width="55">
+				<template slot-scope="scope">
+					<el-checkbox v-model="checked"></el-checkbox>
+				</template>
+			</el-table-column>
+			<el-table-column label="文件名称" align="center">
+				<template slot-scope="scope">
+					DNDFDFN_20220244
+				</template>
+			</el-table-column>
+			<el-table-column label="存储对象" width="180" align="center">
+				<template slot-scope="scope">
+					<span>本地</span>
+				</template>
+			</el-table-column>
+			<el-table-column label="文件大小" width="150" align="center">
+				<template slot-scope="scope">
+					10.05KB
+				</template>
+			</el-table-column>
+			<el-table-column align="center" prop="created_at" label="时间">
+				<template slot-scope="scope">
+					<i class="el-icon-time" />
+					<span>{{ scope.row.display_time }}</span>
+				</template>
+			</el-table-column>
+			<el-table-column label="备注" align="center">
+				<template slot-scope="scope">
+					无
+				</template>
+			</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;">恢复</el-tag>
+					<el-tag type="warning" style="margin-right: 15px;cursor: pointer;">下载</el-tag>
+					<el-tag type="danger" style="cursor: pointer;">删除</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>
 </template>
 
 <script>
-  import {
-    getList
-  } from '@/api/table'
+	import {
+		getList
+	} from '@/api/table'
 
-  export default {
-    filters: {
-      statusFilter(status) {
-        const statusMap = {
-          published: 'success',
-          draft: 'gray',
-          deleted: 'danger'
-        }
-        return statusMap[status]
-      }
-    },
-    data() {
-      return {
-        list: null,
-        listLoading: false,
-        status: '',
-        hpstatus:'',
-        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]);
-            }
-          }]
-        },
-        value1: '',
-        value2: ''
-      }
-    },
-    created() {
-      // this.fetchData()
-    },
-    methods: {
-      handleCommand(command) {
-        this.status = command
+	export default {
+		filters: {
+			statusFilter(status) {
+				const statusMap = {
+					published: 'success',
+					draft: 'gray',
+					deleted: 'danger'
+				}
+				return statusMap[status]
+			}
+		},
+		data() {
+			return {
+				srcList: [],
+				list: [],
+				listLoading: false,
+				status: '',
+				hpstatus: '',
+				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]);
+						}
+					}]
+				},
+				value1: '',
+				value2: ''
+			}
+		},
+		created() {
+			// this.fetchData()
+		},
+		methods: {
+			handleCommand(command) {
+				this.status = command
 
-      },
-      handlehpCommand(command) {
-        this.hpstatus = command
+			},
+			handlehpCommand(command) {
+				this.hpstatus = command
 
-      },
-			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);
+			},
+			handleCurrentChange(val) {
+				this.currentPage = val;
+				this.getPageData();
 			},
-      // fetchData() {
-      //   this.listLoading = true
-      //   getList().then(response => {
-      //     this.list = response.data.items
-      //     this.listLoading = false
-      //   })
-      // }
-    }
-  }
+		}
+	}
 </script>
 <style lang="scss">
-  .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;
-  }
-  .pagesip{
-    position: fixed;
-    bottom: 16px;
-    width: 88%;
-    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-col{
-    margin-bottom: 20px;
-  }
+	.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;
+	}
+
+	.pagesip {
+		position: fixed;
+		bottom: 16px;
+		width: 88%;
+		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-col {
+		margin-bottom: 20px;
+	}
 </style>

+ 277 - 245
src/views/delivery/index.vue

xqd
@@ -1,275 +1,307 @@
 <template>
-  <div class="app-container">
-    <el-row  style="">
-      <el-col :xs="24" :sm="24" :md="12" :lg="3" :xl="3">
-        <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>
-      </el-col>
-      <el-col :xs="24" :sm="24" :md="24" :lg="3" :xl="3">
-        <div class="grid-content bg-purple">
-          <el-dropdown @command="handlehpCommand()">
-            <div class="pulldown">
-              <span class="el-dropdown-link" v-if="!hpstatus">
-                审核状态
-              </span>
-              <span class="el-dropdown-link" v-if="hpstatus">
-                {{hpstatus}}
-              </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>
-      </el-col>
-      <el-col :xs="24" :sm="24" :md="24" :lg="8" :xl="5" >
-        <div class="grid-content bg-purple">
-          <div class="block">
-            <el-date-picker v-model="value2" type="daterange" align="right" unlink-panels range-separator="至"
-              start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions">
-            </el-date-picker>
-          </div>
+	<div class="app-container">
+		<el-row style="">
+			<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="6">
+				<div class="grid-content bg-purple" style="margin-left: 25px;">
+					<el-input placeholder="请输入供应商名称" v-model="search" @change="Search" clearable style="width: 80%;">
+						<i slot="prefix" class="el-input__icon el-icon-search"></i>
+					</el-input>
+				</div>
+			</el-col>
+			<el-col :xs="24" :sm="24" :md="12" :lg="3" :xl="3">
+				<div class="grid-content bg-purple">
+					<el-dropdown @command="PhandleCommand">
+						<div class="pulldown">
+							<span class="el-dropdown-link" v-if="!providerStatus">
+								供应商状态
+							</span>
+							<span class="el-dropdown-link" v-if="providerStatus">
+								{{providerStatus}}
+							</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>
+			</el-col>
+			<el-col :xs="24" :sm="24" :md="24" :lg="3" :xl="3">
+				<div class="grid-content bg-purple">
+					<el-dropdown @command="AhandleCommand">
+						<div class="pulldown">
+							<span class="el-dropdown-link" v-if="!AuditStatus">
+								审核状态
+							</span>
+							<span class="el-dropdown-link" v-if="AuditStatus">
+								{{AuditStatus}}
+							</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>
+			</el-col>
+			<el-col :xs="24" :sm="24" :md="24" :lg="8" :xl="5">
+				<div class="grid-content bg-purple">
+					<div class="block">
+						<el-date-picker v-model="value2" type="daterange" align="right" unlink-panels
+							range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
+							:picker-options="pickerOptions">
+						</el-date-picker>
+					</div>
 
-        </div>
-      </el-col>
-      <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="6">
-        <div class="grid-content bg-purple" style="margin-left: 25px;">
-          <el-input
-              placeholder="请输入供应商名称"
-              v-model="input4" style="width: 80%;">
-              <i slot="prefix" class="el-input__icon el-icon-search"></i>
-            </el-input>
-        </div>
-      </el-col>
-     <!-- <el-col :span="1">
-        <div class="grid-content bg-purple"></div>
-      </el-col> -->
-      <el-col :xs="24" :sm="24" :md="24" :lg="14" :xl="7">
-        <div class="grid-content bg-purple" style="display: flex;justify-content: flex-end;">
-           <el-button type="primary">审核失败</el-button>
-            <el-button type="primary">审核成功</el-button>
-          <el-button type="primary">导出</el-button>
-            <el-button type="success">复原</el-button>
-            <el-button type="danger">禁用</el-button>
-        </div>
-      </el-col>
+				</div>
+			</el-col>
 
-    </el-row>
-    <el-table v-loading="listLoading" :data="list" element-loading-text="Loading" border fit highlight-current-row>
-      <el-table-column align="center" label="" width="55" type="selection">
-      </el-table-column>
-      <el-table-column label="供应商名称"  align="center" prop="name">
-        <!-- <template slot-scope="scope">
+
+			<el-col :xs="24" :sm="24" :md="24" :lg="14" :xl="7">
+				<div class="grid-content bg-purple" style="display: flex;justify-content: flex-end;">
+					<el-button type="primary">审核失败</el-button>
+					<el-button type="primary">审核成功</el-button>
+					<el-button type="primary">导出</el-button>
+					<el-button type="success">复原</el-button>
+					<el-button type="danger">禁用</el-button>
+				</div>
+			</el-col>
+
+		</el-row>
+		<el-table v-loading="listLoading" :data="temporaryList" element-loading-text="Loading" border fit
+			highlight-current-row>
+			<el-table-column align="center" label="" width="55" type="selection">
+			</el-table-column>
+			<el-table-column label="供应商名称" align="center" prop="name">
+				<!-- <template slot-scope="scope">
           {{scope.name}}
         </template> -->
-      </el-table-column>
-      <el-table-column label="社会统一信用代码" width="240" align="center" prop="socialCode">
-        <!-- <template slot-scope="scope">
+			</el-table-column>
+			<el-table-column label="社会统一信用代码" width="240" align="center" prop="socialCode">
+				<!-- <template slot-scope="scope">
           {{scope.socialCode}}
         </template> -->
-      </el-table-column>
-      <el-table-column label="账号" width="180" align="center" prop="account">
-        <!-- <template slot-scope="scope">
+			</el-table-column>
+			<el-table-column label="账号" width="180" align="center" prop="account">
+				<!-- <template slot-scope="scope">
           {{scope.account}}
         </template> -->
-      </el-table-column>
-      <el-table-column label="法人名称" width="180" align="center" prop="legalPerson">
-        <!-- <template slot-scope="scope">
+			</el-table-column>
+			<el-table-column label="法人名称" width="180" align="center" prop="legalPerson">
+				<!-- <template slot-scope="scope">
           {{scope.legalPerson}}
         </template> -->
-      </el-table-column>
-      <el-table-column label="联系人" width="180" align="center" prop="contacts">
-       <!-- <template slot-scope="scope">
+			</el-table-column>
+			<el-table-column label="联系人" width="180" align="center" prop="contacts">
+				<!-- <template slot-scope="scope">
           {{scope.contacts}}
         </template> -->
-      </el-table-column>
+			</el-table-column>
 
-      <el-table-column label="电话" width="180" align="center" prop="contactsMobile">
-       <!-- <template slot-scope="scope">
+			<el-table-column label="电话" width="180" align="center" prop="contactsMobile">
+				<!-- <template slot-scope="scope">
           {{scope.contactsMobile}}
         </template> -->
-      </el-table-column>
-      <el-table-column label="审核状态" width="180" align="center" prop="statusText">
-        <!-- <template slot-scope="scope">
+			</el-table-column>
+			<el-table-column label="审核状态" width="180" align="center" prop="statusText">
+				<!-- <template slot-scope="scope">
           {{scope.statusText}}
         </template> -->
-      </el-table-column>
-      <el-table-column align="center" prop="created_at" label="时间" >
-        <template slot-scope="scope">
+			</el-table-column>
+			<el-table-column align="center" prop="createdAt" label="时间">
+				<!-- <template slot-scope="scope">
           <i class="el-icon-time" />
           <span>{{ scope.row.display_time }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column align="center" prop="created_at" label="操作" width="250">
-        <template slot-scope="scope">
-          <el-tag type="success" style="cursor: pointer;margin-right: 15px;" @click="toedit(scope.row.id)">编辑</el-tag>
-         <el-tag type="warning" style="margin-right: 15px;cursor: pointer;">复原</el-tag>
-          <el-tag type="info">禁用</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
-        layout="prev, pager, next"
-        :total="100"
-    	:size="5"
-    	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> -->
+			</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="toedit(scope.row.id)">编辑
+					</el-tag>
+					<el-tag type="warning" style="margin-right: 15px;cursor: pointer;">复原</el-tag>
+					<el-tag type="info">禁用</el-tag>
+				</template>
+			</el-table-column>
+		</el-table>
+		<div class="pagesip">
+			<el-button type="primary" size="small"
+				style="background-color:#D8AB5A ;border-color:#D8AB5A ; margin: 0 20px;" @click="jumpFirstPage">首页
+			</el-button>
+			<el-pagination background @current-change="handleCurrentChange" layout="prev, pager, next"
+				:total="list.length" :page-size="10" prev-text="上一页" next-text="下一页" :hide-on-single-page="false"
+				ref="pagination">
+			</el-pagination>
+			<el-button type="primary" size="small"
+				style="background-color:#D8AB5A ;border-color:#D8AB5A ;margin: 0 20px;" @click="jumpLastPage">尾页
+			</el-button>
+		</div>
+	</div>
 </template>
 
 <script>
-  import {
-    getList
-  } from '@/api/table'
-
-  export default {
-    filters: {
-      statusFilter(status) {
-        const statusMap = {
-          published: 'success',
-          draft: 'gray',
-          deleted: 'danger'
-        }
-        return statusMap[status]
-      }
-    },
-    data() {
-      return {
-        list: [],
-        listLoading: false,
-        status: '',
-        hpstatus:'',
-        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]);
-            }
-          }]
-        },
-        value1: '',
-        value2: ''
-      }
-    },
-    created() {
-      // this.fetchData()
-    },
-    mounted(){
-      this.$request({
-        url:"/api/Supplier/search",
-        method:'post',
-        data:{
-          pageIndex:1,
-          pageSize:10,
-        }
-      }).then((res)=>{
-        this.list=res.data.result
-		console.log(this.list)
-      })
-    },
-    methods: {
-      handleCommand(command) {
-        this.status = command
+	import {
+		getList
+	} from '@/api/table'
 
-      },
-      handlehpCommand(command) {
-        this.hpstatus = command
+	export default {
+		filters: {
+			statusFilter(status) {
+				const statusMap = {
+					published: 'success',
+					draft: 'gray',
+					deleted: 'danger'
+				}
+				return statusMap[status]
+			}
+		},
+		data() {
+			return {
+				srcList: [],
+				list: [],
+				temporaryList: [],
+				listLoading: false,
+				providerStatus: '',
+				AuditStatus: '',
+				search: '',
+				currentPage: 1,
+				pagesize: 9,
+				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: ''
+			}
+		},
+		created() {
+			// this.fetchData()
+		},
+		mounted() {
+			this.$request({
+				url: "/api/Supplier/search",
+				method: 'post',
+				data: {
+					pageIndex: 1,
+					pageSize: 30,
+				}
+			}).then((res) => {
+				this.list = res.data.result
+				this.getPageData();
+				console.log(this.list)
+			})
+		},
+		methods: {
+			PhandleCommand(command) {
+				this.providerStatus = command
+				if(this.providerStatus=="正常"||this.providerStatus=="删除"){
+					this.temporaryList=this.srcList.filter(item=>item.isDeletedText==this.providerStatus)
+				}else {
+					this.temporaryList=this.srcList
+				}				
 
-      },
-      // fetchData() {
-      //   this.listLoading = true
-      //   getList().then(response => {
-      //     this.list = response.data.items
-      //     this.listLoading = false
-      //   })
-      // },
-      toedit(id){
-        this.$router.push({path:'/edit',query:{id:id}})
-      },
-			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);
+			AhandleCommand(command) {
+				this.AuditStatus = command
+				if(this.AuditStatus=="已认证"||this.AuditStatus=="未认证"){
+					this.temporaryList=this.srcList.filter(item=>item.statusText==this.AuditStatus)
+				}else {
+					this.temporaryList=this.srcList
+				}	
+			},
+			toedit(id) {
+				this.$router.push({
+					path: '/edit',
+					query: {
+						id: id
+					}
+				})
+			},
+			handleCurrentChange(val) {
+				this.currentPage = val;
+				this.getPageData();
+			},
+			jumpFirstPage() {
+				this.$refs.pagination.handleCurrentChange(1);
+				this.$emit('handleCurrentChange', 1);
 			},
-    }
-  }
+			jumpLastPage() {
+				let font = this.$refs.pagination
+				let cpage = Math.ceil(font.total / font.pageSize);
+				font.handleCurrentChange(cpage);
+			},
+			getPageData() {
+				let start = (this.currentPage - 1) * this.pagesize;
+				let end = start + this.pagesize;
+				this.srcList = this.list.slice(start, end);
+				this.temporaryList=this.srcList
+			},
+			Search() {
+				if (this.search == "") {
+					this.temporaryList = this.srcList
+				} else {
+					this.temporaryList = this.list.filter(item => item.name == this.search)
+				}
+			},
+		}
+	}
 </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;
-  }
-  .pagesip{
-    position: fixed;
-    bottom: 16px;
-    width: 88%;
-    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-col{
-    margin-bottom: 20px;
-  }
+	.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 {
+		position: fixed;
+		bottom: 16px;
+		width: 88%;
+		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-col {
+		margin-bottom: 20px;
+	}
 </style>

+ 1 - 1
src/views/form/addTicketdrawer.vue

xqd
@@ -39,7 +39,7 @@
          method:'post',
          data:this.form
        }).then((res)=>{
-         this.$message("注册成功")
+         this.$message("添加成功!")
 		 this.$router.push({path:'index'})
        })
       },

+ 252 - 235
src/views/form/index.vue

xqd xqd
@@ -1,37 +1,38 @@
 <template>
-  <div class="app-container">
-    <el-row>
-      <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 :xs="24" :sm="7" :md="6" :lg="4" :xl="3">
-        <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>
-      </el-col>
+	<div class="app-container">
+		<el-row>
 
+			<el-col :xs="24" :sm="7" :md="6" :lg="4" :xl="3">
+				<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>
+			</el-col>
+			<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="search" @change="Search" clearable style="width: 80%;">
+							<i slot="prefix" class="el-input__icon el-icon-search"></i>
+						</el-input>
+					</div>
+				</div>
+			</el-col>
 
-      <!-- <el-col :xs="24" :sm="11" :md="9" :lg="7" :xl="5" >
+			<!-- <el-col :xs="24" :sm="11" :md="9" :lg="7" :xl="5" >
         <div class="grid-content bg-purple">
           <div class="block">
             <el-date-picker v-model="value2" type="daterange" align="right" unlink-panels range-separator="至"
@@ -42,236 +43,252 @@
         </div>
       </el-col> -->
 
-      <!-- <el-col :span="1">
+			<!-- <el-col :span="1">
         <div class="grid-content bg-purple"></div>
       </el-col> -->
-      <el-col :xs="24" :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" @click="addTicketdrawer">新增出票人</el-button>
-          <el-button type="primary">导出</el-button>
- <!--         <el-button type="success">复原</el-button>
+			<el-col :xs="24" :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" @click="addTicketdrawer">新增出票人</el-button>
+					<el-button type="primary">导出</el-button>
+					<!--         <el-button type="success">复原</el-button>
           <el-button type="danger">删除</el-button> -->
-        </div>
-      </el-col>
+				</div>
+			</el-col>
 
-    </el-row>
-    <el-table v-loading="listLoading" :data="list" element-loading-text="Loading" border fit highlight-current-row @select="handleSelectionChange">
-      <el-table-column align="center"  width="100" type="selection">
-      </el-table-column>
-      <el-table-column label="出票人名称" align="center" width="380" prop="name">
-        <!-- <template slot-scope="scope" >
+		</el-row>
+		<el-table v-loading="listLoading" :data="temporaryList" element-loading-text="Loading" border fit
+			highlight-current-row @select="handleSelectionChange">
+			<el-table-column align="center" width="100" type="selection">
+			</el-table-column>
+			<el-table-column label="出票人名称" align="center" width="380" prop="name">
+				<!-- <template slot-scope="scope" >
 
         </template> -->
-      </el-table-column>
-      <el-table-column label="账号" align="center" prop="bankAccount">
-        <!-- <template slot-scope="scope">
+			</el-table-column>
+			<el-table-column label="账号" align="center" prop="bankAccount">
+				<!-- <template slot-scope="scope">
           XXXXXXXXXXX
         </template> -->
-      </el-table-column>
-      <el-table-column align="center" prop="bankName" label="开户行名称" width="300" >
-        <!-- <template slot-scope="scope">
+			</el-table-column>
+			<el-table-column align="center" prop="bankName" label="开户行名称" width="300">
+				<!-- <template slot-scope="scope">
           <span>XXX</span>
         </template> -->
-      </el-table-column>
+			</el-table-column>
 
-      <el-table-column align="center" prop="id" label="状态" width="200">
-        <!-- <template slot-scope="scope">
+			<el-table-column align="center" prop="statusText" label="状态" width="200">
+				<!-- <template slot-scope="scope">
           <span>XXX</span>
         </template> -->
-      </el-table-column>
-      <el-table-column align="center" prop="createdAt" label="时间" >
-       <!-- <template slot-scope="scope">
+			</el-table-column>
+			<el-table-column align="center" prop="createdAt" label="时间">
+				<!-- <template slot-scope="scope">
           <i class="el-icon-time" />
           <span>{{ scope.row.display_time }}</span>
         </template> -->
-      </el-table-column>
-      <el-table-column align="center" prop="created_at" label="操作" width="250">
-        <template slot-scope="scope">
-          <el-tag type="success" style="cursor: pointer;margin-right: 15px;" @click="todetail(scope.row.id)">详情</el-tag>
-          <el-tag type="warning" style="cursor: pointer;margin-right: 15px;">复原</el-tag>
-          <el-tag type="danger" style="cursor: pointer;margin-right: 15px;" @click.native.prevent="deleteRow(scope.$index,list)">删除</el-tag>
+			</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="todetail(scope.row.id)">
+						详情</el-tag>
+					<el-tag type="warning" style="cursor: pointer;margin-right: 15px;">复原</el-tag>
+					<el-tag type="danger" style="cursor: pointer;margin-right: 15px;"
+						@click.native.prevent="deleteRow(scope.$index,list)">删除</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
-        layout="prev, pager, next"
-        :total="100"
-    	:size="5"
-    	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>
+			</el-table-column>
+		</el-table>
+		<div class="pagesip">
+			<el-button type="primary" size="small"
+				style="background-color:#D8AB5A ;border-color:#D8AB5A ; margin: 0 20px;" @click="jumpFirstPage">首页
+			</el-button>
+			<el-pagination background @current-change="handleCurrentChange" layout="prev, pager, next"
+				:total="list.length" :page-size="10" prev-text="上一页" next-text="下一页" :hide-on-single-page="false"
+				ref="pagination">
+			</el-pagination>
+			<el-button type="primary" size="small"
+				style="background-color:#D8AB5A ;border-color:#D8AB5A ;margin: 0 20px;" @click="jumpLastPage">尾页
+			</el-button>
+		</div>
+	</div>
 </template>
 
 <script>
-  import {
-    getList
-  } from '@/api/table'
+	import {
+		getList
+	} from '@/api/table'
 
-  export default {
-    filters: {
-      statusFilter(status) {
-        const statusMap = {
-          published: 'success',
-          draft: 'gray',
-          deleted: 'danger'
-        }
-        return statusMap[status]
-      }
-    },
-    data() {
-      return {
-        request:{
-          pageIndex:1,
-          pageSize:10,
-          // startTime:'',
-          // endTime:'',
-          // name:'',
-          // status:,
-        },
-        list: [],
-        listLoading: false,
-        status: '',
-        hpstatus: '',
-        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]);
-            }
-          }]
-        },
-        value1: '',
-        value2: ''
-      }
-    },
-    created() {
-      // this.fetchData()
-    },
-    mounted(){
-      this.$request({
-        url:'/api/Drawer/search',
-        method:'post',
-        data:this.request
-      }).then((res)=>{
-        console.log(res.data.result)
-        this.list=res.data.result
-		this.list.forEach(item=>{
-			item.checked=false
-		})
-      })
-    },
-    methods: {
-		// checkFormItem(e){
-		// 	console.log(e)
-		// 	// let list =this.list
-		// 	// list.forEach(item=>{
-		// 	// 	if(id==item.id){
-		// 	// 		item.checked!=item.checked
-		// 	// 	}
-		// 	// })
-		// },
-	  handleSelectionChange(data) {
-	  		  this.multipleSelection=data
-	  		  console.log(this.multipleSelection)
-	  },
-      handleCommand(command) {
-        this.status = command
+	export default {
+		filters: {
+			statusFilter(status) {
+				const statusMap = {
+					published: 'success',
+					draft: 'gray',
+					deleted: 'danger'
+				}
+				return statusMap[status]
+			}
+		},
+		data() {
+			return {
+				request: {
+					pageIndex: 1,
+					pageSize: 50,
+					// startTime:'',
+					// endTime:'',
+					// name:'',
+					// status:,
+				},
+				srcList: [],
+				list: [],
+				temporaryList:[],
+				listLoading: false,
+				status: '',
+				hpstatus: '',
+				search: '',
+				currentPage: 1,
+				pagesize: 11,
+				checked: '',
+				pickerOptions: {
+					shortcuts: [{
+						text: '最近一周',
+						onClick(picker) {
+							const end = new Date();
+							const start = new Date();
+							start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+							picker.$emit('pick', [start, end]);
+						}
+					}, {
+						text: '最近一个月',
+						onClick(picker) {
+							const end = new Date();
+							const start = new Date();
+							start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+							picker.$emit('pick', [start, end]);
+						}
+					}, {
+						text: '最近三个月',
+						onClick(picker) {
+							const end = new Date();
+							const start = new Date();
+							start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+							picker.$emit('pick', [start, end]);
+						}
+					}]
+				},
+				value1: '',
+				value2: ''
+			}
+		},
+		created() {
+			// this.fetchData()
+		},
+		mounted() {
+			this.$request({
+				url: '/api/Drawer/search',
+				method: 'post',
+				data: this.request
+			}).then((res) => {
+				console.log(res.data.result)
+				this.list = res.data.result
+				this.getPageData()
+			})
+		},
+		methods: {
+			handleSelectionChange(data) {
+				this.multipleSelection = data
+				console.log(this.multipleSelection)
+			},
+			handleCommand(command) {
+				this.status = command
+				if(this.status=="正常"||this.status=="删除"){
+					this.temporaryList=this.srcList.filter(item=>item.statusText==this.status)
+				}else {
+					this.temporaryList=this.srcList
+				}				
+				console.log(this.srcList,"command")
+			},
+			handlehpCommand(command) {
+				this.hpstatus = command
 
-      },
-      handlehpCommand(command) {
-        this.hpstatus = command
+			},
+			addTicketdrawer() {
+				this.$router.push({
+					path: '/form/addTicketdrawer'
+				})
+			},
+			todetail(id) {
+				console.log(id)
+				this.$router.push({
+					path: '/form/detail',
+					query: {
+						id: id
+					}
+				}, )
+			},
+			deleteRow(index, rows) {
+				console.log(rows)
+				rows.splice(index, 1);
+			},
+			handleCurrentChange(val) {
+				this.currentPage = val;
+				this.getPageData();
+			},
+			jumpFirstPage() {
+				this.$refs.pagination.handleCurrentChange(1);
+				this.$emit('handleCurrentChange', 1);
+			},
+			jumpLastPage() {
+				let font = this.$refs.pagination
+				let cpage = Math.ceil(font.total / font.pageSize);
+				font.handleCurrentChange(cpage);
+			},
+			getPageData() {
+				let start = (this.currentPage - 1) * this.pagesize;
+				let end = start + this.pagesize;
+				this.srcList = this.list.slice(start, end);
+				this.temporaryList=this.srcList
+			},
+			Search(){
+				if(this.search==""){
+					this.temporaryList=this.srcList
+				}else{
+					this.temporaryList=this.list.filter(item=>item.name==this.search)
+				}
+			},
 
-      },
-      fetchData() {
-        // this.listLoading = true
-        // getList().then(response => {
-        //   this.list = response.data.items
-        //   this.listLoading = false
-        // })
-      },
-      addTicketdrawer(){
-        this.$router.push({path:'/form/addTicketdrawer'})
-      },
-	  todetail(id){
-		  console.log(id)
-				this.$router.push({path:'/form/detail',query:{id:id}},)
-	  },
-	  deleteRow(index,rows) {
-		console.log(rows)
-	    rows.splice(index, 1);
-	  },
-	  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);
-	  },
-			
-    }
-  }
+		}
+	}
 </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 {
-    position: fixed;
-    bottom: 16px;
-    width: 88%;
-    margin: 20px auto;
-    display: flex;
-    // align-items: center;
-    justify-content: flex-end;
-  }
+	.pagesip {
+		position: fixed;
+		bottom: 16px;
+		width: 88%;
+		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>

+ 227 - 222
src/views/management/index.vue

xqd
@@ -1,246 +1,251 @@
 <template>
-  <div class="app-container">
-    <el-row  style="">
-      <el-col :xs="24" :sm="24" :md="24" :lg="10" :xl="6">
-        <div class="grid-content bg-purple" style="margin-left: 10px;">
-          <el-input
-              placeholder="业务管理员名称搜索"
-              v-model="input4" style="width: 80%;">
-              <i slot="prefix" class="el-input__icon el-icon-search"></i>
-            </el-input>
-        </div>
-      </el-col>
-      <el-col :xs="24" :sm="24" :md="12" :lg="4" :xl="3">
-        <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>
-      </el-col>
-      <el-col :xs="24" :sm="24" :md="24" :lg="4" :xl="3">
-        <div class="grid-content bg-purple">
-          <el-dropdown @command="handlehpCommand()">
-            <div class="pulldown">
-              <span class="el-dropdown-link" v-if="!hpstatus">
-                审核状态筛选
-              </span>
-              <span class="el-dropdown-link" v-if="hpstatus">
-                {{hpstatus}}
-              </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>
-      </el-col>
-        <div class="grid-content bg-purple" style="display: flex;justify-content: flex-end;margin-left: 10px;">
-          <el-button type="primary">审核成功</el-button>
-          <el-button type="primary">审核失败</el-button>
-          <el-button type="primary">禁用</el-button>
-            <el-button type="success">复原</el-button>
-            <el-button type="primary">批量导出</el-button>
-        </div>
-    </el-row>
-    <el-table v-loading="listLoading" :data="list" element-loading-text="Loading" border fit highlight-current-row>
-      <el-table-column align="center" label="" width="55">
-        <template slot-scope="scope">
-         <el-checkbox v-model="checked"></el-checkbox>
-        </template>
-      </el-table-column>
-      <el-table-column label="业务管理员姓名"  align="center" width="340" prop="realName">
-        <!-- <template slot-scope="scope">
+	<div class="app-container">
+		<el-row style="">
+			<el-col :xs="24" :sm="24" :md="24" :lg="10" :xl="6">
+				<div class="grid-content bg-purple" style="margin-left: 10px;">
+					<el-input placeholder="业务管理员名称搜索" v-model="input4" style="width: 80%;">
+						<i slot="prefix" class="el-input__icon el-icon-search"></i>
+					</el-input>
+				</div>
+			</el-col>
+			<el-col :xs="24" :sm="24" :md="12" :lg="4" :xl="3">
+				<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>
+			</el-col>
+			<el-col :xs="24" :sm="24" :md="24" :lg="4" :xl="3">
+				<div class="grid-content bg-purple">
+					<el-dropdown @command="handlehpCommand()">
+						<div class="pulldown">
+							<span class="el-dropdown-link" v-if="!hpstatus">
+								审核状态筛选
+							</span>
+							<span class="el-dropdown-link" v-if="hpstatus">
+								{{hpstatus}}
+							</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>
+			</el-col>
+			<div class="grid-content bg-purple" style="display: flex;justify-content: flex-end;margin-left: 10px;">
+				<el-button type="primary">审核成功</el-button>
+				<el-button type="primary">审核失败</el-button>
+				<el-button type="primary">禁用</el-button>
+				<el-button type="success">复原</el-button>
+				<el-button type="primary">批量导出</el-button>
+			</div>
+		</el-row>
+		<el-table v-loading="listLoading" :data="srcList" element-loading-text="Loading" border fit
+			highlight-current-row>
+			<el-table-column align="center" label="" width="55">
+				<template slot-scope="scope">
+					<el-checkbox v-model="checked"></el-checkbox>
+				</template>
+			</el-table-column>
+			<el-table-column label="业务管理员姓名" align="center" width="340" prop="realName">
+				<!-- <template slot-scope="scope">
           成都韩晶供应商公司
         </template> -->
-      </el-table-column>
-      <el-table-column label="账号"  align="center" prop="account">
-        <!-- <template slot-scope="scope">
+			</el-table-column>
+			<el-table-column label="账号" align="center" prop="account">
+				<!-- <template slot-scope="scope">
           <span>合同编号</span>
         </template> -->
-      </el-table-column>
-      <el-table-column label="联系电话" width="190" align="center" prop="mobile">
-        <!-- <template slot-scope="scope">
+			</el-table-column>
+			<el-table-column label="联系电话" width="190" align="center" prop="mobile">
+				<!-- <template slot-scope="scope">
           承兑人
         </template> -->
-      </el-table-column>
-      <el-table-column label="业务管理员状态" width="190" align="center">
-        <!-- <template slot-scope="scope">
+			</el-table-column>
+			<el-table-column label="业务管理员状态" width="190" align="center">
+				<!-- <template slot-scope="scope">
           出票人
         </template> -->
-      </el-table-column>
-      <el-table-column label="审核状态" width="190" align="center">
-        <!-- <template slot-scope="scope">
+			</el-table-column>
+			<el-table-column label="审核状态" width="190" align="center">
+				<!-- <template slot-scope="scope">
           汇票状态
         </template> -->
-      </el-table-column>
-      <el-table-column label="时间" width="180" align="center">
-        <!-- <template slot-scope="scope">
+			</el-table-column>
+			<el-table-column label="时间" width="180" align="center">
+				<!-- <template slot-scope="scope">
           正常
         </template> -->
-      </el-table-column>
-      <el-table-column align="center" prop="created_at" label="操作" width="200">
-        <template slot-scope="scope">
-          <el-tag type="primary" style="cursor: pointer; margin:0 5px;" @click="tapDetail">编辑</el-tag>
-          <el-tag type="warning" style="cursor: pointer; margin:0 5px;" @click="tapDetail">禁用</el-tag>
-          <el-tag type="success" style="cursor: pointer; margin:0 5px;" @click="tapDetail">复原</el-tag>
-         <!-- <el-tag type="warning" style="margin-right: 15px;cursor: pointer;">通过</el-tag>
-          <el-tag type="info">不通过</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
-        layout="prev, pager, next"
-        :total="100"
-    	:size="5"
-    	prev-text="上一页"
-    	next-text="下一页"
-    	:hide-on-single-page="false"
-    	ref="pagination">
-      </el-pagination>
-       <el-button type="primary" size="small" style="background-color:#D8AB5A ;border-color:#D8AB5A ;margin: 0 20px;" @click="jumpLastPage">尾页</el-button>
-    </div>
-  </div>
+			</el-table-column>
+			<el-table-column align="center" prop="created_at" label="操作" width="200">
+				<template slot-scope="scope">
+					<el-tag type="primary" style="cursor: pointer; margin:0 5px;" @click="tapDetail">编辑</el-tag>
+					<el-tag type="warning" style="cursor: pointer; margin:0 5px;" @click="tapDetail">禁用</el-tag>
+					<el-tag type="success" style="cursor: pointer; margin:0 5px;" @click="tapDetail">复原</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>
 </template>
 
 <script>
-  import {
-    getList
-  } from '@/api/table'
+	import {
+		getList
+	} from '@/api/table'
 
-  export default {
-    filters: {
-      statusFilter(status) {
-        const statusMap = {
-          published: 'success',
-          draft: 'gray',
-          deleted: 'danger'
-        }
-        return statusMap[status]
-      }
-    },
-    data() {
-      return {
-        list:[],
-        listLoading: false,
-        status: '',
-        hpstatus:'',
-        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]);
-            }
-          }]
-        },
-        value1: '',
-        value2: ''
-      }
-    },
-    created() {
-      // this.fetchData()
-    },
-    mounted(){
-      this.$request({
-        url:'/api/Account',
-        method:'get',
-      }).then((res)=>{
-        this.list.push(res.data)
-		console.log(this.list)
-      })
-    },
-    methods: {
-      tapDetail(){
-        this.$router.push({path:'/detail'})
-      },
-      handleCommand(command) {
-        this.status = command
+	export default {
+		filters: {
+			statusFilter(status) {
+				const statusMap = {
+					published: 'success',
+					draft: 'gray',
+					deleted: 'danger'
+				}
+				return statusMap[status]
+			}
+		},
+		data() {
+			return {
+				srcList: [],
+				list: [],
+				listLoading: false,
+				status: '',
+				currentPage: 1,
+				pagesize: 11,
+				hpstatus: '',
+				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]);
+						}
+					}]
+				},
+				value1: '',
+				value2: ''
+			}
+		},
+		created() {
+		},
+		mounted() {
+			this.$request({
+				url: '/api/Account',
+				method: 'get',
+			}).then((res) => {
+				this.list.push(res.data)
+				this.getPageData()
+				console.log(this.list)
+			})
+		},
+		methods: {
+			tapDetail() {
+				this.$router.push({
+					path: '/detail'
+				})
+			},
+			handleCommand(command) {
+				this.status = command
 
-      },
-      handlehpCommand(command) {
-        this.hpstatus = command
+			},
+			handlehpCommand(command) {
+				this.hpstatus = command
 
-      },
-			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();
+			},
+			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);
 			},
-      // fetchData() {
-      //   this.listLoading = true
-      //   getList().then(response => {
-      //     this.list = response.data.items
-      //     this.listLoading = false
-      //   })
-      // }
-    }
-  }
+
+		}
+	}
 </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;
-  }
-  .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-col{
-    margin-bottom: 20px;
-  }
+	.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;
+	}
+
+	.el-pagination.is-background .el-pager li:not(.disabled).active {
+		background-color: #D8AB5A;
+	}
+
+	.el-col {
+		margin-bottom: 20px;
+	}
 </style>

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

xqd xqd
@@ -13,7 +13,7 @@
             <el-form-item label="供应商" :rules="[{  message: '姓名不能为空不能为空'}]">
               <el-input v-model="form.name" class="ipwidth" />
             </el-form-item>
-            <el-form-item label="统一社会信用代码" :rules="[{ message: '电话号码不能为空'}]">
+            <el-form-item label="社会信用代码" :rules="[{ message: '电话号码不能为空'}]">
               <el-input v-model="form.socialCode" class="ipwidth" />
             </el-form-item>
             <el-form-item label="法人姓名" :rules="[{  message: '身份证不能为空'}]">
@@ -38,11 +38,7 @@
             <el-form-item label="账号">
               <el-input v-model="form.account" class="ipwidth" />
             </el-form-item>
-            <el-collapse v-model="activeNames" @change="handleChange" style="width: 90%;float: right;">
-              <el-collapse-item title="账号" name="2">
-                <div>控制反馈:通过界面样式和交互动效让用户可以清晰的感知自己的操作;</div>
-                <div>页面反馈:操作后,通过页面元素的变化清晰地展现当前状态。</div>
-              </el-collapse-item>
+            <el-collapse v-model="activeNames" @change="handleChange" style="width: 80%;float: right;">
               <el-collapse-item title="认证照片" name="3" >
                 <div>
                   <el-image style="width: 100px; height: 100px" :src="url" :preview-src-list="srcList">

+ 5 - 5
src/views/register/index.vue

xqd xqd
@@ -126,9 +126,9 @@
             </el-form-item>
             <el-form-item prop="username">
               <span class="svg-container">
-                密码
+                联系人
               </span>
-              <el-input ref="password" v-model="providerForm.password" placeholder="至少6位数的字母数字组合" name="password"
+              <el-input ref="password" v-model="providerForm.contacts" placeholder="输入联系人的真实姓名" name="password"
                 type="passwordType" tabindex="3" />
             </el-form-item>
             <el-form-item prop="username">
@@ -144,10 +144,10 @@
                 type="passwordType" tabindex="3" />
             </el-form-item>
             <el-form-item prop="password"> <span class="svg-container">
-                联系人
+                密码
               </span>
-              <el-input :key="passwordType" ref="password" v-model="providerForm.contacts" :type="passwordType"
-                placeholder="输入联系人的真实姓名" name="password" tabindex="4" auto-complete="on"
+              <el-input :key="passwordType" ref="password" v-model="providerForm.password" :type="passwordType"
+                placeholder="至少6位数的字母数字组合" name="password" tabindex="4" auto-complete="on"
                 @keyup.enter.native="handleLogin" />
               <!-- <span class="show-pwd" @click="showPwd">
                     <svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" />

+ 26 - 15
src/views/shipments/index.vue

xqd xqd xqd xqd xqd xqd
@@ -56,7 +56,7 @@
      </el-col>
 
    </el-row>
-    <el-table v-loading="listLoading" :data="list" element-loading-text="Loading" border fit highlight-current-row>
+    <el-table v-loading="listLoading" :data="srcList" element-loading-text="Loading" border fit highlight-current-row>
       <el-table-column align="center" label="" width="55">
         <template slot-scope="scope">
          <el-checkbox v-model="checked"></el-checkbox>
@@ -89,20 +89,18 @@
         </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
-        layout="prev, pager, next"
-        :total="100"
-    	:size="5"
-    	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 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>
 
@@ -128,6 +126,9 @@
         listLoading: false,
         status: '',
         hpstatus:'',
+				srcList:[],
+				currentPage: 1,
+				pagesize: 11,
         input4:'',
          checked:false,
         pickerOptions: {
@@ -170,6 +171,7 @@
         method:'get',
       }).then((res)=>{
         this.list=res.data
+				this.getPageData()
       })
     },
     methods: {
@@ -206,6 +208,10 @@
       // })
 				window.open('http://123.207.180.167:8700/api/Report/export/acceptorClassification?frequency=1&startDate=&endDate=')
       },
+			handleCurrentChange(val) {
+				this.currentPage = val;
+				this.getPageData();
+			},
 			jumpFirstPage () {
 			    this.$refs.pagination.handleCurrentChange(1);
 			    this.$emit('handleCurrentChange', 1);
@@ -215,6 +221,11 @@
 			    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>

+ 221 - 219
src/views/shipments/shipments1.vue

xqd xqd
@@ -1,37 +1,38 @@
 <template>
-  <div class="app-container">
-   <el-row  >
-     <el-col :xs="24" :sm="7" :md="6" :lg="4" :xl="3">
-       <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="1">1月</el-dropdown-item>
-           </el-dropdown-menu>
-         </el-dropdown>
-       </div>
-     </el-col>
+	<div class="app-container">
+		<el-row>
+			<el-col :xs="24" :sm="7" :md="6" :lg="4" :xl="3">
+				<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="1">1月</el-dropdown-item>
+						</el-dropdown-menu>
+					</el-dropdown>
+				</div>
+			</el-col>
 
 
-     <el-col :xs="24" :sm="11" :md="9" :lg="7" :xl="5" >
-       <div class="grid-content bg-purple">
-         <div class="block">
-           <el-date-picker v-model="value2" type="daterange" align="right" unlink-panels range-separator="至"
-             start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions">
-           </el-date-picker>
-         </div>
+			<el-col :xs="24" :sm="11" :md="9" :lg="7" :xl="5">
+				<div class="grid-content bg-purple">
+					<div class="block">
+						<el-date-picker v-model="value2" type="daterange" align="right" unlink-panels
+							range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
+							:picker-options="pickerOptions">
+						</el-date-picker>
+					</div>
 
-       </div>
-     </el-col>
-  <!-- <el-col :xs="24" :sm="10" :md="8" :lg="5" :xl="5">
+				</div>
+			</el-col>
+			<!-- <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
@@ -42,208 +43,209 @@
        </div>
      </div>
      </el-col> -->
-    <!-- <el-col :span="1">
+			<!-- <el-col :span="1">
        <div class="grid-content bg-purple"></div>
      </el-col> -->
-     <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" @click="index">承兑人分类报表</el-button>
-          <el-button type="primary" disabled>出票人分类报表</el-button>
-          <el-button type="primary" @click="shipments2">合同统计列表</el-button>
-          <el-button type="primary" @click="shipments3">供应商统计列表</el-button>
-         <el-button type="primary" @click="Export">导出</el-button>
+			<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" @click="index">承兑人分类报表</el-button>
+					<el-button type="primary" disabled>出票人分类报表</el-button>
+					<el-button type="primary" @click="shipments2">合同统计列表</el-button>
+					<el-button type="primary" @click="shipments3">供应商统计列表</el-button>
+					<el-button type="primary" @click="Export">导出</el-button>
 
-       </div>
-     </el-col>
+				</div>
+			</el-col>
+
+		</el-row>
+		<el-table v-loading="listLoading" :data="srcList" element-loading-text="Loading" border fit
+			highlight-current-row id="download">
+			<el-table-column align="center" label="" width="55">
+				<template slot-scope="scope">
+					<el-checkbox v-model="checked"></el-checkbox>
+				</template>
+			</el-table-column>
+			<el-table-column label="出票人" align="center" prop="drawerName">
 
-   </el-row>
-    <el-table v-loading="listLoading" :data="list" element-loading-text="Loading" border fit highlight-current-row id="download">
-      <el-table-column align="center" label="" width="55">
-        <template slot-scope="scope">
-         <el-checkbox v-model="checked"></el-checkbox>
-        </template>
-      </el-table-column>
-      <el-table-column label="出票人"  align="center" prop="drawerName">
-        
-      </el-table-column>
-      <el-table-column label="统计周期(按照出票日)"  align="center" prop="period">
-       
-      </el-table-column>
-      <el-table-column label="汇票笔数" width="320" align="center" prop="count">
-        
-      </el-table-column>
-     <el-table-column label="汇票金额" width="320" align="center" prop="money">
-       
-     </el-table-column>
-     <el-table-column label="服务费" width="300" align="center" prop="serviceMoney">
-       
-     </el-table-column>
-     <el-table-column label="利息" width="280" align="center" prop="interest">
-       
-     </el-table-column>
+			</el-table-column>
+			<el-table-column label="统计周期(按照出票日)" align="center" prop="period">
 
-     <!-- <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;">恢复</el-tag>
-         <el-tag type="warning" style="margin-right: 15px;cursor: pointer;">下载</el-tag>
-          <el-tag type="danger" style="cursor: pointer;">删除</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
-        layout="prev, pager, next"
-        :total="100"
-    	:size="5"
-    	prev-text="上一页"
-    	next-text="下一页"
-    	:hide-on-single-page="false"
-    	ref="pagination">
-      </el-pagination>
-       <el-button type="primary" size="small" style="background-color:#D8AB5A ;border-color:#D8AB5A ;margin: 0 20px;" @click="jumpLastPage">尾页</el-button>
-    </div>
-  </div>
+			</el-table-column>
+			<el-table-column label="汇票笔数" width="320" align="center" prop="count">
+
+			</el-table-column>
+			<el-table-column label="汇票金额" width="320" align="center" prop="money">
+			</el-table-column>
+			<el-table-column label="服务费" width="300" align="center" prop="serviceMoney">
+			</el-table-column>
+			<el-table-column label="利息" width="280" 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 background @current-change="handleCurrentChange" layout="prev, pager, next"
+				:total="list.length" :page-size="10" prev-text="上一页" next-text="下一页" :hide-on-single-page="false"
+				ref="pagination">
+			</el-pagination>
+			<el-button type="primary" size="small"
+				style="background-color:#D8AB5A ;border-color:#D8AB5A ;margin: 0 20px;" @click="jumpLastPage">尾页
+			</el-button>
+		</div>
+	</div>
 </template>
 
 <script>
-import {getList} from '@/api/table';
-import FileSaver from "file-saver";
-import XLSX from "xlsx";
+	import {
+		getList
+	} from '@/api/table';
+	import FileSaver from "file-saver";
+	import XLSX from "xlsx";
 
-  export default {
-    filters: {
-      statusFilter(status) {
-        const statusMap = {
-          published: 'success',
-          draft: 'gray',
-          deleted: 'danger'
-        }
-        return statusMap[status]
-      }
-    },
-    data() {
-      return {
-        list: [],
-        listLoading: false,
-        status: '',
-        hpstatus:'',
-        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]);
-            }
-          }]
-        },
-        value1: '',
-        value2: ''
-      }
-    },
-    created() {
-      // this.fetchData()
-    },
-    mounted(){
-      this.$request({
-        url:'/api/Report/drawerClassification?frequency=1&startDate=2020-10-12&endDate=2023-12-23',
-        method:'get',
-      }).then((res)=>{
-        this.list=res.data
-      })
-    },
-    methods: {
-      handleCommand(command) {
-        this.status = command
+	export default {
+		filters: {
+			statusFilter(status) {
+				const statusMap = {
+					published: 'success',
+					draft: 'gray',
+					deleted: 'danger'
+				}
+				return statusMap[status]
+			}
+		},
+		data() {
+			return {
+				list: [],
+				listLoading: false,
+				status: '',
+				hpstatus: '',
+				input4: '',
+				srcList: [],
+				currentPage: 1,
+				pagesize: 11,
+				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: ''
+			}
+		},
+		created() {
+		},
+		mounted() {
+			this.$request({
+				url: '/api/Report/drawerClassification?frequency=1&startDate=2020-10-12&endDate=2023-12-23',
+				method: 'get',
+			}).then((res) => {
+				this.list = res.data
+				this.getPageData()
+			})
+		},
+		methods: {
+			handleCommand(command) {
+				this.status = command
 
-      },
-      handlehpCommand(command) {
-        this.hpstatus = command
+			},
+			handlehpCommand(command) {
+				this.hpstatus = command
 
-      },
-      // fetchData() {
-      //   this.listLoading = true
-      //   getList().then(response => {
-      //     this.list = response.data.items
-      //     this.listLoading = false
-      //   })
-      // },
-      index(){
-        this.$router.push({path:'/shipments/index'})
-      },
-      shipments2(){
-        this.$router.push({path:"/shipments2"})
-      },
-      shipments3(){
-        this.$router.push({path:"/shipments3"})
-      },
-      Export(){
-      //   this.$request({
-      //     url:'/api/Report/export/drawerClassification?frequency=1&startDate=&endDate=',
-      //     method:'get',
-      //   }).then((res)=>{
-      // })
-				window.open('http://123.207.180.167:8700/api/Report/export/drawerClassification?frequency=1&startDate=&endDate=')
-      },
-			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);
+			index() {
+				this.$router.push({
+					path: '/shipments/index'
+				})
+			},
+			shipments2() {
+				this.$router.push({
+					path: "/shipments2"
+				})
+			},
+			shipments3() {
+				this.$router.push({
+					path: "/shipments3"
+				})
 			},
-    }
-  }
+			Export() {
+				window.open(
+					'http://123.207.180.167:8700/api/Report/export/drawerClassification?frequency=1&startDate=&endDate='
+					)
+			},
+			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>
 <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;
-  }
-  .pagesip{
-    position: fixed;
-    bottom: 16px;
-    width: 88%;
-    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-col{
-    margin-bottom: 20px;
-  }
+	.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 {
+		position: fixed;
+		bottom: 16px;
+		width: 88%;
+		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-col {
+		margin-bottom: 20px;
+	}
 </style>

+ 38 - 39
src/views/shipments/shipments2.vue

xqd xqd xqd xqd xqd xqd
@@ -57,7 +57,7 @@
      </el-col>
 
    </el-row>
-    <el-table v-loading="listLoading" :data="list" element-loading-text="Loading" border fit highlight-current-row>
+    <el-table v-loading="listLoading" :data="srcList" element-loading-text="Loading" border fit highlight-current-row>
       <el-table-column align="center" label="" width="55">
         <template slot-scope="scope">
          <el-checkbox v-model="checked"></el-checkbox>
@@ -95,20 +95,18 @@
         </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
-        layout="prev, pager, next"
-        :total="100"
-    	:size="5"
-    	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 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="1" 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>
 
@@ -130,12 +128,15 @@
     },
     data() {
       return {
+		srcList:[],
+		currentPage: 1,
+		pagesize: 11,
         list: [],
         listLoading: false,
         status: '',
         hpstatus:'',
         input4:'',
-         checked:false,
+        checked:false,
         pickerOptions: {
           shortcuts: [{
             text: '最近一周',
@@ -176,6 +177,7 @@
         method:'get',
       }).then((res)=>{
         this.list=res.data
+		this.getPageData()
       })
     },
     methods: {
@@ -187,13 +189,6 @@
         this.hpstatus = command
 
       },
-      // fetchData() {
-      //   this.listLoading = true
-      //   getList().then(response => {
-      //     this.list = response.data.items
-      //     this.listLoading = false
-      //   })
-      // },
       index(){
         this.$router.push({path:'/shipments/index'})
       },
@@ -204,23 +199,27 @@
         this.$router.push({path:"/shipments3"})
       },
       Export(){
-      //   this.$request({
-      //     url:'/api/Report/export/contractReport?contractName=&startDate=&endDate=',
-      //     method:'get',
-      //   }).then((res)=>{
-      //   console.log(res)
-      // })
-				window.open('http://123.207.180.167:8700/api/Report/export/contractReport?contractName=&startDate=&endDate=')
+
+		window.open('http://123.207.180.167:8700/api/Report/export/contractReport?contractName=&startDate=&endDate=')
       },
-			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);
+	  },
+	  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>

+ 219 - 219
src/views/shipments/shipments3.vue

xqd xqd xqd
@@ -1,37 +1,38 @@
 <template>
-  <div class="app-container">
-   <el-row  >
-     <el-col :xs="24" :sm="7" :md="6" :lg="4" :xl="3">
-       <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="1">1月</el-dropdown-item>
-           </el-dropdown-menu>
-         </el-dropdown>
-       </div>
-     </el-col>
+	<div class="app-container">
+		<el-row>
+			<el-col :xs="24" :sm="7" :md="6" :lg="4" :xl="3">
+				<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="1">1月</el-dropdown-item>
+						</el-dropdown-menu>
+					</el-dropdown>
+				</div>
+			</el-col>
 
 
-     <el-col :xs="24" :sm="11" :md="9" :lg="7" :xl="5" >
-       <div class="grid-content bg-purple">
-         <div class="block">
-           <el-date-picker v-model="value2" type="daterange" align="right" unlink-panels range-separator="至"
-             start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions">
-           </el-date-picker>
-         </div>
+			<el-col :xs="24" :sm="11" :md="9" :lg="7" :xl="5">
+				<div class="grid-content bg-purple">
+					<div class="block">
+						<el-date-picker v-model="value2" type="daterange" align="right" unlink-panels
+							range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
+							:picker-options="pickerOptions">
+						</el-date-picker>
+					</div>
 
-       </div>
-     </el-col>
-  <!-- <el-col :xs="24" :sm="10" :md="8" :lg="5" :xl="5">
+				</div>
+			</el-col>
+			<!-- <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
@@ -42,19 +43,19 @@
        </div>
      </div>
      </el-col> -->
-    <!-- <el-col :span="1">
+			<!-- <el-col :span="1">
        <div class="grid-content bg-purple"></div>
      </el-col> -->
-     <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" @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>
-    <!-- <el-col :xs="13" :sm="7" :md="6" :lg="8" :xl="16">
+			<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" @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>
+			<!-- <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>
@@ -62,199 +63,198 @@
        </div>
      </el-col> -->
 
-   </el-row>
-    <el-table v-loading="listLoading" :data="list" element-loading-text="Loading" border fit highlight-current-row>
-      <el-table-column align="center" label="" width="55">
-        <template slot-scope="scope">
-         <el-checkbox v-model="checked"></el-checkbox>
-        </template>
-      </el-table-column>
-      <el-table-column label="供应商名称"  align="center" prop="supplierName">
-
-      </el-table-column>
-      <el-table-column label="汇票承兑日"  align="center" prop="acceptDate">
+		</el-row>
+		<el-table v-loading="listLoading" :data="srcList" element-loading-text="Loading" border fit highlight-current-row>
+			<el-table-column align="center" label="" width="55">
+				<template slot-scope="scope">
+					<el-checkbox v-model="checked"></el-checkbox>
+				</template>
+			</el-table-column>
+			<el-table-column label="供应商名称" align="center" prop="supplierName">
 
-      </el-table-column>
-      <el-table-column label="汇票贴现日" width="320" align="center" prop="expectDiscountDate">
+			</el-table-column>
+			<el-table-column label="汇票承兑日" align="center" prop="acceptDate">
 
-      </el-table-column>
-     <el-table-column label="汇票笔数" width="320" align="center" prop="count">
+			</el-table-column>
+			<el-table-column label="汇票贴现日" width="320" align="center" prop="expectDiscountDate">
 
-     </el-table-column>
-     <el-table-column label="汇票金额" width="320" align="center" prop="money">
+			</el-table-column>
+			<el-table-column label="汇票笔数" width="320" align="center" prop="count">
 
-     </el-table-column>
-     <el-table-column label="服务费" width="300" align="center" prop="serviceMoney">
+			</el-table-column>
+			<el-table-column label="汇票金额" width="320" align="center" prop="money">
 
-     </el-table-column>
-     <el-table-column label="利息" width="280" align="center" prop="interest">
+			</el-table-column>
+			<el-table-column label="服务费" width="300" align="center" prop="serviceMoney">
 
-     </el-table-column>
+			</el-table-column>
+			<el-table-column label="利息" width="280" align="center" prop="interest">
 
-     <!-- <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;">恢复</el-tag>
-         <el-tag type="warning" style="margin-right: 15px;cursor: pointer;">下载</el-tag>
-          <el-tag type="danger" style="cursor: pointer;">删除</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
-        layout="prev, pager, next"
-        :total="100"
-    	:size="5"
-    	prev-text="上一页"
-    	next-text="下一页"
-    	:hide-on-single-page="false"
-    	ref="pagination">
-      </el-pagination>
-       <el-button type="primary" size="small" style="background-color:#D8AB5A ;border-color:#D8AB5A ;margin: 0 20px;" @click="jumpLastPage">尾页</el-button>
-    </div>
-  </div>
+			</el-table-column>
+		</el-table>
+		<div class="pagesip">
+			<el-button type="primary" size="small"
+				style="background-color:#D8AB5A ;border-color:#D8AB5A ; margin: 0 20px;" @click="jumpFirstPage">首页
+			</el-button>
+			<el-pagination background @current-change="handleCurrentChange" layout="prev, pager, next"
+				:total="list.length" :page-size="10" prev-text="上一页" next-text="下一页" :hide-on-single-page="false"
+				ref="pagination">
+			</el-pagination>
+			<el-button type="primary" size="small"
+				style="background-color:#D8AB5A ;border-color:#D8AB5A ;margin: 0 20px;" @click="jumpLastPage">尾页
+			</el-button>
+		</div>
+	</div>
 </template>
 
 <script>
-  import {
-    getList
-  } from '@/api/table'
+	import {
+		getList
+	} from '@/api/table'
 
-  export default {
-    filters: {
-      statusFilter(status) {
-        const statusMap = {
-          published: 'success',
-          draft: 'gray',
-          deleted: 'danger'
-        }
-        return statusMap[status]
-      }
-    },
-    data() {
-      return {
-        list: [],
-        listLoading: false,
-        status: '',
-        hpstatus:'',
-        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]);
-            }
-          }]
-        },
-        value1: '',
-        value2: ''
-      }
-    },
-    created() {
-      // this.fetchData()
-    },
-    mounted(){
-      this.$request({
-        url:'/api/Report/supplierReport?supplierName=&startDate=&endDate=',
-        method:'get',
-      }).then((res)=>{
-        this.list=res.data
-      })
-    },
-    methods: {
-      handleCommand(command) {
-        this.status = command
+	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
 
-      },
-      handlehpCommand(command) {
-        this.hpstatus = command
-
-      },
-      // fetchData() {
-      //   this.listLoading = true
-      //   getList().then(response => {
-      //     this.list = response.data.items
-      //     this.listLoading = false
-      //   })
-      // },
-      index(){
-        this.$router.push({path:'/shipments/index'})
-      },
-      shipments1(){
-        this.$router.push({path:"/shipments1"})
-      },
-      shipments2(){
-        this.$router.push({path:"/shipments2"})
-      },
-      Export(){
-      //   this.$request({
-      //     url:'/api/Report/export/supplierReport?supplierName=&startDate=&endDate=',
-      //     method:'get',
+			},
+			handlehpCommand(command) {
+				this.hpstatus = command
 
-      //   }).then((res)=>{
-      //   console.log(res)
-      // })
-			window.open('http://123.207.180.167:8700/api/Report/export/supplierReport?supplierName=&startDate=&endDate=')
-      },
-			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);
+			
+			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=')
+			},
+			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>
 <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;
-  }
-  .pagesip{
-    position: fixed;
-    bottom: 16px;
-    width: 88%;
-    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-col{
-    margin-bottom: 20px;
-  }
+	.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 {
+		position: fixed;
+		bottom: 16px;
+		width: 88%;
+		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-col {
+		margin-bottom: 20px;
+	}
 </style>

+ 39 - 22
src/views/sucuirtyaudit/annexList.vue

xqd xqd xqd xqd xqd
@@ -49,14 +49,14 @@
       <el-col :xs="13" :sm="7" :md="6" :lg="8" :xl="11">
         <div class="grid-content bg-purple" style="display: flex;justify-content: flex-end;">
 
-          <el-button type="primary">数据备份</el-button>
+          <!-- <el-button type="primary">数据备份</el-button> -->
            <el-button type="primary" @click="toindex">操作日志</el-button>
             <el-button type="primary" disabled>附件列表</el-button>
         </div>
       </el-col>
 
     </el-row>
-    <el-table v-loading="listLoading" :data="list" element-loading-text="Loading" border fit highlight-current-row>
+    <el-table v-loading="listLoading" :data="srcList" element-loading-text="Loading" border fit highlight-current-row>
       <el-table-column align="center" label="" width="55">
         <template slot-scope="scope">
          <el-checkbox v-model="checked"></el-checkbox>
@@ -86,15 +86,17 @@
         </template>
       </el-table-column>
     </el-table>
-    <div class="pagesip">
-       <el-button type="primary" size="small" style="background-color:#D8AB5A ;border-color:#D8AB5A ;">首页</el-button>
-      <el-pagination
-        background
-        layout="prev, pager, next"
-        :total="200">
-      </el-pagination>
-       <el-button type="primary" size="small" style="background-color:#D8AB5A ;border-color:#D8AB5A ;">尾页</el-button>
-    </div>
+   <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>
 </template>
 
@@ -116,9 +118,12 @@
     },
     data() {
       return {
-        list: null,
-        listLoading: true,
+		srcList:[],
+        list: [],
+        listLoading: false,
         status: '',
+		currentPage: 1,
+		pagesize: 11,
         hpstatus:'',
         input4:'',
          checked:false,
@@ -154,7 +159,7 @@
       }
     },
     created() {
-      this.fetchData()
+      // this.fetchData()
     },
     methods: {
       handleCommand(command) {
@@ -165,19 +170,31 @@
         this.hpstatus = command
 
       },
-      fetchData() {
-        this.listLoading = true
-        getList().then(response => {
-          this.list = response.data.items
-          this.listLoading = false
-        })
-      },
+     
       todetail(){
         this.$router.push({path:'/detail'})
       },
       toindex(){
         this.$router.push({path:'/sucuirtyaudit/index'})
-      }
+      },
+	  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>

+ 16 - 25
src/views/sucuirtyaudit/index.vue

xqd xqd xqd xqd xqd
@@ -49,11 +49,9 @@
       <el-col :xs="13" :sm="7" :md="6" :lg="8" :xl="11">
         <div class="grid-content bg-purple" style="display: flex;justify-content: flex-end;">
 
-          <el-button type="primary">数据备份</el-button>
+          <!-- <el-button type="primary">数据备份</el-button> -->
            <el-button type="primary" disabled>操作日志</el-button>
             <el-button type="primary" @click="toannexList">附件列表</el-button>
-            <!-- <el-button type="success">复原</el-button>
-            <el-button type="danger">删除</el-button> -->
         </div>
       </el-col>
 
@@ -98,19 +96,16 @@
         </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
-        layout="prev, pager, next"
-        :total="100"
-    	:size="5"
-    	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 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>
 </template>
@@ -133,7 +128,10 @@
     },
     data() {
       return {
-        list: null,
+		srcList:[],
+		currentPage: 1,
+		pagesize: 11,
+        list: [],
         listLoading: false,
         status: '',
         hpstatus:'',
@@ -171,7 +169,6 @@
       }
     },
     created() {
-      // this.fetchData()
     },
     methods: {
       handleCommand(command) {
@@ -182,13 +179,7 @@
         this.hpstatus = command
 
       },
-      // fetchData() {
-      //   this.listLoading = true
-      //   getList().then(response => {
-      //     this.list = response.data.items
-      //     this.listLoading = false
-      //   })
-      // },
+      
       toannexList(){
         this.$router.push({path:'/annexList'})
       },

+ 1 - 1
src/views/table/addAcceptor.vue

xqd
@@ -52,7 +52,7 @@
         method:'post',
         data:this.form
       }).then((res)=>{
-					// this.$message("注册成功")
+					this.$message("注册成功")
 					// this.$router.push({path:'table'})
       })
     },

+ 33 - 13
src/views/table/index.vue

xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -14,6 +14,7 @@
 							<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>
@@ -23,7 +24,7 @@
 			<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%;">
+						<el-input placeholder="请输入承兑人名称" v-model="search" @change="Search" clearable style="width: 80%;">
 							<i slot="prefix" class="el-input__icon el-icon-search"></i>
 						</el-input>
 					</div>
@@ -39,7 +40,7 @@
 			</el-col>
 
 		</el-row>
-		<el-table v-loading="listLoading" :data="srcList" element-loading-text="Loading" border fit
+		<el-table v-loading="listLoading" :data="temporaryList" element-loading-text="Loading" border fit
 			highlight-current-row @select="handleSelectionChange">
 			<el-table-column align="center" label="" width="55" type="selection">
 
@@ -75,7 +76,7 @@
 						详情</el-tag>
 					<el-tag type="warning" style="cursor: pointer;margin-right: 15px;">复原</el-tag>
 					<el-tag type="danger" style="cursor: pointer;margin-right: 15px;"
-						@click.native.prevent="deleteRow(scope.row.id,list)">删除</el-tag>
+						@click.native.prevent="deleteRow(scope.row.id,srcList)">删除</el-tag>
 
 				</template>
 			</el-table-column>
@@ -85,7 +86,7 @@
 				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="1" prev-text="上一页" next-text="下一页" :hide-on-single-page="false"
+				: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"
@@ -117,11 +118,12 @@
 				list: [],
 				listLoading: false,
 				status: '',
+				search:'',
+				temporaryList:[],
 				currentPage: 1,
 				pagesize: 11,
 				multipleSelection: [],
 				hpstatus: '',
-				input4: '',
 				checked: false,
 				pickerOptions: {
 					shortcuts: [{
@@ -154,15 +156,14 @@
 				value2: ''
 			}
 		},
-		created() {
-		},
+		created() {},
 		mounted() {
 			this.$request({
 				url: '/api/Acceptor/search',
 				method: 'post',
 				data: {
 					pageIndex: 1,
-					pageSize: 12,
+					pageSize: 15,
 				}
 			}).then((res) => {
 				console.log(res.data.result);
@@ -173,6 +174,12 @@
 		methods: {
 			handleCommand(command) {
 				this.status = command
+				if(this.status=="正常"||this.status=="删除"){
+					this.temporaryList=this.srcList.filter(item=>item.statusText==this.status)
+				}else {
+					this.temporaryList=this.srcList
+				}				
+				console.log(this.srcList,"command")
 			},
 			handlehpCommand(command) {
 				this.hpstatus = command
@@ -181,11 +188,23 @@
 				this.multipleSelection = data
 				console.log(this.multipleSelection)
 			},
-	
+			Search(){
+				if(this.search==""){
+					this.temporaryList=this.srcList
+				}else{
+					this.temporaryList=this.list.filter(item=>item.name==this.search)
+				}
+			},
 			addAcceptor() {
-				this.$router.push({
-					path: 'table/addAcceptor'
-				})
+				let confirm = window.confirm("你确定新增承兑人")
+				if (confirm) {
+					this.$router.push({
+						path: 'table/addAcceptor'
+					})
+				} else {
+
+				}
+
 			},
 			toDetail(id) {
 				this.$router.push({
@@ -196,6 +215,7 @@
 				})
 			},
 			deleteRow(row, rows) {
+				console.log(row, rows)
 				rows.splice(row, 1);
 			},
 
@@ -216,6 +236,7 @@
 				let start = (this.currentPage - 1) * this.pagesize;
 				let end = start + this.pagesize;
 				this.srcList = this.list.slice(start, end);
+				this.temporaryList=this.srcList
 			},
 		},
 	}
@@ -239,7 +260,6 @@
 		bottom: 16px;
 		width: 88%;
 		display: flex;
-		// align-items: center;
 		justify-content: flex-end;
 	}