1.资产、个贷、大中型我的订单导出

2.土规回款记录导出

src/views/assets/myOrderList.vue

@@ -23,11 +23,17 @@
                     style=" width: 200px;margin-left: 10px;float: left;">
                     <el-option v-for="(d, id) in allotDepartment" :label="d.name" :value="d.id"></el-option>
                 </el-select>
+                <el-date-picker style="margin-left: 20px;float: left;" v-model="selectDate" type="daterange"
+                    :picker-options="pickerOptions" format="yyyy 年 MM 月 dd 日" value-format="yyyy-MM-dd" range-separator="至"
+                    start-placeholder="开始日期" end-placeholder="结束日期" align="right">
+                </el-date-picker>
                 <el-button class="filter-item" style="margin-left: 10px;float: left;" type="primary" @click="searchList"
                     round>搜索
                 </el-button>
                 <el-button class="filter-item" style="float: left;" round type="success" @click="resetParams()">重置
                 </el-button>
+                <el-button class="filter-item" style="float: left;" round type="success" @click="exportMyOrder()" :disabled="!listQuery.startTime && !listQuery.endTime">导出
+                </el-button>
             </template>
             <parentTable ref="table" v-loading="listLoading" :data="pageData.records" slot="table" style="width: 100%;">
                 <el-table-column label="项目编号" align="center" width="150">
@@ -52,7 +58,7 @@
                 </el-table-column>
                 <el-table-column label="项目名称" align="center" width="250">
                     <template slot-scope="{row}">
-                        <span>{{ row.reportName || row.statementName || row.name }}</span>
+                        <span>{{ row.name }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="业务类型" align="center" width="150">
@@ -618,7 +624,11 @@ export default {
                 keyWord: null,
                 // 送达状态
                 delivery: null,
-                departmentId: null
+                departmentId: null,
+                // 开始时间
+                startTime: null,
+                // 结束时间
+                endTime: null
             },
             // 接单部门
             allotDepartment: [],
@@ -709,7 +719,35 @@ export default {
                 realMakeDate: null
             },
             makeInvoiceListDialog: false,
-            newInvoiceDialog: false
+            newInvoiceDialog: 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]);
+                    }
+                }]
+            },
+            selectDate: ''
         }
     },
     created() {
@@ -729,6 +767,10 @@ export default {
     methods: {
         // 无条件分页查询
         selectMyOrderPage() {
+            if (this.selectDate) {
+                this.listQuery.startTime = this.selectDate[0] + ' 00:00:00';
+                this.listQuery.endTime = this.selectDate[1] + ' 23:59:59';
+            }
             this.$api.assets.selectMyOrderPage(this.listQuery).then(res => {
                 if (res.code === 200) {
                     this.pageData = res.data;
@@ -745,6 +787,7 @@ export default {
         // 重置搜索条件
         resetParams() {
             this.$router.push({ query: {} });
+            this.selectDate = '';
             this.listQuery = {
                 page: 1,
                 size: 10,
@@ -1294,6 +1337,13 @@ export default {
             this.invoice.created = null;
             this.invoice.modified = null;
             this.newInvoiceDialog = true;
+        },
+        // 资产我的订单导出
+        exportMyOrder() {
+            this.$utils.exportUtil(
+                "/assets/exportMyOrder", this.listQuery,
+                "导出"
+            );
         }
     }
 }

src/views/major/myOrder.vue

@@ -12,6 +12,8 @@
             <PermissionButton menu-code="_views_major_order" class-name="filter-item" type="danger"
               icon="el-icon-circle-plus-outline" :page-jump="true" round 
               :page-query="{ 'couldEdit': true, 'couldBack': true }" />
+              <el-button class="filter-item" round type="success" @click="exportMyOrder()" :disabled="!listQuery.startDate && !listQuery.endDate">导出
+              </el-button>
           </template>
         </MoreSearchBar>
       </template>
@@ -1404,8 +1406,15 @@ export default {
         this.invoice.created = null;
         this.invoice.modified = null;
         this.newInvoiceDialog = true;
+    },
+    // 大中型我的订单导出
+    exportMyOrder() {
+        this.$utils.exportUtil(
+            "/majorProduction/exportMyOrder", this.listQuery,
+            "导出"
+        );
     }
-  },
+  }
 
 }
 </script>

src/views/market/payment/list.vue

@@ -3,7 +3,7 @@
     <div class="title-container">
       <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
     </div>
-    <el-tabs v-model="activeName"  type="border-card" style="margin-top: 30px;">
+    <el-tabs v-model="activeName" type="border-card" style="margin-top: 30px;">
       <el-tab-pane label="项目回款" name="first">
         <y-page-list-layout :page-list="pageData" :page-para="listQuery" :get-page-list="getList">
           <template slot="left">
@@ -17,8 +17,8 @@
             </el-button>
           </template>
           <template slot="right">
-            <PermissionButton menu-code="_views_payment_collection_export" class-name="filter-item" round type="primary" name="导出"
-              @click="paymentExport">
+            <PermissionButton menu-code="_views_payment_collection_export" class-name="filter-item" round type="primary"
+              name="导出" @click="paymentExport">
             </PermissionButton>
           </template>
           <parentTable v-loading="listLoading" :data="pageData.records" slot="table" style="width: 100%;">
@@ -87,11 +87,18 @@
             <el-input v-model="listQuery.name" placeholder="回款名称" clearable
               style="margin-left: 20px;width: 320px;float: left;">
             </el-input>
+            <el-date-picker style="margin-left: 20px;float: left;" v-model="selectDate" type="daterange"
+              :picker-options="pickerOptions" format="yyyy 年 MM 月 dd 日" value-format="yyyy-MM-dd" range-separator="至"
+              start-placeholder="开始日期" end-placeholder="结束日期" align="right">
+            </el-date-picker>
             <el-button class="filter-item" style="margin-left: 10px;float: left;" type="primary" @click="searchXList"
               round>搜索
             </el-button>
             <el-button class="filter-item" style="float: left;" round type="warning" @click="resetSearch()">重置
             </el-button>
+            <el-button class="filter-item" round type="success" @click="exportPaymentCollect()"
+              :disabled="!listQuery.startDate && !listQuery.endDate">导出
+            </el-button>
           </template>
           <parentTable v-loading="listLoading" :data="pageXData.records" slot="table" style="width: 100%;">
             <el-table-column label="项目名称" align="center" width="center">
@@ -129,12 +136,12 @@
 
         <el-form-item label="回款名称：" prop="name" :rules="{ required: true, message: '请填写回款名称', trigger: 'blur' }">
           <el-select v-model="temp.name" style="width: 100%;">
-              <el-option label="一次性付款" value="一次性付款"></el-option>
-              <el-option label="预付款" value="预付款"></el-option>
-              <el-option label="尾款" value="尾款"></el-option>
-              <el-option label="第一次回款" value="第一次回款"></el-option>
-              <el-option label="第二次回款" value="第二次回款"></el-option>
-              <el-option label="第三次回款" value="第三次回款"></el-option>
+            <el-option label="一次性付款" value="一次性付款"></el-option>
+            <el-option label="预付款" value="预付款"></el-option>
+            <el-option label="尾款" value="尾款"></el-option>
+            <el-option label="第一次回款" value="第一次回款"></el-option>
+            <el-option label="第二次回款" value="第二次回款"></el-option>
+            <el-option label="第三次回款" value="第三次回款"></el-option>
           </el-select>
         </el-form-item>
 
@@ -195,7 +202,11 @@ export default {
         page: 1,
         size: 10,
         descs: 'id',
-        itemName: null
+        itemName: null,
+        // 开始时间
+        startDate: null,
+        // 结束时间
+        endDate: null
       },
       listQueryKey: 'keyword',
       importLoading: false,
@@ -206,7 +217,35 @@ export default {
         itemId: ''
       },
       activeName: 'first',
-      pageXData:{records:[]}
+      pageXData: { records: [] },
+      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]);
+          }
+        }]
+      },
+      selectDate: ''
     }
   },
   created() {
@@ -255,6 +294,7 @@ export default {
       })
     },
     resetSearch() {
+      this.selectDate = '';
       this.$router.push({ query: {} });
       this.listQuery = {
         current: 1,
@@ -292,29 +332,40 @@ export default {
         })
     },
     getXList() {
-        const that = this;
-        this.listLoading = true;
-        // console.log(that.listQuery)
-        const key = {}
-        key[this.listQueryKey] = this.listQuery.description;
-        this.$api.payment
-          .list(Object.assign({}, that.listQuery, key))
-          .then((res) => {
-            that.pageXData = res.data
-            setTimeout(() => {
-              that.listLoading = false
-            }, 200)
-          })
-          .catch(() => {
+      if (this.selectDate) {
+        this.listQuery.startDate = this.selectDate[0] + ' 00:00:00';
+        this.listQuery.endDate = this.selectDate[1] + ' 23:59:59';
+      }
+      const that = this;
+      this.listLoading = true;
+      // console.log(that.listQuery)
+      const key = {}
+      key[this.listQueryKey] = this.listQuery.description;
+      this.$api.payment
+        .list(Object.assign({}, that.listQuery, key))
+        .then((res) => {
+          that.pageXData = res.data
+          setTimeout(() => {
             that.listLoading = false
-          })
-      },
-      paymentExport(){
-        this.$utils.exportUtil(
+          }, 200)
+        })
+        .catch(() => {
+          that.listLoading = false
+        })
+    },
+    paymentExport() {
+      this.$utils.exportUtil(
         "/paymentCollection/item/export", this.listQuery,
         "导出"
       );
-      } 
+    },
+    // 回款记录导出
+    exportPaymentCollect() {
+      this.$utils.exportUtil(
+        "/paymentCollection/export", this.listQuery,
+        "导出"
+      );
+    }
   },
 }
 </script>

src/views/personal/myOrder.vue

@@ -10,7 +10,12 @@
           :page-jump="true" round style="position: absolute;right: 30px;z-index:9" :page-query="{'couldEdit':true,'saveOrderBtn':'保存订单','showBtn':true ,'couldBack':true}" />
         </el-col>
           <MoreSearchBar business="PERSONAL_BUSINESS" @fliterSearch="fliterSearch" @resetParams="resetParams" :listQuery="listQuery" 
-              :nodeCode="false" :clientManager="false" :outwardStaffName="false" :inwardStaffName="false" :pricingStaffName="false" :handlerName="false"></MoreSearchBar>
+              :nodeCode="false" :clientManager="false" :outwardStaffName="false" :inwardStaffName="false" :pricingStaffName="false" :handlerName="false">
+            <template v-slot:otherButton>
+              <el-button class="filter-item" round type="success" @click="exportMyOrder()" :disabled="!listQuery.startDate && !listQuery.endDate">导出
+              </el-button>
+            </template>
+        </MoreSearchBar>
       </template>
       <parentTable ref="table" v-loading="listLoading" :data="pageData.records" slot="table" style="width: 100%;" >
         <el-table-column label="坐落" align="center" width="300">
@@ -1074,6 +1079,13 @@ export default {
         this.invoice.created = null;
         this.invoice.modified = null;
         this.newInvoiceDialog = true;
+    },
+    // 个贷我的订单导出
+    exportMyOrder() {
+        this.$utils.exportUtil(
+            "/personal/exportMyOrder", this.listQuery,
+            "导出"
+        );
     }
   },