Merge remote-tracking branch 'origin/branch20211008'

src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue

@@ -383,6 +383,7 @@ export default {
      * 重置
      */
     searchReset() {
+      this.departChange(this.departId)
       let obj = {
         departId: this.departId,
         principalId: this.principal,

src/views/incomePayments/meetManage/Attendance.vue

@@ -254,7 +254,7 @@
           </template>
 
           <span slot="action" slot-scope="text, record" class="action-span-cell">
-            <!-- 只有缴费方式为汇款并且上传了汇款凭证的的才会有审核按钮  审核通过后不显示 审核凭证按钮 -->
+            <!-- 只有缴费方式为汇款并且上传了汇款凭证的的才会有审核按钮 审核报名信息通过后才能审核凭证 审核通过后不显示 审核凭证按钮 -->
           <a @click="handleAudit(record)" v-if="(record.payMode === 1 || record.payMode === 2 ) && record.paymentRecord && record.checkResult !== 1"
              v-has:[authorCode.auditRecord]="'attendance:auditCredentials'">审核凭证</a>
             <!-- 只有工作组会议与分标委会议才有审核报名信息-->

src/views/incomePayments/meetManage/OtherMeetingForm.vue

@@ -96,7 +96,7 @@
             <a-input placeholder="请输入邮寄地址"
                      :maxLength='50'
                      :disabled="isEditBool"
-                     v-decorator="[ 'postContactAddress']"></a-input>
+                     v-decorator="[ 'postContactAddress',validatorRules.postContactAddress]"></a-input>
           </a-form-item>
         </a-col>
 
@@ -105,7 +105,7 @@
             <a-input placeholder="请输入邮编"
                      :disabled="isEditBool"
                      @change="(e) => {e.target.value = e.target.value.replace(/[^0-9]/g,'')}" :maxLength="6"
-                     v-decorator="[ 'postCode']"></a-input>
+                     v-decorator="[ 'postCode',validatorRules.postCode]"></a-input>
           </a-form-item>
         </a-col>
       </a-row>
@@ -201,7 +201,16 @@ export default {
         orderCode: {
           rules: [{required: true, message: '请输入订单号后四位'}],
           validateTrigger: 'blur'
-        }
+        },
+        postContactAddress:{
+          rules: [{required: true, message: '请输入邮寄地址'}],
+          validateTrigger: 'blur'
+        },
+        postCode:{
+          rules: [{required: true, message: '请输入邮编'}],
+          validateTrigger: 'blur'
+        },
+
       },
       // 是否可编辑
       isEditBool: false,

src/views/incomePayments/meetManage/modules/SeminarPartnerForm.vue

@@ -8,6 +8,7 @@
           <a-form-item label="抵达时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <j-date placeholder="请选择抵达时间" style="width: 100%;" v-decorator="['arrivalTime']"
                     :trigger-change="true"
+                    :disabled-date="disabledArrivalTimeEndDate"
                     show-type="day"
                     date-format="YYYY-MM-DD"/>
           </a-form-item>
@@ -96,6 +97,17 @@ export default {
       }
       return startValue.valueOf() > endValue.valueOf()
     },
+    /*
+    * 抵达时间禁用
+    * */
+    disabledArrivalTimeEndDate(endValue) {
+      const startValueTemp = this.form.getFieldValue('departureTime')
+      const startValue = startValueTemp && moment(startValueTemp, 'YYYY-MM-DD')
+      if (!endValue || !startValue) {
+        return false
+      }
+      return startValue.valueOf() < endValue.valueOf() - 86400000
+    },
 
   }
 }

src/views/mailManagement/BillMail.vue

@@ -87,7 +87,7 @@
           </template>
 
           <span slot="print" slot-scope="text, record" class="action-span-cell">
-            <a-button type="primary" :disabled="record.sendMethod === 2">打印</a-button>
+            <a-button type="primary" :disabled="record.sendMethod === 2 || record.postStatus === 0">打印</a-button>
           </span>
           <span slot="action" slot-scope="text, record" class="action-span-cell">
             <a @click="handleAdd(record)" v-if="record.postStatus === 0" v-has="'billMail:mail'">邮寄</a>

src/views/signUp/SignUpPage.vue

@@ -96,6 +96,7 @@
                                     :is-limit="true"
                                     :maxLength='50'>
                     </company-select>
+                    <span class="color-red">若没有您要选择的企业,请您添加企业信息(发票抬头)</span>
                   </a-form-item>
                 </a-col>
               </a-row>
@@ -525,10 +526,10 @@ export default {
       if(e.target.value !== 2 && this.currentMeetingInfo.meetingType !== '3' ){
         this.meetingCostSum = '0.00'
       }else {
-        // 会议是标协会议的话 需要判断企业是否是标准协会
+        // 会议是标协会议的话 需要判断企业是否是标协会员的企业
         if(this.currentMeetingInfo.meetingType === '2' && this.isStandardBool){
           this.meetingCostSum = this.currentMeetingInfo.meetingCostsVip
-        }else {
+        }else if(this.currentMeetingInfo.meetingType === '2'){
           this.meetingCostSum =   this.currentMeetingInfo.meetingCosts
         }
 
@@ -763,7 +764,9 @@ export default {
     }
   }
 }
-
+.color-red {
+  color: red;
+}
 .qr-code {
   width: 140px;
   height: 140px;