zs 1 year ago
parent
commit
eebb6f40d9

+ 3 - 8
src/lang/package/zh-cn/pages.js

@@ -61,12 +61,9 @@ export default {
     openid: '微信标识',
     nick_name: '昵称',
     gender: '性别',
-    age: '年龄',
-    grade: '所属年级',
-    cardType: '身份证类型',
-    card: '身份证号码',
+    birth: '出生日期',
+    card: '身份证照片',
     education: '学历',
-    subject: '学科',
     college: '院校',
     learnStatus: '学业状态',
     phone: '手机号',
@@ -82,10 +79,8 @@ export default {
     openid: '微信标识',
     nick_name: '昵称',
     gender: '性别',
-    age: '年龄',
-    grade: '年级',
+    birth: '出生日期',
     role: '角色',
-    address: '家庭地址',
     phone: '手机号',
     status: '状态'
   },

+ 0 - 7
src/views/user/student/index.vue

@@ -78,7 +78,6 @@ const fields = [
   { label: t('pages.student.gender'), model: 'gender', format: (i) => getDict(i, 'gender') },
   { label: t('pages.student.age'), model: 'age' },
   { label: t('pages.student.phone'), model: 'phone', filter: true },
-  { label: t('pages.student.grade'), model: 'grade', format: (i) => getDict(i, 'grade') },
   { label: t('pages.student.status'), model: 'status', format: (i) => getDict(i, 'status') }
 ]
 const opera = [
@@ -114,7 +113,6 @@ const examRules = reactive({
 const examForm = ref({})
 // 字典表
 const statusList = ref([])
-const gradeList = ref([])
 const genderList = ref([])
 const searchOther = async () => {
   let result
@@ -124,9 +122,6 @@ const searchOther = async () => {
   // 性别
   result = await dictDataStore.query({ code: 'gender', is_use: '0' })
   if ($checkRes(result)) genderList.value = result.data
-  // 年级
-  result = await dictDataStore.query({ code: 'grade', is_use: '0' })
-  if ($checkRes(result)) gradeList.value = result.data
 }
 
 const toDelete = async (data) => {
@@ -140,7 +135,6 @@ const getDict = (data, model) => {
   let res
   if (model == 'status') res = statusList.value.find((f) => f.value == data)
   else if (model == 'gender') res = genderList.value.find((f) => f.value == data)
-  else if (model == 'grade') res = gradeList.value.find((f) => f.value == data)
   return get(res, 'label')
 }
 // 查看
@@ -182,7 +176,6 @@ provide('form', form)
 // 字典
 provide('statusList', statusList)
 provide('genderList', genderList)
-provide('gradeList', gradeList)
 </script>
 <style scoped lang="scss">
 .tags {

+ 2 - 8
src/views/user/student/parts/user.vue

@@ -7,9 +7,6 @@
       <template #gender>
         <el-option disabled v-for="i in genderList" :key="i._id" :label="i.label" :value="i.value"></el-option>
       </template>
-      <template #grade>
-        <el-option disabled v-for="i in gradeList" :key="i._id" :label="i.label" :value="i.value"></el-option>
-      </template>
     </custom-form>
   </div>
 </template>
@@ -22,14 +19,11 @@ const formFields = ref([
   { label: t('pages.student.openid'), model: 'openid' },
   { label: t('pages.student.nick_name'), model: 'nick_name' },
   { label: t('pages.student.gender'), model: 'gender', type: 'select' },
-  { label: t('pages.student.age'), model: 'age' },
-  { label: t('pages.student.phone'), model: 'phone' },
-  { label: t('pages.student.grade'), model: 'grade', type: 'select' },
-  { label: t('pages.student.address'), model: 'address', type: 'textarea' }
+  { label: t('pages.student.birth'), model: 'birth' },
+  { label: t('pages.student.phone'), model: 'phone' }
 ])
 // 字典表
 const genderList = inject('genderList')
-const gradeList = inject('gradeList')
 </script>
 <style scoped lang="scss">
 .tags {

+ 17 - 56
src/views/user/teacher/parts/user.vue

@@ -5,58 +5,16 @@
         <el-avatar v-if="form.icon && form.icon.length > 0" :src="form.icon[0].url"></el-avatar>
       </template>
       <template #gender>
-        <el-option
-          disabled
-          v-for="i in genderList"
-          :key="i._id"
-          :label="i.label"
-          :value="i.value"
-        ></el-option>
-      </template>
-      <template #grade>
-        <el-option
-          disabled
-          v-for="i in gradeList"
-          :key="i._id"
-          :label="i.label"
-          :value="i.value"
-        ></el-option>
-      </template>
-      <template #cardType>
-        <el-option
-          disabled
-          v-for="i in cardTypeList"
-          :key="i._id"
-          :label="i.label"
-          :value="i.value"
-        ></el-option>
+        <el-option disabled v-for="i in genderList" :key="i._id" :label="i.label" :value="i.value"></el-option>
       </template>
       <template #education>
-        <el-option
-          disabled
-          v-for="i in educationList"
-          :key="i._id"
-          :label="i.label"
-          :value="i.value"
-        ></el-option>
-      </template>
-      <template #subject>
-        <el-option
-          disabled
-          v-for="i in subjectList"
-          :key="i._id"
-          :label="i.label"
-          :value="i.value"
-        ></el-option>
+        <el-option disabled v-for="i in educationList" :key="i._id" :label="i.label" :value="i.value"></el-option>
       </template>
       <template #learnStatus>
-        <el-option
-          disabled
-          v-for="i in learnStatusList"
-          :key="i._id"
-          :label="i.label"
-          :value="i.value"
-        ></el-option>
+        <el-option disabled v-for="i in learnStatusList" :key="i._id" :label="i.label" :value="i.value"></el-option>
+      </template>
+      <template #card>
+        <el-image class="images" v-for="i in form.card" :key="i.id" :src="i.url" :preview-src-list="getFlie(form.file)"></el-image>
       </template>
     </custom-form>
   </div>
@@ -70,24 +28,27 @@ const formFields = ref([
   { label: t('pages.teacher.openid'), model: 'openid' },
   { label: t('pages.teacher.nick_name'), model: 'nick_name' },
   { label: t('pages.teacher.gender'), model: 'gender', type: 'select' },
-  { label: t('pages.teacher.age'), model: 'age' },
+  { label: t('pages.teacher.birth'), model: 'birth' },
   { label: t('pages.teacher.phone'), model: 'phone' },
-  { label: t('pages.teacher.grade'), model: 'grade', type: 'select' },
-  { label: t('pages.teacher.cardType'), model: 'cardType', type: 'select' },
-  { label: t('pages.teacher.card'), model: 'card' },
   { label: t('pages.teacher.education'), model: 'education', type: 'select' },
-  { label: t('pages.teacher.subject'), model: 'subject', type: 'select' },
   { label: t('pages.teacher.college'), model: 'college' },
   { label: t('pages.teacher.learnStatus'), model: 'learnStatus', type: 'select' },
+  { label: t('pages.teacher.card'), model: 'card', custom: true },
   { label: t('pages.teacher.brief'), model: 'brief', type: 'textarea' }
 ])
 // 字典表
 const genderList = inject('genderList')
-const gradeList = inject('gradeList')
-const cardTypeList = inject('cardTypeList')
 const educationList = inject('educationList')
 const learnStatusList = inject('learnStatusList')
-const subjectList = inject('subjectList')
+// 图片处理
+const getFlie = (file) => {
+  if (file && file.length > 0) {
+    const urls = file.map((i) => {
+      return i.url
+    })
+    return urls
+  }
+}
 </script>
 <style scoped lang="scss">
 .tags {