diff --git a/src/views/emis/emisSettleBill/panel/CancelAccountApplicationFormPanel.vue b/src/views/emis/emisSettleBill/panel/CancelAccountApplicationFormPanel.vue
index 48615be4..62294993 100644
--- a/src/views/emis/emisSettleBill/panel/CancelAccountApplicationFormPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/CancelAccountApplicationFormPanel.vue
@@ -4,7 +4,7 @@
             class="overflowhidden">
             <el-row>
                 <el-col :span="12">
-                    <el-form-item :label="$t('上传图片')" prop="batchNo">
+                    <el-form-item :label="$t('上传图片')" prop="picUrl">
                         <ImageUpload ref="imageUpload" :fileSize="5" :limit="10" v-model="form.picUrl"></ImageUpload>
                     </el-form-item>
                 </el-col>
@@ -31,9 +31,9 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="4">
-                    <el-form-item label="发出时间" prop="tradeDate">
+                    <el-form-item label="交易时间" prop="tradeDate">
                         <el-date-picker clearable v-model="form.tradeDate" type="date"
-                            value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择发出时间" style="width:100%">
+                            value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择交易时间" style="width:100%">
                         </el-date-picker>
                     </el-form-item>
                 </el-col>
@@ -164,6 +164,9 @@ export default {
             form: {},
 
             rules: {
+                picUrl: [
+                    { required: true, message: "请上传图片", trigger: ["blur", "change"] },
+                ],
                 payType: [
                     { required: true, message: "支付方式不能为空", trigger: ["blur", "change"] },
                 ],
diff --git a/src/views/emis/emisSettleBill/panel/CancelAccountApplicationListPanel.vue b/src/views/emis/emisSettleBill/panel/CancelAccountApplicationListPanel.vue
index 55cde50d..e30b95cc 100644
--- a/src/views/emis/emisSettleBill/panel/CancelAccountApplicationListPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/CancelAccountApplicationListPanel.vue
@@ -73,17 +73,22 @@
       </el-table-column>
       <el-table-column :label="$t('申请时间')" align="center" prop="applyDate" min-width="80">
       </el-table-column>
-      <el-table-column :label="$t('状态')" align="center" prop="blCenterConfirmed" min-width="170">
+      <el-table-column :label="$t('中心审核状态')" align="center" prop="blCenterConfirmed" min-width="120">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.center_confirme_status" :value="scope.row.blCenterConfirmed" />
         </template>
       </el-table-column>
-      <el-table-column :label="$t('审核时间')" align="center" prop="centerConfirmDate" min-width="100" />
-      <el-table-column :label="$t('中心审核人姓名')" align="center" prop="centerConfirmManName" min-width="100" />
-      <el-table-column :label="$t('中心驳回原因')" align="center" prop="centerRejectReason" min-width="100">
+      <el-table-column :label="$t('总部审核状态')" align="center" prop="blHeadquartersConfirmed" min-width="120">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.center_confirme_status" :value="scope.row.blHeadquartersConfirmed" />
+        </template>
       </el-table-column>
-      <el-table-column :label="$t('总部审核人姓名')" align="center" prop="headquartersConfirmManName" min-width="100" />
-      <el-table-column :label="$t('总部驳回原因')" align="center" prop="headquartersRejectReason" min-width="100">
+      <el-table-column :label="$t('审核时间')" align="center" prop="centerConfirmDate" min-width="100" />
+      <el-table-column :label="$t('中心审核人姓名')" align="center" prop="centerConfirmManName" min-width="120" />
+      <el-table-column :label="$t('中心驳回原因')" align="center" prop="centerRejectReason" min-width="110">
+      </el-table-column>
+      <el-table-column :label="$t('总部审核人姓名')" align="center" prop="headquartersConfirmManName" min-width="120" />
+      <el-table-column :label="$t('总部驳回原因')" align="center" prop="headquartersRejectReason" min-width="110">
       </el-table-column>
       <el-table-column :label="$t('销账金额')" align="center" prop="writeoffAmount" min-width="150" />
     </XdTable>
diff --git a/src/views/emis/emisSettleBill/panel/CancelAccountCheckListPanel.vue b/src/views/emis/emisSettleBill/panel/CancelAccountCheckListPanel.vue
index 8363b989..56b2c88d 100644
--- a/src/views/emis/emisSettleBill/panel/CancelAccountCheckListPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/CancelAccountCheckListPanel.vue
@@ -77,19 +77,24 @@
             </el-table-column>
             <el-table-column :label="$t('申请时间')" align="center" prop="applyDate" min-width="80">
             </el-table-column>
-            <el-table-column :label="$t('状态')" align="center" prop="blCenterConfirmed" min-width="170">
+            <el-table-column :label="$t('中心审核状态')" align="center" prop="blCenterConfirmed" min-width="120">
                 <template slot-scope="scope">
-                    <dict-tag :options="dict.type.center_confirme_status" :value="scope.row.blCenterConfirmed" />
+                <dict-tag :options="dict.type.center_confirme_status" :value="scope.row.blCenterConfirmed" />
+                </template>
+            </el-table-column>
+            <el-table-column :label="$t('总部审核状态')" align="center" prop="blHeadquartersConfirmed" min-width="120">
+                <template slot-scope="scope">
+                <dict-tag :options="dict.type.center_confirme_status" :value="scope.row.blHeadquartersConfirmed" />
                 </template>
             </el-table-column>
             <el-table-column :label="$t('审核时间')" align="center" prop="centerConfirmDate" min-width="100" />
-            <el-table-column :label="$t('中心审核人姓名')" align="center" prop="centerConfirmManName" min-width="100" />
-            <el-table-column :label="$t('中心驳回原因')" align="center" prop="centerRejectReason" min-width="100">
+            <el-table-column :label="$t('中心审核人姓名')" align="center" prop="centerConfirmManName" min-width="120" />
+            <el-table-column :label="$t('中心驳回原因')" align="center" prop="centerRejectReason" min-width="110">
             </el-table-column>
-            <el-table-column :label="$t('总部审核人姓名')" align="center" prop="headquartersConfirmManName" min-width="100" />
-            <el-table-column :label="$t('总部驳回原因')" align="center" prop="headquartersRejectReason" min-width="100">
+            <el-table-column :label="$t('总部审核人姓名')" align="center" prop="headquartersConfirmManName" min-width="120" />
+            <el-table-column :label="$t('总部驳回原因')" align="center" prop="headquartersRejectReason" min-width="110">
             </el-table-column>
-            <el-table-column :label="$t('销账金额')" align="center" prop="writeoffAmount" min-width="150" />
+            <el-table-column :label="$t('销账金额')" align="center" prop="writeoffAmount" min-width="100" />
         </XdTable>
     </XdPageContainer>
 </template>
diff --git a/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue b/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue
index e0ff10e3..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> -->
@@ -211,13 +212,13 @@
           <el-tag v-if="scope.row.blAudit=='2'" type="error">审核不通过</el-tag>
         </template>
       </el-table-column>
-      <!-- <el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
+      <el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
           <template slot-scope="scope">
             <el-tag v-if="scope.row.paymentStatus=='0'" type="error">未收款</el-tag>
             <el-tag v-if="scope.row.paymentStatus=='1'" type="success">已收款</el-tag>
             <el-tag v-if="scope.row.paymentStatus=='2'" type="warning">部分收款</el-tag>
           </template>
-        </el-table-column> -->
+        </el-table-column>
       <el-table-column :label="$t('驳回原因')" align="center" prop="auditNote" min-width="100" :show-overflow-tooltip="true"/>
 
       <!-- <el-table-column :label="$t('状态描述')" align="center" prop="invoiceStatusDesc" min-width="100" :show-overflow-tooltip="true"/> -->
@@ -225,6 +226,7 @@
       <!-- <el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="100" /> -->
       <el-table-column :label="$t('账单编号')" align="center" prop="settleBillNo" min-width="170" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('申请金额')" align="center" prop="applyMoney" min-width="100" />
+      <el-table-column :label="$t('已收金额')" align="center" prop="recedMoney" min-width="100" />
       <el-table-column :label="$t('开票类型')" align="center" prop="invoiceType" min-width="100" >
         <template slot-scope="scope">
           <el-tag v-if="scope.row.invoiceType=='1'" type="info">增值税电子普通发票</el-tag>
@@ -419,7 +421,7 @@ export default {
       if(this.selectList&&this.selectList.length>0){
           for(let i=0;i<this.selectList.length;i++){
               let item=this.selectList[i];
-              if(item.paymentStatus!=0){
+              if(item.paymentStatus == '1'){
                 this.$modal.msgError("有收款，不允许发票收款！");
                 return;
               }
diff --git a/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceRecordDealListPanel.vue b/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceRecordDealListPanel.vue
index d12844b0..ac2fb62b 100644
--- a/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceRecordDealListPanel.vue
+++ b/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceRecordDealListPanel.vue
@@ -201,12 +201,12 @@
           <el-tag v-if="scope.row.blAudit=='2'" type="error">审核不通过</el-tag>
         </template>
       </el-table-column>
-      <!-- <el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
+      <el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
           <template slot-scope="scope">
             <el-tag v-if="scope.row.paymentStatus=='0'" type="error">未收款</el-tag>
             <el-tag v-if="scope.row.paymentStatus=='1'" type="success">已收款</el-tag>
           </template>
-        </el-table-column> -->
+        </el-table-column>
         <!-- <el-tag v-if="scope.row.paymentStatus=='2'" type="warning">部分收款</el-tag> -->
       <el-table-column :label="$t('驳回原因')" align="center" prop="auditNote" min-width="100" :show-overflow-tooltip="true"/>
 
@@ -217,6 +217,7 @@
       <el-table-column :label="$t('申请金额')" align="center" prop="applyMoney" min-width="100" />
       <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="recedMoney" min-width="100" />
 
       <el-table-column :label="$t('开票类型')" align="center" prop="invoiceType" min-width="100" >
         <template slot-scope="scope">
diff --git a/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue b/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue
index 77abaf42..3fcd1772 100644
--- a/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue
+++ b/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue
@@ -189,17 +189,7 @@
       <el-table-column :label="$t('申请金额')" align="center" prop="applyMoney" min-width="100" />
       <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="invoiceType" min-width="100" >
-        <template slot-scope="scope">
-          <el-tag v-if="scope.row.invoiceType=='1'" type="info">增值税电子普通发票</el-tag>
-          <el-tag v-if="scope.row.invoiceType=='4'" type="info">增值税电子专用发票</el-tag>
-          <el-tag v-if="scope.row.invoiceType=='2'" type="info">增值税普通发票(纸质发票)</el-tag>
-          <el-tag v-if="scope.row.invoiceType=='3'" type="info">增值税专用发票(纸质发票)</el-tag>
-          <el-tag v-if="scope.row.invoiceType=='9'" type="info">其它手工开票</el-tag>
-
-        </template>
-      </el-table-column>
+      <el-table-column :label="$t('已收金额')" align="center" prop="recedMoney" min-width="100" ></el-table-column>
       <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="companyTel" min-width="100" :show-overflow-tooltip="true"/> -->
@@ -207,13 +197,13 @@
       <!-- <el-table-column :label="$t('联系人')" align="center" prop="contact" min-width="100" :show-overflow-tooltip="true"/> -->
       <!-- <el-table-column :label="$t('联系电话')" align="center" prop="phone" min-width="100" :show-overflow-tooltip="true"/> -->
       <!-- <el-table-column :label="$t('发票号')" align="center" prop="invoiceNo" min-width="170" :show-overflow-tooltip="true" /> -->
-      <!-- <el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
+      <el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
           <template slot-scope="scope">
             <el-tag v-if="scope.row.paymentStatus=='0'" type="error">未收款</el-tag>
             <el-tag v-if="scope.row.paymentStatus=='1'" type="success">已收款</el-tag>
             <el-tag v-if="scope.row.paymentStatus=='2'" type="warning">部分收款</el-tag>
           </template>
-        </el-table-column> -->
+        </el-table-column>
       <el-table-column :label="$t('申请序号')" align="center" prop="applySeqNo" min-width="170" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('申请人')" align="center" prop="createByName" min-width="100" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('申请站点')" align="center" prop="createSiteName" min-width="100" :show-overflow-tooltip="true"/>
diff --git a/src/views/emis/emisSettlePayRecord/panel/PayRecordInputByInvoice.vue b/src/views/emis/emisSettlePayRecord/panel/PayRecordInputByInvoice.vue
index 893f820f..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" >
@@ -207,14 +207,15 @@
                             </el-table-column>
                             <el-table-column prop="payMoney"  :label="$t('收款金额')"  align="center" width="120">
                               <template slot-scope="scope">
-                                <span>{{scope.row.payMoney}}</span>
+                                <!-- <span>{{scope.row.payMoney}}</span> -->
+                                 <el-input-number v-model="scope.row.payMoney" :controls="false" size="mini" :min="0"  placeholder="" @blur="handleCalcFeeItem" />
                               </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">
                                   <span>{{ scope.row.waybillDetail.sendSiteName }}--{{ scope.row.waybillDetail.dispatchUnderlingSiteName }}</span>
-                                </template>
+                              </template>
                             </el-table-column>
                             <el-table-column :label="$t('发件人')" align="center" prop="waybillDetail.sendName" width="100" :show-overflow-tooltip="true"/>
                             <el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" width="150"  :show-overflow-tooltip="true"/>
@@ -243,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>
@@ -445,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;
 
@@ -460,7 +461,6 @@ export default {
                 hasPayMap[item.billNo] = item.sumMoney
               }
             }
-            console.log("===>hasPayMap==>",hasPayMap);
 
             let qParam={
                 applySeqNo: applySeqNoListStr,
@@ -470,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';
@@ -490,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{