1.资产列表查询展示收款信息

2.资产详情-款项信息优化

src/api/modules/assets.js

@@ -72,8 +72,8 @@ export default {
         return request.delete(`assetsEvaluationTarget/delete/${params}`)
     },
     // 根据业务id获取资产业务款项信息
-    getOrderFundInvoiceById(params) {
-        return request.get(`assets/getOrderFundInvoiceById/${params}`)
+    getOrderFundInvoiceById(params1, params2) {
+        return request.get(`assets/getOrderFundInvoiceById/${params1}/${params2}`)
     },
     // 选择产品,新增产品信息
     assetsProductionSave(params) {

src/views/assets/allList.vue

@@ -97,6 +97,21 @@
                         <span>{{ row.clientManagerName }}</span>
                     </template>
                 </el-table-column>
+                <el-table-column label="产品应收款(元)" align="center" width="100">
+                    <template slot-scope="{row}">
+                        <span>{{ row.productionShouldAmount == null ? '-' : row.productionShouldAmount }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="产品实收款(元)" align="center" width="100">
+                    <template slot-scope="{row}">
+                        <span>{{ row.productionRealAmount == null ? '-' : row.productionRealAmount }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="标准收费(元)" align="center" width="100">
+                    <template slot-scope="{row}">
+                        <span>{{ row.standardAmount == null ? '-' : row.standardAmount }}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column label="下单时间" align="center" width="170" v-if="!hiddenLabels.includes('created')" prop="created">
                     <template slot-scope="{row}">
                         <span>{{ row.created }}</span>

src/views/assets/orderDetail.vue

@@ -736,18 +736,18 @@
           <el-form ref="invoiceData" :model="invoiceData" :disabled="true">
             <el-row>
               <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                <el-form-item label="应收金额(元)：" prop="shouldAmount" label-width="120px" class="postInfo-container-item">
-                  <el-input v-model="invoiceData.shouldAmount" class="filter-item" />
+                <el-form-item label="产品应收款(元)：" prop="productionShouldAmount" label-width="120px" class="postInfo-container-item">
+                  <el-input v-model="invoiceData.productionShouldAmount" class="filter-item" />
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                <el-form-item label="实收金额(元)：" prop="realAmount" label-width="120px" class="postInfo-container-item">
-                  <el-input v-model="invoiceData.realAmount" class="filter-item" />
+                <el-form-item label="产品实收款(元)：" prop="productionRealAmount" label-width="120px" class="postInfo-container-item">
+                  <el-input v-model="invoiceData.productionRealAmount" class="filter-item" />
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                <el-form-item label="剩余金额(元)：" prop="leftAmount" label-width="120px" class="postInfo-container-item">
-                  <el-input v-model="invoiceData.leftAmount" class="filter-item" />
+                <el-form-item label="产品标准收费(元)：" prop="standardAmount" label-width="120px" class="postInfo-container-item">
+                  <el-input v-model="invoiceData.standardAmount" class="filter-item" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -2682,14 +2682,14 @@ export default {
     },
     // 根据业务id获取资产业务款项信息
     getOrderFundInvoiceById() {
-      this.$api.assets.getOrderFundInvoiceById(this.assetsForm.id).then(res => {
-        if (res.code === 200) {
-          // if (res.data != null) {
+      if (this.pageParams.row.reportNo) {
+        this.$api.assets.getOrderFundInvoiceById(this.assetsForm.id, this.pageParams.row.reportNo).then(res => {
+          if (res.code === 200) {
             this.invoiceData = res.data;
             this.invoiceData.leftAmount = this.invoiceData.shouldAmount - this.invoiceData.realAmount;
-          // }
-        }
-      })
+          }
+        }) 
+      }
     },
     // 获取产品信息类型
     getProductionTypes(id) {