From 319deacf1faeb38975cf53e31d0a464dbb121e9c Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 8 May 2025 13:41:53 +0800
Subject: [PATCH] md

---
 src/api/emis/emisSettleBill.js                       |  8 ++++++++
 .../emis/emisSettleBill/ChargeBillMoneyList.vue      |  3 ---
 .../emisSettleBill/PayBackStat/PayBackStatQuery.vue  |  2 +-
 .../panel/InvoiceRecordList.vue                      |  2 ++
 .../emisSettlePayRecord/panel/PayRecordInput.vue     | 12 ++++++++++--
 5 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/api/emis/emisSettleBill.js b/src/api/emis/emisSettleBill.js
index 4fea7dad..a5e3e426 100644
--- a/src/api/emis/emisSettleBill.js
+++ b/src/api/emis/emisSettleBill.js
@@ -9,6 +9,14 @@ export function listEmisSettleBill(query) {
   })
 }
 
+export function calculateRecedMoney(query) {
+  return request({
+    url: '/emis/emisSettleBill/calculateRecedMoney',
+    method: 'get',
+    params: query
+  })
+}
+
 export function queryPayBackStatList(query) {
   return request({
     url: '/emis/emisSettleBill/queryPayBackStatList',
diff --git a/src/views/emis/emisSettleBill/ChargeBillMoneyList.vue b/src/views/emis/emisSettleBill/ChargeBillMoneyList.vue
index 30daf625..00b2fda6 100644
--- a/src/views/emis/emisSettleBill/ChargeBillMoneyList.vue
+++ b/src/views/emis/emisSettleBill/ChargeBillMoneyList.vue
@@ -12,9 +12,6 @@
           <el-tab-pane label="合并收款"  name="payRecordByMerge" v-if="showPayRecordByMerge">
             <PayRecordInputByMerge :billList="settleBillList"  @on-changed="handleMergeFormChanged" @on-cancel="cancelMergeForm"></PayRecordInputByMerge>
           </el-tab-pane>
-          <!-- <el-tab-pane :label="发票收款"  name="payByInvoice" v-if="showPayByInvoice">
-            <PayRecordInput :settleBillNo="currentSettleBillNo" settleType="2"  @on-changed="handleFormChanged" @on-cancel="cancelForm"></PayRecordInput>
-          </el-tab-pane> -->
           <el-tab-pane v-for="(item, index) in billTabs" :key="index"  :name="item.settleBillNo" :label="'账单:'+item.settleBillNo"  closable >
             <BillDetailPanelReadOnly :key="'Detail_'+index" :settleBillNo="item.settleBillNo"></BillDetailPanelReadOnly>
           </el-tab-pane>
diff --git a/src/views/emis/emisSettleBill/PayBackStat/PayBackStatQuery.vue b/src/views/emis/emisSettleBill/PayBackStat/PayBackStatQuery.vue
index 9bd5b931..3f6e080a 100644
--- a/src/views/emis/emisSettleBill/PayBackStat/PayBackStatQuery.vue
+++ b/src/views/emis/emisSettleBill/PayBackStat/PayBackStatQuery.vue
@@ -170,7 +170,7 @@
 
 <script>
 
-import { queryBillPayStatInfoList,queryPayBackStatList } from "@/api/emis/emisSettleBill";
+import { queryPayBackStatList } from "@/api/emis/emisSettleBill";
 import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
 import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue';
 
diff --git a/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordList.vue b/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordList.vue
index 28a9e022..b42e635a 100644
--- a/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordList.vue
+++ b/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordList.vue
@@ -70,6 +70,8 @@
           <el-tag v-if="scope.row.invoiceType=='9'" type="info">其它手工发票</el-tag>
         </template>
       </el-table-column>
+      <el-table-column :label="$t('加开税点')" align="center" prop="addTaxRate" min-width="100" />
+      <el-table-column :label="$t('加开金额')" align="center" prop="addOpenMoney" min-width="100" />
       <el-table-column :label="$t('开票抬头')" align="center" prop="companyName" min-width="170"  :show-overflow-tooltip="true" />
       <el-table-column :label="$t('开票税号')" align="center" prop="companyTaxNo" min-width="170" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('申请序号')" align="center" prop="applySeqNo" min-width="170" :show-overflow-tooltip="true"/>
diff --git a/src/views/emis/emisSettlePayRecord/panel/PayRecordInput.vue b/src/views/emis/emisSettlePayRecord/panel/PayRecordInput.vue
index 503e0edc..e98c065c 100644
--- a/src/views/emis/emisSettlePayRecord/panel/PayRecordInput.vue
+++ b/src/views/emis/emisSettlePayRecord/panel/PayRecordInput.vue
@@ -137,7 +137,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"></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-input v-model="form.payMoney" placeholder="" /> -->
             </el-form-item>
@@ -250,7 +250,7 @@
               <span slot="label">
                 <span style="color: red">退款金额</span>
               </span>
-              <el-input v-model="form.refundMoney" placeholder="" />
+              <el-input v-model="form.refundMoney" placeholder="" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6" v-if="form.recType==2">
@@ -345,6 +345,12 @@
                                 </el-input-number>
                               </template>
                             </el-table-column>
+                            <!-- <el-table-column prop="remark"  :label="$t('备注')"  align="center" width="120">
+                              <template slot-scope="scope">
+                                <el-input  v-model="scope.row.remark" placeholder=""   >
+                                </el-input>
+                              </template>
+                            </el-table-column> -->
                             <el-table-column :label="$t('寄件日期')" align="center" prop="waybillDetail.sendDate" min-width="170"    :show-overflow-tooltip="true"/>
                             <el-table-column :label="$t('快件类型')" align="center" prop="kjlx" width="180" :show-overflow-tooltip="true">
                               <template slot-scope="scope">
@@ -541,6 +547,7 @@ export default {
                 let relItem={...itemSubBill};
                 relItem.payMoney=itemSubBill.billFee;
                 relItem.hasApplyFee=0;
+                relItem.remark='';
 
                 console.log("===>=hasPayMap1111==>",hasPayMap[itemSubBill.billNo])
                 if(itemSubBill.billNo in hasPayMap){
@@ -605,6 +612,7 @@ export default {
           let relItem={...itemSubBill};
           relItem.payMoney=itemSubBill.billFee;
           relItem.hasApplyFee=0;
+          relItem.remark='';
 
           if(relItem.billNo in hasPayMap){
             if(this.form.recType==1){