1127 16:29

111

src/views/businessManager/shopManager/shopCategory.vue

@@ -100,7 +100,7 @@ export default {
       form: {
         name: null, // 作业模块名称
         subjectIds: [],
-        organId: store.getters.organ
+        organId: null
       },
       rules: {
         name: [{ required: true, message: '请输入类型名称', trigger: 'blur' }],
@@ -187,7 +187,7 @@ export default {
           id: row.id,
           name: row.name,
           subjectIds: row.subjectIds,
-          organId: store.getters.organ
+          organId: null
         }
       }
     },
@@ -195,7 +195,7 @@ export default {
       this.form = {
         name: null, // 作业模块名称
         subjectIds: [],
-        organId: store.getters.organ
+        organId: null
       }
       this.$refs[formName].resetFields()
     },

src/views/businessManager/shopManager/shopList.vue

@@ -1,8 +1,11 @@
 <template>
   <div class="m-container">
-    <h2><div class="squrt"></div>商品列表</h2>
+    <h2>
+      <div class="squrt"></div>商品列表
+    </h2>
     <div class="m-core">
-      <div @click="onShopOperation('create')" class='newBand'>添加</div>
+      <div @click="onShopOperation('create')"
+           class='newBand'>添加</div>
       <!-- 搜索类型 -->
       <!-- <el-form :inline="true"
                class="searchForm"
@@ -27,14 +30,18 @@
       </div> -->
       <!-- 列表 -->
       <div class="tableWrap">
-        <el-table :data='tableList' :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-          <el-table-column align='center' prop="id"
+        <el-table :data='tableList'
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+          <el-table-column align='center'
+                           prop="id"
                            label="商品编号">
           </el-table-column>
-          <el-table-column align='center' prop="brand"
+          <el-table-column align='center'
+                           prop="brand"
                            label="品牌">
           </el-table-column>
-          <el-table-column align='center' prop="name"
+          <el-table-column align='center'
+                           prop="name"
                            label="商品名称">
           </el-table-column>
           <el-table-column align='center'
@@ -43,28 +50,37 @@
               {{ scope.row.type | shopType }}
             </template>
           </el-table-column>
-          <el-table-column align='center' prop="goodsCategoryName"
+          <el-table-column align='center'
+                           prop="goodsCategoryName"
                            label="商品分类">
           </el-table-column>
-          <el-table-column align='center' prop="specification"
+          <el-table-column align='center'
+                           prop="specification"
                            label="具体型号">
             <template slot-scope="scope">
               <span style="max-height: 64px; display: block;">{{ scope.row.specification }}</span>
             </template>
           </el-table-column>
-          <el-table-column align='center' prop="marketPrice"
+          <el-table-column align='center'
+                           prop="marketPrice"
                            label="商品价格">
           </el-table-column>
-          <el-table-column align='center' prop="groupPurchasePrice"
+          <el-table-column align='center'
+                           prop="groupPurchasePrice"
                            label="商品团购价">
           </el-table-column>
-          <el-table-column align='center' prop="discountPrice"
+          <el-table-column align='center'
+                           prop="discountPrice"
                            label="商品采购价">
           </el-table-column>
-          <el-table-column align='center' cell-style="padding: 0"
+          <el-table-column align='center'
+                           cell-style="padding: 0"
                            label="商品缩略图片">
             <template slot-scope="scope">
-              <img class="shopImage" :src="scope.row.image" alt="" srcset="">
+              <img class="shopImage"
+                   :src="scope.row.image"
+                   alt=""
+                   srcset="">
             </template>
           </el-table-column>
           <el-table-column align='center'
@@ -75,13 +91,22 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column align='center' width="140px"
+          <el-table-column align='center'
+                           width="140px"
                            label="操作">
             <template slot-scope="scope">
-              <el-button v-if="scope.row.status == 0" @click="onUpdate(scope.row)" type="text">上架</el-button>
-              <el-button v-if="scope.row.status == 0" @click="onShopOperation('update', scope.row)" type="text">修改</el-button>
-              <el-button v-if="scope.row.status == 1" @click="onUpdate(scope.row)" type="text">下架</el-button>
-              <el-button v-if="scope.row.status == 0" @click="onDelete(scope.row)" type="text">删除</el-button>
+              <el-button v-if="scope.row.status == 0"
+                         @click="onUpdate(scope.row)"
+                         type="text">上架</el-button>
+              <el-button v-if="scope.row.status == 0"
+                         @click="onShopOperation('update', scope.row)"
+                         type="text">修改</el-button>
+              <el-button v-if="scope.row.status == 1"
+                         @click="onUpdate(scope.row)"
+                         type="text">下架</el-button>
+              <el-button v-if="scope.row.status == 0"
+                         @click="onDelete(scope.row)"
+                         type="text">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -89,7 +114,7 @@
                     :page.sync="pageInfo.page"
                     :limit.sync="pageInfo.limit"
                     :page-sizes="pageInfo.page_size"
-                    @pagination="getList"  />
+                    @pagination="getList" />
       </div>
     </div>
   </div>
@@ -102,7 +127,7 @@ export default {
   components: { pagination },
   data () {
     return {
-      organId: store.getters.organ,
+      organId: null,
       searchForm: {
         status: ''
       },
@@ -117,11 +142,11 @@ export default {
       },
     }
   },
-  mounted() {
+  mounted () {
     this.getList()
   },
   methods: {
-    onUpdate(row) {
+    onUpdate (row) {
       goodsUpdate({
         id: row.id,
         status: row.status ? 0 : 1
@@ -129,13 +154,13 @@ export default {
         this.messageTips(row.status ? '下架' : '上架', res)
       })
     },
-    onDelete(row) {
+    onDelete (row) {
       goodsDelete(row.id).then(res => {
         this.messageTips('删除', res)
       })
     },
-    messageTips(title, res) {
-      if(res.code == 200) {
+    messageTips (title, res) {
+      if (res.code == 200) {
         this.$message.success(title + '成功')
         this.typeStatus = false
         this.getList()
@@ -143,23 +168,23 @@ export default {
         this.$message.error(res.msg)
       }
     },
-    getList () { 
+    getList () {
       goodsQuery({
         organId: this.organId,
         rows: this.pageInfo.limit,
         page: this.pageInfo.page
       }).then(res => {
-        if(res.code == 200 && res.data) {
+        if (res.code == 200 && res.data) {
           this.tableList = res.data.rows
           this.pageInfo.total = res.data.total
         }
       })
     },
-    onShopOperation(type, row) { // 添加或修改
+    onShopOperation (type, row) { // 添加或修改
       let params = {
         type: type
       }
-      if(row) {
+      if (row) {
         params.id = row.id
       }
       this.$router.push({

src/views/businessManager/shopManager/shopOperation.vue

@@ -112,7 +112,7 @@ export default {
     return {
       categoryList: [],
       pageType: this.$route.query.type,
-      organId: store.getters.organ,
+      organId: null,
       headers: {
         Authorization: getToken()
       },

src/views/categroyManager/generalSettings/errorManager.vue

@@ -76,7 +76,7 @@ export default {
       formLabelWidth: '120px',
       form: {
         name: null, // 热词标签
-        organId: store.getters.organ
+        organId: null
       },
       rules: {
         name: [{ required: true, message: '请输入热词标签', trigger: 'blur' }]
@@ -148,7 +148,7 @@ export default {
         this.form = {
           id: row.id,
           name: row.name,
-          organId: store.getters.organ
+          organId: null
         }
       }
     },
@@ -156,7 +156,7 @@ export default {
       this.form = {
         name: null, // 作业模块名称
         subjectIds: [],
-        organId: store.getters.organ
+        organId: null
       }
       this.$refs[formName].resetFields()
     },

src/views/categroyManager/generalSettings/overallManager.vue

@@ -4,12 +4,16 @@
     <div class="m-core">
       <!-- 列表 -->
       <el-row>
-        <el-col :span="12" v-for="(config, index) in configList" :key="config.id">
+        <el-col :span="12"
+                v-for="(config, index) in configList"
+                :key="config.id">
           {{ config.description[0] }}
           <el-input v-model="input[index]">
-            <template slot="append" v-if="config.description[1]">{{ config.description[1] }}</template>
+            <template slot="append"
+                      v-if="config.description[1]">{{ config.description[1] }}</template>
           </el-input>
-          <el-button @click="onSave(config, index)" type="primary">保存</el-button>
+          <el-button @click="onSave(config, index)"
+                     type="primary">保存</el-button>
         </el-col>
       </el-row>
     </div>
@@ -24,18 +28,18 @@ export default {
   name: 'musicalManager',
   data () {
     return {
-      organId: store.getters.organ,
+      organId: null,
       configList: [],
       input: []
     }
   },
-  mounted() {
+  mounted () {
     this.__init()
   },
   methods: {
-    __init() {
+    __init () {
       sysConfigList({ group: 'default' }).then(res => {
-        if(res.code == 200 && res.data.length > 0) {
+        if (res.code == 200 && res.data.length > 0) {
           res.data.forEach((item, index) => {
             this.input[index] = item.paranValue
             this.configList.push({
@@ -48,7 +52,7 @@ export default {
         }
       })
     },
-    onSave (row, index) { 
+    onSave (row, index) {
       let params = {
         id: row.id,
         paranValue: this.input[index],
@@ -56,7 +60,7 @@ export default {
         description: row.description.join('{}')
       }
       sysConfigUpdate(params).then(res => {
-        if(res.code == 200) {
+        if (res.code == 200) {
           this.$message.success('修改成功')
         }
       })
@@ -66,22 +70,26 @@ export default {
 </script>
 <style lang="scss" scoped>
 /deep/.el-input-group__append {
-  background: #DCDFE6;
-  border-color: #DCDFE6;
-  &:hover, &:active, &:focus {
-    background: #DCDFE6;
-    border-color: #DCDFE6;
-    color: #FFF;
+  background: #dcdfe6;
+  border-color: #dcdfe6;
+  &:hover,
+  &:active,
+  &:focus {
+    background: #dcdfe6;
+    border-color: #dcdfe6;
+    color: #fff;
   }
 }
 .el-button--primary {
   background: #14928a;
   border-color: #14928a;
   color: #fff;
-  &:hover, &:active, &:focus {
+  &:hover,
+  &:active,
+  &:focus {
     background: #14928a;
     border-color: #14928a;
-    color: #FFF;
+    color: #fff;
   }
 }
 .el-row {
@@ -94,9 +102,9 @@ export default {
   justify-content: flex-end;
   margin-right: 50%;
 }
-.el-input-group, .el-input {
+.el-input-group,
+.el-input {
   width: 200px;
   margin: 0 20px;
 }
-
 </style>

src/views/categroyManager/generalSettings/vipParameterManager.vue

@@ -321,7 +321,7 @@ export default {
       if (this.vipTimerFrom.isAdd) {
         // 添加
         addDefaultClassesCycle({
-          organId: this.$store.getters.organ,
+          organId: null,
           maxClassTimes: this.vipTimerFrom.count,
           month: this.vipTimerFrom.timer,
         }).then(res => {

src/views/categroyManager/insideSetting/addressManager.vue

@@ -1,12 +1,15 @@
 <template>
   <div class='m-container'>
-    <h2><div class="squrt"></div>教学点管理</h2>
+    <h2>
+      <div class="squrt"></div>教学点管理
+    </h2>
     <div class="m-core">
       <div @click="openTeaching('create')"
            class='newBand'>新建</div>
       <!-- 列表 -->
       <div class="tableWrap">
-        <el-table :data='tableList' :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+        <el-table :data='tableList'
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}">
           <el-table-column align='center'
                            width="55"
                            prop="id"
@@ -89,20 +92,21 @@
                       prop="source"
                       :label-width="formLabelWidth">
           <template v-if="formActionTitle == 'update'">
-            <el-select v-model="form.source" disabled>
-            <el-option label="合作单位"
-                       value="1"></el-option>
-            <el-option label="租赁"
-                       value="2"></el-option>
-          </el-select>
+            <el-select v-model="form.source"
+                       disabled>
+              <el-option label="合作单位"
+                         value="1"></el-option>
+              <el-option label="租赁"
+                         value="2"></el-option>
+            </el-select>
           </template>
           <template v-else>
             <el-select v-model="form.source">
-            <el-option label="合作单位"
-                       value="1"></el-option>
-            <el-option label="租赁"
-                       value="2"></el-option>
-          </el-select>
+              <el-option label="合作单位"
+                         value="1"></el-option>
+              <el-option label="租赁"
+                         value="2"></el-option>
+            </el-select>
           </template>
         </el-form-item>
         <el-form-item v-if="form.source == 1"
@@ -151,7 +155,8 @@
                    @click="onTeachingSubmit('ruleForm')">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog :close-on-click-modal="false" title="选择地图"
+    <el-dialog :close-on-click-modal="false"
+               title="选择地图"
                custom-class="map-container"
                :visible.sync="mapStatus"
                width="800px">
@@ -236,7 +241,7 @@ export default {
         remark: null,  // 费用
         address: null, // 上课地点
         subsidy: null, // 课酬补贴
-        organId: store.getters.organ
+        organId: null
       },
       rules: {
         name: [{ required: true, message: '请输入教学点名称', trigger: 'blur' }],
@@ -312,7 +317,7 @@ export default {
         this.markers = []
         this.center = [poi.split(',')[0], poi.split(',')[1]]
         this.markers.push([poi.split(',')[0], poi.split(',')[1]])
-      } else if(address && poi == '') {
+      } else if (address && poi == '') {
         let that = this
         //构造地点查询类
         let placeSearch = new AMap.PlaceSearch({
@@ -320,7 +325,7 @@ export default {
           pageIndex: 1, // 页码
         })
         //关键字查询
-        placeSearch.search(address, function(status, result) {
+        placeSearch.search(address, function (status, result) {
           if (status === 'complete') {
             let pois = result.poiList.pois[0]
             poi = pois.location.lng + ',' + pois.location.lat
@@ -425,7 +430,7 @@ export default {
           remark: row.remark,  // 费用
           address: row.address.split(',').join(''), // 上课地点
           subsidy: row.subsidy, // 课酬补贴
-          organId: store.getters.organ
+          organId: null
         }
       }
     },
@@ -438,7 +443,7 @@ export default {
         remark: null,  // 费用
         address: null, // 上课地点
         subsidy: null, // 课酬补贴
-        organId: store.getters.organ
+        organId: null
       }
       this.$refs[formName].resetFields()
     },

src/views/categroyManager/insideSetting/adminManager.vue

@@ -1,21 +1,28 @@
 <template>
   <div class='m-container'>
-    <h2><div class="squrt"></div>系统角色权限管理</h2>
+    <h2>
+      <div class="squrt"></div>系统角色权限管理
+    </h2>
     <div class="m-core">
-      <div @click="onAdminOperation('create')" class='newBand'>添加</div>
+      <div @click="onAdminOperation('create')"
+           class='newBand'>添加</div>
       <!-- 列表 -->
       <div class="tableWrap">
-        <el-table :data='tableList' header-cell-class-name="headerName">
-          <el-table-column align='center' prop="roleName"
+        <el-table :data='tableList'
+                  header-cell-class-name="headerName">
+          <el-table-column align='center'
+                           prop="roleName"
                            label="角色类型">
           </el-table-column>
-          <el-table-column align='center' prop="roleDesc"
+          <el-table-column align='center'
+                           prop="roleDesc"
                            label="角色描述">
           </el-table-column>
           <el-table-column align='center'
                            label="操作">
             <template slot-scope="scope">
-              <el-button @click="onAdminOperation('update', scope.row)" type="text">修改</el-button>
+              <el-button @click="onAdminOperation('update', scope.row)"
+                         type="text">修改</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -45,35 +52,35 @@ export default {
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
-      organId: store.getters.organ
+      organId: null
     }
   },
-  mounted() {
+  mounted () {
     // console.log(store.getters.permission)
     this.getList()
   },
   methods: {
-    getList () { 
-      roleQueryPage({ 
+    getList () {
+      roleQueryPage({
         organId: this.organId,
         rows: this.pageInfo.limit,
         page: this.pageInfo.page
       }).then(res => {
-        if(res.code == 200 && res.data) {
+        if (res.code == 200 && res.data) {
           this.tableList = res.data.rows
           this.pageInfo.total = res.data.total
 
         }
       })
     },
-    onAdminOperation(type, row) {
+    onAdminOperation (type, row) {
       let params = {
         path: '/specialSetup/adminoperation',
         query: {
           type: type
         }
       }
-      if(row) {
+      if (row) {
         params.query.id = row.id
       }
       this.$router.push(params)
@@ -83,7 +90,7 @@ export default {
 </script>
 <style lang="scss">
 .headerName {
-  background-color: #EDEEF0 !important;
-  color: #444444; 
+  background-color: #edeef0 !important;
+  color: #444444;
 }
 </style>

src/views/categroyManager/insideSetting/adminOperation.vue

@@ -1,36 +1,45 @@
 <template>
   <div class='m-container'>
     <h2>
-      <el-page-header @back="onCancel" :content="(pageType == 'create' ? '添加' : '修改') + '角色'"></el-page-header>
+      <el-page-header @back="onCancel"
+                      :content="(pageType == 'create' ? '添加' : '修改') + '角色'"></el-page-header>
     </h2>
     <div class="m-core">
-      <el-form ref="form" label-width="120px" width="500px">
-        <el-form-item label="角色名称" prop="roleName">
+      <el-form ref="form"
+               label-width="120px"
+               width="500px">
+        <el-form-item label="角色名称"
+                      prop="roleName">
           <el-input v-model="result.roleName"></el-input>
         </el-form-item>
         <el-form-item label="角色描述">
-          <el-input type="textarea" v-model="result.roleDesc"></el-input>
+          <el-input type="textarea"
+                    v-model="result.roleDesc"></el-input>
         </el-form-item>
         <el-form-item label="基本权限">
-          <el-checkbox :indeterminate="isIndeterminate" @change="onCheckAll" v-model="checkAll">全选</el-checkbox>
-          <el-tree
-            :data="data"
-            show-checkbox
-            node-key="id"
-            @check="onTreeCheck"
-            ref="tree"
-            accordion
-            highlight-current
-            :default-checked-keys="result.menuIds"
-            :props="defaultProps">
+          <el-checkbox :indeterminate="isIndeterminate"
+                       @change="onCheckAll"
+                       v-model="checkAll">全选</el-checkbox>
+          <el-tree :data="data"
+                   show-checkbox
+                   node-key="id"
+                   @check="onTreeCheck"
+                   ref="tree"
+                   accordion
+                   highlight-current
+                   :default-checked-keys="result.menuIds"
+                   :props="defaultProps">
             <div slot-scope="{ node, data }">
               {{ node.label }}
-              <el-tag v-if="data.type == 1" size="mini" effect="dark">按钮</el-tag>
+              <el-tag v-if="data.type == 1"
+                      size="mini"
+                      effect="dark">按钮</el-tag>
             </div>
           </el-tree>
         </el-form-item>
         <el-form-item>
-          <el-button @click="onSubmit" type="primary">立即{{ pageType == "create" ? '创建' : '修改' }}</el-button>
+          <el-button @click="onSubmit"
+                     type="primary">立即{{ pageType == "create" ? '创建' : '修改' }}</el-button>
           <el-button @click="onReSet('form')">重置</el-button>
         </el-form-item>
       </el-form>
@@ -46,7 +55,7 @@ export default {
   name: 'adminManager',
   data () {
     return {
-      organId: store.getters.organ,
+      organId: null,
       pageType: this.$route.query.type,
       id: this.$route.query.id,
       isIndeterminate: false,
@@ -65,15 +74,15 @@ export default {
       slideCount: 0
     }
   },
-  mounted() {
+  mounted () {
     this.lookSilder()
   },
   methods: {
-    onSubmit() {
+    onSubmit () {
       let tempIds = this.$refs.tree.getCheckedKeys()
       let halfIds = this.$refs.tree.getHalfCheckedKeys()
       let allIds = [...tempIds, ...halfIds]
-      if(this.pageType == 'update') {
+      if (this.pageType == 'update') {
         roleUpdate({
           id: this.id,
           organId: this.organId,
@@ -83,7 +92,7 @@ export default {
         }).then(res => {
           this.messageTips('修改', res)
         })
-      } else if(this.pageType == 'create') {
+      } else if (this.pageType == 'create') {
         roleAdd({
           organId: this.organId,
           roleDesc: this.result.roleDesc,
@@ -94,25 +103,25 @@ export default {
         })
       }
     },
-    messageTips(title, res) {
-      if(res.code == 200) {
+    messageTips (title, res) {
+      if (res.code == 200) {
         this.$message.success('修改成功')
         this.$router.push('/specialSetup/adminManager')
       } else {
         this.$message.error(res.msg)
       }
     },
-    async lookSilder () { 
+    async lookSilder () {
       let silderList = await getSilder({ hid: 0 })
       let tempData = []
-      if(silderList.code == 200) {
+      if (silderList.code == 200) {
         tempData = this.setTableData(silderList.data)
         this.data = tempData
       }
 
-      if(this.pageType == 'update') {
+      if (this.pageType == 'update') {
         let roleInfo = await getRoleInfo({ id: this.id })
-        if(roleInfo.code == 200) {
+        if (roleInfo.code == 200) {
           let roleData = roleInfo.data
           // 是否是全部选中
           this.checkAll = roleData.menuIds.length >= this.slideCount
@@ -127,13 +136,13 @@ export default {
         }
       }
     },
-    onTreeCheck() {
+    onTreeCheck () {
       let checkTree = this.$refs.tree.getCheckedKeys()
       this.checkAll = checkTree.length >= this.slideCount
       this.isIndeterminate = checkTree.length > 0 && checkTree.length < this.slideCount
     },
-    onCheckAll(val) {
-      if(val) {
+    onCheckAll (val) {
+      if (val) {
         this.$refs.tree.setCheckedNodes(this.data)
       } else {
         this.$refs.tree.setCheckedNodes([])
@@ -141,33 +150,33 @@ export default {
     },
 
     //递归获取到所有的为子级的ID
-    getParent(checkIds, data){
+    getParent (checkIds, data) {
       let removeIds = JSON.parse(JSON.stringify(checkIds))
       this.getAllChildIds(data)
       let tempAllChildIds = this.allChildIds
-      for(let i = checkIds.length; i > 0; i--) {
-        if(!tempAllChildIds.includes(checkIds[i - 1])) {
+      for (let i = checkIds.length; i > 0; i--) {
+        if (!tempAllChildIds.includes(checkIds[i - 1])) {
           removeIds.splice(i - 1, 1)
         }
       }
       return removeIds
     },
-    getAllChildIds(data) {
+    getAllChildIds (data) {
       // 获取所有最子集编号
       let child = this.allChildIds
       let tempList = []
       data.forEach((item, index) => {
         let temp = []
-        if(item.children && item.children.length > 0) {
+        if (item.children && item.children.length > 0) {
           temp = this.getAllChildIds(item.children)
         } else {
           child.push(item.id)
         }
       })
     },
-    setTableData(result) {
+    setTableData (result) {
       let list = []
-      list = result.map( res => {
+      list = result.map(res => {
         let tempList = {}
         tempList = {
           id: res.id,
@@ -180,14 +189,14 @@ export default {
           parentId: res.parentId
         }
         this.slideCount++
-        if(res.sysMenus && res.sysMenus.length > 0) {
-            tempList.children = this.setTableData(res.sysMenus)
+        if (res.sysMenus && res.sysMenus.length > 0) {
+          tempList.children = this.setTableData(res.sysMenus)
         }
         return tempList
       })
       return list
     },
-    onReSet() {
+    onReSet () {
       this.$refs.tree.setCheckedNodes([])
       this.result = {
         roleName: null,
@@ -195,7 +204,7 @@ export default {
       }
       this.checkAll = false
     },
-    onCancel() {
+    onCancel () {
       this.$router.push('/specialSetup/adminManager')
     }
   }
@@ -206,10 +215,12 @@ export default {
   background: #14928a;
   border-color: #14928a;
   color: #fff;
-  &:hover, &:active, &:focus {
+  &:hover,
+  &:active,
+  &:focus {
     background: #14928a;
     border-color: #14928a;
-    color: #FFF;
+    color: #fff;
   }
 }
 .el-row {

src/views/categroyManager/insideSetting/branchActive.vue

@@ -1,29 +1,38 @@
 <template>
   <div class='m-container'>
-    <h2><div class="squrt"></div>VIP分部活动列表</h2>
+    <h2>
+      <div class="squrt"></div>VIP分部活动列表
+    </h2>
     <div class="m-core">
-      <div @click="openActive('create')" class='newBand'>新建</div>
+      <div @click="openActive('create')"
+           class='newBand'>新建</div>
       <!-- 搜索类型 -->
-      
+
       <!-- 列表 -->
       <div class="tableWrap">
-        <el-table :data='tableList' :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-          <el-table-column align='center' prop='name'
+        <el-table :data='tableList'
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+          <el-table-column align='center'
+                           prop='name'
                            label="分部活动名">
           </el-table-column>
-          <el-table-column align='center' prop='rewardMode'
+          <el-table-column align='center'
+                           prop='rewardMode'
                            label="分部活动类型">
             <template slot-scope="scope">
               {{ scope.row.rewardMode == 'PER' ? '累计奖励' : '阶梯奖励' }}
             </template>
           </el-table-column>
-          <el-table-column align='center' prop='organNameList'
+          <el-table-column align='center'
+                           prop='organNameList'
                            label="适用分部">
           </el-table-column>
           <el-table-column align='center'
-                           label="操作" width='100'>
+                           label="操作"
+                           width='100'>
             <template slot-scope="scope">
-              <el-button @click="openActive('update', scope.row)" type="text">修改</el-button>
+              <el-button @click="openActive('update', scope.row)"
+                         type="text">修改</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -49,7 +58,7 @@ export default {
       searchForm: {
         status: ''
       },
-      organId: store.getters.organ,
+      organId: null,
       searchLsit: [],
       tableList: [],
       pageInfo: {
@@ -59,38 +68,38 @@ export default {
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
-      
+
     }
   },
-  mounted() {
+  mounted () {
     this.getList() // 获取列表数据
   },
   methods: {
-    getList() {
+    getList () {
       courseScheduleRewards({
         organId: this.organId,
         rows: this.pageInfo.limit,
         page: this.pageInfo.page
       }).then(res => {
-        if(res.code == 200 && res.data) {
+        if (res.code == 200 && res.data) {
           this.tableList = res.data.rows
           this.pageInfo.total = res.data.total
         }
       })
     },
-    openActive(type, row) {
+    openActive (type, row) {
       let params = {
         path: '/vipClassSet/branchActiveOperation',
         query: {
           type: type
         }
       }
-      if(row) {
+      if (row) {
         params.query.id = row.id
       }
       this.$router.push(params)
     },
-    onFormClose(formName) { // 关闭弹窗重置验证
+    onFormClose (formName) { // 关闭弹窗重置验证
       this.$refs[formName].clearValidate()
     }
   }
@@ -101,10 +110,12 @@ export default {
   background: #14928a;
   border-color: #14928a;
   color: #fff;
-  &:hover, &:active, &:focus {
+  &:hover,
+  &:active,
+  &:focus {
     background: #14928a;
     border-color: #14928a;
-    color: #FFF;
+    color: #fff;
   }
 }
 .el-vue-search-box-container {

src/views/categroyManager/insideSetting/branchActiveOperation.vue

@@ -90,7 +90,7 @@ export default {
   name: 'adminManager',
   data () {
     return {
-      organId: store.getters.organ,
+      organId: null,
       pageType: this.$route.query.type,
       id: this.$route.query.id,
       branchList: [],

src/views/categroyManager/insideSetting/branchManager.vue

@@ -173,7 +173,7 @@ export default {
         job: null,  // 费用
         mobileNo: null,
         // ownershipType: null,
-        organId: store.getters.organ
+        organId: null
       },
       rules: {
         name: [{ required: true, message: '请输入教学点名称', trigger: 'blur' }],
@@ -258,7 +258,7 @@ export default {
         job: null,  // 费用
         mobileNo: null, // 合作单位
         ownershipType: null,
-        organId: store.getters.organ
+        organId: null
       }
       this.teachingStatus = true
       this.formActionTitle = type
@@ -271,7 +271,7 @@ export default {
           job: rows.job,  // 费用
           mobileNo: rows.mobileNo ? rows.mobileNo : null,
           ownershipType: rows.ownershipType,
-          organId: store.getters.organ
+          organId: null
         }
       }
     },

src/views/categroyManager/insideSetting/gradientSet.vue

@@ -3,83 +3,116 @@
     <!-- <h2>参数设置</h2> -->
     <div class="m-core">
       <!-- 列表 -->
-    <el-tabs tab-position="left">
+      <el-tabs tab-position="left">
         <el-tab-pane label="单技课">
-            <el-form :model="singleForm" label-width="100px" class="demo-dynamic">
-                <el-form-item style="margin-bottom: 0;">
-                    <span class="min">最小值</span>
-                    <span class="max">最大值</span>
+          <el-form :model="singleForm"
+                   label-width="100px"
+                   class="demo-dynamic">
+            <el-form-item style="margin-bottom: 0;">
+              <span class="min">最小值</span>
+              <span class="max">最大值</span>
+            </el-form-item>
+            <div class="moreRule">
+              <div class="moreRuleIn"
+                   v-for="(domain, index) in singleForm.domains"
+                   :key="domain.key">
+                <el-form-item :label="'梯度' + (index + 1)">
+                  <el-input type="number"
+                            :disabled="domain.disabled"
+                            v-model="domain.min"></el-input>
                 </el-form-item>
-                <div class="moreRule">
-                    <div class="moreRuleIn" v-for="(domain, index) in singleForm.domains" :key="domain.key">
-                        <el-form-item :label="'梯度' + (index + 1)">
-                            <el-input type="number" :disabled="domain.disabled" v-model="domain.min"></el-input>
-                        </el-form-item>
-                        <el-form-item>
-                            <el-input type="number" :disabled="domain.disabled" v-model="domain.max"></el-input>
-                            <el-button v-if="index != 0 && !domain.disabled" @click.prevent="removeDomain(singleForm, domain)">删除</el-button>
-                        </el-form-item>
-                    </div>
-                    <div class="el-form-item__error" v-if="singleForm.errorText">{{ singleForm.errorText }}</div>
-                </div>
                 <el-form-item>
-                    <el-button @click="addDomain(singleForm)">新增梯度</el-button>
-                    <el-button @click="resetForm(singleForm)">重置</el-button>
-                    <el-button type="primary" @click="submitForm(singleForm)">设置</el-button>
+                  <el-input type="number"
+                            :disabled="domain.disabled"
+                            v-model="domain.max"></el-input>
+                  <el-button v-if="index != 0 && !domain.disabled"
+                             @click.prevent="removeDomain(singleForm, domain)">删除</el-button>
                 </el-form-item>
-            </el-form>
+              </div>
+              <div class="el-form-item__error"
+                   v-if="singleForm.errorText">{{ singleForm.errorText }}</div>
+            </div>
+            <el-form-item>
+              <el-button @click="addDomain(singleForm)">新增梯度</el-button>
+              <el-button @click="resetForm(singleForm)">重置</el-button>
+              <el-button type="primary"
+                         @click="submitForm(singleForm)">设置</el-button>
+            </el-form-item>
+          </el-form>
         </el-tab-pane>
         <el-tab-pane label="合奏课">
-            <el-form :model="mixForm" label-width="100px" class="demo-dynamic">
-                <el-form-item style="margin-bottom: 0;">
-                    <span class="min">最小值</span>
-                    <span class="max">最大值</span>
+          <el-form :model="mixForm"
+                   label-width="100px"
+                   class="demo-dynamic">
+            <el-form-item style="margin-bottom: 0;">
+              <span class="min">最小值</span>
+              <span class="max">最大值</span>
+            </el-form-item>
+            <div class="moreRule">
+              <div class="moreRuleIn"
+                   v-for="(domain, index) in mixForm.domains"
+                   :key="domain.key">
+                <el-form-item :label="'梯度' + (index + 1)">
+                  <el-input type="number"
+                            :disabled="domain.disabled"
+                            v-model="domain.min"></el-input>
                 </el-form-item>
-                <div class="moreRule">
-                    <div class="moreRuleIn" v-for="(domain, index) in mixForm.domains" :key="domain.key">
-                        <el-form-item :label="'梯度' + (index + 1)">
-                            <el-input type="number" :disabled="domain.disabled" v-model="domain.min"></el-input>
-                        </el-form-item>
-                        <el-form-item>
-                            <el-input type="number" :disabled="domain.disabled" v-model="domain.max"></el-input>
-                            <el-button v-if="index != 0 && !domain.disabled" @click.prevent="removeDomain(mixForm, domain)">删除</el-button>
-                        </el-form-item>
-                    </div>
-                    <div class="el-form-item__error" v-if="mixForm.errorText">{{ mixForm.errorText }}</div>
-                </div>
                 <el-form-item>
-                    <el-button @click="addDomain(mixForm)">新增梯度</el-button>
-                    <el-button @click="resetForm(mixForm)">重置</el-button>
-                    <el-button type="primary" @click="submitForm(mixForm)">设置</el-button>
+                  <el-input type="number"
+                            :disabled="domain.disabled"
+                            v-model="domain.max"></el-input>
+                  <el-button v-if="index != 0 && !domain.disabled"
+                             @click.prevent="removeDomain(mixForm, domain)">删除</el-button>
                 </el-form-item>
-            </el-form>
+              </div>
+              <div class="el-form-item__error"
+                   v-if="mixForm.errorText">{{ mixForm.errorText }}</div>
+            </div>
+            <el-form-item>
+              <el-button @click="addDomain(mixForm)">新增梯度</el-button>
+              <el-button @click="resetForm(mixForm)">重置</el-button>
+              <el-button type="primary"
+                         @click="submitForm(mixForm)">设置</el-button>
+            </el-form-item>
+          </el-form>
         </el-tab-pane>
         <el-tab-pane label="基础技能班">
-            <el-form :model="highForm" label-width="100px" class="demo-dynamic">
-                <el-form-item style="margin-bottom: 0;">
-                    <span class="min">最小值</span>
-                    <span class="max">最大值</span>
+          <el-form :model="highForm"
+                   label-width="100px"
+                   class="demo-dynamic">
+            <el-form-item style="margin-bottom: 0;">
+              <span class="min">最小值</span>
+              <span class="max">最大值</span>
+            </el-form-item>
+            <div class="moreRule">
+              <div class="moreRuleIn"
+                   v-for="(domain, index) in highForm.domains"
+                   :key="domain.key">
+                <el-form-item :label="'梯度' + (index + 1)">
+                  <el-input type="number"
+                            :disabled="domain.disabled"
+                            v-model="domain.min"></el-input>
                 </el-form-item>
-                <div class="moreRule">
-                    <div class="moreRuleIn" v-for="(domain, index) in highForm.domains" :key="domain.key">
-                        <el-form-item :label="'梯度' + (index + 1)">
-                            <el-input type="number" :disabled="domain.disabled" v-model="domain.min"></el-input>
-                        </el-form-item>
-                        <el-form-item>
-                            <el-input type="number" :disabled="domain.disabled" v-model="domain.max"></el-input>
-                            <el-button v-if="index != 0 && !domain.disabled" @click.prevent="removeDomain(highForm, domain)">删除</el-button>
-                        </el-form-item>
-                    </div>
-                    <div class="el-form-item__error" v-if="highForm.errorText">{{ highForm.errorText }}</div>
-                </div>
                 <el-form-item>
-                    <el-button @click="addDomain(highForm)">新增梯度</el-button>
-                    <el-button @click="resetForm(highForm)">重置</el-button>
-                    <el-button type="primary" @click="submitForm(highForm)">设置</el-button>
+                  <el-input type="number"
+                            :disabled="domain.disabled"
+                            v-model="domain.max"></el-input>
+                  <el-button v-if="index != 0 && !domain.disabled"
+                             @click.prevent="removeDomain(highForm, domain)">删除</el-button>
                 </el-form-item>
-            </el-form>
+              </div>
+              <div class="el-form-item__error"
+                   v-if="highForm.errorText">{{ highForm.errorText }}</div>
+            </div>
+            <el-form-item>
+              <el-button @click="addDomain(highForm)">新增梯度</el-button>
+              <el-button @click="resetForm(highForm)">重置</el-button>
+              <el-button type="primary"
+                         @click="submitForm(highForm)">设置</el-button>
+            </el-form-item>
+          </el-form>
         </el-tab-pane>
-    </el-tabs>
+      </el-tabs>
     </div>
   </div>
 </template>
@@ -92,164 +125,168 @@ export default {
   name: 'gradientset',
   data () {
     return {
-        organId: store.getters.organ,
-        singleForm: {
-            domains: [{
-                min: null,
-                max: null,
-                disabled: false,
-                key: Date.now()
-            }],
-            errorText: null,
-        },
-        mixForm: {
-            domains: [{
-                min: null,
-                max: null,
-                disabled: false,
-                key: Date.now()
-            }],
-            errorText: null,
-        },
-        highForm: {
-            domains: [{
-                min: null,
-                max: null,
-                disabled: false,
-                key: Date.now()
-            }],
-            errorText: null,
-        },
+      organId: null,
+      singleForm: {
+        domains: [{
+          min: null,
+          max: null,
+          disabled: false,
+          key: Date.now()
+        }],
+        errorText: null,
+      },
+      mixForm: {
+        domains: [{
+          min: null,
+          max: null,
+          disabled: false,
+          key: Date.now()
+        }],
+        errorText: null,
+      },
+      highForm: {
+        domains: [{
+          min: null,
+          max: null,
+          disabled: false,
+          key: Date.now()
+        }],
+        errorText: null,
+      },
     }
   },
-  mounted() {
+  mounted () {
     this.__init()
   },
   methods: {
-    __init() {
+    __init () {
       sysConfigList({ group: 'settlement_rule' }).then(res => {
-        if(res.code == 200 && res.data.length > 0) {
-            res.data.forEach(item => {
-                let domain = []
-                if(item.paranValue) {
-                    domain = JSON.parse(item.paranValue)
-                } else {
-                    domain = [{
-                        min: null,
-                        max: null,
-                        disabled: false,
-                        key: Date.now()
-                    }]
-                }
-                let tempArray = {
-                    domains: domain,
-                    errorText: null,
-                    paramName: item.paramName,
-                    id: item.id
-                }
-                if(item.paramName == 'sigle_gradient_settlement_rule') {
-                    this.singleForm = tempArray
-                }
-                if(item.paramName == "max_gradient_settlement_rule") {
-                    this.mixForm = tempArray
-                }
-                if(item.paramName == "high_gradient_settlement_rule") {
-                    this.highForm = tempArray
-                }
-            })
+        if (res.code == 200 && res.data.length > 0) {
+          res.data.forEach(item => {
+            let domain = []
+            if (item.paranValue) {
+              domain = JSON.parse(item.paranValue)
+            } else {
+              domain = [{
+                min: null,
+                max: null,
+                disabled: false,
+                key: Date.now()
+              }]
+            }
+            let tempArray = {
+              domains: domain,
+              errorText: null,
+              paramName: item.paramName,
+              id: item.id
+            }
+            if (item.paramName == 'sigle_gradient_settlement_rule') {
+              this.singleForm = tempArray
+            }
+            if (item.paramName == "max_gradient_settlement_rule") {
+              this.mixForm = tempArray
+            }
+            if (item.paramName == "high_gradient_settlement_rule") {
+              this.highForm = tempArray
+            }
+          })
         }
       })
     },
-    submitForm(form) {
-        this.addDomain(form, true)
-        if(!form.errorText) {
-            let params = {
-                id: form.id,
-                paranValue: JSON.stringify(form.domains),
-                paramName: form.paramName
-            }
-            sysConfigUpdate(params).then(res => {
-                if(res.code == 200) {
-                    this.$message.success('设置成功')
-                }
-            })
+    submitForm (form) {
+      this.addDomain(form, true)
+      if (!form.errorText) {
+        let params = {
+          id: form.id,
+          paranValue: JSON.stringify(form.domains),
+          paramName: form.paramName
         }
+        sysConfigUpdate(params).then(res => {
+          if (res.code == 200) {
+            this.$message.success('设置成功')
+          }
+        })
+      }
     },
-    resetForm(form) {
-        form.domains = [{
-            min: null,
-            max: null,
-            disabled: false
-        }]
-        form.errorText = null
+    resetForm (form) {
+      form.domains = [{
+        min: null,
+        max: null,
+        disabled: false
+      }]
+      form.errorText = null
     },
-    removeDomain(form, item) {
-        var index = form.domains.indexOf(item)
-        if (index !== -1) {
-            form.domains.splice(index, 1)
-            // 取消最后一个数据的禁用状态
-            form.domains[form.domains.length - 1].disabled = false
-            form.errorText = null
-        }
+    removeDomain (form, item) {
+      var index = form.domains.indexOf(item)
+      if (index !== -1) {
+        form.domains.splice(index, 1)
+        // 取消最后一个数据的禁用状态
+        form.domains[form.domains.length - 1].disabled = false
+        form.errorText = null
+      }
     },
-    addDomain(form, checked) {
-        // debugger
-        let domains = form.domains,
-            singleLength = domains.length,
-            lastDate = domains[singleLength - 1] // 获取倒数一个对象
-        if(!lastDate.min) {
-            form.errorText = '最小值不能为空'
-            return
-        }
-        if(singleLength <= 1 && parseInt(lastDate.min) < 0) {
-            form.errorText = '最小值不能小于0'
-            return
-        } else if(singleLength > 1 && parseInt(lastDate.min) <= parseInt(domains[singleLength - 2].max)) {
-            form.errorText = '最小值不能小于或等于上一个梯度的最大值'
-            return
-        }
+    addDomain (form, checked) {
+      // debugger
+      let domains = form.domains,
+        singleLength = domains.length,
+        lastDate = domains[singleLength - 1] // 获取倒数一个对象
+      if (!lastDate.min) {
+        form.errorText = '最小值不能为空'
+        return
+      }
+      if (singleLength <= 1 && parseInt(lastDate.min) < 0) {
+        form.errorText = '最小值不能小于0'
+        return
+      } else if (singleLength > 1 && parseInt(lastDate.min) <= parseInt(domains[singleLength - 2].max)) {
+        form.errorText = '最小值不能小于或等于上一个梯度的最大值'
+        return
+      }
 
-        if(!parseInt(lastDate.max)) {
-            form.errorText = '最大值不能为空'
-            return
-        } else if(parseInt(lastDate.max) <= parseInt(lastDate.min)) {
-            form.errorText = '最大值应大于该梯度的最小值'
-            return
-        }
+      if (!parseInt(lastDate.max)) {
+        form.errorText = '最大值不能为空'
+        return
+      } else if (parseInt(lastDate.max) <= parseInt(lastDate.min)) {
+        form.errorText = '最大值应大于该梯度的最小值'
+        return
+      }
+
+      form.errorText = null
+      if (!checked) {
+        lastDate.disabled = true
+        domains.push({
+          min: null,
+          max: null,
+          disabled: false,
+          key: Date.now()
+        })
+      }
 
-        form.errorText = null
-        if(!checked) {
-            lastDate.disabled = true
-            domains.push({
-                min: null,
-                max: null,
-                disabled: false,
-                key: Date.now()
-            })
-        }
-        
     }
   }
 }
 </script>
 <style lang="scss" scoped>
 /deep/.el-input-group__append {
-  background: #DCDFE6;
-  border-color: #DCDFE6;
-  &:hover, &:active, &:focus {
-    background: #DCDFE6;
-    border-color: #DCDFE6;
-    color: #FFF;
+  background: #dcdfe6;
+  border-color: #dcdfe6;
+  &:hover,
+  &:active,
+  &:focus {
+    background: #dcdfe6;
+    border-color: #dcdfe6;
+    color: #fff;
   }
 }
 .el-button--primary {
   background: #14928a;
   border-color: #14928a;
   color: #fff;
-  &:hover, &:active, &:focus {
+  &:hover,
+  &:active,
+  &:focus {
     background: #14928a;
     border-color: #14928a;
-    color: #FFF;
+    color: #fff;
   }
 }
 .el-row {
@@ -262,36 +299,38 @@ export default {
   justify-content: flex-end;
   margin-right: 50%;
 }
-.min, .max {
-    display: inline-block;
-    width: 180px;
-    text-align: center;
-    margin-right: 10px;
+.min,
+.max {
+  display: inline-block;
+  width: 180px;
+  text-align: center;
+  margin-right: 10px;
 }
-.el-input-group, .el-input {
+.el-input-group,
+.el-input {
   width: 180px;
   margin-right: 10px;
 }
 .moreRule {
-    position: relative;
-    .el-form-item__error {
-        color: #F56C6C;
-        font-size: 12px;
-        line-height: 1;
-        position: absolute;
-        left: 100px;
-        top: 100%;
-        margin-top: -21px;
-    }
+  position: relative;
+  .el-form-item__error {
+    color: #f56c6c;
+    font-size: 12px;
+    line-height: 1;
+    position: absolute;
+    left: 100px;
+    top: 100%;
+    margin-top: -21px;
+  }
 }
 .moreRuleIn {
-    .el-form-item {
-        display: inline-block;
-        &:last-child {
-            /deep/.el-form-item__content {
-                margin-left: 0 !important;
-            }
-        }
+  .el-form-item {
+    display: inline-block;
+    &:last-child {
+      /deep/.el-form-item__content {
+        margin-left: 0 !important;
+      }
     }
+  }
 }
 </style>

src/views/categroyManager/specialSetup/bannerManager.vue

@@ -5,7 +5,8 @@
       <div class='newBand'>添加</div>
       <!-- 列表 -->
       <div class="tableWrap">
-        <el-table :data='tableList' :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+        <el-table :data='tableList'
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}">
           <el-table-column align='center'
                            label="轮播图">
           </el-table-column>
@@ -49,16 +50,16 @@ export default {
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
-      organId: store.getters.organ
+      organId: null
     }
   },
-  mounted() {
+  mounted () {
     this.getList()
     this.getAreaList()
   },
   methods: {
-    messageTips(title, res) {
-      if(res.code == 200) {
+    messageTips (title, res) {
+      if (res.code == 200) {
         this.$message.success(title + '成功')
         this.branchStatus = false
         this.getList()
@@ -66,8 +67,8 @@ export default {
         this.$message.error(res.msg)
       }
     },
-    getList () { 
-      
+    getList () {
+
     }
   }
 }
@@ -77,13 +78,15 @@ export default {
   background: #14928a;
   border-color: #14928a;
   color: #fff;
-  &:hover, &:active, &:focus {
+  &:hover,
+  &:active,
+  &:focus {
     background: #14928a;
     border-color: #14928a;
-    color: #FFF;
+    color: #fff;
   }
 }
-.el-date-editor.el-input{
+.el-date-editor.el-input {
   width: 100% !important;
 }
 .el-select {

src/views/categroyManager/specialSetup/branchSetting.vue

@@ -1,18 +1,25 @@
 <template>
   <div class='m-container'>
-    <h2><div class="squrt"></div>分部设置</h2>
+    <h2>
+      <div class="squrt"></div>分部设置
+    </h2>
     <div class="m-core">
-      <div @click="onBranchOperation('create')" class='newBand'>添加</div>
+      <div @click="onBranchOperation('create')"
+           class='newBand'>添加</div>
       <!-- 列表 -->
       <div class="tableWrap">
-        <el-table :data='tableList' :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-          <el-table-column align='center' prop="name"
+        <el-table :data='tableList'
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+          <el-table-column align='center'
+                           prop="name"
                            label="分部名称">
           </el-table-column>
-          <el-table-column align='center' prop="areaName"
+          <el-table-column align='center'
+                           prop="areaName"
                            label="城市">
           </el-table-column>
-          <el-table-column align='center' prop="address"
+          <el-table-column align='center'
+                           prop="address"
                            label="分部地址">
           </el-table-column>
           <el-table-column align='center'
@@ -24,7 +31,8 @@
           <el-table-column align='center'
                            label="操作">
             <template slot-scope="scope">
-              <el-button @click="onBranchOperation('update', scope.row)" type="text">修改</el-button>
+              <el-button @click="onBranchOperation('update', scope.row)"
+                         type="text">修改</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -36,45 +44,67 @@
       </div>
     </div>
 
-    <el-dialog :title="formTitle[formActionTitle]" :visible.sync="branchStatus" @close="onFormClose('ruleForm')" width="500px">
-      <el-form :model="form" :rules="rules" ref="ruleForm">
-        <el-form-item label="分部名称" prop="name" :label-width="formLabelWidth">
-          <el-input v-model="form.name" autocomplete="off"></el-input>
+    <el-dialog :title="formTitle[formActionTitle]"
+               :visible.sync="branchStatus"
+               @close="onFormClose('ruleForm')"
+               width="500px">
+      <el-form :model="form"
+               :rules="rules"
+               ref="ruleForm">
+        <el-form-item label="分部名称"
+                      prop="name"
+                      :label-width="formLabelWidth">
+          <el-input v-model="form.name"
+                    autocomplete="off"></el-input>
         </el-form-item>
-        <el-form-item label="城市" required :label-width="formLabelWidth">
+        <el-form-item label="城市"
+                      required
+                      :label-width="formLabelWidth">
           <el-col :span="12">
             <el-form-item prop="province">
-              <el-select v-model="form.province" @change="onChangeProvince">
-                <el-option v-for="item in provinceList" :key="item.value" 
-                  :label="item.label" :value="item.value"></el-option>
+              <el-select v-model="form.province"
+                         @change="onChangeProvince">
+                <el-option v-for="item in provinceList"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item prop="city">
               <el-select v-model="form.city">
-            <el-option v-for="item in cityList" :key="item.value" 
-              :label="item.label" :value="item.value"></el-option>
-          </el-select>
+                <el-option v-for="item in cityList"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value"></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-form-item>
-        <el-form-item label="分部地址" prop="address" :label-width="formLabelWidth">
-          <el-input v-model="form.address" autocomplete="off"></el-input>
+        <el-form-item label="分部地址"
+                      prop="address"
+                      :label-width="formLabelWidth">
+          <el-input v-model="form.address"
+                    autocomplete="off"></el-input>
         </el-form-item>
-        <el-form-item label="成立时间" prop="registerDate" :label-width="formLabelWidth">
+        <el-form-item label="成立时间"
+                      prop="registerDate"
+                      :label-width="formLabelWidth">
           <el-date-picker v-model="form.registerDate"
-            type="date" value-format="yyyy-MM-dd" 
-            placeholder="选择日期"></el-date-picker>
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择日期"></el-date-picker>
         </el-form-item>
       </el-form>
-      <span slot="footer" class="dialog-footer">
+      <span slot="footer"
+            class="dialog-footer">
         <el-button @click="branchStatus = false">取 消</el-button>
-        <el-button @click="onBranchSubmit('ruleForm')" type="primary">确 定</el-button>
+        <el-button @click="onBranchSubmit('ruleForm')"
+                   type="primary">确 定</el-button>
       </span>
     </el-dialog>
 
-
   </div>
 </template>
 <script>
@@ -94,7 +124,7 @@ export default {
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
-      organId: store.getters.organ,
+      organId: null,
       formActionTitle: 'create',
       formTitle: {
         create: '添加分部',
@@ -112,39 +142,39 @@ export default {
         registerDate: null
       },
       rules: {
-        name: [{required: true, message: '请输入分部名称', trigger: 'blur'}],
-        province: [{required: true, message: '请选择省', trigger: 'change'}],
-        city: [{required: true, message: '请选择市', trigger: 'change'}],
-        address: [{required: true, message: '请输入分部地址', trigger: 'blur'}],
-        registerDate:[{ required: true, message: '请选择成立时间', trigger: 'change'}]
+        name: [{ required: true, message: '请输入分部名称', trigger: 'blur' }],
+        province: [{ required: true, message: '请选择省', trigger: 'change' }],
+        city: [{ required: true, message: '请选择市', trigger: 'change' }],
+        address: [{ required: true, message: '请输入分部地址', trigger: 'blur' }],
+        registerDate: [{ required: true, message: '请选择成立时间', trigger: 'change' }]
       }
     }
   },
-  mounted() {
+  mounted () {
     this.getList()
     this.getAreaList()
   },
   methods: {
-    onBranchSubmit(formName) {
+    onBranchSubmit (formName) {
       this.$refs[formName].validate(valid => {
-        if(!valid) return
+        if (!valid) return
         this.form.areaId = this.form.city
-        if(this.formActionTitle == 'create') {
-          if(this.form.id) { // 判断有没有Id，如果有则删除
+        if (this.formActionTitle == 'create') {
+          if (this.form.id) { // 判断有没有Id，如果有则删除
             delete this.form.id
           }
           branchAdd(this.form).then(res => {
             this.messageTips('添加', res)
           })
-        } else if(this.formActionTitle == 'update') {
+        } else if (this.formActionTitle == 'update') {
           branchUpdate(this.form).then(res => {
             this.messageTips('修改', res)
           })
         }
       })
     },
-    messageTips(title, res) {
-      if(res.code == 200) {
+    messageTips (title, res) {
+      if (res.code == 200) {
         this.$message.success(title + '成功')
         this.branchStatus = false
         this.getList()
@@ -152,53 +182,53 @@ export default {
         this.$message.error(res.msg)
       }
     },
-    getList () { 
+    getList () {
       branchQueryPage({
         rows: this.pageInfo.limit,
         page: this.pageInfo.page
       }).then(res => {
-        if(res.code == 200 && res.data) {
+        if (res.code == 200 && res.data) {
           this.tableList = res.data.rows
           this.pageInfo.total = res.data.total
         }
       })
     },
-    onFormClose(formName) { // 关闭弹窗重置验证
+    onFormClose (formName) { // 关闭弹窗重置验证
       this.$refs[formName].resetFields()
     },
-    getAreaList(parentId, callback) {
+    getAreaList (parentId, callback) {
       parentId = parentId ? parentId : 0
       areaQueryChild({ parentId: parentId }).then(res => {
-        if(res.code == 200 && res.data) {
+        if (res.code == 200 && res.data) {
           let tempData = []
           res.data.forEach(item => {
             tempData.push({
-                label: item.name,
-                value: item.id
+              label: item.name,
+              value: item.id
             })
           })
-          if(parentId) {
+          if (parentId) {
             this.cityList = tempData
           } else {
             this.provinceList = tempData
           }
 
-          if(callback && typeof callback == 'function') {
+          if (callback && typeof callback == 'function') {
             callback()
           }
         }
       })
     },
-    onChangeProvince(val) {
+    onChangeProvince (val) {
       this.form.city = null
       this.getAreaList(val)
     },
-    onBranchOperation(type, row) { // 修改分部信息
+    onBranchOperation (type, row) { // 修改分部信息
       this.formActionTitle = type
       this.branchStatus = true
-      if(type == 'update') {
+      if (type == 'update') {
         getParentArea({ id: row.areaId }).then(res => {
-          if(res.code == 200 && res.data) {
+          if (res.code == 200 && res.data) {
             this.getAreaList(res.data.id, () => {
               this.form = {
                 id: row.id,
@@ -207,14 +237,14 @@ export default {
                 city: row.areaId,
                 address: row.address,
                 registerDate: row.registerDate
-              } 
+              }
             })
-            
+
           }
         })
       }
     }
-    
+
   }
 }
 </script>
@@ -223,13 +253,15 @@ export default {
   background: #14928a;
   border-color: #14928a;
   color: #fff;
-  &:hover, &:active, &:focus {
+  &:hover,
+  &:active,
+  &:focus {
     background: #14928a;
     border-color: #14928a;
-    color: #FFF;
+    color: #fff;
   }
 }
-.el-date-editor.el-input{
+.el-date-editor.el-input {
   width: 100% !important;
 }
 .el-select {

src/views/categroyManager/specialSetup/chargesList.vue

@@ -2,21 +2,27 @@
   <div class='m-container'>
     <!-- <h2>收费类型设置</h2> -->
     <div class="m-core">
-      <div @click="onChargeOperation('create')" class='newBand'>添加</div>
+      <div @click="onChargeOperation('create')"
+           class='newBand'>添加</div>
       <div class="tableWrap">
         <el-table :data="dataList"
-                :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-          <el-table-column prop="organName" label="所属分部" >
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+          <el-table-column prop="organName"
+                           label="所属分部">
           </el-table-column>
-          <el-table-column prop="chargeTypeName" label="收费类型" >
+          <el-table-column prop="chargeTypeName"
+                           label="收费类型">
           </el-table-column>
-          <el-table-column prop="courseFee" label="收费标准" >
+          <el-table-column prop="courseFee"
+                           label="收费标准">
           </el-table-column>
           <el-table-column align='center'
-                          label="操作">
+                           label="操作">
             <template slot-scope="scope">
-              <el-button @click="onChargeOperation('update', scope.row)" type="text">修改</el-button>
-              <el-button @click="onChargeDelete(scope.row)" type="text">删除</el-button>
+              <el-button @click="onChargeOperation('update', scope.row)"
+                         type="text">修改</el-button>
+              <el-button @click="onChargeDelete(scope.row)"
+                         type="text">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -27,35 +33,48 @@
                     @pagination="getList" />
       </div>
 
-      <el-dialog :title="formTitle[formActionTitle]" :visible.sync="chargeStatus" @close="onFormClose('ruleForm')" width="500px">
-        <el-form :model="form" :rules="rules" ref="ruleForm">
-          <el-form-item label="所属分部" prop="organId" :label-width="formLabelWidth">
+      <el-dialog :title="formTitle[formActionTitle]"
+                 :visible.sync="chargeStatus"
+                 @close="onFormClose('ruleForm')"
+                 width="500px">
+        <el-form :model="form"
+                 :rules="rules"
+                 ref="ruleForm">
+          <el-form-item label="所属分部"
+                        prop="organId"
+                        :label-width="formLabelWidth">
             <el-select v-model="form.organId">
-              <el-option
-                v-for="(item, index) in branchList"
-                :key="index"
-                :label="item.label"
-                :value="item.value">
+              <el-option v-for="(item, index) in branchList"
+                         :key="index"
+                         :label="item.label"
+                         :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="收费类型" prop="chargeTypeId" :label-width="formLabelWidth">
+          <el-form-item label="收费类型"
+                        prop="chargeTypeId"
+                        :label-width="formLabelWidth">
             <el-select v-model="form.chargeTypeId">
-              <el-option
-                v-for="(item, index) in typesList"
-                :key="index"
-                :label="item.label"
-                :value="item.value">
+              <el-option v-for="(item, index) in typesList"
+                         :key="index"
+                         :label="item.label"
+                         :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="收费标准" prop="courseFee" :label-width="formLabelWidth">
-            <el-input type="number" v-model="form.courseFee" autocomplete="off"></el-input>
+          <el-form-item label="收费标准"
+                        prop="courseFee"
+                        :label-width="formLabelWidth">
+            <el-input type="number"
+                      v-model="form.courseFee"
+                      autocomplete="off"></el-input>
           </el-form-item>
         </el-form>
-        <span slot="footer" class="dialog-footer">
+        <span slot="footer"
+              class="dialog-footer">
           <el-button @click="chargeStatus = false">取 消</el-button>
-          <el-button @click="onTypesSubmit('ruleForm')" type="primary">确 定</el-button>
+          <el-button @click="onTypesSubmit('ruleForm')"
+                     type="primary">确 定</el-button>
         </span>
       </el-dialog>
     </div>
@@ -84,7 +103,7 @@ export default {
       form: {
         chargeTypeId: null,
         courseFee: null,
-        organId: store.getters.organ
+        organId: null
       },
       rules: {
         courseFee: [{ required: true, message: '请输入收费标准', trigger: 'blur' }],
@@ -100,15 +119,15 @@ export default {
       }
     }
   },
-  mounted() {
+  mounted () {
     this.getList()
-    
+
     // 收费类型
     chargeTypeList({
       rows: 9999,
       page: 1
     }).then(res => {
-      if(res.code == 200) {
+      if (res.code == 200) {
         res.data.rows.forEach(item => {
           this.typesList.push({
             label: item.name,
@@ -123,7 +142,7 @@ export default {
       rows: 9999,
       page: 1
     }).then(res => {
-      if(res.code == 200) {
+      if (res.code == 200) {
         res.data.rows.forEach(item => {
           this.branchList.push({
             label: item.name,
@@ -137,14 +156,14 @@ export default {
     onTypesSubmit (formName) { // 添加数据
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          if(this.formActionTitle == 'create') {
-            if(this.form.id) { // 判断有没有Id，如果有则删除
+          if (this.formActionTitle == 'create') {
+            if (this.form.id) { // 判断有没有Id，如果有则删除
               delete this.form.id
             }
             chargeTypeOrganizationFeeAdd(this.form).then(res => {
               this.messageTips('添加', res)
             })
-          } else if(this.formActionTitle == 'update') {
+          } else if (this.formActionTitle == 'update') {
             chargeTypeOrganizationFeeUpdate(this.form).then(res => {
               this.messageTips('修改', res)
             })
@@ -154,8 +173,8 @@ export default {
         }
       })
     },
-    messageTips(title, res) {
-      if(res.code == 200) {
+    messageTips (title, res) {
+      if (res.code == 200) {
         this.$message.success(title + '成功')
         this.chargeStatus = false
         this.getList()
@@ -163,11 +182,11 @@ export default {
         this.$message.error(res.msg)
       }
     },
-    onChargeOperation(type, row) {
+    onChargeOperation (type, row) {
       this.chargeStatus = true
       this.formActionTitle = type
 
-      if(type == 'update') {
+      if (type == 'update') {
         this.form = {
           chargeTypeId: row.chargeTypeId,
           courseFee: row.courseFee,
@@ -176,7 +195,7 @@ export default {
         }
       }
     },
-    onChargeDelete(row){ // 删除
+    onChargeDelete (row) { // 删除
       this.$confirm('您确定删除该收费标准?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -186,14 +205,14 @@ export default {
           this.messageTips('删除', res)
         })
       }).catch(() => { })
-      
+
     },
-    getList () { 
+    getList () {
       chargeTypeOrganizationFee({
         rows: this.pageInfo.limit,
         page: this.pageInfo.page
       }).then(res => {
-        if(res.code == 200) {
+        if (res.code == 200) {
           this.dataList = res.data.rows
           this.pageInfo.total = res.data.total
         }
@@ -201,9 +220,9 @@ export default {
     },
     onFormClose (formName) { // 关闭弹窗重置验证
       this.form = {
-        courseFee: null, 
+        courseFee: null,
         chargeTypeId: null,
-        organId: store.getters.organ
+        organId: null
       }
       this.$refs[formName].resetFields()
     },
@@ -215,13 +234,15 @@ export default {
   background: #14928a;
   border-color: #14928a;
   color: #fff;
-  &:hover, &:active, &:focus {
+  &:hover,
+  &:active,
+  &:focus {
     background: #14928a;
     border-color: #14928a;
-    color: #FFF;
+    color: #fff;
   }
 }
-.el-date-editor.el-input{
+.el-date-editor.el-input {
   width: 100% !important;
 }
 .el-select {

src/views/categroyManager/specialSetup/jobTemplateSetting.vue

@@ -2,14 +2,18 @@
   <div class='m-container'>
     <!-- <h2>作业模板管理</h2> -->
     <div class="m-core">
-      <div class='newBand' @click="openJob('create')">添加</div>
+      <div class='newBand'
+           @click="openJob('create')">添加</div>
       <!-- 列表 -->
       <div class="tableWrap">
-        <el-table :data='tableList' :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-          <el-table-column align='center' prop="name"
+        <el-table :data='tableList'
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+          <el-table-column align='center'
+                           prop="name"
                            label="作业模板名称">
           </el-table-column>
-          <el-table-column align='center' prop="classGroupTypeName"
+          <el-table-column align='center'
+                           prop="classGroupTypeName"
                            label="对应课程类型">
           </el-table-column>
           <el-table-column align='center'
@@ -18,14 +22,17 @@
               {{ scope.row.subjectName ? scope.row.subjectName : '无' }}
             </template>
           </el-table-column>
-          <el-table-column align='center' prop="content"
+          <el-table-column align='center'
+                           prop="content"
                            label="模板内容">
           </el-table-column>
           <el-table-column align='center'
                            label="操作">
             <template slot-scope="scope">
-              <el-button @click="openJob('update', scope.row)" type="text">修改</el-button>
-              <el-button @click="onJobDel(scope.row)" type="text">删除</el-button>
+              <el-button @click="openJob('update', scope.row)"
+                         type="text">修改</el-button>
+              <el-button @click="onJobDel(scope.row)"
+                         type="text">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -36,44 +43,60 @@
                     @pagination="getList" />
       </div>
 
-      <el-dialog :title="formTitle[formActionTitle]" :visible.sync="jobStatus"
-               @close="onFormClose('ruleForm')" width="500px">
-      <el-form :model="form" :rules="rules" ref="ruleForm">
-        <el-form-item label="作业模板名称" prop="name" :label-width="formLabelWidth">
-          <el-input v-model="form.name" autocomplete="off"></el-input>
-        </el-form-item>
-        <el-form-item label="对应课程类型" prop="classGroupType" :label-width="formLabelWidth">
-          <el-radio-group :disabled="formActionTitle == 'update' ? true: false" v-model="form.classGroupType">
-            <el-radio label="NORMAL">单技课</el-radio>
-            <el-radio label="MIX">合奏课</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="声部选择" v-if="form.classGroupType != 'MIX'"
-          prop="subjectId" :label-width="formLabelWidth">
-          <el-select v-model="form.subjectId">
-              <el-option-group
-                v-for="group in subjectList"
-                :key="group.label"
-                :label="group.label">
-                <el-option
-                  v-for="item in group.options"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
+      <el-dialog :title="formTitle[formActionTitle]"
+                 :visible.sync="jobStatus"
+                 @close="onFormClose('ruleForm')"
+                 width="500px">
+        <el-form :model="form"
+                 :rules="rules"
+                 ref="ruleForm">
+          <el-form-item label="作业模板名称"
+                        prop="name"
+                        :label-width="formLabelWidth">
+            <el-input v-model="form.name"
+                      autocomplete="off"></el-input>
+          </el-form-item>
+          <el-form-item label="对应课程类型"
+                        prop="classGroupType"
+                        :label-width="formLabelWidth">
+            <el-radio-group :disabled="formActionTitle == 'update' ? true: false"
+                            v-model="form.classGroupType">
+              <el-radio label="NORMAL">单技课</el-radio>
+              <el-radio label="MIX">合奏课</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="声部选择"
+                        v-if="form.classGroupType != 'MIX'"
+                        prop="subjectId"
+                        :label-width="formLabelWidth">
+            <el-select v-model="form.subjectId">
+              <el-option-group v-for="group in subjectList"
+                               :key="group.label"
+                               :label="group.label">
+                <el-option v-for="item in group.options"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
                 </el-option>
               </el-option-group>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="作业内容" prop="content" :label-width="formLabelWidth">
-          <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4}" placeholder="请输入内容" v-model="form.content"></el-input>
-        </el-form-item>
-      </el-form>
-      <span slot="footer"
-            class="dialog-footer">
-        <el-button @click="jobStatus = false">取 消</el-button>
-        <el-button type="primary" @click="onJobSubmit('ruleForm')">确 定</el-button>
-      </span>
-    </el-dialog>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="作业内容"
+                        prop="content"
+                        :label-width="formLabelWidth">
+            <el-input type="textarea"
+                      :autosize="{ minRows: 2, maxRows: 4}"
+                      placeholder="请输入内容"
+                      v-model="form.content"></el-input>
+          </el-form-item>
+        </el-form>
+        <span slot="footer"
+              class="dialog-footer">
+          <el-button @click="jobStatus = false">取 消</el-button>
+          <el-button type="primary"
+                     @click="onJobSubmit('ruleForm')">确 定</el-button>
+        </span>
+      </el-dialog>
     </div>
 
   </div>
@@ -81,7 +104,7 @@
 <script>
 import pagination from '@/components/Pagination/index'
 import store from '@/store'
-import { courseHomeworkTemplateList, subjectListTree, homeWorkUpdate, homeWorkAdd, homeWorkDel  } from '@/api/specialSetting'
+import { courseHomeworkTemplateList, subjectListTree, homeWorkUpdate, homeWorkAdd, homeWorkDel } from '@/api/specialSetting'
 export default {
   components: { pagination },
   name: 'adminManager',
@@ -101,7 +124,7 @@ export default {
         classGroupType: null,
         subjectId: null,
         content: null,
-        organId: store.getters.organ
+        organId: null
       },
       rules: {
         name: [{ required: true, message: '请输入作业模板名称', trigger: 'blur' }],
@@ -116,10 +139,10 @@ export default {
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
-      organId: store.getters.organ
+      organId: null
     }
   },
-  mounted() {
+  mounted () {
     this.getList()
     this.getSubjectTree()
   },
@@ -128,14 +151,14 @@ export default {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           if (this.formActionTitle == 'create') {
-            if(this.form.id) { // 判断有没有Id，如果有则删除
+            if (this.form.id) { // 判断有没有Id，如果有则删除
               delete this.form.id
             }
             homeWorkAdd(this.form).then(res => {
               this.messageTips('添加', res)
             })
           } else if (this.formActionTitle == 'update') {
-            if(this.form.classGroupType == 'MIX') {
+            if (this.form.classGroupType == 'MIX') {
               this.form.subjectId = ''
             }
             homeWorkUpdate(this.form).then(res => {
@@ -158,17 +181,17 @@ export default {
           classGroupType: row.classGroupType,
           subjectId: row.subjectId,
           content: row.content,
-          organId: store.getters.organ
+          organId: null
         }
       }
     },
-    onJobDel(row) {
+    onJobDel (row) {
       homeWorkDel(row.id).then(res => {
         this.messageTips('删除', res)
       })
     },
-    messageTips(title, res) {
-      if(res.code == 200) {
+    messageTips (title, res) {
+      if (res.code == 200) {
         this.$message.success(title + '成功')
         this.jobStatus = false
         this.getList()
@@ -176,7 +199,7 @@ export default {
         this.$message.error(res.msg)
       }
     },
-    getList () { 
+    getList () {
       courseHomeworkTemplateList({
         delFlag: 0,
         organId: this.organId,
@@ -195,17 +218,17 @@ export default {
         classGroupType: null,
         subjectId: null,
         content: null,
-        organId: store.getters.organ
+        organId: null
       }
       this.$refs[formName].resetFields()
     },
-    getSubjectTree() { // 获取声部列表
+    getSubjectTree () { // 获取声部列表
       subjectListTree({
         delFlag: 0,
         rows: 9999
       }).then(res => {
         let result = res.data
-        if(res.code == 200) {
+        if (res.code == 200) {
           let tempArray = []
           result.rows.forEach((item, index) => {
             let subject = []
@@ -215,7 +238,7 @@ export default {
                 label: s.name
               })
             })
-            
+
             tempArray[index] = {
               label: item.name,
               options: subject
@@ -225,7 +248,7 @@ export default {
         }
       })
     }
-    
+
   }
 }
 </script>
@@ -234,13 +257,15 @@ export default {
   background: #14928a;
   border-color: #14928a;
   color: #fff;
-  &:hover, &:active, &:focus {
+  &:hover,
+  &:active,
+  &:focus {
     background: #14928a;
     border-color: #14928a;
-    color: #FFF;
+    color: #fff;
   }
 }
-.el-date-editor.el-input{
+.el-date-editor.el-input {
   width: 100% !important;
 }
 .el-select {

src/views/categroyManager/specialSetup/musicalManager.vue

@@ -6,38 +6,70 @@
       <!-- 列表 -->
       <el-row class="music-title">
         <el-col :span="6">
-          一级分类 
-          <el-popover placement="right" width="300" trigger="click">
-            <el-input v-model="oneTypeName" size="medium" style="width: 73%" autocomplete="off"></el-input>
-            <el-button style="margin: 0;" @click="onAddMusic" type="primary" size="medium" >提交</el-button>
-            <el-button slot="reference" type="primary" size="mini" round icon="el-icon-plus">添加</el-button>
+          一级分类
+          <el-popover placement="right"
+                      width="300"
+                      trigger="click">
+            <el-input v-model="oneTypeName"
+                      size="medium"
+                      style="width: 73%"
+                      autocomplete="off"></el-input>
+            <el-button style="margin: 0;"
+                       @click="onAddMusic"
+                       type="primary"
+                       size="medium">提交</el-button>
+            <el-button slot="reference"
+                       type="primary"
+                       size="mini"
+                       round
+                       icon="el-icon-plus">添加</el-button>
           </el-popover>
-          
+
         </el-col>
         <el-col :span="18">
           二级分类
         </el-col>
       </el-row>
 
-      <el-row v-for="(item, index) in subjectList" :key="item.id">
+      <el-row v-for="(item, index) in subjectList"
+              :key="item.id">
         <el-col :span="6">
-          <el-button @click="subjectDelete(item)" icon="el-icon-delete" circle></el-button>
+          <el-button @click="subjectDelete(item)"
+                     icon="el-icon-delete"
+                     circle></el-button>
           <span class="one_name">{{ item.name }}</span>
         </el-col>
-        <el-col :span="18" class="tow_col">
-           
-          <el-tag v-for="s in item.subjects" :key="s.id" type="info" effect="dark"
-            closable :disable-transitions="false"
-            @close="subjectDelete(s)"> {{s.name}}</el-tag>
+        <el-col :span="18"
+                class="tow_col">
+
+          <el-tag v-for="s in item.subjects"
+                  :key="s.id"
+                  type="info"
+                  effect="dark"
+                  closable
+                  :disable-transitions="false"
+                  @close="subjectDelete(s)"> {{s.name}}</el-tag>
           <span style="display: inline-block;">
             <el-input class="input-new-tag"
-              v-if="item.inputStatus"
-              v-model="inputValue[index]" key="tag"
-              ref="saveTagInput"
-              size="small">
+                      v-if="item.inputStatus"
+                      v-model="inputValue[index]"
+                      key="tag"
+                      ref="saveTagInput"
+                      size="small">
             </el-input>
-            <el-button v-else key="tag" type="primary" size="mini" round icon="el-icon-plus" @click="item.inputStatus = true">添加</el-button>
-            <el-button v-if="item.inputStatus" type="info" size="mini" round icon="el-icon-check" @click="onSave(item, index)">保存</el-button>
+            <el-button v-else
+                       key="tag"
+                       type="primary"
+                       size="mini"
+                       round
+                       icon="el-icon-plus"
+                       @click="item.inputStatus = true">添加</el-button>
+            <el-button v-if="item.inputStatus"
+                       type="info"
+                       size="mini"
+                       round
+                       icon="el-icon-check"
+                       @click="onSave(item, index)">保存</el-button>
           </span>
         </el-col>
       </el-row>
@@ -54,19 +86,19 @@ export default {
   name: 'musicalManager',
   data () {
     return {
-      organId: store.getters.organ,
+      organId: null,
       oneTypeName: null, // 添加一级分类名称
       subjectList: [],
       inputValue: []
     }
   },
-  mounted() {
+  mounted () {
     this.getList()
   },
   methods: {
-    onAddMusic() {
+    onAddMusic () {
       // 添加一级分类 
-      if(!this.oneTypeName) return
+      if (!this.oneTypeName) return
       subjectUpset({
         parentSubjectId: 0,
         name: this.oneTypeName
@@ -74,9 +106,9 @@ export default {
         this.messageTips('添加', res)
       })
     },
-    onSave(item, index) { 
+    onSave (item, index) {
       // 添加二级分类 
-      if(!this.inputValue[index]) return
+      if (!this.inputValue[index]) return
       subjectUpset({
         parentSubjectId: item.id,
         name: this.inputValue[index]
@@ -84,7 +116,7 @@ export default {
         this.messageTips('添加', res)
       })
     },
-    subjectDelete(item) { // 删除分类
+    subjectDelete (item) { // 删除分类
       subjectUpset({
         delFlag: 'YES',
         id: item.id
@@ -92,21 +124,21 @@ export default {
         this.messageTips('删除', res)
       })
     },
-    messageTips(title, res) {
-      if(res.code == 200) {
+    messageTips (title, res) {
+      if (res.code == 200) {
         this.$message.success(title + '成功')
         this.getList()
       } else {
         this.$message.error(res.msg)
       }
     },
-    getList () { 
+    getList () {
       subjectListTree({
         delFlag: 0,
         rows: 9999
       }).then(res => {
         let result = res.data
-        if(res.code == 200) {
+        if (res.code == 200) {
           let tempArray = []
           result.rows.forEach(item => {
             item.inputStatus = false
@@ -132,7 +164,7 @@ export default {
   font-size: 14px;
   color: #444;
   .el-col {
-    background-color: #EDEEF0;
+    background-color: #edeef0;
     padding-left: 36px;
   }
   .el-button {
@@ -155,11 +187,13 @@ export default {
   }
   .tow_col {
     padding-left: 20px;
-    .el-button--primary{
+    .el-button--primary {
       background: #fff;
       border-color: #979797;
       color: #777;
-      &:hover, &:active, &:focus {
+      &:hover,
+      &:active,
+      &:focus {
         background: #fff;
         border-color: #979797;
         color: #777;
@@ -175,13 +209,15 @@ export default {
   background: #14928a;
   border-color: #14928a;
   color: #fff;
-  &:hover, &:active, &:focus {
+  &:hover,
+  &:active,
+  &:focus {
     background: #14928a;
     border-color: #14928a;
-    color: #FFF;
+    color: #fff;
   }
 }
-.el-date-editor.el-input{
+.el-date-editor.el-input {
   width: 100% !important;
 }
 .el-select {
@@ -203,11 +239,11 @@ export default {
   vertical-align: bottom;
 }
 .el-tag--dark.el-tag--info {
-  background-color: #F0F2F5;
-  border-color: #F0F2F5;
-  color: #5A5E66;
+  background-color: #f0f2f5;
+  border-color: #f0f2f5;
+  color: #5a5e66;
   /deep/.el-tag__close {
-    background-color: #C0C4CC;
+    background-color: #c0c4cc;
   }
 }
 </style>

src/views/categroyManager/specialSetup/tryClass.vue

@@ -5,7 +5,8 @@
       <!-- <div class='newBand'>新建</div> -->
       <!-- 列表 -->
       <div class="tableWrap">
-        <el-table :data='tableList' :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+        <el-table :data='tableList'
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}">
           <el-table-column align='center'
                            label="试听课可选专业">
           </el-table-column>
@@ -49,16 +50,16 @@ export default {
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
-      organId: store.getters.organ
+      organId: null
     }
   },
-  mounted() {
+  mounted () {
     this.getList()
     this.getAreaList()
   },
   methods: {
-    messageTips(title, res) {
-      if(res.code == 200) {
+    messageTips (title, res) {
+      if (res.code == 200) {
         this.$message.success(title + '成功')
         this.branchStatus = false
         this.getList()
@@ -66,8 +67,8 @@ export default {
         this.$message.error(res.msg)
       }
     },
-    getList () { 
-      
+    getList () {
+
     }
   }
 }
@@ -77,13 +78,15 @@ export default {
   background: #14928a;
   border-color: #14928a;
   color: #fff;
-  &:hover, &:active, &:focus {
+  &:hover,
+  &:active,
+  &:focus {
     background: #14928a;
     border-color: #14928a;
-    color: #FFF;
+    color: #fff;
   }
 }
-.el-date-editor.el-input{
+.el-date-editor.el-input {
   width: 100% !important;
 }
 .el-select {

src/views/categroyManager/specialSetup/typesManager.vue

@@ -2,14 +2,17 @@
   <div class='m-container'>
     <!-- <h2>收费类型设置</h2> -->
     <div class="m-core">
-      <div class='newBand' @click="openTypes('create')">添加</div>
+      <div class='newBand'
+           @click="openTypes('create')">添加</div>
       <!-- 列表 -->
       <div class="tableWrap">
-        <el-table :data='tableList' :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-          <el-table-column align='center' prop="name"
+        <el-table :data='tableList'
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+          <el-table-column align='center'
+                           prop="name"
                            label="收费类型">
           </el-table-column>
-          <el-table-column align='center' 
+          <el-table-column align='center'
                            label="声部组合">
             <template slot-scope="scope">
               {{ scope.row.subjectName | joinArray(',') }}
@@ -18,8 +21,10 @@
           <el-table-column align='center'
                            label="操作">
             <template slot-scope="scope">
-              <el-button @click="openTypes('update', scope.row)" type="text">修改</el-button>
-              <el-button @click="onTypesDel(scope.row)" type="text">删除</el-button>
+              <el-button @click="openTypes('update', scope.row)"
+                         type="text">修改</el-button>
+              <el-button @click="onTypesDel(scope.row)"
+                         type="text">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -30,33 +35,42 @@
                     @pagination="getList" />
       </div>
     </div>
-    <el-dialog :title="formTitle[formActionTitle]" :visible.sync="typeStatus"
-               @close="onFormClose('ruleForm')" width="500px">
-      <el-form :model="form" :rules="rules" ref="ruleForm">
-        <el-form-item label="收费类型" prop="name" :label-width="formLabelWidth">
-          <el-input v-model="form.name" autocomplete="off"></el-input>
+    <el-dialog :title="formTitle[formActionTitle]"
+               :visible.sync="typeStatus"
+               @close="onFormClose('ruleForm')"
+               width="500px">
+      <el-form :model="form"
+               :rules="rules"
+               ref="ruleForm">
+        <el-form-item label="收费类型"
+                      prop="name"
+                      :label-width="formLabelWidth">
+          <el-input v-model="form.name"
+                    autocomplete="off"></el-input>
         </el-form-item>
-        <el-form-item label="声部选择" v-if="form.classGroupType != 'MIX'"
-          prop="subjectIds" :label-width="formLabelWidth">
-          <el-select v-model="form.subjectIds" multiple>
-              <el-option-group
-                v-for="group in subjectList"
-                :key="group.label"
-                :label="group.label">
-                <el-option
-                  v-for="item in group.options"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-option-group>
+        <el-form-item label="声部选择"
+                      v-if="form.classGroupType != 'MIX'"
+                      prop="subjectIds"
+                      :label-width="formLabelWidth">
+          <el-select v-model="form.subjectIds"
+                     multiple>
+            <el-option-group v-for="group in subjectList"
+                             :key="group.label"
+                             :label="group.label">
+              <el-option v-for="item in group.options"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-option-group>
           </el-select>
         </el-form-item>
       </el-form>
       <span slot="footer"
             class="dialog-footer">
         <el-button @click="typeStatus = false">取 消</el-button>
-        <el-button type="primary" @click="onTypesSubmit('ruleForm')">确 定</el-button>
+        <el-button type="primary"
+                   @click="onTypesSubmit('ruleForm')">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -82,7 +96,7 @@ export default {
       form: {
         name: null, // 
         subjectIds: [],
-        organId: store.getters.organ
+        organId: null
       },
       rules: {
         name: [{ required: true, message: '请输入类型名称', trigger: 'blur' }],
@@ -97,7 +111,7 @@ export default {
       }
     }
   },
-  mounted() {
+  mounted () {
     this.getList()
     this.getSubjectTree()
   },
@@ -106,7 +120,7 @@ export default {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           if (this.formActionTitle == 'create') {
-            if(this.form.id) { // 判断有没有Id，如果有则删除
+            if (this.form.id) { // 判断有没有Id，如果有则删除
               delete this.form.id
             }
             chargeTypeUpSet(this.form).then(res => {
@@ -122,8 +136,8 @@ export default {
         }
       })
     },
-    messageTips(title, res) {
-      if(res.code == 200) {
+    messageTips (title, res) {
+      if (res.code == 200) {
         this.$message.success(title + '成功')
         this.typeStatus = false
         this.getList()
@@ -131,18 +145,18 @@ export default {
         this.$message.error(res.msg)
       }
     },
-    onTypesDel(row) {
+    onTypesDel (row) {
       chargeTypeDel(row.id).then(res => {
         this.messageTips('删除', res)
       })
     },
-    getList () { 
+    getList () {
       chargeTypeList({
         rows: this.pageInfo.limit,
         page: this.pageInfo.page
       }).then(res => {
         let result = res.data
-        if(res.code == 200) {
+        if (res.code == 200) {
           result.rows.forEach(row => {
             let subjectname = [],
               subjectIds = []
@@ -158,7 +172,7 @@ export default {
         }
       })
     },
-    openTypes(type, row) {
+    openTypes (type, row) {
       this.typeStatus = true
       this.formActionTitle = type
       // 修改的时候赋值
@@ -167,7 +181,7 @@ export default {
           id: row.id,
           name: row.name,
           subjectIds: row.subjectIds,
-          organId: store.getters.organ
+          organId: null
         }
       }
     },
@@ -175,21 +189,21 @@ export default {
       this.form = {
         name: null, // 作业模块名称
         subjectIds: [],
-        organId: store.getters.organ
+        organId: null
       }
       this.$refs[formName].resetFields()
     },
-    getSubjectTree() { // 获取声部列表
+    getSubjectTree () { // 获取声部列表
       subjectListTree({
         delFlag: 0,
         rows: 9999
       }).then(res => {
         let result = res.data
-        if(res.code == 200) {
+        if (res.code == 200) {
           let tempArray = []
           result.rows.forEach((item, index) => {
             let subject = []
-            if(item.subjects) {
+            if (item.subjects) {
               item.subjects.forEach(s => {
                 subject.push({
                   value: s.id,
@@ -197,7 +211,7 @@ export default {
                 })
               })
             }
-            
+
             tempArray[index] = {
               label: item.name,
               options: subject
@@ -215,13 +229,15 @@ export default {
   background: #14928a;
   border-color: #14928a;
   color: #fff;
-  &:hover, &:active, &:focus {
+  &:hover,
+  &:active,
+  &:focus {
     background: #14928a;
     border-color: #14928a;
-    color: #FFF;
+    color: #fff;
   }
 }
-.el-date-editor.el-input{
+.el-date-editor.el-input {
   width: 100% !important;
 }
 .el-select {

src/views/categroyManager/vipActiveList.vue

@@ -303,10 +303,10 @@ export default {
       resetFormRules: {
         name: [{ required: true, message: '请输入活动名称', trigger: 'blur' },
         { min: 1, max: 25, message: '长度在 1 到 25 个字符', trigger: 'blur' }],
-        desc: [{ required: true, message: '请输入文字描述', trigger: 'blur' },
+        desc: [{ required: false, message: '请输入文字描述', trigger: 'blur' },
         { min: 1, max: 200, message: '长度在 1 到 200 个字符', trigger: 'blur' }],
-        activeTime: [{ required: true, message: '请选择活动时间', trigger: 'blur' }],
-        courseTime: [{ required: true, message: '请选择课程时间', trigger: 'blur' }],
+        activeTime: [{ required: false, message: '请选择活动时间', trigger: 'blur' }],
+        courseTime: [{ required: false, message: '请选择课程时间', trigger: 'blur' }],
       },
       courseStatusList: [],
       activeType: '',
@@ -429,7 +429,7 @@ export default {
     },
     getList () {
       vipGroupActivity({
-        organId: this.searchForm.organId || null,
+        organId: null,
         rows: this.rules.limit,
         page: this.rules.page      }).then(res => {
         if (res.code == 200) {
@@ -538,7 +538,7 @@ export default {
           let coursesEndTime = this.resetForm.courseTime[1];
           let startTime = this.resetForm.activeTime[0];
           let endTime = this.resetForm.activeTime[1];
-          let organId = this.$store.getters.organ;
+          let organId = null;
           let type = this.activeType;
           let vipGroupCategoryIdList = this.resetForm.stauts.join(',')
           let onlineSalarySettlement;

src/views/categroyManager/vipChargeSeting.vue

@@ -91,7 +91,7 @@ export default {
       this.getList();
     },
     getList () {
-      vipGroupCategory({ organId: this.searchForm.organId }).then(res => {
+      vipGroupCategory({ organId: null }).then(res => {
         if (res.code == 200) {
           this.dataList = res.data;
         }

src/views/categroyManager/vipNewActive.vue

@@ -229,7 +229,7 @@ export default {
           let coursesEndTime = this.vipform.courseTime[1];
           let startTime = this.vipform.activeTime[0];
           let endTime = this.vipform.activeTime[1];
-          let organId = this.$store.getters.organ;
+          let organId = null;
           let type = this.activeType;
           let vipGroupCategoryIdList = this.vipform.stauts.join(',')
           let onlineSalarySettlement;

src/views/contentManager/components/activity.vue

@@ -67,7 +67,7 @@ export default {
   data () {
     return {
       tableList: [],
-      organId: store.getters.organ,
+      organId: null,
       teacherId: this.$route.query.teacherId,
       pageInfo: {
         // 分页规则

src/views/contentManager/components/banner.vue

@@ -67,7 +67,7 @@ export default {
   data () {
     return {
       tableList: [],
-      organId: store.getters.organ,
+      organId: null,
       teacherId: this.$route.query.teacherId,
       pageInfo: {
         // 分页规则

src/views/contentManager/components/information.vue

@@ -67,7 +67,7 @@ export default {
   data () {
     return {
       tableList: [],
-      organId: store.getters.organ,
+      organId: null,
       teacherId: this.$route.query.teacherId,
       pageInfo: {
         // 分页规则

src/views/contentManager/components/training.vue

@@ -2,17 +2,21 @@
   <div>
     <!-- 搜索标题 -->
     <div @click="openTeaching('create')"
-           class='newBand'>新建</div>
+         class='newBand'>新建</div>
     <!-- 列表 -->
     <div class="tableWrap">
-      <el-table :data='tableList' :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+      <el-table :data='tableList'
+                :header-cell-style="{background:'#EDEEF0',color:'#444'}">
         <el-table-column align='center'
                          label="轮播图">
           <template slot-scope="scope">
-            <img class="bannerImg" :src="scope.row.coverImage" alt="">
+            <img class="bannerImg"
+                 :src="scope.row.coverImage"
+                 alt="">
           </template>
         </el-table-column>
-        <el-table-column align='center' prop="title"
+        <el-table-column align='center'
+                         prop="title"
                          label="标题">
         </el-table-column>
         <el-table-column align='center'
@@ -21,26 +25,34 @@
             {{ scope.row.linkUrl + '/' + scope.row.id }}
           </template>
         </el-table-column>
-        <el-table-column align='center' prop="remark"
+        <el-table-column align='center'
+                         prop="remark"
                          label="是否使用">
           <template slot-scope="scope">
             {{ scope.row.status == 1 ? '是' : '否' }}
           </template>
         </el-table-column>
-        <el-table-column align='center' label="操作">
-            <template slot-scope="scope">
-              <el-button @click="openTeaching('update', scope.row)" type="text">修改</el-button>
-              <el-button v-if="scope.row.status == 1" @click="onStop(scope.row, 0)"  type="text">停用</el-button>
-              <el-button v-else @click="onStop(scope.row, 1)"  type="text">启用</el-button>
-              <el-button @click="onDel(scope.row)" type="text">删除</el-button>
-            </template>
+        <el-table-column align='center'
+                         label="操作">
+          <template slot-scope="scope">
+            <el-button @click="openTeaching('update', scope.row)"
+                       type="text">修改</el-button>
+            <el-button v-if="scope.row.status == 1"
+                       @click="onStop(scope.row, 0)"
+                       type="text">停用</el-button>
+            <el-button v-else
+                       @click="onStop(scope.row, 1)"
+                       type="text">启用</el-button>
+            <el-button @click="onDel(scope.row)"
+                       type="text">删除</el-button>
+          </template>
         </el-table-column>
       </el-table>
       <pagination :total="pageInfo.total"
-                :page.sync="pageInfo.page"
-                :limit.sync="pageInfo.limit"
-                :page-sizes="pageInfo.page_size"
-                @pagination="getList" />
+                  :page.sync="pageInfo.page"
+                  :limit.sync="pageInfo.limit"
+                  :page-sizes="pageInfo.page_size"
+                  @pagination="getList" />
     </div>
   </div>
 </template>
@@ -55,7 +67,7 @@ export default {
   data () {
     return {
       tableList: [],
-      organId: store.getters.organ,
+      organId: null,
       teacherId: this.$route.query.teacherId,
       pageInfo: {
         // 分页规则
@@ -66,64 +78,64 @@ export default {
       }
     }
   },
-  mounted() {
+  mounted () {
     this.getList()
   },
   methods: {
-    getList() {
+    getList () {
       let params = {
         rows: this.pageInfo.limit,
         page: this.pageInfo.page,
         type: 4
       }
       newsList(params).then(res => {
-        if(res.code == 200) {
+        if (res.code == 200) {
           this.tableList = res.data.rows
           this.pageInfo.total = res.data.total
         }
       })
     },
-    openTeaching(type, rows) {
-        let params = {}
-        if(type == 'update') {
-          params.id = rows.id
-        }
-        params.type = 4
-        params.pageType = type
-        this.$router.push({
-            path: '/contentManager/contentOperation',
-            query: params
-        })
+    openTeaching (type, rows) {
+      let params = {}
+      if (type == 'update') {
+        params.id = rows.id
+      }
+      params.type = 4
+      params.pageType = type
+      this.$router.push({
+        path: '/contentManager/contentOperation',
+        query: params
+      })
     },
-    onDel(row) { // 删除
+    onDel (row) { // 删除
       this.$confirm('确定是否删除?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
         newsDel({ id: row.id }).then(res => {
-          if(res.code == 200) {
+          if (res.code == 200) {
             this.$message.success('删除成功')
             this.getList()
           } else {
-              this.$message.error(res.msg)
+            this.$message.error(res.msg)
           }
         })
       }).catch(() => { })
-      
+
     },
-    onStop(row, status) { // 停止
+    onStop (row, status) { // 停止
       // newsUpdate
       let tempStr = ['停用', '启用']
       newsUpdate({
         id: row.id,
         status: status
       }).then(res => {
-        if(res.code == 200) {
+        if (res.code == 200) {
           this.$message.success(tempStr[status] + '成功')
           this.getList()
         } else {
-            this.$message.error(res.msg)
+          this.$message.error(res.msg)
         }
       })
     }

src/views/contentManager/contentOperation.vue

@@ -1,53 +1,65 @@
 <template>
   <div class="m-container">
     <h2>
-      <el-page-header @back="onCancel" :content="(pageType == 'create' ? '添加' : '修改') + typeChange(type)"></el-page-header>
+      <el-page-header @back="onCancel"
+                      :content="(pageType == 'create' ? '添加' : '修改') + typeChange(type)"></el-page-header>
     </h2>
-    
+
     <div class="m-core">
-      <el-form :model="form" :rules="rules" ref="form" label-width="120px" style="width: 100%">
-        <el-form-item label="标题" prop="title">
+      <el-form :model="form"
+               :rules="rules"
+               ref="form"
+               label-width="120px"
+               style="width: 100%">
+        <el-form-item label="标题"
+                      prop="title">
           <el-input v-model="form.title"></el-input>
         </el-form-item>
         <el-form-item label="排序值">
-          <el-input  v-model="form.order"></el-input>
+          <el-input v-model="form.order"></el-input>
         </el-form-item>
-        <el-form-item label="链接地址" prop="linkUrl">
+        <el-form-item label="链接地址"
+                      prop="linkUrl">
           <el-input v-model="form.linkUrl"></el-input>
         </el-form-item>
-        <el-form-item label="封面图" prop="coverImage">
-          <el-upload
-            class="avatar-uploader"
-            action="/api-web/uploadFile"
-            :headers="headers"
-            :show-file-list="false"
-            :on-success="handleAvatarSuccess"
-            :before-upload="beforeAvatarUpload">
-            <img v-if="form.coverImage" :src="form.coverImage" class="avatar">
-            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-        </el-upload>
+        <el-form-item label="封面图"
+                      prop="coverImage">
+          <el-upload class="avatar-uploader"
+                     action="/api-web/uploadFile"
+                     :headers="headers"
+                     :show-file-list="false"
+                     :on-success="handleAvatarSuccess"
+                     :before-upload="beforeAvatarUpload">
+            <img v-if="form.coverImage"
+                 :src="form.coverImage"
+                 class="avatar">
+            <i v-else
+               class="el-icon-plus avatar-uploader-icon"></i>
+          </el-upload>
         </el-form-item>
-        <el-form-item label="内容" prop="content" >
+        <el-form-item label="内容"
+                      prop="content">
           <!-- bidirectional data binding（双向数据绑定） -->
-            <quill-editor v-model="form.content"
-                ref="myQuillEditor"
-                :options="editorOption"
-                @change="onEditorChange($event)">
-            </quill-editor>
+          <quill-editor v-model="form.content"
+                        ref="myQuillEditor"
+                        :options="editorOption"
+                        @change="onEditorChange($event)">
+          </quill-editor>
 
-            <el-upload class="ivu-upload"
-                :show-upload-list="false"
-                :headers="headers"
-                :on-success="handleSuccess"
-                :format="['jpg','jpeg','png','gif']"
-                :max-size="2048"
-                multiple
-                action="/api-web/uploadFile">
-                <Button icon="ios-cloud-upload-outline" ></Button>
-            </el-upload>
+          <el-upload class="ivu-upload"
+                     :show-upload-list="false"
+                     :headers="headers"
+                     :on-success="handleSuccess"
+                     :format="['jpg','jpeg','png','gif']"
+                     :max-size="2048"
+                     multiple
+                     action="/api-web/uploadFile">
+            <Button icon="ios-cloud-upload-outline"></Button>
+          </el-upload>
         </el-form-item>
         <el-form-item>
-          <el-button @click="onSubmit('form')" type="primary">立即{{ pageType == "create" ? '创建' : '修改' }}</el-button>
+          <el-button @click="onSubmit('form')"
+                     type="primary">立即{{ pageType == "create" ? '创建' : '修改' }}</el-button>
           <el-button @click="onReSet('form')">重置</el-button>
         </el-form-item>
       </el-form>
@@ -85,240 +97,240 @@ const toolbarOptions = [
 ];
 // 标题
 const titleConfig = {
-    'ql-bold':'加粗',
-    'ql-color':'颜色',
-    'ql-font':'字体',
-    'ql-code':'插入代码',
-    'ql-italic':'斜体',
-    'ql-link':'添加链接',
-    'ql-background':'背景颜色',
-    'ql-size':'字体大小',
-    'ql-strike':'删除线',
-    'ql-script':'上标/下标',
-    'ql-underline':'下划线',
-    'ql-blockquote':'引用',
-    'ql-header':'标题',
-    'ql-indent':'缩进',
-    'ql-list':'列表',
-    'ql-align':'文本对齐',
-    'ql-direction':'文本方向',
-    'ql-code-block':'代码块',
-    'ql-formula':'公式',
-    'ql-image':'图片',
-    'ql-video':'视频',
-    'ql-clean':'清除字体样式',
-    'ql-upload':'文件'
+  'ql-bold': '加粗',
+  'ql-color': '颜色',
+  'ql-font': '字体',
+  'ql-code': '插入代码',
+  'ql-italic': '斜体',
+  'ql-link': '添加链接',
+  'ql-background': '背景颜色',
+  'ql-size': '字体大小',
+  'ql-strike': '删除线',
+  'ql-script': '上标/下标',
+  'ql-underline': '下划线',
+  'ql-blockquote': '引用',
+  'ql-header': '标题',
+  'ql-indent': '缩进',
+  'ql-list': '列表',
+  'ql-align': '文本对齐',
+  'ql-direction': '文本方向',
+  'ql-code-block': '代码块',
+  'ql-formula': '公式',
+  'ql-image': '图片',
+  'ql-video': '视频',
+  'ql-clean': '清除字体样式',
+  'ql-upload': '文件'
 };
 export default {
-    components: {
-        quillEditor
-    },
-    data () {
-        return {
-            categoryList: [],
-            type: this.$route.query.type,
-            pageType: this.$route.query.pageType,
-            organId: store.getters.organ,
-            headers: {
-                Authorization: getToken()
-            },
-            content: null,
-            editorOption: {
-              placeholder: '请输入内容',
-              modules: {
-                toolbar: {
-                  container: toolbarOptions,
-                  handlers: {
-                    'image': function (value) {
-                      if (value) {
-                          // 调用iview图片上传
-                          document.querySelector('.ivu-upload .el-upload').click()
-                      } else {
-                          this.quill.format('image', false);
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            form: {
-                title: null,
-                order: null,
-                coverImage: null,
-                linkUrl: 'http://mstudev.dayaedu.com/#/specialdetail',
-                type: this.$route.query.type,
-                status: 1,
-                content: null
-            },
-            rules: {
-                title: [{ required: true, message: '请输入标题', trigger: 'blur' },
-                { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }],
-                linkUrl: [{ required: true, message: '请输入连接地址', trigger: 'blur' }],
-                coverImage: [{ required: true, message: '请选择封面图', trigger: 'blur' }],
-                content: [{ required: true, message: '请编辑内容', trigger: 'blur' }]
-            }
-        }
-    },
-    mounted() {
-        // console.log('this is current quill instance object', this.editor)
-        this.getList()
-        this.addQuillTitle()
-    },
-    methods: {
-       addQuillTitle () {
-          const oToolBar = document.querySelector('.ql-toolbar'),
-          aButton = oToolBar.querySelectorAll('button'),
-          aSelect =  oToolBar.querySelectorAll('select');
-          aButton.forEach(function(item){
-            if(item.className === 'ql-script'){
-                item.value === 'sub' ? item.title = '下标': item.title = '上标';
-            }else if(item.className === 'ql-indent'){
-                item.value === '+1' ? item.title ='向右缩进': item.title ='向左缩进';
-            }else{
-                item.title = titleConfig[item.classList[0]];
-            }
-          });
-          aSelect.forEach(function(item){
-              item.parentNode.title = titleConfig[item.classList[0]];
-          });
+  components: {
+    quillEditor
+  },
+  data () {
+    return {
+      categoryList: [],
+      type: this.$route.query.type,
+      pageType: this.$route.query.pageType,
+      organId: null,
+      headers: {
+        Authorization: getToken()
       },
-        onSubmit(formName) {
-          this.$refs[formName].validate((valid) => {
-            if (valid) {
-              if (this.pageType == 'create') {
-                if(this.form.id) { // 判断有没有Id，如果有则删除
-                  delete this.form.id
+      content: null,
+      editorOption: {
+        placeholder: '请输入内容',
+        modules: {
+          toolbar: {
+            container: toolbarOptions,
+            handlers: {
+              'image': function (value) {
+                if (value) {
+                  // 调用iview图片上传
+                  document.querySelector('.ivu-upload .el-upload').click()
+                } else {
+                  this.quill.format('image', false);
                 }
-                // return false
-                newsAdd(this.form).then(res => {
-                  this.messageTips('添加', res)
-                })
-              } else if (this.pageType == 'update') {
-                newsUpdate(this.form).then(res => {
-                  this.messageTips('修改', res)
-                })
               }
-            } else {
-              return false
             }
-          })
-        },
-        messageTips(title, res) {
-          if(res.code == 200) {
-              this.$message.success(title + '成功')
-
-              this.$router.push({
-                path: '/contentManager/contentManager',
-                query: {
-                    type: this.typeIndex(this.type)
-                }
-              })
-          } else {
-              this.$message.error(res.msg)
           }
-        },
-        onCancel() {
-          this.$router.push({
-              path: '/contentManager/contentManager',
-              query: {
-              type: this.typeIndex(this.type)
-              }
-          })
-        },
-         handleSuccess (res) {
-            // 获取富文本组件实例
-            let quill = this.editor
-            // 如果上传成功
-            console.log(res)
-            if (res.code) {
-                // 获取光标所在位置
-                let length = quill.getSelection().index;
-                // 插入图片，res为服务器返回的图片链接地址
-                quill.insertEmbed(length, 'image', res.data.url)
-                // 调整光标到最后
-                quill.setSelection(length + 1)
-            } else {
-                // 提示信息，需引入Message
-                this.$message.error('图片插入失败')
-            }
-        },
-        onReSet(formName) {
-          this.$refs[formName].resetFields()
-        },
-        getList() {
-          if(this.pageType == 'create') return false
-          newsQueryId({id: this.$route.query.id}).then(res => {
-            if(res.code == 200) {
-              let result = res.data
-              let form = this.form
-              this.form = {
-                id: result.id,
-                title: result.title,
-                order: result.order,
-                coverImage: result.coverImage,
-                linkUrl: result.linkUrl,
-                type: result.type,
-                status: result.status,
-                content: result.content
-              }
+        }
+      },
+      form: {
+        title: null,
+        order: null,
+        coverImage: null,
+        linkUrl: 'http://mstudev.dayaedu.com/#/specialdetail',
+        type: this.$route.query.type,
+        status: 1,
+        content: null
+      },
+      rules: {
+        title: [{ required: true, message: '请输入标题', trigger: 'blur' },
+        { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }],
+        linkUrl: [{ required: true, message: '请输入连接地址', trigger: 'blur' }],
+        coverImage: [{ required: true, message: '请选择封面图', trigger: 'blur' }],
+        content: [{ required: true, message: '请编辑内容', trigger: 'blur' }]
+      }
+    }
+  },
+  mounted () {
+    // console.log('this is current quill instance object', this.editor)
+    this.getList()
+    this.addQuillTitle()
+  },
+  methods: {
+    addQuillTitle () {
+      const oToolBar = document.querySelector('.ql-toolbar'),
+        aButton = oToolBar.querySelectorAll('button'),
+        aSelect = oToolBar.querySelectorAll('select');
+      aButton.forEach(function (item) {
+        if (item.className === 'ql-script') {
+          item.value === 'sub' ? item.title = '下标' : item.title = '上标';
+        } else if (item.className === 'ql-indent') {
+          item.value === '+1' ? item.title = '向右缩进' : item.title = '向左缩进';
+        } else {
+          item.title = titleConfig[item.classList[0]];
+        }
+      });
+      aSelect.forEach(function (item) {
+        item.parentNode.title = titleConfig[item.classList[0]];
+      });
+    },
+    onSubmit (formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          if (this.pageType == 'create') {
+            if (this.form.id) { // 判断有没有Id，如果有则删除
+              delete this.form.id
             }
-          })
-        },
-        handleAvatarSuccess(res, file) {
-          this.form.coverImage = res.data.url
-        },
-        beforeAvatarUpload(file) {
-          const imageType = {
-              'image/png': true,
-              'image/jpeg': true 
+            // return false
+            newsAdd(this.form).then(res => {
+              this.messageTips('添加', res)
+            })
+          } else if (this.pageType == 'update') {
+            newsUpdate(this.form).then(res => {
+              this.messageTips('修改', res)
+            })
           }
-          const isImage = imageType[file.type]
-          const isLt2M = file.size / 1024 / 1024 < 2
+        } else {
+          return false
+        }
+      })
+    },
+    messageTips (title, res) {
+      if (res.code == 200) {
+        this.$message.success(title + '成功')
 
-          if (!isImage) {
-              this.$message.error('只能上传图片格式!')
-          }
-          if (!isLt2M) {
-              this.$message.error('上传头像图片大小不能超过 2MB!')
-          }
-          return isImage && isLt2M;
-        },
-        typeChange(type) {
-          let tempTitle = {
-              1: "精彩活动",
-              2: "热门资讯",
-              3: "活动列表",
-              4: "专项训练"
+        this.$router.push({
+          path: '/contentManager/contentManager',
+          query: {
+            type: this.typeIndex(this.type)
           }
-          return tempTitle[type]
-        },
-        typeIndex(type) {
-          let tempTitle = {
-              3: 0,
-              1: 1,
-              2: 2,
-              4: 3
+        })
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+    onCancel () {
+      this.$router.push({
+        path: '/contentManager/contentManager',
+        query: {
+          type: this.typeIndex(this.type)
+        }
+      })
+    },
+    handleSuccess (res) {
+      // 获取富文本组件实例
+      let quill = this.editor
+      // 如果上传成功
+      console.log(res)
+      if (res.code) {
+        // 获取光标所在位置
+        let length = quill.getSelection().index;
+        // 插入图片，res为服务器返回的图片链接地址
+        quill.insertEmbed(length, 'image', res.data.url)
+        // 调整光标到最后
+        quill.setSelection(length + 1)
+      } else {
+        // 提示信息，需引入Message
+        this.$message.error('图片插入失败')
+      }
+    },
+    onReSet (formName) {
+      this.$refs[formName].resetFields()
+    },
+    getList () {
+      if (this.pageType == 'create') return false
+      newsQueryId({ id: this.$route.query.id }).then(res => {
+        if (res.code == 200) {
+          let result = res.data
+          let form = this.form
+          this.form = {
+            id: result.id,
+            title: result.title,
+            order: result.order,
+            coverImage: result.coverImage,
+            linkUrl: result.linkUrl,
+            type: result.type,
+            status: result.status,
+            content: result.content
           }
-          return tempTitle[type]
-        },
-        // onEditorBlur(quill) {
-        //     console.log('editor blur!', quill)
-        // },
-        // onEditorFocus(quill) {
-        //     console.log('editor focus!', quill)
-        // },
-        // onEditorReady(quill) {
-        //     console.log('editor ready!', quill)
-        // },
-        onEditorChange({ quill, html, text }) {
-            this.form.content = html
         }
+      })
+    },
+    handleAvatarSuccess (res, file) {
+      this.form.coverImage = res.data.url
     },
-    computed: {
-      editor() {
-        return this.$refs.myQuillEditor.quill
+    beforeAvatarUpload (file) {
+      const imageType = {
+        'image/png': true,
+        'image/jpeg': true
+      }
+      const isImage = imageType[file.type]
+      const isLt2M = file.size / 1024 / 1024 < 2
+
+      if (!isImage) {
+        this.$message.error('只能上传图片格式!')
+      }
+      if (!isLt2M) {
+        this.$message.error('上传头像图片大小不能超过 2MB!')
       }
+      return isImage && isLt2M;
     },
+    typeChange (type) {
+      let tempTitle = {
+        1: "精彩活动",
+        2: "热门资讯",
+        3: "活动列表",
+        4: "专项训练"
+      }
+      return tempTitle[type]
+    },
+    typeIndex (type) {
+      let tempTitle = {
+        3: 0,
+        1: 1,
+        2: 2,
+        4: 3
+      }
+      return tempTitle[type]
+    },
+    // onEditorBlur(quill) {
+    //     console.log('editor blur!', quill)
+    // },
+    // onEditorFocus(quill) {
+    //     console.log('editor focus!', quill)
+    // },
+    // onEditorReady(quill) {
+    //     console.log('editor ready!', quill)
+    // },
+    onEditorChange ({ quill, html, text }) {
+      this.form.content = html
+    }
+  },
+  computed: {
+    editor () {
+      return this.$refs.myQuillEditor.quill
+    }
+  },
 }
 </script>
 <style lang="scss" scoped>
@@ -329,16 +341,18 @@ export default {
   width: 400px;
 }
 /deep/.ql-editor {
-    min-height: 300px;
+  min-height: 300px;
 }
 .el-button--primary {
   background: #14928a;
   border-color: #14928a;
   color: #fff;
-  &:hover, &:active, &:focus {
+  &:hover,
+  &:active,
+  &:focus {
     background: #14928a;
     border-color: #14928a;
-    color: #FFF;
+    color: #fff;
   }
 }
 .el-row {
@@ -359,29 +373,29 @@ export default {
   height: 40px !important;
 }
 /deep/.avatar-uploader .el-upload {
-    border: 1px dashed #d9d9d9;
-    border-radius: 6px;
-    cursor: pointer;
-    position: relative;
-    overflow: hidden;
-  }
-  .avatar-uploader .el-upload:hover {
-    border-color: #409EFF;
-  }
-  .avatar-uploader-icon {
-    font-size: 28px;
-    color: #8c939d;
-    width: 120px;
-    height: 120px;
-    line-height: 120px;
-    text-align: center;
-  }
-  .avatar {
-    width: 120px;
-    height: 120px;
-    display: block;
-  }
-  .ivu-upload {
-    display: none;
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+.avatar-uploader .el-upload:hover {
+  border-color: #409eff;
+}
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 120px;
+  height: 120px;
+  line-height: 120px;
+  text-align: center;
+}
+.avatar {
+  width: 120px;
+  height: 120px;
+  display: block;
+}
+.ivu-upload {
+  display: none;
 }
 </style>

src/views/studentManager/components/studentOrder.vue

@@ -106,7 +106,7 @@ export default {
   components: { pagination },
   data () {
     return {
-      organId: store.getters.organ,
+      organId: null,
       orderDate: null,
       searchForm: {
         studentId: this.$route.query.userId,

src/views/studentManager/components/studentPayList.vue

@@ -81,7 +81,7 @@ export default {
   components: { pagination },
   data () {
     return {
-      organId: store.getters.organ,
+      organId: null,
       searchForm: {
         studentId: this.$route.query.userId,
         attendanceStatus: null,

src/views/studentManager/studentList.vue

@@ -1,6 +1,8 @@
 <template>
   <div class="m-container">
-    <h2><div class="squrt"></div>学员列表</h2>
+    <h2>
+      <div class="squrt"></div>学员列表
+    </h2>
     <div class="m-core">
       <!-- <div class="newBand">声部调整</div> -->
       <!-- 搜索标题 -->
@@ -135,7 +137,7 @@ export default {
     },
     onReSet () {
       this.searchForm = {
-        organId: store.getters.organ,
+        organId: null,
         search: null,
         studentName: null
       }

src/views/teacherManager/teacherDetail/components/courseInfo.vue

@@ -54,7 +54,7 @@ export default {
     return {
       tableList: [],
       teacherId: this.$route.query.teacherId,
-      organId: store.getters.organ,
+      organId: null,
       pageInfo: {
         // 分页规则
         limit: 10, // 限制显示条数

src/views/teacherManager/teacherDetail/components/courseInfo1.vue

@@ -72,7 +72,7 @@ export default {
   data () {
     return {
       teamList: [],
-      organId: store.getters.organ,
+      organId: null,
       teacherId: this.$route.query.teacherId,
       pageInfo: {
         // 分页规则

src/views/teacherManager/teacherDetail/components/courseInfo2.vue

@@ -4,21 +4,24 @@
       <!-- <h4>试听课</h4> -->
       <el-table :data='teamList'
                 :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-        <el-table-column label="星期" width="180px">
+        <el-table-column label="星期"
+                         width="180px">
           <template slot-scope="scope">
             {{ scope.row.classDate | formatWeek }}
           </template>
         </el-table-column>
-        <el-table-column label="试听安排" prop="startTimes">
+        <el-table-column label="试听安排"
+                         prop="startTimes">
         </el-table-column>
-        <el-table-column label="试听专业" prop="subjectNames" >
+        <el-table-column label="试听专业"
+                         prop="subjectNames">
         </el-table-column>
       </el-table>
       <pagination :total="pageInfo.total"
-                :page.sync="pageInfo.page"
-                :limit.sync="pageInfo.limit"
-                :page-sizes="pageInfo.page_size"
-                @pagination="getList" />
+                  :page.sync="pageInfo.page"
+                  :limit.sync="pageInfo.limit"
+                  :page-sizes="pageInfo.page_size"
+                  @pagination="getList" />
     </div>
   </div>
 </template>
@@ -33,7 +36,7 @@ export default {
   data () {
     return {
       teamList: [],
-      organId: store.getters.organ,
+      organId: null,
       teacherId: this.$route.query.teacherId,
       pageInfo: {
         // 分页规则
@@ -44,20 +47,20 @@ export default {
       }
     }
   },
-  mounted() {
+  mounted () {
     this.getList()
   },
   methods: {
-    getList() {
-      findTeacherDemoGroups({ 
+    getList () {
+      findTeacherDemoGroups({
         rows: this.pageInfo.limit,
         page: this.pageInfo.page,
         teacherId: this.teacherId
       }).then(res => {
-        if(res.code == 200) {
+        if (res.code == 200) {
           let data = res.data.rows
           data.forEach(item => {
-            if(item.startTimes) {
+            if (item.startTimes) {
               item.startTimes = item.startTimes.replace(/\s+/g, '-')
             }
           })

src/views/teacherManager/teacherDetail/components/leaveRecord.vue

@@ -79,7 +79,7 @@ export default {
       },
       tableList: [],
       tableList: [],
-      organId: store.getters.organ,
+      organId: null,
       teacherId: this.$route.query.teacherId,
       pageInfo: {
         // 分页规则

src/views/teacherManager/teacherDetail/components/settlement.vue

@@ -97,7 +97,8 @@
         </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.courseScheduleType != 'DEMO'"  v-permission="{child: 'courseSchedule/updateTeacherCoursesSalary', parent: 'settlement/updateTeacherCoursesSalary'}"
+            <el-button v-if="scope.row.courseScheduleType != 'DEMO'"
+                       v-permission="{child: 'courseSchedule/updateTeacherCoursesSalary', parent: 'settlement/updateTeacherCoursesSalary'}"
                        @click="onUpdate(scope.row)"
                        type="text">课酬调整</el-button>
           </template>
@@ -169,7 +170,7 @@ export default {
       },
       courseType: courseType,
       attendance: attendance,
-      organId: store.getters.organ,
+      organId: null,
       teacherId: this.$route.query.teacherId,
       tableList: [],
       pageInfo: {

src/views/teacherManager/teacherDetail/components/teacherRecord.vue

@@ -113,7 +113,7 @@ export default {
         signInStatus: null
       },
       tableList: [],
-      organId: store.getters.organ,
+      organId: null,
       teacherId: this.$route.query.teacherId,
       pageInfo: {
         // 分页规则

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

@@ -271,7 +271,7 @@ export default {
   data () {
     return {
       jobNature: jobNature,
-      organId: store.getters.organ,
+      organId: null,
       pageType: this.$route.query.type,
       teacherId: this.$route.query.teacherId,
       formLabelWidth: '80px',
@@ -284,7 +284,7 @@ export default {
         birthdate: null,
         entryDate: null,
         jobNature: null,
-        organId: store.getters.organ,
+        organId: null,
         flowOrganRange: null,
         introduction: null,
         phone: null,
@@ -404,12 +404,12 @@ export default {
             teacherAdd(this.topForm).then(res => {
               if (res.code == 200) {
                 // 权限判断，是否有课酬设置
-                if(permission('/teacherAdd/salarySeting')) {
+                if (permission('/teacherAdd/salarySeting')) {
                   this.$router.push('/business/teacherList')
                 } else {
                   this.$emit('onTeacher', res.data)
                 }
-                
+
               }
               this.messageTips('添加', res)
             })
@@ -434,7 +434,7 @@ export default {
         birthdate: null,
         entryDate: null,
         jobNature: null,
-        organId: store.getters.organ,
+        organId: null,
         flowOrganRange: null,
         introduction: null,
         phone: null,

src/views/teamBuild/components/teamBaseInfo.vue

@@ -22,6 +22,7 @@
                       prop="section"
                       :rules="[{ required: true, message: '所属分部不能为空'},]">
           <el-select v-model="topFrom.section"
+                     @change="changeSection"
                      clearable>
             <el-option v-for="(item,index) in sectionList"
                        :key='index'
@@ -61,6 +62,7 @@
                       prop='boss'
                       :rules="[{ required: true, message: '运营主管不能为空'},]">
           <el-select v-model="topFrom.boss"
+                     :disabled="!topFrom.section"
                      filterable
                      clearable>
             <el-option v-for="(item,index) in orgianList"
@@ -73,6 +75,7 @@
                       prop='teacher'
                       :rules="[{ required: true, message: '教务老师不能为空'},]">
           <el-select v-model="topFrom.teacher"
+                     :disabled="!topFrom.section"
                      filterable
                      clearable>
             <el-option v-for="(item,index) in orgianList"
@@ -160,7 +163,7 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="  乐队指导"
+        <el-form-item label="乐队指导"
                       v-if="teamStatus=='resetTeam' || teamStatus=='teamList'"
                       prop='head'>
           <el-select v-model="topFrom.head"
@@ -390,7 +393,7 @@
   </div>
 </template>
 <script>
-import { getSection, getType, getCooperation, getTeacher, getAddress, getPayMaster, getPayStatus, getTeamBaseInfo, resetTeamBaseInfo } from '@/api/buildTeam'
+import { getSection, getType, getCooperation, getTeacher, getAddress, getPayMaster, getPayStatus, getTeamBaseInfo, resetTeamBaseInfo, getEmployeeOrgan } from '@/api/buildTeam'
 import { queryEmployByOrganId } from '@/api/systemManage'
 import { scrollTo } from '@/utils/scroll-to'
 import axios from 'axios'
@@ -400,7 +403,7 @@ export default {
   props: ['getTeamList'],
   data () {
     return {
-      organId: store.getters.organ,
+      organId: null,
       topFrom: {
         type: '', // 收费类型
         section: '', //所属分部
@@ -545,12 +548,16 @@ export default {
   },
   mounted () {
     // 1.获取各个选项卡的数据内容
-    getSection({ 'delFlag': 0, 'rows': 1000 }).then(res => {
+    // getSection({ 'delFlag': 0, 'rows': 1000 }).then(res => {
+    //   if (res.code == 200) {
+    //     this.sectionList = res.data.rows;
+    //   }
+    // }).catch()
+    getEmployeeOrgan().then(res => {
       if (res.code == 200) {
-        this.sectionList = res.data.rows;
+        this.sectionList = res.data;
       }
-
-    }).catch()
+    })
     // 2.获取收费类型选项卡
     getType({ 'rows': 1000 }).then(res => {
       if (res.code == 200) {
@@ -590,13 +597,21 @@ export default {
     sessionStorage.setItem('resetCode', '1')
 
     // 获取分部下的员工
-    queryEmployByOrganId({ organId: this.$store.getters.organ, rows: 1000 }).then(res => {
-      if (res.code == 200) {
-        this.orgianList = res.data.rows;
-      }
-    })
+
   },
   methods: {
+    changeSection (val) {
+      // 修改分部的时候 重置运营主管 重置教务老师 重置乐队指导
+      this.topFrom.teacher = '';
+      this.topFrom.boss = '';
+      this.topFrom.head = '';
+      // 发请求 根据分部id 查询所有员工
+      queryEmployByOrganId({ organId: val, rows: 1000 }).then(res => {
+        if (res.code == 200) {
+          this.orgianList = res.data.rows;
+        }
+      })
+    },
     chioseSchool (val) {
 
 

src/views/teamBuild/teamSeting/components/setClass.vue

@@ -295,7 +295,7 @@ export default {
     this.getSingleClass();
     this.getAllClass();
     // 获取所有老师的列表
-    queryEmployByOrganId({ organId: this.$store.getters.organ, rows: 1000 }).then(res => {
+    queryEmployByOrganId({ organId: null, rows: 1000 }).then(res => {
       if (res.code == 200) {
         this.teacherList = res.data.rows;
         // console.log(this.teacherList)

src/views/teamDetail/components/courseList.vue

@@ -65,10 +65,10 @@
                          prop="classGroupName"
                          label="班级名称">
         </el-table-column>
-        <el-table-column align='center'
+        <!-- <el-table-column align='center'
                          prop="mixClassGroupName"
                          label="合奏班">
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column align='center'
                          prop="courseScheduleType"
                          label="课程类型">
@@ -145,8 +145,8 @@
           <el-select v-model="maskForm.teacher">
             <el-option v-for="(item,index) in teacherList"
                        :key="index"
-                       :value="item.userId"
-                       :label="item.name"></el-option>
+                       :value="item.id"
+                       :label="item.realName"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="助教老师"
@@ -157,8 +157,8 @@
                      collapse-tags>
             <el-option v-for="(item,index) in teacherList"
                        :key="index"
-                       :value="item.userId"
-                       :label="item.name"></el-option>
+                       :value="item.id"
+                       :label="item.realName"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="上课日期"
@@ -204,7 +204,7 @@
 </template>
 <script>
 import pagination from '@/components/Pagination/index'
-import { getCourseList, findMusicGroupClassTeacher, resetCourse } from '@/api/buildTeam'
+import { getCourseList, findMusicGroupClassTeacher, resetCourse, getTeacher } from '@/api/buildTeam'
 export default {
   props: {
     teamid: {
@@ -252,7 +252,12 @@ export default {
   mounted () {
     this.getList();
     // 获取所有老师
-    findMusicGroupClassTeacher({ musicGroupId: this.teamid }).then(res => {
+    // findMusicGroupClassTeacher({ musicGroupId: this.teamid }).then(res => {
+    //   if (res.code == 200) {
+    //     this.teacherList = res.data;
+    //   }
+    // })
+    getTeacher().then(res => {
       if (res.code == 200) {
         this.teacherList = res.data;
       }

src/views/teamDetail/components/resetClass.vue

@@ -263,8 +263,8 @@
                      filterable>
             <el-option v-for="(item,index) in teacherList"
                        :key="index"
-                       :label="item.name"
-                       :value="item.userId"></el-option>
+                       :label="item.realName"
+                       :value="item.id"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="助教老师"
@@ -475,18 +475,19 @@ export default {
       }
     })
 
-    // 获取乐团所有老师
-    findMusicGroupClassTeacher({
-      musicGroupId: this.teamid
-    }).then(res => {
-      if (res.code == 200) {
-        this.teacherList = res.data
-      }
-    })
+    // 获取分部所有老师
+    // findMusicGroupClassTeacher({
+    //   musicGroupId: this.teamid
+    // }).then(res => {
+    //   if (res.code == 200) {
+    //     this.teacherList = res.data
+    //   }
+    // })
     // 获取分部所有老师
     getTeacher().then(res => {
       if (res.code == 200) {
         this.cooperationList = res.data;
+        this.teacherList = res.data;
       }
     })
   },

src/views/vipClass/vipDetail/components/fnanceInfo.vue

@@ -133,7 +133,7 @@ export default {
       if (!this.searchForm.time) {
         this.searchForm.time = [];
       }
-      getVipGroupSalarys({ vipGroupId: this.id, organId: this.$store.getters.organ, page: this.rules.page, rows: this.rules.limit, startTime: this.searchForm.time[0] || null, endTime: this.searchForm.time[1] || null }).then(res => {
+      getVipGroupSalarys({ vipGroupId: this.id, organId: null, page: this.rules.page, rows: this.rules.limit, startTime: this.searchForm.time[0] || null, endTime: this.searchForm.time[1] || null }).then(res => {
         if (res.code == 200) {
           this.tableList = res.data.pageInfo.rows;
           //课程总价 totalPrice

src/views/vipClass/vipDetail/components/teacherRecord.vue

@@ -252,7 +252,7 @@ export default {
     // 获取vip教学记录
     this.getList()
     // 获取分部教学点
-    getSchool({ organId: this.$store.getters.organ }).then(res => {
+    getSchool({ organId: null }).then(res => {
       if (res.code == 200) {
         this.cooperationList = res.data;
       }

src/views/vipClass/vipDetail/components/vipStudentList.vue

@@ -183,7 +183,7 @@ export default {
     },
     getList () {
       let search = this.maskForm.search || null;
-      getHaveCourseBalanceStudents({ organId: this.$store.getters.organ, page: this.rules.page, rows: this.rules.limit, search }).then(res => {
+      getHaveCourseBalanceStudents({ organId: null, page: this.rules.page, rows: this.rules.limit, search }).then(res => {
         if (res.code == 200) {
           this.rules.total = res.data.total;
           this.maskStudentList = res.data.rows;

src/views/vipClass/vipList.vue

@@ -195,7 +195,7 @@ export default {
   name: 'vipList',
   data () {
     return {
-      organId: store.getters.organ,
+      organId: null,
       searchForm: {
         teacherId: null,
         activityId: null,

src/views/vipClass/vipReset.vue

@@ -259,7 +259,7 @@ export default {
   },
   mounted () {
     this.getList();
-    getSchool({ organId: this.$store.getters.organ }).then(res => {
+    getSchool({ organId: null }).then(res => {
       if (res.code == 200) {
         this.schoolList = res.data;
       }