From b94b71d44d62802bb8093f64a202d0176fdade50 Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期二, 05 八月 2025 17:00:46 +0800
Subject: [PATCH] '一些更改'
---
src/views/system/dept/utils/hook.tsx | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/src/views/system/dept/utils/hook.tsx b/src/views/system/dept/utils/hook.tsx
index 70bc46e..1825877 100644
--- a/src/views/system/dept/utils/hook.tsx
+++ b/src/views/system/dept/utils/hook.tsx
@@ -181,11 +181,11 @@
}
};
async function onSearch() {
- loading.value = true;
const obj = cloneDeep(form);
obj.tousu = obj.tousu.join("");
obj.zhiyi = obj.zhiyi.join("");
- obj.xingzhengquyu = obj.xingzhengquyu.join("");
+ obj.xingzhengquyu = obj.xingzhengquyu ? obj.xingzhengquyu.join("") : "";
+ loading.value = true;
const { result } = await zhaobiaoPageOrder(obj); // 杩欓噷鏄繑鍥炰竴缁存暟缁勭粨鏋勶紝鍓嶇鑷澶勭悊鎴愭爲缁撴瀯锛岃繑鍥炴牸寮忚姹傦細鍞竴id鍔犵埗鑺傜偣parentId锛宲arentId鍙栫埗鑺傜偣id
const newData = result.items;
loading.value = false;
@@ -216,6 +216,8 @@
}
function openDialog(title = "鏂板", row?: FormItemProps) {
+ console.log(row,'-');
+
addDialog({
title: `${title}椤圭洰`,
props: {
@@ -231,8 +233,8 @@
toubiaobaozhengjin: row?.toubiaobaozhengjin ?? null, // 鎶曟爣淇濊瘉閲戯紙鍙�夛級
lianhetitoubiao: row?.lianhetitoubiao ?? null, // 鑱斿悎浣撴姇鏍囷紙鍙�夛級
kaibiaofangshi: row?.kaibiaofangshi ?? null, // 寮�鏍囨柟寮忥紙鍙�夛級
- shifoufenbao: row?.shifoufenbao ?? false, // 鏄惁鍒嗗寘锛堝彲閫夛級
- shifoutuisongxuanchuan: row?.shifoutuisongxuanchuan ?? true, // 鏄惁鎺ㄩ�佸浼狅紙鍙�夛級
+ shifoufenbao: row?.shifoufenbao ?? "false", // 鏄惁鍒嗗寘锛堝彲閫夛級
+ shifoutuisongxuanchuan: row?.shifoutuisongxuanchuan ?? "true", // 鏄惁鎺ㄩ�佸浼狅紙鍙�夛級
caigourenmingcheng: row?.caigourenmingcheng ?? null, // 閲囪喘浜哄悕绉帮紙鍙�夛級
xingzhengquyu: row?.xingzhengquyu.split(",") ?? [], // 琛屾斂鍖哄煙锛堝彲閫夛級
xingzhengquyuName: row?.xingzhengquyuName ?? null, // 琛屾斂鍖哄煙鍚嶇О锛堝彲閫夛級
@@ -258,9 +260,10 @@
draggable: true,
fullscreen: deviceDetection(),
fullscreenIcon: true,
+ sureBtnLoading: true,
closeOnClickModal: false,
contentRenderer: () => h(editForm, { ref: formRef, formInline: null }),
- beforeSure: (done, { options }) => {
+ beforeSure: (done, { options, closeLoading }) => {
const FormRef = formRef.value.getRef();
const curData = cloneDeep(options.props.formInline as FormItemProps);
async function chores() {
@@ -279,14 +282,14 @@
done(); // 鍏抽棴寮规
onSearch(); // 鍒锋柊琛ㄦ牸鏁版嵁
} else {
+ closeLoading();
message(res.message, {
type: "error"
});
}
}
- FormRef.validate(valid => {
+ FormRef.validate((valid, obj) => {
if (valid) {
- console.log("curData", curData);
// 琛ㄥ崟瑙勫垯鏍￠獙閫氳繃
if (title === "鏂板") {
// 瀹為檯寮�鍙戝厛璋冪敤鏂板鎺ュ彛锛屽啀杩涜涓嬮潰鎿嶄綔
@@ -295,6 +298,18 @@
// 瀹為檯寮�鍙戝厛璋冪敤淇敼鎺ュ彛锛屽啀杩涜涓嬮潰鎿嶄綔
chores();
}
+ } else {
+ closeLoading();
+ const fail = [];
+ console.log(obj);
+
+ for (const key in obj) {
+ fail.push(obj[key][0].message);
+ }
+ message(fail[0], {
+ type: "warning"
+ });
+ return false;
}
});
}
--
Gitblit v1.9.1