修改bug

src/views/training/meeting-add/index.vue

@@ -196,15 +196,15 @@
                                         <template v-for="(item, index) in form.meetingCharge.typeCharge" :key="index">
                                             <div class="d-flex a-c" v-if="checkedVipLevels.some(items => items.vipLevel === item.vipLevel)">
                                                 <el-checkbox v-model="item.check" true-value="1" false-value="0" :label="selectDictLabels(dm_check_join_type, item.vipLevel, ',') + '每个单位参会人员'" size="large" />
-                                                <el-select v-model="item.certType" placeholder="" clearable style="width: 100px">
-                                                    <el-option v-for="item in hasPartialFree" :key="item.value" :label="item.label" :value="item.value" />
+                                                <el-select v-model="item.certType" placeholder="" clearable style="width: 100px" :disabled="!+item.check">
+                                                    <el-option v-for="items in hasPartialFree" :key="items.value" :label="items.label" :value="items.value"/>
                                                 </el-select>
-                                                <div v-if="+item?.certType" class="d-flex a-c">
+                                                <div class="d-flex a-c">
                                                     <div v-if="item.vipLevel != 'P'" class="pl-10 f-s-14" style="white-space: nowrap;">每个单位免费</div>
                                                     <div v-else class="pl-10 f-s-14" style="white-space: nowrap;">免费</div>
-                                                    <el-input class="pl-10" v-model="item.total" maxlength="20" placeholder="请输入免费人数" style="width: 130px" :disabled="!+item.check" />
+                                                    <el-input class="pl-10" v-model="item.total" maxlength="20" placeholder="请输入免费人数" style="width: 130px" :disabled="!+item.check || item?.certType !=='1'" />
                                                     <div class="f-s-14" style="white-space: nowrap;">人,其余每人收费</div>
-                                                    <el-input class="pl-10" v-model="item.cost" maxlength="20" placeholder="请输入费用" style="width: 130px" :disabled="!+item.check" />
+                                                    <el-input class="pl-10" v-model="item.cost" maxlength="20" placeholder="请输入费用" style="width: 130px" :disabled="!+item.check || item?.certType!=='1'" />
                                                     <div f-s-14>元</div>
                                                 </div>
                                             </div>

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

@@ -39,6 +39,34 @@
                     </div>
                 </div>
             </div>
+            <div class="info-title mb-10">参会费用</div>
+            <div class="bg-#fafafa pd-16 d-flex flex-cln">
+                <div class="pd-5 pb-15">是否收取费用 ： {{ form?.meetingCharge?.hasFee == '1' ? '是' : '否' }}</div>
+                <div class="pd-5 pb-15" v-if="form?.meetingCharge?.hasFee == '1'">收费标准 ： {{ form?.meetingCharge?.pricing }}元/每人</div>
+                <div class="pd-5 pb-15" v-if="form?.meetingCharge?.hasFee == '1'&& form?.meetingCharge?.hasFlatFee =='0'">所有人统一收取标准费用</div>
+                <div class="pd-5 pb-15" v-if="form?.meetingCharge?.hasFee == '1' && form?.meetingCharge?.hasFlatFee =='1'">按报名人员类型收取，不同人员收取不同费用</div>
+                <div class="d-flex flex-cln" v-if="form?.meetingCharge?.hasFee == '1' && form?.meetingCharge?.hasFlatFee =='1'">
+                    <template v-for="(item, index) in form?.meetingCharge?.typeCharge" :key="index">
+                        <view v-if="+item?.check" class="pd-5">
+                            <span class="f-w-6">
+                                {{ selectDictLabels(dm_check_join_type, item?.vipLevel, ',') }}
+                            </span>
+                            <span v-if="!+item?.certType">不收取费用</span>
+                            <span v-if="+item?.certType">
+                                <span v-if="item?.vipLevel !== 'P'">每个单位</span>
+                                免除费用{{ item?.total }}人，其余报名人员每人收取费用{{ item?.cost }}元
+                            </span>
+                        </view>
+                        <div class="pd-5" v-if="!+item?.check && +form?.conditions?.typeCheck?.find(items => items?.vipLevel ==item?.vipLevel)?.check">
+                            <span class="f-w-6">
+                                {{ selectDictLabels(dm_check_join_type, item?.vipLevel, ',') }}
+                            </span>
+                            <span v-if="item?.vipLevel !== 'P'">每个单位</span>
+                            <span>每人收取费用{{ form?.meetingCharge?.pricing }}元</span>
+                        </div>
+                    </template>
+                </div>
+            </div>
         </div>
         <div class="d-flex mb-16 ">
             <div class="info-title">
@@ -94,7 +122,7 @@
             <vxe-column title="职务" field="position" min-width="100" :formatter="colNoData" />
             <vxe-column title="联系方式" field="contact" min-width="100" :formatter="colNoData" />
             <vxe-column title="备注" field="remark" min-width="100" :formatter="colNoData" />
-            <vxe-column title="参会费用" field="joinFee" min-width="100" :formatter="colNoData" v-if="form?.meetingCharge?.hasFee =='1'"/>
+            <vxe-column title="参会费用" field="joinFee" min-width="100" :formatter="colNoData" v-if="form?.meetingCharge?.hasFee =='1'" />
             <vxe-column title="报名信息" min-width="80" fixed="right">
                 <template #default="{ row }">
                     <div class="c-s-p"><u @click="checkRegostrationInfo(row)">查看报名信息</u></div>

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

@@ -46,11 +46,11 @@
                                 免除费用{{ item?.total }}人，其余报名人员每人收取费用{{ item?.cost }}元
                             </span>
                         </div>
-                        <div v-if="!+item?.check">
+                        <div v-if="!+item?.check && +form?.conditions?.typeCheck?.find(items => items?.vipLevel ==item?.vipLevel)?.check">
                             <span class="f-w-6">
                                 {{ selectDictLabels(dm_check_join_type, item?.vipLevel, ',')}}
                             </span>
-                            <span>每人收取费用{{ form?.meetingCharge?.pricing }}</span>
+                            <span>每人收取费用{{ form?.meetingCharge?.pricing }}元</span>
                         </div>
                     </template>
                 </div>