1.新增资产订单认领实收款列表

src/api/modules/assetsProduction.js

@@ -3,7 +3,13 @@ import request from '@/utils/request'
 * 资产业务
 */
 export default {
-    getMyAssetsOrder(params) {
+    // 获取资产业务产品实收款认领列表
+    getMyAssetsOrderProd(params) {
         return request.get(`assetsProduction/getAssetsProductionFundVoList`, { params: params })
+    },
+    // 获取资产业务订单实收款认领列表
+    getMyAssetsOrder(params) {
+        return request.get(`assetsProduction/getAssetsOrderFundVoList`, { params: params })
     }
+
 }

src/views/finance/fundClaim.vue

@@ -447,19 +447,18 @@
         </parentTable>
       </y-page-list-layout>
     </el-dialog>
-    <el-dialog :visible.sync="myAssetsOrderDialog" width="95%" center custom-class="doWarehouseClass" @closed="getList"
-      @open="getMyAssetsOrder">
-      <y-page-list-layout :page-list="myAssetsPageData" :page-para="assetsListQuery">
+    <el-dialog :visible.sync="myAssetsOrderDialog" width="95%" center custom-class="doWarehouseClass" @closed="getList">
+      <y-page-list-layout :page-list="myAssetsPageData" :page-para="assetsListQuery" :get-page-list="getMyAssetsOrderOrProd">
         <template slot="left">
-          <!-- <el-switch style="width: 270px;float: left;margin-top: 5px;" v-model="toProd" active-color="#13ce66"
+          <el-switch style="width: 270px;float: left;margin-top: 5px;" v-model="toAssetsProd" active-color="#13ce66"
             inactive-color="#ff4949" active-text="认领到产品" inactive-text="认领到订单">
-          </el-switch> -->
+          </el-switch>
           <el-input v-model="assetsListQuery.name" 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;">
           </el-input>
-          <el-input v-model="assetsListQuery.reportNo" placeholder="报告号" clearable
+          <el-input v-show="toAssetsProd" v-model="assetsListQuery.reportNo" placeholder="报告号" clearable
             style="margin-left: 20px;width: 200px;float: left;">
           </el-input>
           <el-select v-model="assetsListQuery.eDeclareResult" placeholder="评估人员申报" clearable
@@ -476,15 +475,20 @@
             <el-option value="未申报">未申报</el-option>
             <el-option value="审核拒绝">审核拒绝</el-option>
           </el-select>
-          <el-button class="filter-item" style="margin-left: 10px;float: left;" type="primary" @click="getMyAssetsOrder()"
-            round>搜索
+          <el-button v-show="toAssetsProd" class="filter-item" style="margin-left: 10px;float: left;" type="primary"
+            @click="getMyAssetsOrderProd()" round>搜索
           </el-button>
-          <el-button class="filter-item" style="float: left;" round type="success" @click="resetMajorOrderOrProd()">重置
+          <el-button v-show="!toAssetsProd" class="filter-item" style="margin-left: 10px;float: left;" type="primary"
+            @click="getMyAssetsOrder()" round>搜索
+          </el-button>
+          <el-button v-show="toAssetsProd" class="filter-item" style="float: left;" round type="success" @click="getMyAssetsProdResetSearch()">重置
+          </el-button>
+          <el-button v-show="!toAssetsProd" class="filter-item" style="float: left;" round type="success" @click="getMyAssetsOrderResetSearch()">重置
           </el-button>
           <el-button style="float: left;" round type="danger" @click="openClaimDialog()">选择认领</el-button>
         </template>
-        <parentTable ref="order" :clickRowToPick="false" :data="myAssetsPageData.records" slot="table" style="width: 100%;"
-          :selectionChange="handleSelectionChange">
+        <parentTable v-show="toAssetsProd" ref="prod" :clickRowToPick="false" :data="myAssetsPageData.records"
+          slot="table" style="width: 100%;" :selectionChange="handleSelectionChange">
           <el-table-column align="center" type="selection" claimOrders width="100" border="true"
             :selectable="checkSelectable">
           </el-table-column>
@@ -564,6 +568,59 @@
             </template>
           </el-table-column>
         </parentTable>
+        <parentTable v-show="!toAssetsProd" ref="order" :clickRowToPick="false" :data="myAssetsPageData.records"
+          slot="table" style="width: 100%;" :selectionChange="handleSelectionChange">
+          <el-table-column align="center" type="selection" claimOrders width="100" border="true"
+            :selectable="checkSelectable">
+          </el-table-column>
+          <el-table-column label="订单名称" align="center" width='400'>
+            <template slot-scope="{row}">
+              <span>{{ row.name }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="订单号" align="center" width='160'>
+            <template slot-scope="{row}">
+              <span>{{ row.orderId }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="客户名称" align="center">
+            <template slot-scope="{row}">
+              <span>{{ row.clienteleName }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="订单应收款(元)" align="center" width='120'>
+            <template slot-scope="{row}">
+              <span>{{ row.orderShouldAmount }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="订单实收款(元)" align="center" width='120'>
+            <template slot-scope="{row}">
+              <span>{{ row.orderRealAmount }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="市场人员" align="center" width='120'>
+            <template slot-scope="{row}">
+              <span>{{ row.marketUser }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" width='140' label="市场人员申报提成">
+            <template slot-scope="{row}">
+              <el-tag :type="row.mdeclareResult ? (row.mdeclareResult === '审核通过' ? 'success' : 'info') : 'danger'">{{
+                row.mdeclareResult ? row.mdeclareResult : '未申报' }}</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="评估人员" align="center" width='120'>
+            <template slot-scope="{row}">
+              <span>{{ row.evaluateUser }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" width='140' label="评估人员申报提成">
+            <template slot-scope="{row}">
+              <el-tag :type="row.edeclareResult ? (row.edeclareResult === '审核通过' ? 'success' : 'info') : 'danger'">{{
+                row.edeclareResult ? row.edeclareResult : '未申报' }}</el-tag>
+            </template>
+          </el-table-column>
+        </parentTable>
       </y-page-list-layout>
     </el-dialog>
   </div>
@@ -591,6 +648,18 @@ export default {
           this.getMyMajorOrder();
         }
       },
+
+      immediate: true
+    },
+    toAssetsProd: {
+      handler(value) {
+        if (value) {
+          this.getMyAssetsOrderProd();
+        } else {
+          this.getMyAssetsOrder();
+        }
+      },
+
       immediate: true
     }
   },
@@ -629,6 +698,7 @@ export default {
         creator: null
       },
       toProd: true,
+      toAssetsProd: true,
       myMajorOrderDialog: false,
       majorListQuery: {
         page: 1,
@@ -921,12 +991,44 @@ export default {
         descs: 'id',
       }
     },
+    getMyAssetsOrderProd() {
+      this.$api.assetsProduction.getMyAssetsOrderProd(this.assetsListQuery).then(res => {
+        if (res.code == 200) {
+          this.myAssetsPageData = res.data;
+        }
+      })
+    },
     getMyAssetsOrder() {
       this.$api.assetsProduction.getMyAssetsOrder(this.assetsListQuery).then(res => {
         if (res.code == 200) {
           this.myAssetsPageData = res.data;
         }
       })
+    },
+    getMyAssetsProdResetSearch() {
+      this.$router.push({ query: {} });
+      this.assetsListQuery = {
+        current: 1,
+        size: 10,
+        descs: 'id',
+      }
+      this.getMyAssetsOrderProd()
+    },
+    getMyAssetsOrderResetSearch() {
+      this.$router.push({ query: {} });
+      this.assetsListQuery = {
+        current: 1,
+        size: 10,
+        descs: 'id',
+      }
+      this.getMyAssetsOrder()
+    },
+    getMyAssetsOrderOrProd(){
+      if (this.toAssetsProd) {
+        this.getMyAssetsOrderProd();
+      }else{
+        this.getMyAssetsOrder();
+      }
     }
   },