lisy vor 5 Monaten
Ursprung
Commit
370ac36d2b

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

@@ -72,7 +72,6 @@
                                             placeholder="请输入报名人数" clearable
                                             :disabled="form.conditions.totalCheck !== '1'" />
                                     </div>
-
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12" v-if="form.conditions.totalCheck == '1'">
@@ -219,7 +218,7 @@
                                         <el-form-item label="证书名称" :prop="`certificateInfo.${index}.certType`"
                                             :rules="[{ required: true, message: '请选择证书名称', trigger: 'change' }]">
                                             <el-select v-model="item.certType" placeholder="证书名称" clearable>
-                                                <el-option v-for="item in dm_training_cert" :key="item.value"
+                                                <el-option v-for="item in lm_training_cert" :key="item.value"
                                                     :label="item.label" :value="item.value" />
                                             </el-select>
                                         </el-form-item>
@@ -260,7 +259,7 @@ import { useRouter } from 'vue-router';
 import { trainingAdd, trainingDetail, trainingUpdate } from '@/api/training';
 import { checkPermi } from '@/utils/permission';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { dm_training_join_type, yes_no, dm_training_cert, vip_level } = toRefs<any>(proxy?.useDict('dm_training_join_type', 'yes_no', 'dm_training_cert', 'vip_level'));
+const { dm_training_join_type, yes_no, lm_training_cert, vip_level } = toRefs<any>(proxy?.useDict('dm_training_join_type', 'yes_no', 'lm_training_cert', 'vip_level'));
 const router = useRouter();
 const route = useRoute();
 const form = ref<any>({

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

@@ -43,7 +43,7 @@
                 <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 field="trainingName" title="会议名称" :formatter="colNoData" />
+                        <vxe-column field="trainingName" title="会议名称" :formatter="colNoData" min-width="150"/>
                         <vxe-column field="trainingTime" min-width="150" title="培训时间">
                             <template #default="{ row }">{{ row.trainingStart }}~{{ row.trainingEnd }}</template>
                         </vxe-column>
@@ -56,20 +56,20 @@
                             </template>
                         </vxe-column>
                         <!-- <vxe-column field="trainingLocation" title="培训地点" align="center" min-width="150" /> -->
-                        <vxe-column field="certFlag" title="是否颁发证书" width="80">
+                        <vxe-column field="certFlag" title="是否颁发证书" width="60">
                             <template #default="{ row }">
                                 {{ selectDictLabel(yes_no, row.certFlag) }}
                             </template>
                         </vxe-column>
-                        <vxe-column field="joinCount" title="报名人数" width="80" />
-                        <vxe-column field="signCount" title="签到人数" width="80" />
+                        <vxe-column field="joinCount" title="报名人数" width="60" />
+                        <vxe-column field="signCount" title="签到人数" width="60" />
                         <vxe-column field="certCount" title="领取证书人数" width="80" />
                         <vxe-column field="certFlag" title="会议状态" width="80">
                             <template #default="{ row }">
                                 <DictTag :options="dm_training_status" :value="row?.trainingStatus"></DictTag>
                             </template>
                         </vxe-column>
-                        <vxe-column field="certFlag" title="签到二维码" width="120" align="center">
+                        <vxe-column field="certFlag" title="签到二维码" width="100" align="center">
                             <template #default="{ row }">
                                 <el-button @click="trainingSignIn(row)"
                                     :style="{ color: !['1', '0'].includes(row?.trainingStatus) ? '#999' : '#0079fe' }"
@@ -85,10 +85,10 @@
                                     @confirm="confirmEvent(row)" @cancel="cancelEvent">
                                     <template #reference>
                                         <el-switch v-model="row.tempStatus" :loading="loading1" active-value="1"
-                                            inactive-value="0" :before-change="beforeChange1" />
+                                            inactive-value="0" :before-change="beforeChange1" :disabled="row.trainingStatus == '2'"/>
                                     </template>
                                 </el-popconfirm>
-                                <el-button v-if="row.tempStatus == '1'" type="primary" text @click="temporary(row)">
+                                <el-button v-if="row.tempStatus == '1'" type="primary" text @click="temporary(row)" :disabled="row.trainingStatus == '2'">
                                     查看
                                 </el-button>
                             </template>

+ 1 - 1
src/views/training/models/temporary-registration.vue

@@ -10,7 +10,7 @@
                     <div class="mb-6">培训方式:{{ selectDictLabel(dict.dm_training_join_type, info.joinType) }}</div>
                     <div class="mb-6">联系电话:{{ info?.tel }}</div>
                     <div class="d-flex j-c a-c pd-10">
-                        <vueQr :text="VITE_APP_SHARE_QR_CODE_URL + '/enroll?id=' + info?.id" :size="300"
+                        <vueQr :text="VITE_APP_SHARE_QR_CODE_URL + '/enroll?id=' + info?.id + '&tempJoin=1'" :size="300"
                             colorDark="orange"></vueQr>
                     </div>
                 </div>