修改bug

src/views/training/meeting/index.vue

@@ -275,6 +275,8 @@ const trainingSignIn = (row: any) => {
 // 打开临时报名二维码
 const temporary = (row: any) => {
     temporaryRegistration.value = { ...row };
+    console.log(temporaryRegistration.value,'temporaryRegistration.value');
+    
     showTemporary.value = true;
 };
 onMounted(() => {

src/views/training/models/meeting-detail-attend.vue

@@ -69,7 +69,7 @@
             <!-- 序号 -->
             <vxe-column type="seq" width="60" title="序号" align="center" />
             <vxe-column title="企业名称" field="company" min-width="100" :formatter="colNoData" />
-            <vxe-column title="盟员等级" field="vipLevel" min-width="100" :formatter="colNoData" align="center">
+            <vxe-column title="单位类型" field="vipLevel" min-width="100" :formatter="colNoData" align="center">
                 <template #default="{ row }">
                     <div class="d-flex a-c j-c">
                         <DictTag :options="lm_check_join_type" :value="row?.vipLevel"></DictTag>

src/views/training/models/meeting-detail-info.vue

@@ -3,41 +3,51 @@
         <div class="pd-16 ov-hd">
             <div class="info-title f-s-18 c-333 f-w-7 pb-10">会议基本信息</div>
             <el-descriptions :column="4">
-                <el-descriptions-item label="会议名称:">{{ form?.trainingName || '-' }}</el-descriptions-item>
-                <el-descriptions-item label="会议时间:">{{ form?.trainingStart }}~{{ form?.trainingEnd}}</el-descriptions-item>
-                <el-descriptions-item label="报名时间:">{{ form?.signupStart }}~{{ form?.signupEnd }}</el-descriptions-item>
-                <el-descriptions-item label="会议方式:">
+                <el-descriptions-item min-width="100px" label="会议名称:">{{ form?.trainingName || '-' }}</el-descriptions-item>
+                <el-descriptions-item min-width="100px" label="会议时间:">{{ form?.trainingStart }}~{{ form?.trainingEnd}}</el-descriptions-item>
+                <el-descriptions-item min-width="100px" label="报名时间:">{{ form?.signupStart }}~{{ form?.signupEnd }}</el-descriptions-item>
+                <el-descriptions-item min-width="100px" label="会议方式:">
                     {{ selectDictLabel(dm_training_join_type, form?.joinType) || '-'}}
                 </el-descriptions-item>
-                <el-descriptions-item label="会议地点:">{{ form?.trainingLocation || '-' }}</el-descriptions-item>
-                <el-descriptions-item label="联系人:">{{ form?.contactName || '-' }}</el-descriptions-item>
-                <el-descriptions-item label="联系电话:">{{ form?.tel || '-' }}</el-descriptions-item>
-                <el-descriptions-item label="可参会单位类型:">
+                <el-descriptions-item min-width="100px" label="会议地点:">{{ form?.trainingLocation || '-' }}</el-descriptions-item>
+                <el-descriptions-item min-width="100px" label="联系人:">{{ form?.contactName || '-' }}</el-descriptions-item>
+                <el-descriptions-item min-width="100px" label="联系电话:">{{ form?.tel || '-' }}</el-descriptions-item>
+                <el-descriptions-item min-width="100px" label="可参会单位类型:">
                     <template v-for="item,index in form.conditions.typeCheck" :key="index">
                         <span class="pr-5" v-if="item.check =='1'">{{ selectDictLabel(lm_check_join_type, item?.vipLevel) || '-'}}</span>
                     </template>
                 </el-descriptions-item>
-                <el-descriptions-item label="报名人数:" v-if="form?.conditions.totalCheck == '1'">
+                <el-descriptions-item min-width="100px" label="报名人数:" v-if="form?.conditions.totalCheck == '1'">
                     限制{{form?.conditions.total }}
                 </el-descriptions-item>
-                <el-descriptions-item label="报名人数:" v-else>不限制</el-descriptions-item>
-                <el-descriptions-item label="限制条件:" v-if="form?.conditions">
+                <el-descriptions-item min-width="100px" label="报名人数:" v-else>不限制</el-descriptions-item>
+                <el-descriptions-item min-width="100px" label="限制条件:" v-if="form?.conditions">
                     {{ form?.conditions?.levelTotalCheck == '1'?'按单位类型限制' : '' }}
                     {{form.conditions.cpyTotalCheck == '1'? '按每家企业人数限制' : '' }}
                     <span v-if="form?.conditions?.levelTotalCheck !== '1' && form.conditions.cpyTotalCheck !== '1'">{{ '-' }}</span>
                 </el-descriptions-item>
-                <el-descriptions-item label="是否电子手签:">{{ form?.eleSignature == '1' ? "是" : '否' }}</el-descriptions-item>
-                <el-descriptions-item label="是否发放积分:">{{ form?.pointsFlag == '1' ? "是" : '否' }}</el-descriptions-item>
-                <el-descriptions-item label="每成功参会（签到成功）1人发放积分数:">{{ form?.points || '-' }}</el-descriptions-item>
-                <el-descriptions-item label="创建人:">{{ form?.createByName || '-' }}</el-descriptions-item>
-                <el-descriptions-item label="创建时间:">{{ form?.createTime || '-' }}</el-descriptions-item>
-            </el-descriptions>
-            <el-descriptions :column="4">
-                <el-descriptions-item label="会议详情:">{{ form?.description || '-' }}</el-descriptions-item>
-                <el-descriptions-item label=""></el-descriptions-item>
-                <el-descriptions-item label=""></el-descriptions-item>
-                <el-descriptions-item label="与会须知:">{{ form?.notice || '-' }}</el-descriptions-item>
+                <el-descriptions-item min-width="100px" label="是否电子手签:">{{ form?.eleSignature == '1' ? "是" : '否' }}</el-descriptions-item>
+                <el-descriptions-item min-width="100px" label="是否发放积分:">{{ form?.pointsFlag == '1' ? "是" : '否' }}</el-descriptions-item>
+                <el-descriptions-item min-width="100px" label="每成功参会（签到成功）1人发放积分数:">{{ form?.points || '-' }}</el-descriptions-item>
+                <el-descriptions-item min-width="100px" label="创建人:">{{ form?.createByName || '-' }}</el-descriptions-item>
+                <el-descriptions-item min-width="100px" label="创建时间:">{{ form?.createTime || '-' }}</el-descriptions-item>
             </el-descriptions>
+            <div class="d-flex f-s-14 c-666 mb-10">
+                <div class="flex1">
+                    <div class="c-333 mb-10">
+                        会议详情:
+                        <span v-if="!form?.description">-</span>
+                    </div>
+                    <div v-if="form?.description">{{ form?.description || '-' }}</div>
+                </div>
+                <div v-if="form?.attachments" class="flex1">
+                    <div class="c-333 mb-10">
+                        与会须知:
+                        <span v-if="!form?.notice">-</span>
+                    </div>
+                    <div v-if="form?.notice">{{ form?.notice || '-' }}</div>
+                </div>
+            </div>
             <div class="d-flex f-s-14 c-666 mb-10">
                 <div class="flex1">
                     <div class="c-333 mb-10">

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

@@ -6,7 +6,7 @@
                     <div class="mb-6 f-w-6 f-s-16 c-333">临时报名通道</div>
                     <div class="mb-6">会议名称:{{ info?.trainingName }}</div>
                     <div class="mb-6">会议时间:{{ info?.trainingStart }}~{{ info?.trainingEnd }}</div>
-                    <div class="mb-6">培训方式：{{ selectDictLabel(dict.dm_training_join_type, info.joinType) }}</div>
+                    <div class="mb-6">会议方式：{{ selectDictLabel(dict.lm_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 + '&tempJoin=1'" :size="300" colorDark="orange"></vueQr>