commit

src/main/java/com/budwk/app/zhgh/dayofficework/meeting/controller/MeetingMineController.java

@@ -100,7 +100,7 @@ public class MeetingMineController {
 		if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
 			SqlExpressionGroup seg = new SqlExpressionGroup();
 			seg.or("name", "like", "%" + pageForm.getSearchKeyword() + "%");
-			seg.or("name", "like", "%" + pageForm.getSearchKeyword() + "%");
+			seg.or("address", "like", "%" + pageForm.getSearchKeyword() + "%");
 			cnd.and(seg);
 		}
 		if (StrUtil.isNotBlank(pageForm.getPageOrderName()) && StrUtil.isNotBlank(pageForm.getPageOrderBy())) {

src/main/resources/views/platform/zhgh/activity/trainSignUp/userAdjust/userInfo.js

@@ -51,7 +51,6 @@ const userInfo = {
                     <el-table-column label="单选" width="160">
                         <template v-slot="{row}">
                             <el-radio
-                                    :label="row.id"
                                     @change.native="getCurrentRow(row)"
                                     :disabled="(row.courseReservedNumber + row.registerNum) >= row.coursePeopleNumber"
                                     v-model="afterAdjustCourse"

src/main/resources/views/platform/zhgh/dayofficework/meeting/manage/basicForm.js

@@ -231,6 +231,10 @@ const basicForm = {
     },
     methods: {
         next() {
+            if(!this.formData.typeId) {
+                this.$message.warning('请选择会议类型')
+                return
+            }
             const type = this.typeOptions.find(o => o.id === this.formData.typeId)
             if(type.designId === 'JDHHY' && !this.formData.teacherCongressSessionId) {
                 this.$message.warning('请选择所属教代会')

src/main/resources/views/platform/zhghh5/activity/family/list/index.html

@@ -30,6 +30,12 @@ layout("/layouts/platform_h5.html"){
         </van-dropdown-menu>
     </van-sticky>
 
+    <van-tabs v-if="assortList.length > 0" type="card" color="#1867B0"
+              style="margin-top: 10px" @click="tabClick">
+        <van-tab v-for="item in assortList" :name="item" :title="item">
+        </van-tab>
+    </van-tabs>
+
     <table-list api="/platform/family/apply/pageData"
                 :page_form.sync="pageForm"
                 ref="tableListRef"
@@ -117,6 +123,7 @@ layout("/layouts/platform_h5.html"){
                     courseTypeId: null,
                     activityId: GetQueryString('id'),
                     dataType: GetQueryString('dataType'),
+                    assortTypes: [],
                 },
                 typeOptions: [],
                 assortOptions: [],
@@ -125,10 +132,18 @@ layout("/layouts/platform_h5.html"){
 
                 introduceRow: {},
                 activity: {},
+                assortList: [],
+
                 weekdayCNMap: {0: '周日', 1: '周一', 2: '周二', 3: '周三', 4: '周四', 5: '周五', 6: '周六'},
             }
         },
         methods: {
+            tabClick(name) {
+                this.pageForm.assortTypes = []
+                this.pageForm.assortTypes.push(name)
+                this.pageForm.assortTypes = JSON.stringify(this.pageForm.assortTypes)
+                this.doSearch()
+            },
             refresh() {
                 this.doSearch()
             },
@@ -197,6 +212,7 @@ layout("/layouts/platform_h5.html"){
                 }
             },
             async onReady() {
+                this.queryCourseAssort()
                 const typeList = await this.getCourseTypeList()
                 this.sourceTypeOptions = clone(typeList)
                 this.typeOptions = [
@@ -221,6 +237,15 @@ layout("/layouts/platform_h5.html"){
                 const resp = await this.$axios.post("/platform/family/type/getAllType")
                 return resp.data
             },
+            queryCourseAssort() {
+                this.$axios.post("/platform/family/apply/queryCourseAssort", {activityId: this.pageForm.activityId})
+                    .then((resp) => {
+                        this.assortList = resp.data
+                        if(this.assortList.length > 0) {
+                            this.pageForm.assortTypes = JSON.stringify([this.assortList[0]])
+                        }
+                    })
+            },
             doSearch() {
                 this.$nextTick(() => {
                     this.pageForm.pageNumber = 1

src/main/resources/views/platform/zhghh5/activity/trainSignUp/list/index.html

@@ -24,6 +24,12 @@ layout("/layouts/platform_h5.html"){
         </van-dropdown-menu>
     </van-sticky>
 
+    <van-tabs v-if="assortList.length > 0" type="card" color="#1867B0"
+              style="margin-top: 10px" @click="tabClick">
+        <van-tab v-for="item in assortList" :name="item" :title="item">
+        </van-tab>
+    </van-tabs>
+
     <table-list api="/platform/trainSignUp/apply/pageData"
                 :page_form.sync="pageForm"
                 ref="tableListRef"
@@ -110,6 +116,7 @@ layout("/layouts/platform_h5.html"){
                     courseTypeId: null,
                     activityId: GetQueryString('id'),
                     dataType: GetQueryString('dataType'),
+                    assortTypes: [],
                 },
                 typeOptions: [],
                 assortOptions: [],
@@ -118,11 +125,18 @@ layout("/layouts/platform_h5.html"){
 
                 introduceRow: {},
                 activity: {},
+                assortList: [],
 
                 weekdayCNMap: {0: '周日', 1: '周一', 2: '周二', 3: '周三', 4: '周四', 5: '周五', 6: '周六'},
             }
         },
         methods: {
+            tabClick(name) {
+                this.pageForm.assortTypes = []
+                this.pageForm.assortTypes.push(name)
+                this.pageForm.assortTypes = JSON.stringify(this.pageForm.assortTypes)
+                this.doSearch()
+            },
             refresh() {
                 this.doSearch()
             },
@@ -191,6 +205,7 @@ layout("/layouts/platform_h5.html"){
                 }
             },
             async onReady() {
+                this.queryCourseAssort()
                 const typeList = await this.getCourseTypeList()
                 this.sourceTypeOptions = clone(typeList)
                 this.typeOptions = [
@@ -215,6 +230,15 @@ layout("/layouts/platform_h5.html"){
                 const resp = await this.$axios.post("/platform/trainSignUp/type/getAllType")
                 return resp.data
             },
+            queryCourseAssort() {
+                this.$axios.post("/platform/trainSignUp/apply/queryCourseAssort", {activityId: this.pageForm.activityId})
+                    .then((resp) => {
+                        this.assortList = resp.data
+                        if(this.assortList.length > 0) {
+                            this.pageForm.assortTypes = JSON.stringify([this.assortList[0]])
+                        }
+                    })
+            },
             doSearch() {
                 this.$nextTick(() => {
                     this.pageForm.pageNumber = 1

src/main/resources/views/platform/zhghh5/dayofficework/literacy/list/index.html

@@ -24,6 +24,12 @@ layout("/layouts/platform_h5.html"){
         </van-dropdown-menu>
     </van-sticky>
 
+    <van-tabs v-if="assortList.length > 0" type="card" color="#1867B0"
+              style="margin-top: 10px" @click="tabClick">
+        <van-tab v-for="item in assortList" :name="item" :title="item">
+        </van-tab>
+    </van-tabs>
+
     <table-list api="/platform/literacy/apply/pageData"
                 :page_form.sync="pageForm"
                 ref="tableListRef"
@@ -110,6 +116,7 @@ layout("/layouts/platform_h5.html"){
                     courseTypeId: null,
                     activityId: GetQueryString('id'),
                     dataType: GetQueryString('dataType'),
+                    assortTypes: [],
                 },
                 typeOptions: [],
                 assortOptions: [],
@@ -118,11 +125,18 @@ layout("/layouts/platform_h5.html"){
 
                 introduceRow: {},
                 activity: {},
+                assortList: [],
 
                 weekdayCNMap: {0: '周日', 1: '周一', 2: '周二', 3: '周三', 4: '周四', 5: '周五', 6: '周六'},
             }
         },
         methods: {
+            tabClick(name) {
+                this.pageForm.assortTypes = []
+                this.pageForm.assortTypes.push(name)
+                this.pageForm.assortTypes = JSON.stringify(this.pageForm.assortTypes)
+                this.doSearch()
+            },
             refresh() {
                 this.doSearch()
             },
@@ -191,6 +205,7 @@ layout("/layouts/platform_h5.html"){
                 }
             },
             async onReady() {
+                this.queryCourseAssort()
                 const typeList = await this.getCourseTypeList()
                 this.sourceTypeOptions = clone(typeList)
                 this.typeOptions = [
@@ -215,6 +230,15 @@ layout("/layouts/platform_h5.html"){
                 const resp = await this.$axios.post("/platform/literacy/type/getAllType")
                 return resp.data
             },
+            queryCourseAssort() {
+                this.$axios.post("/platform/literacy/apply/queryCourseAssort", {activityId: this.pageForm.activityId})
+                    .then((resp) => {
+                        this.assortList = resp.data
+                        if(this.assortList.length > 0) {
+                            this.pageForm.assortTypes = JSON.stringify([this.assortList[0]])
+                        }
+                    })
+            },
             doSearch() {
                 this.$nextTick(() => {
                     this.pageForm.pageNumber = 1