1.修改资产实收款认领相关

src/views/finance/fundClaim.vue

@@ -447,8 +447,9 @@
         </parentTable>
       </y-page-list-layout>
     </el-dialog>
-    <el-dialog :visible.sync="myAssetsOrderDialog" width="90%" center custom-class="doWarehouseClass" @closed="getList">
-      <y-page-list-layout :page-list="myAssetsPageData" :page-para="assetsListQuery" :get-page-list="getMyAssetsOrder">
+    <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">
         <template slot="left">
           <!-- <el-switch style="width: 270px;float: left;margin-top: 5px;" v-model="toProd" active-color="#13ce66"
             inactive-color="#ff4949" active-text="认领到产品" inactive-text="认领到订单">
@@ -475,128 +476,74 @@
             <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 class="filter-item" style="margin-left: 10px;float: left;" type="primary" @click="getMyAssetsOrder()"
+            round>搜索
           </el-button>
           <el-button class="filter-item" style="float: left;" round type="success" @click="resetMajorOrderOrProd()">重置
           </el-button>
           <el-button style="float: left;" round type="danger" @click="openClaimDialog()">选择认领</el-button>
         </template>
-        <parentTable v-show="!toProd" ref="order" :clickRowToPick="false" :data="myMajorPageData.records" slot="table"
-          style="width: 100%;" :selectionChange="handleSelectionChange">
+        <parentTable 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" show-overflow-tooltip>
+          <el-table-column label="订单名称" align="center" width='400'>
             <template slot-scope="{row}">
-              <span>{{ row.orderName }}</span>
+              <span>{{ row.name }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="订单号" align="center" show-overflow-tooltip width='200'>
+          <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" show-overflow-tooltip width='100'>
+          <el-table-column label="报告号" align="center" width='400'>
             <template slot-scope="{row}">
-              <span>{{ row.bailor }}</span>
+              <span>{{ row.productionNo }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="产权人" align="center" show-overflow-tooltip width='100'>
+          <el-table-column label="报告类型" align="center">
             <template slot-scope="{row}">
-              <span>{{ row.owner }}</span>
+              <span v-if="row.productionType === 'STATEMENT'">价值意见书</span>
+              <span v-if="row.productionType == 'LETTER'">意见函</span>
+              <span v-if="row.productionType == 'CONSULT'">咨询报告</span>
+              <span v-if="row.productionType == 'REPORT'">评估报告</span>
             </template>
           </el-table-column>
-          <el-table-column label="客户名称" align="center" width='120' show-overflow-tooltip>
+          <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' show-overflow-tooltip>
-            <template slot-scope="{row}">
-              <span>{{ row.clienteleSubName }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="客户联系人" align="center" width='120' show-overflow-tooltip>
-            <template slot-scope="{row}">
-              <span>{{ row.clienteleContactName }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="应收款(元)" align="center" width='120'>
+          <el-table-column label="订单应收款(元)" align="center" width='120'>
             <template slot-scope="{row}">
-              <span>{{ row.shouldAmount }}</span>
+              <span>{{ row.orderShouldAmount }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="实收款(元)" align="center" width='120'>
+          <el-table-column label="订单实收款(元)" align="center" width='120'>
             <template slot-scope="{row}">
-              <span>{{ row.realAmount }}</span>
+              <span>{{ row.orderRealAmount }}</span>
             </template>
           </el-table-column>
-          <el-table-column align="center" width='140' label="市场人员申报提成">
+          <el-table-column label="产品应收款(元)" align="center" width='120'>
             <template slot-scope="{row}">
-              <el-tag :type="row.mdeclareResult ? (row.mdeclareResult === '审核通过' ? 'success' : 'info') : 'danger'">{{
-                row.mdeclareResult ? row.mdeclareResult : '未申报' }}</el-tag>
+              <span>{{ row.productionShouldAmount }}</span>
             </template>
           </el-table-column>
-          <el-table-column align="center" width='140' label="评估人员申报提成">
+          <el-table-column label="产品实收款(元)" align="center" width='120'>
             <template slot-scope="{row}">
-              <el-tag :type="row.edeclareResult ? (row.edeclareResult === '审核通过' ? 'success' : 'info') : 'danger'">{{
-                row.edeclareResult ? row.edeclareResult : '未申报' }}</el-tag>
+              <span>{{ row.productionRealAmount }}</span>
             </template>
           </el-table-column>
-        </parentTable>
-        <parentTable v-show="toProd" ref="prod" :clickRowToPick="false" :data="myMajorPageData.records" slot="table"
-          style="width: 100%;" :selectionChange="handleSelectionChange">
-          <el-table-column align="center" type="selection" claimOrders border="true" :selectable="checkSelectable">
-          </el-table-column>
-          <el-table-column label="金融类型" align="center" width='100'>
-            <template slot-scope="{row}">
-              <span>{{ row.financial == true ? '金融' : '非金融' }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="项目名称" align="center" show-overflow-tooltip>
-            <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" width='80'>
-            <template slot-scope="{row}">
-              <span>{{ row.production }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="产品编号" align="center" width='200'>
-            <template slot-scope="{row}">
-              <span>{{ row.reportNo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="客户名称" align="center" width='100'>
-            <template slot-scope="{row}">
-              <span>{{ row.clienteleName }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="收费标准" align="center" width='80'>
+          <el-table-column label="标准收费(元)" align="center" width='120'>
             <template slot-scope="{row}">
               <span>{{ row.standardAmount }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="订单应收款" align="center" width='100'>
-            <template slot-scope="{row}">
-              <span>{{ row.shouldAmount }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="实收款" align="center" width='80'>
-            <template slot-scope="{row}">
-              <span>{{ row.realAmount }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="市场人员" align="center" width='100'>
+          <el-table-column label="市场人员" align="center" width='120'>
             <template slot-scope="{row}">
-              <span>{{ row.clientManager }}</span>
+              <span>{{ row.marketUser }}</span>
             </template>
           </el-table-column>
           <el-table-column align="center" width='140' label="市场人员申报提成">
@@ -605,9 +552,9 @@
                 row.mdeclareResult ? row.mdeclareResult : '未申报' }}</el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="评估人员" align="center" width='100'>
+          <el-table-column label="评估人员" align="center" width='120'>
             <template slot-scope="{row}">
-              <span>{{ row.principal }}</span>
+              <span>{{ row.evaluateUser }}</span>
             </template>
           </el-table-column>
           <el-table-column align="center" width='140' label="评估人员申报提成">
@@ -726,7 +673,7 @@ export default {
           }
         }]
       },
-      myAssetsPageData: {records: []},
+      myAssetsPageData: { records: [] },
       assetsListQuery: {
         page: 1,
         size: 10,
@@ -974,9 +921,9 @@ export default {
         descs: 'id',
       }
     },
-    getMyAssetsOrder(){
+    getMyAssetsOrder() {
       this.$api.assetsProduction.getMyAssetsOrder(this.assetsListQuery).then(res => {
-        if(res.code == 200){
+        if (res.code == 200) {
           this.myAssetsPageData = res.data;
         }
       })