Merge branch 'test' into 04/19replaceMusic

dist/static/css/chunk-13af5276.f78fc9ab.css

@@ -0,0 +1 @@
+.lookTitle[data-v-662bacf4]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.setWidth[data-v-662bacf4]{display:inline-block}.showShop[data-v-662bacf4]{height:40px;line-height:40px;width:150px;background-color:#f5f7fa;border-color:#e4e7ed;color:#c0c4cc;cursor:not-allowed;color:#333;opacity:1;border-radius:4px;border:1px solid #dcdfe6;padding:0 15px;margin-right:10px}.shopListWrap[data-v-662bacf4]{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}

dist/static/css/chunk-631b0a09.7ae0c203.css

@@ -1 +0,0 @@
-.lookTitle[data-v-0f503cb0]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.setWidth[data-v-0f503cb0]{display:inline-block}.showShop[data-v-0f503cb0]{height:40px;line-height:40px;width:150px;background-color:#f5f7fa;border-color:#e4e7ed;color:#c0c4cc;cursor:not-allowed;color:#333;opacity:1;border-radius:4px;border:1px solid #dcdfe6;padding:0 15px;margin-right:10px}.shopListWrap[data-v-0f503cb0]{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}

dist/static/css/chunk-2003fc7f.928fc890.css → dist/static/css/chunk-ec9a919c.807082c4.css

@@ -1 +1 @@
-.alert[data-v-4f95a965]{margin:10px 0}.dialog-footer[data-v-5b9f92c9],.dialog-footer[data-v-59fb2832]{margin-top:20px;display:block;text-align:right}[data-v-63f32cba] .el-date-editor.el-input,[data-v-63f32cba] .el-select{width:100%!important}[data-v-63f32cba] .el-table .cell{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}[data-v-63f32cba] .el-dialog__body{padding:10px 20px}.newBand[data-v-63f32cba]{display:inline-block}
+.alert[data-v-c199f174]{margin:10px 0}.dialog-footer[data-v-5b9f92c9],.dialog-footer[data-v-59fb2832]{margin-top:20px;display:block;text-align:right}[data-v-63f32cba] .el-date-editor.el-input,[data-v-63f32cba] .el-select{width:100%!important}[data-v-63f32cba] .el-table .cell{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}[data-v-63f32cba] .el-dialog__body{padding:10px 20px}.newBand[data-v-63f32cba]{display:inline-block}

src/App.vue

@@ -19,11 +19,7 @@ export default {
       isRouterAlive: true,
     };
   },
-  created() {
-
-
-
-  },
+  created() {},
   methods: {
     reloads() {
       this.isRouterAlive = false;
@@ -72,8 +68,8 @@ body {
 $--color-primary: teal;
 .el-table {
   width: 99% !important;
-  border-left: 1px solid #EBEEF5;
-  border-right: 1px solid #EBEEF5;
+  border-left: 1px solid #ebeef5;
+  border-right: 1px solid #ebeef5;
 }
 .el-tabs__content {
   overflow: auto;
@@ -91,8 +87,8 @@ input::-webkit-inner-spin-button {
 input[type="number"] {
   -moz-appearance: textfield;
 }
-.el-input__inner{
-  line-height: 1px!important;
+.el-input__inner {
+  line-height: 1px !important;
 }
 .el-dialog {
   margin-bottom: 10vh;
@@ -100,7 +96,7 @@ input[type="number"] {
     background: #363d55;
     padding: 15px 20px 15px;
     .el-dialog__title {
-      color: #fff
+      color: #fff;
     }
     .el-dialog__headerbtn .el-dialog__close {
       color: #fff;
@@ -357,27 +353,38 @@ input[type="number"] {
 }
 
 .horizontal-scrollbar {
-    .el-scrollbar__wrap {
-        overflow-x: hidden;
-        .el-scrollbar__view{
-            white-space: nowrap;
-         }
+  .el-scrollbar__wrap {
+    overflow-x: hidden;
+    .el-scrollbar__view {
+      white-space: nowrap;
     }
+  }
 }
 </style>
 <style lang="less">
 .main-dot {
   position: relative;
-  &::after{
-    content: '';
+  &::after {
+    content: "";
     display: block;
     position: absolute;
     height: 8px;
     width: 8px;
-    background-color: #F56C6C;
+    background-color: #f56c6c;
     border-radius: 50%;
     right: 5px;
     top: 5px;
   }
 }
+.el-select__tags {
+  overflow: hidden;
+  flex-wrap: nowrap;
+}
+.el-select__tags {
+  .el-tag.el-tag--info.el-tag--small.el-tag--light {
+    max-width: 85px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+}
 </style>

src/components/save-form/index.vue

@@ -48,7 +48,7 @@ export default {
         this.searchs.update(this.$route.path, undefined, 'bind')
       }
       this.searchs.update(this.model, undefined, 'form')
-        console.log(  new Searchs().searchs)
+        // console.log(  new Searchs().searchs)
       if (this.$listeners.submit) {
         this.$listeners.submit(evt)
       }

src/components/select-all/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="wrap">
+  <div class="wrap selcetAll">
     <el-tooltip
       v-if="isShow"
       class="item"
@@ -40,8 +40,11 @@ export default {
   },
   mounted() {
     const { selected } = this.$refs.select;
-    this.labelStr = selected.map((item) => item.label?item.label:item.value).join(",");
-    this.isShow = (this.$refs?.select?.disabled || false)&&this.labelStr.length>0;
+    this.labelStr = selected
+      .map((item) => (item.label ? item.label : item.value))
+      .join(",");
+    this.isShow =
+      (this.$refs?.select?.disabled || false) && this.labelStr.length > 0;
   },
   methods: {
     selectAll() {
@@ -59,7 +62,6 @@ export default {
   max-width: 300px;
   line-height: 180%;
 }
-
 </style>
 <style lang="less" scoped>
 .wrap {
@@ -80,7 +82,7 @@ export default {
   padding: 0 10px;
   border-left: none;
   border-radius: 0 4px 4px 0;
-
+  height: 40px;
 }
 .item {
   width: 100%;

src/layout/components/Navbar.vue

@@ -9,7 +9,7 @@
     <div class="indexlayout-top-menu">
       <!-- :class="{'active': getTopMenuActive === route.path}" -->
       <!-- el-scrollbar -->
-      <el-scrollbar class="horizontal-scrollbar" style="overflow: hidden;">
+      <el-scrollbar class="horizontal-scrollbar" style="overflow: hidden; height: 100%;">
           <template v-for="route in permission_routes">
             <app-link v-if="!route.hidden" :to="route.path" :key="route.id" class="indexlayout-top-menu-li" :class="{'active': getTopMenuActive === route.path}">
                 <span>{{ route.meta.title }}</span>
@@ -320,7 +320,7 @@ export default {
     span {
       // display: block;
       transition: all .3s ease;
-      padding: 10px 18px;
+      padding: 10px 20px;
     }
     &:hover,
     &.active{

src/styles/variables.scss

@@ -11,7 +11,7 @@ $subMenuBg:#fff;
 $subMenuHover:#EEF4F4;
 $subMenuActiveBg:#EEF4F4;
 
-$sideBarWidth: 210px;
+$sideBarWidth: 195px;
 /* 改变主题色变量 */
 $--color-primary: rgb(19, 129, 122);
 // the :export directive is the magic sauce for webpack

src/views/HumanResources/form.vue

@@ -104,7 +104,8 @@
               <th class="description-label">声部</th>
               <td class="description-content">
                 <el-form-item prop="subjectIdList">
-                  <select-all
+                  <el-select
+                  size="mini"
                     v-model.trim="form.subjectIdList"
                     clearable
                     filterable
@@ -118,7 +119,7 @@
                       :label="item.name"
                     >
                     </el-option>
-                  </select-all>
+                  </el-select>
                 </el-form-item>
               </td>
             </tr>

src/views/arrearage-students/modals/list.vue

@@ -24,11 +24,11 @@
         width="55"
       />
       <el-table-column
-        prop="id"
+        prop="musicGroupPaymentCalenderId"
         label="缴费编号"
       >
         <copy-text slot-scope="scope">
-          {{ scope.row.id }}
+          {{ scope.row.musicGroupPaymentCalenderId }}
         </copy-text>
       </el-table-column>
       <el-table-column

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,11 +229,11 @@ 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({ rows: 99999 }).then((res) => {

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

@@ -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"

src/views/resetTeaming/modals/review-detail.vue

@@ -4,10 +4,10 @@
       :closable="false"
       class="alert"
       type="info"
-      v-if="musicGroupPaymentCalenders[0].paymentType === 'ADD_STUDENT'"
+      v-if="musicGroupPaymentCalenders[0] && musicGroupPaymentCalenders[0].paymentType === 'ADD_STUDENT'"
     >
     </el-alert>
-    <descriptions :column="2" v-if="musicGroupPaymentCalenders[0].paymentType === 'ADD_STUDENT'">
+    <descriptions :column="2" v-if="musicGroupPaymentCalenders[0] && musicGroupPaymentCalenders[0].paymentType === 'ADD_STUDENT'">
       <descriptions-item label="学员姓名：">{{
         username
       }}</descriptions-item>
@@ -145,7 +145,7 @@
 
         <template slot-scope="scope">
           <div>
-            {{ (musicGroupPaymentCalenders[0].paymentType === 'SPAN_GROUP_CLASS_ADJUST' ? scope.row.masterSubCoursePrice : scope.row.courseOriginalPrice) | moneyFormat }}
+            {{ (musicGroupPaymentCalenders[0] && musicGroupPaymentCalenders[0].paymentType === 'SPAN_GROUP_CLASS_ADJUST' ? scope.row.masterSubCoursePrice : scope.row.courseOriginalPrice) | moneyFormat }}
           </div>
         </template>
       </el-table-column>

src/views/teamBuild/signupList.vue

@@ -58,10 +58,10 @@
             延长报名
           </div>
           <div class="newBand" @click="onCreateQRCode('payment')"   v-show="
-              status == 'PAY' ||
+              (status == 'PAY' ||
               status == 'APPLY' ||
               status == 'PROGRESS' ||
-              status == 'PREPARE'
+              status == 'PREPARE')&&ischeckCanReg
             ">报名链接</div>
           <div class="newBand" @click="onCreateQRCode('detail')">缴费详情</div>
           <div
@@ -86,7 +86,12 @@
             class="newBand"
             v-permission="'musicGroup/addMusicGroupRegs'"
             @click="mergeVisible = true"
-            v-show="status == 'PAY' || status == 'APPLY'"
+             v-show="
+              (status == 'PAY' ||
+              status == 'APPLY' ||
+              status == 'PROGRESS' ||
+              status == 'PREPARE')&&ischeckCanReg
+            "
           >
             合并学员
           </div>
@@ -94,6 +99,12 @@
             class="newBand"
             style="background-color: #f97215; border: 1px solid #f97215"
             @click="onCreateQRCode('rePayment')"
+             v-show="
+              (status == 'PAY' ||
+              status == 'APPLY' ||
+              status == 'PROGRESS' ||
+              status == 'PREPARE')&&ischeckCanReg
+            "
           >
             报名链接（无乐器）
           </div>
@@ -252,7 +263,7 @@
           <el-table-column align="center" label="入团年份">
             <template slot-scope="scope">
               <div>
-                {{ scope.row.currentGradeDate | dayjsFormat("YYYY年") }}
+                {{ scope.row.createTime | dayjsFormat("YYYY年") }}
               </div>
             </template>
           </el-table-column>
@@ -692,6 +703,7 @@ import {
   studentApplyDetailExport,
   StudentQuit,
   getMusicGroupGradeList,
+  checkCanReg
 } from "@/api/buildTeam";
 import mergeMusic from "./components/merge-music";
 import forecastList from "./components/forecast-list";
@@ -844,6 +856,7 @@ export default {
       applyDates: this.applyDate(),
       detail: null,
       gradeList: [],
+      ischeckCanReg:false
     };
   },
   created() {},
@@ -858,13 +871,21 @@ export default {
     permission(str) {
       return permission(str);
     },
-    init() {
+   async init() {
       this.status = this.$route.query.team_status;
       // 通过乐团id 获取乐团招生状态
       this.id = this.$route.query.id;
       this.teamName = this.$route.query.name;
       // 判断是否带缓存参数
       this.pickerOptions = this.beginDate(new Date());
+      // checkCanReg
+      try{
+       this.ischeckCanReg = await (await checkCanReg({musicGroupId:this.id})).data
+       console.log(this.ischeckCanReg)
+      }catch(e){
+        console.log(e)
+      }
+
 
       getMusicGroupGradeList({ musicGroupId: this.id }).then((res) => {
         let result = res.data;

src/views/teamDetail/teamCourseList.vue

@@ -193,13 +193,17 @@
             }"
           ></el-date-picker>
         </el-form-item> -->
-        <el-button
+
+        <el-form-item>
+             <el-button
           type="primary"
           icon="el-icon-circle-plus-outline"
           @click="showMove = true"
           >更多选项</el-button
         >
-        <el-button native-type="submit" type="primary">搜索</el-button>
+        </el-form-item>
+        <el-form-item>
+               <el-button native-type="submit" type="primary">搜索</el-button>
         <el-button native-type="reset" type="danger">重置</el-button>
 
         <el-button
@@ -208,6 +212,8 @@
           type="primary"
           >导出课表</el-button
         >
+        </el-form-item>
+
       </save-form>
       <!-- 列表 -->
       <div class="tableWrap">