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

src/views/about/news/index.vue

@@ -100,9 +100,6 @@ const data = reactive<any>({
     queryParams: {
         pageNum: 1,
         pageSize: 10,
-        type: '1',
-        newsTitle: '',
-        newsStatus: '',
         newsType: '14'
     },
     rules: {}

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

@@ -17,22 +17,25 @@
                         <el-descriptions-item label="培训时间:">{{ form?.trainingStart }}~{{ form?.trainingEnd }}</el-descriptions-item>
                         <el-descriptions-item label="培训方式:">{{ selectDictLabel(dm_training_join_type, form?.joinType) || '-' }}</el-descriptions-item>
                         <el-descriptions-item label="培训地点:">{{ form?.trainingLocation || '-' }}</el-descriptions-item>
-                        <el-descriptions-item label="是否颁发证书:">{{ selectDictLabel(dm_training_join_type, form?.certFlag) || '-' }}</el-descriptions-item>
-                        <el-descriptions-item label="证书名称:">{{ selectDictLabels(dm_training_cert, form?.certificateInfo, ',') }}</el-descriptions-item>
+                        <el-descriptions-item label="联系人:">{{ form?.contactName || '-' }}</el-descriptions-item>
+                        <el-descriptions-item label="联系电话:">{{ form?.tel || '-' }}</el-descriptions-item>
                         <el-descriptions-item label="创建人:">{{ form?.createByName || '-' }}</el-descriptions-item>
                         <el-descriptions-item label="创建时间:">{{ form?.createTime || '-' }}</el-descriptions-item>
                     </el-descriptions>
-                    <div class="d-flex f-s-14 c-666">
+                    <div class="d-flex f-s-14 c-666 mb-10">
                         <div class="flex1">
                             <div class="c-333 mb-10">培训详情:</div>
                             <div>{{ form?.description || '-' }}</div>
                         </div>
+                        <div class="flex1">
+                            <div class="c-333 mb-10">与会须知:</div>
+                            <div>{{ form?.notice || '-' }}</div>
+                        </div>
                         <div v-if="form?.attachments" class="flex1">
                             <div class="c-333 mb-10">相关文件:</div>
                             <FileLook v-model="form.attachments" :span="12"></FileLook>
                         </div>
                     </div>
-                    <el-divider />
                     <div class="d-flex f-s-14 c-666">
                         <div class="flex1">
                             <div class="c-333 mb-10">封面图:</div>
@@ -51,6 +54,23 @@
                             </div>
                         </div>
                     </div>
+                    <div class="f-s-14">
+                        <div class="c-333 mb-10">是否颁发证书: {{ +form?.certFlag ? '是' : '否' }}</div>
+                        <vxe-table v-if="+form?.certFlag" border :data="form?.certificateInfo" min-height="0">
+                            <!-- 序号 -->
+                            <vxe-column type="seq" width="60" title="序号" align="center" />
+                            <vxe-column title="证书名称" min-width="100">
+                                <template #default="{ row }">
+                                    <DictTag :options="dm_training_cert" :value="row?.certType"></DictTag>
+                                </template>
+                            </vxe-column>
+                            <vxe-column title="证书模板">
+                                <template #default="{ row }">
+                                    <ImagePreview :src="row?.certImgUrl" :width="100"></ImagePreview>
+                                </template>
+                            </vxe-column>
+                        </vxe-table>
+                    </div>
                     <el-divider />
                     <div class="d-flex mb-16">
                         <div class="info-title ">