Merge branch 'master' of http://git.dayaedu.com/molingzhide/dy-admin-manager

src/views/categroyManager/generalSettings/errorManager.vue

@@ -58,7 +58,6 @@
 </template>
 <script>
 import pagination from '@/components/Pagination/index'
-import store from '@/store'
 import { hotWordLabelManage, hotWordLabelManageAdd, hotWordLabelManageUpdate, hotWordLabelManageDel } from '@/api/systemManage'
 export default {
   components: { pagination },
@@ -76,7 +75,6 @@ export default {
       formLabelWidth: '120px',
       form: {
         name: null, // 热词标签
-        organId: null
       },
       rules: {
         name: [{ required: true, message: '请输入热词标签', trigger: 'blur' }]
@@ -147,16 +145,14 @@ export default {
       if (type == 'update') {
         this.form = {
           id: row.id,
-          name: row.name,
-          organId: null
+          name: row.name
         }
       }
     },
     onFormClose (formName) { // 关闭弹窗重置验证
       this.form = {
         name: null, // 作业模块名称
-        subjectIds: [],
-        organId: null
+        subjectIds: []
       }
       this.$refs[formName].resetFields()
     },

src/views/categroyManager/generalSettings/overallManager.vue

@@ -21,14 +21,12 @@
 </template>
 <script>
 import pagination from '@/components/Pagination/index'
-import store from '@/store'
 import { sysConfigList, sysConfigUpdate } from '@/api/generalSettings'
 export default {
   components: { pagination },
   name: 'musicalManager',
   data () {
     return {
-      organId: null,
       configList: [],
       input: []
     }

src/views/categroyManager/insideSetting/addressManager.vue

@@ -199,6 +199,7 @@ import pagination from '@/components/Pagination/index'
   };
 }());
 import { schoolQueryPage, schoolAdd, schoolUpdate, queryByOrganId, schoolDel } from '@/api/systemManage'
+import { getEmployeeOrgan } from '@/api/buildTeam'
 import store from '@/store'
 import VueAMap from 'vue-amap'
 // Vue.use(VueAMap)
@@ -241,7 +242,6 @@ export default {
         remark: null,  // 费用
         address: null, // 上课地点
         subsidy: null, // 课酬补贴
-        organId: null
       },
       rules: {
         name: [{ required: true, message: '请输入教学点名称', trigger: 'blur' }],
@@ -378,7 +378,6 @@ export default {
     },
     getList () {
       schoolQueryPage({
-        organId: this.form.organId,
         rows: this.pageInfo.limit,
         page: this.pageInfo.page
       }).then(res => {
@@ -389,21 +388,34 @@ export default {
       })
     },
     getBreachList () { // 获取分部列表
-      queryByOrganId({
-        organId: this.form.organId
-      }).then(res => {
-        if (res.code == 200) {
-          // 判断是否有数据
-          if (!res.data && res.data.length <= 0) return
-          res.data.forEach(r => {
-            this.breachList.push({
-              value: r.id,
-              label: r.name
-            })
+      // 获取当前用户分部
+      getEmployeeOrgan().then(res => {
+        if(res.code == 200){
+          let branchIds = []
+          res.data.forEach(item => {
+            branchIds.push(item.id)
+          })
+
+          queryByOrganId({
+            organId: branchIds.join(',')
+          }).then(res => {
+            if (res.code == 200) {
+              // 判断是否有数据
+              if (!res.data && res.data.length <= 0) return
+              res.data.forEach(r => {
+                this.breachList.push({
+                  value: r.id,
+                  label: r.name
+                })
+              })
+            }
           })
 
         }
       })
+
+
+      
     },
     openTeaching (type, row) {
       // 重置数据
@@ -430,7 +442,7 @@ export default {
           remark: row.remark,  // 费用
           address: row.address.split(',').join(''), // 上课地点
           subsidy: row.subsidy, // 课酬补贴
-          organId: null
+          
         }
       }
     },
@@ -443,7 +455,6 @@ export default {
         remark: null,  // 费用
         address: null, // 上课地点
         subsidy: null, // 课酬补贴
-        organId: null
       }
       this.$refs[formName].resetFields()
     },

src/views/categroyManager/insideSetting/adminManager.vue

@@ -38,7 +38,6 @@
 <script>
 import pagination from '@/components/Pagination/index'
 import { roleQueryPage } from '@/api/systemManage'
-import store from '@/store'
 export default {
   components: { pagination },
   name: 'adminManager',
@@ -51,8 +50,7 @@ export default {
         page: 1, // 当前页
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
-      },
-      organId: null
+      }
     }
   },
   mounted () {
@@ -62,7 +60,6 @@ export default {
   methods: {
     getList () {
       roleQueryPage({
-        organId: this.organId,
         rows: this.pageInfo.limit,
         page: this.pageInfo.page
       }).then(res => {

src/views/categroyManager/insideSetting/branchManager.vue

@@ -93,6 +93,16 @@
           <el-input v-model="form.name"
                     autocomplete="off"></el-input>
         </el-form-item>
+        <el-form-item label="所属分部"
+                      prop="organId"
+                      :label-width="formLabelWidth">
+          <el-select v-model="form.organId">
+            <el-option v-for="item in userBranchList"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="联系人"
                       prop="linkman"
                       :label-width="formLabelWidth">
@@ -131,6 +141,7 @@
 <script>
 import pagination from '@/components/Pagination/index'
 import { cooperationOrganAdd, cooperationOrganUpdate, cooperationOrganDel, queryPage } from '@/api/systemManage'
+import { getEmployeeOrgan } from '@/api/buildTeam'
 import store from '@/store'
 import { isvalidPhone } from '@/utils/validate'
 let validPhone = (rule, value, callback) => {
@@ -152,6 +163,7 @@ export default {
       },
       searchLsit: [],
       tableList: [],
+      userBranchList: [], // 用户当前分部列表
       pageInfo: {
         // 分页规则
         limit: 10, // 限制显示条数
@@ -180,6 +192,7 @@ export default {
         linkman: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
         job: [{ required: true, message: '请输入职位', trigger: 'blur' }],
         mobileNo: [{ required: true, validator: validPhone, trigger: 'blur' }],
+        organId: [{ required: true, message: '请选择所属分部', trigger: 'change' }]
         // ownershipType: [{ required: true, message: '请选择权属类型', trigger: 'change' }]
       },
 
@@ -187,6 +200,18 @@ export default {
   },
   mounted () {
     this.getList() // 获取列表数据
+
+    // 获取当前用户分部
+    getEmployeeOrgan().then(res => {
+      if(res.code == 200){
+        res.data.forEach(item => {
+          this.userBranchList.push({
+            label: item.name,
+            value: item.id
+          })
+        })
+      }
+    })
   },
   methods: {
     onDelete (rows) {
@@ -211,6 +236,9 @@ export default {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           if (this.formActionTitle == 'create') {
+            if (this.form.id) { // 判断有没有Id，如果有则删除
+              delete this.form.id
+            }
             cooperationOrganAdd(this.form).then(res => {
               if (res.code == 200) {
                 this.$message.success('修改成功')
@@ -222,7 +250,6 @@ export default {
             })
           } else if (this.formActionTitle == 'update') {
             cooperationOrganUpdate(this.form).then(res => {
-              // console.log(res)
               if (res.code == 200) {
                 this.$message.success('修改成功')
                 this.teachingStatus = false
@@ -239,7 +266,6 @@ export default {
     },
     getList () {
       queryPage({
-        search: this.form.organId,
         rows: this.pageInfo.limit,
         page: this.pageInfo.page
       }).then(res => {
@@ -271,17 +297,18 @@ export default {
           job: rows.job,  // 费用
           mobileNo: rows.mobileNo ? rows.mobileNo : null,
           ownershipType: rows.ownershipType,
-          organId: null
+          organId: rows.organId
         }
       }
     },
     onFormClose (formName) { // 关闭弹窗重置验证
-      this.$refs[formName].clearValidate()
+      // this.$refs[formName].clearValidate()
+      this.$refs[formName].resetFields()
     }
   }
 }
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .el-button--primary {
   background: #14928a;
   border-color: #14928a;
@@ -294,6 +321,9 @@ export default {
     color: #fff;
   }
 }
+/deep/.el-select {
+  width: 100% !important;
+}
 .el-vue-search-box-container {
   position: absolute !important;
   left: 10px;

src/views/categroyManager/insideSetting/staffManager.vue

@@ -127,6 +127,7 @@
 </template>
 <script>
 import pagination from '@/components/Pagination/index'
+
 import { queryEmployByOrganId, employeeOperate, getUserRole, employeeAdd, employeeUpdate } from '@/api/systemManage'
 import { branchQueryPage } from '@/api/specialSetting'
 import store from '@/store'
@@ -153,7 +154,6 @@ export default {
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
-      organId: null,
       roleStatus: false,
       formActionTitle: 'create',
       roleList: [], // 角色列表
@@ -189,12 +189,13 @@ export default {
   mounted() {
     this.getList()
     this.getRoleList()
+
+    
   },
   methods: {
     onRoleSubmit(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          this.form.organId = this.organId
           this.form.organIdList = this.form.organIdLists.join(',')
           if(this.formActionTitle == 'create') {
             if(this.form.id) { // 判断有没有Id，如果有则删除
@@ -228,7 +229,6 @@ export default {
     },
     getList () {
       let params = this.searchForm
-      params.organId = this.organId
       params.rows = this.pageInfo.limit
       params.page = this.pageInfo.page
       queryEmployByOrganId(params).then(res => {
@@ -263,6 +263,7 @@ export default {
           })
         }
       })
+      
     },
     roleOperation(type, data) {
       this.formActionTitle = type

src/views/categroyManager/specialSetup/chargesList.vue

@@ -82,7 +82,6 @@
 </template>
 <script>
 import pagination from '@/components/Pagination/index'
-import store from '@/store'
 import { chargeTypeList, chargeTypeOrganizationFeeAdd, chargeTypeOrganizationFeeDelete, chargeTypeOrganizationFeeUpdate, chargeTypeOrganizationFee, branchQueryPage } from '@/api/specialSetting'
 export default {
   components: { pagination },
@@ -102,8 +101,7 @@ export default {
       formLabelWidth: '100px',
       form: {
         chargeTypeId: null,
-        courseFee: null,
-        organId: null
+        courseFee: null
       },
       rules: {
         courseFee: [{ required: true, message: '请输入收费标准', trigger: 'blur' }],
@@ -221,8 +219,7 @@ export default {
     onFormClose (formName) { // 关闭弹窗重置验证
       this.form = {
         courseFee: null,
-        chargeTypeId: null,
-        organId: null
+        chargeTypeId: null
       }
       this.$refs[formName].resetFields()
     },

src/views/categroyManager/specialSetup/jobTemplateSetting.vue

@@ -103,7 +103,6 @@
 </template>
 <script>
 import pagination from '@/components/Pagination/index'
-import store from '@/store'
 import { courseHomeworkTemplateList, subjectListTree, homeWorkUpdate, homeWorkAdd, homeWorkDel } from '@/api/specialSetting'
 export default {
   components: { pagination },
@@ -123,8 +122,7 @@ export default {
         name: null, // 作业模块名称
         classGroupType: null,
         subjectId: null,
-        content: null,
-        organId: null
+        content: null
       },
       rules: {
         name: [{ required: true, message: '请输入作业模板名称', trigger: 'blur' }],
@@ -138,8 +136,7 @@ export default {
         page: 1, // 当前页
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
-      },
-      organId: null
+      }
     }
   },
   mounted () {
@@ -180,8 +177,7 @@ export default {
           name: row.name, // 作业模块名称
           classGroupType: row.classGroupType,
           subjectId: row.subjectId,
-          content: row.content,
-          organId: null
+          content: row.content
         }
       }
     },
@@ -202,7 +198,6 @@ export default {
     getList () {
       courseHomeworkTemplateList({
         delFlag: 0,
-        organId: this.organId,
         rows: this.pageInfo.limit,
         page: this.pageInfo.page
       }).then(res => {
@@ -217,8 +212,7 @@ export default {
         name: null, // 作业模块名称
         classGroupType: null,
         subjectId: null,
-        content: null,
-        organId: null
+        content: null
       }
       this.$refs[formName].resetFields()
     },

src/views/categroyManager/specialSetup/musicalManager.vue

@@ -79,14 +79,12 @@
 </template>
 <script>
 import pagination from '@/components/Pagination/index'
-import store from '@/store'
 import { subjectListTree, subjectUpset } from '@/api/specialSetting'
 export default {
   components: { pagination },
   name: 'musicalManager',
   data () {
     return {
-      organId: null,
       oneTypeName: null, // 添加一级分类名称
       subjectList: [],
       inputValue: []

src/views/categroyManager/specialSetup/typesManager.vue

@@ -77,7 +77,6 @@
 </template>
 <script>
 import pagination from '@/components/Pagination/index'
-import store from '@/store'
 import { chargeTypeList, subjectListTree, chargeTypeUpSet, chargeTypeDel } from '@/api/specialSetting'
 export default {
   components: { pagination },
@@ -95,8 +94,7 @@ export default {
       formLabelWidth: '120px',
       form: {
         name: null, // 
-        subjectIds: [],
-        organId: null
+        subjectIds: []
       },
       rules: {
         name: [{ required: true, message: '请输入类型名称', trigger: 'blur' }],
@@ -180,16 +178,14 @@ export default {
         this.form = {
           id: row.id,
           name: row.name,
-          subjectIds: row.subjectIds,
-          organId: null
+          subjectIds: row.subjectIds
         }
       }
     },
     onFormClose (formName) { // 关闭弹窗重置验证
       this.form = {
         name: null, // 作业模块名称
-        subjectIds: [],
-        organId: null
+        subjectIds: []
       }
       this.$refs[formName].resetFields()
     },

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

@@ -12,7 +12,7 @@
     <div class="tableWrap">
       <el-table :data='singinList'
                 :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-        <el-table-column label="单技课班级名称"
+        <el-table-column label="班级名称"
                          prop='name'
                          width="160px">
         </el-table-column>
@@ -62,7 +62,7 @@
     <div class="tableWrap">
       <el-table :data='allList'
                 :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-        <el-table-column label="合奏班课程名称"
+        <el-table-column label="合奏班名称"
                          prop='name'
                          width="160px">