修改搜索条件

src/views/contentManager/components/activity.vue

@@ -10,7 +10,7 @@
              :saveKey="'contentActivity'"
              :model="searchForm">
       <!-- <el-form-item prop="tenantId">
-        <el-select class="multiple"
+        <el-select class="multiple" multiple
                    v-model.trim="searchForm.tenantId"
                    placeholder="请选择对内或对外">
           <el-option label="对内"
@@ -19,11 +19,12 @@
                      value="2"></el-option>
         </el-select>
       </el-form-item> -->
-      <el-form-item prop="organId">
-        <el-select class="multiple"
-                   v-model.trim="searchForm.organId"
+      <el-form-item prop="organIdList">
+        <el-select class="multiple" v-model="searchForm.organIdList"
                    clearable
+                   multiple
                    filterable
+                   collapse-tags
                    placeholder="请选择分部">
           <el-option v-for="(item,index) in selects.branchs"
                     :key="index"
@@ -109,7 +110,7 @@ export default {
   data () {
     return {
       searchForm: {
-        organId: null
+        organIdList: []
       },
       tableList: [],
       teacherId: this.$route.query.teacherId,
@@ -134,7 +135,7 @@ export default {
     getList () {
       let params = {
         clientName: 'manage',
-        organId: this.searchForm.organId,
+        organIdList: this.searchForm.organIdList ? this.searchForm?.organIdList.join(',') : null,
         rows: this.pageInfo.limit,
         page: this.pageInfo.page,
         type: 1
@@ -200,4 +201,7 @@ export default {
 .bannerImg {
   height: 60px;
 }
+.multiple.el-select {
+  // width: 220px !important;
+}
 </style>

src/views/contentManager/components/advert.vue

@@ -9,10 +9,12 @@
              :saveKey="'contentAdvert'"
              @submit="search"
              :model="searchForm">
-      <el-form-item prop="organId">
+      <el-form-item prop="organIdList">
         <el-select class="multiple" clearable
                    filterable
-                   v-model.trim="searchForm.organId"
+                   collapse-tags
+                   multiple
+                   v-model.trim="searchForm.organIdList"
                    placeholder="请选择分部">
           <el-option v-for="(item,index) in selects.branchs"
                     :key="index"
@@ -103,7 +105,7 @@ export default {
   data () {
     return {
       searchForm: {
-        organId: null
+        organIdList: []
       },
       tableList: [],
       teacherId: this.$route.query.teacherId,
@@ -128,7 +130,7 @@ export default {
     getList () {
       let params = {
         clientName: 'manage',
-        organId: this.searchForm.organId,
+        organIdList: this.searchForm.organIdList ? this.searchForm.organIdList.join(',') : null,
         rows: this.pageInfo.limit,
         page: this.pageInfo.page,
         type: 8

src/views/contentManager/components/appPage.vue

@@ -9,10 +9,12 @@
              saveKey="contentAppPage"
              @submit="search"
              :model="searchForm">
-      <el-form-item prop="organId">
+      <el-form-item prop="organIdList">
         <el-select class="multiple"
-                   v-model.trim="searchForm.organId" clearable
+                   v-model.trim="searchForm.organIdList" clearable
                    filterable
+                   collapse-tags
+                   multiple
                    placeholder="请选择分部">
           <el-option v-for="(item,index) in selects.branchs"
                     :key="index"
@@ -109,7 +111,7 @@ export default {
   data () {
     return {
       searchForm: {
-        organId: null
+        organIdList: []
       },
       tableList: [],
       teacherId: this.$route.query.teacherId,
@@ -134,7 +136,7 @@ export default {
     getList () {
       let params = {
         clientName: 'manage',
-        organId: this.searchForm.organId,
+        organIdList: this.searchForm.organIdList ? this.searchForm.organIdList.join(',') : null,
         rows: this.pageInfo.limit,
         page: this.pageInfo.page,
         type: 6

src/views/contentManager/components/banner.vue

@@ -9,10 +9,12 @@
              saveKey="contentBanner"
              @submit="search"
              :model="searchForm">
-      <el-form-item prop="organId">
+      <el-form-item prop="organIdList">
         <el-select class="multiple" clearable
                    filterable
-                   v-model.trim="searchForm.organId"
+                   collapse-tags
+                   multiple
+                   v-model.trim="searchForm.organIdList"
                    placeholder="请选择分部">
           <el-option v-for="(item,index) in selects.branchs"
                     :key="index"
@@ -116,7 +118,7 @@ export default {
   data () {
     return {
       searchForm: {
-        organId: null
+        organIdList: []
       },
       tableList: [],
       teacherId: this.$route.query.teacherId,
@@ -144,7 +146,7 @@ export default {
     getList () {
       let params = {
         clientName: 'manage',
-        organId: this.searchForm.organId,
+        organIdList: this.searchForm.organIdList ? this.searchForm.organIdList.join(',') : null,
         rows: this.pageInfo.limit,
         page: this.pageInfo.page,
         type: 3

src/views/contentManager/components/flashPage.vue

@@ -9,10 +9,12 @@
              saveKey="contentFlashPage"
              @submit="search"
              :model="searchForm">
-      <el-form-item prop="organId">
+      <el-form-item prop="organIdList">
         <el-select class="multiple" clearable
                    filterable
-                   v-model.trim="searchForm.organId"
+                   collapse-tags
+                   multiple
+                   v-model.trim="searchForm.organIdList"
                    placeholder="请选择分部">
           <el-option v-for="(item,index) in selects.branchs"
                     :key="index"
@@ -102,7 +104,7 @@ export default {
   data () {
     return {
       searchForm: {
-        organId: null
+        organIdList: []
       },
       tableList: [],
       teacherId: this.$route.query.teacherId,
@@ -127,7 +129,7 @@ export default {
     getList () {
       let params = {
         clientName: 'manage',
-        organId: this.searchForm.organId,
+        organIdList: this.searchForm.organIdList ? this.searchForm.organIdList.join(',') : null,
         rows: this.pageInfo.limit,
         page: this.pageInfo.page,
         type: 5

src/views/contentManager/components/information.vue

@@ -9,10 +9,12 @@
              :saveKey="'contentInformation'"
              @submit="search"
              :model="searchForm">
-      <el-form-item prop="organId">
+      <el-form-item prop="organIdList">
         <el-select class="multiple" clearable
                    filterable
-                   v-model.trim="searchForm.organId"
+                   collapse-tags
+                   multiple
+                   v-model.trim="searchForm.organIdList"
                    placeholder="请选择分部">
           <el-option v-for="(item,index) in selects.branchs"
                     :key="index"
@@ -116,7 +118,7 @@ export default {
   data () {
     return {
       searchForm: {
-        organId: null,
+        organIdList: [],
         subType: null,
       },
       tableList: [],
@@ -148,7 +150,7 @@ export default {
     getList () {
       let params = {
         clientName: 'manage',
-        organId: this.searchForm.organId,
+        organIdList: this.searchForm.organIdList ? this.searchForm.organIdList.join(',') : null,
         subType: this.searchForm.subType,
         rows: this.pageInfo.limit,
         page: this.pageInfo.page,

src/views/contentManager/components/knowledge.vue

@@ -9,10 +9,12 @@
              saveKey="contentKnowledge"
              @submit="search"
              :model="searchForm">
-      <el-form-item prop="organId">
+      <el-form-item prop="organIdList">
         <el-select class="multiple" clearable
                    filterable
-                   v-model.trim="searchForm.organId"
+                   collapse-tags
+                   multiple
+                   v-model.trim="searchForm.organIdList"
                    placeholder="请选择分部">
           <el-option v-for="(item,index) in selects.branchs"
                     :key="index"
@@ -152,7 +154,7 @@ export default {
   data () {
     return {
       searchForm: {
-        organId: null,
+        organIdList: [],
         subjectId: null,
         subType: null,
       },
@@ -189,7 +191,7 @@ export default {
     getList () {
       let params = {
         clientName: 'manage',
-        organId: this.searchForm.organId,
+        organIdList: this.searchForm.organIdList ? this.searchForm.organIdList.join(',') : null,
         subType: this.searchForm.subType,
         subjectId: this.searchForm.subjectId,
         rows: this.pageInfo.limit,

src/views/contentManager/components/training.vue

@@ -9,10 +9,12 @@
              :saveKey="'contentTraining'"
              @submit="search"
              :model="searchForm">
-      <el-form-item prop="organId">
+      <el-form-item prop="organIdList">
         <el-select class="multiple" clearable
                    filterable
-                   v-model.trim="searchForm.organId"
+                   collapse-tags
+                   multiple
+                   v-model.trim="searchForm.organIdList"
                    placeholder="请选择分部">
           <el-option v-for="(item,index) in selects.branchs"
                     :key="index"
@@ -98,7 +100,7 @@ export default {
   data () {
     return {
       searchForm: {
-        organId: null
+        organIdList: []
       },
       tableList: [],
       teacherId: this.$route.query.teacherId,
@@ -123,7 +125,7 @@ export default {
     getList () {
       let params = {
         clientName: 'manage',
-        organId: this.searchForm.organId,
+        organIdList: this.searchForm.organIdList ? this.searchForm.organIdList.join(',') : null,
         rows: this.pageInfo.limit,
         page: this.pageInfo.page,
         type: 4