lisy vor 5 Monaten
Ursprung
Commit
006ca67b9b

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

@@ -13,18 +13,18 @@
                 <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">
+                    <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 min-width="100px" label="报名人数:" v-if="form?.conditions.totalCheck == '1'">
-                    限制{{form?.conditions.total }}
+                <el-descriptions-item min-width="100px" label="报名人数:" v-if="form?.conditions?.totalCheck == '1'">
+                    限制{{form?.conditions?.total }}
                 </el-descriptions-item>
                 <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>
+                    {{form?.conditions?.cpyTotalCheck == '1'? '按每家企业人数限制' : '' }}
+                    <span v-if="form?.conditions?.levelTotalCheck !== '1' && form?.conditions?.cpyTotalCheck !== '1'">{{ '-' }}</span>
                 </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>
@@ -59,9 +59,9 @@
                 <div v-if="form?.attachments" class="flex1">
                     <div class="c-333 mb-10">
                         相关文件:
-                        <span v-if="form?.attachments.length==0">-</span>
+                        <span v-if="form?.attachments?.length==0">-</span>
                     </div>
-                    <FileLook v-if="form?.attachments.length!==0" v-model="form.attachments" :span="12"></FileLook>
+                    <FileLook v-if="form?.attachments?.length!==0" v-model="form.attachments" :span="12"></FileLook>
                 </div>
             </div>
             <div class="d-flex f-s-14 c-666">
@@ -86,9 +86,9 @@
                 <div class="flex1">
                     <div class="c-333 mb-10">
                         会议图:
-                        <span v-if="form?.trainingImg.length == 0">-</span>
+                        <span v-if="form?.trainingImg?.length == 0">-</span>
                     </div>
-                    <div class="d-flex flex-wrap" v-if="form?.trainingImg.length !== 0">
+                    <div class="d-flex flex-wrap" v-if="form?.trainingImg?.length !== 0">
                         <template v-for="(item, index) in form?.trainingImg" :key="index">
                             <div class="mr-10 mb-10">
                                 <ImagePreview :src="item" :width="100" :height="100"></ImagePreview>

+ 1 - 1
src/views/training/models/meeting-editors.vue

@@ -11,7 +11,7 @@
                             @click="addCustoms({
                                     name: `id-${generateSecureRandomString()}`,
                                     label: '身份证', type: '1', required: '1', readonly: '0',
-                                    pattern: '^[1-9]\d{5}(18|19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}[\dXx]$'
+                                    pattern: '^[1-9]\\d{5}(18|19|20)\\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\\d|3[01])\\d{3}[0-9Xx]$'
                                 })"
                         >
                             身份证