From 481c8b547c600438d1a0403197e8412016a0bb48 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Wed, 29 Sep 2021 15:43:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=90=8D=E6=8F=90=E4=BA=A4bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=97=A5=E5=BF=97=E5=8A=A0=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/signUp/SignUpPage.vue |  3 ++-
 src/views/system/LogList.vue    | 30 ++++++++++++++++++------------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/views/signUp/SignUpPage.vue b/src/views/signUp/SignUpPage.vue
index af306d8..ca4a01e 100644
--- a/src/views/signUp/SignUpPage.vue
+++ b/src/views/signUp/SignUpPage.vue
@@ -447,7 +447,8 @@ export default {
       }
       this.form.validateFields((err, values) => {
         if (!err) {
-          if (this.codeErrorBool) {
+          // 判断邀请码是否错误 需要判断会议类型 以及 是否有邀请码
+          if (this.codeErrorBool && this.currentMeetingInfo.meetingType === '3' && this.inviteCodeBool ) {
             this.$message.error('邀请码填写错误')
             return
           }
diff --git a/src/views/system/LogList.vue b/src/views/system/LogList.vue
index 1f5c06d..0dc0a2b 100644
--- a/src/views/system/LogList.vue
+++ b/src/views/system/LogList.vue
@@ -41,13 +41,18 @@
                 <a-button type="primary" style="left: 10px" @click="searchQuery" icon="search" v-has="'sys:log:search'">查询</a-button>
                 <a-button class="reset-button" @click="searchReset" icon="reload"
                           style="margin-left: 8px;left: 10px">重置</a-button>
+
             </a-col>
           </span>
 
           </a-row>
         </a-form>
       </div>
-
+      <div class="table-operator">
+        <a-button type="danger" @click="batchDel" icon="delete"  v-has="'sys:log:batchDelete'"
+                  style="margin-left: 8px;left: 10px">批量删除
+        </a-button>
+      </div>
       <!-- table区域-begin -->
       <a-table
         ref="table"
@@ -58,6 +63,7 @@
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
 
         <!--      <div v-show="queryParam.logType==2" slot="expandedRowRender" slot-scope="record" style="margin: 0">-->
@@ -75,8 +81,8 @@
 </template>
 
 <script>
-import { filterObj } from '@/utils/util'
-import { JeroListMixin } from '@/mixins/JeroListMixin'
+import {filterObj} from '@/utils/util'
+import {JeroListMixin} from '@/mixins/JeroListMixin'
 import JEllipsis from '@/components/jero/JEllipsis'
 import IconImg from '@/assets/imgs/icon/icon_system.png'
 import PageHeaderTitle from '../../components/layouts/PageHeaderTitle'
@@ -125,7 +131,7 @@ export default {
           title: '日志内容',
           align: 'center',
           dataIndex: 'logContent',
-          scopedSlots: { customRender: 'logContent' },
+          scopedSlots: {customRender: 'logContent'},
           sorter: true
         }, {
           title: '创建时间',
@@ -160,17 +166,17 @@ export default {
           align: 'center'
         },
       labelCol: {
-        xs: { span: 1 },
-        sm: { span: 2 }
+        xs: {span: 1},
+        sm: {span: 2}
       },
       wrapperCol: {
-        xs: { span: 10 },
-        sm: { span: 16 }
+        xs: {span: 10},
+        sm: {span: 16}
       },
       url: {
         list: '/sys/log/page'
       },
-      newColumns:[],
+      newColumns: [],
     }
   },
   created() {
@@ -178,7 +184,7 @@ export default {
   },
   methods: {
     getQueryParams() {
-      var param = Object.assign({}, this.lastQueryParam, this.isorter, { logType: this.tabKey })
+      var param = Object.assign({}, this.lastQueryParam, this.isorter, {logType: this.tabKey})
       param.field = this.getQueryField()
       param.pageNo = this.ipagination.current
       param.pageSize = this.ipagination.pageSize
@@ -209,9 +215,9 @@ export default {
         this.newColumns.splice(7, 0, this.operateColumn)
       } else if (this.columns.length == 9) {
         this.tabKey = '1'
-         this.newColumns.splice(7, 1)
+        this.newColumns.splice(7, 1)
       }
-      console.log(this.tabKey,'this.tabKey')
+      console.log(this.tabKey, 'this.tabKey')
       let that = this
       that.queryParam = {}
       that.queryParam.logType = key