Merge branch 'master' into iteration_0926

dist/static/css/chunk-34313a5b.6fd6f384.css → dist/static/css/chunk-33c11bdd.1927dfd8.css

@@ -1 +1 @@
-.btns[data-v-5594b0f2]{text-align:right}.files[data-v-5594b0f2]{background-color:#f8f8f8;padding:20px 0;padding-right:20px;margin-bottom:20px;border-radius:5px;position:relative}.files .file-remove[data-v-5594b0f2]{position:absolute;right:20px;bottom:10px}.remark[data-v-6188d72a]{display:inline;overflow:hidden;white-space:pre}.lookForm[data-v-6188d72a] .el-dialog__body{padding:0}.iframe_back[data-v-6188d72a]{width:195px;height:45px;position:absolute;bottom:50px;background:transparent;left:50%;z-index:99;margin-left:-100px}.iframe_help[data-v-6188d72a]{position:absolute;background:transparent;width:50px;height:120px;top:50%;right:0;margin-top:-35px}.iframe_header_back[data-v-6188d72a]{background:transparent;width:225px;height:50px;position:absolute;top:65px;left:20px}
+.btns[data-v-5594b0f2]{text-align:right}.files[data-v-5594b0f2]{background-color:#f8f8f8;padding:20px 0;padding-right:20px;margin-bottom:20px;border-radius:5px;position:relative}.files .file-remove[data-v-5594b0f2]{position:absolute;right:20px;bottom:10px}.remark[data-v-e8507474]{display:inline;overflow:hidden;white-space:pre}.lookForm[data-v-e8507474] .el-dialog__body{padding:0}.iframe_back[data-v-e8507474]{width:195px;height:45px;position:absolute;bottom:50px;background:transparent;left:50%;z-index:99;margin-left:-100px}.iframe_help[data-v-e8507474]{position:absolute;background:transparent;width:50px;height:120px;top:50%;right:0;margin-top:-35px}.iframe_header_back[data-v-e8507474]{background:transparent;width:225px;height:50px;position:absolute;top:65px;left:20px}

dist/static/css/chunk-0bd32a1e.ad12f049.css → dist/static/css/chunk-926ccd64.9c580796.css

@@ -1 +1 @@
-.dialog-footer.question[data-v-2a1d461b]{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:justify;-ms-flex-pack:justify;justify-content:space-between}
+.dialog-footer.question[data-v-97c5d1e4]{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:justify;-ms-flex-pack:justify;justify-content:space-between}

src/views/accompaniment/index.vue

@@ -250,7 +250,7 @@ import pagination from "@/components/Pagination/index";
 import { songUseType } from "@/constant";
 import { QueryPage, Del, Show, queryTree } from "./api";
 import form from "./modals/form";
-import { vaildStudentUrl } from '@/utils/validate'
+import { vaildTeachingUrl } from '@/utils/validate'
 import { getToken } from '@/utils/auth'
 import deepClone from '@/helpers/deep-clone/'
 export default {
@@ -345,7 +345,7 @@ export default {
       this.FetchList();
     },
     looker(row) {
-      this.accompanyUrl = vaildStudentUrl() + '/accompany?Authorization=' + getToken() + '#/detail/' + row.id
+      this.accompanyUrl = vaildTeachingUrl() + '/accompany?Authorization=' + getToken() + '&platform=web#/detail/' + row.id
       this.lookVisible = true
       // this.$nextTick(() => {
       //   console.log(this.$refs.iframe)

src/views/resetTeaming/components/strudentPayInfo.vue

@@ -390,7 +390,10 @@
                     value="张三"></el-input>
         </el-form-item> -->
         <el-form-item
-          v-if="msgList.length > 0 || titleForm.paymentType == 'SPAN_GROUP_CLASS_ADJUST'"
+          v-if="
+            msgList.length > 0 ||
+            titleForm.paymentType == 'SPAN_GROUP_CLASS_ADJUST'
+          "
           label="预计课程金额"
           :rules="[
             { required: true, message: '请输入预计缴费金额', trigger: 'blur' },
@@ -463,6 +466,44 @@
     <el-dialog width="700px" title="查看缴费详情" :visible.sync="detailVisible">
       <studentPayDetail :msgList="msgList" :titleForm="titleForm" />
     </el-dialog>
+
+    <el-dialog width="400px" title="缴费时间" :visible.sync="timerVisible">
+      <el-form :model="timerForm" ref="timerForm">
+        <el-form-item
+          label="缴费开始时间"
+          :rules="[{ required: true, message: '请选择缴费开始时间' }]"
+          prop="startPaymentDate"
+        >
+          <el-date-picker
+            :picker-options="pickerOptions"
+            v-model="timerForm.startPaymentDate"
+            type="date"
+            placeholder="选择日期"
+            @change="changeStartTime"
+            value-format="yyyy-MM-dd"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item
+          label="缴费结束时间"
+          :rules="[{ required: true, message: '请选择缴费结束时间' }]"
+          prop="deadlinePaymentDate"
+        >
+          <el-date-picker
+            :picker-options="payendTimer"
+            v-model="timerForm.deadlinePaymentDate"
+            type="date"
+            placeholder="选择日期"
+            value-format="yyyy-MM-dd"
+          >
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="timerVisible = false">取 消</el-button>
+        <el-button @click="submitPayTimer" type="primary">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -487,7 +528,7 @@ import {
   delMusicGroupPaymentCalenderStudent,
   sendWaitRenewMessage,
 } from "@/api/buildTeam";
-
+let that;
 export default {
   components: { pagination, studentPayDetail },
   data() {
@@ -514,6 +555,7 @@ export default {
       chioseStudent: null,
       studentList: [],
       pickerOptions: {
+        firstDayOfWeek: 1,
         disabledDate(time) {
           return time.getTime() + 86400000 <= new Date().getTime();
         },
@@ -552,6 +594,11 @@ export default {
         originalMemberPaymentAmount: "",
         memberValidDate: "",
       },
+      timerVisible: false,
+      timerForm: {
+        startPaymentDate: "",
+        deadlinePaymentDate: "",
+      },
     };
   },
   //生命周期 - 创建完成（可以访问当前this实例）
@@ -559,6 +606,7 @@ export default {
   //生命周期 - 挂载完成（可以访问DOM元素）
   mounted() {
     // 获取声部
+    that = this;
     this.teamid = this.$route.query.id;
     findSound({ musicGroupId: this.teamid }).then((res) => {
       if (res.code == 200) {
@@ -684,19 +732,10 @@ export default {
         this.$message.error("请至少选择一名学员");
         return;
       }
-
+      // 来一个弹窗选择日期 开始-结束
+      this.timerVisible = true;
+      return;
       // console.log(this.activeChiose)
-      let ids = this.activeChiose.map((item) => {
-        return item.id;
-      });
-      ids = ids.join(",");
-      // console.log(ids)
-      openMusicGroupPaymentCalenderDetailPayment({ ids }).then((res) => {
-        if (res.code == 200) {
-          this.$message.success(res.msg);
-          this.getList();
-        }
-      });
     },
     submitReset() {
       this.$refs.resetPayForm.validate((res) => {
@@ -878,6 +917,31 @@ export default {
         })
         .catch(() => {});
     },
+    changeStartTime(val) {
+      this.timerForm.deadlinePaymentDate = "";
+    },
+    async submitPayTimer() {
+      this.$refs.timerForm.validate((flag) => {
+        if (flag) {
+          let ids = this.activeChiose.map((item) => {
+            return item.id;
+          });
+          ids = ids.join(",");
+          // console.log(ids)
+          openMusicGroupPaymentCalenderDetailPayment({
+            ids,
+            ...this.timerForm,
+          }).then((res) => {
+            if (res.code == 200) {
+              this.$message.success(res.msg);
+              this.timerVisible = false;
+
+              this.getList();
+            }
+          });
+        }
+      });
+    },
   },
   watch: {
     payVisible(val) {
@@ -895,6 +959,28 @@ export default {
         };
       }
     },
+    timerVisible(val) {
+      if (!val) {
+        this.$refs.timerForm.resetFields();
+      }
+    },
+  },
+  computed: {
+    payendTimer: () => {
+      return {
+        firstDayOfWeek: 1,
+        disabledDate(time) {
+          if (that.timerForm?.startPaymentDate) {
+            return (
+              time.getTime() + 86400000 <=
+              new Date(that.timerForm?.startPaymentDate).getTime()
+            );
+          } else {
+            return time.getTime() + 86400000 <= new Date().getTime();
+          }
+        },
+      };
+    },
   },
 };
 </script>

src/views/withdrawal-application/index.vue

@@ -24,6 +24,24 @@
             placeholder="学员(乐团)编号"
           ></el-input>
         </el-form-item>
+                <el-form-item prop="organId">
+          <el-select
+            class="multiple"
+            style="width: 180px !important"
+            v-model.trim="searchForm.organId"
+            filterable
+            clearable
+            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-select
             v-model="searchForm.status"
@@ -72,6 +90,11 @@
             scope.row.user.username
           }}</copy-text>
         </el-table-column>
+            <el-table-column prop="organName" label="所属分部">
+          <div slot-scope="scope">{{
+            scope.row.musicGroup.organName
+          }}</div>
+        </el-table-column>
         <el-table-column prop="musicGroupId" label="所属乐团">
           <copy-text slot-scope="scope">{{
             scope.row.musicGroup.name
@@ -280,6 +303,7 @@ import { withdrawalStatus } from "@/constant";
 const initSearch = {
   search: "",
   status: null,
+  organId:''
 };
 export default {
   components: { pagination, quitModal, quitOnlyModal, visit },
@@ -318,10 +342,10 @@ export default {
       isDisabled: false,
     };
   },
-  mounted() {
+ async mounted() {
     let isSuperAdmin = this.$store.getters.isSuperAdmin;
     let roles = this.$store.getters.roles;
-    console.log(roles);
+    await this.$store.dispatch("setBranchs");
     if (isSuperAdmin) {
       this.isManage = "super";
     } else {