修改

package.json

@@ -13,7 +13,9 @@
     "preview": "vite preview",
     "lint:eslint": "eslint",
     "lint:eslint:fix": "eslint --fix",
-    "prettier": "prettier --write ."
+    "prettier": "prettier --write .",
+    "zip": "sh ./zip-dist.sh",
+    "push:dev": "sh ./zip-dist-push.sh"
   },
   "repository": {
     "type": "git",
@@ -87,4 +89,4 @@
     "vitest": "1.5.0",
     "vue-tsc": "2.0.13"
   }
-}
+}

src/utils/ruoyi.ts

@@ -250,6 +250,9 @@ export default {
     handleTree
 };
 export const fileExt = (fileName: string) => {
+    if (!fileName || fileName.length === 0) {
+        return '';
+    }
     // 获取文件后缀， 从后面到第一个点取 不包括.
     return fileName.slice(fileName.lastIndexOf('.') + 1);
 };

src/views/brand/cloud/index.vue

@@ -72,7 +72,7 @@
     </div>
 </template>
 
-<script setup name="MedicineNews" lang="ts">
+<script setup name="brand-cloud" 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';

src/views/brand/input/index.vue

@@ -2,7 +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">新增{{ 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 />

src/views/brand/resources/index.vue

@@ -73,7 +73,7 @@
     </div>
 </template>
 
-<script setup name="MedicineNews" lang="ts">
+<script setup name="brand-resources" 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';

src/views/gap/downloads/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">云药GAP资料下载</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="gap_downloads_type" key-label="label" key-value="value" :isNum="false"></searchTabs>
+                    </div>
+                    <el-button type="primary" @click="router.push({ path: 'gap-input', query: { newsType: queryParams.newsType } })">新增{{ selectDictLabel(gap_downloads_type, queryParams.newsType)}}</el-button>
+                </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="gap_downloads_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="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="gap-downloads" 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, gap_downloads_type } = toRefs<any>(proxy?.useDict('news_status', 'gap_downloads_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: '35'
+    },
+    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: `gap-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/gap/gap-input/index.vue

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

src/views/gap/rules/index.vue

@@ -0,0 +1,145 @@
+<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">云药GAP管理办法</div>
+            </div>
+
+            <div class="d-flex flex1 ov-hd flex-cln pd-16">
+                <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="news_top10_cloud" :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="gap-rules" 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, news_top10_cloud } = toRefs<any>(proxy?.useDict('news_status', 'news_top10_cloud'));
+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: '30'
+    },
+    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: `gap-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>