浏览代码

推荐匹配bug修改

wucl 10 月之前
父节点
当前提交
1bcd4936e4
共有 1 个文件被更改,包括 8 次插入7 次删除
  1. 8 7
      src/views/finance/fundClaim.vue

+ 8 - 7
src/views/finance/fundClaim.vue

@@ -440,7 +440,7 @@
               <span>{{ row.orderId }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="委托人" align="center" width='100'>
+          <el-table-column label="委托人" align="center" width='100' show-overflow-tooltip>
             <template slot-scope="{row}">
               <span>{{ row.bailorA }} {{ row.bailorB }}</span>
             </template>
@@ -455,7 +455,7 @@
               <span>{{ row.clientSubName }}</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.agent == null ? '-' : row.agent }}</span>
             </template>
@@ -1142,7 +1142,7 @@ export default {
       this.notInfo = this.notInfo + this.notClaimAmount + '¥'
     },
     getMyPersonalOrder() {
-      this.$api.personal.waitingClamOrder(this.listQuery).then(res => {
+      this.$api.personal.waitingClamOrder(Object.assign({'invoiceAmount':this.notClaimAmount}, this.majorListQuery)).then(res => {
         if (res.code === 200) {
           this.myPersonalPageData = res.data;
         }
@@ -1255,10 +1255,10 @@ export default {
       this.getMyMajorProd();
     },
     claimPersonal(row) {
-      this.getMyPersonalOrder();
       this.myPersonalOrderDialog = true;
       this.financeFundId = row.id;
       this.notClaimAmount = row.notClaimAmount;
+      this.getMyPersonalOrder();
     },
     getMajorOrderOrProd() {
       if (this.toProd) {
@@ -1275,10 +1275,11 @@ export default {
       }
     },
     claimAssets(row) {
-      this.getMyAssetsOrderProd();
-      this.myAssetsOrderDialog = true;
       this.notClaimAmount = row.notClaimAmount;
+      this.myAssetsOrderDialog = true;
       this.financeFundId = row.id;
+      this.getMyAssetsOrderProd();
+      
     },
     resetAssetsListQuery() {
       this.assetsListQuery = {
@@ -1288,7 +1289,7 @@ export default {
       }
     },
     getMyAssetsOrderProd() {
-      this.$api.assetsProduction.getMyAssetsOrderProd(this.assetsListQuery).then(res => {
+      this.$api.assetsProduction.getMyAssetsOrderProd(Object.assign({'invoiceAmount':this.notClaimAmount}, this.assetsListQuery)).then(res => {
         if (res.code == 200) {
           this.myAssetsPageData = res.data;
         }