lisy 5 mēneši atpakaļ
vecāks
revīzija
7870630d15

+ 3 - 2
src/views/authority/choose-detail/index.vue

@@ -78,15 +78,16 @@
                                 </template>
                             </vxe-column>
                             <vxe-column field="name" title="姓名" />
+                            <vxe-column title="联系电话" field="phone" :formatter="colNoData" />
                             <vxe-column title="性别">
                                 <template #default="{ row }">
                                     {{ selectDictLabel(sys_sex_type, row?.sex) }}
                                 </template>
                             </vxe-column>
-                            <vxe-column field="workUnit" title="单位" :formatter="colNoData" />
+                            <vxe-column title="单位" field="workUnit" :formatter="colNoData" />
+                            <vxe-column title="所在地区" field="adcodeName" :formatter="colNoData" />
                             <vxe-column title="职称/职务" field="post" :formatter="colNoData" />
                             <vxe-column title="专业品种" field="variety" :formatter="colNoData" />
-                            <vxe-column title="联系电话" field="phone" :formatter="colNoData" />
                         </vxe-table>
                     </template>
                 </div>

+ 1 - 1
src/views/authority/choose-list/index.vue

@@ -63,7 +63,7 @@
                             <template #default="{ row }">
                                 <div class="d-flex flex-wrap">
                                     <div v-for="(item, index) in row?.personInfo" :key="index" class="pd-4">
-                                        <el-tag>{{ selectDictLabel(lm_person_type, item?.personType) }}({{ item?.personCount }})</el-tag>
+                                        <el-tag>{{ selectDictLabel(lm_person_type, item?.personType) }}({{ item?.personCount }})</el-tag>
                                     </div>
                                 </div>
                             </template>

+ 1 - 0
src/views/authority/models/ChooseExpert.vue

@@ -39,6 +39,7 @@
                             <vxe-column title="单位" field="workUnit" :formatter="colNoData" />
                             <vxe-column title="职称/职务" field="post" :formatter="colNoData" />
                             <vxe-column title="专业品种" field="variety" :formatter="colNoData" />
+                            <vxe-column title="所在地区" field="adcodeName" :formatter="colNoData" />
                             <vxe-column title="岗位状态" width="90">
                                 <template #default="{ row }">
                                     <DictTag :options="dm_position_status" :value="row?.status"></DictTag>

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

@@ -477,7 +477,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' }],
+    'conditions.totalCheck': [{ message: '请选择是否限制报名人数', trigger: 'change' }],
     'conditions.typeCheck': [
     {
             validator: (rule, value, callback) => {
@@ -490,6 +490,7 @@ const rules = reactive({
                     }
                 }, 300);
             },
+            required: true,
             trigger: 'change' // 触发校验的时机
         }
   ],