1.资产实收款认领到产品与订单开发

2.资产订单实收款分配到产品开发
3.其他页面调整与BUG修复

src/api/modules/assetsProduction.js

@@ -10,6 +10,14 @@ export default {
     // 获取资产业务订单实收款认领列表
     getMyAssetsOrder(params) {
         return request.get(`assetsProduction/getAssetsOrderFundVoList`, { params: params })
+    },
+    // 根据订单收款id获取产品收款信息
+    getProductionFundByOrderFundId(params){
+        return request.get(`assetsProduction/getProductionFundByOrderFundId/${params}`)
+    },
+    // 资产分配订单实收款到产品
+    allotOrderRealAmountToProduction(params){
+        return request.post(`assetsProduction/allotOrderRealAmountToProduction`, params )
     }
 
 }

src/api/modules/businessProduction.js

@@ -3,34 +3,42 @@ import request from '@/utils/request'
 * 业务产品
 */
 export default {
-   bag(params1){
-    return request.get(`businessProduction/bag/major/${params1}`)
+   bag(params1) {
+      return request.get(`businessProduction/bag/major/${params1}`)
    },
-   orderReports(params){
-      return request.post(`businessProduction/report/major`,params)
+   orderReports(params) {
+      return request.post(`businessProduction/report/major`, params)
    },
-   allotRealAmount(params){
-      return request.post(`businessProduction/allotRealAmount/major`,params)
+   allotRealAmount(params) {
+      return request.post(`businessProduction/allotRealAmount/major`, params)
    },
-   getProductionByOrderFundId(params){
+   getProductionByOrderFundId(params) {
       return request.get(`businessProduction/major/${params}`)
    },
-   allotMajorProduction(params){
-      return request.post(`businessProduction/major/allot`,params)
+   allotMajorProduction(params) {
+      return request.post(`businessProduction/major/allot`, params)
    },
-   doStamp(params){
+   doStamp(params) {
       return request.post(`businessProduction/doStamp`, params)
    },
-   personalBag(params){
+   personalBag(params) {
       return request.get(`businessProduction/bag/personal/${params}`)
    },
-   personalAllotRealAmount(params){
-      return request.post(`businessProduction/allotRealAmount/personal`,params)
+   personalAllotRealAmount(params) {
+      return request.post(`businessProduction/allotRealAmount/personal`, params)
    },
-   getValidateInfo(params1,params2){
+   getValidateInfo(params1, params2) {
       return request.get(`businessProduction/validate/${params1}/${params2}`)
    },
-   allotRealAmountToOrder(params){
-      return request.post(`businessProduction/allotRealAmountOrder/major`,params)
+   allotRealAmountToOrder(params) {
+      return request.post(`businessProduction/allotRealAmountOrder/major`, params)
    },
+   // 资产认领实收款到 订单
+   assetsDoAllotRealAmountToOrder(params) {
+      return request.post(`businessProduction/assets/doAllotRealAmountToOrder`, params)
+   },
+   // 资产认领实收款到 产品
+   assetsDoAllotRealAmountToProd(params) {
+      return request.post(`businessProduction/assets/doAllotRealAmountToProd`, params)
+   }
 }

src/views/assets/myOrderList.vue

@@ -116,6 +116,11 @@
                         <span>{{ row.productionShouldAmount }}</span>
                     </template>
                 </el-table-column>
+                <el-table-column label="产品实收款(元)" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.productionRealAmount }}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column label="标准收费(元)" align="center" width="150">
                     <template slot-scope="{row}">
                         <span>{{ row.standardAmount }}</span>
@@ -139,7 +144,9 @@
                 <el-table-column label="操作" align="center" :min-width="dynamicWidth" fixed="right">
                     <template slot-scope="{row}">
                         <div class="optionDiv" style="white-space: nowrap; display: inline-block">
-                            <el-button type="danger" size="mini" v-if="(!row.reportDelivery || row.reportDelivery == null) && row.reportRepertoryState">
+                            <el-button type="danger" size="mini"
+                                v-if="(!row.reportDelivery || row.reportDelivery == null) && row.reportRepertoryState"
+                                @click="markDelivery(row)">
                                 标记送达
                             </el-button>
                             <el-button type="success" size="mini" @click="orderDetail(row)">
@@ -148,12 +155,18 @@
                             <el-button type="primary" size="mini" @click="openShouldAmountDialog(row)">
                                 订单应收款
                             </el-button>
-                            <el-button v-if="row.reportNo !== null" type="success" size="mini" @click="openProShouldAmountDialog(row)">
+                            <el-button v-if="row.reportNo !== null" type="success" size="mini"
+                                @click="openProShouldAmountDialog(row)">
                                 产品应收款
                             </el-button>
-                            <el-button v-if="row.currentNodeCode === 'REPORT_OUT_APPLY'" type="danger" size="mini" @click="openRepertoryOutWarehouse(row)">
+                            <el-button v-if="row.currentNodeCode === 'REPORT_OUT_APPLY'" type="danger" size="mini"
+                                @click="openRepertoryOutWarehouse(row)">
                                 申请提前出库
                             </el-button>
+                            <el-button v-if="row.realAmount > 0" type="danger" size="mini"
+                                @click="openAllotProductionDialog(row)">
+                                实收款分配
+                            </el-button>
                             <!-- <el-button v-if="row.currentNodeCode === 'REPORT_OUT_APPLY'" type="text"
                             @click="canceladdRepertoryOutWarehouse(row)">
                             撤销出库申请 
@@ -231,6 +244,98 @@
                 <el-button type="primary" @click="addRepertoryOutWarehouse()">确 定</el-button>
             </span>
         </el-dialog>
+        <!-- 分配资产订单实收款到产品 -->
+        <el-dialog :visible.sync="allotAmountDialog" width="65%" center custom-class="doWarehouseClass">
+            <el-form v-model="orderProduction" ref="orderProduction">
+                <el-row>
+                    <el-col :xs="24" :sm="12" :lg="24" :span="6">
+                        <el-button style="float:right" type="success" @click="allotOrderRealAmountToProduction()">确认分配</el-button>
+                    </el-col>
+                </el-row>
+                <el-card style="margin-top:20px" shadow="hover">
+                    <div slot="header" class="clearfix">
+                        <el-row>
+                            <el-col :xs="24" :sm="12" :lg="12" :span="6">
+                                <el-form-item label="订单名称：" prop="orderName" label-width="140px"
+                                    class="postInfo-container-item">
+                                    <el-input :value="orderProduction.orderName" type="text" class="filter-item" disabled
+                                        readonly />
+                                </el-form-item>
+                            </el-col>
+                            <el-col :xs="24" :sm="12" :lg="12" :span="6">
+                                <el-form-item label="订单号：" prop="orderId" label-width="140px"
+                                    class="postInfo-container-item">
+                                    <el-input :value="orderProduction.orderId" type="text" class="filter-item" disabled
+                                        readonly />
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <el-row>
+                            <el-col :xs="24" :sm="12" :lg="12" :span="6">
+                                <el-form-item label="订单已认领金额：" prop="realAmount" label-width="160px"
+                                    :class="['postInfo-container-item', 'real-amount']">
+                                    <el-input :value="orderProduction.realAmount" type="text" class="filter-item" disabled
+                                        readonly>
+                                        <template slot="append">元</template>
+                                    </el-input>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :xs="24" :sm="12" :lg="12" :span="6">
+                                <el-form-item label="未分配金额：" prop="notAllotAmount" label-width="160px"
+                                    :class="['postInfo-container-item', 'real-amount']">
+                                    <el-input :value="notAllotAmount" type="text" class="filter-item" disabled readonly>
+                                        <template slot="append">元</template>
+                                    </el-input>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </div>
+                    <el-row>
+                        <el-col :xs="24" :sm="12" :lg="12" :span="6">
+                            <el-form-item label="产品列表：" prop="orderName" label-width="140px"
+                                class="postInfo-container-item" />
+                        </el-col>
+                    </el-row>
+                    <div v-if="orderProduction.reports != null && orderProduction.reports.length > 0">
+                        <el-row v-for="(r, index) in orderProduction.reports">
+                            <div>
+                                <el-col :xs="24" :sm="12" :lg="5" :span="6">
+                                    <el-form-item :label="productionLabel + (index + 1) + ':'" prop="productionType"
+                                        label-width="90px" class="postInfo-container-item">
+                                        <el-input :value="r.productionType" type="text" class="filter-item" disabled
+                                            readonly />
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :xs="24" :sm="12" :lg="7" :span="6">
+                                    <el-form-item label="报告号：" prop="businessSubId" label-width="90px"
+                                        class="postInfo-container-item">
+                                        <el-input :value="r.businessSubId" type="text" class="filter-item" disabled
+                                            readonly />
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                                    <el-form-item label="已分配金额：" prop="claimedAmount" label-width="120px"
+                                        class="postInfo-container-item">
+                                        <el-input-number :precision="2" :min="0" :value-on-clear="0"
+                                            v-model.number="r.claimedAmount" type="number" style="width:100%"
+                                            class="filter-item" readonly disabled />
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                                    <el-form-item label="本次分配：" prop="thisTimeAmount" label-width="100px"
+                                        class="postInfo-container-item">
+                                        <el-input-number :precision="2" :min="0" :value-on-clear="0"
+                                            v-model.number="r.thisTimeAmount" type="number" style="width:100%"
+                                            class="filter-item" />
+                                    </el-form-item>
+                                </el-col>
+                            </div>
+                        </el-row>
+                    </div>
+                    <span v-else style="margin-left:140px;color:RGB(153,153,153)">暂无产品</span>
+                </el-card>
+            </el-form>
+        </el-dialog>
     </div>
 </template>
 
@@ -320,6 +425,16 @@ export default {
                 orderFundId: null,
                 productionShouldAmount: null,
                 remark: null
+            },
+            allotAmountDialog: false,
+            notAllotAmount: null,
+            productionLabel: "产品",
+            orderProduction: {
+                reports: [],
+                orderName: null,
+                orderId: null,
+                realAmount: null,
+                id: null
             }
         }
     },
@@ -631,20 +746,73 @@ export default {
                     }
                 }
             })
-        }
-    },
-    // 标记产品送达
-    markDelivery(row) {
-        this.$api.assets.markDelivery(row.reportNo).then(res => {
-            if (res.code === 200 && res.data) {
+        },
+        // 标记产品送达
+        markDelivery(row) {
+            this.$api.assets.markDelivery(row.reportNo).then(res => {
+                if (res.code === 200 && res.data) {
+                    this.$notify({
+                        title: '成功',
+                        message: '标记送达成功！',
+                        type: 'success',
+                        duration: 1000
+                    });
+                }
+            })
+        },
+        // 打开分配弹窗
+        openAllotProductionDialog(row) {
+            if (!row.shouldAmount) {
                 this.$notify({
-                    title: '成功',
-                    message: '标记送达成功！',
-                    type: 'success',
-                    duration: 1000
+                    title: '提示',
+                    message: '该订单还没有认领实收款，请先认领实收款后再分配给产品。',
+                    type: 'info',
+                    duration: 3000
                 });
+                return;
+            }
+            this.getProductionFundByOrderFundId(row.orderFundId);
+            this.orderProduction.orderId = row.orderId;
+            this.orderProduction.orderName = row.name;
+            this.orderProduction.realAmount = row.realAmount;
+            this.orderProduction.orderFundId = row.orderFundId;
+            this.allotAmountDialog = true;
+        },
+        getProductionFundByOrderFundId(orderFundId) {
+            if (orderFundId) {
+                this.$api.assetsProduction.getProductionFundByOrderFundId(orderFundId).then(res => {
+                    if (res.code === 200) {
+                        this.orderProduction.reports = res.data;
+                        let allotAmount = res.data.map(item => item.claimedAmount).reduce(function (prev, cur) {
+                            return prev + cur;
+                        }, 0);
+                        this.notAllotAmount = this.orderProduction.realAmount - allotAmount;
+                        this.allotAmountDialog = true;
+                    }
+                })
             }
-        })
+        },
+        allotOrderRealAmountToProduction() {
+            this.$api.assetsProduction.allotOrderRealAmountToProduction(this.orderProduction).then(res => {
+                if (res.code === 200 && res.data) {
+                    this.$notify({
+                        title: '成功',
+                        message: '实收款分配成功',
+                        type: 'success',
+                        duration: 2000
+                    });
+                    this.allotAmountDialog = false;
+                    this.selectMyOrderPage();
+                } else {
+                    this.$notify({
+                        title: '失败',
+                        message: '实收款分配失败',
+                        type: 'error',
+                        duration: 2000
+                    });
+                }
+            })
+        }
     }
 }
 </script>

src/views/finance/fundClaim.vue

@@ -80,7 +80,7 @@
           <template slot-scope="{row}">
             <el-button type="text" @click="claimMajor(row)">大中型</el-button>
             <el-button type="text" @click="claimPersonal()">个贷</el-button>
-            <el-button type="text" @click="claimAssets()">资产</el-button>
+            <el-button type="text" @click="claimAssets(row)">资产</el-button>
           </template>
         </el-table-column>
       </parentTable>
@@ -447,8 +447,9 @@
         </parentTable>
       </y-page-list-layout>
     </el-dialog>
-    <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">
+    <el-dialog :visible.sync="myAssetsOrderDialog" width="97%" 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="toAssetsProd" active-color="#13ce66"
             inactive-color="#ff4949" active-text="认领到产品" inactive-text="认领到订单">
@@ -481,14 +482,16 @@
           <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 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 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>
+          <el-button style="float: left;" round type="danger" @click="openAssetsClaimDialog()">选择认领</el-button>
         </template>
         <parentTable v-show="toAssetsProd" ref="prod" :clickRowToPick="false" :data="myAssetsPageData.records"
-          slot="table" style="width: 100%;" :selectionChange="handleSelectionChange">
+          slot="table" style="width: 100%;" :selectionChange="assetsHandleSelectionChange">
           <el-table-column align="center" type="selection" claimOrders width="100" border="true"
             :selectable="checkSelectable">
           </el-table-column>
@@ -569,52 +572,52 @@
           </el-table-column>
         </parentTable>
         <parentTable v-show="!toAssetsProd" ref="order" :clickRowToPick="false" :data="myAssetsPageData.records"
-          slot="table" style="width: 100%;" :selectionChange="handleSelectionChange">
+          slot="table" style="width: 100%;" :selectionChange="assetsHandleSelectionChange">
           <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'>
+          <el-table-column label="订单名称" align="center" width='600'>
             <template slot-scope="{row}">
               <span>{{ row.name }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="订单号" align="center" width='160'>
+          <el-table-column label="订单号" align="center" width='250'>
             <template slot-scope="{row}">
               <span>{{ row.orderId }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="客户名称" align="center">
+          <el-table-column label="客户名称" align="center" width='200'>
             <template slot-scope="{row}">
               <span>{{ row.clienteleName }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="订单应收款(元)" align="center" width='120'>
+          <el-table-column label="订单应收款(元)" align="center" width='200'>
             <template slot-scope="{row}">
               <span>{{ row.orderShouldAmount }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="订单实收款(元)" align="center" width='120'>
+          <el-table-column label="订单实收款(元)" align="center" width='200'>
             <template slot-scope="{row}">
               <span>{{ row.orderRealAmount }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="市场人员" align="center" width='120'>
+          <el-table-column label="市场人员" align="center" width='200'>
             <template slot-scope="{row}">
               <span>{{ row.marketUser }}</span>
             </template>
           </el-table-column>
-          <el-table-column align="center" width='140' label="市场人员申报提成">
+          <el-table-column align="center" width='215' 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'>
+          <el-table-column label="评估人员" align="center" width='200'>
             <template slot-scope="{row}">
               <span>{{ row.evaluateUser }}</span>
             </template>
           </el-table-column>
-          <el-table-column align="center" width='140' label="评估人员申报提成">
+          <el-table-column align="center" width='215' label="评估人员申报提成">
             <template slot-scope="{row}">
               <el-tag :type="row.edeclareResult ? (row.edeclareResult === '审核通过' ? 'success' : 'info') : 'danger'">{{
                 row.edeclareResult ? row.edeclareResult : '未申报' }}</el-tag>
@@ -623,6 +626,118 @@
         </parentTable>
       </y-page-list-layout>
     </el-dialog>
+    <el-dialog :visible.sync="allotAssetsAmountDialog" width="45%" center custom-class="doWarehouseClass"
+      @closed="cleanClaimDTO">
+      <el-form v-model="claimOrders" ref="claimOrdersForm">
+        <el-row>
+          <el-col :xs="24" :sm="12" :lg="21" :span="6">
+            <div style="font-size:20px;">
+              <span>此笔实收款剩余：</span><span style="color:red;font-weight:bold">{{ notClaimAmount }}￥</span>
+            </div>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="3" :span="6">
+            <el-button style="float:right" type="success" @click="assetsDoAllotRealAmountToOrder()">确认认领</el-button>
+          </el-col>
+        </el-row>
+        <el-card style="margin-top:20px" v-for="(p, id) in claimOrders" shadow="hover">
+          <div slot="header" class="clearfix">
+            <el-row>
+              <el-col :xs="24" :sm="12" :lg="24" :span="6">
+                <el-form-item label="订单名称" prop="orderName" label-width="140px" class="postInfo-container-item">
+                  <el-input :value="p.name" type="text" class="filter-item" disabled readonly />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :xs="24" :sm="12" :lg="12" :span="6">
+                <span class="redPoint">*</span>
+                <el-form-item label="本次认领金额：" prop="thisTimeAmount" label-width="140px" class="postInfo-container-item">
+                  <el-input-number :precision="2" :min="0" :value-on-clear="0" v-model.number="p.thisTimeAmount"
+                    style="width:100%" class="filter-item" />
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="12" :span="6">
+                <el-form-item label="订单号" prop="orderId" label-width="140px" class="postInfo-container-item">
+                  <el-input :value="p.orderId" type="text" class="filter-item" disabled readonly />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :xs="24" :sm="12" :lg="12" :span="6">
+                <el-form-item label="已认领金额：" prop="realAmount" label-width="140px" class="postInfo-container-item">
+                  <el-input :value="p.realAmount" type="text" class="filter-item" disabled readonly>
+                    <template slot="append">元</template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="12" :span="6">
+                <el-form-item label="订单应收金额：" prop="shouldAmount" label-width="140px" class="postInfo-container-item">
+                  <el-input :value="p.shouldAmount" type="text" class="filter-item" disabled readonly>
+                    <template slot="append">元</template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+        </el-card>
+      </el-form>
+    </el-dialog>
+    <el-dialog :visible.sync="allotAssetsProdDialog" width="45%" center custom-class="doWarehouseClass"
+      @closed="cleanClaimDTO">
+      <el-form v-model="claimOrders" ref="claimOrdersForm">
+        <el-row>
+          <el-col :xs="24" :sm="12" :lg="21" :span="6">
+            <div style="font-size:20px;">
+              <span>此笔实收款剩余：</span><span style="color:red;font-weight:bold">{{ notClaimAmount }}￥</span>
+            </div>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="3" :span="6">
+            <el-button style="float:right" type="success" @click="assetsDoAllotRealAmountToProd()">确认认领</el-button>
+          </el-col>
+        </el-row>
+        <el-card style="margin-top:20px" v-for="(p, id) in claimOrders" shadow="hover">
+          <div slot="header" class="clearfix">
+            <el-row>
+              <el-col :xs="24" :sm="12" :lg="24" :span="6">
+                <el-form-item label="订单名称：" prop="name" label-width="140px" class="postInfo-container-item">
+                  <el-input :value="p.name" type="text" class="filter-item" disabled readonly />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :xs="24" :sm="12" :lg="12" :span="6">
+                <span class="redPoint">*</span>
+                <el-form-item label="本次认领金额：" prop="thisTimeAmount" label-width="140px" class="postInfo-container-item">
+                  <el-input-number :precision="2" :min="0" :value-on-clear="0" v-model.number="p.thisTimeAmount"
+                    style="width:100%" class="filter-item" />
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="12" :span="6">
+                <el-form-item label="报告号：" prop="reportNo" label-width="140px" class="postInfo-container-item">
+                  <el-input :value="p.reportNo" type="text" class="filter-item" disabled readonly />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :xs="24" :sm="12" :lg="12" :span="6">
+                <el-form-item label="已认领金额：" prop="realAmount" label-width="140px" class="postInfo-container-item">
+                  <el-input :value="p.realAmount" type="text" class="filter-item" disabled readonly>
+                    <template slot="append">元</template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="12" :span="6">
+                <el-form-item label="产品应收金额：" prop="shouldAmount" label-width="140px" class="postInfo-container-item">
+                  <el-input :value="p.shouldAmount" type="text" class="filter-item" disabled readonly>
+                    <template slot="append">元</template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+        </el-card>
+      </el-form>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -684,6 +799,8 @@ export default {
       myAssetsOrderDialog: false,
       allotAmountDialog: false,
       allotProdDialog: false,
+      allotAssetsAmountDialog: false,
+      allotAssetsProdDialog: false,
       realFund: {
         id: null,
         payer: null,
@@ -843,6 +960,29 @@ export default {
       }
       this.claimOrders = pickeds;
     },
+    assetsHandleSelectionChange(val) {
+      let pickeds = [];
+      for (let i in val) {
+        let picked = new Object();
+        picked.id = val[i].id;
+        picked.orderName = val[i].name;
+        picked.name = val[i].name;
+        picked.reportNo = val[i].productionNo;
+        picked.orderId = val[i].orderId;
+        if (this.toAssetsProd) {
+          picked.shouldAmount = val[i].productionShouldAmount;
+          picked.realAmount = val[i].productionRealAmount;
+        } else {
+          picked.shouldAmount = val[i].orderShouldAmount;
+          picked.realAmount = val[i].orderRealAmount;
+        }
+        picked.orderFundId = val[i].orderFundId;
+        picked.financeFundId = this.financeFundId;
+        picked.productionFundId = val[i].productionFundId;
+        pickeds.push(picked);
+      }
+      this.claimOrders = pickeds;
+    },
     openClaimDialog() {
       if (this.claimOrders.length === 0) {
         this.$notify({
@@ -861,7 +1001,24 @@ export default {
 
       this.notInfo = this.notInfo + this.notClaimAmount + '￥'
     },
+    openAssetsClaimDialog() {
+      if (this.claimOrders.length === 0) {
+        this.$notify({
+          title: '提示',
+          message: '请先选择订单，然后认领。',
+          type: 'info',
+          duration: 2000
+        });
+        return;
+      }
+      if (this.toAssetsProd) {
+        this.allotAssetsProdDialog = true;
+      } else {
+        this.allotAssetsAmountDialog = true;
+      }
 
+      this.notInfo = this.notInfo + this.notClaimAmount + '￥'
+    },
     getMyPersonalOrder() {
       this.$api.personal.waitingClamOrder(this.listQuery).then(res => {
         if (res.code === 200) {
@@ -981,8 +1138,10 @@ export default {
         this.getMyMajorOrderResetSearch();
       }
     },
-    claimAssets() {
+    claimAssets(row) {
       this.myAssetsOrderDialog = true;
+      this.notClaimAmount = row.notClaimAmount;
+      this.financeFundId = row.id;
     },
     resetAssetsListQuery() {
       this.assetsListQuery = {
@@ -1023,12 +1182,72 @@ export default {
       }
       this.getMyAssetsOrder()
     },
-    getMyAssetsOrderOrProd(){
+    getMyAssetsOrderOrProd() {
       if (this.toAssetsProd) {
         this.getMyAssetsOrderProd();
-      }else{
+      } else {
         this.getMyAssetsOrder();
       }
+    },
+    // 资产认领实收款到 订单
+    assetsDoAllotRealAmountToOrder() {
+      const orders = this.claimOrders;
+      for (let i in orders) {
+        if (!orders[i].thisTimeAmount) {
+          this.$message.error("订单号:[" + orders[i].orderId + "],本次认领金额不能为空。");
+          return;
+        }
+      }
+      this.$api.businessProduction.assetsDoAllotRealAmountToOrder(this.claimOrders).then(res => {
+        if (res.code === 200 && res.data) {
+          this.$notify({
+            title: '成功',
+            message: '实收款认领成功',
+            type: 'success',
+            duration: 2000
+          });
+          this.getMyAssetsOrder();
+          this.allotAssetsAmountDialog = false;
+          this.allotAssetsProdDialog = false;
+        } else {
+          this.$notify({
+            title: '失败',
+            message: '实收款认领失败',
+            type: 'error',
+            duration: 2000
+          });
+        }
+      })
+    },
+    // 资产认领实收款到 产品
+    assetsDoAllotRealAmountToProd() {
+      const orders = this.claimOrders;
+      for (let i in orders) {
+        if (!orders[i].thisTimeAmount) {
+          this.$message.error("报告号:[" + orders[i].reportNo + "],本次认领金额不能为空。");
+          return;
+        }
+      }
+      this.$api.businessProduction.assetsDoAllotRealAmountToProd(this.claimOrders).then(res => {
+        if (res.code === 200 && res.data) {
+          this.$notify({
+            title: '成功',
+            message: '实收款认领成功',
+            type: 'success',
+            duration: 2000
+          });
+          this.getMyAssetsOrderProd();
+          this.allotAssetsAmountDialog = false;
+          this.allotAssetsProdDialog = false;
+        } else {
+          this.$notify({
+            title: '失败',
+            message: '实收款认领失败',
+            type: 'error',
+            duration: 2000
+          });
+        }
+      })
     }
   },