From 704a721f1ea9e3050be765afff0bb86dbc6bb603 Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期一, 11 八月 2025 10:42:43 +0800
Subject: [PATCH] 报红更改
---
src/views/system/dept/utils/hook.tsx | 39 +++++++------------
src/views/system/dept/index.vue | 7 ++-
src/views/system/aboutItem/index.vue | 2
src/views/system/dept/form.vue | 2
src/api/item/index.ts | 4 +-
src/api/types.ts | 12 ++++++
6 files changed, 35 insertions(+), 31 deletions(-)
diff --git a/src/api/item/index.ts b/src/api/item/index.ts
index 0689be7..9556952 100644
--- a/src/api/item/index.ts
+++ b/src/api/item/index.ts
@@ -7,7 +7,7 @@
import { http } from "@/utils/http";
import { baseUrlApi } from "../util";
-import type { Result } from "../types";
+import type { Result, PageResult } from "../types";
// 鑾峰彇琛屾斂鍖哄煙鍒楄〃
export const getRegionList = () => {
@@ -104,7 +104,7 @@
// 鎷涙爣浠ｇ悊鍒嗛〉鏌ヨ闈炴斂搴滆鍗曞鐞�
export const zhaobiaoPageOrder = (data?: object) => {
- return http.request<Result>("post", baseUrlApi("/api/tenderOrder/page"), {
+ return http.request<PageResult>("post", baseUrlApi("/api/tenderOrder/page"), {
data
});
};
diff --git a/src/api/types.ts b/src/api/types.ts
index 81776b8..2e3491e 100644
--- a/src/api/types.ts
+++ b/src/api/types.ts
@@ -4,6 +4,18 @@
code: string | number;
message: string;
};
+type page = {
+ items: Array<any>;
+ total: number;
+ pageSize: number;
+ page: number;
+};
+export type PageResult = {
+ success: boolean;
+ result: page;
+ code: string | number;
+ message: string;
+};
type captchaImg = {
expirySeconds: number;
diff --git a/src/views/system/aboutItem/index.vue b/src/views/system/aboutItem/index.vue
index a945ecc..127646a 100644
--- a/src/views/system/aboutItem/index.vue
+++ b/src/views/system/aboutItem/index.vue
@@ -260,7 +260,7 @@
<pure-table
ref="tableRef"
adaptive
- :adaptiveConfig="{ offsetBottom: 45 }"
+ :adaptiveConfig="{ offsetBottom: 105 }"
align-whole="center"
row-key="id"
showOverflowTooltip
diff --git a/src/views/system/dept/form.vue b/src/views/system/dept/form.vue
index d189790..88586e0 100644
--- a/src/views/system/dept/form.vue
+++ b/src/views/system/dept/form.vue
@@ -8,7 +8,7 @@
import { Operation } from "@element-plus/icons-vue";
import { getCaigoufangshiList } from "@/api/item/index";
-const { state } = useDept();
+const { state } = useDept(ref({}));
const props = withDefaults(defineProps<FormProps>(), {
formInline: () => ({
id: "",
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 3d5caf9..bc56d7a 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -119,8 +119,9 @@
:value="item.value"
/>
</el-select>
- </el-form-item> </el-col
- ><el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4">
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4">
<el-form-item label="璐ㄧ枒锛�">
<el-checkbox-group
v-model="form.zhiyi"
@@ -269,7 +270,7 @@
<pure-table
ref="tableRef"
adaptive
- :adaptiveConfig="{ offsetBottom: 45 }"
+ :adaptiveConfig="{ offsetBottom: 105 }"
align-whole="center"
row-key="id"
showOverflowTooltip
diff --git a/src/views/system/dept/utils/hook.tsx b/src/views/system/dept/utils/hook.tsx
index 0608031..01b6a0d 100644
--- a/src/views/system/dept/utils/hook.tsx
+++ b/src/views/system/dept/utils/hook.tsx
@@ -1,4 +1,4 @@
-import dayjs from "dayjs";
+// import dayjs from "dayjs";
import editForm from "../form.vue";
import { handleTree } from "@/utils/tree";
import { message } from "@/utils/message";
@@ -15,22 +15,17 @@
caigourenDelete,
caigourenBatchDelete
} from "@/api/item/index";
-import { usePublicHooks } from "../../hooks";
+// import { usePublicHooks } from "../../hooks";
import { addDialog } from "@/components/ReDialog";
-import { type Ref, reactive, ref, onMounted, h, computed } from "vue";
+import { type Ref, reactive, ref, onMounted, h } from "vue";
import type { FormItemProps } from "./types";
-import {
- cloneDeep,
- isAllEmpty,
- deviceDetection,
- getKeyList
-} from "@pureadmin/utils";
-import { useUserStoreHook } from "@/store/modules/user";
+import { cloneDeep, deviceDetection, getKeyList } from "@pureadmin/utils";
+// import { useUserStoreHook } from "@/store/modules/user";
import type { PaginationProps } from "@pureadmin/table";
-const nowRole = computed(() => {
- return useUserStoreHook().nowRole;
-});
+// const nowRole = computed(() => {
+// return useUserStoreHook().nowRole;
+// });
const selectedNum = ref(0);
export function useDept(tableRef: Ref) {
@@ -102,7 +97,7 @@
const formRef = ref();
const dataList = ref([]);
const loading = ref(true);
- const { tagStyle } = usePublicHooks();
+ // const { tagStyle } = usePublicHooks();
const getOrderStatus = row => {
const res = state.orderStatusList.find(item => {
return row.orderStatus == item.status;
@@ -131,7 +126,7 @@
label: "椤圭洰杩涘害",
prop: "orderStatus",
minWidth: 70,
- cellRenderer: ({ row, props }) => getOrderStatus(row)
+ cellRenderer: ({ row }) => getOrderStatus(row)
},
{
label: "鎶ュ悕璐�",
@@ -157,15 +152,13 @@
label: "璐ㄧ枒",
prop: "zhiyi",
minWidth: 100,
- cellRenderer: ({ row, props }) => (
- <span>{row.status === 1 ? "鏈�" : "鏃�"}</span>
- )
+ cellRenderer: ({ row }) => <span>{row.status === 1 ? "鏈�" : "鏃�"}</span>
},
{
label: "鎶曡瘔",
prop: "tousu",
minWidth: 100,
- cellRenderer: ({ row, props }) => (
+ cellRenderer: ({ row }) => (
// <el-tag size={props.size} style={tagStyle.value(row.status)}>
<span>{row.status === 1 ? "鏈�" : "鏃�"}</span>
// </el-tag>
@@ -200,7 +193,7 @@
label: "椤圭洰杩涘害",
prop: "orderStatus",
minWidth: 70,
- cellRenderer: ({ row, props }) => getOrderStatus(row)
+ cellRenderer: ({ row }) => getOrderStatus(row)
},
{
label: "鎶ュ悕璐�",
@@ -226,15 +219,13 @@
label: "璐ㄧ枒",
prop: "zhiyi",
minWidth: 100,
- cellRenderer: ({ row, props }) => (
- <span>{row.status === 1 ? "鏈�" : "鏃�"}</span>
- )
+ cellRenderer: ({ row }) => <span>{row.status === 1 ? "鏈�" : "鏃�"}</span>
},
{
label: "鎶曡瘔",
prop: "tousu",
minWidth: 100,
- cellRenderer: ({ row, props }) => (
+ cellRenderer: ({ row }) => (
// <el-tag size={props.size} style={tagStyle.value(row.status)}>
<span>{row.status === 1 ? "鏈�" : "鏃�"}</span>
// </el-tag>
--
Gitblit v1.9.1