Tartarus 3 سال پیش
والد
کامیت
384c4f95ff

+ 379 - 254
src/views/contracts/detail.vue

xqd xqd
@@ -1,181 +1,307 @@
 <template>
-	<div>
-		<el-card class="box-card">
-			<el-col :xs="24" :sm="24" :md="10" :lg="10" :xl="12">
-				<div class="grid-content bg-purple">
-					<span style="font-weight: 600">合同基础信息</span>
-					<div class="titlein">
-						<span class="titlename">合同名称</span>
-						<span class="meatatitle">{{ contract.name }}</span>
-					</div>
-					<div class="titlein">
-						<span class="titlename">合同编号</span>
-						<span class="meatatitle">{{ contract.contractNo }}</span>
-					</div>
-					<div class="titlein">
-						<span class="titlename">合同附件</span>
-						<div style="display: flex">
-							<div class="imgbox">
-								<FileShow :files="contract.picList" />
-							</div>
-						</div>
-					</div>
-					<div class="titlein">
-						<span class="titlename">发票附件</span>
-						<div style="display: flex">
-							<div class="imgbox">
-								<FileShow :files="contract.invoicePicList" />
-							</div>
-						</div>
-					</div>
-				</div>
-			</el-col>
-			<el-col :xs="24" :sm="24" :md="14" :lg="14" :xl="12">
-				<div class="jas">
-					<div class="titlein jas">
-						<span class="titlename">贸易合同</span>
-						<div style="display: flex">
-							<div class="imgbox">
-								<FileShow :files="contract.tradePicList" />
-							</div>
-						</div>
-					</div>
-					<div class="yusa jas">
-						<div class="boxas">
-							<span style="color: #fff">合同状态:</span>
-							<span style="color: #d05c39">{{
+  <div>
+    <el-card class="box-card">
+      <el-col :xs="24" :sm="24" :md="10" :lg="10" :xl="12">
+        <div class="grid-content bg-purple">
+          <span style="font-weight: 600">合同基础信息</span>
+          <div class="titlein">
+            <span class="titlename">合同名称</span>
+            <span class="meatatitle">{{ contract.name }}</span>
+          </div>
+          <div class="titlein">
+            <span class="titlename">合同编号</span>
+            <span class="meatatitle">{{ contract.contractNo }}</span>
+          </div>
+          <div class="titlein">
+            <span class="titlename">合同附件</span>
+            <div style="display: flex">
+              <div class="imgbox">
+                <FileShow :files="contract.picList" />
+              </div>
+            </div>
+          </div>
+          <div class="titlein">
+            <span class="titlename">发票附件</span>
+            <div style="display: flex">
+              <div class="imgbox">
+                <FileShow :files="contract.invoicePicList" />
+              </div>
+            </div>
+          </div>
+        </div>
+      </el-col>
+      <el-col :xs="24" :sm="24" :md="14" :lg="14" :xl="12">
+        <div class="jas">
+          <div class="titlein jas">
+            <span class="titlename">贸易合同</span>
+            <div style="display: flex">
+              <div class="imgbox">
+                <FileShow :files="contract.tradePicList" />
+              </div>
+            </div>
+          </div>
+          <div class="yusa jas">
+            <div class="boxas">
+              <span style="color: #fff">合同状态:</span>
+              <span style="color: #d05c39">{{
                 contract.contractStatusText
               }}</span>
-						</div>
-						<span class="aoiisp">审核结果:
-							<p style="color: #d8ab5a">{{ contract.statusText }}</p>
-						</span>
-					</div>
-
-					<!-- 审核反馈和审核截图框  -->
-					<div class="yusa">
-						<el-col :xs="24" :sm="24" :md="14" :lg="14" :xl="10" class="jas">
-							<el-form ref="form" :model="contract" label-width="0px">
-								<span class="sah">审核反馈:</span>
-								<el-form-item label="">
-									<el-input v-permission="['salesman', 'admin']" v-model="contract.feedback"
-										type="textarea" />
-									<div v-permission="['supplier']">{{ contract.feedback }}</div>
-								</el-form-item>
-							</el-form>
-						</el-col>
-						<el-col :xs="24" :sm="24" :md="14" :lg="14" :xl="14" class="jas">
-							<span class="sah">审核截图:</span>
-							<div style="display: flex; justify-content: flex-end">
-								<div class="imgbox">
-									<FileUpload v-permission="['salesman', 'admin']" v-model="contract.feedbackPics"
-										accept=".jpg, .jpeg, .png, .pdf" />
-									<FileShow v-permission="['supplier']" :files="contract.feedbackPics" />
-								</div>
-							</div>
-						</el-col>
-					</div>
-					<div slot="" class="clearfix">
-						<!-- <el-button
+            </div>
+            <span class="aoiisp"
+              >审核结果:
+              <p style="color: #d8ab5a">{{ contract.statusText }}</p>
+            </span>
+          </div>
+
+          <!-- 审核反馈和审核截图框  -->
+          <div class="yusa">
+            <el-col :xs="24" :sm="24" :md="14" :lg="14" :xl="10" class="jas">
+              <el-form ref="form" :model="contract" label-width="0px">
+                <span class="sah">审核反馈:</span>
+                <el-form-item label="">
+                  <el-input
+                    v-permission="['salesman', 'admin']"
+                    v-model="contract.feedback"
+                    type="textarea"
+                  />
+                  <div v-permission="['supplier']">{{ contract.feedback }}</div>
+                </el-form-item>
+              </el-form>
+            </el-col>
+            <el-col :xs="24" :sm="24" :md="14" :lg="14" :xl="14" class="jas">
+              <span class="sah">审核截图:</span>
+              <div style="display: flex; justify-content: flex-end">
+                <div class="imgbox">
+                  <FileUpload
+                    v-permission="['salesman', 'admin']"
+                    v-model="contract.feedbackPics"
+                    accept=".jpg, .jpeg, .png, .pdf"
+                  />
+                  <FileShow
+                    v-permission="['supplier']"
+                    :files="contract.feedbackPics"
+                  />
+                </div>
+              </div>
+            </el-col>
+          </div>
+          <div slot="" class="clearfix">
+            <!-- <el-button
               type="primary"
               style="float: right; margin-left: 10px"
             >导出
             </el-button> -->
-						<el-button v-if="contract.status !== 0 && contract.contractStatus === 0" type="danger"
-							style="float: right" @click="deletedContract">删除</el-button>
-
-						<el-button v-if="contract.contractStatus === 1" type="primary" style="float: right"
-							@click="recoverContract">恢复
-						</el-button>
-
-						<el-button v-permission="['salesman', 'admin']" type="warning" style="float: right"
-							@click="failed">审核失败
-						</el-button>
-						<el-button v-permission="['salesman', 'admin']" type="success" style="float: right"
-							@click="success">审核成功
-						</el-button>
-					</div>
-				</div>
-			</el-col>
-		</el-card>
-
-		<el-card class="box-card">
-			<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">
-				<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" />
-				<el-table-column label="金额" align="center">
-					<template slot-scope="scope">
-						{{ scope.row.money }}
-					</template>
-				</el-table-column>
-				<el-table-column label="服务费" align="center">
-					<template slot-scope="scope">
-						{{ scope.row.serviceMoney }}
-					</template>
-				</el-table-column>
-				<el-table-column label="汇票状态" align="center" prop="draftStatusText" />
-				<el-table-column label="审核状态" align="center">
-					<template slot-scope="scope">
-						{{ scope.row.statusText }}
-					</template>
-				</el-table-column>
-				<el-table-column align="center" prop="created_at" label="操作" width="250">
-					<template slot-scope="scope">
-						<el-tag v-permission="['salesman', 'admin']" v-show="contract.status !== 0" type="primary"
-							style="cursor: pointer; margin-right: 15px" @click="tapDetail(scope.row.id)">查看详情</el-tag>
-						<el-tag v-permission="['supplier']" type="primary" style="cursor: pointer; margin-right: 15px"
-							@click="tapDetail(scope.row.id)">查看详情</el-tag>
-						<el-tag v-permission="['supplier']" v-show="scope.row.status == 2" type="success"
-							style="cursor: pointer; margin-right: 15px" @click="addNewBill(scope.row.id)">重新提交</el-tag>
-						<el-tag v-if="scope.row.draftStatus == 1" type="success"
-							style="margin-right: 15px; cursor: pointer" @click="recover(scope.row.id)">恢复</el-tag>
-						<el-tag v-if="contract.status != 0 && scope.row.draftStatus == 0" type="danger"
-							style="margin-right: 15px; cursor: pointer" @click="deleted(scope.row.id)">删除</el-tag>
-					</template>
-				</el-table-column>
-			</el-table>
-
-			<div class="pagesip">
-				<el-button v-permission="['salesman', 'admin']" v-show="contract.status !== 0" type="primary"
-					@click="batSuccessed">审核成功</el-button>
-				<el-button v-permission="['salesman', 'admin']" v-show="contract.status !== 0" type="primary"
-					@click="batFailed">审核失败</el-button>
-				<el-button v-if="contract.status !== 0 && role === 2" type="primary" @click="addNewBill('')">
-					新增汇票</el-button>
-
-				<el-button v-if="contract.status !== 0" type="success" style="float: right"
-					@click="recoverContractDraft">恢复
-				</el-button>
-				<el-button v-if="contract.status !== 0" type="danger" style="float: right"
-					@click="deletedContractDraft">删除</el-button>
-				<el-button type="primary" style="float: right; margin-left: 10px" @click="ExportsContractDraft">导出
-				</el-button>
-
-				<el-button type="primary" size="small" style="
+            <el-button
+              v-if="contract.status !== 0 && contract.contractStatus === 0"
+              type="danger"
+              style="float: right"
+              @click="deletedContract"
+              >删除</el-button
+            >
+
+            <el-button
+              v-if="contract.contractStatus === 1"
+              type="primary"
+              style="float: right"
+              @click="recoverContract"
+              >恢复
+            </el-button>
+
+            <el-button
+              v-permission="['salesman', 'admin']"
+              type="warning"
+              style="float: right"
+              @click="failed"
+              >审核失败
+            </el-button>
+            <el-button
+              v-permission="['salesman', 'admin']"
+              type="success"
+              style="float: right"
+              @click="success"
+              >审核成功
+            </el-button>
+          </div>
+        </div>
+      </el-col>
+    </el-card>
+
+    <el-card class="box-card">
+      <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"
+      >
+        <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" />
+        <el-table-column label="金额" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.money }}
+          </template>
+        </el-table-column>
+        <el-table-column label="服务费" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.serviceMoney }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="汇票状态"
+          align="center"
+          prop="draftStatusText"
+        />
+        <el-table-column label="审核状态" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.statusText }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          align="center"
+          prop="created_at"
+          label="操作"
+          width="250"
+        >
+          <template slot-scope="scope">
+            <el-tag
+              v-permission="['salesman', 'admin']"
+              v-show="contract.status !== 0"
+              type="primary"
+              style="cursor: pointer; margin-right: 15px"
+              @click="tapDetail(scope.row.id)"
+              >查看详情</el-tag
+            >
+            <el-tag
+              v-permission="['supplier']"
+              type="primary"
+              style="cursor: pointer; margin-right: 15px"
+              @click="tapDetail(scope.row.id)"
+              >查看详情</el-tag
+            >
+            <el-tag
+              v-permission="['supplier']"
+              v-show="scope.row.status == 2"
+              type="success"
+              style="cursor: pointer; margin-right: 15px"
+              @click="addNewBill(scope.row.id)"
+              >重新提交</el-tag
+            >
+            <el-tag
+              v-if="scope.row.draftStatus == 1"
+              type="success"
+              style="margin-right: 15px; cursor: pointer"
+              @click="recover(scope.row.id)"
+              >恢复</el-tag
+            >
+            <el-tag
+              v-if="contract.status != 0 && scope.row.draftStatus == 0"
+              type="danger"
+              style="margin-right: 15px; cursor: pointer"
+              @click="deleted(scope.row.id)"
+              >删除</el-tag
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <div class="pagesip">
+        <el-button
+          v-permission="['salesman', 'admin']"
+          v-show="contract.status !== 0"
+          type="primary"
+          @click="batSuccessed"
+          >审核成功</el-button
+        >
+        <el-button
+          v-permission="['salesman', 'admin']"
+          v-show="contract.status !== 0"
+          type="primary"
+          @click="batFailed"
+          >审核失败</el-button
+        >
+        <el-button
+          v-if="contract.status !== 0 && role === 2"
+          type="primary"
+          @click="addNewBill('')"
+        >
+          新增汇票</el-button
+        >
+
+        <el-button
+          v-if="contract.status !== 0"
+          type="success"
+          style="float: right"
+          @click="recoverContractDraft"
+          >恢复
+        </el-button>
+        <el-button
+          v-if="contract.status !== 0"
+          type="danger"
+          style="float: right"
+          @click="deletedContractDraft"
+          >删除</el-button
+        >
+        <el-button
+          type="primary"
+          style="float: right; margin-left: 10px"
+          @click="ExportsContractDraft"
+          >导出
+        </el-button>
+
+        <el-button
+          type="primary"
+          size="small"
+          style="
             background-color: #d8ab5a;
             border-color: #d8ab5a;
             margin: 0 20px;
-          " @click="jumpFirstPage">首页
-				</el-button>
-				<el-pagination ref="pagination" background layout="prev, pager, next" :total="list.length"
-					:page-size="10" prev-text="上一页" next-text="下一页" :hide-on-single-page="false"
-					@current-change="handleCurrentChange" />
-				<el-button type="primary" size="small" style="
+          "
+          @click="jumpFirstPage"
+          >首页
+        </el-button>
+        <el-pagination
+          ref="pagination"
+          background
+          layout="prev, pager, next"
+          :total="list.length"
+          :page-size="10"
+          prev-text="上一页"
+          next-text="下一页"
+          :hide-on-single-page="false"
+          @current-change="handleCurrentChange"
+        />
+        <el-button
+          type="primary"
+          size="small"
+          style="
             background-color: #d8ab5a;
             border-color: #d8ab5a;
             margin: 0 20px;
-          " @click="jumpLastPage">尾页
-				</el-button>
-				<el-button type="primary" size="small" @click="back">返回 </el-button>
-			</div>
-		</el-card>
-	</div>
+          "
+          @click="jumpLastPage"
+          >尾页
+        </el-button>
+        <el-button type="primary" size="small" @click="back">返回 </el-button>
+      </div>
+    </el-card>
+  </div>
 </template>
 
 <script>
+
 	import {
 		dataConversionUtil
 	} from "../../utils/Excel.js";
@@ -696,96 +822,95 @@
 </script>
 
 <style lang="scss" scoped>
-	.box-card {
-		width: 98%;
-		margin: 0 auto;
-		margin-top: 10px;
-	}
-
-	.el-textarea__inner {
-		padding: 30px 0;
-	}
-
-	.imgbox {
-		margin-left: 15px;
-	}
-
-	.titlein {
-		display: flex;
-		justify-content: space-between;
-		margin: 20px 0;
-
-		.titlename {
-			color: #bebdbb;
-		}
-
-		.meatatitle {
-			color: #1f242a;
-		}
-	}
-
-	.yusa {
-		display: flex;
-	}
-
-	.jas {
-		margin: 20px 20px;
-		margin-bottom: 0;
-	}
-
-	.sah {
-		display: block;
-		color: #68625b;
-		padding-bottom: 10px;
-	}
-
-	.grid-content {
-		margin: 15px 20px;
-	}
-
-	.bors {
-		height: 100%;
-	}
-
-	.aoiisp {
-		margin-left: 20px;
-		display: flex;
-		align-items: center;
-	}
-
-	.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;
-	}
-
-	.boxas {
-		font-size: 18px;
-		width: 211px;
-		height: 40px;
-		background: linear-gradient(to right, #ffe1ad, #d8ab5a);
-		box-shadow: 0 10px 20px 1px rgba(179, 116, 5, 0.2);
-		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;
-
-	}
+.box-card {
+  width: 98%;
+  margin: 0 auto;
+  margin-top: 10px;
+}
+
+.el-textarea__inner {
+  padding: 30px 0;
+}
+
+.imgbox {
+  margin-left: 15px;
+}
+
+.titlein {
+  display: flex;
+  justify-content: space-between;
+  margin: 20px 0;
+
+  .titlename {
+    color: #bebdbb;
+  }
+
+  .meatatitle {
+    color: #1f242a;
+  }
+}
+
+.yusa {
+  display: flex;
+}
+
+.jas {
+  margin: 20px 20px;
+  margin-bottom: 0;
+}
+
+.sah {
+  display: block;
+  color: #68625b;
+  padding-bottom: 10px;
+}
+
+.grid-content {
+  margin: 15px 20px;
+}
+
+.bors {
+  height: 100%;
+}
+
+.aoiisp {
+  margin-left: 20px;
+  display: flex;
+  align-items: center;
+}
+
+.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;
+}
+
+.boxas {
+  font-size: 18px;
+  width: 211px;
+  height: 40px;
+  background: linear-gradient(to right, #ffe1ad, #d8ab5a);
+  box-shadow: 0 10px 20px 1px rgba(179, 116, 5, 0.2);
+  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>

+ 26 - 33
src/views/contracts/index.vue

xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -25,7 +25,7 @@
           <i slot="prefix" class="el-input__icon el-icon-search" />
         </el-input>
       </div>
-       <!-- 合同审核状态 -->
+      <!-- 合同审核状态 -->
       <div class="grid-content bg-purple">
         <el-dropdown @command="handleCommandAuditstatus">
           <div class="pulldown">
@@ -45,7 +45,7 @@
           </el-dropdown-menu>
         </el-dropdown>
       </div>
-      
+
       <!-- 汇票状态 -->
       <div class="grid-content bg-purple">
         <el-dropdown @command="handlehpCommand">
@@ -83,9 +83,6 @@
         </el-dropdown>
       </div>
 
-     
-
-
       <!-- 日期查询 -->
       <div class="grid-content bg-purple">
         <div class="block">
@@ -112,7 +109,7 @@
       element-loading-text="Loading"
       border
       fit
-			ref="multipleTable"
+      ref="multipleTable"
       highlight-current-row
       @select="handleSelectionChange"
       @select-all="handleAll"
@@ -131,23 +128,10 @@
         prop="contractNo"
         width="155"
       />
-      <el-table-column
-        label="供应商名称"
-        align="center"
-        prop="supplierName"
-      />
+      <el-table-column label="供应商名称" align="center" prop="supplierName" />
 
-      <el-table-column
-        label="承兑人名称"
-        align="center"
-        prop="acceptorName"
-      />
-      <el-table-column
-        label="出票人名称"
-        align="center"
-        prop="drawersName"
-
-      />
+      <el-table-column label="承兑人名称" align="center" prop="acceptorName" />
+      <el-table-column label="出票人名称" align="center" prop="drawersName" />
       <!-- 合同审核状态 -->
       <el-table-column
         class-name="status-col"
@@ -157,7 +141,7 @@
       />
       <!-- 汇票状态 -->
       <el-table-column label="汇票状态" align="center" prop="draftStatusText" />
-       <!-- 合同状态 -->
+      <!-- 合同状态 -->
       <el-table-column
         label="合同状态"
         align="center"
@@ -357,7 +341,7 @@ export default {
         ],
       },
       value2: "",
-      multipleSelection:[]
+      multipleSelection: [],
     };
   },
   mounted() {
@@ -505,7 +489,6 @@ export default {
 				  }
 				});
 			}
-      
     },
     Sfailed(id) {
       this.$request({
@@ -611,7 +594,6 @@ export default {
 				  }
 				});
 			}
-     
     },
     // 合同状态查询
     handleCommand(command) {
@@ -741,7 +723,6 @@ export default {
     /* 批量导出数据 */
     handleSelectionChange(data) {
       this.multipleSelection = data;
-      console.log(this.multipleSelection);
     },
     handleAll(data) {
       this.multipleSelection = data;
@@ -754,7 +735,7 @@ export default {
       } else {
         var tableHeader = [
           [
-             "序号",
+            "序号",
             "合同名称",
             "合同编号",
             "承兑人",
@@ -779,7 +760,7 @@ export default {
             item.createdAt,
           ]);
         });
-        dataConversionUtil.dataToExcel("承兑人列表", tableHeader, dataList);
+        dataConversionUtil.dataToExcel("合同列表", tableHeader, dataList);
         this.$message.success("导出成功!");
       }
     },
@@ -804,11 +785,23 @@ export default {
     },
     /* 全部导出 */
     Exports() {
-      this.getContacts();
-      setTimeout(() => {
+      const data = {
+        pageIndex: "",
+        pageSize: -1,
+        startTime: "",
+        endTime: "",
+        name: "",
+        contractStatus: "",
+        approveStatus: "",
+        draftStatus: "",
+        supplierId: "",
+      };
+      contractsPageApi({ ...data }).then((res) => {
+        const { result } = res.data;
+        this.multipleSelection = result;
         var tableHeader = [
           [
-             "序号",
+            "序号",
             "合同名称",
             "合同编号",
             "承兑人",
@@ -835,7 +828,7 @@ export default {
         });
         dataConversionUtil.dataToExcel("合同列表", tableHeader, dataList);
         this.$message.success("导出成功!");
-      }, 1000);
+      });
     },
   },
 };

+ 14 - 16
src/views/databackup/index.vue

xqd xqd xqd xqd xqd xqd xqd
@@ -148,8 +148,12 @@
     <!--修改备注弹窗 -->
     <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" disabled style="width: 100%" ></el-input>
+        <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>
@@ -239,7 +243,7 @@ export default {
       value1: "",
       value2: "",
       multipleSelection: [], //下载sql文件数据
-      fileNameArray:[],//存放所有的文件名
+      fileNameArray: [], //存放所有的文件名
     };
   },
 
@@ -258,9 +262,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
-        })
+        this.fileNameArray = this.temporaryList.map((item) => {
+          return item.fileName;
+        });
       });
     },
 
@@ -347,7 +351,7 @@ export default {
           url: "/api/Database/download",
           method: "post",
           data: {
-            fileNameList:this.fileNameArray
+            fileNameList: this.fileNameArray,
           },
         }).then((res) => {
           window.open(res.data);
@@ -483,8 +487,8 @@ export default {
       }
     },
 
-    /* 全部导出承兑人列表数据 */
-    getContacts() {
+    /* 全部导出 */
+    Exports() {
       const data = {
         pageIndex: "",
         pageSize: -1,
@@ -495,12 +499,6 @@ export default {
       getDatabase({ ...data }).then((res) => {
         const { result } = res.data;
         this.multipleSelection = result;
-      });
-    },
-    /* 全部导出 */
-    Exports() {
-      this.getContacts();
-      setTimeout(() => {
         var tableHeader = [
           ["序号", "文件名称", "存储对象", "文件大小", "时间", "备注"],
         ];
@@ -517,7 +515,7 @@ export default {
         });
         dataConversionUtil.dataToExcel("数据备份列表", tableHeader, dataList);
         this.$message.success("导出成功!");
-      }, 1000);
+      });
     },
   },
 };

+ 513 - 464
src/views/delivery/index.vue

xqd xqd xqd xqd xqd
@@ -12,7 +12,7 @@
           <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">
@@ -48,7 +48,7 @@
           </el-dropdown-menu>
         </el-dropdown>
       </div>
-     
+
       <!-- 日期查询 -->
       <div class="grid-content bg-purple">
         <div class="block">
@@ -79,7 +79,8 @@
       @selection-change="handleSelectionChange"
       @select-all="handleAll"
     >
-      <el-table-column type="selection" :reserve-selection="true"> </el-table-column>
+      <el-table-column type="selection" :reserve-selection="true">
+      </el-table-column>
       <el-table-column
         label="供应商名称"
         align="center"
@@ -111,391 +112,340 @@
       >
       </el-table-column>
 
-			<el-table-column label="联系电话" width="180" align="center" prop="contactsMobile">
-			</el-table-column>
-			<el-table-column label="审核状态" align="center" prop="statusText">
-			</el-table-column>
-			<el-table-column label="供应商状态" align="center" prop="isDeletedText" width="120">
-			</el-table-column>
-			<el-table-column align="center" prop="createdAt" label="时间" width="180">
-			</el-table-column>
-			<el-table-column align="center" prop="created_at" label="操作" width="250">
-				<template slot-scope="scope">
-					<el-tag type="primary" style="cursor: pointer; margin-right: 15px" @click="toedit(scope.row.id)">详情
-					</el-tag>
-					<el-tag type="success" style="margin-right: 15px; cursor: pointer" @click="Srecover(scope.row.id)"
-						v-if="scope.row.isDeleted == 1">恢复</el-tag>
-					<el-tag type="danger" style="margin-right: 15px; cursor: pointer" @click="Sdeleted(scope.row.id)"
-						v-if="scope.row.isDeleted == 0">删除</el-tag>
-					<el-tag type="primary" style="margin-right: 15px; cursor: pointer" @click="reset(scope.row.id)"
-						v-permission="['admin']">重置密码</el-tag>
-				</template>
-			</el-table-column>
-		</el-table>
+      <el-table-column
+        label="联系电话"
+        width="180"
+        align="center"
+        prop="contactsMobile"
+      >
+      </el-table-column>
+      <el-table-column label="审核状态" align="center" prop="statusText">
+      </el-table-column>
+      <el-table-column
+        label="供应商状态"
+        align="center"
+        prop="isDeletedText"
+        width="120"
+      >
+      </el-table-column>
+      <el-table-column align="center" prop="createdAt" label="时间" width="180">
+      </el-table-column>
+      <el-table-column
+        align="center"
+        prop="created_at"
+        label="操作"
+        width="250"
+      >
+        <template slot-scope="scope">
+          <el-tag
+            type="primary"
+            style="cursor: pointer; margin-right: 15px"
+            @click="toedit(scope.row.id)"
+            >详情
+          </el-tag>
+          <el-tag
+            type="success"
+            style="margin-right: 15px; cursor: pointer"
+            @click="Srecover(scope.row.id)"
+            v-if="scope.row.isDeleted == 1"
+            >恢复</el-tag
+          >
+          <el-tag
+            type="danger"
+            style="margin-right: 15px; cursor: pointer"
+            @click="Sdeleted(scope.row.id)"
+            v-if="scope.row.isDeleted == 0"
+            >删除</el-tag
+          >
+          <el-tag
+            type="primary"
+            style="margin-right: 15px; cursor: pointer"
+            @click="reset(scope.row.id)"
+            v-permission="['admin']"
+            >重置密码</el-tag
+          >
+        </template>
+      </el-table-column>
+    </el-table>
 
-		<!-- 重置密码弹窗 -->
-		<el-dialog title="重置密码" :visible.sync="dialogVisible" width="30%">
-			<el-form ref="form" :model="password" label-width="80px">
-				<el-form-item label="登录密码" prop="password.newpassword">
-					<el-input v-model="password.newpassword" style="width: 300px" show-password></el-input>
-				</el-form-item>
-				<el-form-item label="确认密码" prop="password.ConfirmnewPassword">
-					<el-input v-model="password.ConfirmnewPassword" style="width: 300px" show-password></el-input>
-				</el-form-item>
-				<el-form-item>
-					<el-button @click="dialogVisible = false">取 消</el-button>
-					<el-button type="primary" @click="onSubmit">提交修改</el-button>
-				</el-form-item>
-			</el-form>
-		</el-dialog>
+    <!-- 重置密码弹窗 -->
+    <el-dialog title="重置密码" :visible.sync="dialogVisible" width="30%">
+      <el-form ref="form" :model="password" label-width="80px">
+        <el-form-item label="登录密码" prop="password.newpassword">
+          <el-input
+            v-model="password.newpassword"
+            style="width: 300px"
+            show-password
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="确认密码" prop="password.ConfirmnewPassword">
+          <el-input
+            v-model="password.ConfirmnewPassword"
+            style="width: 300px"
+            show-password
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="dialogVisible = false">取 消</el-button>
+          <el-button type="primary" @click="onSubmit">提交修改</el-button>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
 
-		<div style="display: flex; justify-content: space-between">
-			<el-row type="flex" justify="end">
-				<div class="btn" style="display: flex; justify-content: flex-end">
-					<el-button type="primary" @click="failed">认证失败</el-button>
-					<el-button type="primary" @click="success">认证成功</el-button>
-					<el-button type="primary" @click="batchExports">导出</el-button>
-					<el-button type="success" @click="recover">恢复</el-button>
-					<el-button type="danger" @click="deleted">删除</el-button>
-				</div>
-			</el-row>
-			<div class="pagesip">
-				<el-button type="primary" size="small" style="
+    <div style="display: flex; justify-content: space-between">
+      <el-row type="flex" justify="end">
+        <div class="btn" style="display: flex; justify-content: flex-end">
+          <el-button type="primary" @click="failed">认证失败</el-button>
+          <el-button type="primary" @click="success">认证成功</el-button>
+          <el-button type="primary" @click="batchExports">导出</el-button>
+          <el-button type="success" @click="recover">恢复</el-button>
+          <el-button type="danger" @click="deleted">删除</el-button>
+        </div>
+      </el-row>
+      <div class="pagesip">
+        <el-button
+          type="primary"
+          size="small"
+          style="
             background-color: #d8ab5a;
             border-color: #d8ab5a;
             margin: 0 20px;
-          " @click="jumpFirstPage">首页
-				</el-button>
-				<el-pagination background @current-change="handleCurrentChange" layout="total,prev, pager, next"
-					:total="total" :page-size="pagesize" :current-page="currentPage" prev-text="上一页" next-text="下一页"
-					:hide-on-single-page="false" ref="pagination">
-				</el-pagination>
-				<el-button type="primary" size="small" style="
+          "
+          @click="jumpFirstPage"
+          >首页
+        </el-button>
+        <el-pagination
+          background
+          @current-change="handleCurrentChange"
+          layout="total,prev, pager, next"
+          :total="total"
+          :page-size="pagesize"
+          :current-page="currentPage"
+          prev-text="上一页"
+          next-text="下一页"
+          :hide-on-single-page="false"
+          ref="pagination"
+        >
+        </el-pagination>
+        <el-button
+          type="primary"
+          size="small"
+          style="
             background-color: #d8ab5a;
             border-color: #d8ab5a;
             margin: 0 20px;
-          " @click="jumpLastPage">尾页
-				</el-button>
-			</div>
-		</div>
-	</div>
+          "
+          @click="jumpLastPage"
+          >尾页
+        </el-button>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
-	import {
-		dataConversionUtil
-	} from "../../utils/Excel.js";
-	import {
-		getSupplierSearch
-	} from "@/api/supplier";
-
-	export default {
-		filters: {
-			statusFilter(status) {
-				const statusMap = {
-					published: "success",
-					draft: "gray",
-					deleted: "danger",
-				};
-				return statusMap[status];
-			},
-		},
-		data() {
-			return {
-				//重置密码
-				password: {
-					newpassword: "",
-					ConfirmnewPassword: "",
-					supplierId: "",
-				},
-				// 控制弹窗
-				dialogVisible: false,
-				// 表单数据
-				formData: {
-					startTime: "",
-					endTime: "",
-					name: "",
-					status: "",
-					socialCode: "",
-					legalPerson: "",
-					isDeleted: "",
-				},
-				/* 当前页数 */
-				currentPage: 1,
-				/* 每页显示个数 */
-				pagesize: 10,
-				/* 总条数 */
-				total: 20,
-				srcList: [],
-				list: [],
-				temporaryList: [],
-				listLoading: false,
-				providerStatus: "",
-				search: "",
-				Auditstatus: "",
-				multipleSelection: [],
-				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: "",
-				exportExcelData1: [], //列表缓存数据
-				exportExcelData2: [],
-			};
-		},
-		mounted() {
-			this.checked = this.$store.state.user.checked;
-			this.getAllList();
-		},
-		methods: {
-			/* 获取列表数据 */
-			getAllList(searchForm = {}) {
-				const params = {
-					pageIndex: this.currentPage,
-					pageSize: this.pagesize,
-				};
-				getSupplierSearch({
-					...params,
-					...searchForm
-				}).then((res) => {
-					const {
-						data
-					} = res;
-					this.temporaryList = data.result;
-					this.srcList = data.result;
-					this.total = res.data.total;
-				});
-			},
-
-			toedit(id) {
-				this.$router.push({
-					path: "/edit",
-					query: {
-						id: id,
-					},
-				});
-			},
-
-			// 日期审核状态查询
-			startEndTime(item) {
-				if (item == null) {
-					item = [];
-					this.formData.startTime = "";
-					this.formData.endTime = "";
-					this.currentPage = 1;
-					this.searchForm = {
-						...this.formData
-					};
-					this.getAllList(this.searchForm);
-				} else {
-					this.formData.startTime = this.value2[0];
-					this.formData.endTime = this.value2[1];
-					this.currentPage = 1;
-					this.searchForm = {
-						...this.formData
-					};
-					this.getAllList(this.searchForm);
-				}
-			},
-			/* 审核状态查询 */
-			handleCommand(command) {
-				this.providerStatus = command;
-				if (command === "全部") {
-					this.formData.isDeleted = "";
-				}
-				if (command === "正常") {
-					this.formData.isDeleted = 0;
-				}
-				if (command === "删除") {
-					this.formData.isDeleted = 1;
-				}
-				this.currentPage = 1;
-				this.searchForm = {
-					...this.formData
-				};
-				this.getAllList(this.searchForm);
-			},
+import { dataConversionUtil } from "../../utils/Excel.js";
+import { getSupplierSearch } from "@/api/supplier";
 
-			// 输入供应商状态查询
-			AhandleCommand(command) {
-				this.Auditstatus = command;
-				if (command === "全部") {
-					this.formData.status = "";
-				}
-				if (command === "已认证") {
-					this.formData.status = 2;
-				}
-				if (command === "未认证") {
-					this.formData.status = 1;
-				}
-				this.currentPage = 1;
-				this.searchForm = {
-					...this.formData
-				};
-				this.getAllList(this.searchForm);
-			},
+export default {
+  filters: {
+    statusFilter(status) {
+      const statusMap = {
+        published: "success",
+        draft: "gray",
+        deleted: "danger",
+      };
+      return statusMap[status];
+    },
+  },
+  data() {
+    return {
+      //重置密码
+      password: {
+        newpassword: "",
+        ConfirmnewPassword: "",
+        supplierId: "",
+      },
+      // 控制弹窗
+      dialogVisible: false,
+      // 表单数据
+      formData: {
+        startTime: "",
+        endTime: "",
+        name: "",
+        status: "",
+        socialCode: "",
+        legalPerson: "",
+        isDeleted: "",
+      },
+      /* 当前页数 */
+      currentPage: 1,
+      /* 每页显示个数 */
+      pagesize: 10,
+      /* 总条数 */
+      total: 20,
+      srcList: [],
+      list: [],
+      temporaryList: [],
+      listLoading: false,
+      providerStatus: "",
+      search: "",
+      Auditstatus: "",
+      multipleSelection: [],
+      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: "",
+      exportExcelData1: [], //列表缓存数据
+      exportExcelData2: [],
+    };
+  },
+  mounted() {
+    this.checked = this.$store.state.user.checked;
+    this.getAllList();
+  },
+  methods: {
+    /* 获取列表数据 */
+    getAllList(searchForm = {}) {
+      const params = {
+        pageIndex: this.currentPage,
+        pageSize: this.pagesize,
+      };
+      getSupplierSearch({
+        ...params,
+        ...searchForm,
+      }).then((res) => {
+        const { data } = res;
+        this.temporaryList = data.result;
+        this.srcList = data.result;
+        this.total = res.data.total;
+      });
+    },
 
-			/* 输入出票人名称查询 */
-			Search() {
-				this.currentPage = 1;
-				this.searchForm = {
-					...this.formData,
-				};
-				this.getAllList(this.searchForm);
-			},
+    toedit(id) {
+      this.$router.push({
+        path: "/edit",
+        query: {
+          id: id,
+        },
+      });
+    },
 
-			/* 分页功能,改变当前页 */
-			handleCurrentChange(val) {
-				this.currentPage = val;
-				this.getAllList(this.searchForm);
-			},
+    // 日期审核状态查询
+    startEndTime(item) {
+      if (item == null) {
+        item = [];
+        this.formData.startTime = "";
+        this.formData.endTime = "";
+        this.currentPage = 1;
+        this.searchForm = {
+          ...this.formData,
+        };
+        this.getAllList(this.searchForm);
+      } else {
+        this.formData.startTime = this.value2[0];
+        this.formData.endTime = this.value2[1];
+        this.currentPage = 1;
+        this.searchForm = {
+          ...this.formData,
+        };
+        this.getAllList(this.searchForm);
+      }
+    },
+    /* 审核状态查询 */
+    handleCommand(command) {
+      this.providerStatus = command;
+      if (command === "全部") {
+        this.formData.isDeleted = "";
+      }
+      if (command === "正常") {
+        this.formData.isDeleted = 0;
+      }
+      if (command === "删除") {
+        this.formData.isDeleted = 1;
+      }
+      this.currentPage = 1;
+      this.searchForm = {
+        ...this.formData,
+      };
+      this.getAllList(this.searchForm);
+    },
 
-			/* 分页功能去首页 */
-			jumpFirstPage() {
-				this.$refs.pagination.handleCurrentChange(1);
-				this.$emit("handleCurrentChange", 1);
-			},
-			/* 分页功能:去尾页 */
-			jumpLastPage() {
-				let font = this.$refs.pagination;
-				let cpage = Math.ceil(font.total / font.pageSize);
-				font.handleCurrentChange(cpage);
-			},
+    // 输入供应商状态查询
+    AhandleCommand(command) {
+      this.Auditstatus = command;
+      if (command === "全部") {
+        this.formData.status = "";
+      }
+      if (command === "已认证") {
+        this.formData.status = 2;
+      }
+      if (command === "未认证") {
+        this.formData.status = 1;
+      }
+      this.currentPage = 1;
+      this.searchForm = {
+        ...this.formData,
+      };
+      this.getAllList(this.searchForm);
+    },
 
-			getRowKey(row) {
-				return row.id;
-			},
+    /* 输入出票人名称查询 */
+    Search() {
+      this.currentPage = 1;
+      this.searchForm = {
+        ...this.formData,
+      };
+      this.getAllList(this.searchForm);
+    },
 
-			/* 批量导出数据 */
-			handleSelectionChange(data) {
-				this.multipleSelection = data
-				console.log(this.multipleSelection)
-			},
-			handleAll(data) {
-				this.multipleSelection = data
-			},
-			/* 批量导出数据 */
-			batchExports() {
-				if (this.multipleSelection == "") {
-					this.Exports()
-				} else {
-					var tableHeader = [
-						[
-							"序号",
-							"供应商名称",
-							"社会统一信用码",
-							"账号",
-							"法人名称",
-							"联系人",
-							"电话",
-							"审核状态",
-							"时间",
-						],
-					];
-					var dataList = [];
-					this.multipleSelection.forEach((item, index) => {
-						dataList.push([
-							index + 1,
-							item.name,
-							item.socialCode,
-							item.account,
-							item.legalPerson,
-							item.contacts,
-							item.contactsMobile,
-							item.statusText,
-							item.createdAt,
-						]);
-					});
-					dataConversionUtil.dataToExcel("供应商列表", tableHeader, dataList);
-					this.$message.success("导出成功!");
-				}
-			},
+    /* 分页功能,改变当前页 */
+    handleCurrentChange(val) {
+      this.currentPage = val;
+      this.getAllList(this.searchForm);
+    },
 
-			/* 全部导出承兑人列表数据 */
-			getContacts() {
-				const data = {
-					pageIndex: "",
-					pageSize: -1,
-					startTime: "",
-					endTime: "",
-					name: "",
-					status: "",
-					socialCode: "",
-					legalPerson: "",
-					isDeleted: "",
-				};
-				getSupplierSearch({
-					...data
-				}).then((res) => {
-					const {
-						result
-					} = res.data;
-					this.multipleSelection = result;
-				});
-			},
-			/* 全部导出 */
-			Exports() {
-				this.getContacts();
-				setTimeout(() => {
-					var tableHeader = [
-						[
-							"序号",
-							"供应商名称",
-							"社会统一信用码",
-							"账号",
-							"法人名称",
-							"联系人",
-							"电话",
-							"审核状态",
-							"时间",
-						],
-					];
-					var dataList = [];
-					this.multipleSelection.forEach((item, index) => {
-						dataList.push([
-							index + 1,
-							item.name,
-							item.socialCode,
-							item.account,
-							item.legalPerson,
-							item.contacts,
-							item.contactsMobile,
-							item.statusText,
-							item.createdAt,
-						]);
-					});
-					dataConversionUtil.dataToExcel("供应商列表", tableHeader, dataList);
-					this.$message.success("导出成功!");
-				}, 1000);
-			},
+    /* 分页功能去首页 */
+    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);
+    },
 
 			success() {
 				let ids = Array.from(this.multipleSelection, ({
@@ -699,105 +649,204 @@
 						}
 					});
 				}
+      },
 
-			},
-			Sdeleted(id) {
-				this.$request({
-					url: "/api/Supplier/manage",
-					method: "post",
-					data: {
-						ids: [id],
-						operateType: 1,
-					},
-				}).then((res) => {
-					if (res.code == 200) {
-						this.$message({
-							type: "success",
-							message: res.msg,
-						});
-						this.getAllList();
-					} else {
-						this.$message({
-							type: "danger",
-							message: res.msg,
-						});
-						this.getAllList();
-					}
-				});
-			},
-			reset(id) {
-				this.dialogVisible = true;
-				this.password.supplierId = id;
-			},
-			// 提交修改密码
-			onSubmit() {
-				if (this.password.newpassword !== this.password.ConfirmnewPassword) {
-					this.$message({
-						type: "error",
-						message: "密码与确认密码不一致",
-					});
-				} else if (
-					this.password.newpassword.length < 6 ||
-					this.password.ConfirmnewPassword < 6
-				) {
-					this.$message({
-						type: "error",
-						message: "密码与确认密码至少6位",
-					});
-				} else {
-					this.$request({
-						url: "/api/Account/password/resetSupplier",
-						method: "post",
-						data: {
-							password: this.password.newpassword,
-							supplierId: this.password.supplierId,
-						},
-					}).then((res) => {
-						console.log(res);
-						if (res.code === 200) {
-							this.$message({
-								type: "success",
-								message: "重置成功",
-							});
-							this.dialogVisible = false;
-						}
-					});
-				}
-			},
-		},
-	};
+    getRowKey(row) {
+      return row.id;
+    },
+
+    /* 批量导出数据 */
+    handleSelectionChange(data) {
+      this.multipleSelection = data;
+      console.log(this.multipleSelection);
+    },
+    handleAll(data) {
+      this.multipleSelection = data;
+    },
+    /* 批量导出数据 */
+    batchExports() {
+      if (this.multipleSelection == "") {
+        this.Exports();
+      } else {
+        var tableHeader = [
+          [
+            "序号",
+            "供应商名称",
+            "社会统一信用码",
+            "账号",
+            "法人名称",
+            "联系人",
+            "电话",
+            "审核状态",
+            "时间",
+          ],
+        ];
+        var dataList = [];
+        this.multipleSelection.forEach((item, index) => {
+          dataList.push([
+            index + 1,
+            item.name,
+            item.socialCode,
+            item.account,
+            item.legalPerson,
+            item.contacts,
+            item.contactsMobile,
+            item.statusText,
+            item.createdAt,
+          ]);
+        });
+        dataConversionUtil.dataToExcel("供应商列表", tableHeader, dataList);
+        this.$message.success("导出成功!");
+      }
+    },
+
+    /* 全部导出 */
+    Exports() {
+      const data = {
+        pageIndex: "",
+        pageSize: -1,
+        startTime: "",
+        endTime: "",
+        name: "",
+        status: "",
+        socialCode: "",
+        legalPerson: "",
+        isDeleted: "",
+      };
+      getSupplierSearch({
+        ...data,
+      }).then((res) => {
+        const { result } = res.data;
+        this.multipleSelection = result;
+        var tableHeader = [
+          [
+            "序号",
+            "供应商名称",
+            "社会统一信用码",
+            "账号",
+            "法人名称",
+            "联系人",
+            "电话",
+            "审核状态",
+            "时间",
+          ],
+        ];
+        var dataList = [];
+        this.multipleSelection.forEach((item, index) => {
+          dataList.push([
+            index + 1,
+            item.name,
+            item.socialCode,
+            item.account,
+            item.legalPerson,
+            item.contacts,
+            item.contactsMobile,
+            item.statusText,
+            item.createdAt,
+          ]);
+        });
+        dataConversionUtil.dataToExcel("供应商列表", tableHeader, dataList);
+        this.$message.success("导出成功!");
+      });
+    },
+
+    Sdeleted(id) {
+      this.$request({
+        url: "/api/Supplier/manage",
+        method: "post",
+        data: {
+          ids: [id],
+          operateType: 1,
+        },
+      }).then((res) => {
+        if (res.code == 200) {
+          this.$message({
+            type: "success",
+            message: res.msg,
+          });
+          this.getAllList();
+        } else {
+          this.$message({
+            type: "danger",
+            message: res.msg,
+          });
+          this.getAllList();
+        }
+      });
+    },
+    reset(id) {
+      this.dialogVisible = true;
+      this.password.supplierId = id;
+    },
+    // 提交修改密码
+    onSubmit() {
+      if (this.password.newpassword !== this.password.ConfirmnewPassword) {
+        this.$message({
+          type: "error",
+          message: "密码与确认密码不一致",
+        });
+      } else if (
+        this.password.newpassword.length < 6 ||
+        this.password.ConfirmnewPassword < 6
+      ) {
+        this.$message({
+          type: "error",
+          message: "密码与确认密码至少6位",
+        });
+      } else {
+        this.$request({
+          url: "/api/Account/password/resetSupplier",
+          method: "post",
+          data: {
+            password: this.password.newpassword,
+            supplierId: this.password.supplierId,
+          },
+        }).then((res) => {
+          console.log(res);
+          if (res.code === 200) {
+            this.$message({
+              type: "success",
+              message: "重置成功",
+            });
+            this.dialogVisible = false;
+          }
+        });
+      }
+    },
+  },
+};
 </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;
+}
 
-	.btn {
-		padding: 20px;
-	}
+.btn {
+  padding: 20px;
+}
 </style>

+ 305 - 151
src/views/form/index.vue

xqd xqd xqd xqd xqd xqd xqd
@@ -1,5 +1,4 @@
 <template>
-
   <div class="app-container">
     <el-row type="flex" justify="space-between" style="margin-bottom: 20px">
       <div class="grid-content bg-purple">
@@ -87,45 +86,94 @@
       </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">
-			<el-table-column align="center" type="selection" :reserve-selection="true">
-			</el-table-column>
-			<el-table-column label="出票人名称" align="center" prop="name">
-			</el-table-column>
-			<el-table-column label="银行账号" align="center" prop="bankAccount">
-			</el-table-column>
-			<el-table-column align="center" prop="bankName" label="开户行名称">
-			</el-table-column>
-			<el-table-column align="center" prop="statusText" label="出票人状态">
-			</el-table-column>
-			<el-table-column align="center" prop="createdAt" label="时间">
-			</el-table-column>
-			<el-table-column align="center" prop="created_at" label="操作" width="250">
-				<template slot-scope="scope">
-					<el-tag type="primary" style="cursor: pointer; margin-right: 15px" @click="modify(scope.row.id)">修改
-					</el-tag>
-					<el-tag type="success" style="cursor: pointer; margin-right: 15px" @click="recover(scope.row.id)"
-						v-if="scope.row.status == 1">恢复
-					</el-tag>
-					<el-tag type="danger" style="cursor: pointer; margin-right: 15px"
-						@click="deletestatus(scope.row.id)" v-if="scope.row.status == 0">删除</el-tag>
-				</template>
-			</el-table-column>
-		</el-table>
-		<div class="pagesip">
-			<el-button type="primary" size="small"
-				style="background-color: #d8ab5a; border-color: #d8ab5a; margin: 0 20px" @click="jumpFirstPage">首页
-			</el-button>
-			<el-pagination background @current-change="handleCurrentChange" layout="total,prev, pager, next"
-				:total="total" :page-size="pagesize" :current-page="currentPage" prev-text="上一页" next-text="下一页"
-				:hide-on-single-page="false" ref="pagination">
-			</el-pagination>
-			<el-button type="primary" size="small"
-				style="background-color: #d8ab5a; border-color: #d8ab5a; margin: 0 20px" @click="jumpLastPage">尾页
-			</el-button>
-		</div>
-	</div>
+    <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"
+    >
+      <el-table-column
+        align="center"
+        type="selection"
+        :reserve-selection="true"
+      >
+      </el-table-column>
+      <el-table-column label="出票人名称" align="center" prop="name">
+      </el-table-column>
+      <el-table-column label="银行账号" align="center" prop="bankAccount">
+      </el-table-column>
+      <el-table-column align="center" prop="bankName" label="开户行名称">
+      </el-table-column>
+      <el-table-column align="center" prop="statusText" label="出票人状态">
+      </el-table-column>
+      <el-table-column align="center" prop="createdAt" label="时间">
+      </el-table-column>
+      <el-table-column
+        align="center"
+        prop="created_at"
+        label="操作"
+        width="250"
+      >
+        <template slot-scope="scope">
+          <el-tag
+            type="primary"
+            style="cursor: pointer; margin-right: 15px"
+            @click="modify(scope.row.id)"
+            >修改
+          </el-tag>
+          <el-tag
+            type="success"
+            style="cursor: pointer; margin-right: 15px"
+            @click="recover(scope.row.id)"
+            v-if="scope.row.status == 1"
+            >恢复
+          </el-tag>
+          <el-tag
+            type="danger"
+            style="cursor: pointer; margin-right: 15px"
+            @click="deletestatus(scope.row.id)"
+            v-if="scope.row.status == 0"
+            >删除</el-tag
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="pagesip">
+      <el-button
+        type="primary"
+        size="small"
+        style="background-color: #d8ab5a; border-color: #d8ab5a; margin: 0 20px"
+        @click="jumpFirstPage"
+        >首页
+      </el-button>
+      <el-pagination
+        background
+        @current-change="handleCurrentChange"
+        layout="total,prev, pager, next"
+        :total="total"
+        :page-size="pagesize"
+        :current-page="currentPage"
+        prev-text="上一页"
+        next-text="下一页"
+        :hide-on-single-page="false"
+        ref="pagination"
+      >
+      </el-pagination>
+      <el-button
+        type="primary"
+        size="small"
+        style="background-color: #d8ab5a; border-color: #d8ab5a; margin: 0 20px"
+        @click="jumpLastPage"
+        >尾页
+      </el-button>
+    </div>
+  </div>
 </template>
 
 <script>
@@ -378,34 +426,149 @@
 						}
 					});
 				}
+      },
+    // addTicketdrawer() {
+    // 	this.$router.push({
+    // 		path: "/form/addTicketdrawer",
+    // 	});
+    // },
+    todetail(id) {
+      console.log(id);
+      this.$router.push({
+        path: "/form/detail",
+        query: {
+          id: id,
+        },
+      });
+    },
+    // 批量恢复
+    recovers() {
+      let ids = Array.from(this.multipleSelection, ({ id }) => id);
+      let status = Array.from(this.multipleSelection, ({ status }) => status);
+      if (status.includes(0)) {
+        this.$message({
+          type: "error",
+          message: "不能恢复已是正常状态的账号",
+        });
+      } else if (ids == "") {
+        this.$message({
+          type: "error",
+          message: "请选择数据",
+        });
+      } else {
+        this.$request({
+          url: "/api/Drawer/manager",
+          method: "post",
+          data: {
+            ids: ids,
+            operateType: 2,
+          },
+        }).then((res) => {
+          if (res.code == 200) {
+            this.$message({
+              type: "success",
+              message: "恢复成功",
+            });
+            this.$refs.multipleTable.clearSelection();
+            this.getAllList();
+          } else {
+            this.$message({
+              type: "danger",
+              message: "恢复失败",
+            });
+            this.getAllList();
+          }
+        });
+      }
+    },
+    recover(id) {
+      this.$request({
+        url: "/api/Drawer/manager",
+        method: "post",
+        data: {
+          ids: [id],
+          operateType: 2,
+        },
+      }).then((res) => {
+        if (res.code == 200) {
+          this.$message({
+            type: "success",
+            message: "恢复成功",
+          });
+          this.getAllList();
+        } else {
+          this.$message({
+            type: "danger",
+            message: "恢复失败",
+          });
+          this.getAllList();
+        }
+      });
+    },
+    deletestatuses() {
+      let ids = Array.from(this.multipleSelection, ({ id }) => id);
+      let status = Array.from(this.multipleSelection, ({ status }) => status);
+      if (status.includes(1)) {
+        this.$message({
+          type: "error",
+          message: "不能删除已是删除状态的账号",
+        });
+      } else if (ids == "") {
+        this.$message({
+          type: "error",
+          message: "请选择数据",
+        });
+      } else {
+        this.$request({
+          url: "/api/Drawer/manager",
+          method: "post",
+          data: {
+            ids: ids,
+            operateType: 1,
+          },
+        }).then((res) => {
+          if (res.code == 200) {
+            this.$message({
+              type: "success",
+              message: "删除成功",
+            });
+            this.$refs.multipleTable.clearSelection();
+            this.getAllList();
+          } else {
+            this.$message({
+              type: "danger",
+              message: "删除失败",
+            });
+            this.getAllList();
+          }
+        });
+      }
+    },
+    deletestatus(id) {
+      this.$request({
+        url: "/api/Drawer/manager",
+        method: "post",
+        data: {
+          ids: [id],
+          operateType: 1,
+        },
+      }).then((res) => {
+        if (res.code == 200) {
+          this.$message({
+            type: "success",
+            message: "删除成功",
+          });
+          this.getAllList();
+        } else {
+          this.$message({
+            type: "danger",
+            message: "删除失败",
+          });
+          this.getAllList();
+        }
+      });
+    },
 
-			},
-			deletestatus(id) {
-				this.$request({
-					url: "/api/Drawer/manager",
-					method: "post",
-					data: {
-						ids: [id],
-						operateType: 1,
-					},
-				}).then((res) => {
-					if (res.code == 200) {
-						this.$message({
-							type: "success",
-							message: "删除成功",
-						});
-						this.getAllList();
-					} else {
-						this.$message({
-							type: "danger",
-							message: "删除失败",
-						});
-						this.getAllList();
-					}
-				});
-			},
-
-	
     // 修改信息弹窗
     modify(id) {
       this.dialogVisible1 = true;
@@ -460,7 +623,10 @@
     },
     // 新增出票人弹窗
     addTicketdrawer() {
-      if (this.form.bankAccount.length < 5 || this.form.bankAccount.length > 20) {
+      if (
+        this.form.bankAccount.length < 5 ||
+        this.form.bankAccount.length > 20
+      ) {
         this.$message({
           type: "error",
           message: "银行账号必须为5~20位!",
@@ -473,9 +639,9 @@
         }).then((res) => {
           if (res.code === 200) {
             this.$message({
-				type:'success',
-				message:'添加成功'
-			});
+              type: "success",
+              message: "添加成功",
+            });
             this.getAllList();
             this.dialogVisible2 = false;
           } else {
@@ -512,7 +678,7 @@
       this.getAllList(this.searchForm);
     },
 
-	/* 分页功能,改变当前页 */
+    /* 分页功能,改变当前页 */
     handleCurrentChange(val) {
       this.currentPage = val;
       this.getAllList(this.searchForm);
@@ -530,87 +696,75 @@
       font.handleCurrentChange(cpage);
     },
 
-	getRowKey(row) {
-				return row.id;
-			},
-			/* 批量导出数据 */
-	handleSelectionChange(data) {
-				this.multipleSelection = data;
-			},
-	handleAll(data) {
-				this.multipleSelection = data;
-			},
-
+    getRowKey(row) {
+      return row.id;
+    },
+    /* 批量导出数据 */
+    handleSelectionChange(data) {
+      this.multipleSelection = data;
+    },
+    handleAll(data) {
+      this.multipleSelection = data;
+    },
 
-			/* 批量导出 */
-	batchExports() {
-				if (this.multipleSelection == "") {
-					this.Exports();
-				} else {
-					var tableHeader = [
-						["序号", "出票人名称", "账号", "开户行名称", "状态", "时间"],
-					];
-					var dataList = [];
-					this.multipleSelection.forEach((item, index) => {
-						dataList.push([
-							index + 1,
-							item.name,
-							item.bankAccount,
-							item.bankName,
-							item.statusText,
-							item.createdAt,
-						]);
-					});
-					dataConversionUtil.dataToExcel("出票人列表", tableHeader, dataList);
-					this.$message.success("导出成功!");
-				}
-			},
-			/* 全部导出承兑人列表数据 */
-	getContacts() {
-				const data = {
-					pageIndex: "",
-					pageSize: -1,
-					startTime: "",
-					endTime: "",
-					name: "",
-					status: "",
-				};
-				getDrawerSearch({
-					...data
-				}).then((res) => {
-					const {
-						result
-					} = res.data;
-					this.multipleSelection = result;
-				});
-			},
+    /* 批量导出 */
+    batchExports() {
+      if (this.multipleSelection == "") {
+        this.Exports();
+      } else {
+        var tableHeader = [
+          ["序号", "出票人名称", "账号", "开户行名称", "状态", "时间"],
+        ];
+        var dataList = [];
+        this.multipleSelection.forEach((item, index) => {
+          dataList.push([
+            index + 1,
+            item.name,
+            item.bankAccount,
+            item.bankName,
+            item.statusText,
+            item.createdAt,
+          ]);
+        });
+        dataConversionUtil.dataToExcel("出票人列表", tableHeader, dataList);
+        this.$message.success("导出成功!");
+      }
+    },
 
-			/* 全部导出 */
-	Exports() {
-				this.getContacts();
-				setTimeout(() => {
-					var tableHeader = [
-						["序号", "出票人名称", "账号", "开户行名称", "状态", "时间"],
-					];
-					var dataList = [];
-					this.multipleSelection.forEach((item, index) => {
-						dataList.push([
-							index + 1,
-							item.name,
-							item.bankAccount,
-							item.bankName,
-							item.statusText,
-							item.createdAt,
-						]);
-					});
-					dataConversionUtil.dataToExcel("出票人列表", tableHeader, dataList);
-					this.$message.success("导出成功!");
-				}, 1000);
-			},
-		}
-	
-    
-  
+    /* 全部导出 */
+    Exports() {
+      const data = {
+        pageIndex: "",
+        pageSize: -1,
+        startTime: "",
+        endTime: "",
+        name: "",
+        status: "",
+      };
+      getDrawerSearch({
+        ...data,
+      }).then((res) => {
+        const { result } = res.data;
+        this.multipleSelection = result;
+        var tableHeader = [
+          ["序号", "出票人名称", "账号", "开户行名称", "状态", "时间"],
+        ];
+        var dataList = [];
+        this.multipleSelection.forEach((item, index) => {
+          dataList.push([
+            index + 1,
+            item.name,
+            item.bankAccount,
+            item.bankName,
+            item.statusText,
+            item.createdAt,
+          ]);
+        });
+        dataConversionUtil.dataToExcel("出票人列表", tableHeader, dataList);
+        this.$message.success("导出成功!");
+      });
+    },
+  },
 };
 </script>
 

+ 362 - 327
src/views/management/index.vue

xqd xqd xqd xqd xqd
@@ -1,5 +1,4 @@
 <template>
-
   <div class="app-container">
     <el-row type="flex" justify="space-between" style="margin-bottom: 20px">
       <div class="grid-content bg-purple">
@@ -13,7 +12,7 @@
           <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">
@@ -62,30 +61,28 @@
       </div>
     </el-row>
     <el-table
-    :row-key="getRowKey"
+      :row-key="getRowKey"
       v-loading="listLoading"
       :data="temporaryList"
       element-loading-text="Loading"
       border
       fit
-	  ref="multipleTable"
+      ref="multipleTable"
       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"
+        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="mobile" />
       <el-table-column
         label="审核状态"
         align="center"
@@ -97,47 +94,95 @@
         prop="statusText"
       />
 
-			<el-table-column label="时间" width="180" align="center" prop="createdAt" />
-			<el-table-column align="center" prop="created_at" label="操作" width="300">
-				<template slot-scope="scope">
-					<el-tag type="success" style="cursor: pointer; margin: 0 5px" @click="Srecover(scope.row.id)"
-						v-if="scope.row.status == 1">恢复</el-tag>
-					<el-tag type="danger" style="cursor: pointer; margin: 0 5px" @click="Sdeleted(scope.row.id)"
-						v-if="scope.row.status == 0">删除</el-tag>
-					<el-tag type="primary" v-permission="['admin']" style="cursor: pointer; margin: 0 5px"
-						@click="reset(scope.row.id)">重置密码
-					</el-tag>
-				</template>
-			</el-table-column>
-		</el-table>
-		<!-- 重置密码弹窗 -->
-		<el-dialog title="重置密码" :visible.sync="dialogVisible" width="30%">
-			<el-form ref="form" :model="password" label-width="80px">
-				<el-form-item label="登录密码" prop="password.newpassword">
-					<el-input v-model="password.newpassword" style="width: 300px" show-password></el-input>
-				</el-form-item>
-				<el-form-item label="确认密码" prop="password.ConfirmnewPassword">
-					<el-input v-model="password.ConfirmnewPassword" style="width: 300px" show-password></el-input>
-				</el-form-item>
-				<el-form-item>
-					<el-button @click="dialogVisible = false">取 消</el-button>
-					<el-button type="primary" @click="onSubmit">提交修改</el-button>
-				</el-form-item>
-			</el-form>
-		</el-dialog>
+      <el-table-column
+        label="时间"
+        width="180"
+        align="center"
+        prop="createdAt"
+      />
+      <el-table-column
+        align="center"
+        prop="created_at"
+        label="操作"
+        width="300"
+      >
+        <template slot-scope="scope">
+          <el-tag
+            type="success"
+            style="cursor: pointer; margin: 0 5px"
+            @click="Srecover(scope.row.id)"
+            v-if="scope.row.status == 1"
+            >恢复</el-tag
+          >
+          <el-tag
+            type="danger"
+            style="cursor: pointer; margin: 0 5px"
+            @click="Sdeleted(scope.row.id)"
+            v-if="scope.row.status == 0"
+            >删除</el-tag
+          >
+          <el-tag
+            type="primary"
+            v-permission="['admin']"
+            style="cursor: pointer; margin: 0 5px"
+            @click="reset(scope.row.id)"
+            >重置密码
+          </el-tag>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 重置密码弹窗 -->
+    <el-dialog title="重置密码" :visible.sync="dialogVisible" width="30%">
+      <el-form ref="form" :model="password" label-width="80px">
+        <el-form-item label="登录密码" prop="password.newpassword">
+          <el-input
+            v-model="password.newpassword"
+            style="width: 300px"
+            show-password
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="确认密码" prop="password.ConfirmnewPassword">
+          <el-input
+            v-model="password.ConfirmnewPassword"
+            style="width: 300px"
+            show-password
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="dialogVisible = false">取 消</el-button>
+          <el-button type="primary" @click="onSubmit">提交修改</el-button>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
 
-		<div class="pagesip">
-			<el-button type="primary" size="small"
-				style="background-color: #d8ab5a; border-color: #d8ab5a; margin: 0 20px" @click="jumpFirstPage">首页
-			</el-button>
-			<el-pagination ref="pagination" background layout="total,prev, pager, next" :total="total"
-				:page-size="pagesize" :current-page="currentPage" prev-text="上一页" next-text="下一页"
-				@current-change="handleCurrentChange" />
-			<el-button type="primary" size="small"
-				style="background-color: #d8ab5a; border-color: #d8ab5a; margin: 0 20px" @click="jumpLastPage">尾页
-			</el-button>
-		</div>
-	</div>
+    <div class="pagesip">
+      <el-button
+        type="primary"
+        size="small"
+        style="background-color: #d8ab5a; border-color: #d8ab5a; margin: 0 20px"
+        @click="jumpFirstPage"
+        >首页
+      </el-button>
+      <el-pagination
+        ref="pagination"
+        background
+        layout="total,prev, pager, next"
+        :total="total"
+        :page-size="pagesize"
+        :current-page="currentPage"
+        prev-text="上一页"
+        next-text="下一页"
+        @current-change="handleCurrentChange"
+      />
+      <el-button
+        type="primary"
+        size="small"
+        style="background-color: #d8ab5a; border-color: #d8ab5a; margin: 0 20px"
+        @click="jumpLastPage"
+        >尾页
+      </el-button>
+    </div>
+  </div>
 </template>
 
 <script>
@@ -428,290 +473,280 @@
 						}
 					});
 				}
+      },
+    Srecover(id) {
+      this.$request({
+        url: "/api/Account/manager",
+        method: "post",
+        data: {
+          ids: [id],
+          operateType: 2,
+        },
+      }).then((res) => {
+        if (res.code == 200) {
+          this.$message({
+            type: "success",
+            message: "恢复成功",
+          });
+          this.getAllList();
+        } else {
+          this.$message({
+            type: "error",
+            message: "恢复失败",
+          });
+          this.getAllList();
+        }
+      });
+    },
+    Sdeleted(id) {
+      this.$request({
+        url: "/api/Account/manager",
+        method: "post",
+        data: {
+          ids: [id],
+          operateType: 1,
+        },
+      }).then((res) => {
+        if (res.code == 200) {
+          this.$message({
+            type: "success",
+            message: "删除成功",
+          });
+          this.getAllList();
+        } else {
+          this.$message({
+            type: "error",
+            message: "删除失败",
+          });
+          this.getAllList();
+        }
+      });
+    },
 
-			},
-			Srecover(id) {
-				this.$request({
-					url: "/api/Account/manager",
-					method: "post",
-					data: {
-						ids: [id],
-						operateType: 2,
-					},
-				}).then((res) => {
-					if (res.code == 200) {
-						this.$message({
-							type: "success",
-							message: "恢复成功",
-						});
-						this.getAllList();
-					} else {
-						this.$message({
-							type: "error",
-							message: "恢复失败",
-						});
-						this.getAllList();
-					}
-				});
-			},
-			Sdeleted(id) {
-				this.$request({
-					url: "/api/Account/manager",
-					method: "post",
-					data: {
-						ids: [id],
-						operateType: 1,
-					},
-				}).then((res) => {
-					if (res.code == 200) {
-						this.$message({
-							type: "success",
-							message: "删除成功",
-						});
-						this.getAllList();
-					} else {
-						this.$message({
-							type: "error",
-							message: "删除失败",
-						});
-						this.getAllList();
-					}
-				});
-			},
+    /* 输入出票人名称查询 */
+    Search() {
+      this.currentPage = 1;
+      this.searchForm = {
+        ...this.formData,
+      };
+      this.getAllList(this.searchForm);
+    },
+    /* 业务员状态筛选 */
+    handleCommand(command) {
+      this.status = command;
+      if (command === "全部") {
+        this.formData.isDeleted = "";
+      }
+      if (command === "正常") {
+        this.formData.isDeleted = 0;
+      }
+      if (command === "删除") {
+        this.formData.isDeleted = 1;
+      }
+      this.currentPage = 1;
+      this.searchForm = {
+        ...this.formData,
+      };
+      this.getAllList(this.searchForm);
+    },
 
-			/* 输入出票人名称查询 */
-			Search() {
-				this.currentPage = 1;
-				this.searchForm = {
-					...this.formData,
-				};
-				this.getAllList(this.searchForm);
-			},
-			/* 业务员状态筛选 */
-			handleCommand(command) {
-				this.status = command;
-				if (command === "全部") {
-					this.formData.isDeleted = "";
-				}
-				if (command === "正常") {
-					this.formData.isDeleted = 0;
-				}
-				if (command === "删除") {
-					this.formData.isDeleted = 1;
-				}
-				this.currentPage = 1;
-				this.searchForm = {
-					...this.formData,
-				};
-				this.getAllList(this.searchForm);
-			},
+    /* 审核状态筛选 */
+    handlehpCommand(command) {
+      this.Auditstatus = command;
+      if (command === "全部") {
+        this.formData.status = "";
+      }
+      if (command === "待审核") {
+        this.formData.status = 1;
+      }
+      if (command === "通过") {
+        this.formData.status = 2;
+      }
+      if (command === "未通过") {
+        this.formData.status = 3;
+      }
+      this.currentPage = 1;
+      this.searchForm = {
+        ...this.formData,
+      };
+      this.getAllList(this.searchForm);
+    },
 
-			/* 审核状态筛选 */
-			handlehpCommand(command) {
-				this.Auditstatus = command;
-				if (command === "全部") {
-					this.formData.status = "";
-				}
-				if (command === "待审核") {
-					this.formData.status = 1;
-				}
-				if (command === "通过") {
-					this.formData.status = 2;
-				}
-				if (command === "未通过") {
-					this.formData.status = 3;
-				}
-				this.currentPage = 1;
-				this.searchForm = {
-					...this.formData,
-				};
-				this.getAllList(this.searchForm);
-			},
+    /* 分页功能,改变当前页 */
+    handleCurrentChange(val) {
+      this.currentPage = val;
+      this.getAllList(this.searchForm);
+    },
 
-			/* 分页功能,改变当前页 */
-			handleCurrentChange(val) {
-				this.currentPage = val;
-				this.getAllList(this.searchForm);
-			},
+    /* 分页功能去首页 */
+    jumpFirstPage() {
+      this.$refs.pagination.handleCurrentChange(1);
+      this.$emit("handleCurrentChange", 1);
+    },
+    /* 分页功能:去尾页 */
+    jumpLastPage() {
+      let font = this.$refs.pagination;
+      let cpage = Math.ceil(font.total / font.pageSize);
+      font.handleCurrentChange(cpage);
+    },
 
-			/* 分页功能去首页 */
-			jumpFirstPage() {
-				this.$refs.pagination.handleCurrentChange(1);
-				this.$emit("handleCurrentChange", 1);
-			},
-			/* 分页功能:去尾页 */
-			jumpLastPage() {
-				let font = this.$refs.pagination;
-				let cpage = Math.ceil(font.total / font.pageSize);
-				font.handleCurrentChange(cpage);
-			},
+    getRowKey(row) {
+      return row.id;
+    },
+    /* 批量导出数据 */
+    handleSelectionChange(data) {
+      this.multipleSelection = data;
+      console.log(this.multipleSelection);
+    },
+    handleAll(data) {
+      this.multipleSelection = data;
+    },
 
-			getRowKey(row) {
-				return row.id;
-			},
-			/* 批量导出数据 */
-			handleSelectionChange(data) {
-				this.multipleSelection = data;
-				console.log(this.multipleSelection)
-			},
-			handleAll(data) {
-				this.multipleSelection = data;
-			},
+    /* 批量导出 */
+    batchExports() {
+      if (this.multipleSelection == "") {
+        this.Exports();
+      } else {
+        var tableHeader = [
+          [
+            "序号",
+            "业务管理员姓名",
+            "账号",
+            "联系电话",
+            "业务管理员状态",
+            "审核状态",
+            "时间",
+          ],
+        ];
+        var dataList = [];
+        this.multipleSelection.forEach((item, index) => {
+          dataList.push([
+            index + 1,
+            item.realName,
+            item.account,
+            item.mobile,
+            item.statusText,
+            item.approveStatusText,
+            item.createdAt,
+          ]);
+        });
+        dataConversionUtil.dataToExcel("业务管理员列表", tableHeader, dataList);
+        this.$message.success("导出成功!");
+      }
+    },
+    /* 全部导出 */
+    Exports() {
+      const data = {
+        pageIndex: "",
+        pageSize: -1,
+        startTime: "",
+        endTime: "",
+        isDeleted: "",
+        status: "",
+      };
+      getAccountSearch({
+        ...data,
+      }).then((res) => {
+        const { result } = res.data;
+        this.multipleSelection = result;
+        var tableHeader = [
+          [
+            "序号",
+            "业务管理员姓名",
+            "账号",
+            "联系电话",
+            "业务管理员状态",
+            "审核状态",
+            "时间",
+          ],
+        ];
+        var dataList = [];
+        this.multipleSelection.forEach((item, index) => {
+          dataList.push([
+            index + 1,
+            item.realName,
+            item.account,
+            item.mobile,
+            item.statusText,
+            item.approveStatusText,
+            item.createdAt,
+          ]);
+        });
+        dataConversionUtil.dataToExcel("业务管理员列表", tableHeader, dataList);
+        this.$message.success("导出成功!");
+      });
+    },
 
-			/* 批量导出 */
-			batchExports() {
-				if (this.multipleSelection == "") {
-					this.Exports()
-				} else {
-					var tableHeader = [
-						[
-							"序号",
-							"业务管理员姓名",
-							"账号",
-							"联系电话",
-							"业务管理员状态",
-							"审核状态",
-							"时间",
-						],
-					];
-					var dataList = [];
-					this.multipleSelection.forEach((item, index) => {
-						dataList.push([
-							index + 1,
-							item.realName,
-							item.account,
-							item.mobile,
-							item.statusText,
-							item.approveStatusText,
-							item.createdAt,
-						]);
-					});
-					dataConversionUtil.dataToExcel("业务管理员列表", tableHeader, dataList);
-					this.$message.success("导出成功!");
-				}
-			},
-			/* 全部导出合同列表数据 */
-			getContacts() {
-				const data = {
-					pageIndex: "",
-					pageSize: -1,
-					startTime: "",
-					endTime: "",
-					isDeleted: "",
-					status: "",
-				};
-				getAccountSearch({
-					...data
-				}).then((res) => {
-					const {
-						result
-					} = res.data;
-					this.multipleSelection = result;
-				});
-			},
-
-			/* 全部导出 */
-			Exports() {
-				this.getContacts();
-				setTimeout(() => {
-					var tableHeader = [
-						[
-							"序号",
-							"业务管理员姓名",
-							"账号",
-							"联系电话",
-							"业务管理员状态",
-							"审核状态",
-							"时间",
-						],
-					];
-					var dataList = [];
-					this.multipleSelection.forEach((item, index) => {
-						dataList.push([
-							index + 1,
-							item.realName,
-							item.account,
-							item.mobile,
-							item.statusText,
-							item.approveStatusText,
-							item.createdAt,
-						]);
-					});
-					dataConversionUtil.dataToExcel("业务管理员列表", tableHeader, dataList);
-					this.$message.success("导出成功!");
-				}, 1000);
-			},
-
-			// 重置业务员密码
-			reset(id) {
-				this.dialogVisible = true;
-				this.password.userId = id;
-			},
-			// 提交修改密码
-			onSubmit() {
-				if (this.password.newpassword !== this.password.ConfirmnewPassword) {
-					this.$message({
-						type: "error",
-						message: "密码与确认密码不一致",
-					});
-				} else if (
-					this.password.newpassword.length < 6 ||
-					this.password.ConfirmnewPassword < 6
-				) {
-					this.$message({
-						type: "error",
-						message: "密码与确认密码至少6位",
-					});
-				} else {
-					this.$request({
-						url: "/api/Account/password/resetUser",
-						method: "post",
-						data: {
-							password: this.password.newpassword,
-							userId: this.password.userId,
-						},
-					}).then((res) => {
-						console.log(res);
-						if (res.code === 200) {
-							this.$message({
-								type: "success",
-								message: "重置成功",
-							});
-							this.dialogVisible = false;
-						}
-					});
-				}
-			},
-		},
-	};
+    // 重置业务员密码
+    reset(id) {
+      this.dialogVisible = true;
+      this.password.userId = id;
+    },
+    // 提交修改密码
+    onSubmit() {
+      if (this.password.newpassword !== this.password.ConfirmnewPassword) {
+        this.$message({
+          type: "error",
+          message: "密码与确认密码不一致",
+        });
+      } else if (
+        this.password.newpassword.length < 6 ||
+        this.password.ConfirmnewPassword < 6
+      ) {
+        this.$message({
+          type: "error",
+          message: "密码与确认密码至少6位",
+        });
+      } else {
+        this.$request({
+          url: "/api/Account/password/resetUser",
+          method: "post",
+          data: {
+            password: this.password.newpassword,
+            userId: this.password.userId,
+          },
+        }).then((res) => {
+          console.log(res);
+          if (res.code === 200) {
+            this.$message({
+              type: "success",
+              message: "重置成功",
+            });
+            this.dialogVisible = false;
+          }
+        });
+      }
+    },
+  },
+};
 </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>

+ 14 - 10
src/views/shipments/index.vue

xqd xqd xqd xqd
@@ -54,7 +54,13 @@
       highlight-current-row
       @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="承兑人名称" align="center" prop="acceptorName">
       </el-table-column>
@@ -295,10 +301,10 @@ export default {
 
     /* 批量导出数据 */
     handleSelectionChange(data) {
-      this.multipleSelection = data
+      this.multipleSelection = data;
     },
     handleAll(data) {
-      this.multipleSelection = data
+      this.multipleSelection = data;
     },
     /* 导出 */
     batchExport() {
@@ -344,12 +350,6 @@ export default {
       getReportSearch({ ...params }).then((res) => {
         const { data } = res;
         this.multipleSelection = data.result;
-      });
-    },
-    /* 全部导出 */
-    Exports() {
-      this.getContacts(this.formData.frequency);
-      setTimeout(() => {
         var tableHeader = [
           [
             "序号",
@@ -375,7 +375,11 @@ export default {
         });
         dataConversionUtil.dataToExcel("承兑人分类报表", tableHeader, dataList);
         this.$message.success("导出成功!");
-      }, 1000);
+      });
+    },
+    /* 全部导出 */
+    Exports() {
+      this.getContacts(this.formData.frequency);
     },
   },
 };

+ 8 - 11
src/views/shipments/shipments1.vue

xqd xqd xqd xqd
@@ -180,8 +180,7 @@ export default {
       },
       value1: "",
       value2: "",
-      exportExcelData1: [], //导出列表缓存数据整页
-      exportExcelData2: [], //导出列表缓存数据单选
+      multipleSelection: [],
     };
   },
   created() {},
@@ -297,10 +296,10 @@ export default {
     },
     /* 批量导出数据 */
     handleSelectionChange(data) {
-      this.multipleSelection = data
+      this.multipleSelection = data;
     },
     handleAll(data) {
-      this.multipleSelection = data
+      this.multipleSelection = data;
     },
     /* 批量导出数据 */
     batchExport() {
@@ -347,12 +346,6 @@ export default {
       getReportDrawerClassification({ ...params }).then((res) => {
         const { data } = res;
         this.multipleSelection = data.result;
-      });
-    },
-    /* 全部导出 */
-    Exports() {
-      this.getContacts(this.formData.frequency);
-      setTimeout(() => {
         var tableHeader = [
           [
             "序号",
@@ -378,7 +371,11 @@ export default {
         });
         dataConversionUtil.dataToExcel("出票人分类报表", tableHeader, dataList);
         this.$message.success("导出成功!");
-      }, 1000);
+      });
+    },
+    /* 全部导出 */
+    Exports() {
+      this.getContacts(this.formData.frequency);
     },
   },
 };

+ 4 - 11
src/views/shipments/shipments2.vue

xqd xqd xqd xqd
@@ -178,8 +178,7 @@ export default {
       },
       value1: "",
       value2: "",
-      exportExcelData1: [], //导出列表缓存数据整页
-      exportExcelData2: [], //导出列表缓存数据单选
+      multipleSelection: [],
     };
   },
 
@@ -327,8 +326,8 @@ export default {
         this.$message.success("导出成功!");
       }
     },
-    /* 全部导出承兑人列表数据 */
-    getContacts() {
+    /* 全部导出 */
+    Exports() {
       const params = {
         pageIndex: "",
         pageSize: "",
@@ -339,12 +338,6 @@ export default {
       getReportContractReport({ ...params }).then((res) => {
         const { data } = res;
         this.multipleSelection = data.result;
-      });
-    },
-    /* 全部导出 */
-    Exports() {
-      this.getContacts();
-      setTimeout(() => {
         var tableHeader = [
           [
             "序号",
@@ -372,7 +365,7 @@ export default {
         });
         dataConversionUtil.dataToExcel("合同统计列表", tableHeader, dataList);
         this.$message.success("导出成功!");
-      }, 1000);
+      });
     },
   },
 };

+ 16 - 17
src/views/shipments/shipments3.vue

xqd xqd xqd xqd xqd xqd xqd
@@ -44,7 +44,7 @@
       </div>
     </el-row>
     <el-table
-    :row-key="getRowKey"
+      :row-key="getRowKey"
       v-loading="listLoading"
       :data="srcList"
       element-loading-text="Loading"
@@ -54,7 +54,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="供应商名称" align="center" prop="supplierName">
       </el-table-column>
@@ -173,8 +179,7 @@ export default {
         ],
       },
       value2: "",
-      exportExcelData1: [], //导出列表缓存数据整页
-      exportExcelData2: [], //导出列表缓存数据单选
+      multipleSelection: [],
     };
   },
 
@@ -277,20 +282,20 @@ export default {
       font.handleCurrentChange(cpage);
     },
 
-     getRowKey(row) {
+    getRowKey(row) {
       return row.id;
     },
     /* 批量导出数据 */
     handleSelectionChange(data) {
-      this.multipleSelection = data
+      this.multipleSelection = data;
     },
     handleAll(data) {
-      this.multipleSelection = data
+      this.multipleSelection = data;
     },
     /* 导出 */
     batchExport() {
       if (this.multipleSelection == "") {
-        this.Exports()
+        this.Exports();
       } else {
         var tableHeader = [
           [
@@ -321,8 +326,8 @@ export default {
         this.$message.success("导出成功!");
       }
     },
-    /* 全部导出承兑人列表数据 */
-    getContacts() {
+    /* 全部导出 */
+    Exports() {
       const params = {
         pageIndex: "",
         pageSize: -1,
@@ -332,12 +337,6 @@ export default {
       getReportSupplierReport({ ...params }).then((res) => {
         const { data } = res;
         this.multipleSelection = data.result;
-      });
-    },
-    /* 全部导出 */
-    Exports() {
-      this.getContacts();
-      setTimeout(() => {
         var tableHeader = [
           [
             "序号",
@@ -365,7 +364,7 @@ export default {
         });
         dataConversionUtil.dataToExcel("供应商统计列表", tableHeader, dataList);
         this.$message.success("导出成功!");
-      }, 1000);
+      });
     },
   },
 };

+ 3 - 9
src/views/sucuirtyaudit/annexList.vue

xqd xqd xqd
@@ -495,8 +495,8 @@ export default {
         this.$message.success("导出成功!");
       }
     },
-    /* 全部导出承兑人列表数据 */
-    getContacts() {
+    /* 全部导出 */
+    Exports() {
       const data = {
         pageIndex: "",
         pageSize: -1,
@@ -508,12 +508,6 @@ export default {
       getAuditLogAttachmentsSearch({ ...data }).then((res) => {
         const { result } = res.data;
         this.multipleSelection = result;
-      });
-    },
-    /* 全部导出 */
-    Exports() {
-      this.getContacts();
-      setTimeout(() => {
         var tableHeader = [
           [
             "序号",
@@ -539,7 +533,7 @@ export default {
         });
         dataConversionUtil.dataToExcel("附件列表", tableHeader, dataList);
         this.$message.success("导出成功!");
-      }, 1000);
+      });
     },
   },
 };

+ 18 - 18
src/views/sucuirtyaudit/index.vue

xqd xqd xqd xqd xqd xqd xqd
@@ -53,7 +53,7 @@
       </div>
     </el-row>
     <el-table
-    :row-key="getRowKey"
+      :row-key="getRowKey"
       v-loading="listLoading"
       :data="temporaryList"
       element-loading-text="Loading"
@@ -63,7 +63,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
         align="center"
@@ -217,8 +223,7 @@ export default {
       },
       value1: "",
       value2: "",
-      exportExcelData1: [], //导出列表缓存数据整页
-      exportExcelData2: [], //导出列表缓存数据单选
+      multipleSelection: [],
     };
   },
   mounted() {
@@ -306,14 +311,14 @@ 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 = [
           ["序号", "操作日", "事件", "操作人员", "操作状态", "操作说明"],
@@ -329,12 +334,13 @@ export default {
             item.remark,
           ]);
         });
-        dataConversionUtil.dataToExcel("安全审计列表", tableHeader, dataList);
+        dataConversionUtil.dataToExcel("操作日志列表", tableHeader, dataList);
         this.$message.success("导出成功!");
       }
     },
-    /* 全部导出合同列表数据 */
-    getContacts() {
+
+    /* 全部导出 */
+    Exports() {
       const data = {
         pageIndex: "",
         pageSize: -1,
@@ -346,13 +352,7 @@ export default {
       getAuditLogSearch({ ...data }).then((res) => {
         const { result } = res.data;
         this.multipleSelection = result;
-      });
-    },
 
-    /* 全部导出 */
-    Exports() {
-      this.getContacts();
-      setTimeout(() => {
         var tableHeader = [
           ["序号", "操作日", "事件", "操作人员", "操作状态", "操作说明"],
         ];
@@ -367,9 +367,9 @@ export default {
             item.remark,
           ]);
         });
-        dataConversionUtil.dataToExcel("安全审计列表", tableHeader, dataList);
+        dataConversionUtil.dataToExcel("操作日志列表", tableHeader, dataList);
         this.$message.success("导出成功!");
-      }, 1000);
+      });
     },
   },
 };

+ 83 - 77
src/views/table/index.vue

xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -34,8 +34,8 @@
         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="success" @click="recovers">恢复</el-button>
+        <el-button type="danger" @click="deleteStatuses">删除</el-button>
         <el-button type="primary" @click="dialogVisible2 = true"
           >新增承兑人</el-button
         >
@@ -165,12 +165,18 @@
       element-loading-text="Loading"
       border
       fit
-	  ref="multipleTable"
+      ref="multipleTable"
       highlight-current-row
       @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="承兑人名称" align="center" prop="name">
       </el-table-column>
@@ -377,33 +383,35 @@ export default {
     },
 
     addAcceptor() {
-		if(this.form.bankAccount.length<5||this.form.bankAccount.length>20){
-			this.$message({
-			  type: "error",
-			  message: "银行账号必须为5~20位!",
-			});
-		}else{
-			this.$request({
-			  url: "/api/Acceptor",
-			  method: "post",
-			  data: this.form,
-			}).then((res) => {
-			  if (res.code === 200) {
-			    this.$message({
-			      type: "success",
-			      message: "添加成功",
-			    });
-			    this.getAllList();
-			    this.dialogVisible2 = false;
-			  } else {
-			    this.$message({
-			      type: "error",
-			      message: res.msg,
-			    });
-			  }
-			});
-		}
-     
+      if (
+        this.form.bankAccount.length < 5 ||
+        this.form.bankAccount.length > 20
+      ) {
+        this.$message({
+          type: "error",
+          message: "银行账号必须为5~20位!",
+        });
+      } else {
+        this.$request({
+          url: "/api/Acceptor",
+          method: "post",
+          data: this.form,
+        }).then((res) => {
+          if (res.code === 200) {
+            this.$message({
+              type: "success",
+              message: "添加成功",
+            });
+            this.getAllList();
+            this.dialogVisible2 = false;
+          } else {
+            this.$message({
+              type: "error",
+              message: res.msg,
+            });
+          }
+        });
+      }
     },
     toDetail(id) {
       this.$router.push({
@@ -455,6 +463,7 @@ export default {
 		}
 		
 	},
+
     recover(id) {
       this.$request({
         url: "/api/Acceptor/manager",
@@ -562,39 +571,42 @@ export default {
     },
     // 弹窗修改
     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.length>20){
-			this.$message({
-			  type:'error',
-			  message:'银行账号必须为5~20位!'
-			})
-		}else{
-		  this.$request({
-		    url: "/api/Acceptor/update",
-		    method: "post",
-		    data: this.tableData,
-		  }).then((res) => {
-		    if (res.code == 200) {
-		      this.$message({
-		        type: "success",
-		        message: "修改成功!",
-		      });
-		      this.getAllList();
-		    } else {
-		      this.$message({
-		        type: "danger",
-		        message: "修改失败!",
-		      });
-		    }
-		  });
-		  this.dialogVisible1 = false;
-	  }
-
+      if (
+        JSON.stringify(this.oldTableData) === JSON.stringify(this.tableData)
+      ) {
+        this.$message({
+          type: "error",
+          message: "数据没有改变!",
+        });
+      } else if (
+        this.tableData.bankAccount.length < 5 ||
+        this.tableData.bankAccount.length > 20
+      ) {
+        this.$message({
+          type: "error",
+          message: "银行账号必须为5~20位!",
+        });
+      } else {
+        this.$request({
+          url: "/api/Acceptor/update",
+          method: "post",
+          data: this.tableData,
+        }).then((res) => {
+          if (res.code == 200) {
+            this.$message({
+              type: "success",
+              message: "修改成功!",
+            });
+            this.getAllList();
+          } else {
+            this.$message({
+              type: "danger",
+              message: "修改失败!",
+            });
+          }
+        });
+        this.dialogVisible1 = false;
+      }
     },
 
     /* 输入承兑人状态查询 */
@@ -649,11 +661,11 @@ export default {
 
     /* 批量导出数据 */
     handleSelectionChange(data) {
-      this.multipleSelection = data
-			console.log(this.multipleSelection)
+      this.multipleSelection = data;
+      console.log(this.multipleSelection);
     },
     handleAll(data) {
-      this.multipleSelection = data
+      this.multipleSelection = data;
     },
     /* 导出 */
     batchExports() {
@@ -691,8 +703,9 @@ export default {
         this.$message.success("导出成功!");
       }
     },
-    /* 全部导出承兑人列表数据 */
-    getContacts() {
+ 
+    /* 全部导出 */
+    Exports() {
       const data = {
         pageIndex: "",
         pageSize: -1,
@@ -707,13 +720,6 @@ export default {
       getAcceptorSearch({ ...data }).then((res) => {
         const { result } = res.data;
         this.multipleSelection = result;
-      });
-    },
-
-    /* 全部导出 */
-    Exports() {
-      this.getContacts();
-      setTimeout(() => {
         var tableHeader = [
           [
             "序号",
@@ -743,7 +749,7 @@ export default {
         });
         dataConversionUtil.dataToExcel("承兑人列表", tableHeader, dataList);
         this.$message.success("导出成功!");
-      }, 1000);
+      });
     },
   },
 };