更新优化

src/views/businessManager/shopManager/shopList.vue

@@ -105,7 +105,7 @@
           <el-select
             v-model.trim="searchForm.educationShowOrganId"
             clearable
-            placeholder="管理端APP可售分部"
+            placeholder="移动端可售分部"
           >
             <el-option
               v-for="item in selects.branchs"
@@ -896,14 +896,14 @@
         </el-form-item> -->
         <!--   :disabled="pageDisabled || pageType == 'update'" -->
         <el-form-item
-          label="管理端APP可售分部"
+          label="移动端可售分部"
           prop="educationShowOrganId"
           :label-width="formLabelWidth"
         >
           <select-all
             v-model.trim="form.educationShowOrganId"
             filterable
-            placeholder="管理端APP可售分部"
+            placeholder="移动端可售分部"
             style="width: 400px !important"
             multiple
             clearable

src/views/businessManager/shopManager/shopOperation.vue

@@ -259,7 +259,7 @@
             ></el-option>
           </select-all>
         </el-form-item> -->
-        <el-form-item label="管理端APP可售分部" prop="educationShowOrganId">
+        <el-form-item label="移动端可售分部" prop="educationShowOrganId">
           <select-all
             v-model.trim="form.educationShowOrganId"
             filterable
@@ -418,7 +418,13 @@
             <img v-if="form.image" :src="form.image" class="avatar" />
             <i v-else class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload> -->
-          <image-cropper :options="cropperOptions" :disabled="pageDisabled" :imgSize="2" :imageUrl="form.image"  @crop-upload-success="cropSuccess" />
+          <image-cropper
+            :options="cropperOptions"
+            :disabled="pageDisabled"
+            :imgSize="2"
+            :imageUrl="form.image"
+            @crop-upload-success="cropSuccess"
+          />
           <p class="imageSize">
             <!-- 仅支持上传尺寸为：{{ imageWidthM }}x{{ imageHeightM }}的图片 -->
             请上传大小2M以内，格式为jpg、png、gif图片
@@ -456,11 +462,11 @@ import {
   categoryListTree,
   goodsAdd,
   goodsUpdate,
-  goodsSingleQuery,
+  goodsSingleQuery
 } from "@/api/businessManager";
 import { getToken, getTenantId } from "@/utils/auth";
 import { goodsType, stockType } from "@/utils/searchArray";
-import ImageCropper from '@/components/ImageCropper'
+import ImageCropper from "@/components/ImageCropper";
 let validPrice = (rule, value, callback) => {
   if ((value == "" && typeof value == "string") || value == null) {
     callback(new Error("请输入金额"));
@@ -494,11 +500,11 @@ export default {
         create: "添加",
         update: "修改",
         look: "查看",
-        copy: "复制",
+        copy: "复制"
       },
       pageDisabled: false,
       headers: {
-        Authorization: getToken(),
+        Authorization: getToken()
       },
       form: {
         sn: null,
@@ -528,7 +534,7 @@ export default {
         educationShowOrganId: null,
         courseFeeShowOrganId: null,
         memberFeeShowOrganId: null,
-        replacementShowOrganId: null,
+        replacementShowOrganId: null
       },
       rules: {
         sn: [{ required: true, message: "请输入商品货号", trigger: "blur" }],
@@ -536,138 +542,138 @@ export default {
           {
             required: true,
             message: "请输入品牌",
-            trigger: "blur",
+            trigger: "blur"
           },
           {
             min: 2,
             max: 30,
             message: "长度在 2 到 30 个字符",
-            trigger: "blur",
-          },
+            trigger: "blur"
+          }
         ],
         supplyChannel: [
-          { required: true, message: "请输入备查货号", trigger: "blur" },
+          { required: true, message: "请输入备查货号", trigger: "blur" }
         ],
         name: [
           {
             required: true,
             message: "请输入商品名称",
-            trigger: "blur",
+            trigger: "blur"
           },
           {
             min: 2,
             max: 30,
             message: "长度在 2 到 30 个字符",
-            trigger: "blur",
-          },
+            trigger: "blur"
+          }
         ],
         type: [
           {
             required: true,
             message: "请选择商品分类",
-            trigger: "change",
-          },
+            trigger: "change"
+          }
         ],
         goodsCategoryId: [
           {
             required: true,
             message: "请选择商品类型",
-            trigger: "change",
-          },
+            trigger: "change"
+          }
         ],
         organIdList: [
           {
             required: true,
             message: "请选择所属分部",
-            trigger: "change",
-          },
+            trigger: "change"
+          }
         ],
         specification: [
           {
             required: true,
             message: "请输入商品型号",
-            trigger: "blur",
+            trigger: "blur"
           },
           {
             min: 2,
             max: 30,
             message: "长度在 2 到 30 个字符",
-            trigger: "blur",
-          },
+            trigger: "blur"
+          }
         ],
         stockCount: [
-          { required: true, validator: validStock, trigger: "blur" },
+          { required: true, validator: validStock, trigger: "blur" }
         ],
         taxStockCount: [
-          { required: true, validator: validStock, trigger: "blur" },
+          { required: true, validator: validStock, trigger: "blur" }
         ],
         stockType: [
-          { required: true, message: "请选择库存类型", trigger: "change" },
+          { required: true, message: "请选择库存类型", trigger: "change" }
         ],
         marketPrice: [
           {
             required: true,
             validator: validPrice,
-            trigger: "blur",
-          },
+            trigger: "blur"
+          }
         ],
         discountPrice: [
           {
             required: true,
             validator: validPrice,
-            trigger: "blur",
-          },
+            trigger: "blur"
+          }
         ],
         groupPurchasePrice: [
           {
             required: true,
             validator: validPrice,
-            trigger: "blur",
-          },
+            trigger: "blur"
+          }
         ],
         clientShow: [
-          { required: true, message: "请选择学员是否展示", trigger: "change" },
+          { required: true, message: "请选择学员是否展示", trigger: "change" }
         ],
         replacementShow: [
-          { required: true, message: "是否参与乐器置换", trigger: "change" },
+          { required: true, message: "是否参与乐器置换", trigger: "change" }
         ],
         educationalShow: [
           {
             required: true,
             message: "请选择教务端是否展示",
-            trigger: "change",
-          },
+            trigger: "change"
+          }
         ],
         musicGroupShow: [
-          { required: true, message: "请选择乐团是否展示", trigger: "change" },
+          { required: true, message: "请选择乐团是否展示", trigger: "change" }
         ],
         courseViewType: [
-          { required: true, message: "请选乐团收费模式", trigger: "change" },
+          { required: true, message: "请选乐团收费模式", trigger: "change" }
         ],
         stockWarning: [
-          { required: true, message: "请选择是否库存预警", trigger: "change" },
+          { required: true, message: "请选择是否库存预警", trigger: "change" }
         ],
         image: [
           {
             required: true,
             message: "请选择图片",
-            trigger: "blur",
-          },
+            trigger: "blur"
+          }
         ],
         brief: [
           {
             required: true,
             message: "请输入商品描述",
-            trigger: "blur",
-          },
+            trigger: "blur"
+          }
         ],
         desc: [
           {
             required: true,
             message: "请输入商品详情",
-            trigger: "blur",
-          },
-        ],
+            trigger: "blur"
+          }
+        ]
       },
       Fsearch: null,
       Frules: null,
@@ -680,8 +686,8 @@ export default {
         autoCropHeight: 300, //默认生成截图框高度
         fixedBox: true, //是否固定截图框大小 不允许改变
         previewsCircle: false, //预览图是否是圆形
-        title: '商品图片', //模态框上显示的标题
-      },
+        title: "商品图片" //模态框上显示的标题
+      }
     };
   },
   mounted() {
@@ -706,7 +712,7 @@ export default {
       this.form.image = data.data.url;
     },
     onSubmit(formName) {
-      this.$refs[formName].validate((valid) => {
+      this.$refs[formName].validate(valid => {
         if (valid) {
           let tempForm = JSON.parse(JSON.stringify(this.form));
           if (tempForm.courseViewType) {
@@ -719,21 +725,25 @@ export default {
             tempForm.studentShowOrganId = tempForm.studentShowOrganId.join(",");
           }
           if (tempForm.educationShowOrganId) {
-            tempForm.educationShowOrganId =
-              tempForm.educationShowOrganId.join(",");
+            tempForm.educationShowOrganId = tempForm.educationShowOrganId.join(
+              ","
+            );
           }
 
           if (tempForm.courseFeeShowOrganId) {
-            tempForm.courseFeeShowOrganId =
-              tempForm.courseFeeShowOrganId.join(",");
+            tempForm.courseFeeShowOrganId = tempForm.courseFeeShowOrganId.join(
+              ","
+            );
           }
           if (tempForm.memberFeeShowOrganId) {
-            tempForm.memberFeeShowOrganId =
-              tempForm.memberFeeShowOrganId.join(",");
+            tempForm.memberFeeShowOrganId = tempForm.memberFeeShowOrganId.join(
+              ","
+            );
           }
           if (tempForm.replacementShowOrganId) {
-            tempForm.replacementShowOrganId =
-              tempForm.replacementShowOrganId.join(",");
+            tempForm.replacementShowOrganId = tempForm.replacementShowOrganId.join(
+              ","
+            );
           }
           if (
             !tempForm.studentShowOrganId &&
@@ -754,11 +764,11 @@ export default {
             tempForm.stockCount = 0;
             tempForm.taxStockCount = 0;
             tempForm.status = "NO"; // 默认上架
-            goodsAdd(tempForm).then((res) => {
+            goodsAdd(tempForm).then(res => {
               this.messageTips("保存", res);
             });
           } else if (this.pageType == "update") {
-            goodsUpdate(tempForm).then((res) => {
+            goodsUpdate(tempForm).then(res => {
               this.messageTips("保存", res);
             });
           }
@@ -767,7 +777,7 @@ export default {
             let isError = document.getElementsByClassName("is-error");
             isError[0].scrollIntoView({
               block: "center",
-              behavior: "smooth",
+              behavior: "smooth"
             });
           });
           return false;
@@ -782,8 +792,8 @@ export default {
           path: "/shopList",
           query: {
             pageInfo: this.Frules,
-            searchForm: this.Fsearch,
-          },
+            searchForm: this.Fsearch
+          }
         });
       } else {
         this.$message.error(res.msg);
@@ -792,7 +802,7 @@ export default {
     onCancel() {
       this.$store.dispatch("delVisitedViews", this.$route);
       this.$router.push({
-        path: "/shopList",
+        path: "/shopList"
       });
     },
     onReSet(formName) {
@@ -822,13 +832,13 @@ export default {
           stockWarning: null,
           image: null,
           brief: null,
-          desc: null,
+          desc: null
         };
         if (this.$refs["form"]) {
           this.$refs["form"].resetFields();
         }
       } else {
-        goodsSingleQuery(this.id).then((res) => {
+        goodsSingleQuery(this.id).then(res => {
           if (res.code == 200) {
             let result = res.data;
             let courseViewType = null;
@@ -893,7 +903,7 @@ replacementShowOrganId: 6,7 */
               image: result.image,
               brief: result.brief,
               desc: result.desc,
-              replacementShow: result.replacementShow,
+              replacementShow: result.replacementShow
             };
           }
         });
@@ -902,15 +912,15 @@ replacementShowOrganId: 6,7 */
     getCatagory() {
       categoryListTree({
         delFlag: 0,
-        rows: 9999,
-      }).then((res) => {
+        rows: 9999
+      }).then(res => {
         let result = res.data;
         if (res.code == 200) {
           let tempArray = [];
-          result.rows.forEach((row) => {
+          result.rows.forEach(row => {
             tempArray.push({
               label: row.name,
-              value: row.id,
+              value: row.id
             });
           });
           this.categoryList = tempArray;
@@ -923,7 +933,7 @@ replacementShowOrganId: 6,7 */
     beforeAvatarUpload(file) {
       const imageType = {
         "image/png": true,
-        "image/jpeg": true,
+        "image/jpeg": true
       };
       const isImage = imageType[file.type];
       const isLt2M = file.size / 1024 / 1024 < 2;
@@ -932,7 +942,7 @@ replacementShowOrganId: 6,7 */
       const _URL = window.URL || window.webkitURL;
       const isSize = new Promise((resolve, reject) => {
         const img = new Image();
-        img.onload = function () {
+        img.onload = function() {
           if (imageWidth && imageHeigh) {
             this.width === imageWidth && this.height === imageHeigh
               ? resolve()
@@ -954,7 +964,7 @@ replacementShowOrganId: 6,7 */
         () => {
           return file;
         },
-        (src) => {
+        src => {
           this.$message.error(src);
           this.uploadImgLoading = false;
           return Promise.reject();
@@ -967,8 +977,8 @@ replacementShowOrganId: 6,7 */
         this.$message.error("上传头像图片大小不能超过 2MB!");
       }
       return isImage && isLt2M && isSize;
-    },
-  },
+    }
+  }
 };
 </script>
 <style lang="scss" scoped>

src/views/liveShopManger/index.vue

@@ -71,16 +71,12 @@
           <el-table-column align="center" prop="studentId" label="操作">
             <template slot-scope="scope">
               <div>
-                <auth
-                  auths="liveGoods/update"
-                >
+                <auth auths="liveGoods/update">
                   <el-button type="text" @click="resetShop(scope.row)"
                     >修改</el-button
                   >
                 </auth>
-                <auth
-                  auths="liveGoods/delete"
-                >
+                <auth auths="liveGoods/delete">
                   <el-button type="text" @click="deteleShop(scope.row)"
                     >删除</el-button
                   >
@@ -109,14 +105,14 @@ import { getToken } from "@/utils/auth";
 import pagination from "@/components/Pagination/index";
 import load from "@/utils/loading";
 import { getTimes } from "@/utils";
-import { getLiveGoodsMapperList,delLiveGoods } from "./api";
+import { getLiveGoodsMapperList, delLiveGoods } from "./api";
 import eidtLiveShop from "./models/eidtLiveShop";
 export default {
   components: { pagination, eidtLiveShop },
   data() {
     return {
       searchForm: {
-        search: null,
+        search: null
       },
 
       tableList: [],
@@ -126,8 +122,8 @@ export default {
         limit: 10, // 限制显示条数
         page: 1, // 当前页
         total: 0, // 总条数
-        page_size: [10, 20, 40, 50], // 选择限制显示条数
-      },
+        page_size: [10, 20, 40, 50] // 选择限制显示条数
+      }
     };
   },
   //生命周期 - 创建完成（可以访问当前this实例）
@@ -146,7 +142,7 @@ export default {
       let params = {
         ...this.searchForm,
         page: this.rules.page,
-        rows: this.rules.limit,
+        rows: this.rules.limit
       };
       try {
         const res = await getLiveGoodsMapperList({ ...params });
@@ -174,10 +170,10 @@ export default {
       this.$confirm(`确定删除"${row.name}"?`, "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning",
+        type: "warning"
       })
         .then(() => {
-          delLiveGoods({ goodsId: row.id }).then((res) => {
+          delLiveGoods({ goodsId: row.id }).then(res => {
             if (res.code === 200) {
               this.$message.success("删除成功");
               this.getList();
@@ -186,9 +182,8 @@ export default {
           });
         })
         .catch();
-    },
-  },
+    }
+  }
 };
 </script>
-<style lang='scss' scoped>
-</style>
+<style lang="scss" scoped></style>

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

@@ -6,98 +6,86 @@
         <el-form :model="topForm">
           <el-row>
             <el-col :span="12">
-              <el-form-item label="姓名"
-                            :label-width="formLabelWidth">
-                <el-input v-model.trim="topForm.realName"
-                          disabled></el-input>
+              <el-form-item label="姓名" :label-width="formLabelWidth">
+                <el-input v-model.trim="topForm.realName" disabled></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="姓名(备注)"
-                            :label-width="formLabelWidth">
-                <el-input v-model.trim="topForm.memo"
-                          disabled></el-input>
+              <el-form-item label="姓名(备注)" :label-width="formLabelWidth">
+                <el-input v-model.trim="topForm.memo" disabled></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="老师编号"
-                            :label-width="formLabelWidth">
-                <el-input disabled
-                          v-model.trim="topForm.id"></el-input>
+              <el-form-item label="老师编号" :label-width="formLabelWidth">
+                <el-input disabled v-model.trim="topForm.id"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="性别"
-                            :label-width="formLabelWidth">
-                <el-input disabled
-                          v-model.trim="topForm.gender"></el-input>
+              <el-form-item label="性别" :label-width="formLabelWidth">
+                <el-input disabled v-model.trim="topForm.gender"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="出生日期"
-                            :label-width="formLabelWidth">
-                <el-input disabled
-                          v-model.trim="topForm.birthdate"></el-input>
+              <el-form-item label="出生日期" :label-width="formLabelWidth">
+                <el-input disabled v-model.trim="topForm.birthdate"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="工作类别"
-                            :label-width="formLabelWidth">
-                <el-input disabled
-                          v-model.trim="topForm.jobNature "></el-input>
+              <el-form-item label="工作类别" :label-width="formLabelWidth">
+                <el-input disabled v-model.trim="topForm.jobNature"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="入职日期"
-                            :label-width="formLabelWidth">
-                <el-input disabled
-                          v-model.trim="topForm.entryDate"></el-input>
+              <el-form-item label="入职日期" :label-width="formLabelWidth">
+                <el-input disabled v-model.trim="topForm.entryDate"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="教学点"
-                            :label-width="formLabelWidth">
-                <el-input disabled
-                          v-model.trim="topForm.teacherSchools"></el-input>
+              <el-form-item label="教学点" :label-width="formLabelWidth">
+                <el-input
+                  disabled
+                  v-model.trim="topForm.teacherSchools"
+                ></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="所属分部"
-                            :label-width="formLabelWidth">
-                <el-input disabled
-                          v-model.trim="topForm.organName"></el-input>
+              <el-form-item label="所属分部" :label-width="formLabelWidth">
+                <el-input disabled v-model.trim="topForm.organName"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="流动范围"
-                            :label-width="formLabelWidth">
-                <el-input disabled
-                          v-model.trim="topForm.flowOrganRange"></el-input>
+              <el-form-item label="流动范围" :label-width="formLabelWidth">
+                <el-input
+                  disabled
+                  v-model.trim="topForm.flowOrganRange"
+                ></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="老师简介"
-                            :label-width="formLabelWidth">
-                <el-input disabled
-                          type='textarea'
-                          v-model.trim="topForm.introduction"></el-input>
+              <el-form-item label="老师简介" :label-width="formLabelWidth">
+                <el-input
+                  disabled
+                  type="textarea"
+                  v-model.trim="topForm.introduction"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="开放陪练"
-                            :label-width="formLabelWidth">
-                <el-input disabled
-                          v-model.trim="isSupportExtraPracticeLesson"></el-input>
+              <el-form-item label="开放陪练" :label-width="formLabelWidth">
+                <el-input
+                  disabled
+                  v-model.trim="isSupportExtraPracticeLesson"
+                ></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -105,82 +93,85 @@
           <h4>资料学历</h4>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="手机号"
-                            :label-width="formLabelWidth">
-                <el-input disabled
-                          v-model.trim="topForm.phone"></el-input>
+              <el-form-item label="手机号" :label-width="formLabelWidth">
+                <el-input disabled v-model.trim="topForm.phone"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="毕业学校"
-                            :label-width="formLabelWidth">
-                <el-input disabled
-                          v-model.trim="topForm.graduateSchool"></el-input>
+              <el-form-item label="毕业学校" :label-width="formLabelWidth">
+                <el-input
+                  disabled
+                  v-model.trim="topForm.graduateSchool"
+                ></el-input>
               </el-form-item>
             </el-col>
-
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="电子邮箱"
-                            :label-width="formLabelWidth">
-                <el-input disabled
-                          v-model.trim="topForm.email"></el-input>
+              <el-form-item label="电子邮箱" :label-width="formLabelWidth">
+                <el-input disabled v-model.trim="topForm.email"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="最高学历"
-                            :label-width="formLabelWidth">
-                <el-input disabled
-                          v-model.trim="topForm.educationBackground"></el-input>
+              <el-form-item label="最高学历" :label-width="formLabelWidth">
+                <el-input
+                  disabled
+                  v-model.trim="topForm.educationBackground"
+                ></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="专业技能"
-                            :label-width="formLabelWidth">
-                <el-input disabled
-                          v-model.trim="topForm.subjectName"></el-input>
+              <el-form-item label="专业技能" :label-width="formLabelWidth">
+                <el-input
+                  disabled
+                  v-model.trim="topForm.subjectName"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="职称"
-                            :label-width="formLabelWidth">
-                <el-input disabled
-                          v-model.trim="topForm.technicalTitles"></el-input>
+              <el-form-item label="职称" :label-width="formLabelWidth">
+                <el-input
+                  disabled
+                  v-model.trim="topForm.technicalTitles"
+                ></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="证件类型"
-                            :label-width="formLabelWidth">
-                <el-input disabled
-                          v-model.trim="topForm.certificateType"></el-input>
+              <el-form-item label="证件类型" :label-width="formLabelWidth">
+                <el-input
+                  disabled
+                  v-model.trim="topForm.certificateType"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="证件号码"
-                            :label-width="formLabelWidth">
-                <el-input disabled
-                          v-model.trim="topForm.certificateNum"></el-input>
+              <el-form-item label="证件号码" :label-width="formLabelWidth">
+                <el-input
+                  disabled
+                  v-model.trim="topForm.certificateNum"
+                ></el-input>
               </el-form-item>
             </el-col>
           </el-row>
-             <el-row>
+          <el-row>
             <el-col :span="12">
-              <el-form-item label="转正日期"
-                            :label-width="formLabelWidth">
-                <el-input disabled
-                          v-model.trim="topForm.formalStaffDate"></el-input>
+              <el-form-item label="转正日期" :label-width="formLabelWidth">
+                <el-input
+                  disabled
+                  v-model.trim="topForm.formalStaffDate"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="离职日期"
-                            :label-width="formLabelWidth">
-                <el-input disabled
-                          v-model.trim="topForm.demissionDate"></el-input>
+              <el-form-item label="离职日期" :label-width="formLabelWidth">
+                <el-input
+                  disabled
+                  v-model.trim="topForm.demissionDate"
+                ></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -188,97 +179,102 @@
       </div>
       <div class="right">
         <div class="teacherIcon">
-          <img v-if="topForm.avatar"
-               :src="topForm.avatar"
-               alt="">
-          <img v-else
-               src="@/assets/images/base/woman.png"
-               alt="">
+          <img v-if="topForm.avatar" :src="topForm.avatar" alt="" />
+          <img v-else src="@/assets/images/base/woman.png" alt="" />
         </div>
-
       </div>
     </div>
-
   </div>
 </template>
 <script>
-import { teacherGet } from '@/api/teacherManager'
-import dayjs from 'dayjs';
+import { teacherGet } from "@/api/teacherManager";
+import dayjs from "dayjs";
 export default {
-  name: 'teacherInfo',
-  props:['teacherInfo'],
-  data () {
+  name: "teacherInfo",
+  props: ["teacherInfo"],
+  data() {
     return {
-      formLabelWidth: '80px',
+      formLabelWidth: "80px",
       teacherId: this.$route.query.teacherId,
       topForm: {}
-    }
+    };
   },
-  mounted () {
-    this.teacherId = this.$route.query.teacherId
-    this.teacherGet()
+  mounted() {
+    this.teacherId = this.$route.query.teacherId;
+    this.teacherGet();
   },
   methods: {
-    teacherGet () {
-        let tempData = this.teacherInfo
-          tempData.subjectName = this.joinArray(tempData.subjectName)
-          let sn = []
-          if(tempData.teacherSchools && tempData.teacherSchools.length > 0) {
-            tempData.teacherSchools.forEach(item => {
-              sn.push(item.name)
-            })
-          }
-          tempData.teacherSchools = this.joinArray(sn, ',') // 教学点
-          tempData.entryDate = this.formatTimer(tempData.entryDate)
-          tempData.jobNature = this.jobNature(tempData.jobNature)
-          tempData.birthdate = this.formatTimer(tempData.birthdate)
-          if(tempData.gender !='男'&&tempData.gender!='女'){
-            tempData.gender = tempData.gender ? '男' : '女'
-          }
+    teacherGet() {
+      let tempData = this.teacherInfo;
+      tempData.subjectName = this.joinArray(tempData.subjectName);
+      let sn = [];
+      // 处理教学点显示问题
+      if (
+        tempData.teacherSchools &&
+        typeof tempData.teacherSchools == "object" &&
+        tempData.teacherSchools.length > 0
+      ) {
+        tempData.teacherSchools.forEach(item => {
+          sn.push(item.name);
+        });
+      } else {
+        sn.push(tempData.teacherSchools);
+      }
+      tempData.teacherSchools = this.joinArray(sn, ","); // 教学点
+      tempData.entryDate = this.formatTimer(tempData.entryDate);
+      tempData.jobNature = this.jobNature(tempData.jobNature);
+      tempData.birthdate = this.formatTimer(tempData.birthdate);
+      if (tempData.gender != "男" && tempData.gender != "女") {
+        tempData.gender = tempData.gender ? "男" : "女";
+      }
 
-          this.topForm = this.teacherInfo
-          if(this.topForm.demissionDate){
-             this.topForm.demissionDate = dayjs(this.topForm.demissionDate).format('YYYY-MM-DD')
-          }
-          if(this.topForm.formalStaffDate) {
-            this.topForm.formalStaffDate = dayjs(this.topForm.formalStaffDate).format('YYYY-MM-DD')
-          }
+      this.topForm = this.teacherInfo;
+      if (this.topForm.demissionDate) {
+        this.topForm.demissionDate = dayjs(this.topForm.demissionDate).format(
+          "YYYY-MM-DD"
+        );
+      }
+      if (this.topForm.formalStaffDate) {
+        this.topForm.formalStaffDate = dayjs(
+          this.topForm.formalStaffDate
+        ).format("YYYY-MM-DD");
+      }
     },
-    joinArray (value, type) {
+    joinArray(value, type) {
       if (!type) {
-        type = ' '
+        type = " ";
       }
-      if (typeof value == 'object' && value != null) {
-        return value.join(type)
+      if (typeof value == "object" && value != null) {
+        return value.join(type);
       } else {
-        return value
+        return value;
       }
     },
-    formatTimer (value) {
+    formatTimer(value) {
       if (value) {
-        return value.split(' ')[0]
+        return value.split(" ")[0];
       } else {
-        return value
+        return value;
       }
     },
-    jobNature (value) {
+    jobNature(value) {
       let template = {
         PART_TIME: "兼职",
         FULL_TIME: "全职",
-        LABOUR:'劳务'
+        LABOUR: "劳务"
         // TEMPORARY: "零时工"
-      }
-      return template[value]
+      };
+      return template[value];
     }
   },
   computed: {
-    isSupportExtraPracticeLesson () {
-      let str = ''
-      this.topForm.isSupportExtraPracticeLesson ? str = '是' : str = "否"
-      return str
-    },
+    isSupportExtraPracticeLesson() {
+      let str = "";
+      this.topForm.isSupportExtraPracticeLesson ? (str = "是") : (str = "否");
+      return str;
+    }
   }
-}
+};
 </script>
 <style lang="scss" scoped>
 .teacherInfo {

src/views/teacherManager/teacherDetail/index.vue

@@ -1,89 +1,131 @@
 <template>
   <div class="m-container">
     <h2 class="mo-tilte">
-      <el-page-header @back="onCancel"
-                      :content="teacherName"></el-page-header>
+      <el-page-header @back="onCancel" :content="teacherName"></el-page-header>
       <div>
         <!-- 服务指标:本周 运营指标: -->
-        <el-button v-if="teacherInfos && permission('/operateStudent')" type="text" @click="gotoOperating">运营指标:<span style="color:red">{{teacherInfos.operatingIndex}}%</span></el-button>
-        <el-button v-if="teacherInfos && permission('/serverIndexList')" type="text" @click="gotoAfterSchool">服务指标(每周):<span style="color:red">{{teacherInfos.serviceIndex}}%</span></el-button>
+        <el-button
+          v-if="teacherInfos && permission('/operateStudent')"
+          type="text"
+          @click="gotoOperating"
+          >运营指标:<span style="color:red"
+            >{{ teacherInfos.operatingIndex }}%</span
+          ></el-button
+        >
+        <el-button
+          v-if="teacherInfos && permission('/serverIndexList')"
+          type="text"
+          @click="gotoAfterSchool"
+          >服务指标(每周):<span style="color:red"
+            >{{ teacherInfos.serviceIndex }}%</span
+          ></el-button
+        >
       </div>
     </h2>
     <div class="m-core">
       <!-- navMenu -->
-      <tab-router v-model.trim="activeName"
-               type="card"
-               @tab-click="handleClick">
-        <el-tab-pane label="基本信息"
-        lazy
-                     v-if="permissionList.teacherInfo"
-                     name="0">
-          <teacherInfo v-if="activeName == 0&&teacherInfos" :teacherInfo='teacherInfos'  />
+      <tab-router
+        v-model.trim="activeName"
+        type="card"
+        @tab-click="handleClick"
+      >
+        <el-tab-pane
+          label="基本信息"
+          lazy
+          v-if="permissionList.teacherInfo"
+          name="0"
+        >
+          <teacherInfo
+            v-if="activeName == 0 && teacherInfos"
+            :teacherInfo="teacherInfos"
+          />
         </el-tab-pane>
-        <el-tab-pane label="乐团课"
-        lazy
-                     v-if="permissionList.musicGroup"
-                     name="1">
+        <el-tab-pane
+          label="乐团课"
+          lazy
+          v-if="permissionList.musicGroup"
+          name="1"
+        >
           <courseInfo v-if="activeName == 1" />
         </el-tab-pane>
-        <el-tab-pane label="VIP课"
-        lazy
-                     v-if="permissionList.VipCourse"
-                     name="2">
+        <el-tab-pane
+          label="VIP课"
+          lazy
+          v-if="permissionList.VipCourse"
+          name="2"
+        >
           <courseInfo1 v-if="activeName == 2" />
         </el-tab-pane>
-        <el-tab-pane label="网管课"
-        lazy
-                     v-if="permissionList.teacherNetwork"
-                     name="8">
+        <el-tab-pane
+          label="网管课"
+          lazy
+          v-if="permissionList.teacherNetwork"
+          name="8"
+        >
           <teacherNetwork v-if="activeName == 8" />
         </el-tab-pane>
-        <el-tab-pane label="对外课"
-        lazy
-                     v-if="permissionList.outCourseList"
-                     name="3">
+        <el-tab-pane
+          label="对外课"
+          lazy
+          v-if="permissionList.outCourseList"
+          name="3"
+        >
           <outCourseList v-if="activeName == 3" />
         </el-tab-pane>
-        <el-tab-pane label="课表详情"
-        lazy
-                     v-if="permissionList.teacherRecord"
-                     name="4">
+        <el-tab-pane
+          label="课表详情"
+          lazy
+          v-if="permissionList.teacherRecord"
+          name="4"
+        >
           <teacherRecord v-if="activeName == 4" />
         </el-tab-pane>
-        <el-tab-pane label="请假记录"
-        lazy
-                     v-if="permissionList.leaveRecord"
-                     name="5">
+        <el-tab-pane
+          label="请假记录"
+          lazy
+          v-if="permissionList.leaveRecord"
+          name="5"
+        >
           <leaveRecord v-if="activeName == 5" />
         </el-tab-pane>
-        <el-tab-pane label="上课结算列表"
-        lazy
-                     v-if="permissionList.settlement"
-                     name="6">
+        <el-tab-pane
+          label="上课结算列表"
+          lazy
+          v-if="permissionList.settlement"
+          name="6"
+        >
           <settlement v-if="activeName == 6" />
         </el-tab-pane>
-        <el-tab-pane label="时间记录"
-        lazy
-                     v-if="permissionList.timerList"
-                     name="7">
+        <el-tab-pane
+          label="时间记录"
+          lazy
+          v-if="permissionList.timerList"
+          name="7"
+        >
           <timerList v-if="activeName == 7" />
         </el-tab-pane>
-        <el-tab-pane label="学员"
-        lazy
-                     v-if="permissionList.serveStudentList"
-                     name="9">
+        <el-tab-pane
+          label="学员"
+          lazy
+          v-if="permissionList.serveStudentList"
+          name="9"
+        >
           <serveStudentList v-if="activeName == 9" />
         </el-tab-pane>
-        <el-tab-pane label="月历课表"
-        lazy
-                     v-if="permissionList.calendarList"
-                     name="10">
+        <el-tab-pane
+          label="月历课表"
+          lazy
+          v-if="permissionList.calendarList"
+          name="10"
+        >
           <calendarList v-if="activeName == 10" />
         </el-tab-pane>
-        <el-tab-pane label="周历课表"
-        lazy
-                     v-if="permissionList.weeklyCalendar"
-                     name="11">
+        <el-tab-pane
+          label="周历课表"
+          lazy
+          v-if="permissionList.weeklyCalendar"
+          name="11"
+        >
           <weeklyCalendar v-if="activeName == 11" />
         </el-tab-pane>
       </tab-router>
@@ -102,10 +144,10 @@ import timerList from "@/views/teacherManager/teacherDetail/components/timerList
 import outCourseList from "@/views/teacherManager/teacherDetail/components/outCourseList";
 import teacherNetwork from "@/views/teacherManager/teacherDetail/components/teacherNetwork";
 import serveStudentList from "@/views/teacherManager/teacherDetail/components/serveStudentList";
-import calendarList from '@/views/teacherManager/teacherDetail/components/calendarList'
-import weeklyCalendar from '@/views/teacherManager/teacherDetail/components/weeklyCalendar'
+import calendarList from "@/views/teacherManager/teacherDetail/components/calendarList";
+import weeklyCalendar from "@/views/teacherManager/teacherDetail/components/weeklyCalendar";
 import { permission } from "@/utils/directivePage";
-import { teacherGet } from '@/api/teacherManager'
+import { teacherGet } from "@/api/teacherManager";
 export default {
   components: {
     teacherRecord,
@@ -123,7 +165,7 @@ export default {
     weeklyCalendar
   },
   name: "teacherDetail",
-  data () {
+  data() {
     return {
       teacherName: this.$route.query.teacherName,
       activeName: "",
@@ -141,52 +183,49 @@ export default {
         teacherNetwork: permission("/teacherDetail/teacherNetwork"),
         serveStudentList: permission("/teacherDetail/serveStudentList"),
         calendarList: permission("/teacherDetail/calendarList"),
-        weeklyCalendar: permission("/teacherDetail/weeklyCalendar"),
+        weeklyCalendar: permission("/teacherDetail/weeklyCalendar")
       },
-      teacherInfos:null
+      teacherInfos: null
     };
   },
-  activated () {
+  activated() {},
 
-  },
-
-  mounted () {
-      this.teacherName = this.$route.query.teacherName;
-      this.teacherId = this.$route.query.teacherId
+  mounted() {
+    this.teacherName = this.$route.query.teacherName;
+    this.teacherId = this.$route.query.teacherId;
 
-      teacherGet({ teacherId: this.teacherId }).then(res => {
-        if (res.code == 200) {
-         this.teacherInfos = res.data
-         this.activeName = "0";
-
-        }
-      })
+    teacherGet({ teacherId: this.teacherId }).then(res => {
+      if (res.code == 200) {
+        this.teacherInfos = res.data;
+        this.activeName = "0";
+      }
+    });
   },
   methods: {
     permission,
-    handleClick (val, event) {
+    handleClick(val, event) {
       this.activeName = val.name;
       // this.activeStatus[val.name] = true
     },
-    onCancel () {
-       this.$store.dispatch('delVisitedViews', this.$route)
+    onCancel() {
+      this.$store.dispatch("delVisitedViews", this.$route);
       this.$router.push({
         path: "/teacherManager/teacherList"
       });
     },
-      gotoAfterSchool() {
+    gotoAfterSchool() {
       // 需要的参数 id
       this.$router.push({
         path: "/serverIndexManager/serverIndexList",
-        query: { teacherId:  this.teacherId*1, activeIndex: "2" },
+        query: { teacherId: this.teacherId * 1, activeIndex: "2" }
       });
     },
     gotoOperating() {
       this.$router.push({
         path: "/operateManager/operateStudent",
-        query: { teacherId:  this.teacherId*1, operatingTag: "1" },
+        query: { teacherId: this.teacherId * 1, operatingTag: "1" }
       });
-    },
+    }
   }
 };
 </script>