实收款认领推荐

src/api/modules/financeRealFund.js

@@ -6,6 +6,9 @@ export default {
   list(params) {
     return request.get(`financeRealFund`, { params: params })
   },
+  claimList(params) {
+    return request.get(`financeRealFund/claim`, { params: params })
+  },
   detail(params) {
     return request.get(`financeRealFund/${params}`)
   },

src/components/BaseTable/parentTable.vue

@@ -35,7 +35,9 @@ export default {
       type: Boolean,
     },
     showSummary: false,
+
     summaryMethod: null,
+
     selectionChange: {
       type: Function,
       default: function () {
@@ -46,7 +48,6 @@ export default {
       default: true,
       type: Boolean,
     },
-
   },
 
   computed: {
@@ -98,3 +99,4 @@ export default {
   },
 };
 </script>
+

src/views/finance/fundClaim.vue

@@ -76,11 +76,17 @@
             <span>{{ row.remark }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="200" fixed="right">
+        <el-table-column label="认领" align="center" width="200" fixed="right">
           <template slot-scope="{row}">
-            <el-button type="text" @click="claimMajor(row)">大中型</el-button>
-            <el-button type="text" @click="claimPersonal(row)">个贷</el-button>
-            <el-button type="text" @click="claimAssets(row)">资产</el-button>
+            <el-tooltip effect="light" :disabled="!row.recommends.includes('MAJOR_BUSINESS')" class="item"  content="推荐" placement="top-start">
+              <el-button type="text" @click="claimMajor(row)" :style="row.recommends.includes('MAJOR_BUSINESS')?'color:red':''">大中型</el-button>
+            </el-tooltip>
+            <el-tooltip effect="light" :disabled="!row.recommends.includes('PERSONAL_BUSINESS')" class="item"  content="推荐" placement="top-start">
+              <el-button type="text" @click="claimPersonal(row)" :style="row.recommends.includes('PERSONAL_BUSINESS')?'color:red':''">个贷</el-button>
+            </el-tooltip>
+            <el-tooltip effect="light" :disabled="!row.recommends.includes('ASSET_BUSINESS')" class="item"  content="推荐" placement="top-start">
+              <el-button type="text" @click="claimAssets(row)" :style="row.recommends.includes('ASSET_BUSINESS')?'color:red':''">资产</el-button>
+            </el-tooltip>
           </template>
         </el-table-column>
       </parentTable>
@@ -295,10 +301,21 @@
             </template>
           </el-table-column>
         </parentTable>
-        <parentTable v-show="toProd" ref="prod" :clickRowToPick="false" :data="myMajorPageData.records" slot="table"
-          style="width: 100%; height: 50%;" :selectionChange="handleSelectionChange"  :isBoard=500>
+        <el-table v-show="toProd" ref="prod" :data="myMajorPageData.records" slot="table"
+          :header-row-style="{ color: '#333333' }" style="
+            border-left: 1px solid #ebeced;
+            border-right: 1px solid #ebeced;
+            color: #333333; font-size: 14px
+          " @selection-change="handleSelectionChange"  :rowClassName="tableRowClassName">
           <el-table-column align="center" type="selection" claimOrders border="true" :selectable="checkSelectable">
           </el-table-column>
+          <el-table-column align="center"  width='100'>
+            <template slot-scope="{row}">
+              <span style="color:red">
+                {{ row.invoiceAmount === notClaimAmount ? '推荐匹配' : '' }}
+              </span>
+            </template>
+          </el-table-column>
           <el-table-column label="金融类型" align="center" width='100'>
             <template slot-scope="{row}">
               <span>{{ row.financial == true ? '金融' : '非金融' }}</span>
@@ -344,6 +361,11 @@
               <span style="color:red;font-weight:bold">{{ row.realAmount==null? 0 : row.realAmount }}</span>
             </template>
           </el-table-column>
+          <el-table-column label="开票金额(￥)" align="center" width='80'>
+            <template slot-scope="{row}">
+              <span >{{ row.invoiceAmount?row.invoiceAmount:'--'}}</span>
+            </template>
+          </el-table-column>
           <el-table-column label="市场人员" align="center" width='100'>
             <template slot-scope="{row}">
               <span>{{ row.clientManager }}</span>
@@ -366,7 +388,7 @@
                 row.edeclareResult ? row.edeclareResult : '未申报' }}</el-tag>
             </template>
           </el-table-column>
-        </parentTable>
+        </el-table>
       </y-page-list-layout>
     </el-dialog>
     <el-dialog :visible.sync="myPersonalOrderDialog" width="90%" center custom-class="doWarehouseClass" @closed="getList">
@@ -394,11 +416,21 @@
           <el-button style="margin-left: 10px ;float: left;" round type="danger"
             @click="openPersonalOrderDialog()">选择认领</el-button>
         </template>
-        <parentTable ref="table" :clickRowToPick="false" :data="myPersonalPageData.records" slot="table"
-          style="width: 100%;" :selectionChange="handleSelectionChange" :isBoard=500>
+        <el-table ref="table" :data="myPersonalPageData.records"  slot="table"
+            :header-row-style="{ color: '#333333' }" style="
+            border-left: 1px solid #ebeced; 
+            border-right: 1px solid #ebeced; font-size: 14px;
+            color: #333333;" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
           <el-table-column align="center" type="selection" claimOrders width="100" border="true">
           </el-table-column>
-          <el-table-column label="坐落" align="center">
+          <el-table-column align="center"  width='100'>
+            <template slot-scope="{row}">
+              <span style="color:red">
+                {{ row.invoiceAmount === notClaimAmount ? '推荐匹配' : '' }}
+              </span>
+            </template>
+          </el-table-column>
+          <el-table-column label="坐落" align="center" show-overflow-tooltip>
             <template slot-scope="{row}">
               <span>{{ row.orderName }}</span>
             </template>
@@ -433,17 +465,27 @@
               <span>{{ row.contactName }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="已认领(元)" align="center">
+          <el-table-column label="应收款(￥)" align="center" width='100'>
+            <template slot-scope="{row}">
+              <span>{{ row.shouldAmount?row.shouldAmount:'--' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="实收款(元)" align="center">
             <template slot-scope="{row}">
               <span style="color:red;font-weight: bold;">{{ row.realAmount ? row.realAmount : 0 }}</span>
             </template>
           </el-table-column>
+          <el-table-column label="开票金额(￥)" align="center" width='100'>
+            <template slot-scope="{row}">
+              <span>{{ row.invoiceAmount?row.invoiceAmount:'--' }}</span>
+            </template>
+          </el-table-column>
           <el-table-column align="center" show-overflow-tooltip width='120' label="备注">
             <template slot-scope="{row}">
               <span>{{ row.remark }}</span>
             </template>
           </el-table-column>
-        </parentTable>
+        </el-table>
       </y-page-list-layout>
     </el-dialog>
     <el-dialog :visible.sync="myAssetsOrderDialog" width="97%" center custom-class="doWarehouseClass" @closed="getList">
@@ -922,7 +964,7 @@ export default {
         size: 10,
         descs: 'id',
       },
-      allotPersonalAmountDialog:false
+      allotPersonalAmountDialog:false,
     }
   },
   created() {
@@ -985,7 +1027,7 @@ export default {
     getList() {
       this.listQuery.notFinished = true;
       this.claimOrders = [];
-      this.$api.financeRealFund.list(Object.assign({}, this.listQuery)).then(res => {
+      this.$api.financeRealFund.claimList(Object.assign({}, this.listQuery)).then(res => {
         if (res.code === 200) {
           this.pageData = res.data;
         }
@@ -1001,7 +1043,7 @@ export default {
       })
     },
     getMyMajorProd() {
-      this.$api.majorProduction.waitingClaimProd(Object.assign({}, this.majorListQuery)).then(res => {
+      this.$api.majorProduction.waitingClaimProd(Object.assign({'invoiceAmount':this.notClaimAmount}, this.majorListQuery)).then(res => {
         if (res.code === 200) {
           this.myMajorPageData = res.data;
         }
@@ -1195,10 +1237,10 @@ export default {
       }
     },
     claimMajor(row) {
-      this.getMyMajorProd();
       this.myMajorOrderDialog = true;
       this.notClaimAmount = row.notClaimAmount;
       this.financeFundId = row.id;
+      this.getMyMajorProd();
     },
     claimPersonal(row) {
       this.getMyPersonalOrder();
@@ -1345,7 +1387,13 @@ export default {
 
       this.notInfo = this.notInfo + this.notClaimAmount + '￥'
       this.allotPersonalAmountDialog = true;
-    }
+    },
+    tableRowClassName({row, rowIndex}) {
+        if (row.invoiceAmount === this.notClaimAmount) {
+          return 'success-row';
+        }
+        return '';
+      }
   },
 
 }
@@ -1362,3 +1410,9 @@ export default {
   left: 5px;
 }
 </style>
+
+<style>
+  .el-table .success-row {
+    background: #f0f9eb;
+  }
+</style>

src/views/finance/invoiceCheck.vue

@@ -48,7 +48,7 @@
                 <span>{{ row.businessType}}</span>
               </template>
             </el-table-column>
-            <el-table-column label="订单名称" align="center" width="250" show-overflow-tooltip>
+            <el-table-column label="订单名称" align="center" width="150" show-overflow-tooltip>
               <template slot-scope="{row}">
                 <span>{{ row.orderName }}</span>
               </template>
@@ -58,7 +58,12 @@
                 <span>{{ row.orderId }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="发票抬头" align="center" width="250" show-overflow-tooltip>
+            <el-table-column label="产品号" align="center" width="200">
+              <template slot-scope="{row}">
+                <span>{{ row.productionNo?row.productionNo:'--' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="发票抬头" align="center" width="150" show-overflow-tooltip>
               <template slot-scope="{row}">
                 <span>{{ row.title }}</span>
               </template>
@@ -156,7 +161,7 @@
                 <span>{{ row.businessType}}</span>
               </template>
             </el-table-column>
-            <el-table-column label="订单名称" align="center" width="250" show-overflow-tooltip>
+            <el-table-column label="订单名称" align="center" width="150" show-overflow-tooltip>
               <template slot-scope="{row}">
                 <span>{{ row.orderName }}</span>
               </template>
@@ -166,7 +171,12 @@
                 <span>{{ row.orderId }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="发票抬头" align="center" width="250" show-overflow-tooltip>
+            <el-table-column label="产品号" align="center" width="200">
+              <template slot-scope="{row}">
+                <span>{{ row.productionNo?row.productionNo:'--' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="发票抬头" align="center" width="150" show-overflow-tooltip>
               <template slot-scope="{row}">
                 <span>{{ row.title }}</span>
               </template>
@@ -264,7 +274,7 @@
                 <span>{{ row.businessType}}</span>
               </template>
             </el-table-column>
-            <el-table-column label="订单名称" align="center" width="250" show-overflow-tooltip>
+            <el-table-column label="订单名称" align="center" width="150" show-overflow-tooltip>
               <template slot-scope="{row}">
                 <span>{{ row.orderName }}</span>
               </template>
@@ -274,7 +284,12 @@
                 <span>{{ row.orderId }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="发票抬头" align="center" width="250" show-overflow-tooltip>
+            <el-table-column label="产品号" align="center" width="200">
+              <template slot-scope="{row}">
+                <span>{{ row.productionNo?row.productionNo:'--' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="发票抬头" align="center" width="150" show-overflow-tooltip>
               <template slot-scope="{row}">
                 <span>{{ row.title }}</span>
               </template>

src/views/major/myOrder.vue

@@ -63,7 +63,7 @@
         </el-table-column>
         <el-table-column label="开票金额(元)" align="center" width='120'>
           <template slot-scope="{row}">
-            <span style="color:red;font-weight:bold">{{ row.planAmount?row.planAmount:'--' }}</span>
+            <span style="color:red;font-weight:bold">{{ row.invoiceAmount?row.invoiceAmount:'--' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="客户名称" align="center" width='120' show-overflow-tooltip>
@@ -222,7 +222,7 @@
         <el-row>
           <el-col :xs="24" :sm="12" :lg="12" :span="6">
             <el-form-item label="待开金额(元):" prop="planAmount"
-              :rules="{ required: true, message: '使用权面积不能为空', trigger: 'blur' }" label-width="140px"
+              :rules="{ required: true, message: '待开金额不能为空', trigger: 'blur' }" label-width="140px"
               class="postInfo-container-item">
               <el-input-number :precision="2" :min="0" :value-on-clear="0" v-model.number="invoice.planAmount"
                 type="number" style="width:100%" class="filter-item" />

src/views/personal/myOrder.vue

@@ -78,6 +78,11 @@
             <span>{{ row.shouldAmount }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="开票金额(元)" align="center" width='120'>
+          <template slot-scope="{row}">
+            <span>{{ row.invoiceAmount }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="下单时间" align="center" width="110" prop="created">
           <template slot-scope="{row}">
             {{ row.created }}
@@ -428,7 +433,7 @@
         <el-row>
           <el-col :xs="24" :sm="12" :lg="12" :span="6">
             <el-form-item label="待开金额(元):" prop="planAmount"
-              :rules="{ required: true, message: '使用权面积不能为空', trigger: 'blur' }" label-width="140px"
+              :rules="{ required: true, message: '待开金额不能为空', trigger: 'blur' }" label-width="140px"
               class="postInfo-container-item">
               <el-input-number :precision="2" :min="0" :value-on-clear="0" v-model.number="invoice.planAmount"
                 type="number" style="width:100%" class="filter-item" />