Merge branch 'lm-dev' of http://git.yujin.shuziyunyao.com/yujin/digital-medicine-front into lm

src/views/dgtmedicine/check/index.vue

@@ -61,9 +61,12 @@
                                         <el-icon color="green" v-if="item.res == 1">
                                             <CircleCheck />
                                         </el-icon>
-                                        <el-icon color="red" v-else>
+                                        <el-icon color="red" v-else-if="item.res == 2">
                                             <CircleClose />
                                         </el-icon>
+                                        <el-icon v-else>
+                                            <Clock />
+                                        </el-icon>
                                         <span>{{
                                             selectDictLabel(lm_member_app_role, item?.roleCode) }}
                                         </span>
@@ -91,9 +94,10 @@
                         <vxe-column title="操作" align="center" width="100" fixed="right"
                             class-name="small-padding fixed-width">
                             <template #default="{ row }">
-                                <el-button v-if="!+row?.reviewStatus" text type="primary"
-                                    @click="routeDetail(row)">审核</el-button>
-                                <el-button v-else text style="color: #41C06D;" @click="routeDetail(row)">查看</el-button>
+                                <el-button v-if="!!+row?.authStatus" text type="primary" @click="routeDetail(row)">审核
+                                </el-button>
+                                <el-button v-else text style="color: #41C06D;" @click="routeDetail(row)">查看
+                                </el-button>
                             </template>
                         </vxe-column>
                     </vxe-table>
@@ -129,10 +133,6 @@ const data = reactive<any>({
     },
     rules: {}
 });
-// 检查是否有审批记录匹配当前角色
-const hasApprovalForRole = (roleValue) => {
-    return memberList.value.approvalLogList?.some(log => log.roleCode === roleValue)
-}
 const { queryParams } = toRefs(data);
 /** 查询会员信息列表 */
 const getList = async () => {

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

@@ -40,7 +40,7 @@
                                 <el-form-item label="培训方式" prop="joinType">
                                     <!-- 单选框 -->
                                     <el-radio-group v-model="form.joinType">
-                                        <el-radio v-for="item in dm_training_join_type" :key="item.value"
+                                        <el-radio v-for="item in lm_training_join_type" :key="item.value"
                                             :label="item.value">{{ item.label }}</el-radio>
                                     </el-radio-group>
                                 </el-form-item>
@@ -62,8 +62,7 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="6">
-                                <el-form-item label="报名人数" prop="registrantsNumber"
-                                    :rules="[{ required: true, message: '请选择是否有报名限制', trigger: 'change' }]">
+                                <el-form-item label="报名人数" prop="conditions.totalCheck">
                                     <div class="d-flex a-c"><el-radio-group v-model="form.conditions.totalCheck"
                                             style="flex-wrap: nowrap">
                                             <el-radio label="0">不限制</el-radio>
@@ -219,7 +218,7 @@
                                     <el-radio-group v-model="form.certFlag">
                                         <el-radio v-for="item in yes_no" :key="item.value" :label="item.value">{{
                                             item.label
-                                            }}</el-radio>
+                                        }}</el-radio>
                                     </el-radio-group>
                                 </el-form-item>
                                 <div v-if="+form.certFlag" class="ml-20">
@@ -305,7 +304,7 @@ import { FieldDefinition } from '../models/type'
 import MeetingCustom from '../models/meeting-custom.vue'
 import MeetingEditors from '../models/meeting-editors.vue'
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-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 { lm_training_join_type, yes_no, lm_training_cert, vip_level } = toRefs<any>(proxy?.useDict('lm_training_join_type', 'yes_no', 'lm_training_cert', 'vip_level'));
 const fields = ref<FieldDefinition[]>([])
 const showSignIn = ref(false);
 const fixedField = ref<FieldDefinition[]>([{
@@ -379,6 +378,7 @@ const rules = reactive({
     trainingTime: [{ required: true, message: '请选择培训时间', trigger: 'blur' }],
     joinType: [{ required: true, message: '请选择培训方式', trigger: 'change' }],
     trainingLocation: [{ required: true, message: '请输入培训地点', trigger: 'blur' }],
+    'conditions.totalCheck':[{ required: true, message: '请输入培训地点', trigger: 'change' }],
     certFlag: [{ required: true, message: '请选择是否颁发证书', trigger: 'change' }],
     certificateInfo: [{ required: true, message: '请选择证书名称', trigger: 'change' }],
     description: [{ required: true, message: '请输入培训详情', trigger: 'blur' }],

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

@@ -20,7 +20,6 @@
             </div>
             <MeetingDetailAttend v-if="activeName === '1'" :form="form" />
             <MeetingDetailInfo v-if="activeName === '2'" :form="form" />
-
         </div>
     </div>
 </template>

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

@@ -7,21 +7,28 @@
             <div class="bg-#fafafa pd-20" v-if="form?.conditions?.totalCheck == '0' || !form?.conditions?.totalCheck">无
             </div>
             <div class="bg-#fafafa pd-20 d-flex flex-cln" v-else>
-                <div>总参会人数 ≤ {{ form?.conditions?.total }}</div>
-                <div> <template v-for="(item, index) in form?.conditions?.levelCheck" :key="index">
-                        <div class="d-flex a-c pd-5">
-                            <span v-if="+item.check">所有<span class="f-w-6">{{ selectDictLabels(vip_level, item.vipLevel,
-                                ',') }}</span>参会人数 ≤ {{ item.total
-                                    }}</span>
-                        </div>
-                    </template></div>
-                <div> <template v-for="(item, index) in form?.conditions?.cpyCheck" :key="index">
-                        <div class="d-flex a-c pd-5">
-                            <span v-if="+item.check"><span class="f-w-6">{{ selectDictLabels(vip_level, item.vipLevel,
-                                ',') }}</span>限制每家单位人数≤{{ item.total
-                                    }}</span>
-                        </div>
-                    </template></div>
+                <div class="pd-5">总参会人数 ≤ {{ form?.conditions?.total }}</div>
+                <div class="d-flex">
+                    <div>
+                        <template v-for="(item, index) in form?.conditions?.levelCheck" :key="index">
+                            <div class="d-flex a-c pd-5">
+                                <span v-if="+item.check">所有<span class="f-w-6">{{ selectDictLabels(vip_level,
+                                    item.vipLevel,
+                                    ',') }}</span>参会人数 ≤ {{ item.total
+                                        }}</span>
+                            </div>
+                        </template>
+                    </div>
+                    <div> <template v-for="(item, index) in form?.conditions?.cpyCheck" :key="index">
+                            <div class="d-flex a-c pd-5">
+                                <span v-if="+item.check"><span class="f-w-6">{{ selectDictLabels(vip_level,
+                                    item.vipLevel,
+                                    ',') }}</span>限制每家单位人数≤{{ item.total
+                                        }}</span>
+                            </div>
+                        </template></div>
+                </div>
+
             </div>
         </div>
         <div class="d-flex mb-16 ">