From a808a256e469badc9e9992b3b099057cfd62602a Mon Sep 17 00:00:00 2001
From: ywyonui <ywyonui@163.com>
Date: Mon, 22 Sep 2025 21:21:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9openId=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/components/YwConfirm/index.vue      |  2 +-
 .../hr/jsQj/components/XtDkJs.vue}            | 53 +++++++++++++------
 .../view/hr/jsQj/components/jsQjEdit.vue      | 16 +++---
 src/store/modules/user.ts                     | 18 +++----
 4 files changed, 56 insertions(+), 33 deletions(-)
 rename src/pages/{components/XtDkJs/index.vue => view/hr/jsQj/components/XtDkJs.vue} (72%)

diff --git a/src/pages/components/YwConfirm/index.vue b/src/pages/components/YwConfirm/index.vue
index 9425294..a9b3f9e 100644
--- a/src/pages/components/YwConfirm/index.vue
+++ b/src/pages/components/YwConfirm/index.vue
@@ -33,7 +33,7 @@
 
 <script lang="ts" setup>
 import YwTransfer from "../YwTransfer/index.vue";
-import XtDkJs from "../XtDkJs/index.vue";
+import XtDkJs from "@/pages/view/hr/jsQj/components/XtDkJs.vue";
 
 // 接收外部传入属性并设置默认值
 const props = withDefaults(defineProps<{
diff --git a/src/pages/components/XtDkJs/index.vue b/src/pages/view/hr/jsQj/components/XtDkJs.vue
similarity index 72%
rename from src/pages/components/XtDkJs/index.vue
rename to src/pages/view/hr/jsQj/components/XtDkJs.vue
index 6275c28..6c5e184 100644
--- a/src/pages/components/XtDkJs/index.vue
+++ b/src/pages/view/hr/jsQj/components/XtDkJs.vue
@@ -3,19 +3,19 @@
     class="transfer-popup">
     <view class="popup-content">
       <view class="popup-header">
-        <view class="popup-title">转办设置</view>
+        <view class="popup-title">协调代课教师</view>
       </view>
       <view class="popup-body">
         <view class="section">
           <view class="section-header">
-            <text class="section-title">转办原因</text>
+            <text class="section-title">协调说明</text>
           </view>
           <view class="list-content">
-            <u-input v-model="spRemark" type="textarea" placeholder="请填写转办原因" :autoHeight="true" maxlength="200"
+            <u-input v-model="spRemark" type="textarea" placeholder="请填写协调说明" :autoHeight="true" maxlength="200"
               class="remark-input" />
           </view>
         </view>
-        <TransferSpCsMgr ref="transferSpCsMgrRef" />
+        <JsQjDkEdit :data="qjData" ref="dkRef" />
       </view>
       <view class="popup-actions flex-row justify-end mt-4">
         <u-button class="mr-2" @click="closeDlg">取消</u-button>
@@ -27,12 +27,20 @@
 
 <script setup lang="ts">
 import { ref } from "vue";
-import TransferSpCsMgr from "@/components/TransferSpCsMgr/index.vue"
+import JsQjDkEdit from "./components/jsQjDkEdit.vue";
+
+// 接收外部传入属性
+const props = withDefaults(defineProps<{
+  qjData?: any
+}>(), {
+  qjData: () => ({
+  })
+});
 
 // 定义一个上级传入的emit响应事件用于接收数据变更
 const emit = defineEmits(["submit"]);
 
-const transferSpCsMgrRef = ref<any>(null);
+const dkRef = ref<any>(null);
 const dlgFlag = ref(false);
 const spRemark = ref("");
 
@@ -47,16 +55,33 @@ const closeDlg = () => {
 // 提交
 const submit = () => {
   if (!spRemark.value || !spRemark.value.trim()) {
-    uni.showToast({ title: "请填写转办原因", icon: "none" });
+    uni.showToast({ title: "请填写协调说明", icon: "none" });
     return;
   }
-  const newSprList = transferSpCsMgrRef.value.getNewSprList();
-  const newCsrList = transferSpCsMgrRef.value.getNewCsrList();
-  if (!newSprList.length) {
-    uni.showToast({ title: "请选择审批转办人", icon: "none" });
+  const dkList = dkRef.value.getDkList();
+  if (!dkList.length) {
+    uni.showToast({
+      title: "请选择代课教师",
+      icon: "none",
+    });
     return;
   }
-  emit('submit', { newSprList, newCsrList, spRemark: spRemark.value });
+  const params = { spRemark: spRemark.value, dkList: [] };
+  if (dkList.length) {
+    params.dkList = dkList.map((item: any) => {
+      const newItem = {...item};
+      newItem.jsId = item.dkJsId || item.jsId;
+      newItem.jsName = item.dkJsName || item.jsName;
+      newItem.pkkbId = item.id;
+      newItem.dktime = item.dktime + " 00:00:00";
+      newItem.id = "";
+      newItem.qjId = "";
+      return newItem;
+    });
+  } else {
+    params.dkList = [];
+  }
+  emit('submit', params);
 }
 
 
@@ -146,10 +171,6 @@ defineExpose({
       color: #262626;
     }
   }
-
-  .list-content {
-    
-  }
 }
 
 .bottom-actions {
diff --git a/src/pages/view/hr/jsQj/components/jsQjEdit.vue b/src/pages/view/hr/jsQj/components/jsQjEdit.vue
index 42db952..2e045f1 100644
--- a/src/pages/view/hr/jsQj/components/jsQjEdit.vue
+++ b/src/pages/view/hr/jsQj/components/jsQjEdit.vue
@@ -62,12 +62,6 @@ let formData = ref<any>({
 
 const dkRef = ref<any>(null);
 
-if (typeof props.data.dkfs === "string") {
-  nextTick(() => {
-    formData.value.dkfs = parseInt(props.data.dkfs);
-  })
-}
-
 const [register, { setValue, getValue }] = useForm({
   schema: [
     {
@@ -277,9 +271,17 @@ const goBack = () => {
 
 onMounted(() => { 
   if (props.data && props.data.id) {
+    formData.value = props.data;
+    formData.value.dkfs = parseInt(props.data.dkfs);
+    formData.value.jsId = getJs.id;
     // 初始化
-    setValue(props.data);
+    setValue(formData.value);
     initDk();
+  } else {
+    formData.value = props.data;
+    formData.value.dkfs = parseInt(props.data.dkfs);
+    formData.value.jsId = getJs.id;
+    setValue(formData.value);
   }
 });
 
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 6e16247..36b2380 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -133,15 +133,15 @@ export const useUserStore = defineStore({
     },
     async loginByOpenId(openId: string) {
       try {
-        // 先校验当前登录的用户的openid，如果和传入的openid匹配，直接返回true
-        if (
-          this.userdata &&
-          this.userdata.openId &&
-          openId &&
-          this.userdata.openId === openId
-        ) {
-          return true;
-        }
+        // // 先校验当前登录的用户的openid，如果和传入的openid匹配，直接返回true
+        // if (
+        //   this.userdata &&
+        //   this.userdata.openId &&
+        //   openId &&
+        //   this.userdata.openId === openId
+        // ) {
+        //   return true;
+        // }
         // 如果当前登录的用户的openid和传入的openid不匹配，则调用checkOpenId接口进行校验
         const res = await checkOpenId({
           openId,