lisy 6 hónapja
szülő
commit
5b105f7bd8

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

@@ -43,7 +43,7 @@
                         <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-if="+row?.extraInfo?.validStatus">有效</div>
                                 <div v-else>无效</div>
                             </template>
                         </vxe-column>

+ 11 - 3
src/views/training/meeting-add/index.vue

@@ -91,7 +91,7 @@
                         </div>
                         <template v-if="form.certFlag">
                             <template v-for="(item, index) in form.certificateInfo" :key="index">
-                                <el-row :gutter="20">
+                                <el-row :gutter="20" class="bg-#f4f4f4 pd-16 mb-10">
                                     <el-col :span="6">
                                         <el-form-item label="证书名称" :prop="`certificateInfo.${index}.certType`" :rules="[{ required: true, message: '请选择证书名称', trigger: 'change' }]">
                                             <el-select v-model="item.certType" placeholder="证书名称" clearable>
@@ -108,6 +108,11 @@
                                             <ImageUpload v-model="item.certImg" :fileSize="40" :limit="1"></ImageUpload>
                                         </el-form-item>
                                     </el-col>
+                                    <el-col :span="6">
+                                        <el-form-item>
+                                            <el-button type="danger" @click="deleteItem(index)">删除</el-button>
+                                        </el-form-item>
+                                    </el-col>
                                 </el-row>
                             </template>
                         </template>
@@ -152,11 +157,11 @@ const formRef = ref();
 
 const save = debounce(async () => {
     await formRef.value.validate();
-    console.log('form.value', form.value);
     const params = {
         ...form.value,
         trainingStart: form.value.trainingTime ? form.value.trainingTime[0] : undefined,
-        trainingEnd: form.value.trainingTime ? form.value.trainingTime[1] : undefined
+        trainingEnd: form.value.trainingTime ? form.value.trainingTime[1] : undefined,
+        certificateInfo: +form.value.certFlag ? form.value.certificateInfo : undefined
     };
     const res = form.value.id ? await trainingUpdate(params) : await trainingAdd(params);
     if (res && res.code === 200) {
@@ -175,6 +180,9 @@ const addCertInfo = () => {
         certImg: undefined
     });
 };
+const deleteItem = (index: number) => {
+    form.value.certificateInfo.splice(index, 1);
+};
 // 获取专家详情
 const getMeetingDetail = async () => {
     if (route.query?.id) {

+ 1 - 1
src/views/training/meeting/index.vue

@@ -83,7 +83,7 @@
             </div>
         </div>
     </div>
-    <SignInCode v-if="showSignIn" v-model:show="showSignIn" :info="rowInfo"></SignInCode>
+    <SignInCode v-if="showSignIn" v-model:show="showSignIn" :info="rowInfo" :dict="{ dm_training_join_type }"></SignInCode>
 </template>
 
 <script setup name="meeting" lang="ts">

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

@@ -5,8 +5,8 @@
                 <div v-if="info" ref="codeImgRef" style="width: 400px; margin: 0 auto;">
                     <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">培训方式:{{ selectDictLabel(dict.dm_training_join_type, info.joinType) }}</div>
+                    <div class="mb-6">联系电话:{{ info?.tel }}</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>