8.3 12:05合并

src/layout/components/Sidebar/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div :class="{'has-logo':showLogo}">
-    <div class="flex4 boxtitle">
+    <!-- <div class="flex4 boxtitle">
       <el-image :src="logo" style="width: 100px; height: 78px;" fit=" fill"></el-image>
       <span style="color: #1F242A ;">55</span>
             <span style="color: #BEBDBB;">2456165645625454151</span>
-    </div>
+    </div> -->
 
 
     <el-scrollbar wrap-class="scrollbar-wrapper">

src/views/contracts/billDetail.vue

@@ -36,10 +36,10 @@
         list[0].interest
       }}</el-descriptions-item>
       <el-descriptions-item label="承兑日期">{{
-        list[0].issueDate
+        list[0].acceptDate
       }}</el-descriptions-item>
       <el-descriptions-item label="出票日期">{{
-        list[0].acceptDate
+        list[0].issueDate
       }}</el-descriptions-item>
       <el-descriptions-item label="预计贴现日">{{
         list[0].expectDiscountDate
@@ -47,7 +47,6 @@
       <el-descriptions-item label="汇票到期日">{{
         list[0].expireDate
       }}</el-descriptions-item>
-
       <el-descriptions-item label="发票附件">
         <FileShow
         :files="list[0].picList"

src/views/contracts/detail.vue

@@ -16,9 +16,7 @@
             <span class="titlename">合同附件</span>
             <div style="display: flex">
               <div class="imgbox">
-                <FileShow
-                :files="contract.picList"
-                />
+                <FileShow :files="contract.picList" />
               </div>
             </div>
           </div>
@@ -26,9 +24,7 @@
             <span class="titlename">发票附件</span>
             <div style="display: flex">
               <div class="imgbox">
-                <FileShow
-                :files="contract.invoicePicList"
-                />
+                <FileShow :files="contract.invoicePicList" />
               </div>
             </div>
           </div>
@@ -40,9 +36,7 @@
             <span class="titlename">贸易合同</span>
             <div style="display: flex">
               <div class="imgbox">
-                <FileShow
-                :files="contract.tradePicList"
-                />
+                <FileShow :files="contract.tradePicList" />
               </div>
             </div>
           </div>
@@ -53,10 +47,10 @@
                 contract.contractStatusText
               }}</span>
             </div>
-            <span
-              class="aoiisp"
-            >审核结果：
-              <p style="color: #d8ab5a">{{ contract.statusText }}</p></span>
+            <span class="aoiisp"
+              >审核结果：
+              <p style="color: #d8ab5a">{{ contract.statusText }}</p></span
+            >
           </div>
 
           <!-- 审核反馈和审核截图框  -->
@@ -66,9 +60,10 @@
                 <span class="sah">审核反馈：</span>
                 <el-form-item label="">
                   <el-input
-                  v-permission="['salesman', 'admin']"
-                  v-model="contract.feedback"
-                  type="textarea" />
+                    v-permission="['salesman', 'admin']"
+                    v-model="contract.feedback"
+                    type="textarea"
+                  />
                   <div v-permission="['supplier']">{{ contract.feedback }}</div>
                 </el-form-item>
               </el-form>
@@ -78,38 +73,38 @@
               <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"
+                    v-permission="['salesman', 'admin']"
+                    v-model="contract.feedbackPics"
+                    accept=".jpg, .jpeg, .png, .pdf"
                   />
                   <FileShow
-                  v-permission="['supplier']"
-                  :files="contract.feedbackPics"
+                    v-permission="['supplier']"
+                    :files="contract.feedbackPics"
                   />
                 </div>
               </div>
             </el-col>
           </div>
           <div slot="" class="clearfix">
-            <el-button
+            <!-- <el-button
               type="primary"
               style="float: right; margin-left: 10px"
             >导出
-            </el-button>
+            </el-button> -->
             <el-button
-              v-if="contract.status !== 0 &&
-              contract.contractStatus === 0"
+              v-if="contract.status !== 0 && contract.contractStatus === 0"
               type="danger"
               style="float: right"
               @click="deletedContract"
-            >删除</el-button>
+              >删除</el-button
+            >
 
             <el-button
               v-if="contract.contractStatus === 1"
               type="primary"
               style="float: right"
               @click="recoverContract"
-            >恢复
+              >恢复
             </el-button>
 
             <el-button
@@ -117,14 +112,14 @@
               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>
@@ -179,33 +174,37 @@
               type="primary"
               style="cursor: pointer; margin-right: 15px"
               @click="tapDetail(scope.row.id)"
-            >查看详情</el-tag>
+              >查看详情</el-tag
+            >
             <el-tag
               v-permission="['supplier']"
               type="primary"
               style="cursor: pointer; margin-right: 15px"
               @click="tapDetail(scope.row.id)"
-            >查看详情</el-tag>
+              >查看详情</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
+            >
             <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
+            >
             <el-tag
-              v-if="contract.status != 0 &&
-              scope.row.draftStatus == 0"
+              v-if="contract.status != 0 && scope.row.draftStatus == 0"
               type="danger"
               style="margin-right: 15px; cursor: pointer"
               @click="deleted(scope.row.id)"
-            >删除</el-tag>
+              >删除</el-tag
+            >
           </template>
         </el-table-column>
       </el-table>
@@ -226,30 +225,40 @@
           >审核失败</el-button
         >
         <el-button
-        v-if="contract.status !== 0 && role === 2"
-        type="primary"
-        @click="addNewBill('')">
-          新增汇票</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
+        >
+        <el-button
+          type="primary"
+          style="float: right; margin-left: 10px"
+          @click="Exports"
+          >全部导出
+        </el-button>
         <el-button
           type="primary"
           style="float: right; margin-left: 10px"
           @click="ExportsContractDraft"
-        >导出
+          >批量导出
         </el-button>
+         
         <el-button
           type="primary"
           size="small"
@@ -257,32 +266,46 @@
             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'
-import logo from '@/assets/pdf.png'
+import { dataConversionUtil } from "../../utils/Excel.js";
+import logo from "@/assets/pdf.png";
 export default {
   data() {
     return {
       dialogVisible: false,
-      role: '',
+      role: "",
       srcList: [],
       temporaryList: [],
       list: [],
@@ -291,25 +314,25 @@ export default {
       currentPage: 1,
       multipleSelection: [],
       pagesize: 11,
-      form: '',
+      form: "",
       invoicePicList: [],
       picList: [],
       tradePicList: [],
       pdf: logo,
       /* 审核反馈和审核截图的数据 */
       feed: {
-        id: '',
-        feedback: '',
+        id: "",
+        feedback: "",
         feedbackPicList: [],
-        approveStatus: ''
-      }
-    }
+        approveStatus: "",
+      },
+    };
   },
 
   mounted() {
-    this.role = this.$store.state.user.userInfo.type
-    this.checked = this.$store.state.user.checked
-    this.getData()
+    this.role = this.$store.state.user.userInfo.type;
+    this.checked = this.$store.state.user.checked;
+    this.getData();
   },
   methods: {
     // 批量审核汇票 成功
@@ -365,92 +388,93 @@ export default {
       });
     },
     getData() {
-      const id = this.$route.query.id
+      const id = this.$route.query.id;
       this.$request({
-        url: '/api/Contract/' + id,
-        method: 'get'
+        url: "/api/Contract/" + id,
+        method: "get",
       }).then((res) => {
-        this.contract = res.data
-        this.invoicePicList = this.contract.invoicePicList
-        this.picList = this.contract.picList
-        this.list = res.data.contractDraft.result
-        this.tradePicList = this.contract.tradePicList
-        this.getPageData()
-      })
+        this.contract = res.data;
+        this.invoicePicList = this.contract.invoicePicList;
+        this.picList = this.contract.picList;
+        this.list = res.data.contractDraft.result;
+        this.tradePicList = this.contract.tradePicList;
+        this.getPageData();
+      });
     },
     isPDF(url) {
-      const fileType = ['pdf']
-      const index = url.lastIndexOf('.')
-      const type = url.substr(index + 1)
-      return fileType.indexOf(type) === -1
+      const fileType = ["pdf"];
+      const index = url.lastIndexOf(".");
+      const type = url.substr(index + 1);
+      return fileType.indexOf(type) === -1;
     },
     addNewBill(id) {
-      const cid = this.$route.query.id
+      const cid = this.$route.query.id;
       this.$router.push({
-        name: 'addnewbill',
+        name: "addnewbill",
         query: {
           cid: cid,
           id: id,
-        }
-      })
+        },
+      });
     },
     tapDetail(id) {
       this.$router.push({
-        name: 'billDetail',
+        name: "billDetail",
         query: {
-          id: id
-        }
-      })
-    },
-    handleAll(data) {
-      this.multipleSelection = data
-      console.log(this.multipleSelection)
-    },
-    handleSelectionChange(data) {
-      this.multipleSelection = data
-      console.log(this.multipleSelection)
+          id: id,
+        },
+      });
     },
+
     handleCurrentChange(val) {
-      this.currentPage = val
-      this.getPageData()
+      this.currentPage = val;
+      this.getPageData();
     },
     jumpFirstPage() {
-      this.$refs.pagination.handleCurrentChange(1)
-      this.$emit('handleCurrentChange', 1)
+      this.$refs.pagination.handleCurrentChange(1);
+      this.$emit("handleCurrentChange", 1);
     },
     jumpLastPage() {
-      const font = this.$refs.pagination
-      const cpage = Math.ceil(font.total / font.pageSize)
-      font.handleCurrentChange(cpage)
+      const font = this.$refs.pagination;
+      const cpage = Math.ceil(font.total / font.pageSize);
+      font.handleCurrentChange(cpage);
     },
     getPageData() {
-      const start = (this.currentPage - 1) * this.pagesize
-      const end = start + this.pagesize
-      this.srcList = this.list.slice(start, end)
-      this.temporaryList = this.srcList
+      const start = (this.currentPage - 1) * this.pagesize;
+      const end = start + this.pagesize;
+      this.srcList = this.list.slice(start, end);
+      this.temporaryList = this.srcList;
     },
 
-    /* 导出 */
+    /* 批量导出 */
+    handleAll(data) {
+      this.multipleSelection = data;
+    },
+    handleSelectionChange(data) {
+      this.multipleSelection = data;
+    },
+    /* 批量导出 */
     ExportsContractDraft() {
-      if (this.multipleSelection === '') {
+      console.log(this.multipleSelection);
+      if (this.multipleSelection == "") {
         this.$message({
-          type: 'warning',
-          message: '请选择数据!'
-        })
+          type: "warning",
+          message: "请选择数据!",
+        });
       } else {
         var tableHeader = [
           [
-            '序号',
-            '汇票名称',
-            '汇票编号',
-            '承兑人',
-            '金额',
-            '服务费',
-            '汇票状态',
-            '审核状态'
-          ]
-        ]
-        var dataList = []
+            "序号",
+            "汇票名称",
+            "汇票编号",
+            "承兑人",
+            "金额",
+            "服务费",
+            "汇票状态",
+            "审核状态",
+          ],
+        ];
+        var dataList = [];
         this.multipleSelection.forEach((item, index) => {
           dataList.push([
             index + 1,
@@ -460,314 +484,344 @@ export default {
             item.money,
             item.serviceMoney,
             item.draftStatusText,
-            item.statusText
-          ])
-        })
-        dataConversionUtil.dataToExcel('汇票列表', tableHeader, dataList)
-        this.$message.success('导出成功!')
+            item.statusText,
+          ]);
+        });
+        dataConversionUtil.dataToExcel("汇票列表", tableHeader, dataList);
+        this.$message.success("导出成功!");
       }
     },
+/* 全部导出 */
+    Exports() {
+      this.multipleSelection = this.temporaryList
+      setTimeout(() => {
+        var tableHeader = [
+          [
+            "序号",
+            "汇票名称",
+            "汇票编号",
+            "承兑人",
+            "金额",
+            "服务费",
+            "汇票状态",
+            "审核状态",
+          ],
+        ];
+        var dataList = [];
+        this.multipleSelection.forEach((item, index) => {
+          dataList.push([
+           index + 1,
+            item.name,
+            item.draftNo,
+            item.acceptorName,
+            item.money,
+            item.serviceMoney,
+            item.draftStatusText,
+            item.statusText,
+          ]);
+        });
+        dataConversionUtil.dataToExcel("汇票列表", tableHeader, dataList);
+        this.$message.success("导出成功!");
+      }, 1000);
+    },
 
     /* 审核成功发送请求  */
     success() {
-      this.feed.feedback = this.contract.feedback
+      this.feed.feedback = this.contract.feedback;
       /* 反馈图片赋值 */
-      this.feed.feedbackPicList = this.contract.feedbackPics
+      this.feed.feedbackPicList = this.contract.feedbackPics;
       /* 合同id赋值 */
-      this.feed.id = this.$route.query.id
+      this.feed.id = this.$route.query.id;
       /* 反馈内容赋值 */
-      this.feed.approveStatus = 1
+      this.feed.approveStatus = 1;
       this.$request({
-        url: '/api/Contract/approveContract',
-        method: 'post',
-        data: this.feed
+        url: "/api/Contract/approveContract",
+        method: "post",
+        data: this.feed,
       }).then((res) => {
         if (res.code === 200) {
           this.$message({
-            type: 'success',
-            message: res.msg
-          })
-          this.getData()
+            type: "success",
+            message: res.msg,
+          });
+          this.getData();
         } else {
           this.$message({
-            type: 'error',
-            message: '提交失败'
-          })
-          this.getData()
+            type: "error",
+            message: "提交失败",
+          });
+          this.getData();
         }
-      })
+      });
     },
 
     /* 审核失败发送请求  */
     failed() {
-      this.feed.feedback = this.contract.feedback
+      this.feed.feedback = this.contract.feedback;
       /* 反馈图片赋值 */
-      this.feed.feedbackPicList = this.contract.feedbackPics
+      this.feed.feedbackPicList = this.contract.feedbackPics;
       /* 合同id赋值 */
-      this.feed.id = this.$route.query.id
-      this.feed.approveStatus = 2
+      this.feed.id = this.$route.query.id;
+      this.feed.approveStatus = 2;
       this.$request({
-        url: '/api/Contract/approveContract',
-        method: 'post',
-        data: this.feed
+        url: "/api/Contract/approveContract",
+        method: "post",
+        data: this.feed,
       }).then((res) => {
         if (res.code === 200) {
           this.$message({
-            type: 'success',
-            message: res.msg
-          })
-          this.getData()
+            type: "success",
+            message: res.msg,
+          });
+          this.getData();
         } else {
           this.$message({
-            type: 'error',
-            message: '提交失败'
-          })
-          this.getData()
+            type: "error",
+            message: "提交失败",
+          });
+          this.getData();
         }
-      })
+      });
     },
     recoverContract() {
-      const id = this.$route.query.id
+      const id = this.$route.query.id;
       this.$request({
-        url: '/api/Contract/manage',
-        method: 'post',
+        url: "/api/Contract/manage",
+        method: "post",
         data: {
           ids: [id],
-          operateType: 2
-        }
+          operateType: 2,
+        },
       }).then((res) => {
         if (res.code === 200) {
           this.$message({
-            type: 'success',
-            message: res.msg
-          })
-          this.getData()
+            type: "success",
+            message: res.msg,
+          });
+          this.getData();
         } else {
           this.$message({
-            type: 'error',
-            message: '提交失败'
-          })
-          this.getData()
+            type: "error",
+            message: "提交失败",
+          });
+          this.getData();
         }
-      })
+      });
     },
     deletedContract() {
-      const id = this.$route.query.id
+      const id = this.$route.query.id;
       this.$request({
-        url: '/api/Contract/manage',
-        method: 'post',
+        url: "/api/Contract/manage",
+        method: "post",
         data: {
           ids: [id],
-          operateType: 1
-        }
+          operateType: 1,
+        },
       }).then((res) => {
         if (res.code === 200) {
           this.$message({
-            type: 'success',
-            message: res.msg
-          })
-          this.getData()
+            type: "success",
+            message: res.msg,
+          });
+          this.getData();
         } else {
           this.$message({
-            type: 'error',
-            message: '提交失败'
-          })
-          this.getData()
+            type: "error",
+            message: "提交失败",
+          });
+          this.getData();
         }
-      })
+      });
     },
     recoverContractDraft() {
-      const ids = Array.from(this.multipleSelection, ({ id }) => id)
+      const ids = Array.from(this.multipleSelection, ({ id }) => id);
       this.$request({
-        url: '/api/Contract/contractDraft/manager',
-        method: 'post',
+        url: "/api/Contract/contractDraft/manager",
+        method: "post",
         data: {
           ids: ids,
-          operateType: 2
-        }
+          operateType: 2,
+        },
       }).then((res) => {
         if (res.code === 200) {
           this.$message({
-            type: 'success',
-            message: res.msg
-          })
-          this.getData()
+            type: "success",
+            message: res.msg,
+          });
+          this.getData();
         } else {
           this.$message({
-            type: 'error',
-            message: '提交失败'
-          })
-          this.getData()
+            type: "error",
+            message: "提交失败",
+          });
+          this.getData();
         }
-      })
+      });
     },
     deletedContractDraft() {
-      const ids = Array.from(this.multipleSelection, ({ id }) => id)
+      const ids = Array.from(this.multipleSelection, ({ id }) => id);
       this.$request({
-        url: '/api/Contract/contractDraft/manager',
-        method: 'post',
+        url: "/api/Contract/contractDraft/manager",
+        method: "post",
         data: {
           ids: ids,
-          operateType: 1
-        }
+          operateType: 1,
+        },
       }).then((res) => {
         if (res.code === 200) {
           this.$message({
-            type: 'success',
-            message: res.msg
-          })
-          this.getData()
+            type: "success",
+            message: res.msg,
+          });
+          this.getData();
         } else {
           this.$message({
-            type: 'error',
-            message: '提交失败'
-          })
-          this.getData()
+            type: "error",
+            message: "提交失败",
+          });
+          this.getData();
         }
-      })
+      });
     },
     recover(id) {
       this.$request({
-        url: '/api/Contract/contractDraft/manager',
-        method: 'post',
+        url: "/api/Contract/contractDraft/manager",
+        method: "post",
         data: {
           ids: [id],
-          operateType: 2
-        }
+          operateType: 2,
+        },
       }).then((res) => {
         if (res.code === 200) {
           this.$message({
-            type: 'success',
-            message: res.msg
-          })
-          this.getData()
+            type: "success",
+            message: res.msg,
+          });
+          this.getData();
         } else {
           this.$message({
-            type: 'error',
-            message: '提交失败'
-          })
-          this.getData()
+            type: "error",
+            message: "提交失败",
+          });
+          this.getData();
         }
-      })
+      });
     },
     deleted(id) {
       this.$request({
-        url: '/api/Contract/contractDraft/manager',
-        method: 'post',
+        url: "/api/Contract/contractDraft/manager",
+        method: "post",
         data: {
           ids: [id],
-          operateType: 1
-        }
+          operateType: 1,
+        },
       }).then((res) => {
         if (res.code === 200) {
           this.$message({
-            type: 'success',
-            message: res.msg
-          })
-          this.getData()
+            type: "success",
+            message: res.msg,
+          });
+          this.getData();
         } else {
           this.$message({
-            type: 'error',
-            message: '提交失败'
-          })
-          this.getData()
+            type: "error",
+            message: "提交失败",
+          });
+          this.getData();
         }
-      })
+      });
     },
     back() {
-      this.$router.go(-1)
-    }
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.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;
   }
 }
 
-</script>
+.yusa {
+  display: flex;
+}
 
-<style lang="scss">
-	.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;
-	}
-
-	.el-tag {
-		// font-size: 18px;
-	}
-
-	.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;
-	}
+.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;
+}
 </style>

src/views/contracts/index.vue

@@ -671,7 +671,13 @@ export default {
 
     /* 批量导出合同列表 */
     batchExports() {
-      var tableHeader = [
+      if (this.multipleSelection == "") {
+        this.$message({
+          type: "warning",
+          message: "请选择数据!",
+        });
+      } else{
+        var tableHeader = [
         [
           "序号",
           "合同名称",
@@ -700,13 +706,15 @@ export default {
       });
       dataConversionUtil.dataToExcel("合同列表", tableHeader, dataList);
       this.$message.success("导出成功!");
+      }
+      
     },
 
     /* 全部导出合同列表数据 */
     getContacts() {
       const data = {
         pageIndex: '',
-        pageSize: '',
+        pageSize: -1,
         startTime: "",
         endTime: "",
         name: "",

src/views/databackup/index.vue

@@ -266,7 +266,6 @@ export default {
         this.searchForm = { ...this.formData };
         this.getAllList(this.searchForm);
       }
-      
     },
 
     /* 分页功能，改变当前页 */
@@ -287,13 +286,6 @@ export default {
       font.handleCurrentChange(cpage);
     },
 	
-
-
-
-    handleCurrentChange(val) {
-      this.currentPage = val;
-      this.getPageData();
-    },
     handleSelectionChange(data) {
       this.multipleSelection = data;
       console.log(this.multipleSelection);

src/views/delivery/edit.vue

@@ -71,7 +71,7 @@
 			</span>
 		</el-dialog>
 		<div style="display: flex;justify-content: center;">
-			<el-button type="primary" style="width: 100px; " @click="dialogVisible=true">修改信息</el-button>
+			<!-- <el-button type="primary" style="width: 100px; " @click="dialogVisible=true">修改信息</el-button> -->
 			<el-button type="primary" style="width: 100px; " @click="back">返回</el-button>
 		</div>
 	</div>

src/views/delivery/index.vue

@@ -138,7 +138,7 @@
             type="primary"
             style="cursor: pointer; margin-right: 15px"
             @click="toedit(scope.row.id)"
-            >编辑
+            >详情
           </el-tag>
           <el-tag
             type="success"
@@ -480,7 +480,7 @@ export default {
     getContacts() {
       const data = {
         pageIndex: "",
-        pageSize: "",
+        pageSize: -1,
         startTime: "",
         endTime: "",
         name: "",

src/views/form/index.vue

@@ -480,7 +480,7 @@ export default {
     getContacts() {
       const data = {
         pageIndex: "",
-        pageSize: "",
+        pageSize: -1,
         startTime: "",
         endTime: "",
         name: "",

src/views/management/index.vue

@@ -510,7 +510,7 @@ export default {
     getContacts() {
       const data = {
         pageIndex: '',
-        pageSize: '',
+        pageSize: -1,
         startTime: "",
         endTime: "",
         isDeleted:'',

src/views/sucuirtyaudit/annexList.vue

@@ -1,377 +1,511 @@
 <template>
-	<div class="app-container">
-		<el-row type="flex" justify="space-between" style="margin-bottom: 20px">
-			<div class="grid-content bg-purple">
-				<div class="grid-content bg-purple" style="margin-left: 30px">
-					<el-input placeholder="请输入合同名称" v-model="formData.content" @change="Search" style="width: 80%">
-						<i slot="prefix" class="el-input__icon el-icon-search"></i>
-					</el-input>
-				</div>
-			</div>
-			<div class="grid-content bg-purple">
-				<el-input placeholder="请输入供应商名称" v-model="formData.operateUser" @change="SearchOperateUser"
-					style="width: 100%">
-					<i slot="prefix" class="el-input__icon el-icon-search"></i>
-				</el-input>
-			</div>
+  <div class="app-container">
+    <el-row type="flex" justify="space-between" style="margin-bottom: 20px">
+      <div class="grid-content bg-purple">
+        <div class="grid-content bg-purple" style="margin-left: 30px">
+          <el-input
+            placeholder="请输入合同名称"
+            v-model="formData.content"
+            @change="Search"
+            style="width: 80%"
+          >
+            <i slot="prefix" class="el-input__icon el-icon-search"></i>
+          </el-input>
+        </div>
+      </div>
+      <div class="grid-content bg-purple">
+        <el-input
+          placeholder="请输入供应商名称"
+          v-model="formData.operateUser"
+          @change="SearchOperateUser"
+          style="width: 100%"
+        >
+          <i slot="prefix" class="el-input__icon el-icon-search"></i>
+        </el-input>
+      </div>
 
-			<div class="grid-content bg-purple">
-				<div class="block">
-					<el-date-picker v-model="value2" type="daterange" align="right" unlink-panels range-separator="至"
-						start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd"
-						:picker-options="pickerOptions" @change="startEndTime">
-					</el-date-picker>
-				</div>
-			</div>
+      <div class="grid-content bg-purple">
+        <div class="block">
+          <el-date-picker
+            v-model="value2"
+            type="daterange"
+            align="right"
+            unlink-panels
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            value-format="yyyy-MM-dd"
+            :picker-options="pickerOptions"
+            @change="startEndTime"
+          >
+          </el-date-picker>
+        </div>
+      </div>
 
-			<div class="grid-content bg-purple" style="display: flex; justify-content: flex-end">
-				<el-button type="primary" @click="toindex">操作日志</el-button>
-				<el-button type="primary" disabled>附件列表</el-button>
-				<el-button type="primary">批量下载</el-button>
-			</div>
-		</el-row>
-		<el-table v-loading="listLoading" :data="temporaryList" element-loading-text="Loading" border fit
-			highlight-current-row @select="handleSelectionChange" @select-all="handleAll">
-			<el-table-column align="center" label="" width="55" type="selection">
-			</el-table-column>
-			<el-table-column align="center" label="合同名称" width="210" prop="name">
-			</el-table-column>
+      <div
+        class="grid-content bg-purple"
+        style="display: flex; justify-content: flex-end"
+      >
+        <el-button type="primary" @click="toindex">操作日志</el-button>
+        <el-button type="primary" disabled>附件列表</el-button>
+        <el-button type="primary" @click="Exports">全部导出</el-button>
+        <el-button type="primary" @click="batchExports">批量导出</el-button>
+        <el-button type="primary">批量下载</el-button>
+      </div>
+    </el-row>
+    <el-table
+      v-loading="listLoading"
+      :data="temporaryList"
+      element-loading-text="Loading"
+      border
+      fit
+      highlight-current-row
+      @select="handleSelectionChange"
+      @select-all="handleAll"
+    >
+      <el-table-column align="center" label="" width="55" type="selection">
+      </el-table-column>
+      <el-table-column align="center" label="合同名称" width="210" prop="name">
+      </el-table-column>
 
-			<el-table-column label="供应商名称" align="center" width="120" prop="supplierName">
-			</el-table-column>
-			<el-table-column label="日期" width="120" align="center">
-				<template slot-scope="scope">
-					<i class="el-icon-time" />
-					<span>{{ scope.row.createdAt }}</span>
-				</template>
-			</el-table-column>
-			<!-- 合同附件 -->
-			<el-table-column align="center" label="合同附件" width="300" prop="picUrls">
-				<template slot-scope="scope">
-					<img width="100" height="100" v-for="item in scope.row.picUrls" :key="item.id" :src="item" />
-				</template>
-			</el-table-column>
-			<!-- 发票附件 -->
-			<el-table-column align="center" label="发票附件" width="300" prop="invoicePics">
-				<template slot-scope="scope">
-					<img width="100" height="100" v-for="item in scope.row.invoicePics" :key="item.id" :src="item" />
-				</template>
-			</el-table-column>
-			<!-- 贸易合同 -->
-			<el-table-column align="center" label="贸易合同" width="400" prop="tradePics">
-				<template slot-scope="scope">
-					<img width="100" height="100" v-for="item in scope.row.tradePics" :key="item.id" :src="item" />
-				</template>
-			</el-table-column>
+      <el-table-column
+        label="供应商名称"
+        align="center"
+        width="120"
+        prop="supplierName"
+      >
+      </el-table-column>
+      <el-table-column label="日期" width="120" align="center">
+        <template slot-scope="scope">
+          <i class="el-icon-time" />
+          <span>{{ scope.row.createdAt }}</span>
+        </template>
+      </el-table-column>
+      <!-- 合同附件 -->
+      <el-table-column
+        align="center"
+        label="合同附件"
+        width="300"
+        prop="picUrls"
+      >
+        <template slot-scope="scope">
+          <img
+            width="100"
+            height="100"
+            v-for="item in scope.row.picUrls"
+            :key="item.id"
+            :src="item"
+          />
+        </template>
+      </el-table-column>
+      <!-- 发票附件 -->
+      <el-table-column
+        align="center"
+        label="发票附件"
+        width="300"
+        prop="invoicePics"
+      >
+        <template slot-scope="scope">
+          <img
+            width="100"
+            height="100"
+            v-for="item in scope.row.invoicePics"
+            :key="item.id"
+            :src="item"
+          />
+        </template>
+      </el-table-column>
+      <!-- 贸易合同 -->
+      <el-table-column
+        align="center"
+        label="贸易合同"
+        width="400"
+        prop="tradePics"
+      >
+        <template slot-scope="scope">
+          <img
+            width="100"
+            height="100"
+            v-for="item in scope.row.tradePics"
+            :key="item.id"
+            :src="item"
+          />
+        </template>
+      </el-table-column>
 
-			<el-table-column align="center" prop="created_at" label="操作" width="250">
-				<template slot-scope="scope">
-					<el-tag type="primary" style="cursor: pointer; margin-right: 15px" @click="todetail(scope.row.id)">汇票附件</el-tag>
-					<el-tag type="primary" style="cursor: pointer; margin-right: 15px" @click="download(scope.row.id)">
-						下载</el-tag>
-				</template>
-			</el-table-column>
-		</el-table>
-		<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>
+      <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="todetail(scope.row.id)"
+            >汇票附件</el-tag
+          >
+          <el-tag
+            type="primary"
+            style="cursor: pointer; margin-right: 15px"
+            @click="download(scope.row.id)"
+          >
+            下载</el-tag
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="pagesip">
+      <el-button
+        type="primary"
+        size="small"
+        style="background-color: #d8ab5a; border-color: #d8ab5a; margin: 0 20px"
+        @click="jumpFirstPage"
+        >首页
+      </el-button>
+      <el-pagination
+        ref="pagination"
+        background
+        layout="total,prev, pager, next"
+        :total="total"
+        :page-size="pagesize"
+        :current-page="currentPage"
+        prev-text="上一页"
+        next-text="下一页"
+        @current-change="handleCurrentChange"
+      />
+      <el-button
+        type="primary"
+        size="small"
+        style="background-color: #d8ab5a; border-color: #d8ab5a; margin: 0 20px"
+        @click="jumpLastPage"
+        >尾页
+      </el-button>
+    </div>
+  </div>
 </template>
 
 <script>
-	import {
-		getAuditLogAttachmentsSearch
-	} from "@/api/auditlog";
-	export default {
-		filters: {
-			statusFilter(status) {
-				const statusMap = {
-					published: "success",
-					draft: "gray",
-					deleted: "danger",
-				};
-				return statusMap[status];
-			},
-		},
-		data() {
-			return {
-				// 表单数据
-				formData: {
-					startTime: "",
-					endTime: "",
-					name: "",
-					operateUser: "", //操作人员
-					content: "", //查询内容
-				},
-				/* 当前页数 */
-				currentPage: 1,
-				/* 每页显示个数 */
-				pagesize: 10,
-				/* 总条数 */
-				total: 20,
-				temporaryList: [],
-				srcList: [],
-				list: [],
-				listLoading: false,
-				status: "",
-				hpstatus: "",
-				input4: "",
-				checked: false,
-				pickerOptions: {
-					shortcuts: [{
-							text: "最近一周",
-							onClick(picker) {
-								const end = new Date();
-								const start = new Date();
-								start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-								picker.$emit("pick", [start, end]);
-							},
-						},
-						{
-							text: "最近一个月",
-							onClick(picker) {
-								const end = new Date();
-								const start = new Date();
-								start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-								picker.$emit("pick", [start, end]);
-							},
-						},
-						{
-							text: "最近三个月",
-							onClick(picker) {
-								const end = new Date();
-								const start = new Date();
-								start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-								picker.$emit("pick", [start, end]);
-							},
-						},
-					],
-				},
-				value1: "",
-				value2: "",
-			};
-		},
-		mounted() {
-			this.getAllList();
-		},
-		methods: {
-			/* 获取列表数据 */
-			getAllList(searchForm = {}) {
-				const params = {
-					pageIndex: this.currentPage,
-					pageSize: this.pagesize,
-				};
-				getAuditLogAttachmentsSearch({
-					...params,
-					...searchForm
-				}).then((res) => {
-					const {
-						data
-					} = res;
-					this.temporaryList = data.result;
-					this.srcList = data.result;
-					this.total = res.data.total;
-				});
-			},
+import { getAuditLogAttachmentsSearch } from "@/api/auditlog";
+import { dataConversionUtil } from "../../utils/Excel.js";
+export default {
+  filters: {
+    statusFilter(status) {
+      const statusMap = {
+        published: "success",
+        draft: "gray",
+        deleted: "danger",
+      };
+      return statusMap[status];
+    },
+  },
+  data() {
+    return {
+      // 表单数据
+      formData: {
+        startTime: "",
+        endTime: "",
+        name: "",
+        operateUser: "", //操作人员
+        content: "", //查询内容
+      },
+      /* 当前页数 */
+      currentPage: 1,
+      /* 每页显示个数 */
+      pagesize: 10,
+      /* 总条数 */
+      total: 20,
+      temporaryList: [],
+      srcList: [],
+      list: [],
+      listLoading: false,
+      status: "",
+      hpstatus: "",
+      input4: "",
+      checked: false,
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+      value1: "",
+      value2: "",
+	  multipleSelection:[],//导出数据
+    };
+  },
+  mounted() {
+    this.getAllList();
+  },
+  methods: {
+    /* 获取列表数据 */
+    getAllList(searchForm = {}) {
+      const params = {
+        pageIndex: this.currentPage,
+        pageSize: this.pagesize,
+      };
+      getAuditLogAttachmentsSearch({
+        ...params,
+        ...searchForm,
+      }).then((res) => {
+        const { data } = res;
+        this.temporaryList = data.result;
+        this.srcList = data.result;
+        this.total = res.data.total;
+      });
+    },
 
-			handleCommand(command) {
-				this.status = command;
-			},
-			handlehpCommand(command) {
-				this.hpstatus = command;
-			},
+    /* 请输入查询内容 */
+    Search() {
+      this.currentPage = 1;
+      this.searchForm = {
+        ...this.formData,
+      };
+      this.getAllList(this.searchForm);
+    },
+    /* 操作人员查询*/
+    SearchOperateUser() {
+      console.log("我是操作人员");
+      this.currentPage = 1;
+      this.searchForm = {
+        ...this.formData,
+      };
+      this.getAllList(this.searchForm);
+    },
 
-			/* 请输入查询内容 */
-			Search() {
-				this.currentPage = 1;
-				this.searchForm = {
-					...this.formData
-				};
-				this.getAllList(this.searchForm);
-			},
-			/* 操作人员查询*/
-			SearchOperateUser() {
-				console.log("我是操作人员");
-				this.currentPage = 1;
-				this.searchForm = {
-					...this.formData,
-				};
-				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);
+      }
+    },
 
-			// 日期审核状态查询
-			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);
-				}
-			},
+    /* 分页功能，改变当前页 */
+    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);
-			},
+    /* 跳转到详情页 */
+    todetail(id) {
+      this.$router.push({
+        path: "/attachmentdetail",
+        query: {
+          id: id,
+        },
+      });
+    },
+    toindex() {
+      this.$router.push({
+        path: "/sucuirtyaudit/index",
+      });
+    },
 
-			handleSelectionChange(data) {
-				this.multipleSelection = data;
-				console.log(this.multipleSelection);
-			},
-			handleAll(data) {
-				this.multipleSelection = data;
-				console.log(this.multipleSelection);
-			},
-			
-			handleSelectionChange(data) {
-				this.multipleSelection = data;
-				console.log(this.multipleSelection);
-			},
-			handleAll(data) {
-				this.multipleSelection = data
-				console.log(this.multipleSelection)
-			},
-			/* 跳转到详情页 */
+    // 下载合同附件zip
+    download(id) {
+      let that = this;
+      this.$request({
+        url: "/api/AuditLog/attachments/download",
+        method: "post",
+        data: {
+          contractIds: [id],
+        },
+        responseType: "blob",
+      }).then((res) => {
+        let filename = this.getFileName(res.headers["content-disposition"]);
+        let fileData = res.data;
+        let blob = new Blob([fileData], { type: "application/zip" });
+        let url = URL.createObjectURL(blob);
+        const link = document.createElement("a");
+        link.href = url;
+        link.download = filename;
+        link.click();
+        // 释放内存
+        URL.revokeObjectURL(url);
+      });
+    },
+    // 设置zip名
+    getFileName(contentDisposition) {
+      var filename = "";
+      var filenameRegex = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/;
+      var matches = filenameRegex.exec(contentDisposition);
+      if (matches != null && matches[1]) {
+        filename = matches[1].replace(/['"]/g, "");
+      }
+      return decodeURI(filename);
+    },
 
-			todetail(id) {
-				this.$router.push({
-					path: '/attachmentdetail',
-					query: {
-						id: id
-					}
-				})
-			},
-			toindex() {
-				this.$router.push({
-					path: '/sucuirtyaudit/index'
-				})
-			},
-			
-			// 下载合同附件zip
-			download(id) {
-				let that=this
-				this.$request({
-					url: '/api/AuditLog/attachments/download',
-					method: 'post',
-					data: {
-						contractIds: [id]
-					},
-					responseType:'blob'
-				}).then((res) => {
-					let filename = this.getFileName(res.headers['content-disposition']);
-					let fileData = res.data;
-					let blob = new Blob([fileData],{ type:'application/zip'})
-					let url = URL.createObjectURL(blob)
-					const link = document.createElement('a')
-					link.href = url
-					link.download = filename;
-					link.click()
-					// 释放内存
-					URL.revokeObjectURL(url)
-				})
-			},
-			// 设置zip名
-			getFileName(contentDisposition) {
-				var filename = '';
-				var filenameRegex = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/;
-				var matches = filenameRegex.exec(contentDisposition);
-				if (matches != null && matches[1]) {
-					filename = matches[1].replace(/['"]/g, '');
-				}
-				return decodeURI(filename);
-			},
-			Exports() {
-				let ids = Array.from(this.multipleSelection, ({
-					id
-				}) => id)
-				this.$request({
-					url: '/api/AuditLog/attachments/download',
-					method: 'post',
-					data: {
-						contractIds: ids
-					},
-					responseType: 'blob'
-				}).then((res) => {
-					console.log(res)
-					let filename = this.getFileName(res.headers['content-disposition']);
-					let fileData = res.data;
-					let blob = new Blob([fileData], {
-						type: 'application/zip'
-					})
-					let url = URL.createObjectURL(blob)
-					const link = document.createElement('a')
-					link.href = url
-					link.download = filename;
-					link.click()
-					// 释放内存
-					URL.revokeObjectURL(url)
-				})
-			}
-
-		},
-		
-	}
+    /* 批量导出 */
+    handleSelectionChange(data) {
+      this.multipleSelection = data;
+    },
+    handleAll(data) {
+      this.multipleSelection = data;
+    },
+	/* 批量导出数据 */
+    batchExports() {
+      if (this.multipleSelection == "") {
+        this.$message({
+          type: "warning",
+          message: "请选择数据!",
+        });
+      } else {
+        var tableHeader = [
+          [
+            "序号",
+            '合同名称',
+			'供应商名称',
+			'日期',
+			'合同附件',
+			'发票附件',
+			'贸易合同',
+          ],
+        ];
+        var dataList = [];
+        this.multipleSelection.forEach((item, index) => {
+          dataList.push([
+            index + 1,
+            item.name,
+            item.supplierName,
+            item.createdAt,
+			item.picUrls,
+			item.invoicePics,
+			item.tradePics,
+          ]);
+        });
+        dataConversionUtil.dataToExcel("附件列表", tableHeader, dataList);
+        this.$message.success("导出成功!");
+      }
+    },
+ /* 全部导出承兑人列表数据 */
+    getContacts() {
+      const data = {
+        pageIndex: "",
+        pageSize: -1,
+        startTime: "",
+        endTime: "",
+        operateUser:'',
+		content:''
+      };
+      getAuditLogAttachmentsSearch({ 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.supplierName,
+            item.createdAt,
+			item.picUrls,
+			item.invoicePics,
+			item.tradePics,
+          ]);
+        });
+        dataConversionUtil.dataToExcel("附件列表", tableHeader, dataList);
+        this.$message.success("导出成功!");
+      }, 1000);
+    },
+	
+   
+  },
+};
 </script>
 <style lang="scss">
-	.pulldown {
-		width: 185px;
-		height: 40px;
-		border: 1px solid #e8e8e8;
-		border-radius: 10px;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		justify-content: space-between;
-		padding: 0 20px;
-		color: #999999;
-	}
+.pulldown {
+  width: 185px;
+  height: 40px;
+  border: 1px solid #e8e8e8;
+  border-radius: 10px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 20px;
+  color: #999999;
+}
 
-	.pagesip {
-		width: 100%;
-		margin: 20px auto;
-		display: flex;
-		// align-items: center;
-		justify-content: flex-end;
-	}
+.pagesip {
+  width: 100%;
+  margin: 20px auto;
+  display: flex;
+  // align-items: center;
+  justify-content: flex-end;
+}
 
-	.el-pagination.is-background .el-pager li:not(.disabled).active {
-		background-color: #d8ab5a;
-	}
+.el-pagination.is-background .el-pager li:not(.disabled).active {
+  background-color: #d8ab5a;
+}
 
-	.el-col {
-		margin-bottom: 20px;
-	}
+.el-col {
+  margin-bottom: 20px;
+}
 </style>

src/views/sucuirtyaudit/attachment-detail.vue

@@ -9,7 +9,11 @@
         />
       </el-descriptions-item>
     </el-descriptions>
+    <div class="button-btn">
+    <el-button  type="primary" style="width: 100px; " @click="back">返回</el-button>
+    </div>
   </div>
+  
 </template>
 
 <script>
@@ -30,6 +34,12 @@ export default {
 				
 			})
     },
+    methods: {
+      /* 返回上一级 */
+      back() {
+				this.$router.go(-1)
+			},
+    },
 };
 </script>
 
@@ -41,4 +51,9 @@ export default {
   font-size: 18px;
   font-weight: bold;
 }
+.button-btn{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
 </style>

src/views/sucuirtyaudit/index.vue

@@ -334,7 +334,7 @@ export default {
     getContacts() {
       const data = {
         pageIndex: '',
-        pageSize: '',
+        pageSize: -1,
         startTime: "",
         endTime: "",
         operateUser:'',

src/views/table/index.vue

@@ -551,6 +551,7 @@ export default {
             "承兑人名称",
             "账号",
             "开户行名称",
+            "开户行行号",
             "服务费率(%)",
             "利率(%)",
             "状态",
@@ -564,6 +565,7 @@ export default {
             item.name,
             item.bankAccount,
             item.bankName,
+            item.bankNo,
             item.serviceRate,
             item.interest,
             item.statusText,
@@ -578,7 +580,7 @@ export default {
     getContacts() {
       const data = {
         pageIndex: '',
-        pageSize: '',
+        pageSize: -1,
         startTime: "",
         endTime: "",
         name: "",
@@ -603,6 +605,7 @@ export default {
             "承兑人名称",
             "账号",
             "开户行名称",
+            "开户行行号",
             "服务费率(%)",
             "利率(%)",
             "状态",
@@ -616,6 +619,7 @@ export default {
             item.name,
             item.bankAccount,
             item.bankName,
+            item.bankNo,
             item.serviceRate,
             item.interest,
             item.statusText,