From 2cfb1a9ad6799f171f4f7acb25942890c4481bae Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Thu, 25 Sep 2025 17:53:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E5=BC=80=E7=A5=A8=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E9=83=A8=E5=88=86=E6=94=B6=E6=AC=BE=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../panel/CenterInvoiceHasOpenPanel.vue       |  1 +
 .../panel/PayRecordInputByInvoice.vue         | 21 +++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue b/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue
index 27f00c4a..9be01926 100644
--- a/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue
+++ b/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue
@@ -48,6 +48,7 @@
           <el-select clearable v-model="queryParams.paymentStatus" placeholder="请选择" style="width:100%">
              <el-option label="未收款" :value="0"></el-option>
              <el-option label="已收款" :value="1"></el-option>
+             <el-option label="部分收款" :value="2"></el-option>
            </el-select>
       </el-form-item>
       <!-- <el-option label="部分收款" :value="2"></el-option> -->
diff --git a/src/views/emis/emisSettlePayRecord/panel/PayRecordInputByInvoice.vue b/src/views/emis/emisSettlePayRecord/panel/PayRecordInputByInvoice.vue
index 697562fe..c0d2771c 100644
--- a/src/views/emis/emisSettlePayRecord/panel/PayRecordInputByInvoice.vue
+++ b/src/views/emis/emisSettlePayRecord/panel/PayRecordInputByInvoice.vue
@@ -133,7 +133,7 @@
               <span slot="label">
                 <span style="color: red">收款金额</span>
               </span>
-              <el-input-number   v-model="form.payMoney"  size="mini" placeholder="开票金额" :min="0.00" :controls="false" :precision="2" disabled></el-input-number>
+              <el-input-number   v-model="form.payMoney"  size="mini" placeholder="开票金额" :min="0.00"  :controls="false" :precision="2" disabled></el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="18" >
@@ -244,12 +244,12 @@
         </el-row>
       </el-form>
       <div style="text-align: center;margin-bottom: 10px;">
-        <el-button type="primary" :loading="isDoing" @click="submitForm" :disabled="!this.isCanPay">确 定</el-button>
+        <el-button type="primary" :loading="isDoing" @click="submitForm" :disabled="!form.payRelList.length">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-      <div style="text-align: center;margin-bottom: 10px;">
+      <!-- <div style="text-align: center;margin-bottom: 10px;">
         <span v-if="!this.isCanPay" style="color: red;">有收款，不允许发票收款！</span>
-      </div>
+      </div> -->
 
   </div>
 </template>
@@ -446,9 +446,9 @@ export default {
               this.form.payInvoiceRelList.push({applySeqNo:itemBill.applySeqNo});
             }
 
-            totalFee=origFee;
+            // totalFee=origFee;
 
-            this.form.payMoney = totalFee.toFixed(2);
+            // this.form.payMoney = totalFee.toFixed(2);
 
             this.form.settleBillNo=settleBillNoListStr;
 
@@ -461,7 +461,6 @@ export default {
                 hasPayMap[item.billNo] = item.sumMoney
               }
             }
-            console.log("===>hasPayMap==>",hasPayMap);
 
             let qParam={
                 applySeqNo: applySeqNoListStr,
@@ -471,14 +470,12 @@ export default {
 
             // 查询子账单
             let res=await listEmisSettleInvoiceRel(qParam);
-            console.log("===>=res==>",res)
             if(res.code==200){
               res.rows.forEach(itemSubBill=>{
                 let relItem={...itemSubBill};
                 relItem.openMoney=itemSubBill.money;
                 relItem.payMoney=itemSubBill.money;
                 relItem.hasApplyFee=0;
-                console.log("===>=hasPayMap1111==>",hasPayMap[itemSubBill.billNo])
 
                 if(relItem.waybillDetail.paymentType == 2 || relItem.waybillDetail.paymentType == 4 || relItem.waybillDetail.paymentType == 5){
                   that.form.settleType='2';
@@ -491,15 +488,17 @@ export default {
                   if(this.form.recType==1){
                     relItem.hasApplyFee=hasPayMap[itemSubBill.billNo];
                     // relItem.payMoney=itemSubBill.money-hasPayMap[itemSubBill.billNo];
+                    relItem.payMoney=itemSubBill.money-itemSubBill.recedMoney;
                   }
                 }
-
+                
                 if(relItem.payMoney>0){
+                  totalFee = Number(totalFee) + Number(relItem.payMoney);
                   this.form.payRelList.push(relItem);
                 }
               });
-
             }
+            this.form.payMoney = totalFee.toFixed(2);
             // this.handleCalcFeeItem();
 
       }else{