Merge branch 'master' of http://git.9026.com/Tartarus/alhj-admin

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/detail.vue

@@ -326,6 +326,8 @@ export default {
         feedbackPicList: [],
         approveStatus: "",
       },
+      exportExcelData1: [], //导出列表缓存数据整页
+      exportExcelData2:[],//导出列表缓存数据单选
     };
   },
 
@@ -448,14 +450,15 @@ export default {
 
     /* 批量导出 */
     handleAll(data) {
-      this.multipleSelection = data;
+       this.exportExcelData1.push(data);
+      this.exportExcelData2 = new Set( this.exportExcelData1.flat(Infinity));
     },
     handleSelectionChange(data) {
-      this.multipleSelection = data;
+      this.exportExcelData1.push(data);
     },
     /* 批量导出 */
     ExportsContractDraft() {
-      console.log(this.multipleSelection);
+      this.multipleSelection = new Set(this.exportExcelData1.flat(Infinity))||this.exportExcelData2;
       if (this.multipleSelection == "") {
         this.$message({
           type: "warning",

src/views/contracts/index.vue

@@ -310,7 +310,7 @@ export default {
       status: "",
       hpstatus: "",
       Auditstatus: "",
-      exportExcel:[],//导出数据
+      exportExcel: [], //导出数据
       search: "",
       /* 当前页数 */
       currentPage: 1,
@@ -349,6 +349,8 @@ export default {
         ],
       },
       value2: "",
+      exportExcelData1: [], //导出列表缓存数据整页
+      exportExcelData2:[],//导出列表缓存数据单选
     };
   },
   mounted() {
@@ -664,58 +666,58 @@ export default {
 
     /* 批量导出数据 */
     handleSelectionChange(data) {
-      this.exportExcel = data;
+      this.exportExcelData1.push(data);
+      this.exportExcelData2 = new Set( this.exportExcelData1.flat(Infinity));
     },
     handleAll(data) {
-      this.exportExcel = data;
+      this.exportExcelData1.push(data);
     },
 
     /* 批量导出合同列表 */
     batchExports() {
-      console.log(this.exportExcel);
+      this.exportExcel = new Set(this.exportExcelData1.flat(Infinity))||this.exportExcelData2;
       if (this.exportExcel == "") {
         this.$message({
           type: "warning",
           message: "请选择数据!",
         });
-      } else{
+      } else {
         var tableHeader = [
-        [
-          "序号",
-          "合同名称",
-          "合同编号",
-          "承兑人",
-          "出票人",
-          "汇票状态",
-          "合同状态",
-          "审核状态",
-          "时间",
-        ],
-      ];
-      var dataList = [];
-      this.exportExcel.forEach((item, index) => {
-        dataList.push([
-          index + 1,
-          item.name,
-          item.contractNo,
-          item.acceptorName,
-          item.drawersName,
-          item.draftStatusText,
-          item.contractStatusText,
-          item.statusText,
-          item.createdAt,
-        ]);
-      });
-      dataConversionUtil.dataToExcel("合同列表", tableHeader, dataList);
-      this.$message.success("导出成功!");
+          [
+            "序号",
+            "合同名称",
+            "合同编号",
+            "承兑人",
+            "出票人",
+            "汇票状态",
+            "合同状态",
+            "审核状态",
+            "时间",
+          ],
+        ];
+        var dataList = [];
+        this.exportExcel.forEach((item, index) => {
+          dataList.push([
+            index + 1,
+            item.name,
+            item.contractNo,
+            item.acceptorName,
+            item.drawersName,
+            item.draftStatusText,
+            item.contractStatusText,
+            item.statusText,
+            item.createdAt,
+          ]);
+        });
+        dataConversionUtil.dataToExcel("合同列表", tableHeader, dataList);
+        this.$message.success("导出成功!");
       }
-      
     },
 
     /* 全部导出合同列表数据 */
     getContacts() {
       const data = {
-        pageIndex: '',
+        pageIndex: "",
         pageSize: -1,
         startTime: "",
         endTime: "",
@@ -732,7 +734,7 @@ export default {
     },
 
     /* 全部导出 */
-     Exports() {
+    Exports() {
       this.getContacts();
       setTimeout(() => {
         var tableHeader = [
@@ -764,7 +766,7 @@ export default {
         });
         dataConversionUtil.dataToExcel("合同列表", tableHeader, dataList);
         this.$message.success("导出成功!");
-        this.exportExcel=[]
+        this.exportExcel = [];
       }, 1000);
     },
   },

src/views/databackup/index.vue

@@ -226,6 +226,8 @@ export default {
       },
       value1: "",
       value2: "",
+      exportExcelData1: [], //导出列表缓存数据整页
+      exportExcelData2:[],//导出列表缓存数据单选
     };
   },
 
@@ -421,13 +423,15 @@ export default {
 
     /* 批量导出 */
     handleSelectionChange(data) {
-      this.multipleSelection = data;
+       this.exportExcelData1.push(data);
+      this.exportExcelData2 = new Set( this.exportExcelData1.flat(Infinity));
     },
     handleAll(data) {
-      this.multipleSelection = data;
+      this.exportExcelData1.push(data);
     },
     /* 批量导出数据 */
     batchExports() {
+       this.multipleSelection = new Set(this.exportExcelData1.flat(Infinity))||this.exportExcelData2;
       if (this.multipleSelection == "") {
         this.$message({
           type: "warning",

src/views/delivery/index.vue

@@ -316,6 +316,8 @@ export default {
       },
       value1: "",
       value2: "",
+      exportExcelData1:[],//列表缓存数据
+      exportExcelData2:[]
     };
   },
   mounted() {
@@ -431,13 +433,15 @@ export default {
 
     /* 批量导出数据 */
     handleSelectionChange(data) {
-      this.multipleSelection = data;
+      this.exportExcelData1.push(data);
+      this.exportExcelData2 = new Set( this.exportExcelData1.flat(Infinity));
     },
     handleAll(data) {
-      this.multipleSelection = data;
+      this.exportExcelData1.push(data);
     },
     /* 批量导出数据 */
     batchExports() {
+      this.multipleSelection = new Set(this.exportExcelData1.flat(Infinity))||this.exportExcelData2;
       if (this.multipleSelection == "") {
         this.$message({
           type: "warning",

src/views/form/index.vue

@@ -259,6 +259,8 @@ export default {
       },
       value1: "",
       value2: "",
+      exportExcelData1:[],//列表缓存数据
+      exportExcelData2:[]
     };
   },
 
@@ -444,14 +446,17 @@ export default {
 
     /* 批量导出数据 */
     handleSelectionChange(data) {
-      this.multipleSelection = data;
+      this.exportExcelData1.push(data);
+      this.exportExcelData2 = new Set( this.exportExcelData1.flat(Infinity));
     },
     handleAll(data) {
-      this.multipleSelection = data;
+      this.exportExcelData1.push(data);
     },
 
     /* 批量导出 */
     batchExports() {
+      this.multipleSelection = new Set(this.exportExcelData1.flat(Infinity))||this.exportExcelData2;
+
       if (this.multipleSelection == "") {
         this.$message({
           type: "warning",

src/views/management/index.vue

@@ -231,6 +231,8 @@ export default {
       },
       value1: "",
       value2: "",
+      exportExcelData1: [], //导出列表缓存数据整页
+      exportExcelData2:[],//导出列表缓存数据单选
     };
   },
 
@@ -464,14 +466,17 @@ export default {
 
     /* 批量导出数据 */
     handleSelectionChange(data) {
-      this.multipleSelection = data;
+       this.exportExcelData1.push(data);
+      this.exportExcelData2 = new Set( this.exportExcelData1.flat(Infinity));
     },
     handleAll(data) {
-      this.multipleSelection=data
+      this.exportExcelData1.push(data);
     },
 
     /* 批量导出 */
     batchExports() {
+      this.multipleSelection = new Set(this.exportExcelData1.flat(Infinity))||this.exportExcelData2;
+
       if (this.multipleSelection == "") {
         this.$message({
           type: "warning",

src/views/shipments/index.vue

@@ -175,6 +175,8 @@ export default {
       },
       value1: "",
       value2: "",
+      exportExcelData1: [], //导出列表缓存数据整页
+      exportExcelData2:[],//导出列表缓存数据单选
     };
   },
   mounted() {
@@ -290,13 +292,16 @@ export default {
 
     /* 批量导出数据 */
     handleSelectionChange(data) {
-      this.multipleSelection = data;
+      this.exportExcelData1.push(data);
+      this.exportExcelData2 = new Set( this.exportExcelData1.flat(Infinity));
     },
     handleAll(data) {
-      this.multipleSelection = data;
+     this.exportExcelData1.push(data);
     },
     /* 导出 */
     batchExport() {
+      this.multipleSelection = new Set(this.exportExcelData1.flat(Infinity))||this.exportExcelData2;
+
       if (this.multipleSelection == "") {
         this.$message({
           type: "warning",

src/views/shipments/shipments1.vue

@@ -177,6 +177,8 @@ export default {
       },
       value1: "",
       value2: "",
+      exportExcelData1: [], //导出列表缓存数据整页
+      exportExcelData2:[],//导出列表缓存数据单选
     };
   },
   created() {},
@@ -290,13 +292,16 @@ export default {
 
     /* 批量导出数据 */
     handleSelectionChange(data) {
-      this.multipleSelection = data;
+      this.exportExcelData1.push(data);
+      this.exportExcelData2 = new Set( this.exportExcelData1.flat(Infinity));
     },
     handleAll(data) {
-      this.multipleSelection = data;
+      this.exportExcelData1.push(data);
     },
     /* 批量导出数据 */
     batchExport() {
+      this.multipleSelection = new Set(this.exportExcelData1.flat(Infinity))||this.exportExcelData2;
+
       if (this.multipleSelection == "") {
         this.$message({
           type: "warning",

src/views/shipments/shipments2.vue

@@ -171,6 +171,8 @@ export default {
       },
       value1: "",
       value2: "",
+      exportExcelData1: [], //导出列表缓存数据整页
+      exportExcelData2:[],//导出列表缓存数据单选
     };
   },
 
@@ -276,13 +278,16 @@ export default {
 
     /* 批量导出数据 */
     handleSelectionChange(data) {
-      this.multipleSelection = data;
+      this.exportExcelData1.push(data);
+      this.exportExcelData2 = new Set( this.exportExcelData1.flat(Infinity));
     },
     handleAll(data) {
-      this.multipleSelection = data;
+      this.exportExcelData1.push(data);
     },
     /* 批量导出 */
     batchExport() {
+      this.multipleSelection = new Set(this.exportExcelData1.flat(Infinity))||this.exportExcelData2;
+
       if (this.multipleSelection == "") {
         this.$message({
           type: "warning",

src/views/shipments/shipments3.vue

@@ -172,6 +172,8 @@ export default {
         ],
       },
       value2: "",
+      exportExcelData1: [], //导出列表缓存数据整页
+      exportExcelData2:[],//导出列表缓存数据单选
     };
   },
 
@@ -276,13 +278,16 @@ export default {
 
     /* 批量导出数据 */
     handleSelectionChange(data) {
-      this.multipleSelection = data;
+      this.exportExcelData1.push(data);
+      this.exportExcelData2 = new Set( this.exportExcelData1.flat(Infinity));
     },
     handleAll(data) {
-      this.multipleSelection = data;
+      this.exportExcelData1.push(data);
     },
     /* 导出 */
     batchExport() {
+      this.multipleSelection = new Set(this.exportExcelData1.flat(Infinity))||this.exportExcelData2;
+
       if (this.multipleSelection == "") {
         this.$message({
           type: "warning",

src/views/sucuirtyaudit/annexList.vue

@@ -257,7 +257,9 @@ export default {
       },
       value1: "",
       value2: "",
-	  multipleSelection:[],//导出数据
+      multipleSelection: [], //导出数据
+      exportExcelData1: [], //导出列表缓存数据整页
+      exportExcelData2:[],//导出列表缓存数据单选
     };
   },
   mounted() {
@@ -390,13 +392,15 @@ export default {
 
     /* 批量导出 */
     handleSelectionChange(data) {
-      this.multipleSelection = data;
+      this.exportExcelData1.push(data);
+      this.exportExcelData2 = new Set( this.exportExcelData1.flat(Infinity));
     },
     handleAll(data) {
-      this.multipleSelection = data;
+      this.exportExcelData1.push(data);
     },
-	/* 批量导出数据 */
+    /* 批量导出数据 */
     batchExports() {
+      this.multipleSelection = new Set(this.exportExcelData1.flat(Infinity))||this.exportExcelData2;
       if (this.multipleSelection == "") {
         this.$message({
           type: "warning",
@@ -406,12 +410,12 @@ export default {
         var tableHeader = [
           [
             "序号",
-            '合同名称',
-			'供应商名称',
-			'日期',
-			'合同附件',
-			'发票附件',
-			'贸易合同',
+            "合同名称",
+            "供应商名称",
+            "日期",
+            "合同附件",
+            "发票附件",
+            "贸易合同",
           ],
         ];
         var dataList = [];
@@ -421,42 +425,44 @@ export default {
             item.name,
             item.supplierName,
             item.createdAt,
-			item.picUrls,
-			item.invoicePics,
-			item.tradePics,
+            item.picUrls,
+            item.invoicePics,
+            item.tradePics,
           ]);
         });
         dataConversionUtil.dataToExcel("附件列表", tableHeader, dataList);
         this.$message.success("导出成功!");
       }
     },
- /* 全部导出承兑人列表数据 */
+    /* 全部导出承兑人列表数据 */
     getContacts() {
       const data = {
         pageIndex: "",
         pageSize: -1,
         startTime: "",
         endTime: "",
-        operateUser:'',
-		content:''
+        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) => {
@@ -465,18 +471,16 @@ export default {
             item.name,
             item.supplierName,
             item.createdAt,
-			item.picUrls,
-			item.invoicePics,
-			item.tradePics,
+            item.picUrls,
+            item.invoicePics,
+            item.tradePics,
           ]);
         });
         dataConversionUtil.dataToExcel("附件列表", tableHeader, dataList);
         this.$message.success("导出成功!");
-         this.multipleSelection=[]
+        this.multipleSelection = [];
       }, 1000);
     },
-	
-   
   },
 };
 </script>

src/views/sucuirtyaudit/index.vue

@@ -216,6 +216,8 @@ export default {
       },
       value1: "",
       value2: "",
+       exportExcelData1: [], //导出列表缓存数据整页
+      exportExcelData2:[],//导出列表缓存数据单选
     };
   },
   mounted() {
@@ -300,12 +302,14 @@ export default {
 
     /* 批量导出 */
     handleSelectionChange(data) {
-      this.multipleSelection = data;
+      this.exportExcelData1.push(data);
+      this.exportExcelData2 = new Set( this.exportExcelData1.flat(Infinity));
     },
     handleAll(data) {
-      this.multipleSelection = data;
+      this.exportExcelData1.push(data);
     },
     batchExports() {
+      this.multipleSelection = new Set(this.exportExcelData1.flat(Infinity))||this.exportExcelData2;
       if (this.multipleSelection == "") {
         this.$message({
           type: "warning",

src/views/table/index.vue

@@ -345,6 +345,8 @@ export default {
       },
       value1: "",
       value2: "",
+      exportExcelData1:[],//列表缓存数据
+      exportExcelData2:[]
     };
   },
   mounted() {
@@ -532,13 +534,15 @@ export default {
 
     /* 批量导出数据 */
     handleSelectionChange(data) {
-      this.multipleSelection = data;
+      this.exportExcelData1.push(data);
+      this.exportExcelData2 = new Set( this.exportExcelData1.flat(Infinity));
     },
     handleAll(data) {
-      this.multipleSelection = data;
+      this.exportExcelData1.push(data);
     },
     /* 导出 */
     batchExports() {
+      this.multipleSelection = new Set(this.exportExcelData1.flat(Infinity))||this.exportExcelData2;
       if (this.multipleSelection == "") {
         this.$message({
           type: "warning",