公告增加类型

src/views/dgtmedicine/news/medicinenews/noticeAdd.vue

@@ -24,6 +24,13 @@
                                     <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">
@@ -61,7 +68,8 @@ 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 { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { new_type} = toRefs<any>(proxy?.useDict('new_type',));
 const router = useRouter();
 const form = ref({
     id: undefined,
@@ -70,13 +78,16 @@ const form = ref({
     newsImg: '',
     publishTime: '',
     newsOrigin: '',
-    newsType: '1',
+    newsType: '10',
 
 });
 const rules = reactive({
     newsTitle: [
         { required: true, message: '请输入标题', trigger: 'blur' }
     ],
+    newsType:[
+        { required: true, message: '请选择类型', trigger: 'blur' }
+    ],
     newsImg: [
         { required: true, message: '请上传封面图片', trigger: 'blur' }
     ],

src/views/dgtmedicine/news/medicinenews/noticeIndex.vue

@@ -40,6 +40,11 @@
                         <vxe-column title="发布时间" align="center" field="publishTime" :formatter="colNoData" />
                         <vxe-column title="来源" align="center" field="newsOrigin" :formatter="colNoData" />
                         <!-- <vxe-column title="浏览量" align="center" field="publishTime" :formatter="colNoData" /> -->
+                         <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">
@@ -71,7 +76,7 @@ import { publishNews as publishNewsApi, unpublishNews as unpublishNewsApi, remov
 import { DateRange } from '@/views/models/index';
 const router = useRouter();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { news_status } = toRefs<any>(proxy?.useDict('news_status'));
+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);
@@ -85,7 +90,7 @@ const data = reactive<any>({
     queryParams: {
         pageNum: 1,
         pageSize: 10,
-        newsType: '1',
+        type: '1',
         newsTitle: '',
         newsStatus: ''
     },