1.资产、个贷、大中型待认领实收款查询新增 收款状态 查询条件

2.认领收款推荐排除已有实收款的订单
3.资产去掉填写订单应收款，只要产品应收款，且送达前必须填写
4.资产我的订单注释掉订单应收款相关、未出具报告产品时禁用申请开票

src/views/assets/myOrderList.vue

@@ -111,7 +111,7 @@
                         <span>{{ row.estimatedValue == null ? '-' : row.estimatedValue }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="订单应收款(元)" align="center" width="150">
+                <!-- <el-table-column label="订单应收款(元)" align="center" width="150">
                     <template slot-scope="{row}">
                         <span>{{ row.shouldAmount == null ? '-' : row.shouldAmount }}</span>
                     </template>
@@ -120,7 +120,7 @@
                     <template slot-scope="{row}">
                         <span>{{ row.realAmount == null ? '-' : row.realAmount }}</span>
                     </template>
-                </el-table-column>
+                </el-table-column> -->
                 <el-table-column label="产品应收款(元)" align="center" width="150">
                     <template slot-scope="{row}">
                         <span>{{ row.productionShouldAmount == null ? '-' : row.productionShouldAmount }}</span>
@@ -136,11 +136,11 @@
                         <span>{{ row.standardAmount == null ? '-' : row.standardAmount }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="折扣比例" align="center" width="150">
+                <!-- <el-table-column label="折扣比例" align="center" width="150">
                     <template slot-scope="{row}">
                         <span>{{ row.discount == null ? '-' : row.discount }}</span>
                     </template>
-                </el-table-column>
+                </el-table-column> -->
                 <el-table-column label="实际开票金额" align="center" width="150">
                     <template slot-scope="{row}">
                         <span>{{ row.invoiceRealAmount == null ? '-' : row.invoiceRealAmount }}</span>
@@ -164,15 +164,15 @@
                                 <el-button type="text" size="mini" @click="orderDetail(row)">
                                     查看
                                 </el-button>
-                            </div>
-                            <div>
                                 <el-button type="text" size="mini" @click="editOrder(row)">
                                     编辑
                                 </el-button>
+                            </div>
+                            <!-- <div>
                                 <el-button type="text" size="mini" @click="openShouldAmountDialog(row)">
                                     订单应收款
                                 </el-button>
-                            </div>
+                            </div> -->
                             <div>
                                 <el-button :disabled="!(row.reportNo !== null)" type="text" size="mini"
                                     @click="openProShouldAmountDialog(row)">
@@ -188,8 +188,9 @@
                                     @click="openAllotProductionDialog(row)">
                                     实收款分配
                                 </el-button>
-                                <el-button type="text" size="mini"
-                                    @click="openFinanceInvoiceDialog(row.orderFundId, row.productionFundId, row.realAmount, row.customerName, row.customerSubName)">申请开票</el-button>
+                                <el-button :disabled="!(row.reportNo !== null)" type="text" size="mini" @click="openFinanceInvoiceDialog(row.orderFundId, row.productionFundId, row.realAmount, row.customerName, row.customerSubName)">
+                                    申请开票
+                                </el-button>
                             </div>
                             <!-- <el-button v-if="row.currentNodeCode === 'REPORT_OUT_APPLY'" type="text"
                             @click="canceladdRepertoryOutWarehouse(row)">
@@ -231,7 +232,7 @@
             <el-form ref="productionFundFrom" :model="productionFundFrom" style="margin-left:40px">
                 <el-row>
                     <el-col :xs="24" :sm="12" :lg="24" :span="12">
-                        <el-form-item label="产品应收款金额(元)：" prop="productionShouldAmount" label-width="160px"
+                        <el-form-item label="产品应收款金额(元)：" prop="productionShouldAmount" label-width="180px"
                             class="postInfo-container-item"
                             :rules="{ required: true, message: '应收款金额不能为空', trigger: 'blur' }">
                             <el-input-number :precision="2" :min="null" :value-on-clear="0"
@@ -242,7 +243,7 @@
                 </el-row>
                 <el-row>
                     <el-col :xs="24" :sm="12" :lg="24" :span="12">
-                        <el-form-item label="备注：" prop="remark" label-width="160px" class="postInfo-container-item">
+                        <el-form-item label="备注：" prop="remark" label-width="180px" class="postInfo-container-item">
                             <el-input style="width:300px" type="textarea" v-model="productionFundFrom.remark"></el-input>
                         </el-form-item>
                     </el-col>
@@ -1096,17 +1097,27 @@ export default {
         },
         // 标记产品送达
         markDelivery(row) {
-            this.$api.assets.markDelivery(row.reportNo).then(res => {
-                if (res.code === 200 && res.data) {
-                    this.$notify({
-                        title: '成功',
-                        message: '标记送达成功！',
-                        type: 'success',
-                        duration: 1000
-                    });
-                    this.selectMyOrderPage();
-                }
-            })
+            if(row.productionShouldAmount){
+                this.$api.assets.markDelivery(row.reportNo).then(res => {
+                    if (res.code === 200 && res.data) {
+                        this.$notify({
+                            title: '成功',
+                            message: '标记送达成功！',
+                            type: 'success',
+                            duration: 1000
+                        });
+                        this.selectMyOrderPage();
+                    }
+                })
+            }else {
+                this.$notify({
+                    title: '错误',
+                    message: '标记送达前需填写产品应收款！',
+                    type: 'error',
+                    duration: 1000
+                });
+            }
+            
         },
         // 打开分配弹窗
         openAllotProductionDialog(row) {

src/views/assets/orderDetail.vue

@@ -2018,7 +2018,7 @@ export default {
             if (typeof (commit.businessMinId) == 'undefined' || commit.businessMinId == null || commit.ifCheckTask == null) {
               this.$notify({
                 title: '提示',
-                message: '请选择一个产品后，再进行流程提交。',
+                message: '未选择产品，请前往产品信息选择产品后进行提交。',
                 type: 'error',
                 duration: 3000
               });

src/views/finance/fundClaim.vue

@@ -231,6 +231,11 @@
             <el-option value="未申报">未申报</el-option>
             <el-option value="审核拒绝">审核拒绝</el-option>
           </el-select>
+          <el-select v-model="majorListQuery.hasRealAmount" placeholder="收款状态" clearable
+            style="margin-left: 20px;width: 150px;float: left;">
+            <el-option label="未收款" value="false"></el-option>
+            <el-option label="已收款" value="true"></el-option>
+          </el-select>
           <el-button class="filter-item" style="margin-left: 10px;float: left;" type="primary"
             @click="getMajorOrderOrProd()" round>搜索
           </el-button>
@@ -312,7 +317,7 @@
           <el-table-column align="center"  width='100'>
             <template slot-scope="{row}">
               <span style="color:red">
-                {{ row.invoiceAmount === notClaimAmount ? '推荐匹配' : '' }}
+                {{ row.invoiceAmount === notClaimAmount && row.realAmount === null ? '推荐匹配' : '' }}
               </span>
             </template>
           </el-table-column>
@@ -415,6 +420,11 @@
           <el-input v-model="personalListQuery.invoiceAmountCondition" placeholder="开票金额" clearable
             style="margin-left: 10px;width: 150px;float: left;">
           </el-input>
+          <el-select v-model="personalListQuery.hasRealAmount" placeholder="收款状态" clearable
+            style="margin-left: 20px;width: 150px;float: left;">
+            <el-option label="未收款" value="false"></el-option>
+            <el-option label="已收款" value="true"></el-option>
+          </el-select>
           <el-button class="filter-item" style="margin-left: 10px;float: left;" type="primary" @click="getMyPersonalOrder"
             round>搜索
           </el-button>
@@ -438,7 +448,7 @@
           <el-table-column align="center"  width='100'>
             <template slot-scope="{row}">
               <span style="color:red">
-                {{ row.invoiceAmount === notClaimAmount ? '推荐匹配' : '' }}
+                {{ row.invoiceAmount === notClaimAmount && row.realAmount === null ? '推荐匹配' : '' }}
               </span>
             </template>
           </el-table-column>
@@ -529,6 +539,11 @@
             <el-option value="未申报">未申报</el-option>
             <el-option value="审核拒绝">审核拒绝</el-option>
           </el-select>
+          <el-select v-model="assetsListQuery.hasRealAmount" placeholder="收款状态" clearable
+            style="margin-left: 20px;width: 150px;float: left;">
+            <el-option label="未收款" value="false"></el-option>
+            <el-option label="已收款" value="true"></el-option>
+          </el-select>
           <el-button v-show="toAssetsProd" class="filter-item" style="margin-left: 10px;float: left;" type="primary"
             @click="getMyAssetsOrderProd()" round>搜索
           </el-button>
@@ -551,7 +566,7 @@
           <el-table-column align="center"  width='100'>
             <template slot-scope="{row}">
               <span style="color:red">
-                {{ row.invoiceAmount === notClaimAmount ? '推荐匹配' : '' }}
+                {{ row.invoiceAmount === notClaimAmount && row.orderRealAmount === null ? '推荐匹配' : '' }}
               </span>
             </template>
           </el-table-column>
@@ -943,6 +958,7 @@ export default {
         page: 1,
         size: 10,
         descs: 'id',
+        hasRealAmount: "false"
       },
       myMajorPageData: { records: [] },
       notClaimAmount: 0,
@@ -987,11 +1003,13 @@ export default {
         page: 1,
         size: 10,
         descs: 'id',
+        hasRealAmount: "false"
       },
       personalListQuery: {
         page: 1,
         size: 10,
         descs: 'id',
+        hasRealAmount: "false"
       },
       allotPersonalAmountDialog:false,
     }
@@ -1027,6 +1045,7 @@ export default {
         current: 1,
         size: 10,
         descs: 'id',
+        hasRealAmount: "false"
       }
       this.getMyMajorOrder()
     },
@@ -1036,6 +1055,7 @@ export default {
         current: 1,
         size: 10,
         descs: 'id',
+        hasRealAmount: "false"
       }
       this.getMyMajorProd()
     },
@@ -1171,6 +1191,7 @@ export default {
         current: 1,
         size: 10,
         descs: 'id',
+        hasRealAmount: "false"
       }
       this.getMyPersonalOrder()
     },
@@ -1312,6 +1333,7 @@ export default {
         page: 1,
         size: 10,
         descs: 'id',
+        hasRealAmount: "false"
       }
     },
     getMyAssetsOrderProd() {
@@ -1334,6 +1356,7 @@ export default {
         current: 1,
         size: 10,
         descs: 'id',
+        hasRealAmount: "false"
       }
       this.getMyAssetsOrderProd()
     },