合并

dist/static/css/chunk-241ddcba.48caa840.css

@@ -1 +0,0 @@
-.bannerImg[data-v-1f862974],.bannerImg[data-v-3be1b20e],.bannerImg[data-v-7da15717],.bannerImg[data-v-0527b92a],.bannerImg[data-v-967d33b0],.bannerImg[data-v-a65b7c1c],.bannerImg[data-v-b1c03402],.bannerImg[data-v-f3784516]{height:60px}

dist/static/css/chunk-32168c97.6e5a5916.css

@@ -0,0 +1 @@
+.bannerImg[data-v-0e2497fc],.bannerImg[data-v-4a3f6e52],.bannerImg[data-v-6f9696a8],.bannerImg[data-v-51de1e78],.bannerImg[data-v-359145c4],.bannerImg[data-v-a17a2dde],.bannerImg[data-v-ac66114e],.bannerImg[data-v-c4af5972]{height:60px}

dist/static/css/chunk-6099455e.0849ad36.css

@@ -1 +0,0 @@
-.titlewrap[data-v-cfa6619a]{-webkit-box-align:center;-ms-flex-align:center;align-items:center}.titlewrap[data-v-cfa6619a],.wrap[data-v-cfa6619a]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.wrap div[data-v-cfa6619a]{margin-right:20px}.countWrap[data-v-cfa6619a] .el-date-editor.el-input,.countWrap[data-v-cfa6619a] .el-date-editor.el-input__inner{width:100px!important}

dist/static/css/chunk-ddd54eae.dba11dd7.css

@@ -0,0 +1 @@
+.titlewrap[data-v-497bf14e]{-webkit-box-align:center;-ms-flex-align:center;align-items:center}.titlewrap[data-v-497bf14e],.wrap[data-v-497bf14e]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.wrap div[data-v-497bf14e]{margin-right:20px;max-width:inherit}.countWrap[data-v-497bf14e] .el-date-editor.el-input,.countWrap[data-v-497bf14e] .el-date-editor.el-input__inner{width:100px!important}

src/api/buildTeam.js

@@ -1166,6 +1166,16 @@ export function updateCoursesExpireDate (data) {
   })
 }
 
+
+// 网管课有效期调整(不可调整已结束的)
+export function updateCoursesExpireDateOnlyNormal (data) {
+  return request({
+    url: api + '/courseSchedule/updateCoursesExpireDateOnlyNormal',
+    method: 'post',
+    data: qs.stringify(data)
+  })
+}
+
 // 新建缴费周期
 export function addMusicGroupPaymentCalender (data) {
   return request({

src/api/contentManager.js

@@ -5,7 +5,7 @@ let api = '/api-cms'
 // 资讯列表分页查询
 export function newsList(data) {
     return request({
-        url: api + '/news/list',
+        url: api + '/news/queryPage',
         method: 'get',
         params: data
     })

src/views/accompanyManager/accompanys.vue

@@ -42,7 +42,14 @@
       <div
         class="newBand"
         v-permission="'courseSchedule/updateCoursesExpireDate'"
-        @click="expireVisible = true"
+        @click="onUpdateCourse(1)"
+      >
+        有效期调整(高权限)
+      </div>
+      <div
+        class="newBand"
+        v-permission="'courseSchedule/updateCoursesExpireDateOnlyNormal'"
+        @click="onUpdateCourse(2)"
       >
         有效期调整
       </div>
@@ -652,6 +659,7 @@ import {
   findEducationUsers,
   updateTeacherAttendance,
   updateCoursesExpireDate,
+  updateCoursesExpireDateOnlyNormal,
   findAttendanceStudentByCourseWithPage,
   updateStudentAttendances,
   resetCourse,
@@ -796,6 +804,7 @@ export default {
         page_size: [10, 20, 40, 50], // 选择限制显示条数
       },
       accompanTime: 25,
+      updateCourseStatus: 1,
     };
   },
   created() {
@@ -839,6 +848,10 @@ export default {
       this.getCourseGroup();
       this.getList();
     },
+    onUpdateCourse(type) {
+      this.updateCourseStatus = type
+      this.expireVisible = true
+    },
     onCallName(item) {
       // 点名表
       this.rollCall.page = 1;
@@ -980,32 +993,61 @@ export default {
       };
     },
     submitExpireDate() {
+      console.log(this.updateCourseStatus)
       this.$refs.expireForm.validate((some) => {
         if (some) {
-          updateCoursesExpireDate({
-            practiceGroupId: this.practiceId,
-            coursesExpireDate: this.expireForm.coursesExpireDate,
-            coursesStartDate: this.expireForm.coursesStartDate,
-          }).then((res) => {
-            if (res.code == 200) {
-              this.$message.success("有效期修改成功");
-              this.$router.push({
-                query: merge(this.$route.query, {
-                  coursesStartDate: this.expireForm.coursesStartDate,
-                  coursesExpireDate: this.expireForm.coursesExpireDate,
-                }),
-              });
-              this.timers =
-                this.expireForm.coursesStartDate+
-                "至" +
-                this.expireForm.coursesExpireDate;
-              this.expireVisible = false;
-              this.getCourseGroup();
-              this.getList();
-            } else {
-              this.$message.error(res.msg);
-            }
-          });
+          if(this.updateCourseStatus == 1) {
+            updateCoursesExpireDate({
+              practiceGroupId: this.practiceId,
+              coursesExpireDate: this.expireForm.coursesExpireDate,
+              coursesStartDate: this.expireForm.coursesStartDate,
+            }).then((res) => {
+              if (res.code == 200) {
+                this.$message.success("有效期修改成功");
+                this.$router.push({
+                  query: merge(this.$route.query, {
+                    coursesStartDate: this.expireForm.coursesStartDate,
+                    coursesExpireDate: this.expireForm.coursesExpireDate,
+                  }),
+                });
+                this.timers =
+                  this.expireForm.coursesStartDate+
+                  "至" +
+                  this.expireForm.coursesExpireDate;
+                this.expireVisible = false;
+                this.getCourseGroup();
+                this.getList();
+              } else {
+                this.$message.error(res.msg);
+              }
+            });
+          } else if(this.updateCourseStatus == 2) {
+            updateCoursesExpireDateOnlyNormal({
+              practiceGroupId: this.practiceId,
+              coursesExpireDate: this.expireForm.coursesExpireDate,
+              coursesStartDate: this.expireForm.coursesStartDate,
+            }).then((res) => {
+              if (res.code == 200) {
+                this.$message.success("有效期修改成功");
+                this.$router.push({
+                  query: merge(this.$route.query, {
+                    coursesStartDate: this.expireForm.coursesStartDate,
+                    coursesExpireDate: this.expireForm.coursesExpireDate,
+                  }),
+                });
+                this.timers =
+                  this.expireForm.coursesStartDate+
+                  "至" +
+                  this.expireForm.coursesExpireDate;
+                this.expireVisible = false;
+                this.getCourseGroup();
+                this.getList();
+              } else {
+                this.$message.error(res.msg);
+              }
+            });
+          }
+          
         } else {
           return;
         }
@@ -1417,6 +1459,7 @@ export default {
   justify-content: flex-start;
   div {
     margin-right: 20px;
+    max-width: inherit;
   }
 }
 .countWrap {

src/views/contentManager/components/activity.vue

@@ -9,8 +9,8 @@
              @submit="search"
              :saveKey="'contentActivity'"
              :model="searchForm">
-      <el-form-item prop="hasPracticeCourse">
-        <el-select class="multiple"
+      <!-- <el-form-item prop="tenantId">
+        <el-select class="multiple" multiple
                    v-model.trim="searchForm.tenantId"
                    placeholder="请选择对内或对外">
           <el-option label="对内"
@@ -18,6 +18,19 @@
           <el-option label="对外"
                      value="2"></el-option>
         </el-select>
+      </el-form-item> -->
+      <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"
+                    :label="item.name"
+                    :value="item.id"></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button native-type="submit" type="danger">搜索</el-button>
@@ -55,10 +68,9 @@
                          label="排序"></el-table-column>
         <el-table-column align="center"
                          prop="remark"
-                         label="适用范围">
+                         label="适用分部">
           <template slot-scope="scope">
-            <p v-if=" scope.row.tenantId == 1">对内</p>
-            <p v-if=" scope.row.tenantId == 2">对外</p>
+            <overflow-text :text="scope.row.organNameList"></overflow-text>
           </template>
         </el-table-column>
         <el-table-column align="center"
@@ -98,10 +110,9 @@ export default {
   data () {
     return {
       searchForm: {
-        tenantId: '1'
+        organIdList: []
       },
       tableList: [],
-      organId: null,
       teacherId: this.$route.query.teacherId,
       pageInfo: {
         // 分页规则
@@ -113,6 +124,7 @@ export default {
     };
   },
   mounted () {
+    this.$store.dispatch("setBranchs");
     this.getList();
   },
   methods: {
@@ -123,7 +135,7 @@ export default {
     getList () {
       let params = {
         clientName: 'manage',
-        tenantId: this.searchForm.tenantId,
+        organIdList: this.searchForm.organIdList ? this.searchForm?.organIdList.join(',') : null,
         rows: this.pageInfo.limit,
         page: this.pageInfo.page,
         type: 1
@@ -189,4 +201,7 @@ export default {
 .bannerImg {
   height: 60px;
 }
+.multiple.el-select {
+  // width: 220px !important;
+}
 </style>

src/views/contentManager/components/advert.vue

@@ -9,14 +9,17 @@
              :saveKey="'contentAdvert'"
              @submit="search"
              :model="searchForm">
-      <el-form-item prop="hasPracticeCourse">
-        <el-select class="multiple"
-                   v-model.trim="searchForm.tenantId"
-                   placeholder="请选择对内或对外">
-          <el-option label="对内"
-                     value="1"></el-option>
-          <el-option label="对外"
-                     value="2"></el-option>
+      <el-form-item prop="organIdList">
+        <el-select class="multiple" clearable
+                   filterable
+                   collapse-tags
+                   multiple
+                   v-model.trim="searchForm.organIdList"
+                   placeholder="请选择分部">
+          <el-option v-for="(item,index) in selects.branchs"
+                    :key="index"
+                    :label="item.name"
+                    :value="item.id"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -62,10 +65,9 @@
                          label="排序"></el-table-column>
         <el-table-column align="center"
                          prop="remark"
-                         label="适用范围">
+                         label="适用分部">
           <template slot-scope="scope">
-            <p v-if=" scope.row.tenantId == 1">对内</p>
-            <p v-if=" scope.row.tenantId == 2">对外</p>
+            <overflow-text :text="scope.row.organNameList"></overflow-text>
           </template>
         </el-table-column>
         <el-table-column align="center"
@@ -103,10 +105,9 @@ export default {
   data () {
     return {
       searchForm: {
-        tenantId: '1'
+        organIdList: []
       },
       tableList: [],
-      organId: null,
       teacherId: this.$route.query.teacherId,
       pageInfo: {
         // 分页规则
@@ -118,6 +119,7 @@ export default {
     };
   },
   mounted () {
+    this.$store.dispatch("setBranchs");
     this.getList();
   },
   methods: {
@@ -128,7 +130,7 @@ export default {
     getList () {
       let params = {
         clientName: 'manage',
-        tenantId: this.searchForm.tenantId,
+        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,14 +9,17 @@
              saveKey="contentAppPage"
              @submit="search"
              :model="searchForm">
-      <el-form-item prop="hasPracticeCourse">
+      <el-form-item prop="organIdList">
         <el-select class="multiple"
-                   v-model.trim="searchForm.tenantId"
-                   placeholder="请选择对内或对外">
-          <el-option label="对内"
-                     value="1"></el-option>
-          <el-option label="对外"
-                     value="2"></el-option>
+                   v-model.trim="searchForm.organIdList" clearable
+                   filterable
+                   collapse-tags
+                   multiple
+                   placeholder="请选择分部">
+          <el-option v-for="(item,index) in selects.branchs"
+                    :key="index"
+                    :label="item.name"
+                    :value="item.id"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -66,10 +69,9 @@
         </el-table-column>
         <el-table-column align="center"
                          prop="remark"
-                         label="适用范围">
+                         label="适用分部">
           <template slot-scope="scope">
-            <p v-if=" scope.row.tenantId == 1">对内</p>
-            <p v-if=" scope.row.tenantId == 2">对外</p>
+            <overflow-text :text="scope.row.organNameList"></overflow-text>
           </template>
         </el-table-column>
         <el-table-column align='center'
@@ -109,10 +111,9 @@ export default {
   data () {
     return {
       searchForm: {
-        tenantId: '1'
+        organIdList: []
       },
       tableList: [],
-      organId: null,
       teacherId: this.$route.query.teacherId,
       pageInfo: {
         // 分页规则
@@ -124,6 +125,7 @@ export default {
     }
   },
   mounted () {
+    this.$store.dispatch("setBranchs");
     this.getList()
   },
   methods: {
@@ -134,7 +136,7 @@ export default {
     getList () {
       let params = {
         clientName: 'manage',
-        tenantId: this.searchForm.tenantId,
+        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,14 +9,17 @@
              saveKey="contentBanner"
              @submit="search"
              :model="searchForm">
-      <el-form-item prop="hasPracticeCourse">
-        <el-select class="multiple"
-                   v-model.trim="searchForm.tenantId"
-                   placeholder="请选择对内或对外">
-          <el-option label="对内"
-                     value="1"></el-option>
-          <el-option label="对外"
-                     value="2"></el-option>
+      <el-form-item prop="organIdList">
+        <el-select class="multiple" clearable
+                   filterable
+                   collapse-tags
+                   multiple
+                   v-model.trim="searchForm.organIdList"
+                   placeholder="请选择分部">
+          <el-option v-for="(item,index) in selects.branchs"
+                    :key="index"
+                    :label="item.name"
+                    :value="item.id"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -66,10 +69,9 @@
         </el-table-column>
         <el-table-column align="center"
                          prop="remark"
-                         label="适用范围">
+                         label="适用分部">
           <template slot-scope="scope">
-            <p v-if=" scope.row.tenantId == 1">对内</p>
-            <p v-if=" scope.row.tenantId == 2">对外</p>
+            <overflow-text :text="scope.row.organNameList"></overflow-text>
           </template>
         </el-table-column>
         <el-table-column align='center'
@@ -116,10 +118,9 @@ export default {
   data () {
     return {
       searchForm: {
-        tenantId: '1'
+        organIdList: []
       },
       tableList: [],
-      organId: null,
       teacherId: this.$route.query.teacherId,
       pageInfo: {
         // 分页规则
@@ -131,6 +132,7 @@ export default {
     }
   },
   mounted () {
+    this.$store.dispatch("setBranchs");
     this.getList()
   },
   methods: {
@@ -144,7 +146,7 @@ export default {
     getList () {
       let params = {
         clientName: 'manage',
-        tenantId: this.searchForm.tenantId,
+        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,14 +9,17 @@
              saveKey="contentFlashPage"
              @submit="search"
              :model="searchForm">
-      <el-form-item prop="hasPracticeCourse">
-        <el-select class="multiple"
-                   v-model.trim="searchForm.tenantId"
-                   placeholder="请选择对内或对外">
-          <el-option label="对内"
-                     value="1"></el-option>
-          <el-option label="对外"
-                     value="2"></el-option>
+      <el-form-item prop="organIdList">
+        <el-select class="multiple" clearable
+                   filterable
+                   collapse-tags
+                   multiple
+                   v-model.trim="searchForm.organIdList"
+                   placeholder="请选择分部">
+          <el-option v-for="(item,index) in selects.branchs"
+                    :key="index"
+                    :label="item.name"
+                    :value="item.id"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -59,10 +62,9 @@
         </el-table-column>
         <el-table-column align="center"
                          prop="remark"
-                         label="适用范围">
+                         label="适用分部">
           <template slot-scope="scope">
-            <p v-if=" scope.row.tenantId == 1">对内</p>
-            <p v-if=" scope.row.tenantId == 2">对外</p>
+            <overflow-text :text="scope.row.organNameList"></overflow-text>
           </template>
         </el-table-column>
         <el-table-column align='center'
@@ -102,10 +104,9 @@ export default {
   data () {
     return {
       searchForm: {
-        tenantId: '1'
+        organIdList: []
       },
       tableList: [],
-      organId: null,
       teacherId: this.$route.query.teacherId,
       pageInfo: {
         // 分页规则
@@ -117,6 +118,7 @@ export default {
     }
   },
   mounted () {
+    this.$store.dispatch("setBranchs");
     this.getList()
   },
   methods: {
@@ -127,7 +129,7 @@ export default {
     getList () {
       let params = {
         clientName: 'manage',
-        tenantId: this.searchForm.tenantId,
+        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,14 +9,17 @@
              :saveKey="'contentInformation'"
              @submit="search"
              :model="searchForm">
-      <el-form-item prop="hasPracticeCourse">
-        <el-select class="multiple"
-                   v-model.trim="searchForm.tenantId"
-                   placeholder="请选择对内或对外">
-          <el-option label="对内"
-                     value="1"></el-option>
-          <el-option label="对外"
-                     value="2"></el-option>
+      <el-form-item prop="organIdList">
+        <el-select class="multiple" clearable
+                   filterable
+                   collapse-tags
+                   multiple
+                   v-model.trim="searchForm.organIdList"
+                   placeholder="请选择分部">
+          <el-option v-for="(item,index) in selects.branchs"
+                    :key="index"
+                    :label="item.name"
+                    :value="item.id"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item prop="subType">
@@ -73,10 +76,9 @@
         </el-table-column>
         <el-table-column align="center"
                          prop="remark"
-                         label="适用范围">
+                         label="适用分部">
           <template slot-scope="scope">
-            <p v-if=" scope.row.tenantId == 1">对内</p>
-            <p v-if=" scope.row.tenantId == 2">对外</p>
+            <overflow-text :text="scope.row.organNameList"></overflow-text>
           </template>
         </el-table-column>
         <el-table-column align='center'
@@ -116,11 +118,10 @@ export default {
   data () {
     return {
       searchForm: {
-        tenantId: '1',
+        organIdList: [],
         subType: null,
       },
       tableList: [],
-      organId: null,
       teacherId: this.$route.query.teacherId,
       pageInfo: {
         // 分页规则
@@ -138,6 +139,7 @@ export default {
         this.typeList = res.data
       }
     })
+    this.$store.dispatch("setBranchs");
     this.getList()
   },
   methods: {
@@ -148,7 +150,7 @@ export default {
     getList () {
       let params = {
         clientName: 'manage',
-        tenantId: this.searchForm.tenantId,
+        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,14 +9,17 @@
              saveKey="contentKnowledge"
              @submit="search"
              :model="searchForm">
-      <el-form-item prop="tenantId">
-        <el-select class="multiple"
-                   v-model.trim="searchForm.tenantId"
-                   placeholder="请选择对内或对外">
-          <el-option label="对内"
-                     value="1"></el-option>
-          <el-option label="对外"
-                     value="2"></el-option>
+      <el-form-item prop="organIdList">
+        <el-select class="multiple" clearable
+                   filterable
+                   collapse-tags
+                   multiple
+                   v-model.trim="searchForm.organIdList"
+                   placeholder="请选择分部">
+          <el-option v-for="(item,index) in selects.branchs"
+                    :key="index"
+                    :label="item.name"
+                    :value="item.id"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item prop="subType">
@@ -100,10 +103,9 @@
         </el-table-column>
         <el-table-column align="center"
                          prop="remark"
-                         label="适用范围">
+                         label="适用分部">
           <template slot-scope="scope">
-            <p v-if=" scope.row.tenantId == 1">对内</p>
-            <p v-if=" scope.row.tenantId == 2">对外</p>
+            <overflow-text :text="scope.row.organNameList"></overflow-text>
           </template>
         </el-table-column>
         <el-table-column align='center'
@@ -152,12 +154,11 @@ export default {
   data () {
     return {
       searchForm: {
-        tenantId: '1',
+        organIdList: [],
         subjectId: null,
         subType: null,
       },
       tableList: [],
-      organId: null,
       teacherId: this.$route.query.teacherId,
       pageInfo: {
         // 分页规则
@@ -176,6 +177,7 @@ export default {
         this.typeList = res.data
       }
     })
+    this.$store.dispatch("setBranchs");
     this.getList()
   },
   methods: {
@@ -189,7 +191,7 @@ export default {
     getList () {
       let params = {
         clientName: 'manage',
-        tenantId: this.searchForm.tenantId,
+        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,14 +9,17 @@
              :saveKey="'contentTraining'"
              @submit="search"
              :model="searchForm">
-      <el-form-item prop="hasPracticeCourse">
-        <el-select class="multiple"
-                   v-model.trim="searchForm.tenantId"
-                   placeholder="请选择对内或对外">
-          <el-option label="对内"
-                     value="1"></el-option>
-          <el-option label="对外"
-                     value="2"></el-option>
+      <el-form-item prop="organIdList">
+        <el-select class="multiple" clearable
+                   filterable
+                   collapse-tags
+                   multiple
+                   v-model.trim="searchForm.organIdList"
+                   placeholder="请选择分部">
+          <el-option v-for="(item,index) in selects.branchs"
+                    :key="index"
+                    :label="item.name"
+                    :value="item.id"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -55,10 +58,9 @@
                          label="排序"></el-table-column>
         <el-table-column align="center"
                          prop="remark"
-                         label="适用范围">
+                         label="适用分部">
           <template slot-scope="scope">
-            <p v-if=" scope.row.tenantId == 1">对内</p>
-            <p v-if=" scope.row.tenantId == 2">对外</p>
+            <overflow-text :text="scope.row.organNameList"></overflow-text>
           </template>
         </el-table-column>
         <el-table-column align="center"
@@ -98,10 +100,9 @@ export default {
   data () {
     return {
       searchForm: {
-        tenantId: '1'
+        organIdList: []
       },
       tableList: [],
-      organId: null,
       teacherId: this.$route.query.teacherId,
       pageInfo: {
         // 分页规则
@@ -113,6 +114,7 @@ export default {
     };
   },
   mounted () {
+    this.$store.dispatch("setBranchs");
     this.getList();
   },
   methods: {
@@ -123,7 +125,7 @@ export default {
     getList () {
       let params = {
         clientName: 'manage',
-        tenantId: this.searchForm.tenantId,
+        organIdList: this.searchForm.organIdList ? this.searchForm.organIdList.join(',') : null,
         rows: this.pageInfo.limit,
         page: this.pageInfo.page,
         type: 4

src/views/contentManager/contentOperation.vue

@@ -18,7 +18,7 @@
         <el-form-item label="排序值">
           <el-input v-model.trim="form.order"></el-input>
         </el-form-item>
-        <el-form-item label="适用范围"
+        <!-- <el-form-item label="适用范围"
                       prop="tenantId">
           <el-select v-model="form.tenantId" style="width: 400px !important">
             <el-option label="对内"
@@ -26,15 +26,38 @@
             <el-option label="对外"
                        value="2"></el-option>
           </el-select>
+        </el-form-item> -->
+        <el-form-item label="所属分部"
+                      prop="organIdList">
+          <!-- <el-select v-model="form.organIdList" placeholder="请选择所属分部" style="width: 400px !important">
+            <el-option
+              v-for="(item, index) in selects.branchs"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select> -->
+          <select-all v-model.trim="form.organIdList"
+                     style="width: 400px !important"
+                     filterable
+                     placeholder="请选择分部"
+                     multiple
+                     clearable>
+            <el-option v-for="(item,index) in selects.branchs"
+                       :key="index"
+                       :label="item.name"
+                       :value="item.id"></el-option>
+          </select-all>
         </el-form-item>
 
-        <el-form-item 
+
+        <el-form-item
           prop="subjectIdList"  v-if="type == 7"
           label="所属声部"
           :rules="[{required: true, message:'请选择声部', trigger: 'blur, change'}]">
-          <el-select v-model="form.subjectIdList" clearable filterable multiple placeholder="请选择声部" style="width: 400px !important">
+          <select-all v-model="form.subjectIdList" clearable filterable multiple placeholder="请选择声部" style="width: 400px !important">
             <el-option v-for="item in selects.subjects" :value="item.id" :label="item.name" :key="item.id"></el-option>
-          </el-select>
+          </select-all>
         </el-form-item>
 
 
@@ -422,6 +445,7 @@ export default {
       form: {
         title: null,
         order: null,
+        tenantId: null,
         coverImage: null,
         videoCoverImage: null,
         attribute1: null, // 时长
@@ -430,9 +454,9 @@ export default {
         type: query.type,
         status: 1,
         content: null,
-        tenantId: null,
         subType: null,
         actionTime: null,
+        organIdList: null,
       },
       rules: {
         title: [
@@ -442,7 +466,7 @@ export default {
         coverImage: [
           { required: true, message: '请选择封面图或广告视频', trigger: "blur" }
         ],
-        tenantId: [{ required: true, message: "请选择适用范围", trigger: "change" }],
+        organIdList: [{ required: true, message: "请选择分部", trigger: "change" }],
       },
       imageSize: null,
       typeList: [], //子分类列表
@@ -472,6 +496,7 @@ export default {
         status: 1,
         content: null,
         tenantId: null,
+        organIdList: null,
         subType: null,
         actionTime: null
       };
@@ -488,6 +513,7 @@ export default {
     this.pageType = query.pageType;
     // 获取声部
     this.$store.dispatch('setSubjects')
+    this.$store.dispatch("setBranchs");
     this.init();
   },
   methods: {
@@ -591,10 +617,11 @@ export default {
     onSubmit (formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
-          let { subjectIdList, ...rest } = this.form
+          let { subjectIdList, organIdList, ...rest } = this.form
           let form = {
             ...rest,
-            subjectIdList: subjectIdList ? subjectIdList.join(',') : null
+            subjectIdList: subjectIdList ? subjectIdList.join(',') : null,
+            organIdList: organIdList ? organIdList.join(',') : null
           }
           let actionTime = form.actionTime
           // console.log(actionTime)
@@ -692,6 +719,7 @@ export default {
         status: 1,
         content: null,
         tenantId: null,
+        organIdList: null,
         subType: null,
         actionTime: null
       };
@@ -747,6 +775,7 @@ export default {
               tempActionTime = [result.onlineTime, result.offlineTime]
             }
             let subject = result.subjectIdList ? result.subjectIdList.split(',') : []
+            let organ = result.organIdList ? result.organIdList.split(',') : []
             this.form = {
               id: result.id,
               title: result.title,
@@ -757,11 +786,12 @@ export default {
               linkUrl: result.linkUrl,
               type: result.type,
               status: result.status,
+              tenantId: result.tenantId.toString(),
               subjectIdList: subject.map(item => { return +item }),
+              organIdList: organ.map(item => { return +item }),
               memo: result.memo,
               content: result.content,
               actionTime: tempActionTime,
-              tenantId: result.tenantId.toString(),
               subType: result.subType ? result.subType : null
             };
             this.dataInfo.updateTime = result.updateTime

src/views/teacherManager/teacherOperation/components/teacherOperation.vue

@@ -57,6 +57,23 @@
                 prop="entryDate"
                 :label-width="formLabelWidth"
               >
+                <template #label>
+                  入职日期
+                  <el-popover
+                    placement="top"
+                    width="280"
+                    trigger="hover">
+                    <!-- <el-button slot="reference"></el-button> -->
+                    <i slot="reference"
+                      class="el-icon-warning-outline"
+                        style="font-size: 14px; "
+                    />
+                    <p style="color: red; line-height: 1.3; margin-bottom: 10px;">入职日期之前课酬按100%计算；<br />
+                入职日期当天及以后课酬按80%计算；<br />
+                转正日期当天及以后课酬按100%计算；<br />
+                若入职日期和转正日期设置为同一天，则日期当天及以后课酬按100%计算；</p>
+                  </el-popover>
+                </template>
                 <el-date-picker
                   v-model.trim="topForm.entryDate"
                   type="date"
@@ -283,6 +300,23 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="转正日期" :label-width="formLabelWidth">
+                <template #label>
+                  转正日期
+                  <el-popover
+                    placement="top"
+                    width="280"
+                    trigger="hover">
+                    <!-- <el-button slot="reference"></el-button> -->
+                    <i slot="reference"
+                      class="el-icon-warning-outline"
+                        style="font-size: 14px; "
+                    />
+                   <p style="color: red; line-height: 1.3; margin-bottom: 10px;">入职日期之前课酬按100%计算；<br />
+                入职日期当天及以后课酬按80%计算；<br />
+                转正日期当天及以后课酬按100%计算；<br />
+                若入职日期和转正日期设置为同一天，则日期当天及以后课酬按100%计算；</p>
+                  </el-popover>
+                </template>
                 <el-date-picker
                   v-model="topForm.formalStaffDate"
                   value-format="yyyy-MM-dd"
@@ -316,6 +350,14 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <!-- <el-row>
+            <el-col :span="24">
+              <p style="color: red; line-height: 1.3; margin-bottom: 10px;">入职日期之前课酬按100%计算；<br />
+                入职日期当天及以后课酬按80%计算；<br />
+                转正日期当天及以后课酬按100%计算；<br />
+                若入职日期和转正日期设置为同一天，则日期当天及以后课酬按100%计算；</p>
+            </el-col>
+          </el-row> -->
           <el-form-item>
             <el-button @click="onSubmit('form')" type="primary"
               >立即{{ pageType == "create" ? "创建" : "修改" }}</el-button
@@ -402,7 +444,7 @@ export default {
       organId: null,
       pageType: this.$route.query.type,
       teacherId: this.$route.query.teacherId,
-      formLabelWidth: "80px",
+      formLabelWidth: "120px",
       branchList: [], // 分部列表
       subjectList: [], //声部列表 // 多选声部列表
       teacherSchools: null,