级位考试

@@ -157,18 +157,18 @@ function groupMemberRegister(data) {
 }
 }
 
 
 // 获取道馆信息
 // 获取道馆信息
-function getMyOwnMemberInfo() {
-  return request({
-    url: '/member/info/getMyOwnMemberInfo',
-    method: 'get'
-  }).then(res => {
-    const app = getApp()
-    app.globalData.authenticationStatus = res.data.authenticationStatus
-    app.globalData.memberInfo = res.data.memberInfo
-    app.globalData.isExam = res.data?.memberInfo?.isPoints
-    return res
-  })
-}
+function getMyOwnMemberInfo() {
+  return request({
+    url: '/member/info/getMyOwnMemberInfo',
+    method: 'get'
+  }).then(res => {
+    const app = getApp()
+    app.globalData.authenticationStatus = res.data.authenticationStatus
+    app.globalData.memberInfo = res.data.memberInfo
+    app.globalData.isExam = res.data?.memberInfo?.isPoints
+    return res
+  })
+}
 
 
 function pcLoginOpenId() {
 function pcLoginOpenId() {
   uni.login({
   uni.login({
@@ -179,11 +179,11 @@ function pcLoginOpenId() {
       }
       }
     },
     },
     fail: (res) => {
     fail: (res) => {
-      uni.showToast({
-        title: '获取用户信息失败',
-        icon: 'none',
-        duration: 2000
-      })
+      // uni.showToast({
+      //   title: '获取用户信息失败',
+      //   icon: 'none',
+      //   duration: 2000
+      // })
     }
     }
   })
   })
 }
 }

@@ -199,6 +199,25 @@
       </view>
       </view>
     </uni-popup>
     </uni-popup>
 
 
+    <!-- 调动确认弹框 -->
+    <uni-popup ref="transferPopup" type="center" :mask-click="false" style="z-index: 999999">
+      <view class="add-popup">
+        <view class="popup-title">系统提示</view>
+        <view class="popup-content">
+          <view class="transfer-tip">
+            该人员已在其他机构登记，是否申请调入？
+          </view>
+          <view class="transfer-tip sub-tip">
+            如仅办理业务，请前往业务页面，点击【添加】直接办理。
+          </view>
+        </view>
+        <view class="popup-btns">
+          <view class="popup-btn cancel" @click="handleTransfer">调动</view>
+          <view class="popup-btn confirm" @click="handleAddFromTransfer">添加</view>
+        </view>
+      </view>
+    </uni-popup>
+
   </view>
   </view>
 </template>
 </template>
 
 
@@ -266,6 +285,7 @@ const range = ref([{
 
 
 // 添加考生弹框相关
 // 添加考生弹框相关
 const addPopup = ref(null)
 const addPopup = ref(null)
+const transferPopup = ref(null)
 const addForm = ref({
 const addForm = ref({
   name: '',
   name: '',
   idcType: '0',
   idcType: '0',
@@ -480,6 +500,26 @@ function closeAddPopup() {
   addPopup.value?.close()
   addPopup.value?.close()
 }
 }
 
 
+// 关闭调动确认弹框
+function closeTransferPopup() {
+  transferPopup.value?.close()
+}
+
+// 跳转调动页面
+function handleTransfer() {
+  closeTransferPopup()
+  addPopup.value?.close()
+  uni.navigateTo({
+    url: `/personalVip/mobilize`
+  })
+}
+
+// 从调动弹框点击添加
+async function handleAddFromTransfer() {
+  closeTransferPopup()
+  await handelAddPerson()
+}
+
 // 证件类型选择
 // 证件类型选择
 function onIdcTypeChange(e) {
 function onIdcTypeChange(e) {
   idcTypeIndex.value = e.detail.value
   idcTypeIndex.value = e.detail.value
@@ -503,23 +543,8 @@ async function confirmAdd() {
       // 人员已存在，直接添加
       // 人员已存在，直接添加
       await handelAddPerson()
       await handelAddPerson()
     } else {
     } else {
-      // 人员不在本机构，弹出确认框
-      uni.showModal({
-        title: '系统提示',
-        content: '该人员已在其他机构登记，是否申请调入？如仅办理业务，请前往业务页面，点击【添加】直接办理。',
-        confirmText: '添加',
-        cancelText: '调动',
-        success: async function (res) {
-          if (res.confirm) {
-            await handelAddPerson()
-          } else if (res.cancel) {
-            // 跳转调动页面
-            uni.navigateTo({
-              url: '/personal/memberTransfer'
-            })
-          }
-        }
-      })
+      // 人员不在本机构，显示自定义确认弹框（不关闭添加弹框，保留表单数据）
+      transferPopup.value?.open()
     }
     }
   } catch (err) {
   } catch (err) {
     uni.hideLoading()
     uni.hideLoading()
@@ -1240,4 +1265,17 @@ function handleDelete(row) {
   color: #C4121B;
   color: #C4121B;
   font-weight: 500;
   font-weight: 500;
 }
 }
+
+.transfer-tip {
+  font-size: 28rpx;
+  color: #333;
+  line-height: 1.6;
+  text-align: center;
+}
+
+.sub-tip {
+  color: #999;
+  font-size: 28rpx;
+  margin-top: 16rpx;
+}
 </style>
 </style>

@@ -5,14 +5,14 @@
 
 
     <!-- 顶部添加考官按钮 -->
     <!-- 顶部添加考官按钮 -->
     <view class="add-btn-box">
     <view class="add-btn-box">
-	<!-- <button class="btn-red-kx mini" @click="openAddExaminer">
+	<button class="btn-red-kx mini" @click="openAddExaminer">
         <uni-icons type="personadd" size="14" color="#AD181F"></uni-icons>
         <uni-icons type="personadd" size="14" color="#AD181F"></uni-icons>
         选择考官
         选择考官
-      </button> -->
-      <button class="btn-red-kx mini" @click="addExaminer">
+      </button>
+      <!-- <button class="btn-red-kx mini" @click="addExaminer">
         <uni-icons type="personadd" size="14" color="#AD181F"></uni-icons>
         <uni-icons type="personadd" size="14" color="#AD181F"></uni-icons>
         添加考官
         添加考官
-      </button>
+      </button> -->
     </view>
     </view>
 
 
     <view class="indexboxre">
     <view class="indexboxre">

@@ -58,7 +58,7 @@ console.log('222',chosen.value)
 async function getList() {
 async function getList() {
   loading.value = true
   loading.value = true
   try {
   try {
-    const res = await api.listApi({memId: app.globalData.memberInfo.memId})
+    const res = await api.listApi({chooseFlag: 1})
     infoList.value = res.rows || []
     infoList.value = res.rows || []
   } catch (err) {
   } catch (err) {
     console.error('获取考官列表失败:', err)
     console.error('获取考官列表失败:', err)