修改

src/components/FileUpload/index.vue

@@ -14,18 +14,18 @@
                     <template v-if="file.url">
                         <a v-if="['png', 'jpg', 'jpeg', 'bmp'].includes(fileExt(file.name))" class="flex1 right-wrap ov-hd" @click="show2 = true; lookIndex = index">
                             <el-tooltip class="box-item" effect="dark" :content="file.name" placement="top">
-                                <div class="item-text sv-1 flex1">{{ file.name }}</div>
+                                <div class="item-text sv-1 flex1">{{ file.name || file.url || '-' }}</div>
                             </el-tooltip>
                         </a>
                         <a v-else class="flex1 right-wrap ov-hd" :href="`${file.url}`" :underline="false" target="_blank">
                             <el-tooltip class="box-item" effect="dark" :content="file.name" placement="top">
-                                <div class="item-text sv-1 flex1">{{ file.name || '-' }}</div>
+                                <div class="item-text sv-1 flex1">{{ file.name || file.url || '-' }}</div>
                             </el-tooltip>
                         </a>
                     </template>
                     <div v-else class="flex1 right-wrap ov-hd p-rtv">
                         <el-tooltip class="box-item" effect="dark" :content="file.name" placement="top">
-                            <div class="item-text sv-1">{{ file.name || '-' }}</div>
+                            <div class="item-text sv-1">{{ file.name || file.url || '-' }}</div>
                         </el-tooltip>
                         <div class="progress" :style="{ width: file.percentage + '%' }"></div>
                     </div>

src/utils/request.ts

@@ -302,4 +302,4 @@ export function downloadFile({ url, fileName = '', method = 'get', params = {},
     }
 }
 // 导出 axios 实例
-export default service;
+export default service;

src/views/news/input/index.vue

@@ -2,8 +2,7 @@
     <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>
+                <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 />
@@ -12,8 +11,7 @@
                 </el-button>
             </div>
             <div class="flex1 over-auto">
-                <el-form ref="formRef" label-width="auto" label-position="top" :model="form" :rules="rules"
-                    :disabled="disable">
+                <el-form ref="formRef" label-width="auto" label-position="top" :model="form" :rules="rules" :disabled="disable">
                     <div class="pd-16 border-bottom ov-hd">
                         <el-row :gutter="90">
                             <el-col :span="8">
@@ -23,9 +21,7 @@
                             </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"
-                                        :disabled="disable"></el-date-picker>
+                                    <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" :disabled="disable"></el-date-picker>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="8">
@@ -36,15 +32,14 @@
                             <el-col :span="4">
                                 <el-form-item label="有效值：" prop="extraInfo.validStatus">
                                     <el-radio-group v-model="form.extraInfo.validStatus">
-                                        <el-radio :value=true size="large">有效</el-radio>
-                                        <el-radio :value=false size="large">无效</el-radio>
+                                        <el-radio value="1" size="large">有效</el-radio>
+                                        <el-radio value="0" size="large">无效</el-radio>
                                     </el-radio-group>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="8">
                                 <el-form-item label="封面图" prop="newsImg">
-                                    <imageUpload v-model="form.newsImg" :limit="1" isString :isShowTip="false" :fileSize="20">
-                                    </imageUpload>
+                                    <imageUpload v-model="form.newsImg" :limit="1" isString :isShowTip="false" :fileSize="20"></imageUpload>
                                 </el-form-item>
                             </el-col>
                         </el-row>

src/views/news/newslist/index.vue

@@ -0,0 +1,171 @@
+<template>
+    <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">{{ selectDictLabel(new_type, queryParams.newsType)}}</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">
+                            <el-form-item label="标题" prop="newsTitle">
+                                <el-input v-model="queryParams.newsTitle" placeholder="请输入标题" clearable style="width: 180px" @keyup.enter="handleQuery" />
+                            </el-form-item>
+                            <el-form-item label="创建时间" prop="dateRange">
+                                <div class="d-flex" style="width: 180px">
+                                    <DateRange v-model="queryParams.dateRange" v-model:start-date="queryParams.startDate" v-model:end-date="queryParams.endDate"></DateRange>
+                                </div>
+                            </el-form-item>
+                            <el-form-item label="状态" prop="newsStatus">
+                                <el-select style="width: 140px" v-model="queryParams.newsStatus" clearable placeholder="请选择状态">
+                                    <el-option v-for="item in news_status" :key="item.value" :label="item.label" :value="item.value" />
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item>
+                                <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                                <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+                            </el-form-item>
+                        </el-form>
+                    </div>
+                </div>
+            </div>
+
+            <div class="d-flex flex1 ov-hd flex-cln pd-16">
+                <div class="d-flex j-sb mb-16">
+                    <el-button type="primary" @click="router.push({ path: 'input-' + queryParams.newsType, query: { newsType: queryParams.newsType } })">新增{{ selectDictLabel(new_type, queryParams.newsType)}}</el-button>
+                </div>
+                <div class="flex1 ov-hd">
+                    <vxe-table :loading="loading" border :data="dataList" min-height="0" max-height="100%">
+                        <vxe-column title="序号" align="center" type="seq" width="60" />
+                        <vxe-column title="标题" align="center" field="newsTitle" :formatter="colNoData" width="400" />
+                        <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">
+                            <template #default="{ row }">
+                                <dict-tag :options="new_type" :value="row.newsType" />
+                            </template>
+                        </vxe-column>
+                        <vxe-column title="操作人" align="center" field="createByName" :formatter="colNoData" />
+                        <vxe-column title="操作时间" align="center" field="createTime" :formatter="colNoData" />
+                        <vxe-column title="状态" align="center" field="newsStatus">
+                            <template #default="{ row }">
+                                <dict-tag :options="news_status" :value="row.newsStatus" />
+                            </template>
+                        </vxe-column>
+                        <vxe-column title="操作" width="250" align="center" fixed="right">
+                            <template #default="{ row }">
+                                <el-button type="text" size="small" @click="row.newsStatus === '1' ? unpublishNews(row) : publishNews(row)">
+                                    {{ row.newsStatus === '1' ? '下架' : '上架' }}
+                                </el-button>
+                                <el-button type="text" size="small" @click="editNews(row)">编辑</el-button>
+                                <el-button type="text" size="small" @click="deleteNews(row)">删除</el-button>
+                            </template>
+                        </vxe-column>
+                    </vxe-table>
+                </div>
+                <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+            </div>
+        </div>
+    </div>
+</template>
+
+<script setup name="news-list-cum" lang="ts">
+import { colNoData } from '@/utils/noData';
+import { publishNews as publishNewsApi, unpublishNews as unpublishNewsApi, removeNews, fetchNewsList } from '@/api/dgtmedicine/news';
+import { DateRange } from '@/views/models/index';
+import { searchTabs } from '@/views/models';
+const router = useRouter();
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { news_status, new_type} = toRefs<any>(proxy?.useDict('news_status', "new_type"));
+const loading = ref(true);
+const showSearch = ref(true);
+const total = ref(0);
+const queryFormRef = ref<ElFormInstance>();
+const dataList = ref<any[]>([]);
+const initFormData = {};
+const data = reactive<any>({
+    form: { ...initFormData },
+    queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        type: '1',
+        newsTitle: '',
+        newsStatus: '',
+        newsType: '16'
+    },
+    rules: {}
+});
+
+const { queryParams, form } = toRefs(data);
+/** 查询会员信息列表 */
+const getList = async () => {
+    loading.value = true;
+    const res = await fetchNewsList(queryParams.value);
+    dataList.value = res.rows;
+    total.value = res.total;
+    loading.value = false;
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+    queryParams.value.pageNum = 1;
+    getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+    queryFormRef.value?.resetFields();
+    handleQuery();
+};
+
+/** 编辑新闻 */
+const editNews = (row) => {
+    router.push({ path: `input-${row.newsType}`, query: { id: row.id, newsType: row?.newsType, newsStatus: row.newsStatus } });
+};
+
+
+/** 删除新闻 */
+const deleteNews = async (row) => {
+    ElMessageBox.confirm(`确认要删除 "${row.newsTitle}" 数据吗？`, '删除提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning'
+    }).then(async () => {
+        const res = await removeNews([row.id]);
+        if (res) {
+            ElMessage.success('删除成功');
+            getList();
+        }
+    });
+};
+
+/** 上架新闻 */
+const publishNews = async (row) => {
+    try {
+        const res = await publishNewsApi(row.id); // Replace with your API call
+        if (res) {
+            ElMessage.success('上架成功');
+            getList();
+        }
+    } catch (error) {
+        ElMessage.error('下架失败');
+    }
+};
+
+/** 下架新闻 */
+const unpublishNews = async (row) => {
+    try {
+        const res = await unpublishNewsApi(row.id); // Replace with your API call
+        if (res) {
+            ElMessage.success('下架成功');
+            getList();
+        }
+    } catch (error) {
+        ElMessage.error('下架失败');
+    }
+};
+const route = useRoute();
+onMounted(() => {
+    queryParams.value.newsType = route.query?.newsType;
+    getList();
+});
+</script>

src/views/skill/group/post/index.vue

@@ -1,4 +1,148 @@
 <template>
-    <div>xx</div>
+    <div class="p-3">
+        <div class="bg-fff flex1 ov-hd d-flex flex-cln" v-show="showSearch">
+            <div class="pd3-16-16-0 border-bottom">
+                <div class="f-s-20 c-333 f-w-7 mb-10">团体标准</div>
+                <div class="d-flex">
+                    <el-form class="mb-16" ref="formRef" :model="queryParams" inline label-width="auto">
+                        <el-form-item label="标准编号：" prop="code">
+                            <el-input v-model="queryParams.code" clearable placeholder="请输入标准编号"></el-input>
+                        </el-form-item>
+                        <el-form-item>
+                            <el-button type="primary" @click="handleQuery">查询</el-button>
+                            <el-button @click="resetQuery">重置</el-button>
+                            <el-button type="primary" @click="router.push({ path: '/skill/group/post-input', query: { newsType: queryParams.newsType } })">新增团体标准</el-button>
+                        </el-form-item>
+                    </el-form>
+                </div>
+            </div>
+            <div class="d-flex flex1 ov-hd flex-cln pd-12">
+                <div class="flex1 ov-hd">
+                    <vxe-table :loading="loading" border :data="dataList" min-height="0" max-height="100%">
+                        <vxe-column title="序号" align="center" type="seq" width="60" />
+                        <vxe-column title="标准编号">
+                            <template #default="{ row }">
+                                <el-tag class="mr-10" v-if="+row?.validStatus" type="primary" effect="dark" round>有效</el-tag>
+                                <el-tag class="mr-10" v-else type="danger" effect="dark" round>无效</el-tag>
+                                {{ row?.code }}
+                            </template>
+                        </vxe-column>
+                        <vxe-column title="标准名称" field="chTitle"></vxe-column>
+                        <vxe-column title="立项日期" align="center" width="140">
+                            <template #default="{ row }">
+                                {{ parseTime(row?.projectDate, '{y}-{m}-{d}') }}
+                            </template>
+                        </vxe-column>
+                        <vxe-column title="发布日期" align="center" width="140">
+                            <template #default="{ row }">
+                                {{ parseTime(row?.issueDate, '{y}-{m}-{d}') }}
+                            </template>
+                        </vxe-column>
+                        <vxe-column title="实施日期" align="center" width="140">
+                            <template #default="{ row }">
+                                {{ parseTime(row?.putDate, '{y}-{m}-{d}') }}
+                            </template>
+                        </vxe-column>
+                        <vxe-column title="标准名称" field="chTitle"></vxe-column>
+                        <vxe-column title="标准类型">
+                            <template #default="{ row }">
+                                {{ selectDictLabel(standard_group_type, row?.type) }}
+                            </template>
+                        </vxe-column>
+                        <vxe-column title="起草单位" field="takeUnit"></vxe-column>
+                        <vxe-column title="标准文本">
+                            <template #default="{ row }">
+                                <div v-if="row?.standardText">
+                                    <el-link :href="row?.standardText" type="primary" target="_blank">{{ row?.standardText }}</el-link>
+                                </div>
+                                <div v-else>--</div>
+                            </template>
+                        </vxe-column>
+                        <vxe-column title="上架状态" fixed="right" align="center" width="90" field="putawayFlag">
+                            <template #default="{ row }">
+                                <dict-tag :options="news_status" :value="row.putawayFlag" />
+                            </template>
+                        </vxe-column>
+                        <vxe-column title="操作" width="180" align="center" fixed="right">
+                            <template #default="{ row }">
+                                <el-button type="text" size="small" @click="row.putawayFlag === '1' ? unpublishPost(row) : publishPost(row)">
+                                    {{ row.putawayFlag === '1' ? '下架' : '上架' }}
+                                </el-button>
+                                <span></span>
+                                <el-button type="text" size="small" @click="editPost(row)">编辑</el-button>
+                                <span></span>
+                                <el-button type="danger" size="small" @click="deletePost(row)" text>删除</el-button>
+                            </template>
+                        </vxe-column>
+                    </vxe-table>
+                </div>
+                <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+            </div>
+        </div>
+    </div>
 </template>
-<script setup lang="ts" name="skill-group-post"></script>
+
+<script setup name="news-list-cum" lang="ts">
+import { colNoData } from '@/utils/noData';
+import { DateRange } from '@/views/models/index';
+import { httpRequests } from '@/utils/httpRequests';
+
+const router = useRouter();
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { standard_group_type, news_status } = toRefs<any>(proxy?.useDict('standard_group_type', 'news_status'));
+const loading = ref(true);
+const showSearch = ref(true);
+const total = ref(0);
+const formRef = ref<ElFormInstance>();
+const dataList = ref<any[]>([]);
+const initFormData = {};
+const data = reactive<any>({
+    form: { ...initFormData },
+    queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        code: ''
+    },
+    rules: {}
+});
+
+const { queryParams, form } = toRefs(data);
+/** 查询会员信息列表 */
+const getList = async () => {
+    loading.value = true;
+    const res: any = await httpRequests.get('/dgtmedicine/groupStandard/list', queryParams.value);
+    dataList.value = res.rows;
+    total.value = res.total;
+    loading.value = false;
+};
+const publishPost = async (row: any) => {
+   
+};
+const unpublishPost = async (row: any) => {
+   
+};
+const editPost = (row: any) => {
+   
+};
+const deletePost = (row: any) => {
+   
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+    queryParams.value.pageNum = 1;
+    getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+    formRef.value?.resetFields();
+    handleQuery();
+};
+/** 发布新闻 */
+const route = useRoute();
+onMounted(() => {
+    queryParams.value.newsType = route.query?.newsType;
+    getList();
+});
+</script>

src/views/skill/group/post/input.vue

@@ -2,11 +2,7 @@
     <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>
+                <div class="f-s-20 c-333 f-w-7 mr-10">{{ form.id ? '编辑' : '新增' }}团体标准</div>
                 <el-button @click="router.go(-1)" type="primary" text>
                     <el-icon>
                         <Back />
@@ -19,53 +15,110 @@
                     <div class="pd-16 border-bottom ov-hd">
                         <el-row :gutter="90">
                             <el-col :span="8">
-                                <el-form-item label="标题：" prop="newsTitle">
-                                    <el-input v-model="form.newsTitle" clearable placeholder="请输入标题"></el-input>
+                                <el-form-item label="标准状态：" prop="standardRule">
+                                    <el-input v-model="form.standardRule" 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" :disabled="disable"></el-date-picker>
+                                <el-form-item label="标准编号：" prop="code">
+                                    <el-input v-model="form.code" clearable placeholder="请输入标准编号"></el-input>
                                 </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 label="标准类型：" prop="type">
+                                    <el-select v-model="form.type" placeholder="请选择标准类型" clearable>
+                                        <el-option v-for="item in standard_group_type" :key="item.value" :label="item.label" :value="item.value" />
+                                    </el-select>
                                 </el-form-item>
                             </el-col>
-                            <el-col :span="4">
-                                <el-form-item label="有效值：" prop="extraInfo.validStatus">
-                                    <el-radio-group v-model="form.extraInfo.validStatus">
-                                        <el-radio :value="true" size="large">有效</el-radio>
-                                        <el-radio :value="false" size="large">无效</el-radio>
-                                    </el-radio-group>
+                            <el-col :span="8">
+                                <el-form-item label="中文标题：" prop="chTitle">
+                                    <el-input v-model="form.chTitle" clearable placeholder="请输入中文标题"></el-input>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="8">
-                                <el-form-item label="封面图" prop="newsImg">
-                                    <imageUpload v-model="form.newsImg" :limit="1" isString :isShowTip="false" :fileSize="20"></imageUpload>
+                                <el-form-item label="英文标题：" prop="enTitle">
+                                    <el-input v-model="form.enTitle" clearable placeholder="请输入英文标题"></el-input>
                                 </el-form-item>
                             </el-col>
-                        </el-row>
-                        <el-row>
-                            <el-col :span="24">
-                                <el-form-item label="文章内容" prop="newsContent">
+                            <el-col :span="8">
+                                <el-form-item label="国际标准分类号：" prop="inTaxonomy">
+                                    <el-input v-model="form.inTaxonomy" clearable placeholder="请输入国际标准分类号"></el-input>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item label="中国标准分类号：" prop="chTaxonomy">
+                                    <el-input v-model="form.chTaxonomy" clearable placeholder="请输入中国标准分类号"></el-input>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item label="国民经济分类：" prop="nationalEconomy">
+                                    <el-input v-model="form.nationalEconomy" clearable placeholder="请输入国民经济分类"></el-input>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item label="立项日期：" prop="projectDate">
+                                    <el-date-picker class="flex1" v-model="form.projectDate" type="date" placeholder="选择日期时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD"></el-date-picker>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item label="发布日期：" prop="issueDate">
+                                    <el-date-picker class="flex1" v-model="form.issueDate" type="date" placeholder="选择日期时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD"></el-date-picker>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item label="实施日期：" prop="putDate">
+                                    <el-date-picker class="flex1" v-model="form.putDate" type="date" placeholder="选择日期时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD"></el-date-picker>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item label="起草牵头单位：" prop="takeUnit">
+                                    <el-input v-model="form.takeUnit" clearable placeholder="请输入起草牵头单位"></el-input>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item label="范围：" prop="scope">
+                                    <el-input v-model="form.scope" clearable placeholder="请输入范围"></el-input>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item label="主要技术内容：" prop="technologyContent">
+                                    <el-input type="textarea" v-model="form.technologyContent" :rows="2" clearable placeholder="请输入主要技术内容"></el-input>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item label="标准文本：" prop="standardText">
                                     <div class="flex1">
-                                        <Editor v-model="form.newsContent" placeholder="请输入内容"></Editor>
+                                        <FileUpload v-model="form.standardText" format="array" :fileSize="100" :span="8" :limit="100"></FileUpload>
                                     </div>
                                 </el-form-item>
                             </el-col>
+                            <el-col :span="16">
+                                <el-form-item label="标准公告：" prop="newsId">
+                                    <el-select v-model="form.newsId" filterable placeholder="请选择标准公告" clearable>
+                                        <el-option v-for="item in noticeList" :key="item.id" :label="item.newsTitle" :value="item.id" />
+                                    </el-select>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item label="是否有效：" prop="validStatus">
+                                    <el-radio-group v-model="form.validStatus">
+                                        <el-radio value="1" size="large">有效</el-radio>
+                                        <el-radio value="0" size="large">无效</el-radio>
+                                    </el-radio-group>
+                                </el-form-item>
+                            </el-col>
                         </el-row>
                     </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'">
+                <template v-if="form.putawayFlag !== '1'">
                     <el-button @click="save" color="#0079fe">暂存</el-button>
-                    <el-button @click="submitGround" type="warning">立即上架</el-button>
+                    <!-- <el-button @click="submitGround" type="warning">立即上架</el-button> -->
                 </template>
-                <el-button v-if="form.newsStatus === '1'" @click="save" type="primary">提交</el-button>
+                <el-button v-if="form.putawayFlag === '1'" @click="save" type="primary">提交</el-button>
             </div>
         </div>
     </div>
@@ -74,60 +127,63 @@
 <script setup name="news-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';
+import { httpRequests } from '@/utils/httpRequests';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { new_type } = toRefs<any>(proxy?.useDict('new_type'));
+const { standard_group_type, news_status } = toRefs<any>(proxy?.useDict('standard_group_type', 'news_status'));
 const router = useRouter();
 const validStatus = ref<any>(true);
 const form = ref<any>({
     id: undefined,
-    newsTitle: '',
-    newsContent: '',
-    newsImg: '',
-    publishTime: '',
-    newsOrigin: '',
-    extraInfo: {
-        validStatus: validStatus
-    }
-});
-const rules = reactive({
-    newsTitle: [{ required: true, message: '请输入标题', trigger: 'blur' }],
-    newsContent: [{ required: true, message: '请输入内容', trigger: 'blur' }]
+    groupType: '1'
 });
+const rules = reactive({});
 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);
+    const res = form.value.id ? await httpRequests.post('/dgtmedicine/groupStandard/edit', form.value) : await httpRequests.post('/dgtmedicine/groupStandard/add', form.value);
     if (res && res.code === 200) {
         router.go(-1);
     }
 }, 500);
 
-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);
+// 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) {
+//         form.value = res.data;
+//     }
+// };
+const disable = ref(false);
+const route = useRoute();
+const noticeList = ref<any[]>([]);
+// 获取公示列表
+const fetchNoticeList = async () => {
+    const res: any = await httpRequests.get('/dgtmedicine/news/list', {
+        pageNum: 1,
+        pageSize: 9999,
+        newsType: route.query?.newsType || '31',
+        newsStatus: '1',
+        validStatus: '1'
+    });
     if (res && res.code === 200) {
-        form.value = res.data;
+        noticeList.value = res.rows;
     }
 };
-const disable = ref(false);
-const route = useRoute();
 onMounted(() => {
+    fetchNoticeList();
     form.value.newsType = route.query?.newsType;
     if (route.query?.id) {
         // 编辑
-        fetchDetail(route.query?.id);
+        // fetchDetail(route.query?.id);
     }
 });
 </script>

src/views/skill/group/public-notice/index.vue

@@ -1,4 +1,171 @@
 <template>
-    <div>xx</div>
+    <div class="p-3">
+        <div class="bg-fff flex1 ov-hd d-flex flex-cln" v-show="showSearch">
+            <div class="pd3-16-16-0 border-bottom">
+                <div class="f-s-20 c-333 f-w-7 mb-10">{{ selectDictLabel(new_type, queryParams.newsType)}}</div>
+                <div class="d-flex">
+                    <el-form class="mb-16" ref="formRef" :model="queryParams" inline label-width="auto">
+                        <el-form-item label="公示日期:" prop="dateTime">
+                            <div class="d-flex w-230">
+                                <DateRange v-model="queryParams.dateTime" v-model:start-date="queryParams.startDate" v-model:end-date="queryParams.endDate"></DateRange>
+                            </div>
+                        </el-form-item>
+                        <el-form-item label="状态:" prop="validStatus">
+                            <el-select v-model="queryParams.validStatus" placeholder="请选择状态" style="width: 200px" clearable>
+                                <el-option label="有效" value="1"></el-option>
+                                <el-option label="无效" value="0"></el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="关键字:" prop="keyword">
+                            <el-input v-model="queryParams.keyword" placeholder="请输入关键字" style="width: 200px"></el-input>
+                        </el-form-item>
+                        <el-form-item>
+                            <el-button type="primary" @click="handleQuery">查询</el-button>
+                            <el-button @click="resetQuery">重置</el-button>
+                            <el-button type="primary" @click="router.push({ path: '/skill/group/public-input', query: { newsType: queryParams.newsType } })">新增{{ selectDictLabel(new_type, queryParams.newsType)}}</el-button>
+                        </el-form-item>
+                    </el-form>
+                </div>
+            </div>
+
+            <div class="d-flex flex1 ov-hd flex-cln pd-12">
+                <div class="flex1 ov-hd">
+                    <vxe-table :loading="loading" border :data="dataList" min-height="0" max-height="100%">
+                        <vxe-column title="序号" align="center" type="seq" width="60" />
+                        <vxe-column title="标题" align="center" field="newsTitle" :formatter="colNoData" width="400" />
+                        <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">
+                            <template #default="{ row }">
+                                <dict-tag :options="new_type" :value="row.newsType" />
+                            </template>
+                        </vxe-column>
+                        <vxe-column title="状态" align="center" field="extraInfo.validStatus">
+                            <template #default="{ row }">
+                                <dict-tag :options="dm_valid_status" :value="row.extraInfo.validStatus || '0'" />
+                            </template>
+                        </vxe-column>
+                        <vxe-column title="操作人" align="center" field="createByName" :formatter="colNoData" />
+                        <vxe-column title="操作时间" align="center" field="createTime" :formatter="colNoData" />
+                        <vxe-column title="上架状态" align="center" field="newsStatus">
+                            <template #default="{ row }">
+                                <dict-tag :options="news_status" :value="row.newsStatus" />
+                            </template>
+                        </vxe-column>
+                        <vxe-column title="操作" width="250" align="center" fixed="right">
+                            <template #default="{ row }">
+                                <el-button type="text" size="small" @click="row.newsStatus === '1' ? unpublishNews(row) : publishNews(row)">
+                                    {{ row.newsStatus === '1' ? '下架' : '上架' }}
+                                </el-button>
+                                <el-button type="text" size="small" @click="editNews(row)">编辑</el-button>
+                                <el-button type="text" size="small" @click="deleteNews(row)">删除</el-button>
+                            </template>
+                        </vxe-column>
+                    </vxe-table>
+                </div>
+                <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+            </div>
+        </div>
+    </div>
 </template>
-<script setup lang="ts" name="skill-group-public-notice"></script>
+
+<script setup name="news-list-cum" lang="ts">
+import { colNoData } from '@/utils/noData';
+import { publishNews as publishNewsApi, unpublishNews as unpublishNewsApi, removeNews, fetchNewsList } from '@/api/dgtmedicine/news';
+import { DateRange } from '@/views/models/index';
+import { searchTabs } from '@/views/models';
+const router = useRouter();
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { news_status, dm_valid_status, new_type} = toRefs<any>(proxy?.useDict('news_status', "dm_valid_status", 'new_type'));
+const loading = ref(true);
+const showSearch = ref(true);
+const total = ref(0);
+const formRef = ref<ElFormInstance>();
+const dataList = ref<any[]>([]);
+const initFormData = {};
+const data = reactive<any>({
+    form: { ...initFormData },
+    queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        type: '1',
+        newsType: '31'
+    },
+    rules: {}
+});
+
+const { queryParams, form } = toRefs(data);
+/** 查询会员信息列表 */
+const getList = async () => {
+    loading.value = true;
+    const res = await fetchNewsList(queryParams.value);
+    dataList.value = res.rows;
+    total.value = res.total;
+    loading.value = false;
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+    queryParams.value.pageNum = 1;
+    getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+    formRef.value?.resetFields();
+    handleQuery();
+};
+
+/** 编辑新闻 */
+const editNews = (row) => {
+    router.push({ path: `/skill/group/public-input`, query: { id: row.id, newsType: row?.newsType, newsStatus: row.newsStatus } });
+};
+
+
+/** 删除新闻 */
+const deleteNews = async (row) => {
+    ElMessageBox.confirm(`确认要删除 "${row.newsTitle}" 数据吗？`, '删除提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning'
+    }).then(async () => {
+        const res = await removeNews([row.id]);
+        if (res) {
+            ElMessage.success('删除成功');
+            getList();
+        }
+    });
+};
+
+/** 上架新闻 */
+const publishNews = async (row) => {
+    try {
+        const res = await publishNewsApi(row.id); // Replace with your API call
+        if (res) {
+            ElMessage.success('上架成功');
+            getList();
+        }
+    } catch (error) {
+        ElMessage.error('下架失败');
+    }
+};
+
+/** 下架新闻 */
+const unpublishNews = async (row) => {
+    try {
+        const res = await unpublishNewsApi(row.id); // Replace with your API call
+        if (res) {
+            ElMessage.success('下架成功');
+            getList();
+        }
+    } catch (error) {
+        ElMessage.error('下架失败');
+    }
+};
+const route = useRoute();
+onMounted(() => {
+    queryParams.value.newsType = route.query?.newsType;
+    getList();
+});
+</script>

src/views/skill/group/public-notice/input.vue

@@ -13,37 +13,37 @@
             <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">
-                        <el-row :gutter="90">
+                        <el-row :gutter="80">
                             <el-col :span="8">
                                 <el-form-item label="标题：" prop="newsTitle">
                                     <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-col :span="6">
+                                <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" :disabled="disable"></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="4">
                                 <el-form-item label="有效值：" prop="extraInfo.validStatus">
                                     <el-radio-group v-model="form.extraInfo.validStatus">
-                                        <el-radio :value="true" size="large">有效</el-radio>
-                                        <el-radio :value="false" size="large">无效</el-radio>
+                                        <el-radio value="1" size="large">有效</el-radio>
+                                        <el-radio value="0" size="large">无效</el-radio>
                                     </el-radio-group>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="8">
-                                <el-form-item label="封面图" prop="newsImg">
-                                    <imageUpload v-model="form.newsImg" :limit="1" isString :isShowTip="false" :fileSize="20"></imageUpload>
+                                <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="8" v-if="form.newsType !== '15'">
+                                <el-form-item label="封面图" prop="newsImg">
+                                    <imageUpload v-model="form.newsImg" :limit="1" isString :isShowTip="false"></imageUpload>
+                                </el-form-item>
+                            </el-col>
                             <el-col :span="24">
                                 <el-form-item label="文章内容" prop="newsContent">
                                     <div class="flex1">
@@ -52,6 +52,16 @@
                                 </el-form-item>
                             </el-col>
                         </el-row>
+
+                        <el-row>
+                            <el-col :span="24">
+                                <el-form-item label="管理办法附件" :prop="form.extraInfo ? '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>
                     </div>
                 </el-form>
             </div>
@@ -67,7 +77,7 @@
     </div>
 </template>
 
-<script setup name="news-input" lang="ts">
+<script setup name="public-notice-input" lang="ts">
 import { ref, reactive, onMounted } from 'vue';
 import { debounce } from 'lodash';
 import { addNews, editNews, publishNews, getNewsInfo } from '@/api/dgtmedicine/news';
@@ -84,10 +94,13 @@ const form = ref<any>({
     newsImg: '',
     publishTime: '',
     newsOrigin: '',
+    newsType: '',
     extraInfo: {
+        accessory: [],
         validStatus: validStatus
     }
 });
+
 const rules = reactive({
     newsTitle: [{ required: true, message: '请输入标题', trigger: 'blur' }],
     newsContent: [{ required: true, message: '请输入内容', trigger: 'blur' }]
@@ -99,7 +112,15 @@ 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);
+        if (['29', '30', '31'].includes(form.value.newsType)) {
+            ElMessage({
+                message: '提交成功',
+                type: 'success',
+            })
+        } else {
+            router.go(-1);
+        }
+
     }
 }, 500);