切换分支搞别的 报错提交

1

src/views/categroyManager/generalSettings/vipCourseType.vue

@@ -0,0 +1,163 @@
+<template>
+  <div>
+    <el-button
+      v-permission="'vipGroupCategory/add'"
+      @click="addGroupCategory"
+      type="primary"
+      style="margin-bottom: 20px"
+      >新建</el-button
+    >
+    <el-table
+      :data="leftList"
+      :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+    >
+      <el-table-column label="课程形式" prop="name"> </el-table-column>
+      <el-table-column label="班级人数(人)" prop="studentNum">
+      </el-table-column>
+      <el-table-column label="课程课时(分钟)" prop="singleClassMinutes">
+      </el-table-column>
+      <el-table-column label="操作">
+        <template slot-scope="scope">
+          <div>
+            <el-button
+              type="text"
+              v-permission="'vipGroupCategory/update'"
+              @click="resetGroupCategory(scope.row)"
+              >修改</el-button
+            >
+            <el-popover
+              placement="top"
+              width="160"
+              v-permission="'vipGroupCategory/delete'"
+              :ref="scope.row.id"
+            >
+              <p>您确定删除该课程形态吗?</p>
+              <div style="text-align: right; margin: 0">
+                <el-button
+                  size="mini"
+                  type="text"
+                  @click="scope._self.$refs[scope.row.id].doClose()"
+                  >取消</el-button
+                >
+                <el-button
+                  type="primary"
+                  size="mini"
+                  @click="removeGroupCategory(scope)"
+                  >确定</el-button
+                >
+              </div>
+              <el-button type="text" slot="reference">删除</el-button>
+            </el-popover>
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+        <!-- 课程类型新增弹窗 -->
+    <el-dialog :title="(vipStatusFrom.isAdd ? '添加' : '修改') + `VIP课程形式`"
+               class="courseMask"
+               width="500px"
+               @close="onVipStatusClose('vipStatus')"
+               :visible.sync="vipStatus">
+      <el-form :model="vipStatusFrom"
+               ref='vipStatus'>
+        <el-form-item label="课程形式"
+                      prop='name'
+                      :rules="[{ required: true, message: '请输入课程形式', trigger: 'blur' }]"
+                      :label-width="formLabelWidth">
+          <el-input v-model.trim="vipStatusFrom.name"
+                    autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="班级人数"
+                      prop="num"
+                      :rules="[{ required: true, message: '请输入班级人数', trigger: 'blur' }]"
+                      :label-width="formLabelWidth">
+          <el-input v-model.trim="vipStatusFrom.num" type="number"
+                    autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="课程课时"
+                      prop="dynamicTags"
+                      :rules="[{ required: true, message: '请输入课程课时', trigger: 'blur, change' }]"
+                      :label-width="formLabelWidth">
+          <el-tag :key="index"
+                  effect="dark"
+                  type="info"
+                  v-for="(tag, index) in vipStatusFrom.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;"
+                    size="small"
+                    @keyup.enter.native="handleInputConfirm">
+          </el-input>
+          <el-button v-if="!inputVisible"
+                     class="button-new-tag"
+                     size="small"
+                     @click="showInput">+ 添加</el-button>
+          <el-button v-if="inputVisible"
+                     class="button-new-tag"
+                     size="small"
+                     @click="handleInputConfirm">保存</el-button>
+        </el-form-item>
+      </el-form>
+      <div slot="footer"
+           class="dialog-footer">
+        <el-button @click="vipStatus = false">取 消</el-button>
+        <el-button type="primary"
+                   @click="addVipStatus('vipStatus')">确 定</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      leftList: [],
+      vipStatus: false, // 课程形态弹窗状态
+      formLabelWidth: "120px",
+      vipStatusFrom: {
+        name: "",
+        num: "",
+        dynamicTags: [],
+        isAdd: true,
+        id: "",
+      }, // 弹窗内容
+    };
+  },
+  methods: {
+    resetGroupCategory(row) {
+      // 修改课程形式
+      const vipStatusFrom = this.vipStatusFrom;
+      this.vipStatus = true;
+      this.$nextTick(() => {
+        vipStatusFrom.name = row.name;
+        vipStatusFrom.timer = row.singleClassMinutes.split(",");
+        vipStatusFrom.dynamicTags = row.singleClassMinutes.split(",");
+        vipStatusFrom.num = row.studentNum;
+        vipStatusFrom.id = row.id;
+        vipStatusFrom.isAdd = false;
+      });
+    },
+    async removeGroupCategory(scope) {
+      // 删除
+      await removeVipGroupCategory({
+        id: scope.row.id,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.$message.success("删除成功");
+          this.getVipGroupCategoryList();
+        }
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+</style>

src/views/categroyManager/generalSettings/vipParameterManager.vue

@@ -4,45 +4,18 @@
       <div class="squrt"></div> VIP参数设置
     </h2>
     <div class="m-core">
+       <el-tabs v-model.trim="activeIndex"  type="card"
+               @tab-click="handleClick">
+           <el-tab-pane label="课程形式"
+                     v-if="permission('/teamDetails/baseInfo')"
+                     name="1">
+          <baseinfo v-if="activeIndex == '1'"
+                     />
+        </el-tab-pane>
+       </el-tabs>
       <el-row :gutter="20">
         <el-col :span="12" :xs="24">
-          <el-button v-permission="'vipGroupCategory/add'" @click="addGroupCategory" type="primary" style="margin-bottom: 20px">新建</el-button>
-          <el-table :data='leftList'
-                    :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-            <el-table-column label="课程形式"
-                             prop="name">
-            </el-table-column>
-            <el-table-column label="班级人数(人)"
-                             prop="studentNum">
-            </el-table-column>
-            <el-table-column label="课程课时(分钟)"
-                             prop="singleClassMinutes">
-            </el-table-column>
-            <el-table-column label="操作">
-              <template slot-scope="scope">
-                <div>
-                  <el-button type="text" v-permission="'vipGroupCategory/update'"
-                             @click="resetGroupCategory(scope.row)">修改</el-button>
-                  <el-popover placement="top"
-                              width="160"
-                              v-permission="'vipGroupCategory/delete'"
-                              :ref="scope.row.id">
-                    <p>您确定删除该课程形态吗?</p>
-                    <div style="text-align: right; margin: 0">
-                      <el-button size="mini"
-                                 type="text"
-                                 @click="scope._self.$refs[scope.row.id].doClose()">取消</el-button>
-                      <el-button type="primary"
-                                 size="mini"
-                                 @click="removeGroupCategory(scope)">确定</el-button>
-                    </div>
-                    <el-button type="text"
-                               slot="reference">删除</el-button>
-                  </el-popover>
-                </div>
-              </template>
-            </el-table-column>
-          </el-table>
+         
         </el-col>
         <el-col :span="12" :xs="24">
           <el-button v-permission="'vipGroupDefaultClassesCycle/add'" @click="addVipTimer" type="primary" style="margin-bottom: 20px">新建</el-button>
@@ -84,66 +57,6 @@
       </el-row>
     </div>
 
-    <!-- 课程类型新增弹窗 -->
-    <el-dialog :title="(vipStatusFrom.isAdd ? '添加' : '修改') + `VIP课程形式`"
-               class="courseMask"
-               width="500px"
-               @close="onVipStatusClose('vipStatus')"
-               :visible.sync="vipStatus">
-      <el-form :model="vipStatusFrom"
-               ref='vipStatus'>
-        <el-form-item label="课程形式"
-                      prop='name'
-                      :rules="[{ required: true, message: '请输入课程形式', trigger: 'blur' }]"
-                      :label-width="formLabelWidth">
-          <el-input v-model.trim="vipStatusFrom.name"
-                    autocomplete="off"></el-input>
-        </el-form-item>
-        <el-form-item label="班级人数"
-                      prop="num"
-                      :rules="[{ required: true, message: '请输入班级人数', trigger: 'blur' }]"
-                      :label-width="formLabelWidth">
-          <el-input v-model.trim="vipStatusFrom.num" type="number"
-                    autocomplete="off"></el-input>
-        </el-form-item>
-        <el-form-item label="课程课时"
-                      prop="dynamicTags"
-                      :rules="[{ required: true, message: '请输入课程课时', trigger: 'blur, change' }]"
-                      :label-width="formLabelWidth">
-          <el-tag :key="index"
-                  effect="dark"
-                  type="info"
-                  v-for="(tag, index) in vipStatusFrom.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;"
-                    size="small"
-                    @keyup.enter.native="handleInputConfirm">
-          </el-input>
-          <el-button v-if="!inputVisible"
-                     class="button-new-tag"
-                     size="small"
-                     @click="showInput">+ 添加</el-button>
-          <el-button v-if="inputVisible"
-                     class="button-new-tag"
-                     size="small"
-                     @click="handleInputConfirm">保存</el-button>
-        </el-form-item>
-      </el-form>
-      <div slot="footer"
-           class="dialog-footer">
-        <el-button @click="vipStatus = false">取 消</el-button>
-        <el-button type="primary"
-                   @click="addVipStatus('vipStatus')">确 定</el-button>
-      </div>
-    </el-dialog>
 
     <!-- 周期循环新增弹窗 -->
     <el-dialog :title="(vipTimerFrom.isAdd ? '添加' : '修改') + 'VIP时间段'"
@@ -180,17 +93,8 @@ export default {
   name: 'vipParameterManager',
   data () {
     return {
-      leftList: [],
-      rightList: [],
-      vipStatus: false, // 课程形态弹窗状态
-      formLabelWidth: '120px',
-      vipStatusFrom: {
-        name: '',
-        num: '',
-        dynamicTags: [],
-        isAdd: true,
-        id: ''
-      }, // 弹窗内容
+        formLabelWidth: "120px",
+       rightList: [],
       timerStatus: false, //课程时间段弹窗状态
       vipTimerFrom: {
         count: '',
@@ -200,7 +104,9 @@ export default {
       },
       dynamicTags: [],
       inputVisible: false,
-      inputValue: ''
+      inputValue: '',
+      activeIndex:'1'
+      
     }
   },
   mounted () {
@@ -208,6 +114,9 @@ export default {
     this.getDefaultClassesCycle()
   },
   methods: {
+    handleClick(val){
+       this.activeIndex = val.name;
+    },
     handleClose (tag) {
       this.vipStatusFrom.dynamicTags.splice(this.vipStatusFrom.dynamicTags.indexOf(tag), 1);
     },
@@ -283,30 +192,8 @@ export default {
         }
       })
     },
-    resetGroupCategory (row) {
-      // 修改课程形式
-      const vipStatusFrom = this.vipStatusFrom
-      this.vipStatus = true;
-      this.$nextTick(() => {
-        vipStatusFrom.name = row.name;
-        vipStatusFrom.timer = row.singleClassMinutes.split(',');
-        vipStatusFrom.dynamicTags = row.singleClassMinutes.split(',');
-        vipStatusFrom.num = row.studentNum;
-        vipStatusFrom.id = row.id;
-        vipStatusFrom.isAdd = false;
-      })
-    },
-    async removeGroupCategory (scope) {
-      // 删除
-      await removeVipGroupCategory({
-        id: scope.row.id
-      }).then(res => {
-        if (res.code == 200) {
-          this.$message.success('删除成功')
-          this.getVipGroupCategoryList();
-        }
-      })
-    },
+
+
     // 新增时间段
     addVipTimer () {
       this.timerStatus = true;