修改

src/views/gap/policy/index.vue

@@ -0,0 +1,174 @@
+<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">相关政策</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">
+                    <!-- <div>
+                        <searchTabs v-model="queryParams.newsType" @change="handleQuery" :list="new_type" key-label="label" key-value="value" :isNum="false"></searchTabs>
+                    </div> -->
+                    <el-button type="primary" @click="router.push({ path: 'policy-input', 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 v-if="+row.newsStatus" type="text" size="small" @click="editNews(row)">详情</el-button>
+                                <el-button v-else 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="price-num-warn" 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: '33'
+    },
+    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`, 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('下架失败');
+    }
+};
+
+onMounted(() => {
+    getList();
+});
+</script>

src/views/news/input/index.vue

@@ -0,0 +1,139 @@
+<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">
+                        <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>
+                            </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>
+                            </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="newsImg">
+                                    <imageUpload v-model="form.newsImg" :limit="1" isString :isShowTip="false"></imageUpload>
+                                </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>
+                    </div>
+                </el-form>
+            </div>
+            <div class="d-flex a-c j-c pd-16" v-if="form.newsStatus !== '1'">
+                <el-button @click="router.go(-1)">取消</el-button>
+                <el-button @click="save" color="#0079fe" :disabled="disable">暂存</el-button>
+                <el-button @click="submitGround" type="warning" :disabled="disable">立即上架</el-button>
+            </div>
+        </div>
+    </div>
+</template>
+
+<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';
+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: ''
+});
+const rules = reactive({
+    newsTitle: [{ 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/price-num/medicinenews/add.vue

@@ -0,0 +1,115 @@
+<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">新增品种概况</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">
+                        <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>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item label="关联品种" prop="variety">
+                                    <el-select v-model="form.variety" filterable multiple clearable placeholder="请选择关联品种">
+                                        <el-option v-for="item in varietyOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                                    </el-select>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <el-row>
+                            <el-col :span="16">
+                                <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>
+                    </div>
+                </el-form>
+            </div>
+            <div class="d-flex a-c j-c pd-16">
+                <el-button @click="router.go(-1)">取消</el-button>
+                <el-button @click="save" color="#0079fe" :disabled="disable">暂存</el-button>
+                <el-button @click="submitGround" type="primary" :disabled="disable">立即上架</el-button>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script setup name="MedicineNews-add" 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 { getMedicineList } from '@/api/dgtmedicine/variety';
+const router = useRouter();
+const form = ref({
+    id: undefined,
+    newsTitle: '',
+    variety: [],
+    newsContent: '',
+    newsImg: '',
+    newsType: '0'
+});
+const rules = reactive({
+    newsTitle: [{ required: true, message: '请输入概况标题', trigger: 'blur' }],
+    content: [{ required: true, message: '请输入概况内容', trigger: 'blur' }]
+});
+const formRef = ref();
+const varietyOptions = ref([]);
+
+const fetchVarietyOptions = async () => {
+    const res = await getMedicineList({});
+    if (res && res.code === 200) {
+        varietyOptions.value = res.data.map((item) => ({
+            label: item.varietyName,
+            value: item.id
+        }));
+    }
+};
+
+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 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);
+onMounted(() => {
+    const id = router.currentRoute.value.query.id;
+    disable.value = router.currentRoute.value.query.disable == '1';
+    if (id) {
+        // 编辑
+        fetchDetail(id);
+    }
+    fetchVarietyOptions();
+});
+</script>

src/views/price-num/medicinenews/detail.vue

@@ -0,0 +1,63 @@
+<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">详情</div>
+                <el-button @click="router.go(-1)" type="primary" text>
+                    <el-icon>
+                        <Back />
+                    </el-icon>
+                    返回上一级
+                </el-button>
+            </div>
+            <div class="flex1 over-auto">
+                <div class="pd-16">
+                    <div class="info-title mb-16">新闻基本信息</div>
+                    <el-descriptions :column="2">
+                        <el-descriptions-item label="标题:">{{ form?.title || '-' }}</el-descriptions-item>
+                        <el-descriptions-item label="类型:">{{ selectDictLabel(news_type, form?.type) || '-' }}</el-descriptions-item>
+                        <el-descriptions-item label="来源:">{{ form?.source || '-' }}</el-descriptions-item>
+                        <el-descriptions-item label="链接地址:">
+                            <a :href="form?.link || '#'" target="_blank">{{ form?.link || '-' }}</a>
+                        </el-descriptions-item>
+                    </el-descriptions>
+                    <el-divider />
+                    <el-descriptions :column="1">
+                        <el-descriptions-item label="封面图:">
+                            <el-image style="width: 100px; height: 100px" :src="form?.coverImg" :zoom-rate="1.2" :max-scale="7" :min-scale="0.2" :preview-src-list="[form?.coverImg]" fit="cover"></el-image>
+                        </el-descriptions-item>
+                        <el-descriptions-item label="内容:">
+                            <div v-html="form?.content || '-'"></div>
+                        </el-descriptions-item>
+                    </el-descriptions>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script setup name="MedicineNews-detail" lang="ts">
+import { getNewsInfo } from '@/api/dgtmedicine/news';
+
+const { query }: any = useRoute();
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { news_type } = toRefs<any>(proxy?.useDict('news_type'));
+const router = useRouter();
+
+const form = ref<any>({});
+
+const getDetail = async () => {
+    proxy?.$modal.loading('加载中...');
+    const res = await getNewsInfo(query?.id).finally(() => {
+        proxy?.$modal.closeLoading();
+    });
+    if (!res || res.code !== 200) return;
+    form.value = {
+        ...res.data
+    };
+};
+
+onMounted(() => {
+    getDetail();
+});
+</script>

src/views/price-num/medicinenews/index.vue

@@ -0,0 +1,221 @@
+<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">品种概况</div>
+                <div class="d-flex">
+                    <div class="mr-40">
+                        <el-button @click="router.push({ path: 'medicinnew-add' })" type="primary">新增概况</el-button>
+                    </div>
+                    <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="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="pd-8"></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" />
+                        <vxe-column title="关联品种" align="center" field="relatedVariety" :formatter="colNoData">
+                            <template #default="{ row }">
+                                <div v-if="row.variety?.length">
+                                    <el-tag>已关联品种({{ row.variety?.length }})</el-tag>
+                                </div>
+                                <div v-else><el-tag>已关联品种(0)</el-tag></div>
+                                <el-button type="text" @click="bindVariety(row)">绑定品种</el-button>
+                            </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="viewNewsDetail(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>
+    <el-dialog title="添加关联品种" v-model="showVarietyDialog" width="500px">
+        <div>
+            <el-form :model="form" label-width="80px">
+                <el-form-item label="关联品种">
+                    <el-select v-model="form.variety" filterable multiple clearable placeholder="请选择...">
+                        <el-option v-for="item in varietyOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                    </el-select>
+                </el-form-item>
+            </el-form>
+        </div>
+        <div class="dialog-footer" style="text-align: right; margin-top: 20px;">
+            <el-button @click="showVarietyDialog = false">取消</el-button>
+            <el-button type="primary" @click="edit">确认添加</el-button>
+        </div>
+    </el-dialog>
+</template>
+
+<script setup name="MedicineNews" lang="ts">
+import { colNoData } from '@/utils/noData';
+import {Edit} from '@element-plus/icons-vue'
+import { getMedicineList } from '@/api/dgtmedicine/variety';
+import { editNews as editNewsApi,publishNews as publishNewsApi, unpublishNews as unpublishNewsApi, removeNews, fetchNewsList } from '@/api/dgtmedicine/news';
+const router = useRouter();
+import { debounce } from 'lodash';
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { news_status } = toRefs<any>(proxy?.useDict('news_status'));
+const loading = ref(true);
+const showSearch = ref(true);
+const total = ref(0);
+const showVarietyDialog = ref(false);
+const queryFormRef = ref<ElFormInstance>();
+const dataList = ref<any[]>([]);
+const initFormData = {
+    id: undefined,
+    newsType: 0,
+    variety: [],
+};
+const data = reactive<any>({
+    form: { ...initFormData },
+    queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        newsType: '0',
+        newsTitle: '',
+        newsStatus: ''
+    },
+    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: `medicinnew-add`, query: { id: row.id } });
+};
+
+/** 删除新闻 */
+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 viewNewsDetail = (row) => {
+    router.push({ path: `add`, query: { id: row.id, disable: '1' } });
+};
+/** 上架新闻 */
+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 edit = debounce(async () => {
+    const res = await editNewsApi(form.value);
+    if (res && res.code === 200) {
+        showVarietyDialog.value = false;
+        ElMessage.success('编辑成功');
+        getList();
+    }
+}, 500);
+
+const varietyOptions = ref([]);
+
+const fetchVarietyOptions = async () => {
+    const res = await getMedicineList({});
+    if (res && res.code === 200) {
+        varietyOptions.value = res.data.map(item => ({
+            label: item.varietyName,
+            value: item.id
+        }));
+    }
+};
+
+const bindVariety = async (row) => {
+    form.value.id = row.id;
+    form.value.variety = row.variety;
+    showVarietyDialog.value = true;
+};
+
+onMounted(() => {
+    getList();
+    fetchVarietyOptions();
+});
+</script>

src/views/price-num/medicinenews/noticeAdd.vue

@@ -0,0 +1,138 @@
+<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">新增公告</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">
+                        <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>
+                            </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>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item label="类型：" prop="newsType">
+                                    <el-select v-model="form.newsType" placeholder="请选择公告类型">
+                                        <el-option v-for="item in new_type" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                                    </el-select>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <el-row :gutter="90">
+                            <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="newsImg">
+                                    <imageUpload v-model="form.newsImg" :limit="1" isString :isShowTip="false"></imageUpload>
+                                </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>
+                    </div>
+                </el-form>
+            </div>
+            <div class="d-flex a-c j-c pd-16">
+                <el-button @click="router.go(-1)">取消</el-button>
+                <el-button @click="save" color="#0079fe" :disabled="disable">暂存</el-button>
+                <el-button @click="submitGround" type="warning" :disabled="disable">立即上架</el-button>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script setup name="MedicineNews-add" 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';
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { new_type} = toRefs<any>(proxy?.useDict('new_type',));
+const router = useRouter();
+const form = ref({
+    id: undefined,
+    newsTitle: '',
+    newsContent: '',
+    newsImg: '',
+    publishTime: '',
+    newsOrigin: '',
+    newsType: '10',
+
+});
+const rules = reactive({
+    newsTitle: [
+        { required: true, message: '请输入标题', trigger: 'blur' }
+    ],
+    newsType:[
+        { required: true, message: '请选择类型', trigger: 'blur' }
+    ],
+    newsImg: [
+        { required: true, message: '请上传封面图片', trigger: 'blur' }
+    ],
+    publishTime: [
+        { 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 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);
+onMounted(() => {
+    const id = router.currentRoute.value.query.id;
+    disable.value = router.currentRoute.value.query.disable == '1'
+    if (id) {
+        // 编辑
+        fetchDetail(id);
+    }
+});
+</script>

src/views/price-num/medicinenews/noticeIndex.vue

@@ -0,0 +1,194 @@
+<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">资讯发布</div>
+                <div class="d-flex">
+                    <div class="mr-40">
+                        <el-button @click="router.push({ path: 'noticeAdd' })" type="primary">新增资讯</el-button>
+                    </div>
+                    <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 label="公告类型" prop="newsType">
+                                <el-select style="width: 140px" v-model="queryParams.newsType" @change="handleQuery" clearable placeholder="请选择类型">
+                                    <el-option v-for="item in new_type" :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">
+                    <div>
+                        <searchTabs v-model="queryParams.newsType" @change="handleQuery" :list="new_type" key-label="label"
+                        key-value="value" :isNum="false"></searchTabs>
+                    </div>
+                </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="viewNewsDetail(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="MedicineNews" 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:'10'
+    },
+    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: `noticeAdd`, query: { id: row.id, title: '新增资讯' } });
+};
+
+/** 删除新闻 */
+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 viewNewsDetail = (row) => {
+    router.push({ path: `noticeAdd`, query: { id: row.id, disable: '1', title: '资讯详情' } });
+};
+/** 上架新闻 */
+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('下架失败');
+    }
+};
+
+onMounted(() => {
+    getList();
+});
+</script>

src/views/price-num/warn/index.vue

@@ -0,0 +1,174 @@
+<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">品种预警</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">
+                    <!-- <div>
+                        <searchTabs v-model="queryParams.newsType" @change="handleQuery" :list="new_type" key-label="label" key-value="value" :isNum="false"></searchTabs>
+                    </div> -->
+                    <el-button type="primary" @click="router.push({ path: 'med-input', 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 v-if="+row.newsStatus" type="text" size="small" @click="editNews(row)">详情</el-button>
+                                <el-button v-else 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="price-num-warn" 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: '11'
+    },
+    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`, 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('下架失败');
+    }
+};
+
+onMounted(() => {
+    getList();
+});
+</script>