From b93a8e1b6876cd655d8d1275e635001dbc8d3271 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Thu, 21 Oct 2021 17:13:03 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=20=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/AddMeetingPerson.vue              |  2 +-
 .../modules/AddMemberProject.vue              |  2 +-
 .../meetManage/modules/SeminarVipForm.vue     | 57 +++++++++++++++----
 .../modules/MemberProjectModal.vue            | 20 ++++++-
 .../modules/SafeguardMemberModal.vue          | 18 +++++-
 5 files changed, 84 insertions(+), 15 deletions(-)

diff --git a/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue b/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue
index 5b96fa1..e2b1ce7 100644
--- a/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue
+++ b/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue
@@ -230,7 +230,7 @@ export default {
           validateTrigger: 'blur'
         },
         postAddress: {
-          rules: [{required: true, message: '请输入邮编'}],
+          rules: [{required: true, message: '请输入邮寄地址'}],
           validateTrigger: 'blur'
         },
         payMode: {
diff --git a/src/views/contractManagement/revenueContract/modules/AddMemberProject.vue b/src/views/contractManagement/revenueContract/modules/AddMemberProject.vue
index d2a0892..9a40f62 100644
--- a/src/views/contractManagement/revenueContract/modules/AddMemberProject.vue
+++ b/src/views/contractManagement/revenueContract/modules/AddMemberProject.vue
@@ -267,7 +267,7 @@ export default {
       if(value && money(value)){
         callback()
       }else {
-        callback('请输入合法的金额数字，最多2位小数,10位正数')
+        callback('应收金额格式错误')
       }
 
     },
diff --git a/src/views/incomePayments/meetManage/modules/SeminarVipForm.vue b/src/views/incomePayments/meetManage/modules/SeminarVipForm.vue
index 4484d11..f922643 100644
--- a/src/views/incomePayments/meetManage/modules/SeminarVipForm.vue
+++ b/src/views/incomePayments/meetManage/modules/SeminarVipForm.vue
@@ -87,21 +87,21 @@
         <!--入住酒店选择是才显示-->
         <a-col :xxl="8" :xl="12" :sm="24" v-if="inHotelBool">
           <a-form-item label="入住酒店时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <j-date :disabled="isEditBool" v-decorator="['inHotelTime']" :trigger-change="true" show-type="day"
+            <j-date :disabled="isEditBool" v-decorator="['inHotelTime',validatorRules.inHotelTime]" :trigger-change="true" show-type="day"
                     placeholder="请选择入住酒店时间"></j-date>
           </a-form-item>
         </a-col>
         <a-col :xxl="8" :xl="12" :sm="24" v-if="inHotelBool">
           <a-form-item label="离店时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <j-date :disabled="isEditBool" :disabled-date="disabledEndDate" :trigger-change="true" show-type="day"
-                    v-decorator="['outHotelTime']" placeholder="请选择离店时间"></j-date>
+                    v-decorator="['outHotelTime',validatorRules.outHotelTime]" placeholder="请选择离店时间"></j-date>
           </a-form-item>
         </a-col>
         <a-col :xxl="8" :xl="12" :sm="24" v-if="inHotelBool">
           <a-form-item label="房型" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-input :disabled="isEditBool" @change="event => event.target.value = event.target.value.trim()"
                      :maxLength="50"
-                     v-decorator="['roomLayout']"
+                     v-decorator="['roomLayout',validatorRules.roomLayout]"
                      placeholder="请输入房型"></a-input>
           </a-form-item>
         </a-col>
@@ -124,7 +124,7 @@
     <a-row :gutter="24">
       <a-col :xxl="8" :xl="12" :sm="24" v-if="pickUpBool">
         <a-form-item label="抵达时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <j-date :disabled="isEditBool" placeholder="请选择抵达时间" style="width: 100%;" v-decorator="['arrivalTime']"
+          <j-date :disabled="isEditBool" placeholder="请选择抵达时间" style="width: 100%;" v-decorator="['arrivalTime',validatorRules.arrivalTime]"
                   :trigger-change="true"
                   show-type="day"
                   date-format="YYYY-MM-DD"/>
@@ -135,7 +135,7 @@
         <a-form-item label="到达站" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input :disabled="isEditBool" placeholder="请输入到达站"
                    @change="event => event.target.value = event.target.value.trim()" :maxLength="50"
-                   v-decorator="[ 'destination']"></a-input>
+                   v-decorator="[ 'destination',validatorRules.destination]"></a-input>
         </a-form-item>
       </a-col>
 
@@ -143,7 +143,7 @@
         <a-form-item label="到达班次" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input :disabled="isEditBool" placeholder="请输入到达班次"
                    @change="event => event.target.value = event.target.value.trim()" :maxLength="50"
-                   v-decorator="[ 'arrivalShift']"></a-input>
+                   v-decorator="[ 'arrivalShift',validatorRules.arrivalShift]"></a-input>
         </a-form-item>
       </a-col>
     </a-row>
@@ -162,7 +162,7 @@
       <!--送站选择是才显示-->
       <a-col :xxl="8" :xl="12" :sm="24" v-if="sendBool">
         <a-form-item label="离开时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <j-date :disabled="isEditBool" placeholder="请选择离开时间" style="width: 100%;" v-decorator="['departureTime']"
+          <j-date :disabled="isEditBool" placeholder="请选择离开时间" style="width: 100%;" v-decorator="['departureTime',validatorRules.departureTime]"
                   :trigger-change="true"
                   show-type="day"
                   date-format="YYYY-MM-DD"/>
@@ -173,7 +173,7 @@
         <a-form-item label="离开站" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input :disabled="isEditBool" placeholder="请输入离开站"
                    @change="event => event.target.value = event.target.value.trim()" :maxLength="50"
-                   v-decorator="[ 'departureStation']"></a-input>
+                   v-decorator="[ 'departureStation',validatorRules.departureStation]"></a-input>
         </a-form-item>
       </a-col>
 
@@ -182,7 +182,7 @@
         <a-form-item label="离开班次" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input :disabled="isEditBool" placeholder="请输入离开班次"
                    @change="event => event.target.value = event.target.value.trim()" :maxLength="50"
-                   v-decorator="[ 'departureShift']"></a-input>
+                   v-decorator="[ 'departureShift',validatorRules.departureShift]"></a-input>
         </a-form-item>
       </a-col>
     </a-row>
@@ -274,14 +274,51 @@ export default {
           rules: [{ required: true, message: '请选择是否入住酒店' }],
           validateTrigger: 'change'
         },
+        inHotelTime:{
+          rules: [{ required: true, message: '请选择入住酒店时间' }],
+          validateTrigger: 'change'
+        },
+        outHotelTime:{
+          rules: [{ required: true, message: '请选择离店时间' }],
+          validateTrigger: 'change'
+        },
+        roomLayout:{
+          rules: [{ required: true, message: '请输入房型' }],
+          validateTrigger: 'blur'
+        },
         pickUp: {
           rules: [{ required: true, message: '请选择是否接站' }],
           validateTrigger: 'change'
         },
+        departureTime:{
+          rules: [{ required: true, message: '请选择离开时间' }],
+          validateTrigger: 'change'
+        },
+        departureStation:{
+          rules: [{ required: true, message: '请输入离开站' }],
+          validateTrigger: 'blur'
+        },
+        arrivalShift:{
+          rules: [{ required: true, message: '请输入到达班次' }],
+          validateTrigger: 'blur'
+        },
         deliveryStation: {
           rules: [{ required: true, message: '请选择是否送站' }],
           validateTrigger: 'change'
-        }
+        },
+        arrivalTime:{
+          rules: [{ required: true, message: '请选择抵达时间' }],
+          validateTrigger: 'change'
+        },
+        destination:{
+          rules: [{ required: true, message: '请输入到达站' }],
+          validateTrigger: 'blur'
+        },
+        departureShift:{
+          rules: [{ required: true, message: '请输入离开班次' }],
+          validateTrigger: 'blur'
+        },
+
       }
 
     }
diff --git a/src/views/incomePayments/memberManage/modules/MemberProjectModal.vue b/src/views/incomePayments/memberManage/modules/MemberProjectModal.vue
index 41eb126..3faae72 100644
--- a/src/views/incomePayments/memberManage/modules/MemberProjectModal.vue
+++ b/src/views/incomePayments/memberManage/modules/MemberProjectModal.vue
@@ -38,7 +38,7 @@
             <a-form-item label="收费标准" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input placeholder="请输入收费标准"
                        :maxLength='50'
-                       v-decorator="[ 'chargeStandard']"
+                       v-decorator="[ 'chargeStandard',validatorRules.chargeStandard]"
                        @blur="addZero"
                        @change="(e) => {e.target.value = e.target.value.replace(/[^0-9.]/g,'')}"></a-input>
               <span class="yuan">元</span>
@@ -90,6 +90,7 @@ import JYearDate from '@comp/jero/JYearDate'
 import JUpload from '@comp/jero/JUpload'
 import SelectPrincipal from '@comp/company/SelectPrincipal'
 import {addZero} from '@/utils/util'
+import {money} from '@/utils/validate'
 
 export default {
   name: 'MemberProjectModal',
@@ -129,6 +130,12 @@ export default {
           rules: [{required: true, message: '请输入会员项目'}],
           validateTrigger: 'blur'
         },
+        chargeStandard:{
+          rules: [
+            {required: false, validator: this.validateMoney},
+          ],
+          validateTrigger: ['blur']
+        },
         particularYear: {
           rules: [{required: true, message: '请选择年份'}],
           validateTrigger: ['change','blur']
@@ -196,6 +203,17 @@ export default {
     handleCancel() {
       this.close()
     },
+    validateMoney(rule, value, callback) {
+      if(value){
+        if (value && money(value)) {
+          callback()
+        } else {
+          callback('请输入合法的金额数字，最多2位小数,10位正数')
+        }
+      }else {
+        callback()
+      }
+    },
   }
 }
 </script>
diff --git a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
index db32292..47cea26 100644
--- a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
+++ b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
@@ -220,6 +220,7 @@ import CompanySelect from '@comp/company/CompanySelect'
 // import ContactManagementModule from '@views/businessManagement/modules/ContactManagementModule'
 import SelectContacts from '@comp/company/SelectContacts'
 import {addZero} from '@/utils/util'
+import {money} from '@/utils/validate'
 
 export default {
   name: 'SafeguardMemberModal',
@@ -276,9 +277,12 @@ export default {
           initialValue: 3,
         },
         amountReceivable: {
-          rules: [{ required: true, message: '请输入应收金额' }],
-          validateTrigger: 'blur',
+          rules: [
+            {required: true, validator: this.validateMoney},
+          ],
+          validateTrigger: ['blur']
         },
+
         chargeNoticeNo: {
           rules: [{ required: true, message: '请输入收费通知号' }],
           validateTrigger: 'blur',
@@ -310,6 +314,16 @@ export default {
     add() {
       this.edit({})
     },
+    validateMoney(rule, value, callback) {
+      if (value === undefined || value === '' || value === null) {
+        callback('请输入应收金额')
+      }
+      if (value && money(value)) {
+        callback()
+      } else {
+        callback('请输入合法的金额数字，最多2位小数,10位正数')
+      }
+    },
     edit(record) {
       // 清除定时器
       if (this.timer) {