Merge branch '11/24SAAS' of http://git.dayaedu.com/yonge/dy-admin-manager into 11/24SAAS

src/views/baseRulesClassSetting/index.vue

@@ -16,7 +16,7 @@
           <chargesList v-if="activeIndex == 3" />
         </el-tab-pane>
         <el-tab-pane
-          label="乐团课程设置"
+          label="乐团课时长设置"
           lazy
           name="1"
           v-if="permissionList.courseTimerSetting"

src/views/baseRulesManager/index.vue

@@ -7,14 +7,14 @@
     <div class="m-core">
       <!-- navMenu -->
       <tab-router v-model.trim="activeIndex" @tab-click="handleClick">
-        <el-tab-pane
+        <!-- <el-tab-pane
           label="乐团参数"
           lazy
           name="1"
           v-if="permission('/institutionDayaTeamRules')"
         >
           <dayaTeamRules v-if="activeIndex==1"/>
-        </el-tab-pane>
+        </el-tab-pane> -->
         <el-tab-pane
           label="商品库存规则"
           lazy

src/views/businessManager/shopManager/shopList.vue

@@ -654,9 +654,30 @@
         />
         <el-form-item
           label="市场价"
+           class="hiddenStart"
           prop="marketPrice"
           :label-width="formLabelWidth"
         >
+        <template slot="label">
+            <p style="position: relative">
+              <span style="color: #f56c6c; margin-right: 4px">*</span>
+              市场价
+              <el-tooltip placement="top" popper-class="mTooltip">
+                <div slot="content">
+                  商品标价，仅在商品购买时做展示，不以该价格向学员销售商品
+                </div>
+                <i
+                  class="el-icon-question"
+                  style="
+                    font-size: 18px;
+                    color: #f56c6c;
+                    position: relative;
+                    top: 2px;
+                  "
+                ></i>
+              </el-tooltip>
+            </p>
+          </template>
           <el-input
             type="number"
             placeholder="请输入市场价"
@@ -668,9 +689,30 @@
         </el-form-item>
         <el-form-item
           label="零售价"
+           class="hiddenStart"
           prop="discountPrice"
           :label-width="formLabelWidth"
         >
+         <template slot="label">
+            <p style="position: relative">
+              <span style="color: #f56c6c; margin-right: 4px">*</span>
+              零售价
+              <el-tooltip placement="top" popper-class="mTooltip">
+                <div slot="content">
+                  管理端APP、乐器维修时学员购买该商品的价格
+                </div>
+                <i
+                  class="el-icon-question"
+                  style="
+                    font-size: 18px;
+                    color: #f56c6c;
+                    position: relative;
+                    top: 2px;
+                  "
+                ></i>
+              </el-tooltip>
+            </p>
+          </template>
           <el-input
             type="number"
             placeholder="请输入零售价"
@@ -683,8 +725,27 @@
         <el-form-item
           label="商品团购价"
           prop="groupPurchasePrice"
+           class="hiddenStart"
           :label-width="formLabelWidth"
         >
+         <template slot="label">
+            <p style="position: relative">
+              <span style="color: #f56c6c; margin-right: 4px">*</span>
+              团购价
+              <el-tooltip placement="top" popper-class="mTooltip">
+                <div slot="content">乐团报名缴费时学员购买该商品的价格</div>
+                <i
+                  class="el-icon-question"
+                  style="
+                    font-size: 18px;
+                    color: #f56c6c;
+                    position: relative;
+                    top: 2px;
+                  "
+                ></i>
+              </el-tooltip>
+            </p>
+          </template>
           <el-input
             type="number"
             placeholder="请输入商品团购价"
@@ -792,7 +853,7 @@
           type="info"
         />
         <!--      :disabled="pageDisabled || pageType == 'update'" -->
-        <el-form-item
+        <!-- <el-form-item
           label="学员可见分部"
           prop="studentShowOrganId"
           :label-width="formLabelWidth"
@@ -813,17 +874,17 @@
               :value="item.id.toString()"
             ></el-option>
           </select-all>
-        </el-form-item>
+        </el-form-item> -->
         <!--   :disabled="pageDisabled || pageType == 'update'" -->
         <el-form-item
-          label="管理端可见分部"
+          label="管理端APP可售分部"
           prop="educationShowOrganId"
           :label-width="formLabelWidth"
         >
           <select-all
             v-model.trim="form.educationShowOrganId"
             filterable
-            placeholder="请选择管理端可见分部"
+            placeholder="管理端APP可售分部"
             style="width: 400px !important"
             multiple
             clearable
@@ -839,14 +900,14 @@
         </el-form-item>
         <!--   :disabled="pageDisabled || pageType == 'update'" -->
         <el-form-item
-          label="课程&AMR可见分部"
+          label="课程收费乐团可售分部"
           prop="courseFeeShowOrganId"
           :label-width="formLabelWidth"
         >
           <select-all
             v-model.trim="form.courseFeeShowOrganId"
             filterable
-            placeholder="请选择课程&AMR可见分部"
+            placeholder="课程收费乐团可售分部"
             style="width: 400px !important"
             multiple
             clearable
@@ -862,7 +923,7 @@
         </el-form-item>
         <!--  :disabled="pageDisabled || pageType == 'update'" -->
         <el-form-item
-          label="会员收费团可见分部"
+          label="会员收费乐团可售分部"
           prop="memberFeeShowOrganId"
           :label-width="formLabelWidth"
         >
@@ -884,15 +945,15 @@
           </select-all>
         </el-form-item>
         <!--  :disabled="pageDisabled || pageType == 'update'"  -->
-        <el-form-item
-          label="参与置换可见分部"
+        <el-form-item  v-if="tenantId==1"
+          label="乐器置换可售分部"
           prop="replacementShowOrganId"
           :label-width="formLabelWidth"
         >
           <select-all
             v-model.trim="form.replacementShowOrganId"
             filterable
-            placeholder="请选择参与置换可见分部"
+            placeholder="请选择乐器置换可售分部"
             style="width: 400px !important"
             multiple
             clearable
@@ -1743,4 +1804,13 @@ async  mounted() {
 .el-select__tags .el-tag.el-tag--info.el-tag--small.el-tag--light {
   max-width: 95px;
 }
+.hiddenStart {
+  /deep/.el-form-item__label:before {
+    content: "" !important;
+    position: absolute;
+    color: transparent;
+    margin-right: 4px;
+  }
+}
+
 </style>

src/views/categroyManager/insideSetting/branchManager.vue

@@ -92,7 +92,7 @@
           </el-table-column>
           <el-table-column align="center" prop="mobileNo" label="手机号">
           </el-table-column> -->
-          <el-table-column align="center" label="是否全职资源">
+          <el-table-column align="center" label="是否全职资源" v-if="tenantId ==1">
             <template slot-scope="scope">
               {{ scope.row.fullJobResource ? "是" : "否" }}
             </template>
@@ -232,6 +232,7 @@
             </el-select>
           </el-form-item>
           <el-form-item
+          v-if="tenantId ==1"
             label="是否全职资源"
             prop="fullJobResource"
             :label-width="formLabelWidth"
@@ -433,9 +434,12 @@ export default {
       },
       basdisabled: false,
       actionRow: null,
+      tenantId:null
     };
   },
   async mounted() {
+     this.tenantId = this.$helpers.tenantId
+     console.log(this.tenantId)
     this.getList(); // 获取列表数据
 
     // 获取当前用户分部
@@ -443,6 +447,7 @@ export default {
     if (this.selects.branchs.length <= 0) {
       this.$bus.$emit("showguide", ["organ"]);
     }
+
   },
   methods: {
     onDelete(rows) {

src/views/categroyManager/specialSetup/courseTimerSetting.vue

@@ -101,7 +101,7 @@
       />
     </div>
     <el-dialog
-      :title="isAdd ? '新增课程时长' : '修改课程时长'"
+      :title="isAdd ? '新增课时时长' : '修改课时时长'"
       class="courseMask"
       width="600px"
       :visible.sync="courseVisible"

src/views/categroyManager/specialSetup/modals/courseTimeForm.vue

@@ -64,9 +64,11 @@
           v-if="inputVisible"
           v-model.trim="inputValue"
           ref="saveTagInput"
-          style="width: 100px"
+          style="width: 160px"
           @keyup.enter.native="handleInputConfirm"
+          @blur="handleInputConfirm"
         >
+         <template slot="append">分钟</template>
         </el-input>
         <el-button
           v-if="!inputVisible"
@@ -164,7 +166,7 @@ export default {
         }
       });
 
-    
+
     },
   },
   watch: {
@@ -180,4 +182,4 @@ export default {
     margin-right: 4px;
   }
 }
-</style>
+</style>

src/views/categroyManager/vipChargeSeting.vue

@@ -44,7 +44,9 @@
                 <el-input
                 :disabled='scope.row.onlineDis'
                   v-model.trim="scope.row.onlineClassesUnitPrice"
-                ></el-input>
+                >
+                  <template slot="append">元/节</template>
+                </el-input>
               </div>
             </template>
           </el-table-column>
@@ -53,7 +55,7 @@
               <div>
                 <el-input
                   v-model.trim="scope.row.offlineClassesUnitPrice"
-                ></el-input>
+                > <template slot="append">元/节</template></el-input>
               </div>
             </template>
           </el-table-column>

src/views/couponManager/couponUpdate.vue

@@ -53,8 +53,8 @@
               clearable
               style="width: 355px !important"
             >
-              <el-option :value="0" label="主动领取"></el-option>
-              <el-option :value="1" label="手动发放"></el-option>
+              <el-option :value="0" label="学员主动领取"></el-option>
+              <el-option :value="1" label="后台手动发放"></el-option>
             </el-select>
           </el-form-item>
         </el-col>

src/views/courseRulersManager/components/teamRules.vue

@@ -4,6 +4,74 @@
       <el-form :inline="true" :model="form" ref="form">
         <el-alert
           style="margin: 20px 0"
+          title="预报名规则"
+          :closable="false"
+          type="info"
+        >
+        </el-alert>
+        <el-row>
+          <el-form-item
+            prop="132"
+            :rules="[
+              {
+                required: false,
+                pattern: /^\d+$/,
+                message: '请输入正确的人数',
+              },
+            ]"
+          >
+            乐团预报名人数达到
+            <el-input v-model="form['132']" placeholder="请输入人数">
+              <template slot="append">人</template>
+            </el-input>
+            时，可将乐团状态变更为创建缴费中。
+          </el-form-item>
+        </el-row>
+        <el-alert
+          style="margin: 20px 0"
+          title="报名缴费规则"
+          :closable="false"
+          type="info"
+        >
+        </el-alert>
+        <el-row>
+          <el-form-item
+            prop="134"
+            :rules="[
+              {
+                required: false,
+                pattern: /^\d+$/,
+                message: '请输入正确的人数',
+              },
+            ]"
+          >
+            报名缴费阶段乐团若未合并学员，缴费人数达到
+            <el-input v-model="form['134']" placeholder="请输入人数">
+              <template slot="append">人</template>
+            </el-input>
+            时，可确认开团。
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item
+            prop="135"
+            :rules="[
+              {
+                required: false,
+                pattern: /^\d+$/,
+                message: '请输入正确的人数',
+              },
+            ]"
+          >
+            报名缴费阶段乐团若合并学员，缴费人数达到
+            <el-input v-model="form['135']" placeholder="请输入人数">
+              <template slot="append">人</template>
+            </el-input>
+            时，可确认开团。
+          </el-form-item>
+        </el-row>
+        <el-alert
+          style="margin: 20px 0"
           title="乐团筹备规则"
           :closable="false"
           type="info"
@@ -22,7 +90,7 @@
             ]"
           >
             订单支付
-            <el-input v-model="form['76']"  placeholder="请输入天数">
+            <el-input v-model="form['76']" placeholder="请输入天数">
               <template slot="append">天</template>
             </el-input>
             后自动更新为已收货，不设置时立即更新。
@@ -52,9 +120,9 @@
           >
             <span style="color: #f56c6c; margin-right: 4px">*</span>
             乐团各声部不购买团练宝或乐器就可以直接入团的人数
-            <el-input v-model="form[136]"  placeholder="请输入人数">
-              <template slot="append">人</template>
-            </el-input>。
+            <el-input v-model="form[136]" placeholder="请输入人数">
+              <template slot="append">人</template> </el-input
+            >。
           </el-form-item>
         </el-row>
         <el-row>
@@ -74,11 +142,7 @@
           >
             <span style="color: #f56c6c; margin-right: 4px">*</span>
             会员团每学期赠送
-            <el-input
-              v-model="form[133]"
-
-              placeholder="请输入分钟数"
-            >
+            <el-input v-model="form[133]" placeholder="请输入分钟数">
               <template slot="append">分钟</template>
             </el-input>
             课程。
@@ -96,7 +160,7 @@
             ]"
           >
             每学期结束前
-            <el-input v-model="form[99]" >
+            <el-input v-model="form[99]">
               <template slot="append">天</template>
             </el-input>
             提醒教务老师安排下学期课程。
@@ -122,14 +186,20 @@
         </el-row> -->
       </el-form>
 
-      <el-button  type="primary" @click="save" class="saveBtn"
-       v-if="!isPlatform"
-      v-permission="'sysTenantConfig/batchUpSet_teamRules'"
+      <el-button
+        type="primary"
+        @click="save"
+        class="saveBtn"
+        v-if="!isPlatform"
+        v-permission="'sysTenantConfig/batchUpSet_teamRules'"
         >保存</el-button
       >
-      <el-button  type="primary" @click="save" class="saveBtn"
-      v-else
-      v-permission="'sysConfig/batchUpdate_teamRules'"
+      <el-button
+        type="primary"
+        @click="save"
+        class="saveBtn"
+        v-else
+        v-permission="'sysConfig/batchUpdate_teamRules'"
         >保存</el-button
       >
     </div>
@@ -236,7 +306,7 @@ export default {
       });
     },
     save() {
-        if (this.isPlatform) {
+      if (this.isPlatform) {
         this.savePlatform();
       } else {
         this.saveInstitution();

src/views/resetTeaming/components/payInfoDetail.vue

@@ -181,7 +181,7 @@
                   }
                 "
               >
-                <p>乐团活动</p>
+                <p>乐团小课</p>
                 <el-checkbox
                   v-model="teamActive"
                   :disabled="teamActiveDisabled"
@@ -308,7 +308,7 @@ export default {
         leBaoList: [{}],
         activeList: [{}],
 
-        leixing: "2",
+        leixing: "1",
       },
       teamCourse: false,
       teamCourseDisabled: false,
@@ -528,6 +528,10 @@ export default {
         // this.charges =[];
         if (this.charges.length <= 0) {
           this.submitList.push("teamCourseType");
+        }else{
+          if(this.form.leixing == 1){
+            this.$set(this.form,'musicGroupOrganizationCourseSettingId',this.charges[0].id)
+          }
         }
       } catch (error) {}
     },

src/views/resetTeaming/modals/payTeamActive.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="teamCourseList">
-    <p class="coreTitle">乐团活动<span class="dot"></span></p>
+    <p class="coreTitle">乐团小课<span class="dot"></span></p>
     <el-table
       :data="form.activeList"
       style="width: 100% !important; background: #f9f9f9"

src/views/studentManager/studentList.vue

@@ -1021,7 +1021,7 @@ export default {
     onCreateQRCode() {
       // 生成报名二维码
       this.qrcodeStatus = true;
-      this.qrcodeUrl = vaildStudentUrl() + `/#/queryStudentPer`;
+      this.qrcodeUrl = vaildStudentUrl() + `/#/queryStudentPer?tenantId=`+ this.tenantId;
     },
     formatProtocol(version) {
       let str = "（含课程）";

src/views/teamBuild/components/teamBaseInfo.vue

@@ -760,6 +760,8 @@ export default {
           }else{
             if(!this.topFrom.section){
                this.$set(this.topFrom,'section',this.sectionList[0].id)
+               this.changeSection(this.sectionList[0].id)
+               // diao
             }
 
           }
@@ -780,7 +782,10 @@ export default {
       this.topFrom.school = "";
       this.topFrom.address = "";
       // 发请求 根据分部id 查询所有员工
-      this.getBaseList(val);
+      if(val){
+         this.getBaseList(val);
+      }
+
     },
     async getBaseList(val) {
       // 合作单位