From c8746db3858d8edb6fa0e70ec3b19d1a382bacef Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 30 May 2025 15:21:44 +0800
Subject: [PATCH] md

---
 .../AllMonthpayAccountPicker.vue              |  4 +-
 .../panel/PayRecordInputByInvoice.vue         | 46 ++++++++++++-------
 2 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/src/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue b/src/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue
index ddec6ca4..68edd668 100644
--- a/src/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue
+++ b/src/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue
@@ -93,10 +93,10 @@
       },
       onChange() {
           this.$emit("input", this.svalue);
-          let itemData = this.optionItems.find(item => item.monthlyPayCode == this.svalue);
+          let itemData = this.optionItems.find(item => item.custNo == this.svalue);
           this.$emit("change",itemData);
           this.$emit("onChange",itemData);
-          this.dispatch('ElFormItem', 'el.form.change', [this.svalue]);
+          // this.dispatch('ElFormItem', 'el.form.change', [this.svalue]);
       },
       remoteDebounce(val,key){
         debounce(this.queryData(val,key),1000);
diff --git a/src/views/emis/emisSettlePayRecord/panel/PayRecordInputByInvoice.vue b/src/views/emis/emisSettlePayRecord/panel/PayRecordInputByInvoice.vue
index 0caef5ac..5a6e6ee9 100644
--- a/src/views/emis/emisSettlePayRecord/panel/PayRecordInputByInvoice.vue
+++ b/src/views/emis/emisSettlePayRecord/panel/PayRecordInputByInvoice.vue
@@ -62,24 +62,20 @@
        <el-form ref="form"  :model="form" size="mini" :rules="rules" label-width="80px" style="margin-top: 20px;">
          <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
 
-          <el-col :span="6" >
-            <el-form-item label="收款方式" prop="payType">
+           <el-col :span="6" >
+            <el-form-item label="" prop="settleType">
               <span slot="label">
-                <span style="color: red">收款方式</span>
+                <span style="color: red">缴款方式</span>
               </span>
-              <el-select v-model="form.payType" placeholder="收款方式" clearable filterable style="width:100%">
-                <el-option
-                  v-for="dict in dict.type.emis_settlebill_pay_type"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
+
+              <el-radio-group v-model="form.settleType"  >
+                <el-radio :key="'1'" label="1">现金缴款</el-radio>
+                <el-radio :key="'2'" label="2">月结缴款</el-radio>
+              </el-radio-group>
 
             </el-form-item>
-
           </el-col>
-          <el-col :span="6" v-if="form.settleType==2">
+           <el-col :span="6" v-if="form.settleType==2">
             <el-form-item :label="$t('缴款客户')" prop="customerCode" >
               <span slot="label">
                 <span style="color: red">缴款客户</span>
@@ -96,6 +92,27 @@
               <PayeePicker v-model="form.payManCode" @onChange="onPayeeSelect"></PayeePicker>
             </el-form-item>
           </el-col>
+          <el-col :span="12" >
+
+          </el-col>
+          <el-col :span="6" >
+            <el-form-item label="收款方式" prop="payType">
+              <span slot="label">
+                <span style="color: red">收款方式</span>
+              </span>
+              <el-select v-model="form.payType" placeholder="收款方式" clearable filterable style="width:100%">
+                <el-option
+                  v-for="dict in dict.type.emis_settlebill_pay_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+
+            </el-form-item>
+          </el-col>
+
+
           <el-col :span="6" >
             <el-form-item label="交易时间" prop="tradeDate">
               <span slot="label">
@@ -111,9 +128,6 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="6" >
-          </el-col>
-
           <el-col :span="6" >
             <el-form-item label="收款金额" prop="payMoney">
               <span slot="label">