调整协调代课教师

src/api/base/jsQjApi.ts

@@ -34,25 +34,11 @@ export const jsQjTransferApi = async (params: any) => {
   return await post("/api/jsQj/transfer", params);
 };
 
-/**
- * 教务处确认
- */
-export const jsQjJwcQrApi = async (params: any) => {
-  return await post("/api/jsQj/jwc/qr", params);
-};
-
 /**
  * 教务处协调
  */
-export const jsQjJwcXtApi = async (params: any) => {
+export const jsQjXtApi = async (params: any) => {
-  return await post("/api/jsQj/jwc/xt", params);
+  return await post("/api/jsQj/xt", params);
-};
-
-/**
- * 代课教师确认
- */
-export const jsQjDkQrApi = async (params: any) => {
-  return await post("/api/jsQj/dk/qr", params);
 };
 
 /**

src/components/BasicSpCsMgr/index.vue

@@ -386,6 +386,7 @@ onMounted(async () => {
     } else {
       loadExistingApprovers();
     } 
+    notifyChange();
     // 重新构建数据
     console.log("SprList组件初始化成功");
   } catch (error) {

src/pages.json

@@ -360,27 +360,6 @@
         "enablePullDownRefresh": false
       }
     },
-    {
-      "path": "pages/view/hr/jsQj/jwcQr",
-      "style": {
-        "navigationBarTitleText": "请假代课教务处确认",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/view/hr/jsQj/jwcXt",
-      "style": {
-        "navigationBarTitleText": "请假代课教务处协调",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/view/hr/jsQj/dkQr",
-      "style": {
-        "navigationBarTitleText": "请假代课教师确认",
-        "enablePullDownRefresh": false
-      }
-    },
     {
       "path": "pages/view/hr/teacherProfile/education",
       "style": {

src/pages/components/YwConfirm/index.vue

@@ -2,14 +2,14 @@
   <view class="white-bg-color py-5 yw-confirm">
     <view class="flex-row items-center pt-5 pb-10">
       <u-button text="驳回" class="ml-15 mr-7" :plain="true" @click="showDlg('reject')" />
-      <u-button text="同意" class="mr-15 mr-7" type="primary" @click="submit" />
+      <u-button text="同意" class="mr-15 ml-7" type="primary" @click="submit" />
     </view>
-    <view class="flex-row items-center pb-5">
+    <view class="flex-row items-center pb-10">
       <u-button text="终止" class="ml-15 mr-7" :plain="true" @click="showDlg('stop')" />
-      <u-button text="转办" class="mr-15 mr-7" :plain="true" @click="showTransfer" />
+      <u-button text="转办" class="mr-15 ml-7" :plain="true" @click="showTransfer" />
     </view>
     <view class="flex-row items-center pb-5">
-      <u-button text="协调代课教师" class="mr-15 mr-7" :plain="true" @click="showXtDlg" />
+      <u-button text="协调代课教师" class="mr-15 ml-15" :plain="true" @click="showXtDlg" />
     </view>
 		<!-- 驳回弹窗 -->
 		<u-popup :show="dlgFlag" mode="center" :closeOnClickOverlay="false" @close="closeDlg">
@@ -34,12 +34,15 @@
 <script lang="ts" setup>
 import YwTransfer from "../YwTransfer/index.vue";
 import XtDkJs from "@/pages/view/hr/jsQj/components/XtDkJs.vue";
+import { useDataStore } from "@/store/modules/data";
+const { getLcgl } = useDataStore();
 
 // 接收外部传入属性并设置默认值
 const props = withDefaults(defineProps<{
   spApi: any,             // 审批Api
   transferApi: any,       // 转办Api
   stopApi: any,           // 终止Api
+  xtDkApi?: any,           // 协调代课Api
   params: any,            // 默认的请求参数
   stausName?: string,     // 默认的状态属性名
   remarkName?: string,    // 默认的审批说明属性名
@@ -98,7 +101,7 @@ const showTransfer = () => {
 };
 
 const showXtDlg = () => { 
-
+  xtDkJsRef.value.showDlg();
 };
 
 const submit = async () => {
@@ -158,13 +161,16 @@ const handleXtDkJs = async (data: any) => {
   const params = {
     ...props.params
   };
-  const newSprList = data.newSprList || [];
-  const newCsrList = data.newCsrList || [];
   params.spRemark = data.spRemark;
-  params.zbrIds = newSprList.map((item: any) => item.userId).join(",");
+  params.dkList = data.dkList;
-  params.csrIds = newCsrList.map((item: any) => item.userId).join(",");
+  params.csrList = (getLcgl.csrSpList || []).map((item: any) => { 
-	uni.showLoading({ title: "正在转办..." });
+    return {
-  await props.transferApi(params);
+      userId: item.userId,
+      jsxm: item.userName
+    }
+  });
+	uni.showLoading({ title: "正在协调..." });
+  await props.xtDkApi(params);
   transferRef.value.closeDlg();
 	uni.hideLoading();
   emit('transfer');

src/pages/view/hr/jsQj/components/XtDkJs.vue

@@ -28,14 +28,8 @@
 <script setup lang="ts">
 import { ref } from "vue";
 import JsQjDkEdit from "./jsQjDkEdit.vue";
-
+import { useDataStore } from "@/store/modules/data";
-// 接收外部传入属性
+const { getData } = useDataStore();
-const props = withDefaults(defineProps<{
-  qjData?: any
-}>(), {
-  qjData: () => ({
-  })
-});
 
 // 定义一个上级传入的emit响应事件用于接收数据变更
 const emit = defineEmits(["submit"]);
@@ -43,9 +37,16 @@ const emit = defineEmits(["submit"]);
 const dkRef = ref<any>(null);
 const dlgFlag = ref(false);
 const spRemark = ref("");
+const qjData = computed(() => {
+  return getData;
+});
 
 const showDlg = (type: string) => {
   dlgFlag.value = true;
+  nextTick(() => {
+    console.log("qjData.value", qjData.value, dkRef.value);
+    dkRef.value.getPkkbList();
+  });
 };
 
 const closeDlg = () => {

src/pages/view/hr/jsQj/components/jsQjEdit.vue

@@ -204,6 +204,9 @@ const submit = async () => {
     return;
   }
   const params = { ...fd };
+  // 注入审批人/抄送人
+  params.sprList = formData.value.sprList || [];
+  params.csrList = formData.value.csrList || [];
   if (fd.dkfs === 0) {
     const dkList = dkRef.value.getDkList();
     if (!dkList.length) {
@@ -228,9 +231,6 @@ const submit = async () => {
       params.dkList = [];
     }
   }
-  // 注入审批人/抄送人
-  params.sprList = formData.value.sprList || [];
-  params.csrList = formData.value.csrList || [];
   let submitApi = jsQjSqApi;
   if (props.data && props.data.id) {
     submitApi = jsQjCxtjApi
@@ -255,6 +255,7 @@ const submit = async () => {
 
 // 审批/抄送选人变更回调
 const onSpCsChange = (payload: any) => {
+  console.log("onSpCsChange:", payload);
   if (payload) {
     formData.value.sprList = Array.isArray(payload.sprList) ? payload.sprList : [];
     formData.value.csrList = Array.isArray(payload.csrList) ? payload.csrList : [];
@@ -270,19 +271,25 @@ const goBack = () => {
 };
 
 onMounted(() => { 
+  const t = {
+    jsId: formData.value.jsId || getJs.id,
+    sprList: formData.value.sprList || [],
+    csrList: formData.value.csrList || [],
+    dkfs: formData.value.dkfs || 0
+  };
+  formData.value = {
+    ...props.data,
+    ...t
+  };
+  formData.value.dkfs = parseInt(props.data.dkfs);
   if (props.data && props.data.id) {
-    formData.value = props.data;
-    formData.value.dkfs = parseInt(props.data.dkfs);
-    formData.value.jsId = getJs.id;
     // 初始化
     setValue(formData.value);
     initDk();
   } else {
-    formData.value = props.data;
-    formData.value.dkfs = parseInt(props.data.dkfs);
-    formData.value.jsId = getJs.id;
     setValue(formData.value);
   }
+  console.log("onMounted:", formData.value);
 });
 
 </script>

src/pages/view/hr/jsQj/dkQr.vue

@@ -1,145 +0,0 @@
-<template>
-  <BasicLayout>
-    <template #top>
-      <view>
-        <BasicTabs 
-          class="detail-tabs"
-          :list="tabList" 
-          bar-width="60px" 
-          scroll-count="4"
-          :current="curTabIndex" 
-          @change="switchTab"
-        />
-      </view>
-    </template>
-    <view class="qj-detail">
-      <!-- 请假信息 -->
-      <view v-show="curTabIndex === 0">
-        <JsQjDetailInfo
-          :qjId="qjId"
-          :dbFlag="dbFlag"
-          @loadQjData="handleQjDataLoaded"
-        />
-      </view>
-
-      <!-- 代课信息 -->
-      <view v-show="showDkTab && curTabIndex === 1">
-        <JsQjDetailDk
-          :qjId="qjId"
-          @loadDkList="handleDkListLoaded"
-        />
-      </view>
-
-      <!-- 审批流程 -->
-      <view v-show="curTabIndex === 2">
-        <LcglSpList :yw-id="qjId" yw-type="JS_QJ" />
-      </view>
-    </view>
-    <template #bottom>
-			<YwConfirm :api="jsQjDkQrApi" :params="spParams" />
-    </template>
-  </BasicLayout>
-</template>
-
-<script setup lang="ts">
-import { onLoad } from "@dcloudio/uni-app";
-import { jsQjDkQrApi } from "@/api/base/jsQjApi";
-import { useUserStore } from "@/store/modules/user";
-import { useDataStore } from "@/store/modules/data";
-import { ref } from "vue";
-import JsQjDetailInfo from "./components/jsQjDetailInfo.vue";
-import JsQjDetailDk from "./components/jsQjDetailDk.vue";
-import LcglSpList from "@/components/LcglSpList/index.vue";
-import YwConfirm from "@/pages/components/YwConfirm/index.vue";
-import { QjPageUtils } from "@/utils/qjPageUtils";
-
-const { getJs } = useUserStore();
-const { setData, getXxts } = useDataStore();
-
-const tabList = ref<any>([{ name: "请假信息", id: "tab-qj" }]);
-const curTabIndex = ref(0);
-
-const dbFlag = ref(false);
-const qjId = ref('');
-const showDkTab = ref(false);
-
-const spParams = computed(() => {
-  return {
-    xxtsId: getXxts.id,
-    ywId: qjId.value
-  };
-});
-
-// 构建Tab列表
-const rebuildTabList = (showDk: boolean) => {
-  // 构建Tab列表
-  tabList.value = [
-    { name: "请假信息", id: "tab-qj" },
-  ];
-  if (showDk) {
-    tabList.value.push({ name: "代课信息", id: "tab-dk" });
-  }
-  tabList.value.push({ name: "审批流程", id: "tab-sp" });
-};
-
-// 切换Tab
-const switchTab = (index: number) => {
-  curTabIndex.value = index;
-};
-
-const handleQjDataLoaded = (data: any) => {
-  setData(data);
-  showDkTab.value = !!(data && data.dkfs != 2);
-  rebuildTabList(showDkTab.value);
-};
-
-const handleDkListLoaded = (list: any[]) => {
-  // 代课明细数据已由JsQjDetail组件处理
-};
-
-onLoad(async (data?: any) => {
-  const ret = await QjPageUtils.init(data);
-  if (!ret || !ret.success) {
-    return;
-  }
-  qjId.value = ret.qjId;
-  dbFlag.value = ret.dbFlag;
-});
-</script>
-
-<style lang="scss" scoped>
-.qj-detail {
-  background-color: #f5f7fa;
-}
-
-.info-card {
-  margin: 15px;
-  background-color: #fff;
-  border-radius: 8px;
-  padding: 15px;
-  box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-
-  .card-header {
-    font-size: 16px;
-    font-weight: bold;
-    color: #333;
-    margin-bottom: 10px;
-
-    .applicant-name {
-      font-size: 16px;
-      font-weight: bold;
-      color: #333;
-    }
-  }
-
-  .divider {
-    height: 1px;
-    background-color: #eee;
-    margin-bottom: 15px;
-  }
-
-  .card-body {
-    padding: 15px;
-  }
-}
-</style>

src/pages/view/hr/jsQj/jwcQr.vue

@@ -1,156 +0,0 @@
-<template>
-  <BasicLayout>
-    <template #top>
-      <view>
-        <BasicTabs 
-          class="detail-tabs"
-          :list="tabList" 
-          bar-width="60px" 
-          scroll-count="4"
-          :current="curTabIndex" 
-          @change="switchTab"
-        />
-      </view>
-    </template>
-    <view class="qj-detail">
-      <!-- 请假信息 -->
-      <view v-show="curTabIndex === 0">
-        <JsQjDetailInfo
-          :qjId="qjId"
-          :dbFlag="dbFlag"
-          @loadQjData="handleQjDataLoaded"
-        />
-      </view>
-
-      <!-- 代课信息 -->
-      <view v-show="showDkTab && curTabIndex === 1">
-        <JsQjDetailDk
-          :qjId="qjId"
-          @loadDkList="handleDkListLoaded"
-        />
-      </view>
-
-      <!-- 审批流程 -->
-      <view v-show="curTabIndex === 2">
-        <LcglSpList :yw-id="qjId" yw-type="JS_QJ" />
-      </view>
-    </view>
-    <template #bottom>
-			<YwConfirm :api="jsQjJwcQrApi" :params="spParams" />
-    </template>
-  </BasicLayout>
-</template>
-
-<script setup lang="ts">
-import { onLoad } from "@dcloudio/uni-app";
-import { navigateBack } from "@/utils/uniapp";
-import { jsQjJwcQrApi } from "@/api/base/jsQjApi";
-import { useUserStore } from "@/store/modules/user";
-import { useDataStore } from "@/store/modules/data";
-import { ref } from "vue";
-import JsQjDetailInfo from "./components/jsQjDetailInfo.vue";
-import JsQjDetailDk from "./components/jsQjDetailDk.vue";
-import LcglSpList from "@/components/LcglSpList/index.vue";
-import YwConfirm from "@/pages/components/YwConfirm/index.vue";
-import { QjPageUtils } from "@/utils/qjPageUtils";
-
-const { getJs } = useUserStore();
-const { setData, getXxts } = useDataStore();
-
-const tabList = ref<any>([{ name: "请假信息", id: "tab-qj" }]);
-const curTabIndex = ref(0);
-
-const dbFlag = ref(false);
-const qjId = ref('');
-const showDkTab = ref(false);
-
-const spParams = computed(() => {
-  return {
-    xxtsId: getXxts.id,
-    ywId: qjId.value
-  };
-});
-
-// 构建Tab列表
-const rebuildTabList = (showDk: boolean) => {
-  // 构建Tab列表
-  tabList.value = [
-    { name: "请假信息", id: "tab-qj" },
-  ];
-  if (showDk) {
-    tabList.value.push({ name: "代课信息", id: "tab-dk" });
-  }
-  tabList.value.push({ name: "审批流程", id: "tab-sp" });
-};
-
-// 切换Tab
-const switchTab = (index: number) => {
-  curTabIndex.value = index;
-};
-
-const handleQjDataLoaded = (data: any) => {
-  setData(data);
-  showDkTab.value = !!(data && data.dkfs != 2);
-  rebuildTabList(showDkTab.value);
-};
-
-const handleDkListLoaded = (list: any[]) => {
-  // 代课明细数据已由JsQjDetail组件处理
-};
-
-const submit = async () => {
-  navigateBack();
-};
-
-// 驳回处理
-const handleReject = async () => {
-  navigateBack();
-};
-
-onLoad(async (data?: any) => {
-  const ret = await QjPageUtils.init(data);
-  if (!ret || !ret.success) {
-    return;
-  }
-  qjId.value = ret.qjId;
-  dbFlag.value = ret.dbFlag;
-});
-</script>
-
-<style lang="scss" scoped>
-.qj-detail {
-  background-color: #f5f7fa;
-}
-
-.info-card {
-  margin: 15px;
-  background-color: #fff;
-  border-radius: 8px;
-  padding: 15px;
-  box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-
-  .card-header {
-    font-size: 16px;
-    font-weight: bold;
-    color: #333;
-    margin-bottom: 10px;
-
-    .applicant-name {
-      font-size: 16px;
-      font-weight: bold;
-      color: #333;
-    }
-  }
-
-  .divider {
-    height: 1px;
-    background-color: #eee;
-    margin-bottom: 15px;
-  }
-
-  .card-body {
-    padding: 15px;
-  }
-}
-
-</style>

src/pages/view/hr/jsQj/jwcXt.vue

@@ -1,177 +0,0 @@
-<template>
-  <BasicLayout>
-    <template #top>
-      <view>
-        <BasicTabs 
-          class="detail-tabs"
-          :list="tabList" 
-          bar-width="60px" 
-          scroll-count="4"
-          :current="curTabIndex" 
-          @change="switchTab"
-        />
-      </view>
-    </template>
-    <view class="qj-detail">
-      <!-- 请假信息 -->
-      <view v-show="curTabIndex === 0">
-        <JsQjDetailInfo
-          :qjId="qjId"
-          :dbFlag="dbFlag"
-          @loadQjData="handleQjDataLoaded"
-        />
-      </view>
-
-      <!-- 代课信息 -->
-      <view v-show="curTabIndex === 1" class="px-15">
-        <JsQjDkEdit :data="qjData" ref="dkRef" />
-      </view>
-
-      <!-- 审批流程 -->
-      <view v-show="curTabIndex === 2">
-        <LcglSpList :yw-id="qjId" yw-type="JS_QJ" />
-      </view>
-    </view>
-    <template #bottom>
-      <view class="white-bg-color py-5">
-        <view class="flex-row items-center pb-10 pt-5">
-          <u-button text="取消" class="ml-15 mr-7" :plain="true" @click="navigateBack" />
-          <u-button text="提交" class="mr-15 mr-7" type="primary" @click="submit" />
-        </view>
-      </view>
-    </template>
-  </BasicLayout>
-</template>
-
-<script setup lang="ts">
-import { onLoad } from "@dcloudio/uni-app";
-import { navigateBack } from "@/utils/uniapp";
-import { jsQjJwcXtApi } from "@/api/base/jsQjApi";
-import { useUserStore } from "@/store/modules/user";
-import { useDataStore } from "@/store/modules/data";
-import { ref } from "vue";
-import JsQjDetailInfo from "./components/jsQjDetailInfo.vue";
-import JsQjDkEdit from "./components/jsQjDkEdit.vue";
-import LcglSpList from "@/components/LcglSpList/index.vue";
-import { QjPageUtils } from "@/utils/qjPageUtils";
-
-const { getJs } = useUserStore();
-const { setData, getData } = useDataStore();
-
-const tabList = ref<any>([
-  { name: "请假信息", id: "tab-qj" },
-  { name: "代课信息", id: "tab-dk" },
-  { name: "审批流程", id: "tab-sp" }
-]);
-const curTabIndex = ref(1);
-
-const dbFlag = ref(false);
-const qjId = ref('');
-
-const qjData = computed(() => getData);
-const dkRef = ref<any>(null);
-
-// 切换Tab
-const switchTab = (index: number) => {
-  curTabIndex.value = index;
-};
-
-const updateDk = () => {
-  nextTick(() => {
-    if (dkRef.value) {
-      dkRef.value.getPkkbList();
-    }
-  });
-};
-
-const handleQjDataLoaded = (data: any) => {
-  setData(data);
-  updateDk();
-};
-
-const handleDkListLoaded = (list: any[]) => {
-  // 代课明细数据已由JsQjDetail组件处理
-};
-
-const submit = async () => {
-  const params = {
-    qjId: qjId.value,
-    jsId: getJs.id,
-    dkList: [],
-  };
-  const flag = await dkRef.value.validate();
-  if (!flag) {
-    uni.showToast({
-      title: "请选择代课教师",
-      icon: "none",
-    });
-    switchTab(1);
-    return;
-  }
-  let dkList = dkRef.value.getDkList() || [];
-  if (dkList.length) {
-    params.dkList = dkList.map((item: any) => {
-      const newItem = { ...item };
-      newItem.jsId = item.dkJsId;
-      newItem.jsName = item.dkJsName;
-      newItem.pkkbId = item.id;
-      newItem.dktime = item.dktime + " 00:00:00";
-      newItem.id = "";
-      newItem.qjId = "";
-      return newItem;
-    });
-  }
-  uni.showLoading({ title: "提交中..." });
-  await jsQjJwcXtApi(params);
-  uni.hideLoading();
-  setTimeout(() => {
-    uni.reLaunch({ url: '/pages/base/message/index' });
-  }, 1000);
-};
-
-onLoad(async (data?: any) => {
-  const ret = await QjPageUtils.init(data);
-  if (!ret || !ret.success) {
-    return;
-  }
-  qjId.value = ret.qjId;
-  dbFlag.value = ret.dbFlag;
-});
-</script>
-
-<style lang="scss" scoped>
-.qj-detail {
-  background-color: #f5f7fa;
-}
-
-.info-card {
-  margin: 15px;
-  background-color: #fff;
-  border-radius: 8px;
-  padding: 15px;
-  box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-
-  .card-header {
-    font-size: 16px;
-    font-weight: bold;
-    color: #333;
-    margin-bottom: 10px;
-
-    .applicant-name {
-      font-size: 16px;
-      font-weight: bold;
-      color: #333;
-    }
-  }
-
-  .divider {
-    height: 1px;
-    background-color: #eee;
-    margin-bottom: 15px;
-  }
-
-  .card-body {
-    padding: 15px;
-  }
-}
-</style>

src/pages/view/hr/jsQj/sp.vue

@@ -22,7 +22,7 @@
       <LcglSp :yw-id="qjId" yw-type="JS_QJ" />
     </view>
     <template #bottom>
-			<YwConfirm :spApi="jsQjSpApi" :stopApi="jsQjStopApi"
+			<YwConfirm :spApi="jsQjSpApi" :stopApi="jsQjStopApi" :xtDkApi="jsQjXtApi"
 			 :transferApi="jsQjTransferApi" :params="spParams" />
     </template>
   </BasicLayout>
@@ -30,7 +30,7 @@
 
 <script setup lang="ts">
 import { onLoad } from "@dcloudio/uni-app";
-import { jsQjSpApi, jsQjStopApi, jsQjTransferApi } from "@/api/base/jsQjApi";
+import { jsQjSpApi, jsQjStopApi, jsQjTransferApi, jsQjXtApi } from "@/api/base/jsQjApi";
 import { useUserStore } from "@/store/modules/user";
 import { useDataStore } from "@/store/modules/data";
 import { ref } from "vue";