12/17 修改 首页消息验证

src/views/businessManager/orderManager/financeManager.vue

@@ -390,6 +390,17 @@
             </el-select>
           </el-form-item>
           <el-form-item
+            label="缴费单号"
+            prop="calenderId"
+            :label-width="formLabelWidth"
+          >
+            <el-input
+              v-model.trim="form.calenderId"
+              :disabled="!isAdd"
+              placeholder="请输入缴费单号"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
             label="学员编号"
             prop="userId"
             :label-width="formLabelWidth"
@@ -671,6 +682,7 @@ export default {
         ],
         applyType: null,
         userId: "",
+        calenderId:""
       },
       validAmount: [
         { required: true, validator: validAmount, trigger: "blur" },
@@ -1179,4 +1191,4 @@ export default {
   padding: 0 20px;
   margin-bottom: 20px;
 }
-</style>
+</style>

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

@@ -55,6 +55,17 @@
           ></el-option>
         </el-select>
       </el-form-item>
+          <el-form-item
+            label="缴费单号"
+            prop="calenderId"
+            :label-width="formLabelWidth"
+          >
+            <el-input
+              v-model.trim="form.calenderId"
+              :disabled="!isAdd"
+              placeholder="请输入缴费单号"
+            ></el-input>
+          </el-form-item>
       <el-form-item
         label="学员编号"
         prop="userId"
@@ -315,6 +326,7 @@ export default {
         applyType: null,
         userId: "",
         auditComment: "",
+        calenderId:''
       },
       isAdd: !this.isLook,
       cooperationList: [],
@@ -347,6 +359,7 @@ export default {
             userId: orderInfo.userId ? orderInfo.userId : "",
             auditComment: orderInfo.auditComment,
             applyType: orderInfo.saleAmount ? "SELL" : "SERVICE",
+            calenderId:orderInfo.calenderId
           };
           this.auditStatus = orderInfo.auditStatus;
           this.$set(
@@ -471,4 +484,4 @@ export default {
 .setWidth {
   display: inline-block;
 }
-</style>
+</style>

src/views/recodeManager/recodeList.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="m-container">
     <h2>
-      <div class="squrt"></div>考勤列表
+      <div class="squrt"></div>老师考勤列表
     </h2>
     <div class="m-core">
       <el-form :inline="true"
@@ -331,4 +331,4 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-</style>
+</style>

src/views/teamBuild/components/teamBaseInfo.vue

@@ -186,51 +186,6 @@
             placeholder="选择日期"
           ></el-date-picker>
         </el-form-item>
-        <!-- <el-form-item label="缴费方式"
-                      prop="paymentPattern"
-                      :rules="[{ required: !isNotEditing(), message: '请选择缴费方式' }]">
-          <el-select placeholder="缴费方式"
-                     :disabled="isNotEditing() || basdisabled"
-                     clearable
-                     @change="changePaymentPattern"
-                     filterable
-                     v-model.trim="topFrom.paymentPattern">
-            <el-option :value="0"
-                       label="按月"></el-option>
-            <el-option :value="1"
-                       label="按季"></el-option>
-            <el-option :value="2"
-                       label="一次性"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="缴费有效期开始"
-                      prop="paymentValidStartDate"
-                      :rules="[
-            { required: !isNotEditing(), message: '请选择缴费有效期开始' },
-          ]">
-          <el-date-picker :disabled="isNotEditing() || basdisabled "
-                          v-model="topFrom.paymentValidStartDate"
-                          @change="changePaymentValidStartDate"
-                          placeholder="开始日期"
-                          :picker-options="beginDate(topFrom.time)">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="缴费有效期结束"
-                      prop="paymentValidEndDate"
-                      :rules="[
-            {
-              required: !(isNotEditing()),
-              message: '请选择缴费有效期结束',
-            },
-          ]">
-          <el-date-picker :disabled="
-              isNotEditing() || basdisabled || !topFrom.paymentValidStartDate
-            "
-                          v-model="topFrom.paymentValidEndDate"
-                          :picker-options="beginDate(topFrom.paymentValidStartDate)"
-                          placeholder="结束日期">
-          </el-date-picker>
-        </el-form-item> -->
         <el-form-item label="招生年级" v-if="basdisabled">
           <el-tooltip
             class="item"
@@ -308,19 +263,6 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <!-- <el-form-item label="乐团网管课"
-                      :rules="[{ required: true, message: '请选择是否排乐团网管课' }]"
-                      prop="feeType">
-          <el-select v-model="topFrom.feeType"
-                     placeholder="是否排乐团网管课"
-                     :disabled="basdisabled"
-                     @change="changeFeeType">
-            <el-option label="需要排一次线上课"
-                       value="ONLINE"></el-option>
-            <el-option label="只排线下课"
-                       value="OFFLINE"></el-option>
-          </el-select>
-        </el-form-item> -->
         <el-form-item label prop="isClass">
           <el-checkbox v-model.trim="topFrom.isClass" :disabled="basdisabled"
             >课堂课乐团</el-checkbox
@@ -333,180 +275,6 @@
           </p>
         </el-form-item>
       </el-form>
-
-      <!-- <div class="checkList">
-        <div class="head noMargin">乐团课程:</div>
-        <div class="checkRow">
-          <el-checkbox label="乐团声部训练"
-                       :disabled="basdisabled"
-                       v-model.trim="checkList.soundInfo.ischeck"></el-checkbox>
-          <div class="inputWrap">
-            原价:
-            <el-input type="text"
-                      placeholder="请输入"
-                      :disabled="basdisabled"
-                      v-model.trim="checkList.soundInfo.value" />
-          </div>
-        </div>
-        <div class="checkRow">
-          <el-checkbox label="乐团合奏训练"
-                       :disabled="basdisabled"
-                       v-model.trim="checkList.allInfo.ischeck"></el-checkbox>
-          <div class="inputWrap">
-            原价:
-            <el-input type="text"
-                      placeholder="请输入"
-                      :disabled="basdisabled"
-                      v-model.trim="checkList.allInfo.value" />
-          </div>
-        </div>
-        <div class="checkRow">
-          <el-checkbox label="假期集中训练"
-                       :disabled="basdisabled"
-                       v-model.trim="checkList.holidayInfo.ischeck"></el-checkbox>
-          <div class="inputWrap">
-            原价:
-            <el-input type="number"
-                      @mousewheel.native.prevent
-                      :disabled="basdisabled"
-                      placeholder="请输入"
-                      v-model.trim="checkList.holidayInfo.value" />
-          </div>
-        </div>
-        <div class="checkRow"
-             v-if="checkList.networkInfo">
-          <el-checkbox label="乐团云课堂"
-                       :disabled="basdisabled"
-                       v-model="checkList.networkInfo.ischeck"></el-checkbox>
-          <div class="inputWrap">
-            原价:
-            <el-input type="number"
-                      :disabled="basdisabled"
-                      @mousewheel.native.prevent
-                      placeholder="请输入"
-                      v-model.trim="checkList.networkInfo.value" />
-          </div>
-        </div>
-        <div class="checkRow">
-          <el-checkbox label="网络基础训练"
-                       :disabled="basdisabled"
-                       v-model.trim="checkList.baseInfo.ischeck"></el-checkbox>
-          <div class="inputWrap">
-            原价:
-            <el-input type="number"
-                      :disabled="basdisabled"
-                      @mousewheel.native.prevent
-                      placeholder="请输入"
-                      v-model.trim="checkList.baseInfo.value" />
-          </div>
-        </div>
-        <div class="checkRow">
-          <el-checkbox label="课程提示"
-                       :disabled="basdisabled"
-                       class="classCheckBox"
-                       v-model.trim="checkList.submit.ischeck"></el-checkbox>
-          <div class="textWrap"
-               v-if="checkList.submit.ischeck">
-            <el-input type="textarea"
-                      :disabled="basdisabled"
-                      :rows="1"
-                      style="width: 500px"
-                      v-model.trim="checkList.submit.value"></el-input>
-          </div>
-        </div>
-        <div class="head noMargin">新生专享:</div>
-
-        <div class="checkRow"
-             v-if="newStudentList.baseInfo">
-          <el-checkbox label="网络基础训练"
-                       :disabled="basdisabled"
-                       v-model="newStudentList.baseInfo.ischeck"></el-checkbox>
-          <div class="inputWrap">
-            原价:
-            <el-input type="number"
-                      @mousewheel.native.prevent
-                      :disabled="basdisabled"
-                      placeholder="请输入"
-                      v-model.trim="newStudentList.baseInfo.nowValue" />
-          </div>
-          <div class="inputWrap">
-            现价:
-            <el-input type="number"
-                      :disabled="basdisabled"
-                      @mousewheel.native.prevent
-                      placeholder="请输入"
-                      v-model.trim="newStudentList.baseInfo.value" />
-          </div>
-        </div>
-        <div class="head noMargin">付费方式：</div>
-        <div class="checkRow">
-          <el-checkbox label="学校"
-                       :disabled="basdisabled"
-                       class="classCheckBox"
-                       v-model.trim="payList.school.ischeck"></el-checkbox>
-
-          <div class="chioseList">
-            <el-radio-group v-model="payList.school.chiose"
-                            size="small">
-              <el-radio-button label="ONE_OFF">一次性</el-radio-button>
-              <el-radio-button label="MONTHLY">一个月</el-radio-button>
-              <el-radio-button label="TERM">一学期</el-radio-button>
-              <el-radio-button label="YEAR">一学年</el-radio-button>
-            </el-radio-group>
-          </div>
-          <div class="inputWrap">
-            <div>
-              预计收费:
-              <el-input v-model.trim="payList.school.price"
-                        :disabled="basdisabled"
-                        placeholder="请输入" />
-            </div>
-
-          </div>
-          <div class="inputWrap">
-            <div>
-              备注:
-              <el-input v-model.trim="payList.school.value"
-                        :disabled="basdisabled"
-                        placeholder="请输入" />
-            </div>
-
-          </div>
-        </div>
-        <div class="checkRow">
-          <el-checkbox label="公司"
-                       class="classCheckBox"
-                       :disabled="basdisabled"
-                       v-model.trim="payList.company.ischeck"></el-checkbox>
-          <div class="chioseList">
-            <el-radio-group v-model="payList.company.chiose"
-                            size="small">
-              <el-radio-button label="ONE_OFF">一次性</el-radio-button>
-              <el-radio-button label="MONTHLY">一个月</el-radio-button>
-              <el-radio-button label="TERM">一学期</el-radio-button>
-              <el-radio-button label="YEAR">一学年</el-radio-button>
-            </el-radio-group>
-          </div>
-          <div class="inputWrap">
-            <div>
-              预计收费:
-              <el-input placeholder="请输入"
-                        :disabled="basdisabled"
-                        v-model.trim="payList.company.price" />
-            </div>
-
-          </div>
-          <div class="inputWrap">
-            <div>
-              备注:
-              <el-input placeholder="请输入"
-                        :disabled="basdisabled"
-                        v-model.trim="payList.company.value" />
-            </div>
-
-          </div>
-        </div>
-      </div> -->
       <div class="btnWrap">
         <div
           class="nextBtn"
@@ -775,6 +543,7 @@ export default {
         this.teamStatus == "look" ||
         this.teamStatus == "teamAudit" ||
         this.teamStatus == "feeAudit"
+
       ) {
         this.basdisabled = true;
       } else {
@@ -828,52 +597,52 @@ export default {
               ? res.data.musicGroup.feeType
               : null;
             // 课程组成形式
-            this.checkList;
-            // 判断课程是否为空
-            let list = res.data.musicGroup.courseForm
-              ? JSON.parse(res.data.musicGroup.courseForm)
-              : {};
-            for (let i in this.checkList) {
-              if (list[i] && !list[i].isNew) {
-                this.checkList[i] = list[i];
-              } else if (list[i] && list[i].isNew) {
-                this.newStudentList[i] = list[i];
-                this.newStudentList[i].checkBuy = true;
-              }
-            }
+            // this.checkList;
+            // // 判断课程是否为空
+            // let list = res.data.musicGroup.courseForm
+            //   ? JSON.parse(res.data.musicGroup.courseForm)
+            //   : {};
+            // for (let i in this.checkList) {
+            //   if (list[i] && !list[i].isNew) {
+            //     this.checkList[i] = list[i];
+            //   } else if (list[i] && list[i].isNew) {
+            //     this.newStudentList[i] = list[i];
+            //     this.newStudentList[i].checkBuy = true;
+            //   }
+            // }
 
-            // 付费方式和周期
-            for (let i in res.data.musicGroupPaymentEntities) {
-              if (res.data.musicGroupPaymentEntities[i].name == "学校") {
-                this.payList.school.ischeck = true;
-                this.payList.school.value =
-                  res.data.musicGroupPaymentEntities[i].memo;
-                this.payList.school.price =
-                  res.data.musicGroupPaymentEntities[i].amount;
-                this.payList.school.chiose =
-                  res.data.musicGroupPaymentEntities[i].paymentMethod;
-              }
-              if (res.data.musicGroupPaymentEntities[i].name == "公司") {
-                this.payList.company.ischeck = true;
-                this.payList.company.value =
-                  res.data.musicGroupPaymentEntities[i].memo;
-                this.payList.company.price =
-                  res.data.musicGroupPaymentEntities[i].amount;
-                this.payList.company.chiose =
-                  res.data.musicGroupPaymentEntities[i].paymentMethod;
-              }
+            // // 付费方式和周期
+            // for (let i in res.data.musicGroupPaymentEntities) {
+            //   if (res.data.musicGroupPaymentEntities[i].name == "学校") {
+            //     this.payList.school.ischeck = true;
+            //     this.payList.school.value =
+            //       res.data.musicGroupPaymentEntities[i].memo;
+            //     this.payList.school.price =
+            //       res.data.musicGroupPaymentEntities[i].amount;
+            //     this.payList.school.chiose =
+            //       res.data.musicGroupPaymentEntities[i].paymentMethod;
+            //   }
+            //   if (res.data.musicGroupPaymentEntities[i].name == "公司") {
+            //     this.payList.company.ischeck = true;
+            //     this.payList.company.value =
+            //       res.data.musicGroupPaymentEntities[i].memo;
+            //     this.payList.company.price =
+            //       res.data.musicGroupPaymentEntities[i].amount;
+            //     this.payList.company.chiose =
+            //       res.data.musicGroupPaymentEntities[i].paymentMethod;
+            //   }
 
-              if (res.data?.months?.length > 0) {
-                this.payList.student.ischeck = true;
-                this.payList.student.chiose = "loop";
-                this.chioseMonth = res.data.months;
-              } else {
-                this.payList.student.ischeck = true;
-                this.payList.student.chiose = "ONE_OFF";
-              }
-            }
-            // 循环缴费月
-            this.payList.chioseMonth = res.data.months;
+            //   if (res.data?.months?.length > 0) {
+            //     this.payList.student.ischeck = true;
+            //     this.payList.student.chiose = "loop";
+            //     this.chioseMonth = res.data.months;
+            //   } else {
+            //     this.payList.student.ischeck = true;
+            //     this.payList.student.chiose = "ONE_OFF";
+            //   }
+            // }
+            // // 循环缴费月
+            // this.payList.chioseMonth = res.data.months;
             if (res.data.musicGroup.organId) {
               // 获取员工
               queryEmployByOrganId({
@@ -951,34 +720,6 @@ export default {
           this.typeList = res.data.rows;
         }
       });
-      // 3.获取合作单位选项卡
-      // getCooperation({ 'rows': 1000, search: this.organId }).then(res => {
-      //   if (res.code == 200) {
-      //     this.cooperationList = res.data.rows;
-      //   }
-      // })
-      // 4.获取老师选项卡
-      // getTeacher({ 'rows': 1000, organId: this.organId }).then(res => {
-      //   if (res.code == 200) {
-      //     this.teacherList = res.data;
-      //   }
-      // })
-      // 5.获取教学地点选项卡
-      // getAddress({ 'rows': 1000, }).then(res => {
-      //   if (res.code == 200) {
-      //     this.addList = res.data.rows;
-      //   }
-      // })
-      // 6.默认支付主体
-      // getPayMaster({ 'rows': 1000 }).then(res => {
-      //   if (res.code == 200) {
-      //     this.payList = res.data.map(item => {
-      //       let obj = {};
-      //       obj.id = item.id;
-      //       obj.ischios
-      //     })
-      //   }
-      // })
       // 缓存设置时的状态
       sessionStorage.setItem("resetCode", "1");
     },
@@ -1037,35 +778,6 @@ export default {
           this.$message.error("请填写建团必要参数");
         } else {
           // 判断一下是否勾选了课程类型而没有输入金额
-          let flagList = [];
-          for (let i in this.checkList) {
-            if (this.checkList[i].ischeck && !this.checkList[i].value) {
-              flagList.push(false);
-            } else {
-              flagList.push(true);
-            }
-          }
-
-          for (let i in this.newStudentList) {
-            if (
-              (this.newStudentList[i].ischeck &&
-                !this.newStudentList[i].value) ||
-              (this.newStudentList[i].ischeck &&
-                !this.newStudentList[i].nowValue)
-            ) {
-              flagList.push(false);
-            } else {
-              flagList.push(true);
-            }
-          }
-
-          let flag = flagList.every((item) => {
-            return item == true;
-          });
-          if (!flag) {
-            this.$message.error("课程价格不能为空");
-            return;
-          }
           // 验证通过
           this.$store.dispatch("topinfo", this.topFrom);
           // this.$store.dispatch("checkinfo", this.checkList);

src/views/teamBuild/signupList.vue

@@ -1212,6 +1212,7 @@ export default {
       this.$refs.visitForm.validate(res => {
         if (res) {
           this.visitForm.visitType = null;
+          this.visitForm.musicGroupId= this.id
           addVisit(cleanDeep(this.visitForm)).then(res => {
             if (res.code === 200) {
               this.$message.success('新增成功')

src/views/teamDetail/components/baseInfo.vue

@@ -2,7 +2,7 @@
   <div class='basea-container'>
     <div class="baseTop">
       <div class="left">
-        <el-form :inline="true"
+        <!-- <el-form :inline="true"
                  class="form-list"
                  label-width="110px"
                  :model="topForm">
@@ -31,7 +31,7 @@
             <el-input v-model.trim="topForm.repairUserName"
                       disabled></el-input>
           </el-form-item>
-          <!-- ownershipType  -->
+
           <el-form-item label="合作单位">
             <el-input v-model.trim="topForm.cooperate"
                       disabled></el-input>
@@ -68,8 +68,10 @@
                       disabled></el-input>
           </el-form-item>
 
-        </el-form>
-        <el-button type="text"
+        </el-form> -->
+        <teambaseinfo />
+        <div class="wrap">
+              <el-button type="text"
                    v-if="lookType!=='look'"
                    v-permission="'order/musicalListExport'"
                    @click="musicalListExport">订货清单导出</el-button>
@@ -78,12 +80,15 @@
                    v-if="lookType!=='look'"
                    v-permission="'order/musicalListDetailExport'"
                    @click="musicalListDetailExport">分发清单导出</el-button>
+        </div>
+
       </div>
     </div>
   </div>
 </template>
 <script>
 import { getMusicGroup, getMusicGroupProcess } from '@/api/buildTeam'
+import teambaseinfo from '@/views/teamBuild/components/teamBaseInfo'
 import axios from 'axios'
 import qs from 'qs'
 import {
@@ -91,6 +96,7 @@ import {
 } from '@/utils/auth'
 import load from '@/utils/loading'
 export default {
+  components:{teambaseinfo},
   name: "tbaseInfo",
   data () {
     return {
@@ -117,37 +123,37 @@ export default {
     }
   },
   created () {
-    this.init()
+    // this.init()
   },
   activated () {
-    this.init()
+    // this.init()
   },
   methods: {
-    init () {
-      this.teamid = this.$route.query.id;
-      this.lookType = this.$route.query.type
-      getMusicGroup({
-        musicGroupId: this.teamid
-      }).then(res => {
-        if (res.code == 200) {
-          this.topForm.num = res.data.id;
-          this.topForm.teacher = res.data.educationalTeacherName;
-          this.topForm.boss = res.data.directorUserName;
-          this.topForm.paymentPattern = res.data.paymentPattern;
-          this.topForm.paymentValidStartDate = res.data.paymentValidStartDate;
-          this.topForm.paymentValidEndDate = res.data.paymentValidEndDate;
-          this.topForm.cooperate = res.data.schoolName;
-          this.topForm.type = res.data.chargeTypeName;
-          this.topForm.section = res.data.organName;
-          this.topForm.add = res.data.address
-          this.topForm.teamTeacherName = res.data.teamTeacherName
-          this.topForm.ownershipType = res.data.ownershipType
-          this.topForm.repairUserName = res.data.repairUserName
-          // 差上课地点
-          this.$emit('getname', res.data.name)
-        }
-      })
-    },
+    // init () {
+    //   this.teamid = this.$route.query.id;
+    //   this.lookType = this.$route.query.type
+    //   getMusicGroup({
+    //     musicGroupId: this.teamid
+    //   }).then(res => {
+    //     if (res.code == 200) {
+    //       this.topForm.num = res.data.id;
+    //       this.topForm.teacher = res.data.educationalTeacherName;
+    //       this.topForm.boss = res.data.directorUserName;
+    //       this.topForm.paymentPattern = res.data.paymentPattern;
+    //       this.topForm.paymentValidStartDate = res.data.paymentValidStartDate;
+    //       this.topForm.paymentValidEndDate = res.data.paymentValidEndDate;
+    //       this.topForm.cooperate = res.data.schoolName;
+    //       this.topForm.type = res.data.chargeTypeName;
+    //       this.topForm.section = res.data.organName;
+    //       this.topForm.add = res.data.address
+    //       this.topForm.teamTeacherName = res.data.teamTeacherName
+    //       this.topForm.ownershipType = res.data.ownershipType
+    //       this.topForm.repairUserName = res.data.repairUserName
+    //       // 差上课地点
+    //       this.$emit('getname', res.data.name)
+    //     }
+    //   })
+    // },
     musicalListExport () { // 报表导出
       let url = '/api-web/order/musicalListExport'
       let data = {
@@ -260,7 +266,7 @@ export default {
   },
 }
 </script>
-<style lang="scss" scope>
+<style lang="scss" scoped>
 .basea-container {
   margin-top: 35px;
 
@@ -322,5 +328,8 @@ export default {
       }
     }
   }
+  .wrap {
+    padding-left: 60px;
+  }
 }
 </style>

src/views/teamDetail/teamList.vue

@@ -535,7 +535,7 @@ export default {
         case 'PROGRESS': {
           // 进行中
           // 调到乐团详情 teamDetails
-          this.$router.push({ path: `/business/teamDetails`, query: { status: row.status, id: row.id, name: row.name, search, rules, organId: row.organId } })
+          this.$router.push({ path: `/business/teamDetails`, query: { status: row.status, id: row.id, name: row.name, search, rules, organId: row.organId,type:'look' } })
           break
         }
         case 'CANCELED': {