Merge branch '03/12permission' into dev

src/api/systemManage.js

@@ -343,12 +343,3 @@ export function updateEducationTeacherId (data) {
     data: qs.stringify(data)
   })
 }
-
-// 获取员工所在分部列表（管理员查看所有的分部)
-export function queryEmployeeOrganByUser(data) {
-  return request({
-    url: api + '/organization/queryEmployeeOrganByUser',
-    method: 'get',
-    params: data
-  })
-}

src/views/arrearage-students/index.vue

@@ -220,11 +220,9 @@ export default {
   mounted() {
     const { query } = this.$route
     if (query.organId) {
+      console.log(query.organId)
       this.searchForm.organIds = [Number(query.organId)]
     }
-    if(query.result) {
-      this.searchForm.eduTeacherId = Number(query.result)
-    }
     getCooperation({ rows: 1000 }).then((res) => {
       this.cooperations = res.data.rows
     })

src/views/businessManager/orderManager/orderAudit-taoqi/index.vue

@@ -20,10 +20,12 @@
                      filterable
                      clearable
                      placeholder="请选择分部">
-            <el-option v-for="(item,index) in organList"
-                       :key="index"
-                       :label="item.name"
-                       :value="item.id"></el-option>
+            <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>
@@ -227,12 +229,13 @@ export default {
   created() {},
   //生命周期 - 挂载完成（可以访问DOM元素）
   mounted() {
-    getEmployeeOrgan().then((res) => {
-      if (res.code == 200) {
-        this.organList = res.data;
-      }
-    });
+    // getEmployeeOrgan().then((res) => {
+    //   if (res.code == 200) {
+    //     this.organList = res.data;
+    //   }
+    // });
     // 获取分部
+     this.$store.dispatch("setBranchs");
     goodsQuery({ status: 1, rows: 99999 }).then((res) => {
       if (res.code === 200) {
         this.shopList = res.data.rows;

src/views/businessManager/orderManager/orderAudit-taoqi/orderAuditDetail.vue

@@ -29,11 +29,11 @@
           style="width: 100% !important"
         >
           <el-option
-            v-for="(item, index) in organList"
-            :key="index"
-            :label="item.name"
-            :value="item.id"
-          ></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
@@ -303,7 +303,7 @@ import {
 import { orderServerList } from "@/utils/searchArray";
 import { getCooperation } from "@/api/buildTeam";
 export default {
-  props: ["orderId", "shopList", "organList", "isLook"],
+  props: ["orderId", "shopList", "isLook"],
   data() {
     return {
       formLabelWidth: "100px",
@@ -373,6 +373,8 @@ export default {
         }
       });
     }
+    // 获取分部
+     this.$store.dispatch("setBranchs");
   },
   methods: {
     changeOrgin(val) {

src/views/businessManager/orderManager/orderAudit/index.vue

@@ -177,7 +177,6 @@
       <orderAuditDetail
         :orderId="activceId"
         :shopList="shopList"
-        :organList="organList"
         :isLook="isLook"
         ref="orderAuditDetail"
         v-if="orderVisible"
@@ -238,7 +237,7 @@ export default {
         type: null,
       },
       tableList: [],
-      organList: [],
+      // organList: [],
       orderServerList,
       orderAuditTypeList,
       rules: {

src/views/businessManager/orderManager/orderAudit/orderAuditDetail.vue

@@ -29,11 +29,11 @@
           style="width: 100% !important"
         >
           <el-option
-            v-for="(item, index) in organList"
-            :key="index"
-            :label="item.name"
-            :value="item.id"
-          ></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
@@ -291,7 +291,6 @@
     <div
       class="lookTitle"
       v-if="auditStatus == 'ING'"
-      v-permission="'routeOrder/auditOutOrder'"
     >
       审核意见
     </div>
@@ -299,7 +298,6 @@
       :model="submitForm"
       v-if="auditStatus == 'ING'"
       ref="submitForm"
-      v-permission="'routeOrder/auditOutOrder'"
     >
       <el-form-item
         prop="memo"
@@ -328,7 +326,7 @@ import Tooltip from "@/components/Tooltip/index";
 let that;
 export default {
   components: { Tooltip },
-  props: ["orderId", "shopList", "organList", "isLook"],
+  props: ["orderId", "shopList", "isLook"],
   data() {
     return {
       formLabelWidth: "100px",
@@ -391,6 +389,7 @@ export default {
             calenderId: orderInfo.calenderId ? orderInfo.calenderId : "",
           };
           this.auditStatus = orderInfo.auditStatus;
+          console.log(orderInfo)
           this.$set(
             this.form,
             "goodsList",
@@ -401,6 +400,8 @@ export default {
         }
       });
     }
+    // 获取分部
+     this.$store.dispatch("setBranchs");
   },
   methods: {
     changeOrgin(val) {

src/views/categroyManager/insideSetting/staffManager.vue

@@ -211,7 +211,7 @@
                      collapse-tags
                      v-model.trim="form.organIdLists"
                      multiple>
-            <el-option v-for="item in organList"
+            <el-option v-for="item in selects.branchs"
                        :key="item.id"
                        :label="item.name"
                        :value="item.id"></el-option>
@@ -317,7 +317,7 @@
 <script>
 import pagination from '@/components/Pagination/index'
 import { permission } from "@/utils/directivePage";
-import { queryEmployByOrganId, employeeOperate, getUserRole, employeeAdd, employeeUpdate, hasCourseGroupRelation, updateEducationTeacherId, queryEmployeeOrganByUser } from '@/api/systemManage'
+import { queryEmployByOrganId, employeeOperate, getUserRole, employeeAdd, employeeUpdate, hasCourseGroupRelation, updateEducationTeacherId } from '@/api/systemManage'
 import { findEducationTeacher } from '@/api/specialSetting'
 import { findEducationUsers } from '@/api/buildTeam'
 import Tooltip from '@/components/Tooltip/index'
@@ -337,7 +337,6 @@ export default {
   components: { pagination, Tooltip, handover },
   data () {
     return {
-      organList: [],
       tableList: [],
       educationList: [],
       educationForm: {
@@ -404,7 +403,7 @@ export default {
     onBranchCheckAll () {
       this.form.organIdLists = []
 
-      this.organList.forEach(item => {
+      this.selects.branchs.forEach(item => {
         this.form.organIdLists.push(item.id)
       })
     },
@@ -478,13 +477,7 @@ export default {
       })
       this.$store.dispatch('setBranchs')
     },
-    async roleOperation (type, data) {
-      // 获取分部
-      await queryEmployeeOrganByUser().then(res => {
-        if(res.code == 200) {
-          this.organList = res.data
-        }
-      })
+    roleOperation (type, data) {
       this.formActionTitle = type
       this.roleStatus = true
       // 修改的时候

src/views/main/abnormal/index.vue

@@ -155,11 +155,6 @@ export default {
       if(errorType[item[0].errorType] && !this.permission(errorType[item[0].errorType].permission)) {
         return
       }
-
-      // 单独对未缴费学员数
-      if(item[0].errorType == 'STUDENT_NOT_PAYMENT') {
-        item[0].query['result'] = item[0].result ? (item[0].result || []).join(',') : undefined
-      }
       new Searchs().removeByKey(item[0].url)
       this.$router.push({
         path: item[0].url,

src/views/main/constant.js

@@ -44,8 +44,7 @@ export const descs = {
   TEACHER_NOT_A_CLASS:'课程无老师考勤',
   TEACHER_SERVE_ERROR:'服务指标生成的作业未布置',
   WAIT_CREATE_PAYMENT_CALENDER:'缴费项目有效期结束前7天',
-  NO_CLASS_MUSIC_GROUP_STUDENT_INFO: '进行中乐团不在班级中的在读学员提醒',
-  COURSE_TIME_ERROR: '上课时间在00:00~06:00时间段内为时间安排异常',
+  NO_CLASS_MUSIC_GROUP_STUDENT_INFO: '进行中乐团不在班级中的在读学员提醒'
 }
 
 const dates = {
@@ -54,16 +53,6 @@ const dates = {
 }
 
 export const errorType = {
-  COURSE_TIME_ERROR: {
-    name: '课程时间安排异常',
-    isError: false,
-    url: '/business/teamCourseList',
-    always: true,
-    query: {
-      searchType: 'COURSE_TIME_ERROR',
-      // ...dates
-    },
-  },
   MUSIC_PATROL_ITEM: {
     name: '乐团巡查事项异常',
     isError: false,
@@ -100,9 +89,6 @@ export const errorType = {
     url: '/studentManager/ArrearageStudents',
     permission: '/ArrearageStudents',
     always: true,
-    query: {
-      
-    }
   },
   STUDENT_APPLY_FOR_QUIT_MUSIC_GROUP: {
     name: '申请退团学员数',

src/views/repairManager/repairList.vue

@@ -117,8 +117,6 @@
         <el-form-item>
           <el-button type="danger" native-type="submit">搜索</el-button>
           <el-button native-type="reset" type="primary">重置</el-button>
-           <!-- v-permission="'studentRepair/export'" -->
-          <el-button @click="onExport" type="primary">导出</el-button>
         </el-form-item>
       </save-form>
       <div class="tableWrap">
@@ -428,9 +426,6 @@ import { getToken } from "@/utils/auth";
 import pagination from "@/components/Pagination/index";
 import load from "@/utils/loading";
 import { getSoundTree } from "@/api/buildTeam";
-import { Export } from '@/utils/downLoadFile'
-import qs from 'qs'
-import { getTimes } from "@/utils";
 import {
   findAllTechnician,
   studentRepairList,
@@ -578,15 +573,6 @@ export default {
         }
       });
     },
-    onExport() {
-      const {timer, ...rest} = this.searchForm
-      Export(this, {
-        url: '/api-web/studentRepair/export',
-        fileName: '维修单.xlsx',
-        method: 'post',
-        params: qs.stringify({ ...rest, ...getTimes(timer, ["startTime", "endTime"]) })
-      }, '您确定导出维修单列表?')
-    }
   },
   watch: {
     repairVisible(val) {

src/views/setSilder/addSilder.vue

@@ -93,7 +93,6 @@
         </el-form-item>
         <el-form-item label="菜单名"
                       prop="name"
-                      v-if="form.type == 0"
                       :label-width="formLabelWidth">
           <el-input v-model.trim="form.name"
                     autocomplete="off"></el-input>

src/views/teamBuild/signupList.vue

@@ -75,6 +75,9 @@
             延长报名
           </div>
           <div class="newBand" @click="onCreateQRCode('payment')">报名链接</div>
+          <div class="newBand" @click="onCreateQRCode('rePayment')">
+            报名链接（无乐器）
+          </div>
           <div class="newBand" @click="onCreateQRCode('detail')">缴费详情</div>
           <div
             class="newBand"
@@ -108,9 +111,6 @@
           >
             合并学员
           </div>
-          <div class="newBand" style="background-color: #f97215; border: 1px solid #f97215;" @click="onCreateQRCode('rePayment')">
-            报名链接（无乐器）
-          </div>
         </div>
       </div>
       <el-dialog

src/views/teamDetail/components/modals/classroom-setting-item.vue

@@ -15,9 +15,7 @@
         <template slot-scope="scope">
           <div>
             <el-form-item
-              :prop="
-                'classs.' + type + '.cycle.' + scope.$index + '.coreTeacher'
-              "
+              :prop="'classs.' + type + '.cycle.' + scope.$index + '.coreTeacher'"
               label-width="88px"
               :rules="[{ required: true, message: '请选择主教老师' }]"
             >
@@ -27,7 +25,7 @@
                 clearable
                 filterable
               >
-                <!--     @change="changecoreTeacher" -->
+              <!--     @change="changecoreTeacher" -->
                 <el-option
                   v-for="(item, index) in teacherList"
                   :key="index"
@@ -42,10 +40,7 @@
               v-if="
                 activeType != 'HIGH' &&
                 activeType != 'HIGH_ONLINE' &&
-                activeType != 'MUSIC_NETWORK' &&
-                type != 'HIGH' &&
-                type != 'HIGH_ONLINE' &&
-                type != 'MUSIC_NETWORK'
+                activeType != 'MUSIC_NETWORK'
               "
             >
               <!-- <remote-search :commit="'setTeachers'" v-model="form.assistant"  :multiple='true'/> -->
@@ -273,17 +268,7 @@ for (const item of classTimeList) {
 }
 
 export default {
-  props: [
-    "form",
-    "type",
-    "surplustime",
-    "prices",
-    "selectPrice",
-    "holidays",
-    "teacherList",
-    "activeType",
-    "cooperationList",
-  ],
+  props: ["form", "type", "surplustime", "prices", "selectPrice", "holidays","teacherList","activeType",'cooperationList'],
   data() {
     return {
       classTimeListByType,

src/views/teamDetail/components/modals/classroom-setting.vue

@@ -102,9 +102,9 @@
           <courseItem
             :surplustime="surplustime[key]"
             @setUserTime="setUserTime"
-            :teacherList="teacherList"
-            :activeType="activeType"
-            :cooperationList="cooperationList"
+             :teacherList="teacherList"
+             :activeType="activeType"
+              :cooperationList="cooperationList"
             :type="key"
             :form="item"
             :prices="prices"
@@ -156,10 +156,10 @@ import {
 import courseItem from "./classroom-setting-item";
 import { classTimeList } from "@/utils/searchArray";
 import MusicStore from "@/views/resetTeaming/store";
-import { sysConfigList } from "@/api/generalSettings";
+import { sysConfigList } from '@/api/generalSettings'
 import { queryByOrganIdAndCourseType } from "@/views/resetTeaming/api";
 import { isEmpty } from "lodash";
-import classromePreview from "./classroom-preview";
+import classromePreview from './classroom-preview'
 
 const classTimeListByType = {};
 for (const item of classTimeList) {
@@ -205,7 +205,7 @@ export default {
   ],
   components: {
     courseItem,
-    "classrome-preview": classromePreview,
+    'classrome-preview': classromePreview
   },
   data() {
     return {
@@ -269,15 +269,15 @@ export default {
     } catch (error) {}
     this.setCourseTypeListByName();
     this.formatClasss();
-    this.FetchHoliday();
+    this.FetchHoliday()
   },
   methods: {
     async FetchHoliday() {
       try {
         const res = await sysConfigList({
-          group: "holiday",
-        });
-        this.holidays = JSON.parse(res.data[0].paranValue);
+          group: 'holiday'
+        })
+        this.holidays = JSON.parse(res.data[0].paranValue)
       } catch (error) {}
     },
     setCourseTypeListByName() {
@@ -288,9 +288,9 @@ export default {
       this.courseTypeListByName = courseTypeListByName;
     },
     async formatClasss() {
-      let coreid = "";
-      const assistant = [];
       if (this.detail) {
+        let coreid = "";
+        const assistant = [];
         const { classGroupTeacherMapperList } = this.detail;
         for (const item of classGroupTeacherMapperList || []) {
           if (item.teacherRole === "BISHOP") {
@@ -341,8 +341,6 @@ export default {
             cycle: [
               {
                 time: this.selectPrices ? this.selectPrices[key] : undefined,
-                coreTeacher: coreid,
-                assistant: assistant,
               },
             ],
           };
@@ -365,13 +363,11 @@ export default {
       for (const key in this.musicCourseSettings) {
         if (Object.hasOwnProperty.call(this.musicCourseSettings, key)) {
           const allTime = this.musicCourseSettings[key];
-          const useTime = this.musicSurplus[key];
+          const useTime = this.musicSurplus[key]
 
           if (useTime > allTime) {
-            this.$message.error(
-              this.courseTypeListByName[key] + " 课程时长不足"
-            );
-            return;
+            this.$message.error(this.courseTypeListByName[key] + ' 课程时长不足')
+            return
           }
         }
       }
@@ -399,19 +395,19 @@ export default {
                 students: this.studentSubmitedData?.seleched,
                 courseTimes: item.cycle.length,
                 courseTimeDtoList: item.cycle.map((_) => ({
-                  classGroupTeacherMapperList: this.formatTeacher(_),
+                  classGroupTeacherMapperList:this.formatTeacher(_),
                   courseType: key,
                   dayOfWeek: _.dayOfWeek,
                   endClassTime: _.endClassTime,
                   startClassTime: _.startClassTime,
-                  startDate: _.startDate,
-                  endDate: _.endDate,
+                  startDate:_.startDate,
+                  endDate:_.endDate,
                   holiday: _.holiday,
-                  expectCourseNum: _.expectCourseNum,
+                  expectCourseNum:_.expectCourseNum
                 })),
-              };
-              if (type && typeof type === "string") {
-                data[type] = true;
+              }
+              if (type && typeof type === 'string') {
+                data[type] = true
               }
               list.push(data);
             }
@@ -419,15 +415,11 @@ export default {
           try {
             if (this.detail) {
               let result = await classGroupUpdate(list);
-              this.previewVisible = false;
+              this.previewVisible = false
               if (result.code == 207) {
-                await this.$confirm(
-                  result.msg || `当前课程课酬预计为0,是否继续`,
-                  "提示",
-                  {
-                    type: "warning",
-                  }
-                );
+                await this.$confirm((result.msg || `当前课程课酬预计为0,是否继续`), "提示", {
+                  type: "warning",
+                })
                 // obj.allowZeroSalary = true;
                 list.forEach((item) => {
                   item.allowZeroSalary = true;
@@ -438,8 +430,8 @@ export default {
                 return;
               }
               if (result.code == 206) {
-                this.previewVisible = true;
-                this.previewList = result.data;
+                this.previewVisible = true
+                this.previewList = result.data
                 return;
               }
               this.$message.success("排课修改成功");
@@ -486,33 +478,36 @@ export default {
       this.collapses = val;
     },
     changecoreTeacher(val) {},
-    updateMusicSurplus() {},
+    updateMusicSurplus() {
+
+    },
     setUserTime(time, type) {
       // console.log(time, type)
-      this.$set(this.musicSurplus, type, time || 0);
+      this.$set(this.musicSurplus, type, (time || 0))
       // console.log(this.musicSurplus)
-      this.$forceUpdate();
+       this.$forceUpdate()
       // this.$nextTick(res=>{
       //   this.musicSurplus[type] = time;
       //       console.log(this.musicSurplus[type])
       // })
+
     },
-    formatTeacher(row) {
-      console.log(row);
-      let arr = [];
-      if (row.coreTeacher) {
-        let obj = {};
-        obj.teacherRole = "BISHOP";
-        obj.userId = row.coreTeacher;
-        arr.push(obj);
+    formatTeacher(row){
+      console.log(row)
+    let arr = []
+      if(row.coreTeacher){
+           let obj ={}
+        obj.teacherRole = 'BISHOP'
+        obj.userId = row.coreTeacher
+        arr.push(obj)
       }
-      if (row.assistant?.length > 0) {
-        row.assistant.forEach((ass) => {
-          arr.push({ teacherRole: "TEACHING", userId: ass });
-        });
+      if(row.assistant?.length>0){
+        row.assistant.forEach(ass=>{
+          arr.push({teacherRole:'TEACHING',userId:ass})
+        })
       }
-      return arr;
-    },
+      return arr
+    }
   },
   // watch:{
   //   musicSurplus(){

src/views/teamDetail/teamCourseList.vue

@@ -780,10 +780,6 @@ export default {
         this.searchForm.timer = [nowTime, nowTime];
       }
     }
-    // 课程时间段异常，不需要时间搜索
-    if(query.searchType == 'COURSE_TIME_ERROR') {
-      this.searchForm.timer = []
-    }
 
     if (query.organId) {
       this.searchForm.organIdList = Number(query.organId);
@@ -865,11 +861,10 @@ export default {
           count++;
         }
       }
-      //  课程时间段异常，不需要时间搜索，则课表列表搜索可以不要条件搜索
-      // if (count <= 0) {
-      //   this.$message.error("请至少选择一个搜索条件");
-      //   return false;
-      // }
+      if (count <= 0) {
+        this.$message.error("请至少选择一个搜索条件");
+        return false;
+      }
       const { creatTimer, timer, ...rest } = searchForm;
       return {
         ...rest,