1.修复资产-我的订单-翻页后第一次条件搜索没结果的问题

2.个贷订单列表新增查询条件

src/views/assets/myOrderList.vue

@@ -788,6 +788,7 @@ export default {
             // 重置分页
             this.listQuery.page = 1
             this.listQuery.size = 10
+            this.listQuery.current = 1
             this.selectMyOrderPage()
         },
         // 重置搜索条件

src/views/statistical/personal/departmentEfficiency.vue

@@ -178,9 +178,26 @@
                 </el-table-column>
             </el-table>
         </div>
-        <el-dialog title="个贷订单列表" :visible.sync="dialogVisible" width="70%" @open="getPersonalEfficiencyDetailVO()">
+        <el-dialog title="个贷订单列表" :visible.sync="dialogVisible" width="90%" @open="getPersonalEfficiencyDetailVO()">
             <y-page-list-layout :get-page-list="getPersonalEfficiencyDetailVO" :page-list="pageData" :page-para="listQueryDetail">
                 <template slot="left">
+                    <el-date-picker style="float: left;" v-model="selectDate2" type="daterange" 
+                    format="yyyy 年 MM 月 dd 日" value-format="yyyy-MM-dd" range-separator="至"
+                    start-placeholder="出报告时间段 开始" end-placeholder="出报告时间段 结束" align="right">
+                    </el-date-picker>
+                    <el-input style="margin-left: 10px;width: 200px;float: left;" class="filter-item"
+                    v-model="listQueryDetail.customerName" placeholder="客户名称" clearable>
+                    </el-input>
+                    <el-select v-model="listQueryDetail.clientManagerId" filterable placeholder="客户经理（可搜索）"
+                    style="width: 200px;margin-left: 10px;float: left;">
+                        <el-option v-for="(u, id) in clientManagers" :label="u.name" :value="u.id"></el-option>
+                    </el-select>
+                    <el-button class="filter-item" round type="primary" @click="getPersonalEfficiencyDetailVO()"
+                    style="margin-left: 10px;float: left;">搜索
+                    </el-button>
+                    <el-button class="filter-item" round type="success" @click="resetParams2()"
+                    style="margin-left: 10px;float: left;">重置
+                    </el-button>
                     <el-button class="filter-item" round type="info" @click="exportPersonalEfficiencyDetailVO()">导出
                     </el-button>
                 </template>
@@ -191,7 +208,7 @@
                             <span>{{ row.orderId }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column label="项目名称" align="center">
+                    <el-table-column label="项目名称" align="center" show-overflow-tooltip>
                         <template slot-scope="{row}">
                             <span>{{ row.location }}</span>
                         </template>
@@ -298,6 +315,7 @@ export default {
             loading: false,
             // 时间
             selectDate: [],
+            selectDate2: [],
             listQueryByDepartment: {
                 // 开始时间
                 startTime: null,
@@ -317,7 +335,11 @@ export default {
                 // 开始时间
                 startTime: null,
                 // 结束时间
-                endTime: null
+                endTime: null,
+                customerName: null,
+                clientManagerId: null,
+                productionTimeStart: null,
+                productionTimeEnd: null
             },
             // 下单部门
             marketDepartment: [],
@@ -351,12 +373,14 @@ export default {
             exportStatus: true,
             depEfficiency: [],
             pageData: { records: [] },
-            dialogLoading: false
+            dialogLoading: false,
+            clientManagers: []
         }
     },
     created() {
         this.selectDate.push(this.getDefaultStartDate());
         this.selectDate.push(this.getDefaultEndDate());
+        this.getClientManager();
         this.getPersonalDepEfficiencyVO();
     },
     methods: {
@@ -429,10 +453,27 @@ export default {
             this.listQueryDetail.efficiencyType = efficiencyType;
             this.listQueryDetail.startTime = startTime;
             this.listQueryDetail.endTime = endTime;
+            this.listQueryDetail.clientManagerId = null;
+            this.listQueryDetail.customerName = null;
+            this.listQueryDetail.productionTimeStart = null;
+            this.listQueryDetail.productionTimeEnd = null;
+            this.selectDate2 = [];
+        },
+        resetParams2() {
+            this.listQueryDetail.clientManagerId = null;
+            this.listQueryDetail.customerName = null;
+            this.listQueryDetail.productionTimeStart = null;
+            this.listQueryDetail.productionTimeEnd = null;
+            this.selectDate2 = [];
+            this.getPersonalEfficiencyDetailVO();
         },
         // 效率详情列表查询
         getPersonalEfficiencyDetailVO() {
             this.dialogLoading = true;
+            if (this.selectDate2.length > 1) {
+                this.listQueryDetail.productionTimeStart = this.selectDate2[0] + ' 00:00:00';
+                this.listQueryDetail.productionTimeEnd = this.selectDate2[1] + ' 23:59:59';
+            }
             this.$api.statistical.getPersonalEfficiencyDetailVO(this.listQueryDetail).then(res => {
                 if (res.code === 200) {
                     this.pageData = res.data;
@@ -446,6 +487,14 @@ export default {
                 "personal/statisticalStatement/getPersonalEfficiencyDetailVO/export", this.listQueryDetail,
                 "导出"
             );
+        },
+        getClientManager() {
+            const post = "客户经理"
+            this.$api.user.postUser(post).then(res => {
+                if (res.code === 200) {
+                    this.clientManagers = res.data;
+                }
+            })
         }
     }
 }