Browse Source

修改bug

lisy 5 months ago
parent
commit
c74d6c7d15

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

@@ -77,15 +77,16 @@
                                 </template>
                                 </template>
                             </vxe-column>
                             </vxe-column>
                             <vxe-column field="name" title="姓名" />
                             <vxe-column field="name" title="姓名" />
+                            <vxe-column title="联系电话" field="phone" :formatter="colNoData" />
                             <vxe-column title="性别">
                             <vxe-column title="性别">
                                 <template #default="{ row }">
                                 <template #default="{ row }">
                                     {{ selectDictLabel(sys_sex_type, row?.sex) }}
                                     {{ selectDictLabel(sys_sex_type, row?.sex) }}
                                 </template>
                                 </template>
                             </vxe-column>
                             </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="post" :formatter="colNoData" />
                             <vxe-column title="专业品种" field="variety" :formatter="colNoData" />
                             <vxe-column title="专业品种" field="variety" :formatter="colNoData" />
-                            <vxe-column title="联系电话" field="phone" :formatter="colNoData" />
                         </vxe-table>
                         </vxe-table>
                     </template>
                     </template>
                 </div>
                 </div>

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

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

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

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

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

@@ -453,6 +453,7 @@ const rules = reactive({
                     }
                     }
                 }, 300);
                 }, 300);
             },
             },
+            required: true,
             trigger: 'change' // 触发校验的时机
             trigger: 'change' // 触发校验的时机
         }
         }
   ],
   ],

+ 5 - 0
src/views/training/models/meeting-detail-attend.vue

@@ -68,6 +68,9 @@
                         <el-option v-for="item in temp_join_type" :key="item.value" :label="item.label" :value="item.value" />
                         <el-option v-for="item in temp_join_type" :key="item.value" :label="item.label" :value="item.value" />
                     </el-select>
                     </el-select>
                 </el-form-item>
                 </el-form-item>
+                <el-form-item label="所在地区" label-width="70" prop="name">
+                    <AreaCascader v-model="queryParams.adcode" :zlevel="2" checkStrictly @change="handleQuery"></AreaCascader>
+                </el-form-item>
                 <el-form-item>
                 <el-form-item>
                     <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
                     <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
                     <el-button icon="Refresh" @click="resetQuery">重置</el-button>
                     <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -79,6 +82,7 @@
             <!-- 序号 -->
             <!-- 序号 -->
             <vxe-column type="seq" width="60" title="序号" align="center" />
             <vxe-column type="seq" width="60" title="序号" align="center" />
             <vxe-column title="企业名称" field="company" min-width="100" :formatter="colNoData" />
             <vxe-column title="企业名称" field="company" min-width="100" :formatter="colNoData" />
+            <vxe-column title="所在地区" field="adcodeName" :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 }">
                 <template #default="{ row }">
                     <div class="d-flex a-c j-c">
                     <div class="d-flex a-c j-c">
@@ -156,6 +160,7 @@ import { searchTabs } from '@/views/models';
 import { debounce } from 'lodash';
 import { debounce } from 'lodash';
 import { onMounted, reactive, ref } from 'vue';
 import { onMounted, reactive, ref } from 'vue';
 import registrationInfo from './registration-info.vue';
 import registrationInfo from './registration-info.vue';
+import { AreaCascader } from '@/views/components';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { cpy_res_status, lm_signup_status_app_show, dm_check_join_type,temp_join_type } = toRefs<any>(proxy?.useDict('cpy_res_status', 'lm_signup_status_app_show', 'dm_check_join_type','temp_join_type'));
 const { cpy_res_status, lm_signup_status_app_show, dm_check_join_type,temp_join_type } = toRefs<any>(proxy?.useDict('cpy_res_status', 'lm_signup_status_app_show', 'dm_check_join_type','temp_join_type'));
 // 获取详情
 // 获取详情