11

11

src/templateList.vue

@@ -5,26 +5,27 @@
       <div class="squrt"></div>名字
     </h2>
     <div class="m-core">
-      <el-form :inline="true" :model="searchForm">
+      <el-form :inline="true"
+               :model="searchForm">
         <el-form-item>
-          <el-input v-model.trim="searchForm.search" @keyup.enter.native="search" placeholder></el-input>
+          <el-input v-model.trim="searchForm.search"
+                    @keyup.enter.native="search"
+                    placeholder></el-input>
         </el-form-item>
       </el-form>
       <div class="tableWrap">
-        <el-table
-          style="width: 100%"
-          :header-cell-style="{background:'#EDEEF0',color:'#444'}"
-          :data="tableList"
-        >
-          <el-table-column align="center" prop="studentId" label="分部"></el-table-column>
+        <el-table style="width: 100%"
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}"
+                  :data="tableList">
+          <el-table-column align="center"
+                           prop="studentId"
+                           label="分部"></el-table-column>
         </el-table>
-        <pagination
-          :total="rules.total"
-          :page.sync="rules.page"
-          :limit.sync="rules.limit"
-          :page-sizes="rules.page_size"
-          @pagination="getList"
-        />
+        <pagination :total="rules.total"
+                    :page.sync="rules.page"
+                    :limit.sync="rules.limit"
+                    :page-sizes="rules.page_size"
+                    @pagination="getList" />
       </div>
     </div>
   </div>
@@ -39,7 +40,7 @@ import { getTeacher, getEmployeeOrgan } from "@/api/buildTeam";
 
 export default {
   components: { pagination },
-  data() {
+  data () {
     return {
       searchForm: {
         search: null
@@ -53,29 +54,41 @@ export default {
         page: 1, // 当前页
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
-      }
+      },
+      isInit: false
     };
   },
   //生命周期 - 创建完成（可以访问当前this实例）
-  created() {},
+  created () { },
   //生命周期 - 挂载完成（可以访问DOM元素）
-  mounted() {
-       getTeacher().then(res => {
+  mounted () {
+    getTeacher().then(res => {
       if (res.code == 200) {
         this.teacherList = res.data;
       }
     });
-      getEmployeeOrgan().then(res => {
+    getEmployeeOrgan().then(res => {
       if (res.code == 200) {
         this.organList = res.data;
       }
     });
     // 获取分部
-    this.init();
+    if (!isInit) {
+      this.init();
+    }
+
+  },
+  activated () {
+    if (!isInit) {
+      this.init();
+    }
   },
   methods: {
-    init() {},
-    getList() {}
+    init () {
+      this.init = true;
+      this.init = false;
+    },
+    getList () { }
   }
 };
 </script>

src/views/categroyManager/insideSetting/staffManager.vue

@@ -230,6 +230,18 @@
                           placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
+          <el-form-item label="通讯地址"
+                      prop="contactAddress"
+                      :label-width="formLabelWidth">
+          <el-input v-model.trim="form.contactAddress"
+                    autocomplete="off"></el-input>
+        </el-form-item>
+          <el-form-item label="邮政编码"
+                      prop="postalCode"
+                      :label-width="formLabelWidth">
+          <el-input v-model.trim="form.postalCode"
+                    autocomplete="off"></el-input>
+        </el-form-item>
       </el-form>
       <span slot="footer"
             class="dialog-footer">
@@ -285,6 +297,8 @@ export default {
         organIdLists: [],
         jobNature: null,
         entryDate: null,
+        contactAddress:null,
+        postalCode:null
       },
       rules: {
         realName: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
@@ -294,6 +308,7 @@ export default {
         organIdLists: [{ type: 'array', required: true, message: '请选择所属部门', trigger: 'change' }],
         jobNature: [{ required: true, message: '请选择工作类型', trigger: 'change' }],
         entryDate: [{ required: true, message: '请选择入职时间', trigger: 'blur' }],
+
       },
       searchForm: {
         search: null,
@@ -407,7 +422,9 @@ export default {
           roleIds: data.roleIds,
           organIdLists: data.organIdList ? data.organIdList : [],
           jobNature: data.jobNature,
-          entryDate: data.entryDate
+          entryDate: data.entryDate,
+          contactAddress:data.contactAddress,
+          postalCode:data.postalCode
         }
       }
     },

src/views/repairManager/repairList.vue

@@ -0,0 +1,96 @@
+<!--  -->
+<template>
+  <div class="m-container">
+    <h2>
+      <div class="squrt"></div>名字
+    </h2>
+    <div class="m-core">
+      <el-form :inline="true"
+               :model="searchForm">
+        <el-form-item>
+          <el-input v-model.trim="searchForm.search"
+                    @keyup.enter.native="search"
+                    placeholder></el-input>
+        </el-form-item>
+      </el-form>
+      <div class="tableWrap">
+        <el-table style="width: 100%"
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}"
+                  :data="tableList">
+          <el-table-column align="center"
+                           prop="studentId"
+                           label="分部"></el-table-column>
+        </el-table>
+        <pagination :total="rules.total"
+                    :page.sync="rules.page"
+                    :limit.sync="rules.limit"
+                    :page-sizes="rules.page_size"
+                    @pagination="getList" />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import axios from "axios";
+import { getToken } from "@/utils/auth";
+import pagination from "@/components/Pagination/index";
+import load from "@/utils/loading";
+import { getTeacher, getEmployeeOrgan } from "@/api/buildTeam";
+
+export default {
+  components: { pagination },
+  data () {
+    return {
+      searchForm: {
+        search: null
+      },
+      teacherList: [],
+      tableList: [],
+      organList: [],
+      rules: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50] // 选择限制显示条数
+      },
+      isInit: false
+    };
+  },
+  //生命周期 - 创建完成（可以访问当前this实例）
+  created () { },
+  //生命周期 - 挂载完成（可以访问DOM元素）
+  mounted () {
+    getTeacher().then(res => {
+      if (res.code == 200) {
+        this.teacherList = res.data;
+      }
+    });
+    getEmployeeOrgan().then(res => {
+      if (res.code == 200) {
+        this.organList = res.data;
+      }
+    });
+    // 获取分部
+    if (!isInit) {
+      this.init();
+    }
+
+  },
+  activated () {
+    if (!isInit) {
+      this.init();
+    }
+  },
+  methods: {
+    init () {
+      this.init = true;
+      this.init = false;
+    },
+    getList () { }
+  }
+};
+</script>
+<style lang='scss' scoped>
+</style>

src/views/teamBuild/components/teamBaseInfo.vue

@@ -85,6 +85,20 @@
             ></el-option>
           </el-select>
         </el-form-item>
+           <el-form-item
+          label="维修技师"
+          prop="repairUserId"
+          :rules="[{ required: true, message: '维修技师不能为空'},]"
+        >
+          <el-select v-model.trim="topFrom.repairUserId" :disabled="!topFrom.section" filterable clearable>
+            <el-option
+              v-for="(item,index) in orgianList"
+              :key="index"
+              :label="item.realName"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item
           label="报名截止时间"
           prop="time"
@@ -382,7 +396,8 @@ export default {
         head: "",
         isClass: false, //是否为课堂课
         startTime: "",
-        ownershipType: "OWN" // 合作机构类型
+        ownershipType: "OWN", // 合作机构类型
+        repairUserId:null, // 维修技师
       },
       checkList: {
         soundInfo: {
@@ -445,19 +460,27 @@ export default {
       activeTeam: [],
       teamid: "",
       teamStatus: "",
-      orgianList: []
+      orgianList: [],
+       isInit:false
     };
+   
   },
   created() {},
   activated() {
-    this.init();
+    if(!this.isInit){
+      this.init();
+    }
+    
   },
   mounted() {
-    this.init();
+      if(!this.isInit){
+      this.init();
+    }
     // 获取分部下的员工
   },
   methods: {
     init() {
+      this.isInit = true;
       // 分为3种  this.teamStatus
       //          1.resetTeam 乐团修改
       //          2. newTeam  新建乐团
@@ -493,6 +516,7 @@ export default {
             this.topFrom.isClass = res.data.musicGroup.isClassroomLessons;
             this.topFrom.startTime = res.data.musicGroup.expectStartGroupDate;
             this.topFrom.ownershipType = res.data.musicGroup.ownershipType;
+            this.topFrom.repairUserId = res.data.musicGroup.repairUserId?res.data.musicGroup.repairUserId:null;
             // 课程组成形式
             this.checkList = JSON.parse(res.data.musicGroup.courseForm);
             // 付费方式和周期
@@ -549,6 +573,7 @@ export default {
               getSchool({ organId: res.data.musicGroup.organId }).then(res => {
                 if (res.code == 200) {
                   this.addList = res.data;
+                   this.isInit = false;
                 }
               });
             }
@@ -722,7 +747,8 @@ export default {
             isClassroomLessons: this.topFrom.isClass,
             status,
             expectStartGroupDate: this.topFrom.startTime,
-            ownershipType: this.topFrom.ownershipType
+            ownershipType: this.topFrom.ownershipType,
+            repairUserId :this.topFrom.repairUserId
           };
           obj.musicGroupPaymentEntities = [];
           // 添加学校主体付费方式

src/views/vipClass/vipReset.vue

@@ -498,7 +498,7 @@ export default {
         this.FsearchForm = this.$route.query.searchForm;
       }
       //  获取教务老师
-      findEducationUsers({}).then(res => {
+      findEducationUsers().then(res => {
         if (res.code == 200) {
           this.educationList = res.data;
         }