修改问题Bug

src/api/teacherManager.js

@@ -11,4 +11,13 @@ export function teacherQueryPage(data) {
     })
 }
 
+// 根据教师编号查询教师基本信息
+export function teacherGet(data) {
+    return request({
+        url: '/teacher-server/teacher/get',
+        method: 'get',
+        params: data
+    })
+}
+
 

src/utils/vueFilter.js

@@ -117,4 +117,4 @@ Vue.filter('formatTimer', (value) => {
     } else {
         return value
     }
-})
+})

src/views/businessManager/shopManager/shopList.vue

@@ -121,9 +121,9 @@ export default {
     onUpdate(row) {
       goodsUpdate({
         id: row.id,
-        status: row.id ? 0 : 1
+        status: row.status ? 0 : 1
       }).then(res => {
-        this.messageTips(row.id ? '下架' : '上架', res)
+        this.messageTips(row.status ? '下架' : '上架', res)
       })
     },
     onDelete(row) {

src/views/categroyManager/vipActiveList.vue

@@ -57,8 +57,8 @@
                            label="活动持续时间">
             <template slot-scope="scope">
               <div>
-                <p>{{ scope.row.startTime }}</p>
-                <p>{{ scope.row.endTime }}</p>
+                <p>{{ scope.row.startTime | formatTimer }}</p>
+                <p>{{ scope.row.endTime | formatTimer }}</p>
               </div>
             </template>
           </el-table-column>
@@ -67,8 +67,8 @@
                            label="课程安排时间">
             <template slot-scope="scope">
               <div>
-                <p>{{ scope.row.coursesStartTime }}</p>
-                <p>{{ scope.row.coursesEndTime }}</p>
+                <p>{{ scope.row.coursesStartTime | formatTimer }}</p>
+                <p>{{ scope.row.coursesEndTime | formatTimer }}</p>
               </div>
             </template>
           </el-table-column>

src/views/categroyManager/vipChargeSeting.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="m-container">
-    <h2>VIP课时收费设置 <div class="squrt"></div>
+    <h2>VIP课程收费设置 <div class="squrt"></div>
     </h2>
     <div class="m-core">
       <div class="tableWrap">

src/views/categroyManager/vipNewActive.vue

@@ -126,9 +126,11 @@
             <el-input placeholder="多少节开始赠"
                       v-if="activeType=='GIVE_CLASS'"
                       v-model="attribute1"
+                      type="number"
                       style='margin-right:10px;'></el-input> <span v-if="activeType=='GIVE_CLASS'">赠</span>
             <el-input v-if="activeType=='GIVE_CLASS'"
                       placeholder="请输入赠送课时数"
+                      type="number"
                       v-model="attribute2"
                       style='margin:0 10px;'></el-input>
             <el-checkbox v-if="activeType=='GIVE_CLASS'"
@@ -139,7 +141,7 @@
       </div>
     </div>
     <div class="btnWrap" style="justify-content:flex-start">
-      <div class="closeBtn">取消</div>
+      <div class="closeBtn" @click="onReSet">重置</div>
       <div class="okBtn" @click='submitFrom'>确定</div>
     </div>
   </div>
@@ -264,6 +266,23 @@ export default {
     },
     onCancel() {
       this.$router.push("/insideSetting/vipActiveList")
+    },
+    onReSet() {
+      this.vipform = {
+        name: '',
+        desc: '',
+        activeTime: [],
+        courseTime: [],
+      }
+      this.activeType = ''
+      this.online = true
+      this.unonline = true
+      this.salaryReadonlyFlag = true
+      this.onlineSalary = 'TEACHER_DEFAULT'
+      this.unonlineSalary = 'TEACHER_DEFAULT'
+      this.onlineprice = ''
+      this.unonlineprice = ''
+      this.$refs.vipform.resetFields()
     }
   },
 }

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

@@ -5,66 +5,121 @@
         <h4>基本信息</h4>
         <el-form :model="topForm"
                  :inline="true">
-          <el-form-item label="老师编号">
-            <el-input v-model="topForm.teacher"></el-input>
-          </el-form-item>
-          <el-form-item label="性别">
-            <el-input v-model="topForm.sex"></el-input>
-          </el-form-item>
-          <el-form-item label="出生日期">
-            <el-input v-model="topForm.sex"></el-input>
-          </el-form-item>
-          <el-form-item label="工作类别">
-            <el-input v-model="topForm.sex"></el-input>
-          </el-form-item>
-          <el-form-item label="入职日期">
-            <el-input v-model="topForm.sex"></el-input>
-          </el-form-item>
-          <el-form-item label="教学点1">
-            <el-input v-model="topForm.sex"></el-input>
-          </el-form-item>
-          <el-form-item label="所属分部">
-            <el-input v-model="topForm.sex"></el-input>
-          </el-form-item>
-          <el-form-item label="教学点2">
-            <el-input v-model="topForm.sex"></el-input>
-          </el-form-item>
-          <el-form-item label="流动范围">
-            <el-input v-model="topForm.sex"></el-input>
-          </el-form-item>
-          <br />
-          <el-form-item label="老师简介">
-            <el-input type='textarea'
-                      v-model="topForm.sex"></el-input>
-          </el-form-item>
-        </el-form>
-        <h4>资料学历</h4>
-        <el-form :model="dataInfo"
-                 :inline="true">
-          <el-form-item label="手机号">
-            <el-input v-model="dataInfo.phone"></el-input>
-          </el-form-item>
-          <el-form-item label="毕业学校">
-            <el-input v-model="dataInfo.phone"></el-input>
-          </el-form-item>
-          <el-form-item label="电子邮箱">
-            <el-input v-model="dataInfo.phone"></el-input>
-          </el-form-item>
-          <el-form-item label="最高学历">
-            <el-input v-model="dataInfo.phone"></el-input>
-          </el-form-item>
-          <el-form-item label="专业技能">
-            <el-input v-model="dataInfo.phone"></el-input>
-          </el-form-item>
-          <el-form-item label="职称">
-            <el-input v-model="dataInfo.phone"></el-input>
-          </el-form-item>
-          <el-form-item label="证件类型">
-            <el-input v-model="dataInfo.phone"></el-input>
-          </el-form-item>
-          <el-form-item label="证件号码">
-            <el-input v-model="dataInfo.phone"></el-input>
-          </el-form-item>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="老师编号">
+                <el-input disabled v-model="topForm.id"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="性别">
+                <el-input disabled v-model="topForm.gender"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="出生日期">
+                <el-input disabled v-model="topForm.birthdate"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="工作类别">
+                <el-input disabled v-model="topForm.jobNature "></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="入职日期">
+                <el-input disabled v-model="topForm.entryDate"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="教学点1">
+                <el-input disabled v-model="topForm.teacherSchools[0]"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="所属分部">
+                <el-input disabled v-model="topForm.organName"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="教学点2">
+                <el-input disabled v-model="topForm.teacherSchools[1]"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="流动范围">
+                <el-input disabled v-model="topForm.flowOrganRange"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="老师简介">
+                <el-input disabled type='textarea'
+                          v-model="topForm.introduction"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          
+          <h4>资料学历</h4>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="手机号">
+                <el-input disabled v-model="topForm.phone"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="毕业学校">
+                <el-input disabled v-model="topForm.graduateSchool"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="电子邮箱">
+                <el-input disabled v-model="topForm.email"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="最高学历">
+                <el-input disabled v-model="topForm.educationBackground"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="专业技能">
+                <el-input disabled v-model="topForm.subjectName"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="职称">
+                <el-input disabled v-model="topForm.technicalTitles"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="证件类型">
+                <el-input disabled v-model="topForm.certificateType"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="证件号码">
+                <el-input disabled v-model="topForm.certificateNum"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          
+          
+          
+          
+          
+          
+          
+          
         </el-form>
       </div>
       <div class="right">
@@ -79,16 +134,57 @@
   </div>
 </template>
 <script>
+import { teacherGet } from '@/api/teacherManager'
 export default {
   data () {
     return {
+      teacherId: this.$route.query.teacherId,
       topForm: {
-        teacher: '',
-        sex: ''
-      },
-      dataInfo: {
-        phone: ''
+        teacherSchools: ["", ""]
+      }
+    }
+  },
+  mounted() {
+    this.teacherGet()
+  },
+  methods: {
+    teacherGet() {
+      teacherGet({ id: this.teacherId }).then(res => {
+        if(res.code == 200) {
+          let tempData = res.data
+          tempData.subjectName = this.joinArray(tempData.subjectName)
+          tempData.entryDate = this.formatTimer(tempData.entryDate)
+          tempData.jobNature = this.jobNature(tempData.jobNature)
+          tempData.birthdate = this.jobNature(tempData.birthdate)
+          tempData.gender = tempData.birthdate ? '女' : '男'
+          this.topForm = res.data
+        }
+      })
+    },
+    joinArray(value, type) {
+      if (!type) {
+          type = ' '
+      }
+      if (typeof value == 'object' && value != null) {
+          return value.join(type)
+      } else {
+          return value
+      }
+    },
+    formatTimer(value) {
+      if (value) {
+          return value.split(' ')[0]
+      } else {
+          return value
+      }
+    },
+    jobNature(value) {
+      let template = {
+        PART_TIME: "兼职",
+        FULL_TIME: "全职",
+        TEMPORARY: "零时工"
       }
+      return template[value]
     }
   }
 }
@@ -103,6 +199,7 @@ export default {
     justify-content: flex-start;
     .left {
       max-width: 1000px;
+      width: 100%;
       h4 {
         margin-bottom: 20px;
       }

src/views/teacherManager/teacherDetail/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class='m-container'>
-    <h2>李老师</h2>
+    <h2>{{ teacherName }}</h2>
     <div class="m-core">
       <!-- navMenu -->
       <el-tabs v-model="activeName"
@@ -8,27 +8,27 @@
                @tab-click="handleClick">
         <el-tab-pane label="基本信息"
                      name="1">
-          <teacherInfo />
+          <teacherInfo v-if="activeStatus[0]" />
         </el-tab-pane>
         <el-tab-pane label="课程信息"
                      name="2">
-          <courseInfo />
+          <courseInfo v-if="activeStatus[1]" />
         </el-tab-pane>
         <el-tab-pane label="上课记录"
                      name="3">
-          <teacherRecord />
+          <teacherRecord v-if="activeStatus[2]" />
         </el-tab-pane>
         <el-tab-pane label="请假记录"
                      name="4">
-          <leaveRecord />
+          <leaveRecord v-if="activeStatus[3]" />
         </el-tab-pane>
         <el-tab-pane label="上课结算列表"
                      name="5">
-          <settlement />
+          <settlement v-if="activeStatus[4]" />
         </el-tab-pane>
         <el-tab-pane label="课酬设置"
                      name="6">
-          <salarySet />
+          <salarySet v-if="activeStatus[5]" />
         </el-tab-pane>
       </el-tabs>
     </div>
@@ -46,13 +46,15 @@ export default {
   name: 'teacherDetail',
   data () {
     return {
-      activeName: '1'
+      teacherName: this.$route.query.teacherName,
+      activeName: '1',
+      activeStatus: [true, false, false, false, false, false]
     }
   },
   methods: {
     handleClick (val, event) {
-      // console.log(val, event);
-      this.activeName = val.name;
+      this.activeName = val.name
+      this.activeStatus[val.name - 1] = true
     }
   }
 }

src/views/teacherManager/teacherList.vue

@@ -91,7 +91,7 @@
           <el-table-column align='center'
                            label="操作">
             <template slot-scope="scope">
-              <router-link style="color:#409EFF" :to="`/business/teacherDetail?userId=${scope.row.userId}`">查看</router-link>
+              <router-link style="color:#409EFF" :to="`/business/teacherDetail?teacherId=${scope.row.id}&teacherName=${scope.row.realName}`">查看</router-link>
               <el-button type="text">冻结</el-button>
               <el-button type="text">解冻</el-button>
             </template>
@@ -147,6 +147,9 @@ export default {
           this.pageInfo.total = res.data.total
         }
       })
+    },
+    onReSet() {
+      
     }
   }
 }