1.资产待认领实收款列表查询优化

2.个贷待认领实收款订单查询Sql修改
3.资产撰写报告时的提示优化

src/views/assets/orderDetail.vue

@@ -1980,7 +1980,7 @@ export default {
             if (typeof (commit.businessSubId) == 'undefined' || commit.businessSubId == null || commit.ifCheckTask == null) {
               this.$notify({
                 title: '提示',
-                message: '请选择一个产品后，再进行流程提交。',
+                message: '未选择产品，请前往产品信息选择产品后进行提交。',
                 type: 'error',
                 duration: 3000
               });

src/views/finance/fundClaim.vue

@@ -392,21 +392,33 @@
       </y-page-list-layout>
     </el-dialog>
     <el-dialog :visible.sync="myPersonalOrderDialog" width="90%" center custom-class="doWarehouseClass" @closed="getList">
-      <y-page-list-layout :page-list="myPersonalPageData" :page-para="majorListQuery" :get-page-list="getMyPersonalOrder">
+      <y-page-list-layout :page-list="myPersonalPageData" :page-para="personalListQuery" :get-page-list="getMyPersonalOrder">
         <template slot="left">
-          <el-input v-model="listQuery.name" placeholder="坐落" clearable
+          <el-input v-model="personalListQuery.keyword" placeholder="坐落" clearable
             style="margin-left: 20px;width: 270px;float: left;">
           </el-input>
-          <el-input v-model="listQuery.orderId" placeholder="订单号" clearable
+          <el-input v-model="personalListQuery.orderId" placeholder="订单号" clearable
             style="margin-left: 20px;width: 200px;float: left;">
           </el-input>
-          <el-input v-model="listQuery.clientManager" placeholder="客户经理" clearable
-            style="margin-left: 20px;width: 100px;float: left;">
+          <el-input v-model="personalListQuery.bailor" placeholder="委托人" clearable
+            style="margin-left: 20px;width: 200px;float: left;">
+          </el-input>
+          <el-input v-model="personalListQuery.clientName" placeholder="客户名称" clearable
+            style="margin-left: 20px;width: 200px;float: left;">
+          </el-input>
+          <el-input v-model="personalListQuery.clientSubName" placeholder="业务来源" clearable
+            style="margin-left: 20px;width: 200px;float: left;">
           </el-input>
-          <el-button class="filter-item" style="margin-left: 10px;float: left;" type="primary" @click="searchList"
+          <el-input v-model="personalListQuery.shouldAmount" placeholder="应收款" clearable
+            style="margin-left: 20px;width: 200px;float: left;">
+          </el-input>
+          <el-input v-model="personalListQuery.invoiceAmountCondition" placeholder="开票金额" clearable
+            style="margin-left: 20px;width: 200px;float: left;">
+          </el-input>
+          <el-button class="filter-item" style="margin-left: 10px;float: left;" type="primary" @click="getMyPersonalOrder"
             round>搜索
           </el-button>
-          <el-button class="filter-item" style="float: left;" round type="success" @click="resetSearch()">重置
+          <el-button class="filter-item" style="float: left;" round type="success" @click="getMyPersonalOrderResetSearch()">重置
           </el-button>
           <el-button class="filter-item" style="float: left;" round type="info" @click="downloadTemp()">下载模板
           </el-button>
@@ -495,7 +507,7 @@
           <el-switch style="width: 270px;float: left;margin-top: 5px;" v-model="toAssetsProd" active-color="#13ce66"
             inactive-color="#ff4949" active-text="认领到产品" inactive-text="认领到订单" disabled>
           </el-switch>
-          <el-input v-model="assetsListQuery.name" placeholder="订单/项目名称" clearable style="width: 270px;float: left;">
+          <el-input v-model="assetsListQuery.keyWord" placeholder="订单/项目名称" clearable style="width: 270px;float: left;">
           </el-input>
           <el-input v-model="assetsListQuery.orderId" placeholder="订单号" clearable
             style="margin-left: 20px;width: 200px;float: left;">
@@ -976,6 +988,11 @@ export default {
         size: 10,
         descs: 'id',
       },
+      personalListQuery: {
+        page: 1,
+        size: 10,
+        descs: 'id',
+      },
       allotPersonalAmountDialog:false,
     }
   },
@@ -1142,12 +1159,21 @@ export default {
       this.notInfo = this.notInfo + this.notClaimAmount + '￥'
     },
     getMyPersonalOrder() {
-      this.$api.personal.waitingClamOrder(Object.assign({'invoiceAmount':this.notClaimAmount}, this.majorListQuery)).then(res => {
+      this.$api.personal.waitingClamOrder(Object.assign({'invoiceAmount':this.notClaimAmount}, this.personalListQuery)).then(res => {
         if (res.code === 200) {
           this.myPersonalPageData = res.data;
         }
       })
     },
+    getMyPersonalOrderResetSearch() {
+      this.$router.push({ query: {} });
+      this.personalListQuery = {
+        current: 1,
+        size: 10,
+        descs: 'id',
+      }
+      this.getMyPersonalOrder()
+    },
     downloadTemp() {
       window.location.href = "/api/financeClaim/personal/claim/template"
     },