工作组会议维护变更修改 用户添加邮箱验证码字段

src/utils/validate.js

@@ -77,5 +77,5 @@ export function number(s) {
  * @returns {boolean}
  */
 export function money(s) {
-  return /^[1-9](\d{1,10})?(\.\d{1,2})$|^0\.([1-9](\d{0,1})|\d[1-9])$|^[1-9]\d{0,9}$|^0$/.test(s)
+  return /^[0-9](\d{1,9})?(\.\d{1,2})$|^0\.([1-9](\d{0,1})|\d[1-9])$|^[1-9]\d{0,9}$|^0$/.test(s)
 }

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

@@ -255,7 +255,7 @@ export default {
       if(value && money(value)){
         callback()
       }else {
-        callback('请输入合法的金额数字，最多2位小数,11位正数')
+        callback('请输入合法的金额数字，最多2位小数,10位正数')
       }
 
     }

src/views/incomePayments/meetManage/AddOrDetailMeet.vue

@@ -201,7 +201,7 @@
                          :maxLength='50'
                          @change="(e) => {e.target.value = e.target.value.replace(/[^0-9.]/g,'')}"
                          @blur="addZero"
-                         v-decorator="[ 'meetingCosts',validatorRules.meetingCosts]"></a-input>
+                         v-decorator="[ 'meetingCosts',validateInviteCode.meetingCosts]"></a-input>
                 <span class="yuan">元/人</span>
               </a-form-item>
             </a-col>
@@ -212,10 +212,18 @@
                 <a-input placeholder="请输入会议费用"
                          :maxLength='50'
                          @change="(e) => {e.target.value = e.target.value.replace(/[^0-9.]/g,'')}"
-                         v-decorator="[ 'meetingCostsVip',validatorRules.meetingCostsVip]"></a-input>
+                         @blur="addZero"
+                         v-decorator="[ 'meetingCostsVip',validateInviteCode.meetingCostsVip]"></a-input>
                 <span class="yuan">元/人</span>
               </a-form-item>
             </a-col>
+            <!--收款二维码-->
+            <a-col :xxl="8" :xl="12" :sm="24" v-if="QRcodeBool">
+              <a-form-item label="收款二维码" :labelCol="{ xs: {span: 24},sm: {span: 8}}"
+                           :wrapperCol="{ xs: {span: 24},xl:{span:14},sm: {span: 16}}">
+                <j-image-upload :return-id="true"></j-image-upload>
+              </a-form-item>
+            </a-col>
           </a-row>
           <!--会议费用end-->
 
@@ -301,6 +309,25 @@
           </a-row>
 
           <!--联系方式end-->
+          <!--通知正文begin-->
+          <!--只有分标委会议与工作组会议才有-->
+          <template v-if="meetingType === '1' || meetingType === '5' ">
+            <div class="item-title">通知文件</div>
+            <a-row :gutter="24">
+              <a-col :xxl="18" :xl="18" :sm="24">
+                <a-form-item label="通知正文" :labelCol="remarksLabelCol" :wrapperCol="remarksWrapperCol">
+                  <a-textarea
+                    placeholder="请输入通知正文"
+                    :auto-size="{ minRows: 3, maxRows: 6 }"
+                    v-decorator="['remark']"
+                    :maxLength='200'
+                    @change="e => {e.target.value = (e.target.value + '').trim()}"/>
+                  <span style="color:#999">仅用于发送邮件使用</span>
+                </a-form-item>
+              </a-col>
+            </a-row>
+          </template>
+          <!--通知正文end-->
 
         </a-form>
         <div class="footer">
@@ -328,8 +355,10 @@ import moment from 'moment'
 import pick from 'lodash.pick'
 import meetingValidate from '@views/incomePayments/meetManage/meetingValidate'
 import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
+import JImageUpload from '@comp/jero/JImageUpload'
 import {checkMeetingName} from '@/utils/validateOnly'
 import {addZero} from '@/utils/util'
+import {money} from '@/utils/validate'
 
 export default {
   name: 'AddOrDetailMeet',
@@ -340,7 +369,8 @@ export default {
     JDate,
     SelectPrincipal,
     JAreaLinkage,
-    PageHeaderTitle
+    PageHeaderTitle,
+    JImageUpload
   },
   data() {
     return {
@@ -397,6 +427,18 @@ export default {
           validateTrigger: ['blur', 'change'],
           initialValue: this.$store.getters.currentYear
         },
+        meetingCosts: {
+          rules: [
+            {required: true, validator: this.validateMeetingCosts},
+          ],
+          validateTrigger: ['blur']
+        },
+        meetingCostsVip: {
+          rules: [
+            {required: true, validator: this.validateMeetingCostsVip},
+          ],
+          validateTrigger: ['blur']
+        },
       },
       url: {
         add: '/meeting/payMeeting/add',
@@ -407,7 +449,9 @@ export default {
       // 注册召开时间
       newSignInTime: '',
       // 工作组会议列表
-      workGroupList: []
+      workGroupList: [],
+      // 收费二维码显示
+      QRcodeBool: true,
     }
   },
   computed: {
@@ -681,6 +725,38 @@ export default {
       }
     },
     /*
+    * 会议费用校验
+    * */
+    validateMeetingCosts(rule, value, callback) {
+      if (value === undefined || value === '' || value === null) {
+        callback('请输入会议费用')
+      }
+      if (value && money(value)) {
+        // 会议费用为 0控制二维码显示隐藏
+        if (value === '0.00') {
+          this.QRcodeBool = false
+        } else {
+          this.QRcodeBool = true
+        }
+        callback()
+      } else {
+        callback('请输入合法的金额数字，最多2位小数,10位正数')
+      }
+    },
+    /*
+    * 标协会议费用校验
+    * */
+    validateMeetingCostsVip(rule, value, callback) {
+      if (value === undefined || value === '' || value === null) {
+        callback('请输入会议费用(标协会员)')
+      }
+      if (value && money(value)) {
+        callback()
+      } else {
+        callback('请输入合法的金额数字，最多2位小数,10位正数')
+      }
+    },
+    /*
     * 获取所有的工作组
     * */
     getWorkSelectList() {
@@ -690,6 +766,13 @@ export default {
         }
       })
     },
+    moenyQRcode() {
+      let meetingCosts = this.form.getFieldValue('meetingCosts')
+      let meetingCostsVip = this.form.getFieldValue('meetingCostsVip')
+      console.log('meetingCostsVip', meetingCostsVip)
+      console.log('meetingCostsVip', meetingCosts)
+    },
+
   }
 }
 </script>

src/views/projectManagement/ConferenceMaintenance.vue

@@ -80,7 +80,7 @@
       <a-button type="primary" icon="plus" @click="handleAdd">新增</a-button>
       <a-button type="primary" icon="export" @click="handleExportXls('工作组会议维护')">导出</a-button>
       <a-button type="danger" icon="delete" @click="batchDel">批量删除</a-button>
-      <a-button type="primary" @click="publishRemind">发布-提醒</a-button>
+      <a-button type="primary" @click="publishRemind">发布</a-button>
     </div>
     <!--    /操作按钮区域-end-->
 
@@ -111,7 +111,7 @@
 
         <span slot="action" class="action-span-cell" slot-scope="text, record">
           <a @click="uploadFile(record)">上传文件</a>
-          <a @click="applyMsg">报名信息</a>
+<!--          <a @click="applyMsg">报名信息</a>-->
           <a @click="handleEdit(record)">编辑</a>
           <a @click="handleDelete(record.id)">删除</a>
         </span>
@@ -285,7 +285,7 @@ export default {
       })
     },
     /*
-    * 发布提醒
+    * 发布
     * */
     publishRemind() {
       if (this.selectionRows.length === 0) {
@@ -294,7 +294,7 @@ export default {
       } else {
         // 传入选中的会议id
         this.$refs.publishRemindModal.open(this.selectedRowKeys)
-        this.$refs.publishRemindModal.title = '发布-提醒'
+        this.$refs.publishRemindModal.title = '发布'
       }
 
     },

src/views/projectManagement/modules/PublishRemindModal.vue

@@ -44,7 +44,8 @@
 
 
       <template slot="text" slot-scope="text">
-        <j-ellipsis :value="text" :length="18"></j-ellipsis>
+        <j-ellipsis v-if="!!text" :value="text" :length="20"></j-ellipsis>
+        <span v-else></span>
       </template>
 
       <span slot="action" class="action-span-cell" slot-scope="text, record">
@@ -53,9 +54,10 @@
         </span>
     </a-table>
     <template slot="footer">
-      <a-button @click="handleCancel">关闭</a-button>
+      <a-button  type="primary" @click="handleOk" v-preventclick>确定发布</a-button>
-      <a-button  type="primary" @click="handleOk" v-preventclick>确定</a-button>
+      <a-button @click="handleCancel">取消</a-button>
     </template>
+
   </j-modal>
 </template>
 
@@ -90,12 +92,21 @@ export default {
           align: 'center',
           width: 200,
           dataIndex: 'chargeCompanyTemporaryName',
+          scopedSlots: {customRender: 'text'}
         },
         {
           title: '企业联系人',
           align: 'center',
           width: 200,
           dataIndex: 'contactsTemporaryNameOne',
+          scopedSlots: {customRender: 'text'}
+        },
+        {
+          title: '是否提醒',
+          align: 'center',
+          width: 200,
+          dataIndex: '',
+          // scopedSlots: {customRender: 'text'}
         },
       ],
       model: {},

src/views/system/modules/UserModal.vue

@@ -137,6 +137,10 @@
           <a-input placeholder="请输入邮箱" :disabled="disableSubmit" @change="event => event.target.value = event.target.value.trim()" v-decorator="[ 'email', validatorRules.email]" :maxLength="50"/>
         </a-form-item>
 
+        <a-form-item label="邮箱授权码" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-input placeholder="请输入邮箱授权码" :disabled="disableSubmit" @change="event => event.target.value = event.target.value.trim()" v-decorator="[ 'emailCode', validatorRules.emailCode]" :maxLength="50"/>
+        </a-form-item>
+
         <a-form-item label="手机号码" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input placeholder="请输入手机号码"  @change="event => event.target.value = event.target.value.trim()" :disabled="isDisabledAuth('user:form:phone') || disableSubmit"
                    v-decorator="[ 'phone', validatorRules.phone]" :maxLength="11"/>
@@ -208,6 +212,13 @@ export default {
           }],
           validateTrigger: 'blur'
         },
+        emailCode:{
+          rules: [{
+            required: true,
+            message: '请输入邮箱授权码'
+          }],
+          validateTrigger: 'blur'
+        },
         password: {
           rules: [{
             required: true,
@@ -492,7 +503,7 @@ export default {
       // 触发表单验证
       this.form.validateFields((err, values) => {
         if (!err) {
-          console.log("values=======", values)
+          console.log('values=======', values)
           let formData = Object.assign(this.model, values)
           if (that.fileList !== '') {
             formData.avatar = that.fileList