From a367b946b912a4d82266a40aec4dfeca15b8da76 Mon Sep 17 00:00:00 2001 From: ywyonui Date: Tue, 16 Sep 2025 11:13:17 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=B0=86=E7=A1=AE=E8=AE=A4=E9=A9=B3?= =?UTF-8?q?=E5=9B=9E=E6=A8=A1=E5=9D=97=E6=8F=90=E5=8F=96=E6=88=90=E5=85=AC?= =?UTF-8?q?=E5=85=B1=E7=BB=84=E4=BB=B6=202=E3=80=81=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=BE=85=E5=8A=9E=E5=B7=B2=E5=8A=9E=E6=9F=A5=E8=AF=A2=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=98=BE=E7=A4=BA=E9=A1=BA=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/base/message/index.vue | 4 +- src/pages/components/YwConfirm/index.vue | 117 +++++++++++++++++++++++ src/pages/view/hr/jsQj/dkQr.vue | 71 ++------------ src/pages/view/hr/jsQj/jwcQr.vue | 72 ++------------ src/pages/view/routine/xk/tf/detail.vue | 2 +- src/pages/view/routine/xk/tf/sp.vue | 58 ++--------- 6 files changed, 149 insertions(+), 175 deletions(-) create mode 100644 src/pages/components/YwConfirm/index.vue diff --git a/src/pages/base/message/index.vue b/src/pages/base/message/index.vue index 6999a62..412a4b8 100644 --- a/src/pages/base/message/index.vue +++ b/src/pages/base/message/index.vue @@ -89,7 +89,9 @@ const currentTab = ref('A'); // 0: 待办, 1: 已办 const fetchListData = async (tabIndex: string) => { setParam({ dbZt: tabIndex, - jsrId: getJs.id + jsrId: getJs.id, + sidx: "xxtstime", + sord: "desc", }); reload(); }; diff --git a/src/pages/components/YwConfirm/index.vue b/src/pages/components/YwConfirm/index.vue new file mode 100644 index 0000000..c9ce69e --- /dev/null +++ b/src/pages/components/YwConfirm/index.vue @@ -0,0 +1,117 @@ + + + + + \ No newline at end of file diff --git a/src/pages/view/hr/jsQj/dkQr.vue b/src/pages/view/hr/jsQj/dkQr.vue index 7d977b1..05e36a7 100644 --- a/src/pages/view/hr/jsQj/dkQr.vue +++ b/src/pages/view/hr/jsQj/dkQr.vue @@ -36,35 +36,9 @@ - - - - 驳回原因 - - - 取消 - 确定 - - - @@ -77,6 +51,7 @@ 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(); @@ -89,9 +64,12 @@ const dbFlag = ref(false); const qjId = ref(''); const showDkTab = ref(false); -const dlgFlag = ref(false); -const rejectReason = ref(""); - +const spParams = computed(() => { + return { + qjId: qjId.value, + jsId: getJs.id, + }; +}); // 构建Tab列表 const rebuildTabList = (showDk: boolean) => { @@ -120,24 +98,7 @@ const handleDkListLoaded = (list: any[]) => { // 代课明细数据已由JsQjDetail组件处理 }; -const showDlg = () => { - dlgFlag.value = true; -}; - -const closeDlg = () => { - dlgFlag.value = false; -}; - const submit = async () => { - const params = { - qjId: qjId.value, - jsId: getJs.id, - spStatus: "approved", - spRemark: "同意", - }; - uni.showLoading({ title: "确认中..." }); - await jsQjDkQrApi(params); - uni.hideLoading(); setTimeout(() => { uni.reLaunch({ url: '/pages/base/message/index' }); }, 1000); @@ -145,20 +106,6 @@ const submit = async () => { // 驳回处理 const handleReject = async () => { - if (!rejectReason.value.trim()) { - uni.showToast({ title: "请填写驳回意见", icon: "none" }); - return; - } - const params = { - qjId: qjId.value, - jsId: getJs.id, - spStatus: "rejected", - spRemark: rejectReason.value, - }; - uni.showLoading({ title: "正在驳回..." }); - await jsQjDkQrApi(params); - uni.hideLoading(); - closeDlg(); setTimeout(() => { uni.reLaunch({ url: '/pages/base/message/index' }); }, 1000); diff --git a/src/pages/view/hr/jsQj/jwcQr.vue b/src/pages/view/hr/jsQj/jwcQr.vue index 732033b..a66f430 100644 --- a/src/pages/view/hr/jsQj/jwcQr.vue +++ b/src/pages/view/hr/jsQj/jwcQr.vue @@ -36,35 +36,9 @@ - - - - 驳回原因 - - - 取消 - 确定 - - - @@ -78,6 +52,7 @@ 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(); @@ -90,9 +65,12 @@ const dbFlag = ref(false); const qjId = ref(''); const showDkTab = ref(false); -const dlgFlag = ref(false); -const rejectReason = ref(""); - +const spParams = computed(() => { + return { + qjId: qjId.value, + jsId: getJs.id, + }; +}); // 构建Tab列表 const rebuildTabList = (showDk: boolean) => { @@ -121,43 +99,12 @@ const handleDkListLoaded = (list: any[]) => { // 代课明细数据已由JsQjDetail组件处理 }; -const showDlg = () => { - dlgFlag.value = true; -}; - -const closeDlg = () => { - dlgFlag.value = false; -}; - const submit = async () => { - const params = { - qjId: qjId.value, - jsId: getJs.id, - spStatus: "approved", - spRemark: "同意", - }; - uni.showLoading({ title: "确认中..." }); - await jsQjJwcQrApi(params); - uni.hideLoading(); navigateBack(); }; // 驳回处理 const handleReject = async () => { - if (!rejectReason.value.trim()) { - uni.showToast({ title: "请填写驳回意见", icon: "none" }); - return; - } - const params = { - qjId: qjId.value, - jsId: getJs.id, - spStatus: "rejected", - spRemark: rejectReason.value, - }; - uni.showLoading({ title: "正在驳回..." }); - await jsQjJwcQrApi(params); - uni.hideLoading(); - closeDlg(); navigateBack(); }; @@ -206,4 +153,5 @@ onLoad(async (data?: any) => { padding: 15px; } } + \ No newline at end of file diff --git a/src/pages/view/routine/xk/tf/detail.vue b/src/pages/view/routine/xk/tf/detail.vue index f1ff0fa..938ed49 100644 --- a/src/pages/view/routine/xk/tf/detail.vue +++ b/src/pages/view/routine/xk/tf/detail.vue @@ -57,7 +57,7 @@ const jfPzList = ref([]); // 返回首页 const goHome = () => { uni.reLaunch({ - url: "/pages/base/home/index" + url: "/pages/base/service/index" }); }; diff --git a/src/pages/view/routine/xk/tf/sp.vue b/src/pages/view/routine/xk/tf/sp.vue index e7bf72c..1f0ed81 100644 --- a/src/pages/view/routine/xk/tf/sp.vue +++ b/src/pages/view/routine/xk/tf/sp.vue @@ -26,24 +26,9 @@ - - - - 驳回原因 - - - 取消 - 确定 - - - @@ -55,6 +40,7 @@ import XkPayXs from "../components/XkPayXs/index.vue" import XkPaySuccessXkkc from "../components/XkPaySuccessXkkc/index.vue" import LcglSpList from "@/components/LcglSpList/index.vue"; import PreviewImage from "@/components/PreviewImage/index.vue"; +import YwConfirm from "@/pages/components/YwConfirm/index.vue"; import { getXkTfDetailByIdApi, xkTfSpApi } from "@/api/base/xkTfApi"; import { XkTfPageUtils } from "@/utils/xkTfPageUtils"; const { getJs } = useUserStore(); @@ -67,15 +53,12 @@ const jfPzList = ref([]); const dbFlag = ref(false); const xkTfId = ref(''); -const dlgFlag = ref(false); -const rejectReason = ref(""); -const showDlg = () => { - dlgFlag.value = true; -}; - -const closeDlg = () => { - dlgFlag.value = false; -}; +const spParams = computed(() => { + return { + xkTfId: xkTfId.value, + jsId: getJs.id, + }; +}); const goHome = () => { uni.reLaunch({ @@ -110,34 +93,11 @@ const loadData = async (id: string) => { }; const submit = async () => { - const params = { - xkTfId: xkTfId.value, - jsId: getJs.id, - spStatus: "approved", - spRemark: "同意", - }; - uni.showLoading({ title: "确认中..." }); - await xkTfSpApi(params); - uni.hideLoading(); goHome(); }; // 驳回处理 const handleReject = async () => { - if (!rejectReason.value.trim()) { - uni.showToast({ title: "请填写驳回意见", icon: "none" }); - return; - } - const params = { - xkTfId: xkTfId.value, - jsId: getJs.id, - spStatus: "rejected", - spRemark: rejectReason.value, - }; - uni.showLoading({ title: "正在驳回..." }); - await xkTfSpApi(params); - uni.hideLoading(); - closeDlg(); goHome(); };