xiugai

src/views/news/input/index.vue

@@ -2,7 +2,8 @@
     <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 />
@@ -11,7 +12,8 @@
                 </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">
@@ -21,7 +23,9 @@
                             </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">
@@ -29,9 +33,18 @@
                                     <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-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"></imageUpload>
+                                    <imageUpload v-model="form.newsImg" :limit="1" isString :isShowTip="false">
+                                    </imageUpload>
                                 </el-form-item>
                             </el-col>
                         </el-row>
@@ -68,13 +81,17 @@ import { AddBtn } from '@/views/models';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { new_type } = toRefs<any>(proxy?.useDict('new_type'));
 const router = useRouter();
+const validStatus = ref<any>(true);
 const form = ref<any>({
     id: undefined,
     newsTitle: '',
     newsContent: '',
     newsImg: '',
     publishTime: '',
-    newsOrigin: ''
+    newsOrigin: '',
+    extraInfo: {
+        validStatus: validStatus
+    }
 });
 const rules = reactive({
     newsTitle: [{ required: true, message: '请输入标题', trigger: 'blur' }],

src/views/trace-news/news-list/index.vue

@@ -41,6 +41,12 @@
                         <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="extraInfo.validStatus">
+                            <template #default="{ row }">
+                                <div v-if="row.extraInfo.validStatus">有效</div>
+                                <div v-else="row.extraInfo.validStatus ">无效</div>
+                            </template>
+                        </vxe-column>
                         <vxe-column title="浏览量" align="center" field="viewCount" />
                         <vxe-column title="类型" align="center" field="newsType">
                             <template #default="{ row }">
@@ -93,7 +99,7 @@ const data = reactive<any>({
         type: '1',
         newsTitle: '',
         newsStatus: '',
-        newsType: '1'
+        newsType: '1',
     },
     rules: {}
 });
@@ -104,6 +110,8 @@ const getList = async () => {
     loading.value = true;
     const res = await fetchNewsList(queryParams.value);
     dataList.value = res.rows;
+    console.log(dataList.value);
+    
     total.value = res.total;
     loading.value = false;
 };

src/views/training/models/sign-in-code.vue

@@ -6,7 +6,7 @@
                     <div class="mb-6 f-w-6 f-s-16 c-333">{{ info?.trainingName }}</div>
                     <div class="mb-6">培训时间：{{ info?.trainingStart  }}~{{ info?.trainingEnd }}</div>
                     <div class="mb-6">培训详情：{{ info?.description }}</div>
-                    <div class="mb-6">于会须知：{{ info?.notice }}</div>
+                    <div class="mb-6">与会须知：{{ info?.notice }}</div>
                     <div>签到二维码</div>
                     <div class="d-flex j-c a-c pd-20">
                         <vueQr :text="VITE_APP_SHARE_QR_CODE_URL + '/meeting-sign-in?meetid=' + info?.id" :size="300"></vueQr>