修改部分bug，完善云药资料页面

src/views/leader/declaration-detail/index.vue

@@ -42,7 +42,7 @@
                     <div class="info-title f-w-5 mb-10">标准应用产品图</div>
                     <div class="imgout">
                         <div v-for="(item,index) in form?.imgs" :key="index">
-                            <img :src="item" style="height: 300px;width: 300px;object-fit: cover;" />
+                            <el-image :src="item" style="height: 200px;width: 200px;" fit="cover" :preview-src-list="form?.imgs"/>
                         </div>
                     </div>
                     <el-divider />

src/views/leader/declaration-record/index.vue

@@ -79,6 +79,7 @@ const initFormData = {};
 const data = reactive<any>({
     form: { ...initFormData },
     queryParams: {
+        status:"0",
         pageNum: 1,
         pageSize: 10,
         res: '0',

src/views/training/materials-input/index.vue

@@ -0,0 +1,226 @@
+<template>
+    <div class="p-3">
+        <div class="bg-fff flex1 ov-hd d-flex flex-cln">
+            <div class="d-flex a-c pd-16 border-bottom">
+                <div class="f-s-20 c-333 f-w-7 mr-10">{{ form.id ? '编辑' : '新增' }}{{ selectDictLabel(new_type, form.newsType) }}</div>
+                <el-button @click="router.go(-1)" type="primary" text>
+                    <el-icon>
+                        <Back />
+                    </el-icon>
+                    返回上一级
+                </el-button>
+            </div>
+            <div class="flex1 over-auto">
+                <el-form ref="formRef" label-width="auto" label-position="top" :model="form" :rules="rules" :disabled="disable">
+                    <div class="pd-16 border-bottom ov-hd">
+                        <template v-if="['30'].includes(form.newsType)">
+                            <el-row :gutter="90">
+                                <el-col :span="8">
+                                    <el-form-item label="标题：" prop="newsTitle" required :rules="[{ required: true, message: '请输入中文名称', trigger: 'blur' }]">
+                                        <el-input v-model="form.newsTitle" clearable placeholder="请输入中文名称"></el-input>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="8">
+                                    <el-form-item label="发布时间：" prop="publishTime">
+                                        <el-date-picker v-model="form.publishTime" type="datetime" placeholder="请选择发布时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"></el-date-picker>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="8">
+                                    <el-form-item label="来源：" prop="newsOrigin">
+                                        <el-input v-model="form.newsOrigin" clearable placeholder="请输入来源"></el-input>
+                                    </el-form-item>
+                                </el-col>
+                            </el-row>
+                            <el-row>
+                                <el-col :span="24">
+                                    <el-form-item label="内容" prop="newsContent">
+                                        <div class="flex1">
+                                            <Editor v-model="form.newsContent" placeholder="请输入内容" :readOnly="disable"></Editor>
+                                        </div>
+                                    </el-form-item>
+                                </el-col>
+                            </el-row>
+                            <el-row>
+                                <el-col :span="24">
+                                    <el-form-item label="管理办法附件" prop="extraInfo.accessory">
+                                        <div class="flex1">
+                                            <FileUpload v-model="form.extraInfo.accessory" format="array" :fileSize="100" :span="8" :limit="100"></FileUpload>
+                                        </div>
+                                    </el-form-item>
+                                </el-col>
+                            </el-row>
+                        </template>
+                        <template v-if="['37'].includes(form.newsType)">
+                            <el-row :gutter="90">
+                                <el-col :span="8">
+                                    <el-form-item label="标题：" prop="newsTitle" required :rules="[{ required: true, message: '请输入中文名称', trigger: 'blur' }]">
+                                        <el-input v-model="form.newsTitle" clearable placeholder="请输入中文名称"></el-input>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="8">
+                                    <el-form-item label="发布时间：" prop="publishTime">
+                                        <el-date-picker v-model="form.publishTime" type="datetime" placeholder="请选择发布时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"></el-date-picker>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="8">
+                                    <el-form-item label="来源：" prop="newsOrigin">
+                                        <el-input v-model="form.newsOrigin" clearable placeholder="请输入来源"></el-input>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="8">
+                                    <el-form-item label="文件资料：" prop="extraInfo.accessory">
+                                        <FileUpload v-model="form.extraInfo.accessory" format="array" :fileSize="100"></FileUpload>
+                                    </el-form-item>
+                                </el-col>
+                            </el-row>
+                        </template>
+                        <template v-if="['39'].includes(form.newsType)">
+                            <el-row :gutter="90">
+                                <el-col :span="8">
+                                    <el-form-item label="标题：" prop="newsTitle" required :rules="[{ required: true, message: '请输入中文名称', trigger: 'blur' }]">
+                                        <el-input v-model="form.newsTitle" clearable placeholder="请输入中文名称"></el-input>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="8">
+                                    <el-form-item label="发布时间：" prop="publishTime">
+                                        <el-date-picker v-model="form.publishTime" type="datetime" placeholder="请选择发布时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"></el-date-picker>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="8">
+                                    <el-form-item label="来源：" prop="newsOrigin">
+                                        <el-input v-model="form.newsOrigin" clearable placeholder="请输入来源"></el-input>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="8">
+                                    <el-form-item label="视频：" prop="extraInfo.accessory">
+                                        <FileUpload v-model="form.extraInfo.accessory" :fileType="['mp4', 'MP4']" :fileSize="100" format="array"></FileUpload>
+                                    </el-form-item>
+                                </el-col>
+                            </el-row>
+                        </template>
+                        <template v-if="['38'].includes(form.newsType)">
+                            <el-row :gutter="90">
+                                <el-col :span="8">
+                                    <el-form-item label="标题：" prop="newsTitle" required :rules="[{ required: true, message: '请输入中文名称', trigger: 'blur' }]">
+                                        <el-input v-model="form.newsTitle" clearable placeholder="请输入中文名称"></el-input>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="8">
+                                    <el-form-item label="发布时间：" prop="publishTime">
+                                        <el-date-picker v-model="form.publishTime" type="datetime" placeholder="请选择发布时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"></el-date-picker>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="8">
+                                    <el-form-item label="来源：" prop="newsOrigin">
+                                        <el-input v-model="form.newsOrigin" clearable placeholder="请输入来源"></el-input>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="8">
+                                    <el-form-item label="图片：" prop="extraInfo.accessory">
+                                        <FileUpload v-model="form.extraInfo.accessory" :fileType="['png', 'PNG', 'jpg', 'JPG', 'jpeg']" :fileSize="100" format="array"></FileUpload>
+                                    </el-form-item>
+                                </el-col>
+                            </el-row>
+                        </template>
+                    </div>
+                </el-form>
+            </div>
+            <div class="d-flex a-c j-c pd-16">
+                <el-button @click="router.go(-1)">取消</el-button>
+                <template v-if="form.newsStatus !== '1'">
+                    <el-button @click="save" color="#0079fe">暂存</el-button>
+                    <el-button @click="submitGround" type="warning">立即上架</el-button>
+                </template>
+                <el-button v-if="form.newsStatus === '1'" @click="save" type="primary">提交</el-button>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script setup name="Materials-input" lang="ts">
+import { ref, reactive, onMounted } from 'vue';
+import { debounce } from 'lodash';
+import { addNews, editNews, publishNews, getNewsInfo } from '@/api/dgtmedicine/news';
+import { useRouter } from 'vue-router';
+import { AddBtn } from '@/views/models';
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { new_type } = toRefs<any>(proxy?.useDict('new_type'));
+const router = useRouter();
+const form = ref<any>({
+    id: undefined,
+    newsTitle: '',
+    newsContent: '',
+    newsImg: '',
+    publishTime: '',
+    newsOrigin: '',
+    newsType: '10',
+    extraInfo: {
+        accessory: []
+    }
+});
+const rules = reactive({
+    // newsImg: [
+    //     { required: true, message: '请上传封面图片', trigger: 'blur' }
+    // ],
+    newsContent: [{ required: true, message: '请输入内容', trigger: 'blur' }]
+});
+const formRef = ref();
+const varietyOptions = ref([]);
+
+const save = debounce(async () => {
+    await formRef.value.validate();
+    const res = form.value.id ? await editNews(form.value) : await addNews(form.value);
+    if (res && res.code === 200) {
+        router.go(-1);
+    }
+}, 500);
+const addDataList = () => {
+    if (!form.value.extraInfo) {
+        form.value.extraInfo = {
+            dataList: [
+                {
+                    month: '',
+                    subtitle: '',
+                    content: '',
+                    isMark: '0'
+                }
+            ]
+        };
+    } else {
+        form.value.extraInfo.dataList.push({
+            month: '',
+            subtitle: '',
+            content: '',
+            isMark: '0'
+        });
+    }
+};
+const deleteList = (index) => {
+    form.value.extraInfo.dataList.splice(index, 1);
+};
+const submitGround = debounce(async () => {
+    await formRef.value.validate();
+    const res = form.value.id ? await editNews(form.value) : await addNews(form.value);
+    if (res && res.code === 200) {
+        await publishNews(res.data.id);
+        router.go(-1);
+    }
+}, 500);
+const fetchDetail = async (id) => {
+    const res = await getNewsInfo(id);
+    if (res && res.code === 200) {
+        console.log(res.data.publishTime);
+
+        form.value = res.data;
+    }
+};
+const disable = ref(false);
+const route = useRoute();
+onMounted(() => {
+    form.value.newsType = route.query?.newsType;
+    if (route.query?.id) {
+        // 编辑
+        fetchDetail(route.query?.id);
+    }
+});
+</script>

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">云药GAP资料下载</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">
@@ -31,9 +31,9 @@
             <div class="d-flex flex1 ov-hd flex-cln pd-16">
                 <div class="d-flex j-sb mb-16">
                     <div>
-                        <searchTabs v-model="queryParams.newsType" @change="handleQuery" :list="gap_downloads_type" key-label="label" key-value="value" :isNum="false"></searchTabs>
+                        <searchTabs v-model="queryParams.newsType" @change="handleQuery" :list="materials_downloads_type" key-label="label" key-value="value" :isNum="false"></searchTabs>
                     </div>
-                    <el-button type="primary" @click="router.push({ path: 'gap-input', query: { newsType: queryParams.newsType } })">新增{{ selectDictLabel(gap_downloads_type, queryParams.newsType)}}</el-button>
+                    <el-button type="primary" @click="router.push({ path: 'materials-input', query: { newsType: queryParams.newsType } })">新增{{ selectDictLabel(materials_downloads_type, queryParams.newsType)}}</el-button>
                 </div>
                 <div class="flex1 ov-hd">
                     <vxe-table :loading="loading" border :data="dataList" min-height="0" max-height="100%">
@@ -42,9 +42,9 @@
                         <vxe-column title="发布时间" align="center" field="publishTime" :formatter="colNoData" />
                         <vxe-column title="来源" align="center" field="newsOrigin" :formatter="colNoData" />
                         <vxe-column title="浏览量" align="center" field="viewCount" />
-                        <vxe-column title="类型" align="center" field="newsType">
+                        <vxe-column title="类型" align="center" field="newsType" class="materials_downloads_type">
                             <template #default="{ row }">
-                                <dict-tag :options="gap_downloads_type" :value="row.newsType" />
+                                <dict-tag :options="materials_downloads_type" :value="row.newsType" />
                             </template>
                         </vxe-column>
                         <vxe-column title="操作人" align="center" field="createByName" :formatter="colNoData" />
@@ -79,7 +79,7 @@ import { DateRange } from '@/views/models/index';
 import { searchTabs } from '@/views/models';
 const router = useRouter();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { news_status, gap_downloads_type } = toRefs<any>(proxy?.useDict('news_status', 'gap_downloads_type'));
+const { news_status, gap_downloads_type,materials_downloads_type } = toRefs<any>(proxy?.useDict('news_status', 'gap_downloads_type','materials_downloads_type'));
 const loading = ref(true);
 const showSearch = ref(true);
 const total = ref(0);
@@ -94,7 +94,7 @@ const data = reactive<any>({
         type: '1',
         newsTitle: '',
         newsStatus: '',
-        newsType: '35'
+        newsType: '37'
     },
     rules: {}
 });
@@ -104,7 +104,10 @@ const { queryParams, form } = toRefs(data);
 const getList = async () => {
     loading.value = true;
     const res = await fetchNewsList(queryParams.value);
-    dataList.value = res.rows;
+    const allowedTypes = ["37", "38", "39"];
+    dataList.value = res.rows.filter(item => allowedTypes.includes(item.newsType));
+    console.log(dataList.value,'dataList.value');
+
     total.value = res.total;
     loading.value = false;
 };
@@ -123,7 +126,7 @@ const resetQuery = () => {
 
 /** 编辑新闻 */
 const editNews = (row) => {
-    router.push({ path: `gap-input`, query: { id: row.id, newsType: row?.newsType, newsStatus: row.newsStatus } });
+    router.push({ path: `materials-input`, query: { id: row.id, newsType: row?.newsType, newsStatus: row.newsStatus } });
 };
 
 /** 删除新闻 */
@@ -171,3 +174,9 @@ onMounted(() => {
     getList();
 });
 </script>
+<style scoped>
+:deep(.vxe-cell ){
+    display: flex;
+    justify-content: center;
+}
+</style>