From 8b553817d70a534eafd81b32323eed49080e4e92 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Thu, 28 Jul 2022 11:54:46 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=E5=8F=91=E7=A5=A8?=
 =?UTF-8?q?=E6=97=A0=E7=9A=84=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/CombinationPaymentModal.vue          | 16 +++++++++-------
 .../PaymentInfo/modules/PaymentInfoModal.vue     |  5 +++--
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue b/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue
index da80e3c..1f1a605 100644
--- a/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue
+++ b/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue
@@ -121,7 +121,7 @@
                   v-decorator="['paymentRecord',  validatorRules.paymentRecord]">
                 </j-image-upload>
               </a-form-item>
-              <span v-if="!validateCompanyNameFlag" class="paymentRecord-notice">需上传"垫付款说明（盖章"文件）</span>
+              <span v-if="!validateCompanyNameFlag " class="paymentRecord-notice">需上传"垫付款说明（盖章"文件）</span>
             </a-col>
 
             <a-col :span="12">
@@ -246,6 +246,7 @@
           <a-col :span="24" class="remark">
             <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-textarea
+                style="width: 100%"
                 rows="5"
                 v-decorator="['remark']"
                 placeholder="请输入备注"
@@ -331,6 +332,7 @@
                 :trigger-change="true"
                 dictCode="invoice_requirements"
                 placeholder="请选择发票"/>
+              <span v-if="currentSelectInvoiceType === 0 " class="other-notice">本选项不提供任何形式的发票凭证</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -554,7 +556,7 @@ export default {
               required: true, message: '请输入会员缴费金额'
             },
             {
-              pattern: /^[1-9](\d{1,8})?(\.\d{1,2})$|^0\.([1-9](\d{0,1})|\d[1-9])$|^[1-9]\d{0,8}$|^0$/,
+              pattern: /^[1-9](\d{1,7})?(\.\d{1,2})$|^0\.([1-9](\d{0,1})|\d[1-9])$|^[1-9]\d{0,8}$|^0$/,
               message: '请输入合法的金额数字，最多2位小数,8位正数'
             }
           ],
@@ -566,7 +568,7 @@ export default {
               required: true, message: '请输入凭证金额'
             },
             {
-              pattern: /^[1-9](\d{1,8})?(\.\d{1,2})$|^0\.([1-9](\d{0,1})|\d[1-9])$|^[1-9]\d{0,8}$|^0$/,
+              pattern: /^[1-9](\d{1,7})?(\.\d{1,2})$|^0\.([1-9](\d{0,1})|\d[1-9])$|^[1-9]\d{0,8}$|^0$/,
               message: '请输入合法的金额数字，最多2位小数,8位正数'
             }
           ],
@@ -610,7 +612,7 @@ export default {
           rules: [{ required: false, message: '请选择失效日期' }],
           validateTrigger: ['blur', 'change']
         },
-        paymentRecord: { rules: [{ required: true, message: '请山川缴费凭证/付款说明' }] },
+        paymentRecord: { rules: [{ required: true, message: '请上传缴费凭证/付款说明' }] },
         paymentRecord1: { rules: [{ required: true, message: '请上传打包协议' }] },
         headerName: {
           rules: [
@@ -1336,15 +1338,15 @@ export default {
 .paymentRecord-notice {
   color: #f5222d;
   position: absolute;
-  bottom: 4px;
+  bottom: 25px;
   left: 15%
 }
 // 发票选择无 增加样式
 .other-notice {
   color: #f5222d;
   position: absolute;
-  bottom: 4px;
-  left: 25%
+  bottom: -45px;
+  left: 0
 }
 
 
diff --git a/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue b/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
index 01a2138..9985727 100644
--- a/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
+++ b/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
@@ -289,6 +289,7 @@
             <a-col :span="24" class="remark">
               <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <a-textarea
+                  style="width: 100%"
                   rows="5"
                   v-decorator="['remark']"
                   placeholder="请输入备注"
@@ -1422,7 +1423,7 @@ export default {
 .paymentRecord-notice {
   color: #f5222d;
   position: absolute;
-  bottom: 4px;
+  bottom: 25px;
   left: 15%
 }
 // 发票选择无 增加样式
@@ -1430,6 +1431,6 @@ export default {
   color: #f5222d;
   position: absolute;
   bottom: 4px;
-  left: 25%
+  left: 32%
 }
 </style>