8.5 18:09合并

src/layout/components/Sidebar/SidebarItem.vue

@@ -95,21 +95,14 @@ export default {
   }
 }
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .svg-icon{
   width: 1.8em !important;
   margin-left: -3px;
   margin-right: 10px !important;
 }
-.el-tooltip:nth-child(3){
-  position: absolute !important;
-  left: 10px !important;
-  top: 0px;
-  height: 100%;
-  width: 100%;
-  display: inline-block;
-  box-sizing: border-box;
-  padding: 0px -20px;
+::v-deep .el-menu-item.is-active > .el-tooltip i{
+      color: rgb(216, 171, 90) !important;
 }
 
 </style>

src/router/index.js

@@ -1,5 +1,7 @@
 import Vue from 'vue'
 import Router from 'vue-router'
+import { getToken } from '@/utils/auth';
+
 
 Vue.use(Router)
 import Layout from '@/layout'
@@ -151,14 +153,14 @@ export const asyncRouterMap = [{
 		]
 	},
 
-	{
-    path: '/form',
-		component: Layout,
-		redirect: '/form',
-		meta: {
-			title: '出票人列表',
-			icon: 'form',
-			roles: ['admin', 'salesman']
+	{
+    path: '/form',
+		component: Layout,
+		redirect: '/form',
+		meta: {
+			title: '出票人列表',
+			icon: 'form',
+			roles: ['admin', 'salesman']
 		},
 		children: [{
 				path: 'index',
@@ -191,15 +193,15 @@ export const asyncRouterMap = [{
 				hidden: true
 			}
 		]
-	},
+	},
 
 	{
 		path: '/delivery',
-		component: Layout,
-		redirect: '/delivery',
-		meta: {
-			title: '供应商账号',
-			roles: ['admin', 'salesman']
+		component: Layout,
+		redirect: '/delivery',
+		meta: {
+			title: '供应商账号',
+			roles: ['admin', 'salesman']
 		},
 		children: [{
 				path: 'index',
@@ -222,15 +224,15 @@ export const asyncRouterMap = [{
 				hidden: true
 			}
 		]
-	},
+	},
 
-	{
-    path: '/shipments',
-		component: Layout,
-		redirect: '/shipments',
-		meta: {
-			title: '报表统计',
-			roles: ['admin', 'salesman']
+	{
+    path: '/shipments',
+		component: Layout,
+		redirect: '/shipments',
+		meta: {
+			title: '报表统计',
+			roles: ['admin', 'salesman']
 		},
 		children: [{
 				path: 'index',
@@ -274,15 +276,15 @@ export const asyncRouterMap = [{
 			}
 
 		]
-	},
+	},
 
-	{
-    path: '/management',
-		component: Layout,
-		redirect: '/management',
-		meta: {
-			title: '业务管理员',
-			roles: ['admin']
+	{
+    path: '/management',
+		component: Layout,
+		redirect: '/management',
+		meta: {
+			title: '业务管理员',
+			roles: ['admin']
 		},
 		children: [{
 				path: 'index',
@@ -295,15 +297,15 @@ export const asyncRouterMap = [{
 				}
 			},
 		]
-	},
+	},
 
-	{
-    path: '/sucuirtyaudit',
-		component: Layout,
-		redirect: '/sucuirtyaudit',
-		meta: {
-			title: '安全审计',
-			roles: ['admin']
+	{
+    path: '/sucuirtyaudit',
+		component: Layout,
+		redirect: '/sucuirtyaudit',
+		meta: {
+			title: '安全审计',
+			roles: ['admin']
 		},
 		children: [{
 				path: 'index',
@@ -348,15 +350,15 @@ export const asyncRouterMap = [{
 			}
 
 		]
-	},
+	},
 
-	{
-    path: '/databackup',
-		component: Layout,
-		redirect: '/databackup',
-		meta: {
-			title: '数据备份',
-			roles: ['admin']
+	{
+    path: '/databackup',
+		component: Layout,
+		redirect: '/databackup',
+		meta: {
+			title: '数据备份',
+			roles: ['admin']
 		},
 		children: [{
 			path: 'index',
@@ -368,15 +370,15 @@ export const asyncRouterMap = [{
 				roles: ['admin']
 			}
 		}]
-	},
+	},
 
-	{
-    path: '/mine',
-		component: Layout,
-		redirect: '/mine',
-		meta: {
-			title: '个人资料',
-			roles: ['admin', 'salesman', 'supplier']
+	{
+    path: '/mine',
+		component: Layout,
+		redirect: '/mine',
+		meta: {
+			title: '个人资料',
+			roles: ['admin', 'salesman', 'supplier']
 		},
 		children: [{
 			path: 'index',
@@ -397,6 +399,11 @@ export const asyncRouterMap = [{
 	}
 ]
 
+
+
+
+
+
 const createRouter = () => new Router({
 	// mode: 'history', // require service support
 	scrollBehavior: () => ({
@@ -407,6 +414,31 @@ const createRouter = () => new Router({
 
 const router = createRouter()
 
+// //路由全局前置守卫
+// router.beforeEach((to, from, next) => {
+// 	/* 
+// 	  to from 路由信息对象
+// 	  to 到哪儿去
+// 	  from 从哪儿来
+// 	  next 放行方法
+// 	*/
+// 	const token = getToken('vue_admin_template_token');
+// 	//如果有token就跳转
+// 	if (token) {
+// 	  next()
+// 	} else {
+// 	  //如果没有token  1去登录直接放行 
+// 	  if (to.path === '/login') {
+// 		next()
+// 	  } else {
+// 		// 2不去登录跳到登录 
+// 		next('/login')
+// 	  }
+// 	}
+
+// })
+
+
 // Detail see: https://github.com/vuejs/vue-router/issues/1234#issuecomment-357941465
 export function resetRouter() {
 	const newRouter = createRouter()

src/views/contracts/detail.vue

@@ -128,6 +128,7 @@
 
     <el-card class="box-card">
       <el-table
+       :row-key="getRowKey"
         v-loading="listLoading"
         :data="temporaryList"
         element-loading-text="Loading"
@@ -137,7 +138,7 @@
         @select="handleSelectionChange"
         @select-all="handleAll"
       >
-        <el-table-column align="center" label="" width="55" type="selection" />
+        <el-table-column align="center" label="" width="55" type="selection" :reserve-selection="true" />
         <el-table-column label="汇票名称" align="center" prop="name" />
         <el-table-column label="汇票编号" align="center" prop="draftNo" />
         <el-table-column label="承兑人" align="center" prop="acceptorName" />
@@ -246,17 +247,11 @@
           @click="deletedContractDraft"
           >删除</el-button
         >
-        <el-button
-          type="primary"
-          style="float: right; margin-left: 10px"
-          @click="Exports"
-          >全部导出
-        </el-button>
         <el-button
           type="primary"
           style="float: right; margin-left: 10px"
           @click="ExportsContractDraft"
-          >批量导出
+          >导出
         </el-button>
 
         <el-button
@@ -313,7 +308,7 @@ export default {
       contract: {},
       currentPage: 1,
       multipleSelection: [],
-      pagesize: 100,
+      pagesize: 9999,
       form: "",
       invoicePicList: [],
       picList: [],
@@ -448,31 +443,21 @@ export default {
       this.temporaryList = this.srcList;
     },
 
-
+     getRowKey(row) {
+      return row.id;
+    },
 
     /* 批量导出 */
     handleAll(data) {
       this.multipleSelection=data
-      this.exportExcelData1.push(data);
-      this.exportExcelData2 = [
-        ...new Set(this.exportExcelData1.flat(Infinity)),
-      ];
     },
     handleSelectionChange(data) {
 			this.multipleSelection=data
-      this.exportExcelData1.push(data);
     },
     /* 批量导出 */
     ExportsContractDraft() {
-      this.multipleSelection =
-        [...new Set(this.exportExcelData1.flat(Infinity))] ||
-        this.exportExcelData2;
-
       if (this.multipleSelection == "") {
-        this.$message({
-          type: "warning",
-          message: "请选择数据!",
-        });
+        this.Exports()
       } else {
         var tableHeader = [
           [
@@ -534,7 +519,6 @@ export default {
         });
         dataConversionUtil.dataToExcel("汇票列表", tableHeader, dataList);
         this.$message.success("导出成功!");
-        this.multipleSelection = [];
       }, 1000);
     },
 
@@ -834,5 +818,12 @@ export default {
   border-radius: 0 26px 26px 0;
   line-height: 40px;
   text-align: center;
+}
+.el-button--danger{
+  margin-left: 10px;
+}
+::v-deep .el-textarea__inner{
+height: 150px !important;
+
 }
 </style>

src/views/contracts/index.vue

@@ -25,24 +25,27 @@
           <i slot="prefix" class="el-input__icon el-icon-search" />
         </el-input>
       </div>
-      <!-- 合同状态 -->
+       <!-- 合同审核状态 -->
       <div class="grid-content bg-purple">
-        <el-dropdown @command="handleCommand">
+        <el-dropdown @command="handleCommandAuditstatus">
           <div class="pulldown">
-            <span v-if="!status" class="el-dropdown-link"> 合同状态 </span>
-            <span v-if="status" class="el-dropdown-link">
-              {{ status }}
+            <span v-if="!Auditstatus" class="el-dropdown-link">
+              合同审核状态
+            </span>
+            <span v-if="Auditstatus" class="el-dropdown-link">
+              {{ Auditstatus }}
             </span>
             <i class="el-icon-arrow-down el-icon--right" />
           </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-item command="成功">成功</el-dropdown-item>
+            <el-dropdown-item command="失败">失败</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
       </div>
-
+      
       <!-- 汇票状态 -->
       <div class="grid-content bg-purple">
         <el-dropdown @command="handlehpCommand">
@@ -62,27 +65,27 @@
         </el-dropdown>
       </div>
 
-      <!-- 合同审核状态 -->
+      <!-- 合同状态 -->
       <div class="grid-content bg-purple">
-        <el-dropdown @command="handleCommandAuditstatus">
+        <el-dropdown @command="handleCommand">
           <div class="pulldown">
-            <span v-if="!Auditstatus" class="el-dropdown-link">
-              合同审核状态
-            </span>
-            <span v-if="Auditstatus" class="el-dropdown-link">
-              {{ Auditstatus }}
+            <span v-if="!status" class="el-dropdown-link"> 合同状态 </span>
+            <span v-if="status" class="el-dropdown-link">
+              {{ status }}
             </span>
             <i class="el-icon-arrow-down el-icon--right" />
           </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-item command="正常">正常</el-dropdown-item>
+            <el-dropdown-item command="删除">删除</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
       </div>
 
+     
+
+
       <!-- 日期查询 -->
       <div class="grid-content bg-purple">
         <div class="block">
@@ -132,33 +135,33 @@
         label="供应商名称"
         align="center"
         prop="supplierName"
-        width="100"
       />
 
       <el-table-column
         label="承兑人名称"
         align="center"
         prop="acceptorName"
-        width="100"
       />
       <el-table-column
         label="出票人名称"
         align="center"
         prop="drawersName"
-        width="100"
-      />
-      <el-table-column label="汇票状态" align="center" prop="draftStatusText" />
-      <el-table-column
-        label="合同状态"
-        align="center"
-        prop="contractStatusText"
+
       />
+      <!-- 合同审核状态 -->
       <el-table-column
         class-name="status-col"
         label="合同审核状态"
         align="center"
         prop="statusText"
-        width="120"
+      />
+      <!-- 汇票状态 -->
+      <el-table-column label="汇票状态" align="center" prop="draftStatusText" />
+       <!-- 合同状态 -->
+      <el-table-column
+        label="合同状态"
+        align="center"
+        prop="contractStatusText"
       />
       <el-table-column
         align="center"

src/views/databackup/index.vue

@@ -56,7 +56,6 @@
     </el-row>
     <el-table
       :row-key="getRowKey"
-
       v-loading="listLoading"
       :data="srcList"
       element-loading-text="Loading"
@@ -66,7 +65,13 @@
       @select="handleSelectionChange"
       @select-all="handleAll"
     >
-      <el-table-column align="center" label="" width="55" type="selection" :reserve-selection="true">
+      <el-table-column
+        align="center"
+        label=""
+        width="55"
+        type="selection"
+        :reserve-selection="true"
+      >
       </el-table-column>
       <el-table-column
         label="文件名称"
@@ -141,16 +146,18 @@
 
     <!--修改备注弹窗 -->
     <el-dialog title="修改备注" :visible.sync="dialogVisible" width="500px">
-      <el-form ref="form" :model="tableData" label-width="80px">      
-        <el-form-item label="文件名称">
-          <el-input v-model="tableData.fileName" style="width: 100%"></el-input>
+      <el-form ref="form" :model="tableData" label-width="80px">
+        <el-form-item label="文件名称" >
+          <el-input v-model="tableData.fileName" disabled style="width: 100%" ></el-input>
         </el-form-item>
         <el-form-item label="备注">
           <el-input v-model="tableData.remark" style="width: 100%"></el-input>
         </el-form-item>
         <el-form-item>
           <el-button @click="dialogVisible = false">取 消</el-button>
-          <el-button type="primary" @click="submitDelete(tableData.fileName)">提交修改</el-button>
+          <el-button type="primary" @click="submitDelete(tableData.fileName)"
+            >提交修改</el-button
+          >
         </el-form-item>
       </el-form>
     </el-dialog>
@@ -159,7 +166,7 @@
 
 <script>
 import { dataConversionUtil } from "../../utils/Excel.js";
-import { getDatabase,deletDatabase } from "@/api/database";
+import { getDatabase, deletDatabase } from "@/api/database";
 export default {
   filters: {
     statusFilter(status) {
@@ -175,7 +182,7 @@ export default {
     return {
       // 弹窗显示
       dialogVisible: false,
-      tableData:{},
+      tableData: {},
       // 表单数据
       formData: {
         startTime: "",
@@ -230,9 +237,8 @@ export default {
       },
       value1: "",
       value2: "",
-      exportExcelData1: [], //导出列表缓存数据整页
-      exportExcelData2:[],//导出列表缓存数据单选
-      multipleSelection:[],//下载sql文件数据
+      multipleSelection: [], //下载sql文件数据
+      fileNameArray:[],//存放所有的文件名
     };
   },
 
@@ -251,6 +257,9 @@ export default {
         this.temporaryList = data.result;
         this.srcList = data.result;
         this.total = res.data.total;
+        this.fileNameArray = this.temporaryList.map(item=>{
+          return item.fileName
+        })
       });
     },
 
@@ -313,76 +322,84 @@ export default {
       font.handleCurrentChange(cpage);
     },
 
-
     /* 下载数据备份 */
     download(fileName) {
       this.$request({
-      	url:'/api/Database/download',
-      	method:'post',
-      	data:{
-      		fileNameList:[fileName]
-      	}
-      }).then((res)=>{
-        window.open(res.data)
-      })
+        url: "/api/Database/download",
+        method: "post",
+        data: {
+          fileNameList: [fileName],
+        },
+      }).then((res) => {
+        window.open(res.data);
+      });
     },
 
     /* 下载多条数据备份 */
-    downLoadSql(){
-      let fileNameList = this.multipleSelection.map((item,value)=>{
-        return item.fileName
-      })
-      this.$request({
-      	url:'/api/Database/download',
-      	method:'post',
-      	data:{
-      		fileNameList
-      	}
-      }).then((res)=>{
-        window.open(res.data)
-      })
-      
+    downLoadSql() {
+      let fileNameList = this.multipleSelection.map((item, value) => {
+        return item.fileName;
+      });
 
+      if (fileNameList == "") {
+        this.$request({
+          url: "/api/Database/download",
+          method: "post",
+          data: {
+            fileNameList:this.fileNameArray
+          },
+        }).then((res) => {
+          window.open(res.data);
+        });
+      } else {
+        this.$request({
+          url: "/api/Database/download",
+          method: "post",
+          data: {
+            fileNameList,
+          },
+        }).then((res) => {
+          window.open(res.data);
+        });
+      }
     },
 
     /* 修改备注 */
-    modifyRemarks(fileName){
+    modifyRemarks(fileName) {
       this.dialogVisible = true;
       this.$request({
-        url:'/api/Database/backups',
-        method:'post',
-        data:{
-          fileName
-        }
-      }).then(res=>{
-        this.tableData = res.data.result[0]
-      })   
+        url: "/api/Database/backups",
+        method: "post",
+        data: {
+          fileName,
+        },
+      }).then((res) => {
+        this.tableData = res.data.result[0];
+      });
     },
 
     /* 提交修改 */
-    submitDelete(){
+    submitDelete() {
       this.$request({
-        url:'/api/Database/update',
-        method:'post',
-        data:this.tableData
-      }).then(res=>{
-        if(res.code === 200){
+        url: "/api/Database/update",
+        method: "post",
+        data: this.tableData,
+      }).then((res) => {
+        if (res.code === 200) {
           this.$message({
-            type:'success',
-            message:'修改成功'
-          })
-          this.getAllList()
-        }else{
+            type: "success",
+            message: "修改成功",
+          });
+          this.getAllList();
+          this.dialogVisible = false;
+        } else {
           this.$message({
-            type:'danger',
-            message:'修改失败'
-          })
+            type: "danger",
+            message: "修改失败",
+          });
         }
-        
-      }) 
-     
+      });
     },
-   
 
     deleted(fileName) {
       this.$request({
@@ -436,26 +453,18 @@ export default {
     },
     /* 批量导出 */
     handleSelectionChange(data) {
-      this.multipleSelection = data
+      this.multipleSelection = data;
     },
     handleAll(data) {
-      this.multipleSelection = data
+      this.multipleSelection = data;
     },
     /* 批量导出数据 */
     batchExports() {
       if (this.multipleSelection == "") {
-        this.Exports()
+        this.Exports();
       } else {
         var tableHeader = [
-          [
-            "序号",
-            '文件名称',
-            '存储对象',
-            '文件大小',
-            '时间',
-            '备注'
-
-          ],
+          ["序号", "文件名称", "存储对象", "文件大小", "时间", "备注"],
         ];
         var dataList = [];
         this.multipleSelection.forEach((item, index) => {
@@ -465,7 +474,7 @@ export default {
             item.storeType,
             item.fileSize,
             item.backupTime,
-            item.remark
+            item.remark,
           ]);
         });
         dataConversionUtil.dataToExcel("数据备份列表", tableHeader, dataList);
@@ -481,24 +490,18 @@ export default {
         startTime: "",
         endTime: "",
         fileName: "",
-        
       };
       getDatabase({ ...data }).then((res) => {
         const { result } = res.data;
         this.multipleSelection = result;
       });
     },
-     /* 全部导出 */
+    /* 全部导出 */
     Exports() {
       this.getContacts();
       setTimeout(() => {
         var tableHeader = [
-          [ "序号",
-            '文件名称',
-            '存储对象',
-            '文件大小',
-            '时间',
-            '备注'],
+          ["序号", "文件名称", "存储对象", "文件大小", "时间", "备注"],
         ];
         var dataList = [];
         this.multipleSelection.forEach((item, index) => {
@@ -508,12 +511,11 @@ export default {
             item.storeType,
             item.fileSize,
             item.backupTime,
-            item.remark
+            item.remark,
           ]);
         });
         dataConversionUtil.dataToExcel("数据备份列表", tableHeader, dataList);
         this.$message.success("导出成功!");
-
       }, 1000);
     },
   },

src/views/delivery/edit.vue

@@ -1,6 +1,6 @@
 <template>
 	<div>
-		<el-descriptions title="供应商详情" :column="3" :size="size" border style="margin: 20px;">
+		<el-descriptions title="供应商详情" :column="3"  border style="margin: 20px;">
 			<el-descriptions-item label="供应商名称">{{ list.name }}</el-descriptions-item>
 			<el-descriptions-item label="id">{{ list.id }}</el-descriptions-item>
 			<el-descriptions-item label="统一社会信用代码">{{ list.socialCode }}</el-descriptions-item>

src/views/delivery/index.vue

@@ -1,70 +1,114 @@
 <template>
-	<div class="app-container">
-		<el-row type="flex" justify="space-around" style="margin-bottom: 20px">
-			<div class="grid-content bg-purple">
-				<el-input placeholder="请输入供应商名称" v-model="formData.name" @change="Search" clearable style="width: 100%">
-					<i slot="prefix" class="el-input__icon el-icon-search"></i>
-				</el-input>
-			</div>
-			<!-- 审核状态 -->
-			<div class="grid-content bg-purple">
-				<el-dropdown @command="handleCommand">
-					<div class="pulldown">
-						<span v-if="!providerStatus" class="el-dropdown-link">
-							供应商状态
-						</span>
-						<span v-if="providerStatus" class="el-dropdown-link">
-							{{ providerStatus }}
-						</span>
-						<i class="el-icon-arrow-down el-icon--right" />
-					</div>
-					<el-dropdown-menu slot="dropdown">
-						<el-dropdown-item command="全部">全部</el-dropdown-item>
-						<el-dropdown-item command="正常">正常</el-dropdown-item>
-						<el-dropdown-item command="删除">删除</el-dropdown-item>
-					</el-dropdown-menu>
-				</el-dropdown>
-			</div>
-			<!-- 供应商状态 -->
-			<div class="grid-content bg-purple">
-				<el-dropdown @command="AhandleCommand">
-					<div class="pulldown">
-						<span v-if="!Auditstatus" class="el-dropdown-link"> 审核状态 </span>
-						<span v-if="Auditstatus" class="el-dropdown-link">
-							{{ Auditstatus }}
-						</span>
-						<i class="el-icon-arrow-down el-icon--right" />
-					</div>
-					<el-dropdown-menu slot="dropdown">
-						<el-dropdown-item command="全部">全部</el-dropdown-item>
-						<el-dropdown-item command="已认证">已认证</el-dropdown-item>
-						<el-dropdown-item command="未认证">未认证</el-dropdown-item>
-					</el-dropdown-menu>
-				</el-dropdown>
-			</div>
-			<!-- 日期查询 -->
-			<div class="grid-content bg-purple">
-				<div class="block">
-					<el-date-picker v-model="value2" type="daterange" align="right" unlink-panels range-separator="至"
-						start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions"
-						value-format="yyyy-MM-dd" @change="startEndTime" />
-				</div>
-			</div>
-		</el-row>
-		<el-table :row-key="getRowKey" v-loading="listLoading" :data="temporaryList" element-loading-text="Loading"
-			border fit ref="multipleTable" highlight-current-row @selection-change="handleSelectionChange"
-			@select-all="handleAll">
-			<el-table-column type="selection" :reserve-selection="true"> </el-table-column>
-			<el-table-column label="供应商名称" align="center" prop="name" width="200">
-			</el-table-column>
-			<el-table-column label="统一社会信用代码" width="200" align="center" prop="socialCode">
-			</el-table-column>
-			<el-table-column label="账号" width="150" align="center" prop="account">
-			</el-table-column>
-			<el-table-column label="法人姓名" width="180" align="center" prop="legalPerson">
-			</el-table-column>
-			<el-table-column label="联系人" width="180" align="center" prop="contacts">
-			</el-table-column>
+  <div class="app-container">
+    <el-row type="flex" justify="space-around" style="margin-bottom: 20px">
+      <div class="grid-content bg-purple">
+        <el-input
+          placeholder="请输入供应商名称"
+          v-model="formData.name"
+          @change="Search"
+          clearable
+          style="width: 100%"
+        >
+          <i slot="prefix" class="el-input__icon el-icon-search"></i>
+        </el-input>
+      </div>
+       <!-- 审核状态 -->
+      <div class="grid-content bg-purple">
+        <el-dropdown @command="AhandleCommand">
+          <div class="pulldown">
+            <span v-if="!Auditstatus" class="el-dropdown-link"> 审核状态 </span>
+            <span v-if="Auditstatus" class="el-dropdown-link">
+              {{ Auditstatus }}
+            </span>
+            <i class="el-icon-arrow-down el-icon--right" />
+          </div>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item command="全部">全部</el-dropdown-item>
+            <el-dropdown-item command="已认证">已认证</el-dropdown-item>
+            <el-dropdown-item command="未认证">未认证</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+      </div>
+      <!-- 供应商状态 -->
+      <div class="grid-content bg-purple">
+        <el-dropdown @command="handleCommand">
+          <div class="pulldown">
+            <span v-if="!providerStatus" class="el-dropdown-link">
+              供应商状态
+            </span>
+            <span v-if="providerStatus" class="el-dropdown-link">
+              {{ providerStatus }}
+            </span>
+            <i class="el-icon-arrow-down el-icon--right" />
+          </div>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item command="全部">全部</el-dropdown-item>
+            <el-dropdown-item command="正常">正常</el-dropdown-item>
+            <el-dropdown-item command="删除">删除</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+      </div>
+     
+      <!-- 日期查询 -->
+      <div class="grid-content bg-purple">
+        <div class="block">
+          <el-date-picker
+            v-model="value2"
+            type="daterange"
+            align="right"
+            unlink-panels
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            :picker-options="pickerOptions"
+            value-format="yyyy-MM-dd"
+            @change="startEndTime"
+          />
+        </div>
+      </div>
+    </el-row>
+    <el-table
+      :row-key="getRowKey"
+      v-loading="listLoading"
+      :data="temporaryList"
+      element-loading-text="Loading"
+      border
+      fit
+      highlight-current-row
+      @selection-change="handleSelectionChange"
+      @select-all="handleAll"
+    >
+      <el-table-column type="selection" :reserve-selection="true"> </el-table-column>
+      <el-table-column
+        label="供应商名称"
+        align="center"
+        prop="name"
+        width="200"
+      >
+      </el-table-column>
+      <el-table-column
+        label="统一社会信用代码"
+        width="200"
+        align="center"
+        prop="socialCode"
+      >
+      </el-table-column>
+      <el-table-column label="账号" width="150" align="center" prop="account">
+      </el-table-column>
+      <el-table-column
+        label="法人姓名"
+        width="180"
+        align="center"
+        prop="legalPerson"
+      >
+      </el-table-column>
+      <el-table-column
+        label="联系人"
+        width="180"
+        align="center"
+        prop="contacts"
+      >
+      </el-table-column>
 
 			<el-table-column label="联系电话" width="180" align="center" prop="contactsMobile">
 			</el-table-column>

src/views/form/index.vue

@@ -1,77 +1,91 @@
 <template>
-	<div class="app-container">
-		<el-row type="flex" justify="space-between" style="margin-bottom: 20px">
-			<div class="grid-content bg-purple">
-				<div class="grid-content bg-purple" style="margin-left: 30px">
-					<el-input placeholder="请输入出票人名称" v-model="formData.name" @change="Search" clearable
-						style="width: 100%">
-						<i slot="prefix" class="el-input__icon el-icon-search"></i>
-					</el-input>
-				</div>
-			</div>
-			<div class="grid-content bg-purple">
-				<el-dropdown @command="handleCommand">
-					<div class="pulldown">
-						<span class="el-dropdown-link" v-if="!status"> 出票人状态 </span>
-						<span class="el-dropdown-link" v-if="status">
-							{{ status }}
-						</span>
-						<i class="el-icon-arrow-down el-icon--right"></i>
-					</div>
-					<el-dropdown-menu slot="dropdown">
-						<el-dropdown-item command="全部">全部</el-dropdown-item>
-						<el-dropdown-item command="正常">正常</el-dropdown-item>
-						<el-dropdown-item command="删除">删除</el-dropdown-item>
-					</el-dropdown-menu>
-				</el-dropdown>
-			</div>
 
+  <div class="app-container">
+    <el-row type="flex" justify="space-between" style="margin-bottom: 20px">
+      <div class="grid-content bg-purple">
+        <div class="grid-content bg-purple" style="margin-left: 30px">
+          <el-input
+            placeholder="请输入出票人名称"
+            v-model="formData.name"
+            @change="Search"
+            clearable
+            style="width: 100%"
+          >
+            <i slot="prefix" class="el-input__icon el-icon-search"></i>
+          </el-input>
+        </div>
+      </div>
+      <div class="grid-content bg-purple">
+        <el-dropdown @command="handleCommand">
+          <div class="pulldown">
+            <span class="el-dropdown-link" v-if="!status"> 出票人状态 </span>
+            <span class="el-dropdown-link" v-if="status">
+              {{ status }}
+            </span>
+            <i class="el-icon-arrow-down el-icon--right"></i>
+          </div>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item command="全部">全部</el-dropdown-item>
+            <el-dropdown-item command="正常">正常</el-dropdown-item>
+            <el-dropdown-item command="删除">删除</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+      </div>
 
-			<div class="grid-content bg-purple" style="display: flex; justify-content: flex-end">
-				<el-button type="success" @click="recovers">恢复</el-button>
-				<el-button type="danger" @click="deletestatuses">删除</el-button>
-				<el-button type="primary" @click="dialogVisible2 = true">新增出票人</el-button>
-				<el-button type="primary" @click="batchExports">导出</el-button>
-			</div>
-		</el-row>
+      <div
+        class="grid-content bg-purple"
+        style="display: flex; justify-content: flex-end"
+      >
+        <el-button type="success" @click="recovers">恢复</el-button>
+        <el-button type="danger" @click="deletestatuses">删除</el-button>
+        <el-button type="primary" @click="dialogVisible2 = true"
+          >新增出票人</el-button
+        >
+        <el-button type="primary" @click="batchExports">导出</el-button>
+      </div>
+    </el-row>
 
+    <!--修改出票人弹窗 -->
+    <el-dialog title="修改出票人" :visible.sync="dialogVisible1" width="500px">
+      <el-form ref="form" :model="tableData" label-width="80px">
+        <el-form-item label="姓名" prop="tableData.name">
+          <el-input v-model="tableData.name" style="width: 100%"></el-input>
+        </el-form-item>
+        <el-form-item label="银行账号" prop="tableData.bankAccount">
+          <el-input
+            v-model="tableData.bankAccount"
+            style="width: 100%"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="银行名称" prop="tableData.bankName">
+          <el-input v-model="tableData.bankName" style="width: 100%"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="dialogVisible1 = false">取 消</el-button>
+          <el-button type="primary" @click="onSubmit">提交修改</el-button>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
 
-		<!--修改出票人弹窗 -->
-		<el-dialog title="修改出票人" :visible.sync="dialogVisible1" width="500px">
-			<el-form ref="form" :model="tableData" label-width="80px">
-				<el-form-item label="姓名" prop="tableData.name">
-					<el-input v-model="tableData.name" style="width: 100%"></el-input>
-				</el-form-item>
-				<el-form-item label="银行账号" prop="tableData.bankAccount">
-					<el-input v-model="tableData.bankAccount" style="width: 100%"></el-input>
-				</el-form-item>
-				<el-form-item label="银行名称" prop="tableData.bankName">
-					<el-input v-model="tableData.bankName" style="width: 100%"></el-input>
-				</el-form-item>
-				<el-form-item>
-					<el-button @click="dialogVisible1 = false">取 消</el-button>
-					<el-button type="primary" @click="onSubmit">提交修改</el-button>
-				</el-form-item>
-			</el-form>
-		</el-dialog>
-
-		<el-dialog title="新增出票人" :visible.sync="dialogVisible2" width="500px">
-			<el-form ref="form" :model="form" label-width="100px">
-				<el-form-item label="出票人名称" style="width: 100%" prop="name">
-					<el-input v-model="form.name"></el-input>
-				</el-form-item>
-				<el-form-item label="银行账号" style="width: 100%" prop="bankAccount">
-					<el-input v-model="form.bankAccount"></el-input>
-				</el-form-item>
-				<el-form-item label="开户行名称" style="width: 100%" prop="bankName">
-					<el-input v-model="form.bankName"></el-input>
-				</el-form-item>
-				<el-form-item style="display: flex">
-					<el-button @click="dialogVisible2 = false">取 消</el-button>
-					<el-button type="primary" @click="addTicketdrawer">确认添加</el-button>
-				</el-form-item>
-			</el-form>
-		</el-dialog>
+    <el-dialog title="新增出票人" :visible.sync="dialogVisible2" width="500px">
+      <el-form ref="form" :model="form" label-width="100px">
+        <el-form-item label="出票人名称" style="width: 100%" prop="name">
+          <el-input v-model="form.name"></el-input>
+        </el-form-item>
+        <el-form-item label="银行账号" style="width: 100%" prop="bankAccount">
+          <el-input v-model="form.bankAccount"></el-input>
+        </el-form-item>
+        <el-form-item label="开户行名称" style="width: 100%" prop="bankName">
+          <el-input v-model="form.bankName"></el-input>
+        </el-form-item>
+        <el-form-item style="display: flex">
+          <el-button @click="dialogVisible2 = false">取 消</el-button>
+          <el-button type="primary" @click="addTicketdrawer"
+            >确认添加</el-button
+          >
+        </el-form-item>
+      </el-form>
+    </el-dialog>
 
 		<el-table :row-key="getRowKey" v-loading="listLoading" :data="temporaryList" element-loading-text="Loading"
 			border fit highlight-current-row @select="handleSelectionChange" @select-all="handleAll" ref="multipleTable">
@@ -213,8 +227,7 @@
 			};
 		},
 
-
-		mounted() {
+	mounted() {
 			this.checked = this.$store.state.user.checked;
 			this.getAllList();
 		},
@@ -390,123 +403,142 @@
 				});
 			},
 
+	
+    // 修改信息弹窗
+    modify(id) {
+      this.dialogVisible1 = true;
+      this.$request({
+        url: "/api/Drawer/" + id,
+        method: "get",
+      }).then((res) => {
+        this.tableData = res.data;
+        this.oldTableData = {
+          ...this.tableData,
+        };
+      });
+    },
+    // 修改信息弹窗提交
+    onSubmit() {
+      if (
+        JSON.stringify(this.oldTableData) === JSON.stringify(this.tableData)
+      ) {
+        this.$message({
+          type: "error",
+          message: "数据没有改变!",
+        });
+      } else if (
+        this.tableData.bankAccount.length < 5 ||
+        this.tableData.bankAccount > 20
+      ) {
+        this.$message({
+          type: "error",
+          message: "银行账号必须为5~20位!",
+        });
+      } else {
+        this.$request({
+          url: "/api/Drawer/update",
+          method: "post",
+          data: this.tableData,
+        }).then((res) => {
+          if (res.code == 200) {
+            this.$message({
+              type: "success",
+              message: "修改成功!",
+            });
+            this.getAllList();
+            this.dialogVisible1 = false;
+          } else {
+            this.$message({
+              type: "danger",
+              message: "修改失败!",
+            });
+          }
+        });
+      }
+    },
+    // 新增出票人弹窗
+    addTicketdrawer() {
+      if (this.form.bankAccount.length < 5 || this.form.bankAccount > 20) {
+        this.$message({
+          type: "error",
+          message: "银行账号必须为5~20位!",
+        });
+      } else {
+        this.$request({
+          url: "/api/Drawer",
+          method: "post",
+          data: this.form,
+        }).then((res) => {
+          if (res.code === 200) {
+            this.$message("添加成功!");
+            this.getAllList();
+            this.dialogVisible2 = false;
+          } else {
+            this.$message("提交失败");
+          }
+        });
+      }
+    },
 
-			// 修改信息弹窗
-			modify(id) {
-				this.dialogVisible1 = true;
-				this.$request({
-					url: "/api/Drawer/" + id,
-					method: "get",
-				}).then((res) => {
-					this.tableData = res.data;
-					this.oldTableData = {
-						...this.tableData
-					}
+    /* 输入出票人状态查询 */
+    handleCommand(command) {
+      this.status = command;
+      if (command === "正常") {
+        this.formData.status = 5;
+      }
+      if (command === "删除") {
+        this.formData.status = 4;
+      }
+      if (command === "全部") {
+        this.formData.status = "";
+      }
+      this.currentPage = 1;
+      this.searchForm = {
+        ...this.formData,
+      };
+      this.getAllList(this.searchForm);
+    },
+    /* 输入出票人名称查询 */
+    Search() {
+      this.currentPage = 1;
+      this.searchForm = {
+        ...this.formData,
+      };
+      this.getAllList(this.searchForm);
+    },
 
-				});
-			},
-			// 修改信息弹窗提交
-			onSubmit() {
-				if (JSON.stringify(this.oldTableData) === JSON.stringify(this.tableData)) {
-					this.$message({
-						type: 'error',
-						message: '数据没有改变!'
-					})
-				} else if (this.tableData.bankAccount.length < 5 || this.tableData.bankAccount > 20) {
-					this.$message({
-						type: 'error',
-						message: '银行账号必须为5~20位!'
-					})
-				} else {
-					this.$request({
-						url: "/api/Drawer/update",
-						method: "post",
-						data: this.tableData,
-					}).then((res) => {
-						if (res.code == 200) {
-							this.$message({
-								type: "success",
-								message: "修改成功!",
-							});
-							this.getAllList();
-							this.dialogVisible1 = false;
-						} else {
-							this.$message({
-								type: "danger",
-								message: "修改失败!",
-							});
-						}
-					});
-				}
+	/* 分页功能，改变当前页 */
+    handleCurrentChange(val) {
+      this.currentPage = val;
+      this.getAllList(this.searchForm);
+    },
 
+    /* 分页功能去首页 */
+    jumpFirstPage() {
+      this.$refs.pagination.handleCurrentChange(1);
+      this.$emit("handleCurrentChange", 1);
+    },
+    /* 分页功能：去尾页 */
+    jumpLastPage() {
+      let font = this.$refs.pagination;
+      let cpage = Math.ceil(font.total / font.pageSize);
+      font.handleCurrentChange(cpage);
+    },
 
-			},
-			// 新增出票人弹窗
-			addTicketdrawer() {
-				if (this.form.bankAccount.length < 5 || this.form.bankAccount > 20) {
-					this.$message({
-						type: 'error',
-						message: '银行账号必须为5~20位!'
-					})
-				} else {
-					this.$request({
-						url: "/api/Drawer",
-						method: "post",
-						data: this.form,
-					}).then((res) => {
-						if (res.code === 200) {
-							this.$message("添加成功!");
-							this.getAllList();
-							this.dialogVisible2 = false;
-						} else {
-							this.$message("提交失败");
-						}
-					});
-				}
-
-			},
-
-			/* 输入出票人状态查询 */
-			handleCommand(command) {
-				this.status = command;
-				if (command === "正常") {
-					this.formData.status = 5;
-				}
-				if (command === "删除") {
-					this.formData.status = 4;
-				}
-				if (command === "全部") {
-					this.formData.status = "";
-				}
-				this.currentPage = 1;
-				this.searchForm = {
-					...this.formData,
-				};
-				this.getAllList(this.searchForm);
-			},
-			/* 输入出票人名称查询 */
-			Search() {
-				this.currentPage = 1;
-				this.searchForm = {
-					...this.formData,
-				};
-				this.getAllList(this.searchForm);
-			},
-
-
-			getRowKey(row) {
+	getRowKey(row) {
 				return row.id;
 			},
 			/* 批量导出数据 */
-			handleSelectionChange(data) {
+	handleSelectionChange(data) {
 				this.multipleSelection = data;
 			},
-			handleAll(data) {
+	handleAll(data) {
 				this.multipleSelection = data;
 			},
 
+
 			/* 批量导出 */
-			batchExports() {
+	batchExports() {
 				if (this.multipleSelection == "") {
 					this.Exports();
 				} else {
@@ -529,7 +561,7 @@
 				}
 			},
 			/* 全部导出承兑人列表数据 */
-			getContacts() {
+	getContacts() {
 				const data = {
 					pageIndex: "",
 					pageSize: -1,
@@ -549,7 +581,7 @@
 			},
 
 			/* 全部导出 */
-			Exports() {
+	Exports() {
 				this.getContacts();
 				setTimeout(() => {
 					var tableHeader = [
@@ -570,36 +602,41 @@
 					this.$message.success("导出成功!");
 				}, 1000);
 			},
-		},
-	};
+		}
+	
+    
+  
+};
 </script>
+
+
 <style lang="scss" scoped>
-	.pulldown {
-		width: 185px;
-		height: 40px;
-		border: 1px solid #e8e8e8;
-		border-radius: 10px;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		justify-content: space-between;
-		padding: 0 20px;
-		color: #999999;
-	}
+.pulldown {
+  width: 185px;
+  height: 40px;
+  border: 1px solid #e8e8e8;
+  border-radius: 10px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 20px;
+  color: #999999;
+}
 
-	.pagesip {
-		width: 100%;
-		margin: 20px auto;
-		display: flex;
-		// align-items: center;
-		justify-content: flex-end;
-	}
+.pagesip {
+  width: 100%;
+  margin: 20px auto;
+  display: flex;
+  // align-items: center;
+  justify-content: flex-end;
+}
 
-	.el-pagination.is-background .el-pager li:not(.disabled).active {
-		background-color: #d8ab5a;
-	}
+.el-pagination.is-background .el-pager li:not(.disabled).active {
+  background-color: #d8ab5a;
+}
 
-	.el-col {
-		margin-bottom: 20px;
-	}
+.el-col {
+  margin-bottom: 20px;
+}
 </style>

src/views/login/index.vue

@@ -217,27 +217,6 @@ export default {
         this.$store.commit("user/getAdmin", this.checked);
       });
     },
-    //  handleLogin() {
-    //   that.loginForm.loginType = that.checked + 1
-    //   console.log(this.loginForm, 88)
-    //   this.$refs.loginForm.validate(valid => {
-    //     if (valid) {
-    //       this.loading = true
-    //       this.$store.dispatch('user/login', that.loginForm).then((res) => {
-    //         // console.log(res.data)
-    //         this.$router.push({
-    //           path: '/'
-    //         })
-    //         this.loading = false
-    //         this.$store.commit('user/getAdmin', that.checked)
-    //       }).catch(() => {
-    //         this.loading = false
-    //       })
-    //     } else {
-    //       console.log('error submit!!')
-    //       return false
-    //     }
-    //   })
   },
 };
 </script>

src/views/management/index.vue

@@ -1,64 +1,99 @@
 <template>
-	<div class="app-container">
-		<el-row type="flex" justify="space-between" style="margin-bottom: 20px">
-			<div class="grid-content bg-purple">
-				<el-input v-model="formData.name" @change="Search" placeholder="请输入业务管理员名称" style="width: 100%">
-					<i slot="prefix" class="el-input__icon el-icon-search" />
-				</el-input>
-			</div>
-			<div class="grid-content bg-purple">
-				<el-dropdown @command="handleCommand">
-					<div class="pulldown">
-						<span v-if="!status" class="el-dropdown-link">
-							业务管理员状态
-						</span>
-						<span v-if="status" class="el-dropdown-link">
-							{{ status }}
-						</span>
-						<i class="el-icon-arrow-down el-icon--right" />
-					</div>
-					<el-dropdown-menu slot="dropdown">
-						<el-dropdown-item command="全部">全部</el-dropdown-item>
-						<el-dropdown-item command="正常">正常</el-dropdown-item>
-						<el-dropdown-item command="删除">删除</el-dropdown-item>
-					</el-dropdown-menu>
-				</el-dropdown>
-			</div>
-			<div class="grid-content bg-purple">
-				<el-dropdown @command="handlehpCommand">
-					<div class="pulldown">
-						<span v-if="!Auditstatus" class="el-dropdown-link"> 审核状态 </span>
-						<span v-if="Auditstatus" class="el-dropdown-link">
-							{{ Auditstatus }}
-						</span>
-						<i class="el-icon-arrow-down el-icon--right" />
-					</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>
-			<div class="grid-content bg-purple" style="display: flex; justify-content: flex-end; margin-left: 10px">
-				<el-button type="success" @click="success">审核成功</el-button>
-				<el-button type="danger" @click="failed">审核失败</el-button>
-				<el-button type="success" @click="recover">恢复</el-button>
-				<el-button type="danger" @click="deleted">删除</el-button>
-				<el-button type="primary" @click="batchExports">导出</el-button>
-			</div>
-		</el-row>
-		<el-table :row-key="getRowKey" v-loading="listLoading" :data="temporaryList" element-loading-text="Loading"
-			border fit highlight-current-row ref="multipleTable" @selection-change="handleSelectionChange"
-			@select-all="handleAll">
-			<el-table-column align="center" label="" width="55" type="selection" :reserve-selection="true" />
 
-			<el-table-column label="业务管理员名称" align="center" width="180" prop="realName" />
-			<el-table-column label="账号" align="center" prop="account" />
-			<el-table-column label="联系电话" width="180" align="center" prop="mobile" />
-			<el-table-column label="审核状态" align="center" prop="approveStatusText" />
-			<el-table-column label="业务管理员状态" align="center" prop="statusText" width="180" />
+  <div class="app-container">
+    <el-row type="flex" justify="space-between" style="margin-bottom: 20px">
+      <div class="grid-content bg-purple">
+        <el-input
+          v-model="formData.name"
+          @change="Search"
+          placeholder="请输入业务管理员名称"
+          style="width: 100%"
+        >
+          <i slot="prefix" class="el-input__icon el-icon-search" />
+        </el-input>
+      </div>
+      
+      <div class="grid-content bg-purple">
+        <el-dropdown @command="handlehpCommand">
+          <div class="pulldown">
+            <span v-if="!Auditstatus" class="el-dropdown-link"> 审核状态 </span>
+            <span v-if="Auditstatus" class="el-dropdown-link">
+              {{ Auditstatus }}
+            </span>
+            <i class="el-icon-arrow-down el-icon--right" />
+          </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>
+      <div class="grid-content bg-purple">
+        <el-dropdown @command="handleCommand">
+          <div class="pulldown">
+            <span v-if="!status" class="el-dropdown-link">
+              业务管理员状态
+            </span>
+            <span v-if="status" class="el-dropdown-link">
+              {{ status }}
+            </span>
+            <i class="el-icon-arrow-down el-icon--right" />
+          </div>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item command="全部">全部</el-dropdown-item>
+            <el-dropdown-item command="正常">正常</el-dropdown-item>
+            <el-dropdown-item command="删除">删除</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+      </div>
+
+      <div
+        class="grid-content bg-purple"
+        style="display: flex; justify-content: flex-end; margin-left: 10px"
+      >
+        <el-button type="success" @click="success">审核成功</el-button>
+        <el-button type="danger" @click="failed">审核失败</el-button>
+        <el-button type="primary" @click="recover">恢复</el-button>
+        <el-button type="warning" @click="deleted">删除</el-button>
+        <el-button type="primary" @click="batchExports">导出</el-button>
+      </div>
+    </el-row>
+    <el-table
+    :row-key="getRowKey"
+      v-loading="listLoading"
+      :data="temporaryList"
+      element-loading-text="Loading"
+      border
+      fit
+      highlight-current-row
+      @selection-change="handleSelectionChange"
+      @select-all="handleAll"
+    >
+      <el-table-column align="center" label="" width="55" type="selection"  :reserve-selection="true" />
+
+      <el-table-column
+        label="业务管理员名称"
+        align="center"
+        prop="realName"
+      />
+      <el-table-column label="账号" align="center" prop="account" />
+      <el-table-column
+        label="联系电话"
+        align="center"
+        prop="mobile"
+      />
+      <el-table-column
+        label="审核状态"
+        align="center"
+        prop="approveStatusText"
+      />
+      <el-table-column
+        label="业务管理员状态"
+        align="center"
+        prop="statusText"
+      />
 
 			<el-table-column label="时间" width="180" align="center" prop="createdAt" />
 			<el-table-column align="center" prop="created_at" label="操作" width="300">

src/views/sucuirtyaudit/annexList.vue

@@ -49,7 +49,7 @@
         <el-button type="primary" @click="toindex">操作日志</el-button>
         <el-button type="primary" disabled>附件列表</el-button>
         <el-button type="primary" @click="batchExports">导出</el-button>
-        <el-button type="primary">批量下载</el-button>
+        <el-button type="primary" @click="downloadAppendix">下载</el-button>
       </div>
     </el-row>
     <el-table
@@ -267,8 +267,7 @@ export default {
       value1: "",
       value2: "",
       multipleSelection: [], //导出数据
-      exportExcelData1: [], //导出列表缓存数据整页
-      exportExcelData2: [], //导出列表缓存数据单选
+      idsArray: [], //存放所有合同的id名
     };
   },
   mounted() {
@@ -289,6 +288,9 @@ export default {
         this.temporaryList = data.result;
         this.srcList = data.result;
         this.total = res.data.total;
+        this.idsArray = this.temporaryList.map((item) => {
+          return item.id;
+        });
       });
     },
 
@@ -399,6 +401,57 @@ export default {
       return decodeURI(filename);
     },
 
+    /* 批量下载附件 */
+    downloadAppendix() {
+      let ids = this.multipleSelection.map((item) => {
+        return item.id;
+      });
+
+      if (ids == "") {
+        let that = this;
+        this.$request({
+          url: "/api/AuditLog/attachments/download",
+          method: "post",
+          data: {
+            contractIds: this.idsArray,
+          },
+          responseType: "blob",
+        }).then((res) => {
+          let filename = this.getFileName(res.headers["content-disposition"]);
+          let fileData = res.data;
+          let blob = new Blob([fileData], { type: "application/zip" });
+          let url = URL.createObjectURL(blob);
+          const link = document.createElement("a");
+          link.href = url;
+          link.download = filename;
+          link.click();
+          // 释放内存
+          URL.revokeObjectURL(url);
+        });
+      } else {
+        let that = this;
+        this.$request({
+          url: "/api/AuditLog/attachments/download",
+          method: "post",
+          data: {
+            contractIds: ids,
+          },
+          responseType: "blob",
+        }).then((res) => {
+          let filename = this.getFileName(res.headers["content-disposition"]);
+          let fileData = res.data;
+          let blob = new Blob([fileData], { type: "application/zip" });
+          let url = URL.createObjectURL(blob);
+          const link = document.createElement("a");
+          link.href = url;
+          link.download = filename;
+          link.click();
+          // 释放内存
+          URL.revokeObjectURL(url);
+        });
+      }
+    },
+
     getRowKey(row) {
       return row.id;
     },

src/views/sucuirtyaudit/detail.vue

@@ -2,12 +2,12 @@
 
 	<div>
 		<el-descriptions title="详情信息" :column="2" border style="margin: 20px;">
-			<el-descriptions-item label="姓名">{{tableData.userName}}</el-descriptions-item>
+			<el-descriptions-item label="操作人员">{{tableData.userName}}</el-descriptions-item>
 			<el-descriptions-item label="状态">{{tableData.status}}</el-descriptions-item>
 			<el-descriptions-item label="id">{{tableData.recordId}}</el-descriptions-item>
-			<el-descriptions-item label="事件名称">{{tableData.event}}</el-descriptions-item>
+			<el-descriptions-item label="操作事件">{{tableData.event}}</el-descriptions-item>
 		</el-descriptions>
-		<el-collapse  @change="handleChange" v-model="activeNames">
+		<el-collapse   v-model="activeNames">
 			<el-collapse-item  name="1" style=" margin-left:20px">
 				<!-- <el-descriptions title="更新前" :column="3" border style="margin: 20px;">
 					<el-descriptions-item label="姓名">{{beforeobj.columns.name}}</el-descriptions-item>
@@ -65,6 +65,7 @@
 				columnName:'',
 				hanhua:['供应商id','姓名','合同编号','发票附件','合同附件','贸易附件','状态','反馈','反馈截图','合同id','创建时间','更新时间','删除时间','删除状态'],
 				title:'',
+				afterArray:[],//存放更新后的数据
 			}
 		},
 		mounted() {
@@ -73,6 +74,21 @@
 				url: '/api/AuditLog/detail/' + id,
 				method: 'get',
 			}).then((res) => {
+				// this.tableData = res.data
+				// console.log(this.tableData,"tableData")
+				// this.afterobj = JSON.parse(res.data.after)
+				// // this.beforeobj=JSON.parse(res.data.before)
+				// console.log(this.afterobj, "更新后")
+				// let columnName=Array.from(this.afterobj.columns,({columnName})=>columnName)
+				// console.log(columnName)
+				// this.columnName=this.getnewarr(columnName,this.hanhua)
+				// console.log(this.columnName)
+				// // 更新内容设置标题
+				// if(this.afterobj.tableName=='contract'){
+				// 	this.title='合同'
+				// }else{
+				// 	this.title='汇票'
+				// }
 				this.tableData = res.data
 				console.log(this.tableData,"tableData")
 				this.afterobj = JSON.parse(res.data.after)

src/views/table/index.vue

@@ -765,6 +765,7 @@ export default {
   width: 100%;
   display: flex;
   justify-content: flex-end;
+  margin-top: 20px;
 }
 
 .el-pagination.is-background .el-pager li:not(.disabled).active {