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

src/api/specialSetting.js

@@ -48,6 +48,15 @@ export function getParentArea (data) {
   })
 }
 
+// 查询所有子集科目
+export function subSubjectList (data) {
+  return request({
+    url: api + `/subject/search`,
+    method: 'get',
+    params: data
+  })
+}
+
 // 分页查询科目列表
 export function subjectListTree (data) {
   return request({

src/router/index.js

@@ -508,7 +508,9 @@ export const asyncRoutes = {
   // 操作手册管理
   operationManual:() => import('@/views/operationManual'),
   // 产品服务
-  productService: () => import('@/views/productService')
+  productService: () => import('@/views/productService'),
+  // 声部分类列表
+  subjectCategroyList:() => import('@/views/categroyManager/subjectCategroyList')
 }
 
 export default router

src/views/businessManager/shopManager/shopOperation.vue

@@ -121,7 +121,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="是否库存预警" prop="stockWarning">
+        <el-form-item label="是否库存预警" prop="stockWarning" >
           <el-select
             v-model="form.stockWarning"
             placeholder="请选择库存预警"
@@ -138,7 +138,28 @@
           class="alert"
           type="info"
         />
-        <el-form-item label="市场价" prop="marketPrice">
+
+        <el-form-item label="市场价" prop="marketPrice" class="hiddenStart">
+          <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="请输入市场价"
@@ -148,7 +169,27 @@
             style="width: 220px"
           ></el-input>
         </el-form-item>
-        <el-form-item label="零售价" prop="discountPrice">
+        <el-form-item label="零售价" prop="discountPrice" class="hiddenStart">
+          <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="请输入零售价"
@@ -158,7 +199,25 @@
             style="width: 220px"
           ></el-input>
         </el-form-item>
-        <el-form-item label="商品团购价" prop="groupPurchasePrice">
+        <el-form-item label="商品团购价" prop="groupPurchasePrice" class="hiddenStart">
+          <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="请输入商品团购价"
@@ -199,7 +258,7 @@
             placeholder="请选择分部"
             style="width: 400px !important"
             multiple
-            :disabled="pageDisabled "
+            :disabled="pageDisabled"
             clearable
           >
             <el-option
@@ -644,9 +703,15 @@ export default {
             tempForm.replacementShowOrganId =
               tempForm.replacementShowOrganId.join(",");
           }
-          if(!tempForm.studentShowOrganId&&!tempForm.educationShowOrganId&&!tempForm.courseFeeShowOrganId&&!tempForm.memberFeeShowOrganId&&!tempForm.replacementShowOrganId){
-            this.$message.error('请至少选择一个可见分部')
-            return
+          if (
+            !tempForm.studentShowOrganId &&
+            !tempForm.educationShowOrganId &&
+            !tempForm.courseFeeShowOrganId &&
+            !tempForm.memberFeeShowOrganId &&
+            !tempForm.replacementShowOrganId
+          ) {
+            this.$message.error("请至少选择一个可见分部");
+            return;
           }
           if (this.pageType == "create" || this.pageType == "copy") {
             if (tempForm.id) {
@@ -739,23 +804,23 @@ export default {
             // if (result.organIdList) {
             //   organIdList = result.organIdList.split(",");
             // }
-               let studentShowOrganId = [];
+            let studentShowOrganId = [];
             if (result.studentShowOrganId) {
               studentShowOrganId = result.studentShowOrganId.split(",");
             }
-                let educationShowOrganId = [];
+            let educationShowOrganId = [];
             if (result.educationShowOrganId) {
               educationShowOrganId = result.educationShowOrganId.split(",");
             }
-                let courseFeeShowOrganId = [];
+            let courseFeeShowOrganId = [];
             if (result.courseFeeShowOrganId) {
               courseFeeShowOrganId = result.courseFeeShowOrganId.split(",");
             }
-                let memberFeeShowOrganId = [];
+            let memberFeeShowOrganId = [];
             if (result.memberFeeShowOrganId) {
               memberFeeShowOrganId = result.memberFeeShowOrganId.split(",");
             }
-                let replacementShowOrganId = [];
+            let replacementShowOrganId = [];
             if (result.replacementShowOrganId) {
               replacementShowOrganId = result.replacementShowOrganId.split(",");
             }
@@ -872,11 +937,19 @@ replacementShowOrganId: 6,7 */
 };
 </script>
 <style lang="scss" scoped>
+.hiddenStart {
+  /deep/.el-form-item__label:before {
+    content: "" !important;
+    position: absolute;
+    color: transparent;
+    margin-right: 4px;
+  }
+}
+
 .alert {
   margin-bottom: 22px;
 }
 
-
 .el-row {
   margin-top: 40px;
 }

src/views/categroyManager/generalSettings/overallManagerTwo.vue

@@ -12,29 +12,22 @@
         >
         </el-alert>
         <el-row>
+          <!-- (双乾: YQPAY 汇付: ADAPAY) -->
           <el-form-item prop="68">
-            默认收款渠道(双乾: YQPAY 汇付: ADAPAY):
-            <el-input
-              style="width: 180px"
-              class="marginLR5"
-              v-model="form['68']"
-              placeholder="请输入渠道"
-              
-            >
-            </el-input>
+            默认收款渠道:
+            <el-select v-model="form['68']"  placeholder="请选择渠道">
+              <el-option label="双乾" value="YQPAY"></el-option>
+               <el-option label="汇付" value="ADAPAY"></el-option>
+            </el-select>
           </el-form-item>
         </el-row>
         <el-row>
           <el-form-item prop="69">
-            是否用收费配置(1:使用 0:不使用):
-            <el-input
-              style="width: 180px"
-              class="marginLR5"
-              v-model="form['69']"
-              placeholder="请输入渠道"
-              
-            >
-            </el-input>
+            是否用收费配置:
+               <el-select v-model="form['69']"  placeholder="请选择渠道">
+              <el-option label="使用" value="1"></el-option>
+               <el-option label="不适用" value="0"></el-option>
+            </el-select>
           </el-form-item>
         </el-row>
         <el-row>
@@ -47,7 +40,7 @@
               format="yyyy-MM-dd HH:mm:ss"
               value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择始执行时间"
-              
+
             >
             </el-date-picker>
           </el-form-item>

src/views/categroyManager/globalSubjects.vue

@@ -1,64 +1,257 @@
+<!--  -->
 <template>
   <div class="m-container">
     <h2>
       <div class="squrt"></div>
       声部设置
     </h2>
+
     <div class="m-core">
-      <!-- navMenu -->
-        <tab-router
-          v-model.trim="activeIndex"
-          type="card"
-          @tab-click="handleClick"
-        >
-          <el-tab-pane
-            label="声部设置(对内)"
-            lazy
-            name="0"
-            v-if="permissionList.musicalManager"
-          >
-            <musicalManager v-if="activeIndex == 0" />
-          </el-tab-pane>
-          <el-tab-pane
-            label="声部设置(对外)"
-            lazy
-            name="1"
-            v-if="permissionList.musicalManagerOut"
+      <save-form
+        :inline="true"
+        :model="searchForm"
+        @submit="search"
+        @reset="onReSet"
+      >
+        <el-form-item>
+          <el-input
+            v-model.trim="searchForm.search"
+            clearable
+            @keyup.enter.native="search"
+            placeholder="请输入编号、名称"
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-select
+            v-model="searchForm.parentSubjectId"
+            placeholder="选择声部分类"
+            prop="parentSubjectId"
           >
-            <musicalManagerOut v-if="activeIndex == 1" />
-          </el-tab-pane>
-        </tab-router>
+            <el-option
+              v-for="item in fatherList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </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-form-item>
+      </save-form>
+      <auth auths="subject/upset/insert" style="margin-bottom:20px;">
+        <el-button @click="addCategory" type="primary">添加</el-button>
+      </auth>
+      <div class="tableWrap">
+        <el-table
+          style="width: 100%"
+          :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+          :data="tableList"
+        >
+          <el-table-column
+            align="center"
+            prop="id"
+            label="分类编号"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            prop="name"
+            label="分类名称"
+          ></el-table-column>
+          <el-table-column align="center" prop="name" label="操作">
+            <template slot-scope="scope">
+              <div>
+                <!-- v-permission="'subject/upset/del' -->
+                <auth auths="subject/upset/insert">
+                  <el-button
+                    type="text"
+                    @click="resetSubjectCategory(scope.row)"
+                    >修改</el-button
+                  >
+                </auth>
+                <auth auths="subject/upset/del">
+                  <el-button
+                    type="text"
+                    @click="removeSubjectCategory(scope.row)"
+                    >删除</el-button
+                  >
+                </auth>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="name" label="分类图片">
+            <template slot-scope="scope">
+              <el-image
+                v-if="scope.row.img"
+                style="width: 60px; height: 60px"
+                fit="cover"
+                :src="scope.row.img.split(',')[0]"
+                :previewSrcList="scope.row.img.split(',')"
+              >
+              </el-image>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination
+          :total.sync="rules.total"
+          :page.sync="rules.page"
+          :limit.sync="rules.limit"
+          :page-sizes="rules.page_size"
+          @pagination="getList"
+        />
+      </div>
     </div>
+    <el-dialog
+      title="修改分类"
+      :visible.sync="categoryVisible"
+      width="500px"
+      v-if="categoryVisible"
+    >
+      <el-form :model="form" :inline="true" ref="form">
+        <el-form-item
+          prop="name"
+          label="分类名称"
+          :rules="{
+            required: true,
+            message: '请输入分类名称',
+            trigger: 'change,blur',
+          }"
+        >
+          <el-input v-model="form.name"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="categoryVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submitReset">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
+
 <script>
-import musicalManager from "./specialSetup/musicalManager";
-import musicalManagerOut from "./specialSetup/musicalManagerOut";
-import { permission } from "@/utils/directivePage";
+import axios from "axios";
+import { getToken } from "@/utils/auth";
+import pagination from "@/components/Pagination/index";
+import load from "@/utils/loading";
+import { subjectListTree, subjectUpset,subSubjectList } from "@/api/specialSetting";
 export default {
-  components: {
-    musicalManager,
-    musicalManagerOut
-  },
-  name: "globalConfig",
+  components: { pagination },
   data() {
     return {
-      activeIndex: "0",
-      permissionList: {
-        musicalManager: permission("/globalConfig/musicalManager"),
-        musicalManagerOut: permission("/globalConfig/musicalManagerOut")
-      }
+      searchForm: {
+        search: null,
+        parentSubjectId: null,
+      },
+      form: {
+        name: null,
+        id: null,
+      },
+      tableList: [],
+      organList: [],
+      rules: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50], // 选择限制显示条数
+      },
+      categoryVisible: false,
+      fatherList: [],
     };
   },
+  //生命周期 - 创建完成（可以访问当前this实例）
+  created() {},
+  //生命周期 - 挂载完成（可以访问DOM元素）
+  mounted() {
+    // 获取分部
+
+    this.init();
+  },
   methods: {
-    handleClick(val) {
-      this.activeIndex = val.name;
-    }
-  }
+    init() {
+      this.getList();
+      this.getFatherList()
+    },
+    getFatherList() {
+      subjectListTree({
+        delFlag: "NO",
+        rows: 9999,
+        page: 1,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.fatherList = res.data.rows;
+        }
+      });
+    },
+    getList() {
+      subSubjectList({...this.searchForm}).then(res=>{
+
+      })
+    },
+    search() {
+      this.rules.page = 1;
+      this.getList();
+    },
+    onReSet() {
+      this.$nextTick(()=>{
+        this.search()
+      })
+    },
+    resetSubjectCategory(row) {
+      this.form.name = row.name;
+      this.form.id = row.id;
+      this.categoryVisible = true;
+    },
+    removeSubjectCategory(row) {
+      this.$confirm("是否确认删除分类", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        subjectUpset({
+          delFlag: "YES",
+          id: row.id,
+        }).then((res) => {
+          this.messageTips("删除", res);
+          this.search();
+        });
+      });
+    },
+    messageTips(title, res) {
+      if (res.code == 200) {
+        this.$message.success(title + "成功");
+      } else {
+        this.$message.error(res.msg);
+      }
+    },
+    submitReset() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          subjectUpset({
+            parentSubjectId: 0,
+            tenantId: 1,
+            name: this.form.name,
+            id: this.form.id,
+          }).then((res) => {
+            if (res.code == 200) {
+              this.messageTips("修改", res);
+              this.categoryVisible = false;
+              this.getList();
+            }
+          });
+        }
+      });
+    },
+    addCategory() {
+      this.form.id = null;
+      this.form.name = null;
+      this.categoryVisible = true;
+    },
+  },
 };
 </script>
-<style lang="scss" scoped>
-/deep/.m-container {
-  padding: 0 10px 40px;
-}
+<style lang='scss' scoped>
 </style>
+

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

@@ -0,0 +1,86 @@
+<template>
+  <div>
+    <el-form :model="courseTimeForm" ref="courseTimeForm" >
+      <el-form-item
+        label="分部"
+        prop="organId"
+        :label-width="formLabelWidth"
+        :rules="[{ required: true, message: '请选择分部', trigger: 'blur' }]"
+      >
+        <el-select
+          style="width: 100% !important"
+          class="multiple"
+          v-model.trim="courseTimeForm.organId"
+          filterable
+          clearable
+          placeholder="请选择分部"
+        >
+          <el-option
+            v-for="(item, index) in organList"
+            :key="index"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        label="课程类型"
+        prop="courseType"
+        :label-width="formLabelWidth"
+        :rules="[
+          { required: true, message: '请选择课程类型', trigger: 'blur' },
+        ]"
+      >
+        <el-select
+          style="width: 100% !important"
+          class="multiple"
+          v-model.trim="courseTimeForm.courseType"
+          filterable
+          clearable
+          placeholder="课程类型"
+        >
+          <el-option
+            v-for="(item, index) in courseType"
+            :key="index"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="课程课时" prop="timer" :label-width="formLabelWidth">
+        <el-tag
+          :key="index"
+          effect="dark"
+          type="info"
+          v-for="(tag, index) in dynamicTags"
+          closable
+          :disable-transitions="false"
+          @close="handleClose(tag)"
+        >
+          {{ tag }}
+        </el-tag>
+        <el-input
+          class="input-new-tag"
+          v-if="inputVisible"
+          v-model.trim="inputValue"
+          ref="saveTagInput"
+          style="width: 100px"
+          @keyup.enter.native="handleInputConfirm"
+        >
+        </el-input>
+        <el-button
+          v-if="!inputVisible"
+          class="button-new-tag"
+          @click="showInput"
+          >+ 添加</el-button
+        >
+        <el-button
+          v-if="inputVisible"
+          class="button-new-tag"
+          @click="handleInputConfirm"
+          >保存</el-button
+        >
+      </el-form-item>
+    </el-form>
+  </div>
+</template>

src/views/categroyManager/subjectCategroyList.vue

@@ -0,0 +1,235 @@
+<!--  -->
+<template>
+  <div class="m-container">
+    <h2>
+      <div class="squrt"></div>
+      声部分类管理
+    </h2>
+       <auth auths="subject/upset/insert">
+    <el-button @click="addCategory" type="primary">添加</el-button>
+       </auth>
+    <div class="m-core">
+      <!-- <save-form
+        :inline="true"
+        :model="searchForm"
+        @submit="search"
+        @reset="onReSet"
+      >
+        <el-form-item>
+          <el-input
+            v-model.trim="searchForm.search"
+            clearable
+            @keyup.enter.native="search"
+            placeholder="请输入乐团编号"
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-input
+            v-model.trim="searchForm.search"
+            @keyup.enter.native="search"
+            placeholder="请输入乐团编号"
+          ></el-input>
+        </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-form-item> -->
+      <!-- </save-form> -->
+      <div class="tableWrap">
+        <el-table
+          style="width: 100%"
+          :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+          :data="tableList"
+        >
+          <el-table-column
+            align="center"
+            prop="id"
+            label="分类编号"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            prop="name"
+            label="分类名称"
+          ></el-table-column>
+          <el-table-column align="center" prop="name" label="操作">
+            <template slot-scope="scope">
+              <div>
+                <!-- v-permission="'subject/upset/del' -->
+                <auth auths="subject/upset/insert">
+                <el-button type="text" @click="resetSubjectCategory(scope.row)"
+                  >修改</el-button
+                >
+                </auth>
+                   <auth auths="subject/upset/del">
+                <el-button type="text" @click="removeSubjectCategory(scope.row)"
+                  >删除</el-button
+                >
+                   </auth>
+              </div>
+            </template>
+          </el-table-column>
+          <!-- <el-table-column align="center" prop="name" label="分类图片">
+            <template slot-scope="scope">
+              <el-image
+                v-if="scope.row.img"
+                style="width: 60px; height: 60px"
+                fit="cover"
+                :src="scope.row.img.split(',')[0]"
+                :previewSrcList="scope.row.img.split(',')"
+              >
+              </el-image>
+            </template>
+          </el-table-column> -->
+        </el-table>
+        <pagination
+          :total.sync="rules.total"
+          :page.sync="rules.page"
+          :limit.sync="rules.limit"
+          :page-sizes="rules.page_size"
+          @pagination="getList"
+        />
+      </div>
+    </div>
+    <el-dialog
+      title="修改分类"
+      :visible.sync="categoryVisible"
+      width="500px"
+      v-if="categoryVisible"
+    >
+      <el-form :model="form" :inline="true" ref="form">
+        <el-form-item
+        prop="name"
+          label="分类名称"
+          :rules="{
+            required: true,
+            message: '请输入分类名称',
+            trigger: 'change,blur',
+          }"
+        >
+          <el-input v-model="form.name"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="categoryVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submitReset">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import axios from "axios";
+import { getToken } from "@/utils/auth";
+import pagination from "@/components/Pagination/index";
+import load from "@/utils/loading";
+import { subjectListTree,subjectUpset } from "@/api/specialSetting";
+export default {
+  components: { pagination },
+  data() {
+    return {
+      searchForm: {
+        search: null,
+      },
+      form: {
+        name: null,
+        id: null,
+      },
+      tableList: [],
+      organList: [],
+      rules: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50], // 选择限制显示条数
+      },
+      categoryVisible: false,
+    };
+  },
+  //生命周期 - 创建完成（可以访问当前this实例）
+  created() {},
+  //生命周期 - 挂载完成（可以访问DOM元素）
+  mounted() {
+    // 获取分部
+
+    this.init();
+  },
+  methods: {
+    init() {
+      this.getList();
+    },
+    getList() {
+      subjectListTree({
+        delFlag: "NO",
+        tenantId: 1,
+        rows: this.rules.limit,
+        page: this.rules.page,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.tableList = res.data.rows;
+          this.rules.total = res.data.total;
+        }
+      });
+    },
+    search() {
+      this.rules.page = 1;
+      this.getList();
+    },
+    onReSet() {},
+    resetSubjectCategory(row) {
+      console.log(row);
+      this.form.name = row.name;
+      this.form.id = row.id;
+      this.categoryVisible = true;
+    },
+    removeSubjectCategory(row) {
+      this.$confirm("是否确认删除分类", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        subjectUpset({
+          delFlag: "YES",
+          id: row.id,
+        }).then((res) => {
+          this.messageTips("删除", res);
+          this.search()
+        });
+      });
+    },
+    messageTips(title, res) {
+      if (res.code == 200) {
+        this.$message.success(title + "成功");
+      } else {
+        this.$message.error(res.msg);
+      }
+    },
+    submitReset() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          subjectUpset({
+            parentSubjectId: 0,
+            tenantId: 1,
+            name: this.form.name,
+            id:this.form.id
+          }).then((res) => {
+
+            if (res.code == 200) {
+                this.messageTips("修改", res);
+             this.categoryVisible = false;
+             this.getList()
+            }
+          });
+        }
+      });
+    },
+    addCategory(){
+      this.form.id = null;
+      this.form.name = null;
+      this.categoryVisible = true;
+    }
+  },
+};
+</script>
+<style lang='scss' scoped>
+</style>

src/views/couponManager/couponUpdate.vue

@@ -124,13 +124,13 @@
         </el-col>
         <el-col style="width: 395px" v-if="form.type == 'FULL_REDUCTION'">
           <el-form-item
-            label="达标金额"
+            label="满减金额"
             prop="fullAmount"
-            :rules="[{ required: true, message: '请输入达标金额' }]"
+            :rules="[{ required: true, message: '请输入满减金额' }]"
           >
             <el-input
               v-model="form.fullAmount"
-              placeholder="请输入达标金额"
+              placeholder="请输入满减金额"
               :disabled="isDisabled"
             >
               <template slot="append">元</template>

src/views/couponManager/index.vue

@@ -166,7 +166,7 @@
           >
             <template slot="header" slot-scope="slot">
               <div class="titleCell">
-                <span>达标金额</span>
+                <span>满减金额</span>
                 <el-tooltip placement="top" popper-class="mTooltip">
                   <div slot="content">消费满多少才可使用</div>
                   <i

src/views/courseRulersManager/components/offlineTeamRules.vue

@@ -589,6 +589,63 @@
             >。
           </el-form-item>
         </el-row>
+        <p class="subtitle">点名GPS定位：</p>
+        <el-row>
+          <el-form-item
+            prop="212"
+            :rules="[
+              {
+                required: true,
+                message: '请输入时间',
+                trigger: 'blur',
+              },
+              {
+                pattern: /^[1-9][0-9]*$/,
+                message: '请输入金额',
+              },
+            ]"
+          >
+            <span style="color: #f56c6c; margin-right: 4px">*</span>
+            VIP线下课点名地点未在教学点范围内，扣减课酬
+            <el-input v-model="form['212']" placeholder="请输入金额"  class="chiose">
+              <template slot="append">
+                <el-select class="append" v-model.trim="form['213']">
+                  <el-option label="元" value="1"> </el-option>
+                  <el-option label="%" value="2"> </el-option>
+                </el-select>
+              </template> </el-input
+            >。
+          </el-form-item>
+        </el-row>
+
+        <el-row>
+          <el-form-item
+            prop="214"
+            :rules="[
+              {
+                required: true,
+                message: '请输入金额',
+                trigger: 'blur',
+              },
+              {
+                pattern: /^[1-9][0-9]*$/,
+                message: '请输入正确的金额',
+              },
+            ]"
+          >
+            <span style="color: #f56c6c; margin-right: 4px">*</span>
+            VIP线下课未点名，扣减课酬
+            <el-input v-model="form['214']" placeholder="请输入金额"  class="chiose">
+              <template slot="append">
+                <el-select class="append" v-model.trim="form['215']">
+                  <el-option label="元" value="1"> </el-option>
+                  <el-option label="%" value="2"> </el-option>
+                </el-select>
+              </template> </el-input
+            >。
+          </el-form-item>
+        </el-row>
+
         <el-alert
           style="margin: 10px 0"
           title="试用期课酬"
@@ -621,7 +678,7 @@
           <el-form-item
             prop="184"
             :rules="[
-            {
+              {
                 required: true,
                 message: '请输入时间',
                 trigger: 'blur',
@@ -633,7 +690,7 @@
               },
             ]"
           >
-           <span style="color: #f56c6c; margin-right: 4px">*</span>
+            <span style="color: #f56c6c; margin-right: 4px">*</span>
             老师在课程结束后
             <el-input v-model="form['184']" placeholder="请输入时间">
               <template slot="append">天</template> </el-input
@@ -644,7 +701,7 @@
           <el-form-item
             prop="185"
             :rules="[
-            {
+              {
                 required: true,
                 message: '请输入时间',
                 trigger: 'blur',
@@ -656,7 +713,7 @@
               },
             ]"
           >
-           <span style="color: #f56c6c; margin-right: 4px">*</span>
+            <span style="color: #f56c6c; margin-right: 4px">*</span>
             管理员可以在次月
             <el-input v-model="form['185']" placeholder="请输入时间">
               <template slot="append">号</template> </el-input

src/views/resetTeaming/components/payInfoDetail.vue

@@ -21,6 +21,7 @@
               :rules="[
                 { required: true, message: '请选择缴费时间', trigger: 'blur' },
               ]"
+              ref="paymentDate"
             >
               <template slot="label">
                 <p style="position: relative">
@@ -58,6 +59,7 @@
                 :rules="[
                   { required: true, message: '请输入备注', trigger: 'blur' },
                 ]"
+                 ref="memo"
               >
                 <template slot="label">
                   <p style="position: relative">
@@ -139,7 +141,7 @@
                 ></el-checkbox>
               </div>
               <div
-                v-if="isShowLeBao"
+                v-if="isShowLeBao&&tenantId==1"
                 class="checkBtn"
                 :class="[
                   leBao ? 'active' : '',
@@ -200,6 +202,7 @@
                 @priceChange="priceChange"
               />
               <payMember
+                ref="payMember"
                 :memberRankList="memberRankList"
                 @moneyChange="syncAllMoney"
                 @priceChange="priceChange"
@@ -339,10 +342,16 @@ export default {
       dialogSubjectVisible: false, // 预览
       dialogSubjectList: [],
       activeName: null,
-      preViewData: {}
+      preViewData: {},
+      tenantId:null
     };
   },
   mounted() {
+        let tenantConfig = sessionStorage.getItem('tenantConfig')
+    tenantConfig = tenantConfig ? JSON.parse(tenantConfig) : {}
+    if(tenantConfig.tenantId && tenantConfig.tenantId != 'undefined') {
+      this.tenantId = tenantConfig.tenantId
+    }
     this.organizationCourseUnitPriceSettings = JSON.parse(
       localStorage.getItem("organizationCourseUnitPriceSettings")
     );
@@ -378,13 +387,14 @@ export default {
         this.teamActive = false;
         this.leBaoDisabled = true;
         this.teamActiveDisabled = true;
+      } else {
       }
       await this.getCharges(); // 续费的选择缴费类型
       await this.formatCourse(); // 临时加课的类型选择以及价格
       await this.getMemberList(); // 获取会员(团练保信息)
       await this.getLeBao(); // 获取乐保
       await this.getActive(); // 获取活动
-      await this.getMemberRules()
+      await this.getMemberRules();
       if (this.$route.query.calenderId) {
         // 说明是修改  查缴项目详情
         getMusicGroupPaymentCalenderDetail({
@@ -471,7 +481,6 @@ export default {
             if (itemValue) {
               this.rulesForm = itemValue;
             }
-
           }
         });
       } catch (e) {
@@ -647,7 +656,7 @@ export default {
       );
     },
     submitForm() {
-      this.$refs.form.validate(async (isok) => {
+      this.$refs.form.validate(async (isok,obj) => {
         if (isok) {
           const preViewData = this.formatPreviewData()
           this.preViewData = preViewData
@@ -697,12 +706,38 @@ export default {
               console.log(e);
             }
           }
+        } else {
+          this.$nextTick(() => {
+            this.scrollView(obj);
+          });
         }
       });
     },
+    scrollView(object) {
+
+      for (const i in object) {
+        let dom = this.$refs[i];
+        // 这里是针对遍历的情况（多个输入框），取值为数组
+        if (Object.prototype.toString.call(dom) !== "[object Object]") {
+
+          dom = dom[0];
+        }
+
+        // 第一种方法（包含动画效果）
+        dom.$el.scrollIntoView({
+          // 滚动到指定节点
+          // 值有start,center,end，nearest，当前显示在视图区域中间
+          block: "center",
+          // 值有auto、instant,smooth，缓动动画（当前是慢速的）
+          behavior: "smooth",
+        });
+        break; // 跳出循环了
+      }
+    },
+
     formatPreviewData() {
       // 格式化预览数据
-      const form = this.form
+      const form = this.form;
       // 重置小班课数据
       let tmpActiveList = form.activeList?.length > 0 ? form.activeList : []
       console.log(this.tmpActiveList, 'tmpActiveList')
@@ -764,18 +799,18 @@ export default {
   watch: {
     teamCourse(val) {
       if (!val) {
-        this.$set(this.form, "eclass",  [{}]);
+        this.$set(this.form, "eclass", [{}]);
         this.$set(this.form, "leixing", "2");
       }
     },
     member(val) {
       if (!val) {
-        this.$set(this.form, "memberList",  [{}]);
+        this.$set(this.form, "memberList", [{}]);
       }
     },
     teamActive(val) {
       if (!val) {
-        this.$set(this.form, "activeList",  [{}]);
+        this.$set(this.form, "activeList", [{}]);
       }
     },
     leBao(val) {
@@ -786,17 +821,16 @@ export default {
     async "form.musicGroupOrganizationCourseSettingId"(val) {
       // && !this.rowDetail !this.$route.query.calenderId
 
-      if (val && !this.isSetCourseSettingsId  ) {
+      if (val && !this.isSetCourseSettingsId) {
         try {
           const res = await queryByMusicGroupOrganizationCourseSettingsId({
             id: val,
           });
-          let CourseSettingDetail = res.data.map(course=>{
+          let CourseSettingDetail = res.data.map((course) => {
             return {
               ...course,
-
-            }
-          })
+            };
+          });
           this.$set(this.form, "eclass", res.data);
           // this.syncAllMoney();
         } catch (error) {}

src/views/resetTeaming/components/resetPayListSchool.vue

@@ -659,7 +659,9 @@ export default {
         this.$router.push({
           path: "/business/studentPaySet",
           query: { ...query, payUserType: "SCHOOL" },
-        });
+        },(route) => {
+        route.meta.title = '学校缴费设置'
+      });
       }
     },
     getList() {
@@ -709,7 +711,9 @@ export default {
         this.$router.push({
           path: "/business/studentPaySet",
           query: { ...query, payUserType: "SCHOOL", calenderId: row.id },
-        });
+        },(route) => {
+        route.meta.title = '学校缴费设置'
+      });
         // 跳转新接口
         // this.memberVisible = true;
       } else {

src/views/resetTeaming/modals/payLeBao.vue

@@ -8,11 +8,11 @@
     >
       <el-table-column
       width="170px"
-        label="会员类型"
+        label="乐器保养"
 
       >
         <template slot-scope="scope">
-          <p>乐保保养</p>
+          <p>乐器保养</p>
         </template>
       </el-table-column>
       <el-table-column label="年限" prop="num" key="num"  width="170px">

src/views/resetTeaming/modals/payMember.vue

@@ -25,7 +25,6 @@
               style="width: 90% !important"
               v-model="form.memberList[scope.$index].memberRankSettingId"
               placeholder="会员类型"
-              @change="changeMember"
             >
               <el-option
                 :value="item.id"
@@ -172,7 +171,10 @@
               :precision="0"
               :min="0"
               @change="change"
-              :disabled="!form.memberList[scope.$index].period || !form.memberList[scope.$index].num"
+              :disabled="
+                !form.memberList[scope.$index].period ||
+                !form.memberList[scope.$index].num
+              "
               placeholder="请输入售价"
             />
           </el-form-item>
@@ -242,10 +244,13 @@ export default {
       boolOptionsOptions: objectToOptions(boolOptions),
       memberEnumList,
       memberPrice: {},
+      getMemberFeeFlag: true,
     };
   },
+  mounted() {},
   methods: {
     changeMemberperiodEnum(val) {
+      console.log(this.memberPrice);
       if (val == "DAY") {
         this.$set(
           this.form.memberList[0],
@@ -312,46 +317,64 @@ export default {
     change() {},
     async changeMember(val) {
       if (val) {
-        try {
-          const res = await getMemberFee({
-            rankId: val,
-            organId: this.organId,
-          });
-          this.memberPrice = res.data;
-          if (!res.data) {
-            this.$bus.$emit("showguide", ["memberList"]);
-            return;
+        if (this.getMemberFeeFlag) {
+          this.getMemberFeeFlag = false;
+          try {
+            const res = await getMemberFee({
+              rankId: val,
+              organId: this.organId,
+            });
+            this.memberPrice = res.data;
+            this.getMemberFeeFlag = true;
+            if (!res.data) {
+              this.$bus.$emit("showguide", ["memberList"]);
+              return;
+            }
+          } catch (e) {
+            console.log(e);
+            this.getMemberFeeFlag = true;
           }
-        } catch (e) {
-          console.log(e);
         }
       }
     },
     validateMember(rule, value, callback) {
       const one = Number(value);
-      let min=0;
-      let max =0
+      let min = 0;
+      let max = 0;
 
       switch (this.form.memberList[0]?.period) {
         case "MONTH": {
-           min = Number(this.rulesForm.minMonthFee)*this.form.memberList[0].num;
-           max = Number(this.rulesForm.maxMonthFee)*this.form.memberList[0].num;
+          min =
+            Number(this.rulesForm.minMonthFee) * this.form.memberList[0].num;
+          max =
+            Number(this.rulesForm.maxMonthFee) * this.form.memberList[0].num;
           break;
         }
         case "QUARTERLY": {
-            min = Number(this.rulesForm.minQuarterlyFee)*this.form.memberList[0].num;
-           max = Number(this.rulesForm.maxQuarterlyFee)*this.form.memberList[0].num;
-           console.log(this.form.memberList[0]?.period,min,max,this.rulesForm)
+          min =
+            Number(this.rulesForm.minQuarterlyFee) *
+            this.form.memberList[0].num;
+          max =
+            Number(this.rulesForm.maxQuarterlyFee) *
+            this.form.memberList[0].num;
+          console.log(
+            this.form.memberList[0]?.period,
+            min,
+            max,
+            this.rulesForm
+          );
           break;
         }
         case "YEAR_HALF": {
-            min = Number(this.rulesForm.minHalfYearFee)*this.form.memberList[0].num;
-           max = Number(this.rulesForm.maxHalfYearFee)*this.form.memberList[0].num;
+          min =
+            Number(this.rulesForm.minHalfYearFee) * this.form.memberList[0].num;
+          max =
+            Number(this.rulesForm.maxHalfYearFee) * this.form.memberList[0].num;
           break;
         }
         case "YEAR": {
-            min = Number(this.rulesForm.minYearFee)*this.form.memberList[0].num;
-           max = Number(this.rulesForm.maxYearFee)*this.form.memberList[0].num;
+          min = Number(this.rulesForm.minYearFee) * this.form.memberList[0].num;
+          max = Number(this.rulesForm.maxYearFee) * this.form.memberList[0].num;
           break;
         }
       }
@@ -362,6 +385,17 @@ export default {
       return callback(new Error(`定价应在${min}-${max}之间`));
     },
   },
+  watch: {
+    form: {
+      deep: true,
+      handler(val) {
+        console.log(this.memberPrice);
+        if (val.memberList[0].memberRankSettingId && !this.memberPrice.id) {
+          this.changeMember(val.memberList[0].memberRankSettingId);
+        }
+      },
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>

src/views/resetTeaming/modals/payTeamCourse.vue

@@ -148,6 +148,7 @@
               message: '请输入现价',
               trigger: 'blur',
             }"
+
           >
             <!-- $listeners.moneyChange -->
             <el-input-number

src/views/teacherManager/teacherOperation/components/teacherOperation.vue

@@ -57,23 +57,6 @@
                 prop="entryDate"
                 :label-width="formLabelWidth"
               >
-                <template #label>
-                  入职日期
-                  <el-popover
-                    placement="top"
-                    width="280"
-                    trigger="hover">
-                    <!-- <el-button slot="reference"></el-button> -->
-                    <i slot="reference"
-                      class="el-icon-warning-outline"
-                        style="font-size: 14px; "
-                    />
-                    <p style="color: red; line-height: 1.3; margin-bottom: 10px;">入职日期之前课酬按100%计算；<br />
-                入职日期当天及以后课酬按80%计算；<br />
-                转正日期当天及以后课酬按100%计算；<br />
-                若入职日期和转正日期设置为同一天，则日期当天及以后课酬按100%计算；</p>
-                  </el-popover>
-                </template>
                 <el-date-picker
                   v-model.trim="topForm.entryDate"
                   type="date"
@@ -83,28 +66,73 @@
                 ></el-date-picker>
               </el-form-item>
             </el-col>
+            <!--               <template #label>
+                  转正日期
+                  <el-popover placement="top" width="280" trigger="hover">
+
+                    <i
+                      slot="reference"
+                      class="el-icon-warning-outline"
+                      style="font-size: 14px"
+                    />
+                    <p
+                      style="color: red; line-height: 1.3; margin-bottom: 10px"
+                    >
+                      入职日期之前课酬按100%计算；<br />
+                      入职日期当天及以后课酬按80%计算；<br />
+                      转正日期当天及以后课酬按100%计算；<br />
+                      若入职日期和转正日期设置为同一天，则日期当天及以后课酬按100%计算；
+                    </p>
+                  </el-popover>
+                </template> <template #label>
+                  入职日期
+                  <el-popover placement="top" width="280" trigger="hover">
+
+                    <i
+                      slot="reference"
+                      class="el-icon-warning-outline"
+                      style="font-size: 14px"
+                    />
+                    <p
+                      style="color: red; line-height: 1.3; margin-bottom: 10px"
+                    >
+                      入职日期之前课酬按100%计算；<br />
+                      入职日期当天及以后课酬按80%计算；<br />
+                      转正日期当天及以后课酬按100%计算；<br />
+                      若入职日期和转正日期设置为同一天，则日期当天及以后课酬按100%计算；
+                    </p>
+                  </el-popover>
+                </template>-->
             <el-col :span="12">
-              <el-form-item
-                label="工作类型"
-                prop="jobNature"
-                :label-width="formLabelWidth"
-              >
-                <el-select
-                  v-model.trim="topForm.jobNature"
-                  placeholder="工作类型"
-                  clearable
-                  filterable
+              <el-form-item label="转正日期" :label-width="formLabelWidth">
+                <el-date-picker
+                  v-model="topForm.formalStaffDate"
+                  value-format="yyyy-MM-dd"
+                  type="date"
+                  placeholder="选择转正日期"
+                  :picker-options="pickerOptions"
                 >
-                  <el-option
-                    v-for="item in jobNature"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  ></el-option>
-                </el-select>
+                </el-date-picker>
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row >
+            <el-alert class="alert"  :closable="false" type="info">
+              <template #title>
+                <div>
+                  <p style="font-weight:600">老师课酬结算规则：</p>
+                  <p>1.入职日期之前的课程，按老师课酬的100%结算</p>
+                  <p>2.入职日期当天及以后的课程，按老师课酬*试用期课酬折算值结算</p>
+                  <p>3.转正日期当天及以后的课程，按老师课酬的100%结算</p>
+                  <p>4.入职日期和转正日期设置为同一天，则日期当天及以后的课程按老师课酬的100%结算</p>
+
+
+
+
+                </div>
+              </template>
+            </el-alert>
+          </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item
@@ -160,7 +188,12 @@
                   filterable
                   placeholder="员工状态"
                 >
-                  <el-option v-for="item in ProbationPeriodList" :key="item.value" :label="item.label" :value="Number(item.value)"></el-option>
+                  <el-option
+                    v-for="item in ProbationPeriodList"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="Number(item.value)"
+                  ></el-option>
                   <!-- <el-option label="正式" :value="0"></el-option>
                   <el-option label="试用" :value="1"></el-option>
                   <el-option label="实习" :value="3"></el-option> -->
@@ -175,13 +208,27 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="老师简介" :label-width="formLabelWidth">
-                <el-input
-                  type="textarea"
-                  v-model.trim="topForm.introduction"
-                ></el-input>
+              <el-form-item
+                label="工作类型"
+                prop="jobNature"
+                :label-width="formLabelWidth"
+              >
+                <el-select
+                  v-model.trim="topForm.jobNature"
+                  placeholder="工作类型"
+                  clearable
+                  filterable
+                >
+                  <el-option
+                    v-for="item in jobNature"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
               </el-form-item>
             </el-col>
+
             <el-col :span="12" class="diSpan">
               <el-tooltip placement="top" popper-class="mTooltip">
                 <div slot="content">
@@ -208,6 +255,16 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="老师简介" :label-width="formLabelWidth">
+                <el-input
+                  type="textarea"
+                  v-model.trim="topForm.introduction"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <h4>资料学历</h4>
           <el-row>
             <el-col :span="12">
@@ -299,39 +356,10 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="转正日期" :label-width="formLabelWidth">
-                <template #label>
-                  转正日期
-                  <el-popover
-                    placement="top"
-                    width="280"
-                    trigger="hover">
-                    <!-- <el-button slot="reference"></el-button> -->
-                    <i slot="reference"
-                      class="el-icon-warning-outline"
-                        style="font-size: 14px; "
-                    />
-                   <p style="color: red; line-height: 1.3; margin-bottom: 10px;">入职日期之前课酬按100%计算；<br />
-                入职日期当天及以后课酬按80%计算；<br />
-                转正日期当天及以后课酬按100%计算；<br />
-                若入职日期和转正日期设置为同一天，则日期当天及以后课酬按100%计算；</p>
-                  </el-popover>
-                </template>
-                <el-date-picker
-                  v-model="topForm.formalStaffDate"
-                  value-format="yyyy-MM-dd"
-                  type="date"
-                  placeholder="选择转正日期"
-                  :picker-options="pickerOptions"
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
               <el-form-item label="离职日期" :label-width="formLabelWidth">
                 <el-date-picker
-                   v-model="topForm.demissionDate"
-                    value-format="yyyy-MM-dd"
+                  v-model="topForm.demissionDate"
+                  value-format="yyyy-MM-dd"
                   type="date"
                   placeholder="选择离职日期"
                 >
@@ -382,10 +410,7 @@
           multiple
           action="/api-web/uploadFile"
         >
-          <el-button
-            icon="ios-cloud-upload-outline"
-            >修改头像</el-button
-          >
+          <el-button icon="ios-cloud-upload-outline">修改头像</el-button>
           <!--
                v-if="pageType != 'create'"
             <el-button
@@ -417,7 +442,7 @@ import store from "@/store";
 import { permission } from "@/utils/directivePage";
 import { jobNature, ProbationPeriodList } from "@/utils/searchArray";
 import { isvalidPhone } from "@/utils/validate";
-import dayjs from 'dayjs'
+import dayjs from "dayjs";
 let validPhone = (rule, value, callback) => {
   if (!value) {
     callback(new Error("请输入电话号码"));
@@ -431,7 +456,7 @@ let validPhone = (rule, value, callback) => {
 export default {
   name: "teacherOperation",
   data() {
-    const that = this
+    const that = this;
     return {
       headers: {
         Authorization: getToken(),
@@ -459,7 +484,7 @@ export default {
         graduateSchool: null,
         email: null,
         educationBackground: null,
-        demissionDate:null,
+        demissionDate: null,
         formalStaffDate: null,
         isProbationPeriod: null,
         technicalTitles: null,
@@ -501,17 +526,26 @@ export default {
       pickerOptions2: {
         firstDayOfWeek: 1,
         disabledDate(time) {
-          let date = new Date(dayjs(that.topForm.formalStaffDate).format('YYYY-MM-DD') + ' 00:00:00')
-          return that.topForm.formalStaffDate ? time.getTime() > date.getTime() : false;
-        }
+          let date = new Date(
+            dayjs(that.topForm.formalStaffDate).format("YYYY-MM-DD") +
+              " 00:00:00"
+          );
+          return that.topForm.formalStaffDate
+            ? time.getTime() > date.getTime()
+            : false;
+        },
       },
       pickerOptions: {
         firstDayOfWeek: 1,
         disabledDate(time) {
-          let date = new Date(dayjs(that.topForm.entryDate).format('YYYY-MM-DD') + ' 00:00:00')
-          return that.topForm.entryDate ? date.getTime() > time.getTime() : false;
-        }
-      }
+          let date = new Date(
+            dayjs(that.topForm.entryDate).format("YYYY-MM-DD") + " 00:00:00"
+          );
+          return that.topForm.entryDate
+            ? date.getTime() > time.getTime()
+            : false;
+        },
+      },
     };
   },
   created() {},
@@ -570,7 +604,7 @@ export default {
               graduateSchool: result.graduateSchool,
               email: result.email,
               educationBackground: result.educationBackground,
-              demissionDate:result.demissionDate,
+              demissionDate: result.demissionDate,
               formalStaffDate: result.formalStaffDate,
               technicalTitles: result.technicalTitles,
               certificateType: result.certificateType,
@@ -636,7 +670,7 @@ export default {
             teacherUpdate(this.topForm).then((res) => {
               if (res.code == 200) {
                 // this.$emit('onTeacher')
-                this.$store.dispatch('delVisitedViews', this.$route)
+                this.$store.dispatch("delVisitedViews", this.$route);
                 this.$router.push({
                   path: "/teacherManager/teacherList",
                   query: { rules: this.Frules, search: this.Fsearch },
@@ -654,7 +688,7 @@ export default {
                 if (permission("/teacherAdd/salarySeting")) {
                   this.$emit("onTeacher", res.data);
                 } else {
-                  this.$store.dispatch('delVisitedViews', this.$route)
+                  this.$store.dispatch("delVisitedViews", this.$route);
                   this.$router.push({
                     path: "/teacherManager/teacherList",
                     query: { rules: this.Frules, search: this.Fsearch },
@@ -666,15 +700,15 @@ export default {
           }
         } else {
           this.$nextTick(() => {
-            let isError = document.getElementsByClassName('is-error')
+            let isError = document.getElementsByClassName("is-error");
             isError[0].scrollIntoView({
               // 滚动到指定节点
               // 值有start,center,end，nearest，当前显示在视图区域中间
-              block: 'center',
+              block: "center",
               // 值有auto、instant,smooth，缓动动画（当前是慢速的）
-              behavior: 'smooth',
-            })
-          })
+              behavior: "smooth",
+            });
+          });
           return false;
         }
       });
@@ -709,13 +743,13 @@ export default {
         certificateType: null,
         certificateNum: null,
         jobType: "ADVISER",
-        memo: null
+        memo: null,
       };
-      this.subjectIds = []
+      this.subjectIds = [];
       this.$refs[formName].resetFields();
     },
     onCancel() {
-      this.$store.dispatch('delVisitedViews', this.$route)
+      this.$store.dispatch("delVisitedViews", this.$route);
       this.$router.push({
         path: "/teacherManager/teacherList",
         query: { rules: this.Frules, search: this.Fsearch },
@@ -842,5 +876,9 @@ export default {
     width: 260px;
     text-align: center;
   }
+  .alert {
+    margin:  0 0 20px 120px;
+    width: 855px;
+  }
 }
 </style>

src/views/teamDetail/components/studentList.vue

@@ -959,7 +959,7 @@
     <el-dialog
       title="添加会员"
       width="500px"
-      :visible.sync="memberVisible"
+      :visible.sync="memberVisible" 
     >
       <createMember
         ref="addMember"