md

src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue

@@ -559,14 +559,25 @@ export default {
     },
 
     handlePayRecord(){
-      //  this.currentId= row.id || this.ids;
-      //  this.openForm = true;
-      //  this.titleForm = "收/退款:"+this.currentSettleBillNo;
-
        this.$emit("onPayInput",this.currentSettleBillNo);
     },
     handlePayRecordByMerge(){
-       this.$emit("onPayInputByMerge",this.selectList);
+       // 如果有已收款的账单则不允许合并收款
+       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){
+                this.$modal.msgError("有收款，不允许合并收款！");
+                return;
+              }
+          }
+
+          this.$emit("onPayInputByMerge",this.selectList);
+       }
+       else{
+        this.$modal.msgError("请先选择账单");
+       }
+
     },
 
     handleCharge(row) {

src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue

@@ -397,7 +397,21 @@ export default {
       this.$emit("onSelect",row);
     },
     handlePayRecordByInvoice(){
-       this.$emit("onPayInputByInvoice",this.selectList);
+      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){
+                this.$modal.msgError("有收款，不允许发票收款！");
+                return;
+              }
+          }
+          this.$emit("onPayInputByInvoice",this.selectList);
+       }
+       else{
+        this.$modal.msgError("请先选择发票");
+       }
+
+
     },
     handleRefuse(row) {
       const ids = row.id || this.ids;

src/views/emis/emisSettlePayRecord/panel/PayRecordInputByInvoice.vue

@@ -220,9 +220,13 @@
         </el-row>
       </el-form>
       <div style="text-align: center;margin-bottom: 10px;">
-        <el-button type="primary" :loading="isDoing" @click="submitForm">确 定</el-button>
+        <el-button type="primary" :loading="isDoing" @click="submitForm" :disabled="!this.isCanPay">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
+      <div style="text-align: center;margin-bottom: 10px;">
+        <span v-if="!this.isCanPay" style="color: red;">有收款，不允许发票收款！</span>
+      </div>
+
   </div>
 </template>
 
@@ -249,6 +253,7 @@ export default {
     return {
       emisSettlePayRecordOptions: [],
       settleBillItem:this.settleBillObj,
+      isCanPay:true,
       // 遮罩层
       loading: true,
       isDoing:false,
@@ -304,6 +309,7 @@ export default {
   methods: {
     initData() {
           this.reset();
+          this.isCanPay=true;
           this.form.recType=1;
           this.form.payScope='1';
           this.form.payRelList=[];
@@ -446,6 +452,7 @@ export default {
                 relItem.hasApplyFee=0;
                 console.log("===>=hasPayMap1111==>",hasPayMap[itemSubBill.billNo])
                 if(itemSubBill.billNo in hasPayMap){
+                  this.isCanPay=false;
                   if(this.form.recType==1){
                     relItem.hasApplyFee=hasPayMap[itemSubBill.billNo];
                     // relItem.payMoney=itemSubBill.money-hasPayMap[itemSubBill.billNo];