Merge branch 'master' of http://git.yujin.shuziyunyao.com/yujin/digital-medicine-front

src/api/training/index.ts

@@ -1,6 +1,6 @@
 import request, { downloadFile } from '@/utils/request';
 import { AxiosPromise } from 'axios';
-// 查询培训列表
+// 查询会议列表
 export const trainingList = (query?: any): AxiosPromise => {
     return request({
         url: '/dgtmedicine/training/list',

src/assets/styles/ruoyi.scss

@@ -383,4 +383,8 @@ $colors: (
 }
 .c-s-p {
   cursor: pointer;
-}
+}
+.p-2 {
+    flex: 1;
+    overflow-y: auto;
+}

src/views/training/materials/index.vue

@@ -2,7 +2,7 @@
     <div class="p-3">
         <div class="bg-fff flex1 ov-hd d-flex flex-cln" v-show="showSearch">
             <div class="pd-16 border-bottom">
-                <div class="f-s-20 c-333 f-w-7 mb-10">培训资料</div>
+                <div class="f-s-20 c-333 f-w-7 mb-10">会议资料</div>
                 <div class="d-flex">
                     <div class="flex1 ov-hd d-flex j-ed">
                         <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="auto">

src/views/training/meeting-add/index.vue

@@ -467,7 +467,7 @@ const rules = reactive({
     ],
     certFlag: [{ required: true, message: '请选择是否颁发证书', trigger: 'change' }],
     certificateInfo: [{ required: true, message: '请选择证书名称', trigger: 'change' }],
-    description: [{ required: true, message: '请输入培训详情', trigger: 'blur' }],
+    description: [{ required: true, message: '请输入会议详情', trigger: 'blur' }],
     eleSignature: [{ required: true, message: '请选择是否电子手签', trigger: 'blur' }],
     pointsFlag: [{ required: true, message: '请选择是否发放积分', trigger: 'blur' }],
     // coverImg: [{ required: true, message: '请上传封面图', trigger: 'change' }],

src/views/training/meeting/index.vue

@@ -69,7 +69,7 @@
                                 {{ selectDictLabel(lm_training_join_type, row.joinType) }}
                             </template>
                         </vxe-column>
-                        <!-- <vxe-column field="trainingLocation" title="培训地点" align="center" min-width="150" /> -->
+                        <!-- <vxe-column field="trainingLocation" title="会议地点" align="center" min-width="150" /> -->
                         <vxe-column field="certFlag" title="是否颁发证书" width="60">
                             <template #default="{ row }">
                                 {{ selectDictLabel(yes_no, row.certFlag) }}

src/views/training/models/meeting-editors.vue

@@ -264,12 +264,12 @@ const route = useRoute();
 const rules = reactive({
     // 自动生成全部
     trainingName: [{ required: true, message: '请输入会议名称', trigger: 'blur' }],
-    trainingTime: [{ required: true, message: '请选择培训时间', trigger: 'blur' }],
-    joinType: [{ required: true, message: '请选择培训方式', trigger: 'change' }],
-    trainingLocation: [{ required: true, message: '请输入培训地点', trigger: 'blur' }],
+    trainingTime: [{ required: true, message: '请选择会议时间', trigger: 'blur' }],
+    joinType: [{ required: true, message: '请选择会议方式', trigger: 'change' }],
+    trainingLocation: [{ required: true, message: '请输入会议地点', trigger: 'blur' }],
     certFlag: [{ required: true, message: '请选择是否颁发证书', trigger: 'change' }],
     certificateInfo: [{ required: true, message: '请选择证书名称', trigger: 'change' }],
-    description: [{ required: true, message: '请输入培训详情', trigger: 'blur' }],
+    description: [{ required: true, message: '请输入会议详情', trigger: 'blur' }],
     // coverImg: [{ required: true, message: '请上传封面图', trigger: 'change' }],
     // trainingImg: [{ required: true, message: '请上传会议图', trigger: 'change' }],
     contactName: [{ required: true, message: '请输入会议联系人', trigger: 'blur' }],