Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud

# Conflicts:
#	package-lock.json

src/api/act/actCancel.ts

@@ -0,0 +1,40 @@
+import request from "/@/utils/request"
+
+export function fetchList(query?: Object) {
+	return request({
+		url: "/wallet/act/act-cancel/page",
+		method: "get",
+		params: query,
+	})
+}
+
+export function addObj(obj?: Object) {
+	return request({
+		url: "/wallet/act/act-cancel",
+		method: "post",
+		data: obj,
+	})
+}
+
+export function getObj(id?: string) {
+	return request({
+		url: "/wallet/act/act-cancel/" + id,
+		method: "get",
+	})
+}
+
+export function delObjs(ids?: Object) {
+	return request({
+		url: "/wallet/act/act-cancel",
+		method: "delete",
+		data: ids,
+	})
+}
+
+export function putObj(obj?: Object) {
+	return request({
+		url: "/wallet/act/act-cancel",
+		method: "put",
+		data: obj,
+	})
+}

src/api/integrated/notice.ts

@@ -1,49 +1,48 @@
 import request from "/@/utils/request"
 
 export function fetchList(query?: Object) {
-  return request({
-    url: '/integrated/notice/page',
-    method: 'get',
-    params: query
-  })
+	return request({
+		url: "/integrated/notice/page",
+		method: "get",
+		params: query,
+	})
 }
 
 export function addObj(obj?: Object) {
-  return request({
-    url: '/integrated/notice',
-    method: 'post',
-    data: obj
-  })
+	return request({
+		url: "/integrated/notice",
+		method: "post",
+		data: obj,
+	})
 }
 
 export function getObj(id?: string) {
-  return request({
-    url: '/integrated/notice/' + id,
-    method: 'get'
-  })
+	return request({
+		url: "/integrated/notice/" + id,
+		method: "get",
+	})
 }
 
 export function delObjs(ids?: Object) {
-  return request({
-    url: '/integrated/notice',
-    method: 'delete',
-    data: ids
-  })
+	return request({
+		url: "/integrated/notice",
+		method: "delete",
+		data: ids,
+	})
 }
 
 export function putObj(obj?: Object) {
-  return request({
-    url: '/integrated/notice',
-    method: 'put',
-    data: obj
-  })
+	return request({
+		url: "/integrated/notice",
+		method: "put",
+		data: obj,
+	})
 }
 
 export function getScreenNoticeList(params?: Object) {
-  return request({
-    url: '/integrated/notice/screen/list',
-    method: 'get',
-    params
-  })
+	return request({
+		url: "/integrated/notice/screen/list",
+		method: "get",
+		params,
+	})
 }
-

src/components/Select/SelectAct.vue

@@ -0,0 +1,101 @@
+<template>
+	<el-select
+		style="width: 100%"
+		v-model="selectId"
+		:placeholder="props.placeholder"
+		clearable
+		remote-show-suffix
+		filterable
+		remote
+		:disabled="props.disabled"
+		:remote-method="remoteSearch"
+		:loading="state.loading"
+		@visible-change="(e: boolean) => e && getOptions()"
+		:multiple="props.multiple"
+	>
+		<el-option v-for="v in state.options" :key="v.id" :label="`${v.actTitle}`" :value="v.id">
+			<div class="flex items-center">
+				<div class="color-primary">{{ v.actTitle }}</div>
+			</div>
+		</el-option>
+	</el-select>
+</template>
+
+<script setup lang="ts" name="select-merchant">
+import { reactive } from "vue"
+import * as actCancelApi from "/@/api/act/actCancel"
+
+const selectId = defineModel()
+
+const props = withDefaults(
+	defineProps<{
+		placeholder?: string
+		apiParams?: any
+		autoFirst?: boolean
+		disabled?: boolean
+		multiple?: boolean
+	}>(),
+	{
+		placeholder: "请选择",
+		apiParams: {},
+		autoFirst: false,
+		disabled: false,
+		multiple: false,
+	},
+)
+
+const queryForm = reactive<any>({
+	name: null,
+	current: 1,
+	size: 9999,
+})
+
+const state = reactive<any>({
+	loading: true,
+	selectId: selectId.value,
+	options: [],
+})
+
+watch(
+	selectId,
+	(newVal, oldValue) => {
+		if (newVal == oldValue) return
+		state.selectId = newVal
+		getOptions()
+	},
+	{ immediate: true },
+)
+
+async function getOptions() {
+	try {
+		state.loading = true
+		const _pa = {
+			...queryForm,
+			...props.apiParams,
+		}
+		const { data } = await actCancelApi.fetchList(_pa)
+		state.options = data.records ?? []
+		if (props.autoFirst && state.options.length != 0) {
+			state.selectId = state.options[0].id
+		}
+	} finally {
+		setTimeout(() => (state.loading = false), 500)
+	}
+}
+
+function remoteSearch(params: string) {
+	if (params != queryForm.name) {
+		queryForm.name = params
+		getOptions()
+	}
+}
+
+function clear() {
+	state.selectId = null
+	getOptions()
+}
+
+onMounted(() => {
+	props.autoFirst && getOptions()
+})
+</script>

src/components/Select/SelectNotice.vue

@@ -0,0 +1,90 @@
+<template>
+    <el-select style="width: 100%" v-model="selectId" :placeholder="props.placeholder" clearable remote-show-suffix
+        filterable remote :disabled="props.disabled" :remote-method="remoteSearch" :loading="state.loading"
+        @visible-change="(e: boolean) => e && getOptions()" :multiple="props.multiple">
+        <el-option v-for="v in state.options" :key="v.id" :label="`${v.title}`" :value="v.id">
+            <div class="flex items-center">
+                <div class="color-primary"> {{ v.title }}</div>
+            </div>
+        </el-option>
+    </el-select>
+</template>
+
+<script setup lang="ts" name="select-merchant">
+import { reactive } from "vue"
+import * as noticeApi from "/@/api/integrated/notice"
+
+const selectId = defineModel()
+
+const props = withDefaults(
+    defineProps<{
+        placeholder?: string
+        apiParams?: any
+        autoFirst?: boolean
+        disabled?: boolean
+        multiple?: boolean
+    }>(),
+    {
+        placeholder: "请选择",
+        apiParams: {},
+        autoFirst: false,
+        disabled: false,
+        multiple: false
+    },
+)
+
+const queryForm = reactive<any>({
+    name: null,
+    current: 1,
+    size: 9999,
+})
+
+const state = reactive<any>({
+    loading: true,
+    selectId: selectId.value,
+    options: [],
+})
+
+watch(
+    selectId,
+    (newVal, oldValue) => {
+        if (newVal == oldValue) return
+        state.selectId = newVal
+        getOptions()
+    },
+    { immediate: true },
+)
+
+async function getOptions() {
+    try {
+        state.loading = true
+        const _pa = {
+            ...queryForm,
+            ...props.apiParams,
+        }
+        const { data } = await noticeApi.fetchList(_pa)
+        state.options = data.records ?? []
+        if (props.autoFirst && state.options.length != 0) {
+            state.selectId = state.options[0].id
+        }
+    } finally {
+        setTimeout(() => (state.loading = false), 500)
+    }
+}
+
+function remoteSearch(params: string) {
+    if (params != queryForm.name) {
+        queryForm.name = params
+        getOptions()
+    }
+}
+
+function clear() {
+    state.selectId = null
+    getOptions()
+}
+
+onMounted(() => {
+    props.autoFirst && getOptions()
+})
+</script>

src/components/Upload/qnImages.vue

@@ -0,0 +1,282 @@
+<template>
+    <div class="upload-box">
+        <el-upload v-model:file-list="fileList" list-type="picture-card" multiple :accept="fileType.join(',')"
+            :class="['upload', 'no-border', self_disabled ? 'disabled' : '']" :drag="true" :disabled="self_disabled"
+            :before-upload="beforeUpload" :on-preview="handlePictureCardPreview" :on-error="uploadError"
+            :on-remove="handleRemove" :on-success="uploadSuccess" :http-request="handleHttpUpload">
+            <el-icon>
+                <Plus />
+            </el-icon>
+        </el-upload>
+
+        <el-dialog v-model="dialogVisible">
+            <img class="m-auto" w-full :src="dialogImageUrl" alt="Preview Image" />
+        </el-dialog>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { ref, watch } from "vue"
+import { Plus } from "@element-plus/icons-vue"
+import { ElUpload, ElDialog, UploadRequestOptions, ElNotification, UploadFile, UploadProps, formContextKey } from "element-plus"
+import request from "/@/utils/request"
+
+interface UploadFileProps {
+    disabled?: boolean
+    fileType?: string[]
+    fileSize?: number
+    height?: string
+    width?: string
+    borderRadius?: string
+}
+const props = withDefaults(defineProps<UploadFileProps>(), {
+    disabled: false,
+    fileType: () => ["image/jpeg", "image/png", "image/gif"],
+    fileSize: 5,
+    height: "150px",
+    width: "150px",
+    borderRadius: "8px",
+})
+
+const imageUrls = defineModel("modelValue", { default: "" })
+
+const imageBaseUrl = import.meta.env.VITE_IMAGE_BASE_PATH
+const dialogVisible = ref(false)
+const fileList = ref<any>([])
+const dialogImageUrl = ref("")
+// 获取 el-form 组件上下文
+const formContext = inject(formContextKey, void 0)
+
+// 自定义上传方法
+const handleHttpUpload = async (options: UploadRequestOptions) => {
+    let formData = new FormData()
+    formData.append("file", options.file)
+    try {
+        const res = await request({
+            url: "/admin/sys-file/qn/upload",
+            method: "post",
+            headers: {
+                "Content-Type": "multipart/form-data",
+            },
+            data: formData,
+        })
+        if (res.code == 0) {
+            return res
+        }
+    } catch (error) {
+        options.onError(error as any)
+    }
+}
+
+/**
+ * @description 文件上传之前判断
+ * @param rawFile 选择的文件
+ * */
+const beforeUpload: UploadProps["beforeUpload"] = (rawFile) => {
+    const imgSize = rawFile.size / 1024 / 1024 < props.fileSize
+    const imgType = props.fileType.includes(rawFile.type)
+    if (!imgType)
+        ElNotification({
+            title: "温馨提示",
+            message: "上传图片不符合所需的格式！",
+            type: "warning",
+        })
+    if (!imgSize)
+        setTimeout(() => {
+            ElNotification({
+                title: "温馨提示",
+                message: `上传图片大小不能超过 ${props.fileSize}M！`,
+                type: "warning",
+            })
+        }, 0)
+    return imgType && imgSize
+}
+
+/**
+ * @description 图片上传成功
+ * */
+const uploadSuccess = (response: any, uploadFile: UploadFile, uploadFiles: any) => {
+    console.log("success", uploadFiles)
+
+    const urls = uploadFiles
+        .map((item: any) => {
+            // 处理新上传和已有的图片URL
+            return item.response ? item.response.data.url : item.fileUrl
+        })
+        .filter(Boolean)
+        .join(",")
+    imageUrls.value = urls
+
+    console.log("fileList.value", fileList.value)
+    console.log("urls", urls)
+
+    ElNotification({
+        title: "温馨提示",
+        message: "图片上传成功！",
+        type: "success",
+    })
+}
+
+// 预览
+const handlePictureCardPreview = (uploadFile: any) => {
+    dialogImageUrl.value = uploadFile.url
+    dialogVisible.value = true
+}
+
+// 移除
+const handleRemove = (uploadFile: any, uploadFiles: any[]) => {
+    const urls = uploadFiles
+        .map((item) => {
+            return item.response ? item.response.data.url : item.fileUrl
+        })
+        .filter(Boolean)
+        .join(",")
+    imageUrls.value = urls
+}
+
+/**
+ * @description 图片上传错误
+ * */
+const uploadError = () => {
+    ElNotification({
+        title: "温馨提示",
+        message: "图片上传失败，请您重新上传！",
+        type: "error",
+    })
+}
+
+// 判断是否禁用上传和删除
+const self_disabled = computed(() => {
+    return props.disabled || formContext?.disabled
+})
+
+watch(
+    () => imageUrls.value,
+    (newValue) => {
+        if (!newValue || Object.prototype.toString.call(newValue) !== "[object String]") {
+            fileList.value = []
+            return
+        }
+
+        if (!newValue.match(/x-oss-process/g)) {
+            fileList.value = newValue
+                .split(",")
+                .map((item: string) => {
+                    const url = item.startsWith("http") ? item : imageBaseUrl + item
+                    return {
+                        name: item.split("/").pop() || "",
+                        url: url,
+                        fileUrl: item,
+                    }
+                })
+                .filter((item) => item.url)
+
+            console.log("fileList.value", fileList.value)
+        } else {
+            fileList.value = newValue
+                .split("?")
+                .filter(
+                    (item) =>
+                        item.endsWith(".jpg") || item.endsWith(".png") || item.endsWith(".gif") || item.endsWith(".jpeg") || item.endsWith(".webp"),
+                )
+                .map((item: string) => {
+                    const url = item.startsWith("http") ? item : imageBaseUrl + item
+                    return {
+                        name: item.split("/").pop() || "",
+                        url: url,
+                        fileUrl: item,
+                    }
+                })
+                .filter((item) => item.url)
+
+            console.log("fileList.value", fileList.value)
+        }
+    },
+    { immediate: true },
+)
+</script>
+
+<style scoped lang="scss">
+.is-error {
+    .upload {
+
+        :deep(.el-upload),
+        :deep(.el-upload-dragger) {
+            border: 1px dashed var(--el-color-danger) !important;
+
+            &:hover {
+                border-color: var(--el-color-primary) !important;
+            }
+        }
+    }
+}
+
+:deep(.disabled) {
+
+    .el-upload,
+    .el-upload-dragger {
+        cursor: not-allowed !important;
+        background: var(--el-disabled-bg-color);
+        border: 1px dashed var(--el-border-color-darker) !important;
+
+        &:hover {
+            border: 1px dashed var(--el-border-color-darker) !important;
+        }
+    }
+}
+
+.upload-box {
+    overflow: hidden;
+
+    .no-border {
+        :deep(.el-upload) {
+            border: none !important;
+        }
+    }
+
+    :deep(.upload) {
+        .el-upload {
+            position: relative;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            width: v-bind(width);
+            height: v-bind(height);
+            overflow: hidden;
+            border: 1px dashed var(--el-border-color-darker);
+            border-radius: v-bind(borderRadius);
+            transition: var(--el-transition-duration-fast);
+
+            &:hover {
+                border-color: var(--el-color-primary);
+
+                .upload-handle {
+                    opacity: 1;
+                }
+            }
+
+            .el-upload-dragger {
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                width: 100%;
+                height: 100%;
+                padding: 0;
+                overflow: hidden;
+                background-color: transparent;
+                border: 1px dashed var(--el-border-color-darker);
+                border-radius: v-bind(borderRadius);
+
+                &:hover {
+                    border: 1px dashed var(--el-color-primary);
+                }
+            }
+
+            .el-upload-dragger.is-dragover {
+                background-color: var(--el-color-primary-light-9);
+                border: 2px dashed var(--el-color-primary) !important;
+            }
+        }
+    }
+}
+</style>

src/components/index.ts

@@ -6,6 +6,8 @@ import UploadExcel from "/@/components/Upload/Excel.vue"
 import UploadFile from "/@/components/Upload/index.vue"
 import UploadImg from "/@/components/Upload/Image.vue"
 import UploadImgs from "/@/components/Upload/Images.vue"
+import UploadQnImgs from "/@/components/Upload/qnImages.vue"
+
 import DelWrap from "/@/components/DelWrap/index.vue"
 import Editor from "/@/components/Editor/index.vue"
 import Tip from "/@/components/Tip/index.vue"
@@ -36,6 +38,8 @@ import SelectCabinet from "/@/components/Select/SelectCabinet.vue"
 import SelectMchCatory from "/@/components/Select/SelectMchCatory.vue"
 import SelectCanteenSupplier from "/@/components/Select/SelectCanteenSupplier.vue"
 import SelectWalletInvoice from "/@/components/Select/SelectWalletInvoice.vue"
+import SelectNotice from "/@/components/Select/SelectNotice.vue"
+import SelectAct from "/@/components/Select/SelectAct.vue"
 // 地图组件
 import MapSelect from "/@/components/map/map-select.vue"
 
@@ -67,6 +71,7 @@ export default {
 		app.component("UploadFile", UploadFile)
 		app.component("UploadImg", UploadImg)
 		app.component("UploadImgs", UploadImgs)
+		app.component("UploadQnImgs", UploadQnImgs)
 		app.component("Editor", Editor)
 		app.component("Tip", Tip)
 		app.component("DelWrap", DelWrap)
@@ -95,6 +100,8 @@ export default {
 		app.component("SelectCabinet", SelectCabinet)
 		app.component("SelectCanteenSupplier", SelectCanteenSupplier)
 		app.component("SelectWalletInvoice", SelectWalletInvoice)
+		app.component("SelectNotice", SelectNotice)
+		app.component("SelectAct", SelectAct)
 
 		app.component("MapSelect", MapSelect)
 

src/layout/navBars/breadcrumb/user.vue

@@ -50,7 +50,7 @@
 				<template #default>
 					<div>联系热线：</div>
 					<div>15657370065</div>
-					<div>18837698126</div>
+					<div>18367908152</div>
 				</template>
 			</el-popover>
 		</div>

src/views/act/act-cancel/form.vue

@@ -0,0 +1,174 @@
+<template>
+	<el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
+		<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
+			<el-row :gutter="24">
+				<el-col :span="24" class="mb20">
+					<el-form-item label="活动商户" prop="mchId">
+						<select-mch v-model="form.mchId" />
+					</el-form-item>
+				</el-col>
+
+				<el-col :span="24" class="mb20">
+					<el-form-item label="活动公告" prop="noticeId">
+						<select-notice v-model="form.noticeId" />
+					</el-form-item>
+				</el-col>
+
+				<el-col :span="12" class="mb20">
+					<el-form-item label="原价" prop="activeOrgPrice">
+						<el-input-number v-model="form.activeOrgPrice" placeholder="请输入原价" />
+					</el-form-item>
+				</el-col>
+
+				<el-col :span="12" class="mb20">
+					<el-form-item label="活动价" prop="activeCancelPrice">
+						<el-input-number v-model="form.activeCancelPrice" placeholder="活动价" />
+					</el-form-item>
+				</el-col>
+
+				<el-col :span="12" class="mb20">
+					<el-form-item label="开始时间" prop="startTime">
+						<el-date-picker value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="请选择开始时间" v-model="form.startTime" />
+					</el-form-item>
+				</el-col>
+
+				<el-col :span="12" class="mb20">
+					<el-form-item label="到期时间" prop="expireTime">
+						<el-date-picker value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="请选择到期时间" v-model="form.expireTime" />
+					</el-form-item>
+				</el-col>
+
+				<el-col v-if="false" :span="24" class="mb20">
+					<el-form-item label="活动状态" prop="actStatus">
+						<dict-select v-model="form.actStatus" dict-code="act_status" />
+					</el-form-item>
+				</el-col>
+
+				<el-col :span="24" class="mb20">
+					<el-form-item label="活动标题" prop="actTitle">
+						<el-input v-model="form.actTitle" placeholder="请输入活动标题" />
+					</el-form-item>
+				</el-col>
+
+				<el-col :span="24" class="mb20">
+					<el-form-item label="活动内容" prop="actContent">
+						<editor v-if="visible" v-model:get-html="form.actContent" placeholder="请输入活动内容"></editor>
+					</el-form-item>
+				</el-col>
+			</el-row>
+		</el-form>
+		<template #footer>
+			<span class="dialog-footer">
+				<el-button @click="visible = false">取消</el-button>
+				<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+			</span>
+		</template>
+	</el-dialog>
+</template>
+
+<script setup lang="ts" name="ActCancelDialog">
+import { useDict } from "/@/hooks/dict"
+import { useMessage } from "/@/hooks/message"
+import * as actCancelApi from "/@/api/act/actCancel"
+import { rule } from "/@/utils/validate"
+import { storePrice, displayPrice } from "/@/utils/formatMoney"
+
+const emit = defineEmits(["refresh"])
+
+// 定义变量内容
+const dataFormRef = ref()
+const visible = ref(false)
+const loading = ref(false)
+// 定义字典
+
+// 提交表单数据
+const form = reactive({
+	id: "",
+	mchId: "",
+	noticeId: "",
+	activeOrgPrice: "",
+	activeCancelPrice: "",
+	startTime: "",
+	expireTime: "",
+	actStatus: "",
+	actTitle: "",
+	actContent: "",
+})
+
+// 定义校验规则
+const dataRules = ref({
+	mchId: [{ required: true, message: "活动商户不能为空", trigger: "change" }],
+	noticeId: [{ required: true, message: "活动公告不能为空", trigger: "change" }],
+	activeCancelPrice: [{ required: true, message: "活动价不能为空", trigger: "blur" }],
+	startTime: [{ required: true, message: "到期时间不能为空", trigger: "change" }],
+	expireTime: [{ required: true, message: "到期时间不能为空", trigger: "change" }],
+	actTitle: [{ required: true, message: "活动标题不能为空", trigger: "blur" }],
+})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+	visible.value = true
+	form.id = ""
+
+	// 重置表单数据
+	nextTick(() => {
+		dataFormRef.value?.resetFields()
+	})
+
+	// 获取actCancel信息
+	if (id) {
+		form.id = id
+		getactCancelData(id)
+	}
+}
+
+// 提交
+const onSubmit = async () => {
+	const valid = await dataFormRef.value.validate().catch(() => {})
+	if (!valid) return false
+
+	try {
+		loading.value = true
+		const pa = {
+			...form,
+			activeOrgPrice: storePrice(form.activeOrgPrice),
+			activeCancelPrice: storePrice(form.activeCancelPrice),
+		}
+		form.id ? await actCancelApi.putObj(pa) : await actCancelApi.addObj(pa)
+		useMessage().success(form.id ? "修改成功" : "添加成功")
+		visible.value = false
+		emit("refresh")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	} finally {
+		loading.value = false
+	}
+}
+
+// 初始化表单数据
+const getactCancelData = (id: string) => {
+	// 获取数据
+	loading.value = true
+	actCancelApi
+		.getObj(id)
+		.then((res: any) => {
+			if (res.data) {
+				if (res.data.activeOrgPrice) {
+					res.data.activeOrgPrice = displayPrice(res.data.activeOrgPrice, "")
+				}
+				if (res.data.activeCancelPrice) {
+					res.data.activeCancelPrice = displayPrice(res.data.activeCancelPrice, "")
+				}
+			}
+			Object.assign(form, res.data)
+		})
+		.finally(() => {
+			loading.value = false
+		})
+}
+
+// 暴露变量
+defineExpose({
+	openDialog,
+})
+</script>

src/views/act/act-cancel/index.vue

@@ -0,0 +1,197 @@
+<template>
+	<div class="layout-padding">
+		<div class="layout-padding-auto layout-padding-view">
+			<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+				<el-row>
+					<el-form-item style="width: 300px" label="活动标题" prop="actTitle">
+						<el-input v-model="state.queryForm.actTitle" placeholder="请输入活动标题" />
+					</el-form-item>
+					<el-form-item style="width: 300px" label="活动商户" prop="mchId">
+						<select-mch v-model="state.queryForm.mchId" />
+					</el-form-item>
+					<el-form-item style="width: 300px" label="活动状态" prop="actStatus">
+						<dict-select v-model="state.queryForm.actStatus" dict-code="act_status" />
+					</el-form-item>
+					<el-form-item>
+						<el-button icon="Search" type="primary" @click="getDataList">
+							{{ $t("common.queryBtn") }}
+						</el-button>
+						<el-button icon="Refresh" @click="resetQuery">
+							{{ $t("common.resetBtn") }}
+						</el-button>
+					</el-form-item>
+				</el-row>
+			</el-form>
+			<el-row>
+				<div class="mb8" style="width: 100%">
+					<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" v-auth="'wallet_actCancel_add'">
+						新 增
+					</el-button>
+					<el-button
+						plain
+						:disabled="multiple"
+						icon="Delete"
+						type="primary"
+						v-auth="'wallet_actCancel_del'"
+						@click="handleDelete(selectObjs)"
+					>
+						删除
+					</el-button>
+					<right-toolbar
+						v-model:showSearch="showSearch"
+						:export="'wallet_actCancel_export'"
+						@exportExcel="exportExcel"
+						class="ml10 mr20"
+						style="float: right"
+						@queryTable="getDataList"
+					></right-toolbar>
+				</div>
+			</el-row>
+			<el-table
+				:data="state.dataList"
+				v-loading="state.loading"
+				border
+				:cell-style="tableStyle.cellStyle"
+				:header-cell-style="tableStyle.headerCellStyle"
+				@selection-change="selectionChangHandle"
+				@sort-change="sortChangeHandle"
+			>
+				<el-table-column type="selection" width="40" align="center" />
+				<el-table-column type="index" label="#" width="40" />
+				<el-table-column prop="merchantName" label="活动商户" show-overflow-tooltip />
+				<el-table-column prop="actTitle" label="活动标题" show-overflow-tooltip />
+				<el-table-column prop="expireTime" label="到期时间" show-overflow-tooltip />
+				<el-table-column prop="actStatus" label="活动状态" show-overflow-tooltip>
+					<template #default="{ row }">
+						<dict-tag :options="act_status" :value="row.actStatus" />
+					</template>
+				</el-table-column>
+				<el-table-column prop="actStatus" label="活动状态" min-width="120" align="center">
+					<template #default="{ row }">
+						<el-switch
+							active-value="1"
+							inactive-value="2"
+							active-text="开启活动"
+							inactive-text="关闭活动"
+							v-model="row.actStatus"
+							@change="updateActStatusChange(row)"
+						/>
+					</template>
+				</el-table-column>
+				<el-table-column prop="actStatus" label="预约总数" show-overflow-tooltip>
+					<template #default="{ row }">
+						<span>{{ row.countVo?.totalCount ?? 0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column prop="actStatus" label="核销总数" show-overflow-tooltip>
+					<template #default="{ row }">
+						<span>{{ row.countVo?.cancelCount ?? 0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column prop="actStatus" label="未核销总数" show-overflow-tooltip>
+					<template #default="{ row }">
+						<span>{{ row.countVo?.cancelAwaitCount ?? 0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="操作" width="150">
+					<template #default="{ row }">
+						<el-button icon="edit-pen" text type="primary" v-auth="'wallet_actCancel_edit'" @click="formDialogRef.openDialog(row.id)">
+							编辑
+						</el-button>
+						<el-button icon="delete" text type="primary" v-auth="'wallet_actCancel_del'" @click="handleDelete([row.id])"> 删除 </el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+		</div>
+
+		<!-- 编辑、新增  -->
+		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+	</div>
+</template>
+
+<script setup lang="ts" name="systemActCancel">
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import * as actCancelApi from "/@/api/act/actCancel"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useDict } from "/@/hooks/dict"
+
+// 引入组件
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
+// 定义查询字典
+const { act_status } = useDict("act_status")
+// 定义变量内容
+const formDialogRef = ref()
+// 搜索变量
+const queryRef = ref()
+const showSearch = ref(true)
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+	queryForm: {},
+	pageList: actCancelApi.fetchList,
+})
+
+//  table hook
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	getDataList()
+}
+
+// 导出excel
+const exportExcel = () => {
+	downBlobFile("/wallet/actCancel/export", Object.assign(state.queryForm, { ids: selectObjs }), "actCancel.xlsx")
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
+
+// 修改是否在正元显示
+const isSyncZyChange = async (row: any) => {
+	try {
+		await mchManangeApi.putObj(row)
+		getDataList()
+		useMessage().success("操作成功")
+	} catch (e) {
+		useMessage().error("操作错误")
+	}
+}
+
+// 删除操作
+const handleDelete = async (ids: string[]) => {
+	try {
+		await useMessageBox().confirm("此操作将永久删除")
+	} catch {
+		return
+	}
+
+	try {
+		await actCancelApi.delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
+}
+
+const updateActStatusChange = async (row: any) => {
+	try {
+		await actCancelApi.putObj(row)
+		getDataList()
+		useMessage().success("操作成功")
+	} catch (e) {
+		useMessage().error("操作错误")
+	}
+}
+</script>

src/views/act/cancel-item/index.vue

@@ -1,66 +1,82 @@
 <template>
-  <div class="layout-padding">
-    <div class="layout-padding-auto layout-padding-view">
-      <el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
-        <el-row>
-          <el-form-item style="width: 300px" label="领取人用户" prop="receiverUserId">
-            <select-user v-model="state.queryForm.receiverUserId" />
-          </el-form-item>
-          <el-form-item style="width: 300px" label="核销状态" prop="actStatus">
-            <dict-select v-model="state.queryForm.actStatus" dict-code="act_cancel_status" />
-          </el-form-item>
-          <el-form-item>
-            <el-button icon="Search" type="primary" @click="getDataList">
-              {{ $t("common.queryBtn") }}
-            </el-button>
-            <el-button icon="Refresh" @click="resetQuery">
-              {{ $t("common.resetBtn") }}
-            </el-button>
-          </el-form-item>
-        </el-row>
-      </el-form>
-      <el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
-        :header-cell-style="tableStyle.headerCellStyle" @selection-change="selectionChangHandle"
-        @sort-change="sortChangeHandle">
-        <el-table-column type="selection" width="40" align="center" />
-        <el-table-column type="index" label="#" width="40" />
-        <el-table-column prop="mchName" label="活动商户" />
-        <el-table-column prop="receiverUsername" label="领取人" />
-        <el-table-column prop="receiverTime" label="领取时间" />
-        <el-table-column prop="actStatus" label="活动状态">
-          <template #default="{ row }">
-            <dict-tag :options="act_cancel_status" :value="row.actStatus" />
-          </template>
-        </el-table-column>
-        <el-table-column prop="cancelUsername" label="核销人" />
-        <el-table-column prop="cancelTime" label="核销时间" />
-        <el-table-column prop="expireTime" label="过期时间" />
-        <el-table-column label="操作" v-if="false" width="150">
-          <template #default="scope">
-            <el-button icon="edit-pen" text type="primary" v-auth="'wallet_actCancelItem_edit'"
-              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
-            <el-button icon="delete" text type="primary" v-auth="'wallet_actCancelItem_del'"
-              @click="handleDelete([scope.row.id])">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
-    </div>
+	<div class="layout-padding">
+		<div class="layout-padding-auto layout-padding-view">
+			<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+				<el-row>
+					<el-form-item style="width: 300px" label="活动" prop="actId">
+						<select-act v-model="state.queryForm.actId" />
+					</el-form-item>
+					<el-form-item style="width: 300px" label="领取人用户" prop="receiverUserId">
+						<select-user v-model="state.queryForm.receiverUserId" />
+					</el-form-item>
+					<el-form-item style="width: 300px" label="核销状态" prop="actStatus">
+						<dict-select v-model="state.queryForm.actStatus" dict-code="act_cancel_status" />
+					</el-form-item>
+					<el-form-item>
+						<el-button icon="Search" type="primary" @click="getDataList">
+							{{ $t("common.queryBtn") }}
+						</el-button>
+						<el-button icon="Refresh" @click="resetQuery">
+							{{ $t("common.resetBtn") }}
+						</el-button>
+					</el-form-item>
+				</el-row>
+			</el-form>
+			<el-table
+				:data="state.dataList"
+				v-loading="state.loading"
+				border
+				:cell-style="tableStyle.cellStyle"
+				:header-cell-style="tableStyle.headerCellStyle"
+				@selection-change="selectionChangHandle"
+				@sort-change="sortChangeHandle"
+			>
+				<el-table-column type="selection" width="40" align="center" />
+				<el-table-column type="index" label="#" width="40" />
+				<el-table-column prop="mchName" label="活动商户" />
+				<el-table-column prop="actTitlel" label="活动标题" show-overflow-tooltip />
+				<el-table-column prop="receiverUsername" label="领取人" />
+				<el-table-column prop="receiverTime" label="领取时间" />
+				<el-table-column prop="actStatus" label="活动状态">
+					<template #default="{ row }">
+						<dict-tag :options="act_cancel_status" :value="row.actStatus" />
+					</template>
+				</el-table-column>
+				<el-table-column prop="cancelUsername" label="核销人" />
+				<el-table-column prop="cancelTime" label="核销时间" />
+				<el-table-column prop="expireTime" label="过期时间" />
+				<el-table-column label="操作" v-if="false" width="150">
+					<template #default="scope">
+						<el-button
+							icon="edit-pen"
+							text
+							type="primary"
+							v-auth="'wallet_actCancelItem_edit'"
+							@click="formDialogRef.openDialog(scope.row.id)"
+							>编辑</el-button
+						>
+						<el-button icon="delete" text type="primary" v-auth="'wallet_actCancelItem_del'" @click="handleDelete([scope.row.id])"
+							>删除</el-button
+						>
+					</template>
+				</el-table-column>
+			</el-table>
+			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+		</div>
 
-    <!-- 编辑、新增  -->
-    <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
-
-  </div>
+		<!-- 编辑、新增  -->
+		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+	</div>
 </template>
 
 <script setup lang="ts" name="systemActCancelItem">
-import { BasicTableProps, useTable } from "/@/hooks/table";
-import { fetchList, delObjs } from "/@/api/act/act-cancel-item";
-import { useMessage, useMessageBox } from "/@/hooks/message";
-import { useDict } from '/@/hooks/dict';
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { fetchList, delObjs } from "/@/api/act/act-cancel-item"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useDict } from "/@/hooks/dict"
 
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
 // 定义查询字典
 const { act_cancel_status } = useDict("act_cancel_status")
 // 定义变量内容
@@ -73,49 +89,42 @@ const selectObjs = ref([]) as any
 const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
-  queryForm: {},
-  pageList: fetchList
+	queryForm: {},
+	pageList: fetchList,
 })
 
 //  table hook
-const {
-  getDataList,
-  currentChangeHandle,
-  sizeChangeHandle,
-  sortChangeHandle,
-  downBlobFile,
-  tableStyle
-} = useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
-  // 清空搜索条件
-  queryRef.value?.resetFields()
-  // 清空多选
-  selectObjs.value = []
-  getDataList()
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	getDataList()
 }
 
 // 多选事件
 const selectionChangHandle = (objs: { id: string }[]) => {
-  selectObjs.value = objs.map(({ id }) => id);
-  multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
-  try {
-    await useMessageBox().confirm('此操作将永久删除');
-  } catch {
-    return;
-  }
+	try {
+		await useMessageBox().confirm("此操作将永久删除")
+	} catch {
+		return
+	}
 
-  try {
-    await delObjs(ids);
-    getDataList();
-    useMessage().success('删除成功');
-  } catch (err: any) {
-    useMessage().error(err.msg);
-  }
-};
-</script>
+	try {
+		await delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
+}
+</script>

src/views/hard/hard-order/components/admin-refund-dialog/table.vue

@@ -1,139 +1,167 @@
 <template>
-    <div class="refund-table">
-        <el-descriptions :column="1" title="购物车商品">
-            <el-descriptions-item labelClassName="no-colon">
-                <el-table :data="state.dataList" border :cell-style="tableStyle.cellStyle"
-                    :header-cell-style="tableStyle.headerCellStyle" @sort-change="sortChangeHandle" show-summary
-                    :summary-method="getSummaries">
-                    <el-table-column label="商品名" width="120" align="center" prop="productName" />
-                    <el-table-column label="商品图片" width="120" align="center" prop="code">
-                        <template #default="{ row }">
-                            <preview-image v-if="row.productPic" :src="row.productPic" />
-                            <div v-else class="w-[60px] h-[60px]" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column width="120" label="商品类型" align="center" prop="productName">
-                        <template #default="{ row }">
-                            <dict-tag :options="supermarket_nature" :value="row.productNature" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="商品价格" align="center" prop="productPrice">
-                        <template #default="{ row }">
-                            <span>{{ displayPrice(row.productPrice) }}</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="商品数量" align="center" prop="productCount">
-                        <template #default="{ row }">
-                            <span v-if="row.productNature == 1">{{ row.productCount }}</span>
-                            <span v-if="row.productNature == 2">{{ displayWeight(row.productWeight) }}kg</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="商品总额" align="center" prop="totalPrice">
-                        <template #default="{ row }">
-                            <span>{{ displayPrice(row.totalPrice) }}</span>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </el-descriptions-item>
-        </el-descriptions>
+	<div class="refund-table">
+		<el-descriptions :column="1" title="购物车商品">
+			<el-descriptions-item labelClassName="no-colon">
+				<el-table
+					:data="state.dataList"
+					border
+					:cell-style="tableStyle.cellStyle"
+					:header-cell-style="tableStyle.headerCellStyle"
+					@sort-change="sortChangeHandle"
+					show-summary
+					:summary-method="getSummaries"
+				>
+					<el-table-column label="商品名" width="120" align="center" prop="productName" />
+					<el-table-column label="商品图片" width="120" align="center" prop="code">
+						<template #default="{ row }">
+							<preview-image v-if="row.productPic" :src="row.productPic" />
+							<div v-else class="w-[60px] h-[60px]" />
+						</template>
+					</el-table-column>
+					<el-table-column width="120" label="商品类型" align="center" prop="productName">
+						<template #default="{ row }">
+							<dict-tag :options="supermarket_nature" :value="row.productNature" />
+						</template>
+					</el-table-column>
+					<el-table-column label="商品价格" align="center" prop="productPrice">
+						<template #default="{ row }">
+							<span>{{ displayPrice(row.productPrice) }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="商品数量" align="center" prop="productCount">
+						<template #default="{ row }">
+							<span v-if="row.productNature == 1">{{ row.productCount }}</span>
+							<span v-if="row.productNature == 2">{{ displayWeight(row.productWeight) }}kg</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="商品总额" align="center" prop="totalPrice">
+						<template #default="{ row }">
+							<span>{{ displayPrice(row.totalPrice) }}</span>
+						</template>
+					</el-table-column>
+				</el-table>
+			</el-descriptions-item>
+		</el-descriptions>
 
-        <el-descriptions :column="1" title="已退款商品">
-            <el-descriptions-item labelClassName="no-colon">
-                <el-table :data="refundSuccessList" border :cell-style="tableStyle.cellStyle"
-                    :header-cell-style="tableStyle.headerCellStyle" @sort-change="sortChangeHandle" show-summary
-                    :summary-method="getSummaries">
-                    <el-table-column label="商品名" width="120" align="center" prop="productName" />
-                    <el-table-column label="商品图片" width="120" align="center" prop="code">
-                        <template #default="{ row }">
-                            <preview-image v-if="row.productPic" :src="row.productPic" />
-                            <div v-else class="w-[60px] h-[60px]" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="商品类型" width="120" align="center" prop="productName">
-                        <template #default="{ row }">
-                            <dict-tag :options="supermarket_nature" :value="row.productNature" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="商品价格" align="center" prop="productPrice">
-                        <template #default="{ row }">
-                            <span>{{ displayPrice(row.productPrice) }}</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="已退款商品数量" align="center" prop="productCount">
-                        <template #default="{ row }">
-                            <span v-if="row.productNature == 1">{{ row.productCount }}</span>
-                            <span v-if="row.productNature == 2">{{ displayWeight(row.productWeight) }}kg</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="已退款商品总额" align="center" prop="totalPrice">
-                        <template #default="{ row }">
-                            <span>{{ displayPrice(row.totalPrice) }}</span>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </el-descriptions-item>
-        </el-descriptions>
+		<el-descriptions :column="1" title="已退款商品">
+			<el-descriptions-item labelClassName="no-colon">
+				<el-table
+					:data="refundSuccessList"
+					border
+					:cell-style="tableStyle.cellStyle"
+					:header-cell-style="tableStyle.headerCellStyle"
+					@sort-change="sortChangeHandle"
+					show-summary
+					:summary-method="getSummaries"
+				>
+					<el-table-column label="商品名" width="120" align="center" prop="productName" />
+					<el-table-column label="商品图片" width="120" align="center" prop="code">
+						<template #default="{ row }">
+							<preview-image v-if="row.productPic" :src="row.productPic" />
+							<div v-else class="w-[60px] h-[60px]" />
+						</template>
+					</el-table-column>
+					<el-table-column label="商品类型" width="120" align="center" prop="productName">
+						<template #default="{ row }">
+							<dict-tag :options="supermarket_nature" :value="row.productNature" />
+						</template>
+					</el-table-column>
+					<el-table-column label="商品价格" align="center" prop="productPrice">
+						<template #default="{ row }">
+							<span>{{ displayPrice(row.productPrice) }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="已退款商品数量" align="center" prop="productCount">
+						<template #default="{ row }">
+							<span v-if="row.productNature == 1">{{ row.productCount }}</span>
+							<span v-if="row.productNature == 2">{{ displayWeight(row.productWeight) }}kg</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="已退款商品总额" align="center" prop="totalPrice">
+						<template #default="{ row }">
+							<span>{{ displayPrice(row.totalPrice) }}</span>
+						</template>
+					</el-table-column>
+				</el-table>
+			</el-descriptions-item>
+		</el-descriptions>
 
-        <el-descriptions :column="1" title="退款商品">
-            <template #extra>
-                <el-button type="primary" text @click="handleAllRefund">全部退款</el-button>
-            </template>
-            <el-descriptions-item labelClassName="no-colon">
-                <el-table :data="disposeDataList" border :cell-style="tableStyle.cellStyle"
-                    :header-cell-style="tableStyle.headerCellStyle" @sort-change="sortChangeHandle" show-summary
-                    :summary-method="getSummaries">
-                    <el-table-column label="商品名" width="120" align="center" prop="productName" />
-                    <el-table-column label="商品图片" width="120" align="center" prop="code">
-                        <template #default="{ row }">
-                            <preview-image v-if="row.productPic" :src="row.productPic" />
-                            <div v-else class="w-[60px] h-[60px]" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="商品类型" width="120" align="center" prop="productName">
-                        <template #default="{ row }">
-                            <dict-tag :options="supermarket_nature" :value="row.productNature" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="商品价格" align="center" prop="productPrice">
-                        <template #default="{ row }">
-                            <span>{{ displayPrice(row.productPrice) }}</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="退款商品数量" align="center" prop="refundProductCount">
-                        <template #default="{ row }">
-                            <div class="w-full h-full">
-                                <!-- start 重量商品 start -->
-                                <el-input-number size="small" v-if="row.productNature == 2"
-                                    v-model="row.refundProductWeight" :min="0" :max="row.maxRefundProductWeight"
-                                    :step="0.01" @change="handleRefundProductCount($event, row)" />
-                                <!-- end 重量商品 end -->
+		<el-descriptions :column="1" title="退款商品">
+			<template #extra>
+				<el-button type="primary" text @click="handleAllRefund">全部退款</el-button>
+			</template>
+			<el-descriptions-item labelClassName="no-colon">
+				<el-table
+					:data="disposeDataList"
+					border
+					:cell-style="tableStyle.cellStyle"
+					:header-cell-style="tableStyle.headerCellStyle"
+					@sort-change="sortChangeHandle"
+					show-summary
+					:summary-method="getSummaries"
+				>
+					<el-table-column label="商品名" width="120" align="center" prop="productName" />
+					<el-table-column label="商品图片" width="120" align="center" prop="code">
+						<template #default="{ row }">
+							<preview-image v-if="row.productPic" :src="row.productPic" />
+							<div v-else class="w-[60px] h-[60px]" />
+						</template>
+					</el-table-column>
+					<el-table-column label="商品类型" width="120" align="center" prop="productName">
+						<template #default="{ row }">
+							<dict-tag :options="supermarket_nature" :value="row.productNature" />
+						</template>
+					</el-table-column>
+					<el-table-column label="商品价格" align="center" prop="productPrice">
+						<template #default="{ row }">
+							<span>{{ displayPrice(row.productPrice) }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="退款商品数量" align="center" prop="refundProductCount">
+						<template #default="{ row }">
+							<div class="w-full h-full">
+								<!-- start 重量商品 start -->
+								<el-input-number
+									size="small"
+									v-if="row.productNature == 2"
+									v-model="row.refundProductWeight"
+									:min="0"
+									:max="row.maxRefundProductWeight"
+									:step="0.01"
+									@change="handleRefundProductCount($event, row)"
+								/>
+								<!-- end 重量商品 end -->
 
-                                <!-- start 数量商品 start -->
-                                <el-input-number size="small" v-else v-model="row.refundProductCount" :min="0"
-                                    :max="row.maxRefundProductCount" @change="handleRefundProductCount($event, row)" />
-                                <!-- end 数量商品 end -->
-                                <div class="h-4">
-                                    <div v-if="row.productNature == 1 && row.refundProductCount >= row.maxRefundProductCount"
-                                        class="color-danger text-xs">
-                                        该商品已全部退款
-                                    </div>
-                                    <div v-if="row.productNature == 2 && row.refundProductWeight >= row.maxRefundProductWeight"
-                                        class="color-danger text-xs">
-                                        该商品已全部退款
-                                    </div>
-                                </div>
-                            </div>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="退款商品总额" align="center" prop="refundTotalPrice">
-                        <template #default="{ row }">
-                            <span>{{ displayPrice(row.refundTotalPrice) }}</span>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </el-descriptions-item>
-        </el-descriptions>
-    </div>
+								<!-- start 数量商品 start -->
+								<el-input-number
+									size="small"
+									v-else
+									v-model="row.refundProductCount"
+									:min="0"
+									:max="row.maxRefundProductCount"
+									@change="handleRefundProductCount($event, row)"
+								/>
+								<!-- end 数量商品 end -->
+								<div class="h-4">
+									<div v-if="row.productNature == 1 && row.refundProductCount >= row.maxRefundProductCount" class="color-danger text-xs">
+										该商品已全部退款
+									</div>
+									<div v-if="row.productNature == 2 && row.refundProductWeight >= row.maxRefundProductWeight" class="color-danger text-xs">
+										该商品已全部退款
+									</div>
+								</div>
+							</div>
+						</template>
+					</el-table-column>
+					<el-table-column label="退款商品总额" align="center" prop="refundTotalPrice">
+						<template #default="{ row }">
+							<span>{{ displayPrice(row.refundTotalPrice) }}</span>
+						</template>
+					</el-table-column>
+				</el-table>
+			</el-descriptions-item>
+		</el-descriptions>
+	</div>
 </template>
 
 <script setup lang="ts" name="RefundTable">
@@ -146,9 +174,9 @@ import { displayPrice, displayWeight } from "/@/utils/formatMoney"
 import * as hardCar from "/@/api/hard/hard-car"
 
 const state: BasicTableProps = reactive<BasicTableProps>({
-    createdIsNeed: false,
-    queryForm: {},
-    pageList: hardCar.getCarByOrderId,
+	createdIsNeed: false,
+	queryForm: {},
+	pageList: hardCar.getCarByOrderId,
 })
 
 const refundSuccessList = ref<any>([])
@@ -160,165 +188,170 @@ const { supermarket_nature } = useDict("supermarket_nature")
 const { getDataList, sortChangeHandle, tableStyle } = useTable(state)
 
 const getCarList = async (orderId: string) => {
-    state.queryForm.orderId = orderId
-    try {
-        // 获取订单商品列表
-        await getDataList()
-        if (!state.dataList || !state.dataList.length) {
-            return
-        }
-        // 获取已退款的商品
-        const { data } = await hardCar.refundCar({ orderId })
-        if (!data || !data.length) {
-            disposeDataList.value = state.dataList.map((item) => {
-                if (!item) return null
-                return {
-                    ...item,
-                    refundProductCount: 0,
-                    maxRefundProductCount: item.productCount,
-                    refundProductWeight: 0,
-                    maxRefundProductWeight: displayWeight(item.productWeight),
-                    refundTotalPrice: 0,
-                }
-            }).filter(Boolean)
-            return
-        }
-        refundSuccessList.value = data
-        // 计算出需要退款的商品
-        const refundViewList = [...state.dataList]
-        disposeDataList.value = refundViewList.map((item) => {
-            if (!item) return null
-            const target = data.find((v: any) => v.productId == item.productId)
-            return {
-                ...item,
-                refundProductCount: 0,
-                maxRefundProductCount: item.productCount - (target?.productCount ?? 0),
-                refundProductWeight: 0,
-                maxRefundProductWeight: displayWeight(item.productWeight - (target?.productWeight ?? 0)),
-                refundTotalPrice: 0,
-            }
-        }).filter(Boolean)
-    } catch (error: any) {
-        state.dataList = []
-        disposeDataList.value = []
-        refundSuccessList.value = []
-    }
+	state.queryForm.orderId = orderId
+	try {
+		// 获取订单商品列表
+		await getDataList()
+		console.log(state.dataList?.length, "state.dataList")
 
+		if (!state.dataList || !state.dataList.length) {
+			return
+		}
+		// 获取已退款的商品
+		const { data } = await hardCar.refundCar({ orderId })
+		if (!data || !data.length) {
+			disposeDataList.value = state.dataList
+				.map((item) => {
+					if (!item) return null
+					return {
+						...item,
+						refundProductCount: 0,
+						maxRefundProductCount: item.productCount,
+						refundProductWeight: 0,
+						maxRefundProductWeight: displayWeight(item.productWeight ?? 0),
+						refundTotalPrice: 0,
+					}
+				})
+				.filter(Boolean)
+			return
+		}
+		refundSuccessList.value = data
+		// 计算出需要退款的商品
+		const refundViewList = [...state.dataList]
+		disposeDataList.value = refundViewList
+			.map((item) => {
+				if (!item) return null
+				const target = data.find((v: any) => v.productId == item.productId)
+				return {
+					...item,
+					refundProductCount: 0,
+					maxRefundProductCount: item.productCount - (target?.productCount ?? 0),
+					refundProductWeight: 0,
+					maxRefundProductWeight: displayWeight(item.productWeight - (target?.productWeight ?? 0)),
+					refundTotalPrice: 0,
+				}
+			})
+			.filter(Boolean)
+	} catch (error: any) {
+		console.log(error)
+		state.dataList = []
+		disposeDataList.value = []
+		refundSuccessList.value = []
+	}
 }
 
 const handleRefundProductCount = (value: any, row: any) => {
-    const target = disposeDataList.value.find((item: any) => item.id == row.id)
-    if (!target) return
-    const { productPrice } = target
-    target.refundTotalPrice = productPrice * value
+	const target = disposeDataList.value.find((item: any) => item.id == row.id)
+	if (!target) return
+	const { productPrice } = target
+	target.refundTotalPrice = productPrice * value
 }
 
 // 全部退款
 const handleAllRefund = () => {
-    if (!state.dataList || !state.dataList.length) return
-    const _list = [...disposeDataList.value]
-    for (const v of _list) {
-        const target = state.dataList.find((item: any) => item.id == v.id)
-        if (!target) continue
-        v.refundProductCount = target.productCount
-        v.refundProductWeight = displayWeight(target.productWeight)
-        v.refundTotalPrice = target.totalPrice
-
-    }
-    disposeDataList.value = _list
+	if (!state.dataList || !state.dataList.length) return
+	const _list = [...disposeDataList.value]
+	for (const v of _list) {
+		const target = state.dataList.find((item: any) => item.id == v.id)
+		if (!target) continue
+		v.refundProductCount = target.productCount
+		v.refundProductWeight = displayWeight(target.productWeight)
+		v.refundTotalPrice = target.totalPrice
+	}
+	disposeDataList.value = _list
 }
 
 const getSummaries = (param: any) => {
-    const { columns, data } = param
-    const totalColumns = ["totalPrice", "totalPrice", "refundTotalPrice"]
-    const totalRow = Array.from({ length: columns.length }, () => "")
-    totalRow[0] = "合计"
-    columns.forEach((i: any, index: number) => {
-        if (totalColumns.includes(i.property)) {
-            const total = data
-                .filter((v: any) => v[i.property] != null)
-                .map((v: any) => Number(v[i.property]))
-                .reduce((pren: number, next: number) => pren + next, 0)
-            if (i.property.includes("Price")) {
-                totalRow[index] = displayPrice(total)
-            } else {
-                totalRow[index] = total
-            }
-        }
-    })
-    return totalRow
+	const { columns, data } = param
+	const totalColumns = ["totalPrice", "totalPrice", "refundTotalPrice"]
+	const totalRow = Array.from({ length: columns.length }, () => "")
+	totalRow[0] = "合计"
+	columns.forEach((i: any, index: number) => {
+		if (totalColumns.includes(i.property)) {
+			const total = data
+				.filter((v: any) => v[i.property] != null)
+				.map((v: any) => Number(v[i.property]))
+				.reduce((pren: number, next: number) => pren + next, 0)
+			if (i.property.includes("Price")) {
+				totalRow[index] = displayPrice(total)
+			} else {
+				totalRow[index] = total
+			}
+		}
+	})
+	return totalRow
 }
 
 // 提交
 const validate = async () => {
-    // 如果购物车为空直接返回true
-    if (!state.dataList || !state.dataList.length) {
-        return []
-    }
+	// 如果购物车为空直接返回true
+	if (!state.dataList || !state.dataList.length) {
+		return []
+	}
 
-    let valid = false
-    for (const v of disposeDataList.value) {
-        if (v.refundProductCount > 0 || v.refundProductWeight > 0) {
-            valid = true
-            break
-        }
-    }
-    if (!valid) {
-        useMessage().error("退款商品列表不能为空")
-        return false
-    }
-    // 处理一下
-    return disposeDataList.value.map((item: any) => {
-        return {
-            ...item,
-            productCount: item.refundProductCount,
-            productWeight: displayWeight(item.refundProductWeight),
-            totalPrice: item.refundTotalPrice,
-        }
-    })
+	let valid = false
+	for (const v of disposeDataList.value) {
+		if (v.refundProductCount > 0 || v.refundProductWeight > 0) {
+			valid = true
+			break
+		}
+	}
+	if (!valid) {
+		useMessage().error("退款商品列表不能为空")
+		return false
+	}
+	// 处理一下
+	return disposeDataList.value.map((item: any) => {
+		return {
+			...item,
+			productCount: item.refundProductCount,
+			productWeight: displayWeight(item.refundProductWeight),
+			totalPrice: item.refundTotalPrice,
+		}
+	})
 }
 
 // 暴露变量
 defineExpose({
-    getCarList,
-    validate,
+	getCarList,
+	validate,
 })
 </script>
 
 <style lang="scss" scoped>
 .refund-table {
-    padding: 0 10px;
+	padding: 0 10px;
 }
 
 :deep(.el-descriptions) {
-    &:not(:nth-child(1)) {
-        margin-top: 20px;
-    }
+	&:not(:nth-child(1)) {
+		margin-top: 20px;
+	}
 
-    .el-descriptions__title {
-        display: flex;
-        align-items: center;
+	.el-descriptions__title {
+		display: flex;
+		align-items: center;
 
-        &::before {
-            display: inline-block;
-            width: 3px;
-            height: 20px;
-            margin-right: 10px;
-            background-color: #409eff;
-            content: "";
-        }
-    }
+		&::before {
+			display: inline-block;
+			width: 3px;
+			height: 20px;
+			margin-right: 10px;
+			background-color: #409eff;
+			content: "";
+		}
+	}
 
-    .el-descriptions-item__container {
-        margin: 0 10px;
+	.el-descriptions-item__container {
+		margin: 0 10px;
 
-        .no-colon {
-            margin: 0;
+		.no-colon {
+			margin: 0;
 
-            &::after {
-                content: "";
-            }
-        }
-    }
+			&::after {
+				content: "";
+			}
+		}
+	}
 }
-</style>
+</style>

src/views/hard/hard-spu/form.vue

@@ -1,6 +1,7 @@
 <template>
 	<el-dialog :title="form.id ? '编辑' : '新增'" width="40%" v-model="visible" :close-on-click-modal="false" draggable>
-		<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="120px" v-loading="loading">
+		<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="120px"
+			v-loading="loading">
 			<el-row :gutter="24">
 				<el-col :span="24" class="mb20">
 					<el-form-item label="商品名" prop="name">
@@ -14,12 +15,12 @@
 				</el-col>
 				<el-col :span="24" class="mb20">
 					<el-form-item label="商品封面图片" prop="cover">
-						<upload-imgs v-model="form.cover" :disabled="form.skuType == '0'" />
+						<upload-qn-imgs v-model="form.cover" :disabled="form.skuType == '0'" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="24" class="mb20">
 					<el-form-item label="商品识别图片" prop="pic">
-						<upload-imgs v-model="form.pic" :disabled="form.skuType == '0'" />
+						<upload-qn-imgs v-model="form.pic" :disabled="form.skuType == '0'" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="24" class="mb20">
@@ -149,7 +150,7 @@ const openDialog = (id: string) => {
 
 // 提交
 const onSubmit = async () => {
-	const valid = await dataFormRef.value.validate().catch(() => {})
+	const valid = await dataFormRef.value.validate().catch(() => { })
 	if (!valid) return false
 
 	try {

src/views/integrated/feedback/index.vue

@@ -1,98 +1,120 @@
 <template>
-  <div class="layout-padding">
-    <div class="layout-padding-auto layout-padding-view">
-      <el-row v-show="showSearch">
-        <el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
-      <el-form-item label="标题" prop="title" >
-        <el-input placeholder="请输入标题" v-model="state.queryForm.title" />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-            <el-select v-model="state.queryForm.status" placeholder="请选择状态">
-              <el-option :label="item.label" :value="item.value" v-for="(item, index) in maintenance_status" :key="index"></el-option>
-            </el-select>
-      </el-form-item>
-      <el-form-item label="反馈类型" prop="type">
-            <el-select v-model="state.queryForm.type" placeholder="请选择反馈类型">
-              <el-option :label="item.label" :value="item.value" v-for="(item, index) in feedback_type" :key="index"></el-option>
-            </el-select>
-      </el-form-item>
-          <el-form-item>
-            <el-button icon="search" type="primary" @click="getDataList">
-              查询
-            </el-button>
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-form>
-      </el-row>
-      <el-row>
-        <div class="mb8" style="width: 100%">
-          <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
-            v-auth="'integrated_feedback_add'">
-            新 增
-          </el-button>
-          <el-button plain :disabled="multiple" icon="Delete" type="primary"
-            v-auth="'integrated_feedback_del'" @click="handleDelete(selectObjs)">
-            删除
-          </el-button>
-          <right-toolbar v-model:showSearch="showSearch" :export="'integrated_feedback_export'"
-                @exportExcel="exportExcel" class="ml10 mr20" style="float: right;"
-            @queryTable="getDataList"></right-toolbar>
-        </div>
-      </el-row>
-      <el-table :data="state.dataList" v-loading="state.loading" border
-        :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
+	<div class="layout-padding">
+		<div class="layout-padding-auto layout-padding-view">
+			<el-row v-show="showSearch">
+				<el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
+					<el-form-item label="标题" prop="title">
+						<el-input placeholder="请输入标题" v-model="state.queryForm.title" />
+					</el-form-item>
+					<el-form-item label="状态" prop="status">
+						<el-select v-model="state.queryForm.status" placeholder="请选择状态">
+							<el-option :label="item.label" :value="item.value" v-for="(item, index) in maintenance_status" :key="index"></el-option>
+						</el-select>
+					</el-form-item>
+					<el-form-item label="反馈类型" prop="type">
+						<el-select v-model="state.queryForm.type" placeholder="请选择反馈类型">
+							<el-option :label="item.label" :value="item.value" v-for="(item, index) in feedback_type" :key="index"></el-option>
+						</el-select>
+					</el-form-item>
+					<el-form-item>
+						<el-button icon="search" type="primary" @click="getDataList"> 查询 </el-button>
+						<el-button icon="Refresh" @click="resetQuery">重置</el-button>
+					</el-form-item>
+				</el-form>
+			</el-row>
+			<el-row>
+				<div class="mb8" style="width: 100%">
+					<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" v-auth="'integrated_feedback_add'">
+						新 增
+					</el-button>
+					<el-button
+						plain
+						:disabled="multiple"
+						icon="Delete"
+						type="primary"
+						v-auth="'integrated_feedback_del'"
+						@click="handleDelete(selectObjs)"
+					>
+						删除
+					</el-button>
+					<right-toolbar
+						v-model:showSearch="showSearch"
+						:export="'integrated_feedback_export'"
+						@exportExcel="exportExcel"
+						class="ml10 mr20"
+						style="float: right"
+						@queryTable="getDataList"
+					></right-toolbar>
+				</div>
+			</el-row>
+			<el-table
+				:data="state.dataList"
+				v-loading="state.loading"
+				border
+				:cell-style="tableStyle.cellStyle"
+				:header-cell-style="tableStyle.headerCellStyle"
 				@selection-change="selectionChangHandle"
-        @sort-change="sortChangeHandle">
-        <el-table-column type="selection" width="40" align="center" />
-        <el-table-column type="index" label="#" width="40" />
-          <el-table-column prop="title" label="标题"  show-overflow-tooltip/>
-        <el-table-column prop="picUrl" label="图片" align="center" width="160px" show-overflow-tooltip>
-          <template #default="scope">
-            <preview-image :src="scope.row.picUrl" />
-          </template>
-        </el-table-column>
-          <el-table-column prop="status" label="状态" show-overflow-tooltip>
-      <template #default="scope">
-                <dict-tag :options="maintenance_status" :value="scope.row.status"></dict-tag>
-            </template>
-          </el-table-column>
-          <el-table-column prop="createBy" label="上报人"  show-overflow-tooltip/>
-          <el-table-column prop="type" label="反馈类型" show-overflow-tooltip>
-      <template #default="scope">
-                <dict-tag :options="feedback_type" :value="scope.row.type"></dict-tag>
-            </template>
-          </el-table-column>
-        <el-table-column prop="createTime" label="创建时间" show-overflow-tooltip min-width="160" />
-<!--        <el-table-column prop="sort" label="排序"  show-overflow-tooltip/>-->
-        <el-table-column label="操作" width="200">
-          <template #default="scope">
-            <el-button icon="view" text type="primary" v-auth="'integrated_feedback_edit'"
-              @click="formDialogRef.openDialog(scope.row.id, true)">详情</el-button>
-            <el-button icon="delete" text type="primary" v-auth="'integrated_feedback_del'" @click="handleDelete([scope.row.id])">删除</el-button>
-            <el-button icon="Check" text type="success" v-if="scope.row.status != 1" @click="handleProcessed(scope.row)">已处理</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
-    </div>
+				@sort-change="sortChangeHandle"
+			>
+				<el-table-column type="selection" width="40" align="center" />
+				<el-table-column type="index" label="#" width="40" />
+				<el-table-column prop="title" label="标题" show-overflow-tooltip />
+				<el-table-column prop="picUrl" label="图片" align="center" width="160px" show-overflow-tooltip>
+					<template #default="scope">
+						<preview-image :src="scope.row.picUrl" />
+					</template>
+				</el-table-column>
+				<el-table-column prop="status" label="状态" show-overflow-tooltip>
+					<template #default="scope">
+						<dict-tag :options="maintenance_status" :value="scope.row.status"></dict-tag>
+					</template>
+				</el-table-column>
+				<el-table-column prop="createBy" label="上报人" show-overflow-tooltip />
+				<el-table-column prop="type" label="反馈类型" show-overflow-tooltip>
+					<template #default="scope">
+						<dict-tag :options="feedback_type" :value="scope.row.type"></dict-tag>
+					</template>
+				</el-table-column>
+				<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip min-width="160" />
+				<!--        <el-table-column prop="sort" label="排序"  show-overflow-tooltip/>-->
+				<el-table-column label="操作" width="200">
+					<template #default="scope">
+						<el-button
+							icon="view"
+							text
+							type="primary"
+							v-auth="'integrated_feedback_edit'"
+							@click="formDialogRef.openDialog(scope.row.id, true)"
+							>详情</el-button
+						>
+						<el-button icon="delete" text type="primary" v-auth="'integrated_feedback_del'" @click="handleDelete([scope.row.id])"
+							>删除</el-button
+						>
+						<el-button icon="Check" text type="primary" v-if="scope.row.status != 1" @click="handleProcessed(scope.row)">
+							标记为已处理
+						</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+		</div>
 
-    <!-- 编辑、新增  -->
-    <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
-
-  </div>
+		<!-- 编辑、新增  -->
+		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+	</div>
 </template>
 
 <script setup lang="ts" name="systemFeedback">
-import { BasicTableProps, useTable } from "/@/hooks/table";
-import { fetchList, delObjs, putObj } from "/@/api/integrated/feedback";
-import { useMessage, useMessageBox } from "/@/hooks/message";
-import { useDict } from '/@/hooks/dict';
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { fetchList, delObjs, putObj } from "/@/api/integrated/feedback"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useDict } from "/@/hooks/dict"
 
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
 // 定义查询字典
 
-const { maintenance_status,feedback_type } = useDict('maintenance_status','feedback_type')
+const { maintenance_status, feedback_type } = useDict("maintenance_status", "feedback_type")
 // 定义变量内容
 const formDialogRef = ref()
 // 搜索变量
@@ -103,70 +125,63 @@ const selectObjs = ref([]) as any
 const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
-  queryForm: {},
-  pageList: fetchList
+	queryForm: {},
+	pageList: fetchList,
 })
 
 //  table hook
-const {
-  getDataList,
-  currentChangeHandle,
-  sizeChangeHandle,
-  sortChangeHandle,
-  downBlobFile,
-	tableStyle
-} = useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
-  // 清空搜索条件
-  queryRef.value?.resetFields()
-  // 清空多选
-  selectObjs.value = []
-  getDataList()
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	getDataList()
 }
 
 // 导出excel
 const exportExcel = () => {
-  downBlobFile('/integrated/feedback/export', Object.assign(state.queryForm, { ids: selectObjs }), 'feedback.xlsx')
+	downBlobFile("/integrated/feedback/export", Object.assign(state.queryForm, { ids: selectObjs }), "feedback.xlsx")
 }
 
 // 多选事件
 const selectionChangHandle = (objs: { id: string }[]) => {
-  selectObjs.value = objs.map(({ id }) => id);
-  multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
-  try {
-    await useMessageBox().confirm('此操作将永久删除');
-  } catch {
-    return;
-  }
+	try {
+		await useMessageBox().confirm("此操作将永久删除")
+	} catch {
+		return
+	}
 
-  try {
-    await delObjs(ids);
-    getDataList();
-    useMessage().success('删除成功');
-  } catch (err: any) {
-    useMessage().error(err.msg);
-  }
-};
+	try {
+		await delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
+}
 
 // 添加已处理操作
 const handleProcessed = async (row: any) => {
-  try {
-    await useMessageBox().confirm('确定将该反馈标记为已处理吗？');
-  } catch {
-    return;
-  }
-  try {
-    await putObj({ ...row, status: 1 });
-    useMessage().success('已处理');
-    getDataList();
-  } catch (err: any) {
-    useMessage().error(err.msg);
-  }
-};
+	try {
+		await useMessageBox().confirm("确定将该反馈标记为已处理吗？")
+	} catch {
+		return
+	}
+	try {
+		await putObj({ ...row, status: 1 })
+		useMessage().success("已处理")
+		getDataList()
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
+}
 </script>

src/views/integrated/lostAndFound/form.vue

@@ -1,150 +1,140 @@
 <template>
-    <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible"
-      :close-on-click-modal="false" draggable>
-      <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
-       <el-row :gutter="24">
-    <el-col :span="24" class="mb20">
-      <el-form-item label="标题" prop="title">
-        <el-input v-model="form.title" placeholder="请输入标题"/>
-      </el-form-item>
-      </el-col>
-         <el-col :span="24" class="mb20">
-           <el-form-item label="发现地点" prop="location">
-             <el-input v-model="form.location" placeholder="请输入发现地点"/>
-           </el-form-item>
-         </el-col>
-         <el-col :span="12" class="mb20">
-           <el-form-item label="发现日期" prop="dateFound">
-             <el-date-picker type="date" placeholder="请选择发现日期" v-model="form.dateFound" :value-format="dateStr"></el-date-picker>
-           </el-form-item>
-         </el-col>
-         <el-col :span="12" class="mb20">
-           <el-form-item label="排序" prop="sort">
-             <el-input v-model="form.sort" placeholder="请输入排序"/>
-           </el-form-item>
-         </el-col>
-    <el-col :span="12" class="mb20">
-  <el-form-item label="图片" prop="picUrl">
-    <upload-img v-model:imageUrl="form.picUrl"></upload-img>
-  </el-form-item>
-  </el-col>
-
-         <el-col :span="12" class="mb20">
-           <el-form-item label="状态" prop="status">
-             <el-switch
-               v-model="form.status"
-               :active-value="1"
-               :inactive-value="0"
-               active-text="已领取"
-               inactive-text="待领取"
-             />
-           </el-form-item>
-         </el-col>
-    <el-col :span="24" class="mb20">
-  <el-form-item label="描述" prop="description">
-    <editor v-if="visible" v-model:get-html="form.description" placeholder="请输入描述"></editor>
-  </el-form-item>
-  </el-col>
-
-
-
+	<el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
+		<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
+			<el-row :gutter="24">
+				<el-col :span="24" class="mb20">
+					<el-form-item label="标题" prop="title">
+						<el-input v-model="form.title" placeholder="请输入标题" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="发现地点" prop="location">
+						<el-input v-model="form.location" placeholder="请输入发现地点" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="12" class="mb20">
+					<el-form-item label="发现日期" prop="dateFound">
+						<el-date-picker type="date" placeholder="请选择发现日期" v-model="form.dateFound" :value-format="dateStr"></el-date-picker>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12" class="mb20">
+					<el-form-item label="排序" prop="sort">
+						<el-input v-model="form.sort" placeholder="请输入排序" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="12" class="mb20">
+					<el-form-item label="图片" prop="picUrl">
+						<upload-img v-model:imageUrl="form.picUrl"></upload-img>
+					</el-form-item>
+				</el-col>
 
+				<el-col :span="12" class="mb20">
+					<el-form-item label="状态" prop="status">
+						<el-switch v-model="form.status" :active-value="1" :inactive-value="0" active-text="已领取" inactive-text="待领取" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="描述" prop="description">
+						<editor v-if="visible" v-model:get-html="form.description" placeholder="请输入描述"></editor>
+					</el-form-item>
+				</el-col>
 			</el-row>
-      </el-form>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="visible = false">取消</el-button>
-          <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
-        </span>
-      </template>
-    </el-dialog>
+		</el-form>
+		<template #footer>
+			<span class="dialog-footer">
+				<el-button @click="visible = false">取消</el-button>
+				<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+			</span>
+		</template>
+	</el-dialog>
 </template>
 
 <script setup lang="ts" name="LostAndFoundDialog">
-import { useDict } from '/@/hooks/dict';
-import { useMessage } from "/@/hooks/message";
-import { getObj, addObj, putObj } from '/@/api/integrated/lostAndFound'
-import { rule } from '/@/utils/validate';
-const emit = defineEmits(['refresh']);
+import { useDict } from "/@/hooks/dict"
+import { useMessage } from "/@/hooks/message"
+import { getObj, addObj, putObj } from "/@/api/integrated/lostAndFound"
+import { rule } from "/@/utils/validate"
+const emit = defineEmits(["refresh"])
 
 // 定义变量内容
-const dataFormRef = ref();
+const dataFormRef = ref()
 const visible = ref(false)
 const loading = ref(false)
 // 定义字典
-const { lost_and_found_status } = useDict('lost_and_found_status')
+const { lost_and_found_status } = useDict("lost_and_found_status")
 
 // 提交表单数据
 const form = reactive({
-		id:'',
-	  title: '',
-	  picUrl: '',
-	  sort: '',
-	  description: '',
-	  status: 0, // 默认待领取
-	  dateFound: '',
-	  location: '',
-});
+	id: "",
+	title: "",
+	picUrl: "",
+	sort: "",
+	description: "",
+	status: 0, // 默认待领取
+	dateFound: "",
+	location: "",
+})
 
 // 定义校验规则
 const dataRules = ref({
-        title: [{required: true, message: '标题不能为空', trigger: 'blur'}],
-        sort: [{ validator: rule.number, trigger: 'blur' }],
-        location: [{required: true, message: '发现地点不能为空', trigger: 'blur'}],
+	title: [{ required: true, message: "标题不能为空", trigger: "blur" }],
+	sort: [{ validator: rule.number, trigger: "blur" }],
+	location: [{ required: true, message: "发现地点不能为空", trigger: "blur" }],
 })
 
 // 打开弹窗
 const openDialog = (id: string) => {
-  visible.value = true
-  form.id = ''
+	visible.value = true
+	form.id = ""
 
-  // 重置表单数据
+	// 重置表单数据
 	nextTick(() => {
-		dataFormRef.value?.resetFields();
-	});
+		dataFormRef.value?.resetFields()
+	})
 
-  // 获取lostAndFound信息
-  if (id) {
-    form.id = id
-    getlostAndFoundData(id)
-  }
-};
+	// 获取lostAndFound信息
+	if (id) {
+		form.id = id
+		getlostAndFoundData(id)
+	}
+}
 
 // 提交
 const onSubmit = async () => {
-	const valid = await dataFormRef.value.validate().catch(() => {});
-	if (!valid) return false;
+	const valid = await dataFormRef.value.validate().catch(() => {})
+	if (!valid) return false
 
 	try {
-    loading.value = true;
-		form.id ? await putObj(form) : await addObj(form);
-		useMessage().success(form.id ? '修改成功' : '添加成功');
-		visible.value = false;
-		emit('refresh');
+		loading.value = true
+		form.id ? await putObj(form) : await addObj(form)
+		useMessage().success(form.id ? "修改成功" : "添加成功")
+		visible.value = false
+		emit("refresh")
 	} catch (err: any) {
-		useMessage().error(err.msg);
+		useMessage().error(err.msg)
 	} finally {
-    loading.value = false;
-  }
-};
-
+		loading.value = false
+	}
+}
 
 // 初始化表单数据
 const getlostAndFoundData = (id: string) => {
-  // 获取数据
-  loading.value = true
-  getObj(id).then((res: any) => {
-    const data = res.data
-    // 确保状态值为数字类型
-    data.status = Number(data.status)
-    Object.assign(form, data)
-  }).finally(() => {
-    loading.value = false
-  })
-};
+	// 获取数据
+	loading.value = true
+	getObj(id)
+		.then((res: any) => {
+			const data = res.data
+			// 确保状态值为数字类型
+			data.status = Number(data.status)
+			Object.assign(form, data)
+		})
+		.finally(() => {
+			loading.value = false
+		})
+}
 
 // 暴露变量
 defineExpose({
-  openDialog
-});
+	openDialog,
+})
 </script>

src/views/integrated/lostAndFound/index.vue

@@ -1,88 +1,114 @@
 <template>
-  <div class="layout-padding">
-    <div class="layout-padding-auto layout-padding-view">
-      <el-row v-show="showSearch">
-        <el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
-      <el-form-item label="标题" prop="title" >
-        <el-input placeholder="请输入标题" v-model="state.queryForm.title" />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-            <el-select v-model="state.queryForm.status" placeholder="请选择状态">
-              <el-option :label="item.label" :value="item.value" v-for="(item, index) in lost_and_found_status" :key="index"></el-option>
-            </el-select>
-      </el-form-item>
-          <el-form-item>
-            <el-button icon="search" type="primary" @click="getDataList">
-              查询
-            </el-button>
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-form>
-      </el-row>
-      <el-row>
-        <div class="mb8" style="width: 100%">
-          <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
-            v-auth="'integrated_lostAndFound_add'">
-            新 增
-          </el-button>
-          <el-button plain :disabled="multiple" icon="Delete" type="primary"
-            v-auth="'integrated_lostAndFound_del'" @click="handleDelete(selectObjs)">
-            删除
-          </el-button>
-          <right-toolbar v-model:showSearch="showSearch" :export="'integrated_lostAndFound_export'"
-                @exportExcel="exportExcel" class="ml10 mr20" style="float: right;"
-            @queryTable="getDataList"></right-toolbar>
-        </div>
-      </el-row>
-      <el-table :data="state.dataList" v-loading="state.loading" border
-        :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
+	<div class="layout-padding">
+		<div class="layout-padding-auto layout-padding-view">
+			<el-row v-show="showSearch">
+				<el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
+					<el-form-item label="标题" prop="title">
+						<el-input placeholder="请输入标题" v-model="state.queryForm.title" />
+					</el-form-item>
+					<el-form-item label="状态" prop="status">
+						<el-select v-model="state.queryForm.status" placeholder="请选择状态">
+							<el-option :label="item.label" :value="item.value" v-for="(item, index) in lost_and_found_status" :key="index"></el-option>
+						</el-select>
+					</el-form-item>
+					<el-form-item>
+						<el-button icon="search" type="primary" @click="getDataList"> 查询 </el-button>
+						<el-button icon="Refresh" @click="resetQuery">重置</el-button>
+					</el-form-item>
+				</el-form>
+			</el-row>
+			<el-row>
+				<div class="mb8" style="width: 100%">
+					<el-button
+						icon="folder-add"
+						type="primary"
+						class="ml10"
+						@click="formDialogRef.openDialog()"
+						v-auth="'integrated_lostAndFound_add'"
+					>
+						新 增
+					</el-button>
+					<el-button
+						plain
+						:disabled="multiple"
+						icon="Delete"
+						type="primary"
+						v-auth="'integrated_lostAndFound_del'"
+						@click="handleDelete(selectObjs)"
+					>
+						删除
+					</el-button>
+					<right-toolbar
+						v-model:showSearch="showSearch"
+						:export="'integrated_lostAndFound_export'"
+						@exportExcel="exportExcel"
+						class="ml10 mr20"
+						style="float: right"
+						@queryTable="getDataList"
+					></right-toolbar>
+				</div>
+			</el-row>
+			<el-table
+				:data="state.dataList"
+				v-loading="state.loading"
+				border
+				:cell-style="tableStyle.cellStyle"
+				:header-cell-style="tableStyle.headerCellStyle"
 				@selection-change="selectionChangHandle"
-        @sort-change="sortChangeHandle">
-        <el-table-column type="selection" width="40" align="center" />
-        <el-table-column type="index" label="#" width="40" />
-          <el-table-column prop="title" label="标题"  show-overflow-tooltip/>
+				@sort-change="sortChangeHandle"
+			>
+				<el-table-column type="selection" width="40" align="center" />
+				<el-table-column type="index" label="#" width="40" />
+				<el-table-column prop="title" label="标题" show-overflow-tooltip />
 				<el-table-column prop="picUrl" label="图片" align="center" width="160px" show-overflow-tooltip>
 					<template #default="scope">
 						<preview-image :src="scope.row.picUrl" />
 					</template>
 				</el-table-column>
-          <el-table-column prop="sort" label="排序"  show-overflow-tooltip/>
-          <el-table-column prop="status" label="状态" show-overflow-tooltip>
-      <template #default="scope">
-                <dict-tag :options="lost_and_found_status" :value="scope.row.status"></dict-tag>
-            </template>
-          </el-table-column>
-          <el-table-column prop="dateFound" label="发现日期"  show-overflow-tooltip/>
-          <el-table-column prop="location" label="发现地点"  show-overflow-tooltip/>
+				<el-table-column prop="sort" label="排序" show-overflow-tooltip />
+				<el-table-column prop="status" label="状态" show-overflow-tooltip>
+					<template #default="scope">
+						<dict-tag :options="lost_and_found_status" :value="scope.row.status"></dict-tag>
+					</template>
+				</el-table-column>
+				<el-table-column prop="dateFound" label="发现日期" show-overflow-tooltip />
+				<el-table-column prop="location" label="发现地点" show-overflow-tooltip />
 				<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip min-width="160" />
-        <el-table-column label="操作" width="150">
-          <template #default="scope">
-            <el-button icon="edit-pen" text type="primary" v-auth="'integrated_lostAndFound_edit'"
-              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
-            <el-button icon="delete" text type="primary" v-auth="'integrated_lostAndFound_del'" @click="handleDelete([scope.row.id])">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
-    </div>
+				<el-table-column label="操作" width="150">
+					<template #default="scope">
+						<el-button
+							icon="edit-pen"
+							text
+							type="primary"
+							v-auth="'integrated_lostAndFound_edit'"
+							@click="formDialogRef.openDialog(scope.row.id)"
+							>编辑</el-button
+						>
+						<el-button icon="delete" text type="primary" v-auth="'integrated_lostAndFound_del'" @click="handleDelete([scope.row.id])"
+							>删除</el-button
+						>
+					</template>
+				</el-table-column>
+			</el-table>
+			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+		</div>
 
-    <!-- 编辑、新增  -->
-    <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
-
-  </div>
+		<!-- 编辑、新增  -->
+		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+	</div>
 </template>
 
 <script setup lang="ts" name="systemLostAndFound">
-import { BasicTableProps, useTable } from "/@/hooks/table";
-import { fetchList, delObjs } from "/@/api/integrated/lostAndFound";
-import { useMessage, useMessageBox } from "/@/hooks/message";
-import { useDict } from '/@/hooks/dict';
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { fetchList, delObjs } from "/@/api/integrated/lostAndFound"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useDict } from "/@/hooks/dict"
 
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
 // 定义查询字典
 
-const { lost_and_found_status } = useDict('lost_and_found_status')
+const { lost_and_found_status } = useDict("lost_and_found_status")
 // 定义变量内容
 const formDialogRef = ref()
 // 搜索变量
@@ -93,54 +119,47 @@ const selectObjs = ref([]) as any
 const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
-  queryForm: {},
-  pageList: fetchList
+	queryForm: {},
+	pageList: fetchList,
 })
 
 //  table hook
-const {
-  getDataList,
-  currentChangeHandle,
-  sizeChangeHandle,
-  sortChangeHandle,
-  downBlobFile,
-	tableStyle
-} = useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
-  // 清空搜索条件
-  queryRef.value?.resetFields()
-  // 清空多选
-  selectObjs.value = []
-  getDataList()
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	getDataList()
 }
 
 // 导出excel
 const exportExcel = () => {
-  downBlobFile('/integrated/lostAndFound/export', Object.assign(state.queryForm, { ids: selectObjs }), 'lostAndFound.xlsx')
+	downBlobFile("/integrated/lostAndFound/export", Object.assign(state.queryForm, { ids: selectObjs }), "lostAndFound.xlsx")
 }
 
 // 多选事件
 const selectionChangHandle = (objs: { id: string }[]) => {
-  selectObjs.value = objs.map(({ id }) => id);
-  multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
-  try {
-    await useMessageBox().confirm('此操作将永久删除');
-  } catch {
-    return;
-  }
+	try {
+		await useMessageBox().confirm("此操作将永久删除")
+	} catch {
+		return
+	}
 
-  try {
-    await delObjs(ids);
-    getDataList();
-    useMessage().success('删除成功');
-  } catch (err: any) {
-    useMessage().error(err.msg);
-  }
-};
+	try {
+		await delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
+}
 </script>

src/views/integrated/maintenanceOrder/index.vue

@@ -1,90 +1,118 @@
 <template>
-  <div class="layout-padding">
-    <div class="layout-padding-auto layout-padding-view">
-      <el-row v-show="showSearch">
-        <el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
-      <el-form-item label="标题" prop="title" >
-        <el-input placeholder="请输入标题" v-model="state.queryForm.title" />
-      </el-form-item>
-          <el-form-item>
-            <el-button icon="search" type="primary" @click="getDataList">
-              查询
-            </el-button>
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-form>
-      </el-row>
-      <el-row>
-        <div class="mb8" style="width: 100%">
-          <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
-            v-auth="'integrated_maintenanceOrder_add'">
-            新 增
-          </el-button>
-          <el-button plain :disabled="multiple" icon="Delete" type="primary"
-            v-auth="'integrated_maintenanceOrder_del'" @click="handleDelete(selectObjs)">
-            删除
-          </el-button>
-          <right-toolbar v-model:showSearch="showSearch" :export="'integrated_maintenanceOrder_export'"
-                @exportExcel="exportExcel" class="ml10 mr20" style="float: right;"
-            @queryTable="getDataList"></right-toolbar>
-        </div>
-      </el-row>
-      <el-table :data="state.dataList" v-loading="state.loading" border
-        :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
+	<div class="layout-padding">
+		<div class="layout-padding-auto layout-padding-view">
+			<el-row v-show="showSearch">
+				<el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
+					<el-form-item label="标题" prop="title">
+						<el-input placeholder="请输入标题" v-model="state.queryForm.title" />
+					</el-form-item>
+					<el-form-item>
+						<el-button icon="search" type="primary" @click="getDataList"> 查询 </el-button>
+						<el-button icon="Refresh" @click="resetQuery">重置</el-button>
+					</el-form-item>
+				</el-form>
+			</el-row>
+			<el-row>
+				<div class="mb8" style="width: 100%">
+					<el-button
+						icon="folder-add"
+						type="primary"
+						class="ml10"
+						@click="formDialogRef.openDialog()"
+						v-auth="'integrated_maintenanceOrder_add'"
+					>
+						新 增
+					</el-button>
+					<el-button
+						plain
+						:disabled="multiple"
+						icon="Delete"
+						type="primary"
+						v-auth="'integrated_maintenanceOrder_del'"
+						@click="handleDelete(selectObjs)"
+					>
+						删除
+					</el-button>
+					<right-toolbar
+						v-model:showSearch="showSearch"
+						:export="'integrated_maintenanceOrder_export'"
+						@exportExcel="exportExcel"
+						class="ml10 mr20"
+						style="float: right"
+						@queryTable="getDataList"
+					></right-toolbar>
+				</div>
+			</el-row>
+			<el-table
+				:data="state.dataList"
+				v-loading="state.loading"
+				border
+				:cell-style="tableStyle.cellStyle"
+				:header-cell-style="tableStyle.headerCellStyle"
 				@selection-change="selectionChangHandle"
-        @sort-change="sortChangeHandle">
-        <el-table-column type="selection" width="40" align="center" />
-        <el-table-column type="index" label="#" width="40" />
-          <el-table-column prop="title" label="标题"  show-overflow-tooltip/>
+				@sort-change="sortChangeHandle"
+			>
+				<el-table-column type="selection" width="40" align="center" />
+				<el-table-column type="index" label="#" width="40" />
+				<el-table-column prop="title" label="标题" show-overflow-tooltip />
 				<el-table-column prop="picUrl" label="图片" align="center" width="160px" show-overflow-tooltip>
 					<template #default="scope">
 						<preview-image :src="scope.row.picUrl" />
 					</template>
 				</el-table-column>
-          <el-table-column prop="status" label="状态" show-overflow-tooltip>
-      <template #default="scope">
-                <dict-tag :options="maintenance_status" :value="scope.row.status"></dict-tag>
-            </template>
-          </el-table-column>
-          <el-table-column prop="dateFound" label="发现日期"  show-overflow-tooltip/>
-          <el-table-column prop="location" label="发现地点"  show-overflow-tooltip/>
-          <el-table-column prop="urgency" label="工单紧急层度" show-overflow-tooltip>
-      <template #default="scope">
-                <dict-tag :options="maintenance_urgency" :value="scope.row.urgency"></dict-tag>
-            </template>
-          </el-table-column>
-          <el-table-column prop="createBy" label="上报人"  show-overflow-tooltip/>
-<!--        <el-table-column prop="sort" label="排序"  show-overflow-tooltip/>-->
+				<el-table-column prop="status" label="状态" show-overflow-tooltip>
+					<template #default="scope">
+						<dict-tag :options="maintenance_status" :value="scope.row.status"></dict-tag>
+					</template>
+				</el-table-column>
+				<el-table-column prop="dateFound" label="发现日期" show-overflow-tooltip />
+				<el-table-column prop="location" label="发现地点" show-overflow-tooltip />
+				<el-table-column prop="urgency" label="工单紧急层度" show-overflow-tooltip>
+					<template #default="scope">
+						<dict-tag :options="maintenance_urgency" :value="scope.row.urgency"></dict-tag>
+					</template>
+				</el-table-column>
+				<el-table-column prop="createBy" label="上报人" show-overflow-tooltip />
+				<!--        <el-table-column prop="sort" label="排序"  show-overflow-tooltip/>-->
 				<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip min-width="160" />
-        <el-table-column label="操作" width="200">
-          <template #default="scope">
-            <el-button icon="view" text type="primary" v-auth="'integrated_maintenanceOrder_edit'"
-              @click="formDialogRef.openDialog(scope.row.id, true)">详情</el-button>
-            <el-button icon="delete" text type="primary" v-auth="'integrated_maintenanceOrder_del'" @click="handleDelete([scope.row.id])">删除</el-button>
-            <el-button icon="Check" text type="success" v-if="scope.row.status != 1" @click="handleProcessed(scope.row)">已处理</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
-    </div>
+				<el-table-column label="操作" width="200">
+					<template #default="scope">
+						<el-button
+							icon="view"
+							text
+							type="primary"
+							v-auth="'integrated_maintenanceOrder_edit'"
+							@click="formDialogRef.openDialog(scope.row.id, true)"
+							>详情</el-button
+						>
+						<el-button icon="delete" text type="primary" v-auth="'integrated_maintenanceOrder_del'" @click="handleDelete([scope.row.id])"
+							>删除</el-button
+						>
+						<el-button icon="Check" text type="primary" v-if="scope.row.status != 1" @click="handleProcessed(scope.row)">
+							标记为已处理
+						</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+		</div>
 
-    <!-- 编辑、新增  -->
-    <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
-
-  </div>
+		<!-- 编辑、新增  -->
+		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+	</div>
 </template>
 
 <script setup lang="ts" name="systemMaintenanceOrder">
-import { BasicTableProps, useTable } from "/@/hooks/table";
-import { fetchList, delObjs, putObj } from "/@/api/integrated/maintenanceOrder";
-import { useMessage, useMessageBox } from "/@/hooks/message";
-import { useDict } from '/@/hooks/dict';
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { fetchList, delObjs, putObj } from "/@/api/integrated/maintenanceOrder"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useDict } from "/@/hooks/dict"
 
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
 // 定义查询字典
 
-const { maintenance_urgency,maintenance_status } = useDict('maintenance_urgency','maintenance_status')
+const { maintenance_urgency, maintenance_status } = useDict("maintenance_urgency", "maintenance_status")
 // 定义变量内容
 const formDialogRef = ref()
 // 搜索变量
@@ -95,70 +123,63 @@ const selectObjs = ref([]) as any
 const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
-  queryForm: {},
-  pageList: fetchList
+	queryForm: {},
+	pageList: fetchList,
 })
 
 //  table hook
-const {
-  getDataList,
-  currentChangeHandle,
-  sizeChangeHandle,
-  sortChangeHandle,
-  downBlobFile,
-	tableStyle
-} = useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
-  // 清空搜索条件
-  queryRef.value?.resetFields()
-  // 清空多选
-  selectObjs.value = []
-  getDataList()
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	getDataList()
 }
 
 // 导出excel
 const exportExcel = () => {
-  downBlobFile('/integrated/maintenanceOrder/export', Object.assign(state.queryForm, { ids: selectObjs }), 'maintenanceOrder.xlsx')
+	downBlobFile("/integrated/maintenanceOrder/export", Object.assign(state.queryForm, { ids: selectObjs }), "maintenanceOrder.xlsx")
 }
 
 // 多选事件
 const selectionChangHandle = (objs: { id: string }[]) => {
-  selectObjs.value = objs.map(({ id }) => id);
-  multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
-  try {
-    await useMessageBox().confirm('此操作将永久删除');
-  } catch {
-    return;
-  }
+	try {
+		await useMessageBox().confirm("此操作将永久删除")
+	} catch {
+		return
+	}
 
-  try {
-    await delObjs(ids);
-    getDataList();
-    useMessage().success('删除成功');
-  } catch (err: any) {
-    useMessage().error(err.msg);
-  }
-};
+	try {
+		await delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
+}
 
 // 添加已处理操作
 const handleProcessed = async (row: any) => {
-  try {
-    await useMessageBox().confirm('确定将该工单标记为已处理吗？');
-  } catch {
-    return;
-  }
-  try {
-    await putObj({ ...row, status: 1 });
-    useMessage().success('已处理');
-    getDataList();
-  } catch (err: any) {
-    useMessage().error(err.msg);
-  }
-};
+	try {
+		await useMessageBox().confirm("确定将该工单标记为已处理吗？")
+	} catch {
+		return
+	}
+	try {
+		await putObj({ ...row, status: 1 })
+		useMessage().success("已处理")
+		getDataList()
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
+}
 </script>

src/views/integrated/meeting/cleanUser/form.vue

@@ -1,117 +1,112 @@
 <template>
-    <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible"
-      :close-on-click-modal="false" draggable>
-      <el-form ref="dataFormRef" :model="form" :rules="dataRules" label-width="90px" v-loading="loading">
-       <el-row :gutter="24">
-    <el-col :span="12" class="mb20">
-      <el-form-item label="姓名" prop="name">
-        <el-input v-model="form.name" placeholder="请输入姓名"/>
-      </el-form-item>
-      </el-col>
+	<el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
+		<el-form ref="dataFormRef" :model="form" :rules="dataRules" label-width="90px" v-loading="loading">
+			<el-row :gutter="24">
+				<el-col :span="12" class="mb20">
+					<el-form-item label="姓名" prop="name">
+						<el-input v-model="form.name" placeholder="请输入姓名" />
+					</el-form-item>
+				</el-col>
 
-    <el-col :span="12" class="mb20">
-      <el-form-item label="手机号" prop="phone">
-        <el-input v-model="form.phone" placeholder="请输入手机号"/>
-      </el-form-item>
-      </el-col>
-
-
-
-    <el-col :span="12" class="mb20">
-  <el-form-item label="照片" prop="picUrl">
-    <upload-img v-model="form.picUrl"></upload-img>
-  </el-form-item>
-  </el-col>
+				<el-col :span="12" class="mb20">
+					<el-form-item label="手机号" prop="phone">
+						<el-input v-model="form.phone" placeholder="请输入手机号" />
+					</el-form-item>
+				</el-col>
 
+				<el-col :span="12" class="mb20">
+					<el-form-item label="照片" prop="picUrl">
+						<upload-img v-model:imageUrl="form.picUrl"></upload-img>
+					</el-form-item>
+				</el-col>
 			</el-row>
-      </el-form>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="visible = false">取消</el-button>
-          <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
-        </span>
-      </template>
-    </el-dialog>
+		</el-form>
+		<template #footer>
+			<span class="dialog-footer">
+				<el-button @click="visible = false">取消</el-button>
+				<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+			</span>
+		</template>
+	</el-dialog>
 </template>
 
 <script setup lang="ts" name="CleanUserDialog">
-import { ref, reactive, nextTick } from 'vue';
-import { useDict } from '/src/hooks/dict';
-import { useMessage } from "/src/hooks/message";
-import { getObj, addObj, putObj } from '/src/api/integrated/cleanUser'
-import { rule } from '/src/utils/validate';
-const emit = defineEmits(['refresh']);
+import { ref, reactive, nextTick } from "vue"
+import { useMessage } from "/@/hooks/message"
+import { getObj, addObj, putObj } from "/@/api/integrated/cleanUser"
+const emit = defineEmits(["refresh"])
 
 // 定义变量内容
-const dataFormRef = ref();
+const dataFormRef = ref()
 const visible = ref(false)
 const loading = ref(false)
 // 定义字典
 
 // 提交表单数据
 const form = reactive({
-		id:'',
-	  name: '',
-	  phone: '',
-	  picUrl: '',
-	  type: '1', // 保洁人员
-});
+	id: "",
+	name: "",
+	phone: "",
+	picUrl: "",
+	type: "1", // 保洁人员
+})
 
 // 定义校验规则
 const dataRules = ref({
-        name: [{required: true, message: '姓名不能为空', trigger: 'blur'}],
-        phone: [{required: true, message: '手机号不能为空', trigger: 'blur'}],
+	name: [{ required: true, message: "姓名不能为空", trigger: "blur" }],
+	phone: [{ required: true, message: "手机号不能为空", trigger: "blur" }],
 })
 
 // 打开弹窗
 const openDialog = (id: string) => {
-  visible.value = true
-  form.id = ''
+	visible.value = true
+	form.id = ""
 
-  // 重置表单数据
+	// 重置表单数据
 	nextTick(() => {
-		dataFormRef.value?.resetFields();
-	});
+		dataFormRef.value?.resetFields()
+	})
 
-  // 获取cleanUser信息
-  if (id) {
-    form.id = id
-    getcleanUserData(id)
-  }
-};
+	// 获取cleanUser信息
+	if (id) {
+		form.id = id
+		getcleanUserData(id)
+	}
+}
 
 // 提交
 const onSubmit = async () => {
-	const valid = await dataFormRef.value.validate().catch(() => {});
-	if (!valid) return false;
+	const valid = await dataFormRef.value.validate().catch(() => {})
+	if (!valid) return false
 
 	try {
-    loading.value = true;
-		form.id ? await putObj(form) : await addObj(form);
-		useMessage().success(form.id ? '修改成功' : '添加成功');
-		visible.value = false;
-		emit('refresh');
+		loading.value = true
+		form.id ? await putObj(form) : await addObj(form)
+		useMessage().success(form.id ? "修改成功" : "添加成功")
+		visible.value = false
+		emit("refresh")
 	} catch (err: any) {
-		useMessage().error(err.msg);
+		useMessage().error(err.msg)
 	} finally {
-    loading.value = false;
-  }
-};
-
+		loading.value = false
+	}
+}
 
 // 初始化表单数据
 const getcleanUserData = (id: string) => {
-  // 获取数据
-  loading.value = true
-  getObj(id).then((res: any) => {
-    Object.assign(form, res.data)
-  }).finally(() => {
-    loading.value = false
-  })
-};
+	// 获取数据
+	loading.value = true
+	getObj(id)
+		.then((res: any) => {
+			Object.assign(form, res.data)
+		})
+		.finally(() => {
+			loading.value = false
+		})
+}
 
 // 暴露变量
 defineExpose({
-  openDialog
-});
+	openDialog,
+})
 </script>

src/views/integrated/meeting/cleanUser/index.vue

@@ -1,72 +1,95 @@
 <template>
-  <div class="layout-padding">
-    <div class="layout-padding-auto layout-padding-view">
-      <el-row v-show="showSearch">
-        <el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
-      <el-form-item label="姓名" prop="name" >
-        <el-input placeholder="请输入姓名" v-model="state.queryForm.name" />
-      </el-form-item>
-      <el-form-item label="手机号" prop="phone" >
-        <el-input placeholder="请输入手机号" v-model="state.queryForm.phone" />
-      </el-form-item>
-          <el-form-item>
-            <el-button icon="search" type="primary" @click="getDataList">
-              查询
-            </el-button>
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-form>
-      </el-row>
-      <el-row>
-        <div class="mb8" style="width: 100%">
-          <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
-            v-auth="'integrated_cleanUser_add'">
-            新 增
-          </el-button>
-          <el-button plain :disabled="multiple" icon="Delete" type="primary"
-            v-auth="'integrated_cleanUser_del'" @click="handleDelete(selectObjs)">
-            删除
-          </el-button>
-          <right-toolbar v-model:showSearch="showSearch" :export="'integrated_cleanUser_export'"
-                @exportExcel="exportExcel" class="ml10 mr20" style="float: right;"
-            @queryTable="getDataList"></right-toolbar>
-        </div>
-      </el-row>
-      <el-table :data="state.dataList" v-loading="state.loading" border
-        :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
+	<div class="layout-padding">
+		<div class="layout-padding-auto layout-padding-view">
+			<el-row v-show="showSearch">
+				<el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
+					<el-form-item label="姓名" prop="name">
+						<el-input placeholder="请输入姓名" v-model="state.queryForm.name" />
+					</el-form-item>
+					<el-form-item label="手机号" prop="phone">
+						<el-input placeholder="请输入手机号" v-model="state.queryForm.phone" />
+					</el-form-item>
+					<el-form-item>
+						<el-button icon="search" type="primary" @click="getDataList"> 查询 </el-button>
+						<el-button icon="Refresh" @click="resetQuery">重置</el-button>
+					</el-form-item>
+				</el-form>
+			</el-row>
+			<el-row>
+				<div class="mb8" style="width: 100%">
+					<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" v-auth="'integrated_cleanUser_add'">
+						新 增
+					</el-button>
+					<el-button
+						plain
+						:disabled="multiple"
+						icon="Delete"
+						type="primary"
+						v-auth="'integrated_cleanUser_del'"
+						@click="handleDelete(selectObjs)"
+					>
+						删除
+					</el-button>
+					<right-toolbar
+						v-model:showSearch="showSearch"
+						:export="'integrated_cleanUser_export'"
+						@exportExcel="exportExcel"
+						class="ml10 mr20"
+						style="float: right"
+						@queryTable="getDataList"
+					></right-toolbar>
+				</div>
+			</el-row>
+			<el-table
+				:data="state.dataList"
+				v-loading="state.loading"
+				border
+				:cell-style="tableStyle.cellStyle"
+				:header-cell-style="tableStyle.headerCellStyle"
 				@selection-change="selectionChangHandle"
-        @sort-change="sortChangeHandle">
-        <el-table-column type="selection" width="40" align="center" />
-        <el-table-column type="index" label="#" width="40" />
-          <el-table-column prop="name" label="姓名"  show-overflow-tooltip/>
-          <el-table-column prop="phone" label="手机号"  show-overflow-tooltip/>
-          <el-table-column prop="picUrl" label="照片"  show-overflow-tooltip/>
-        <el-table-column label="操作" width="150">
-          <template #default="scope">
-            <el-button icon="edit-pen" text type="primary" v-auth="'integrated_cleanUser_edit'"
-              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
-            <el-button icon="delete" text type="primary" v-auth="'integrated_cleanUser_del'" @click="handleDelete([scope.row.id])">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
-    </div>
+				@sort-change="sortChangeHandle"
+			>
+				<el-table-column type="selection" width="40" align="center" />
+				<el-table-column type="index" label="#" width="40" />
+				<el-table-column prop="name" label="姓名" show-overflow-tooltip />
+				<el-table-column prop="phone" label="手机号" show-overflow-tooltip />
+				<el-table-column prop="picUrl" label="照片" show-overflow-tooltip>
+					<template #default="scope">
+						<preview-image :src="scope.row.picUrl" />
+					</template>
+				</el-table-column>
+				<el-table-column label="操作" width="150">
+					<template #default="scope">
+						<el-button
+							icon="edit-pen"
+							text
+							type="primary"
+							v-auth="'integrated_cleanUser_edit'"
+							@click="formDialogRef.openDialog(scope.row.id)"
+							>编辑</el-button
+						>
+						<el-button icon="delete" text type="primary" v-auth="'integrated_cleanUser_del'" @click="handleDelete([scope.row.id])"
+							>删除</el-button
+						>
+					</template>
+				</el-table-column>
+			</el-table>
+			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+		</div>
 
-    <!-- 编辑、新增  -->
-    <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
-
-  </div>
+		<!-- 编辑、新增  -->
+		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+	</div>
 </template>
 
 <script setup lang="ts" name="systemCleanUser">
-import { ref, reactive, defineAsyncComponent } from 'vue';
-import { BasicTableProps, useTable } from "/src/hooks/table";
-import { fetchList, delObjs } from "/src/api/integrated/cleanUser";
-import { useMessage, useMessageBox } from "/src/hooks/message";
-import { useDict } from '/src/hooks/dict';
+import { ref, reactive, defineAsyncComponent } from "vue"
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { fetchList, delObjs } from "/@/api/integrated/cleanUser"
+import { useMessage, useMessageBox } from "/@/hooks/message"
 
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
 // 定义查询字典
 
 // 定义变量内容
@@ -79,54 +102,47 @@ const selectObjs = ref([]) as any
 const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
-  queryForm: { type: '1' }, // 保洁人员
-  pageList: (params: any) => fetchList({ ...params, type: '1' })
+	queryForm: { type: "1" }, // 保洁人员
+	pageList: (params: any) => fetchList({ ...params, type: "1" }),
 })
 
 //  table hook
-const {
-  getDataList,
-  currentChangeHandle,
-  sizeChangeHandle,
-  sortChangeHandle,
-  downBlobFile,
-	tableStyle
-} = useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
-  // 清空搜索条件
-  queryRef.value?.resetFields()
-  // 清空多选
-  selectObjs.value = []
-  getDataList()
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	getDataList()
 }
 
 // 导出excel
 const exportExcel = () => {
-  downBlobFile('/integrated/cleanUser/export', Object.assign(state.queryForm, { ids: selectObjs }), 'cleanUser.xlsx')
+	downBlobFile("/integrated/cleanUser/export", Object.assign(state.queryForm, { ids: selectObjs }), "cleanUser.xlsx")
 }
 
 // 多选事件
 const selectionChangHandle = (objs: { id: string }[]) => {
-  selectObjs.value = objs.map(({ id }) => id);
-  multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
-  try {
-    await useMessageBox().confirm('此操作将永久删除');
-  } catch {
-    return;
-  }
+	try {
+		await useMessageBox().confirm("此操作将永久删除")
+	} catch {
+		return
+	}
 
-  try {
-    await delObjs(ids);
-    getDataList();
-    useMessage().success('删除成功');
-  } catch (err: any) {
-    useMessage().error(err.msg);
-  }
-};
+	try {
+		await delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
+}
 </script>

src/views/integrated/meeting/meetingDeskLayout/form.vue

@@ -1,240 +1,237 @@
 <template>
-    <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible"
-      :close-on-click-modal="false" draggable width="800px">
-      <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="130px" v-loading="loading">
-       <el-row :gutter="24">
-    <el-col :span="12" class="mb20">
-      <el-form-item label="摆放形式名称" prop="layoutName">
-        <el-input v-model="form.layoutName" placeholder="请输入摆放形式名称" clearable/>
-      </el-form-item>
-      </el-col>
+	<el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable width="800px">
+		<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="130px" v-loading="loading">
+			<el-row :gutter="24">
+				<el-col :span="12" class="mb20">
+					<el-form-item label="摆放形式名称" prop="layoutName">
+						<el-input v-model="form.layoutName" placeholder="请输入摆放形式名称" clearable />
+					</el-form-item>
+				</el-col>
 
-    <el-col :span="12" class="mb20">
-      <el-form-item label="摆放形式编码" prop="layoutCode">
-        <el-input v-model="form.layoutCode" placeholder="请输入摆放形式编码" clearable/>
-      </el-form-item>
-      </el-col>
+				<el-col :span="12" class="mb20">
+					<el-form-item label="摆放形式编码" prop="layoutCode">
+						<el-input v-model="form.layoutCode" placeholder="请输入摆放形式编码" clearable />
+					</el-form-item>
+				</el-col>
 
-    <el-col :span="24" class="mb20">
-      <el-form-item label="摆放形式描述" prop="description">
-        <el-input 
-          v-model="form.description" 
-          type="textarea" 
-          :rows="3"
-          placeholder="请输入摆放形式描述" 
-          maxlength="500"
-          show-word-limit
-          clearable/>
-      </el-form-item>
-      </el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="摆放形式描述" prop="description">
+						<el-input
+							v-model="form.description"
+							type="textarea"
+							:rows="3"
+							placeholder="请输入摆放形式描述"
+							maxlength="500"
+							show-word-limit
+							clearable
+						/>
+					</el-form-item>
+				</el-col>
 
-    <el-col :span="12" class="mb20">
-      <el-form-item label="最小容纳人数" prop="capacityMin">
-        <el-input-number 
-          v-model="form.capacityMin" 
-          :min="1"
-          :max="9999"
-          placeholder="请输入最小容纳人数"
-          controls-position="right"
-          style="width: 100%"/>
-      </el-form-item>
-      </el-col>
+				<el-col :span="12" class="mb20">
+					<el-form-item label="最小容纳人数" prop="capacityMin">
+						<el-input-number
+							v-model="form.capacityMin"
+							:min="1"
+							:max="9999"
+							placeholder="请输入最小容纳人数"
+							controls-position="right"
+							style="width: 100%"
+						/>
+					</el-form-item>
+				</el-col>
 
-    <el-col :span="12" class="mb20">
-      <el-form-item label="最大容纳人数" prop="capacityMax">
-        <el-input-number 
-          v-model="form.capacityMax" 
-          :min="1"
-          :max="9999"
-          placeholder="请输入最大容纳人数"
-          controls-position="right"
-          style="width: 100%"/>
-      </el-form-item>
-      </el-col>
+				<el-col :span="12" class="mb20">
+					<el-form-item label="最大容纳人数" prop="capacityMax">
+						<el-input-number
+							v-model="form.capacityMax"
+							:min="1"
+							:max="9999"
+							placeholder="请输入最大容纳人数"
+							controls-position="right"
+							style="width: 100%"
+						/>
+					</el-form-item>
+				</el-col>
 
-    <el-col :span="24" class="mb20">
-      <el-form-item label="摆放形式示意图" prop="layoutImage">
-        <upload-image v-model="form.layoutImage" :limit="1" />
-        <div class="el-form-item-msg">建议尺寸：800x600px，支持jpg、png格式</div>
-      </el-form-item>
-      </el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="摆放形式示意图" prop="layoutImage">
+						<upload-image v-model:imageUrl="form.layoutImage" :limit="1" />
+						<div class="el-form-item-msg">建议尺寸：800x600px，支持jpg、png格式</div>
+					</el-form-item>
+				</el-col>
 
-    <el-col :span="12" class="mb20">
-      <el-form-item label="布置所需时间" prop="setupTime">
-        <el-input-number 
-          v-model="form.setupTime" 
-          :min="0"
-          :max="999"
-          placeholder="请输入布置所需时间"
-          controls-position="right"
-          style="width: 100%">
-          <template #append>分钟</template>
-        </el-input-number>
-      </el-form-item>
-      </el-col>
+				<el-col :span="12" class="mb20">
+					<el-form-item label="布置所需时间" prop="setupTime">
+						<el-input-number
+							v-model="form.setupTime"
+							:min="0"
+							:max="999"
+							placeholder="请输入布置所需时间"
+							controls-position="right"
+							style="width: 100%"
+						>
+							<template #append>分钟</template>
+						</el-input-number>
+					</el-form-item>
+				</el-col>
 
-    <el-col :span="12" class="mb20">
-      <el-form-item label="是否可用" prop="isAvailable">
-        <el-radio-group v-model="form.isAvailable">
-          <el-radio label="0">可用</el-radio>
-          <el-radio label="1">不可用</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      </el-col>
+				<el-col :span="12" class="mb20">
+					<el-form-item label="是否可用" prop="isAvailable">
+						<el-radio-group v-model="form.isAvailable">
+							<el-radio label="0">可用</el-radio>
+							<el-radio label="1">不可用</el-radio>
+						</el-radio-group>
+					</el-form-item>
+				</el-col>
 
-    <el-col :span="12" class="mb20">
-      <el-form-item label="排序" prop="sortOrder">
-        <el-input-number 
-          v-model="form.sortOrder" 
-          :min="0"
-          :max="9999"
-          placeholder="请输入排序"
-          controls-position="right"
-          style="width: 100%"/>
-      </el-form-item>
-      </el-col>
+				<el-col :span="12" class="mb20">
+					<el-form-item label="排序" prop="sortOrder">
+						<el-input-number
+							v-model="form.sortOrder"
+							:min="0"
+							:max="9999"
+							placeholder="请输入排序"
+							controls-position="right"
+							style="width: 100%"
+						/>
+					</el-form-item>
+				</el-col>
 
-    <el-col :span="24" class="mb20">
-      <el-form-item label="备注" prop="remark">
-        <el-input 
-          v-model="form.remark" 
-          type="textarea" 
-          :rows="3"
-          placeholder="请输入备注" 
-          maxlength="500"
-          show-word-limit
-          clearable/>
-      </el-form-item>
-      </el-col>
-
-		</el-row>
-      </el-form>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="visible = false">取消</el-button>
-          <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
-        </span>
-      </template>
-    </el-dialog>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="备注" prop="remark">
+						<el-input v-model="form.remark" type="textarea" :rows="3" placeholder="请输入备注" maxlength="500" show-word-limit clearable />
+					</el-form-item>
+				</el-col>
+			</el-row>
+		</el-form>
+		<template #footer>
+			<span class="dialog-footer">
+				<el-button @click="visible = false">取消</el-button>
+				<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+			</span>
+		</template>
+	</el-dialog>
 </template>
 
 <script setup lang="ts" name="MeetingDeskLayoutDialog">
-import { useDict } from '/@/hooks/dict';
-import { useMessage } from "/@/hooks/message";
-import { getObj, addObj, putObj } from '/@/api/integrated/meetingDeskLayout'
-import { rule } from '/@/utils/validate';
-import UploadImage from '/@/components/Upload/Image.vue';
+import { useDict } from "/@/hooks/dict"
+import { useMessage } from "/@/hooks/message"
+import { getObj, addObj, putObj } from "/@/api/integrated/meetingDeskLayout"
+import { rule } from "/@/utils/validate"
+import UploadImage from "/@/components/Upload/Image.vue"
 
-const emit = defineEmits(['refresh']);
+const emit = defineEmits(["refresh"])
 
 // 定义变量内容
-const dataFormRef = ref();
+const dataFormRef = ref()
 const visible = ref(false)
 const loading = ref(false)
 // 定义字典
-const { is_show } = useDict('is_show')
+const { is_show } = useDict("is_show")
 
 // 提交表单数据
 const form = reactive({
-		id:'',
-	  layoutName: '',
-	  layoutCode: '',
-	  description: '',
-	  capacityMin: null as number | null,
-	  capacityMax: null as number | null,
-	  layoutImage: '',
-	  setupTime: null as number | null,
-	  isAvailable: '0', // 默认可用
-	  sortOrder: 0 as number,
-	  remark: '',
-});
+	id: "",
+	layoutName: "",
+	layoutCode: "",
+	description: "",
+	capacityMin: null as number | null,
+	capacityMax: null as number | null,
+	layoutImage: "",
+	setupTime: null as number | null,
+	isAvailable: "0", // 默认可用
+	sortOrder: 0 as number,
+	remark: "",
+})
 
 // 定义校验规则
 const dataRules = ref({
-        layoutName: [{required: true, message: '摆放形式名称不能为空', trigger: 'blur'}],
-        layoutCode: [{required: true, message: '摆放形式编码不能为空', trigger: 'blur'}],
-        capacityMin: [{required: true, message: '最小容纳人数不能为空', trigger: 'change'}],
-        capacityMax: [{required: true, message: '最大容纳人数不能为空', trigger: 'change'}],
+	layoutName: [{ required: true, message: "摆放形式名称不能为空", trigger: "blur" }],
+	layoutCode: [{ required: true, message: "摆放形式编码不能为空", trigger: "blur" }],
+	capacityMin: [{ required: true, message: "最小容纳人数不能为空", trigger: "change" }],
+	capacityMax: [{ required: true, message: "最大容纳人数不能为空", trigger: "change" }],
 })
 
 // 打开弹窗
 const openDialog = (id: string) => {
-  visible.value = true
-  form.id = ''
+	visible.value = true
+	form.id = ""
 
-  // 重置表单数据
+	// 重置表单数据
 	nextTick(() => {
-		dataFormRef.value?.resetFields();
-	});
+		dataFormRef.value?.resetFields()
+	})
 
-  // 获取meetingDeskLayout信息
-  if (id) {
-    form.id = id
-    getmeetingDeskLayoutData(id)
-  } else {
-    // 新增时设置默认值
-    form.isAvailable = '0'; // 默认可用
-    form.sortOrder = 0;
-    form.capacityMin = null;
-    form.capacityMax = null;
-    form.setupTime = null;
-    form.layoutImage = '';
-    form.description = '';
-    form.remark = '';
-  }
-};
+	// 获取meetingDeskLayout信息
+	if (id) {
+		form.id = id
+		getmeetingDeskLayoutData(id)
+	} else {
+		// 新增时设置默认值
+		form.isAvailable = "0" // 默认可用
+		form.sortOrder = 0
+		form.capacityMin = null
+		form.capacityMax = null
+		form.setupTime = null
+		form.layoutImage = ""
+		form.description = ""
+		form.remark = ""
+	}
+}
 
 // 提交
 const onSubmit = async () => {
-	const valid = await dataFormRef.value.validate().catch(() => {});
-	if (!valid) return false;
+	const valid = await dataFormRef.value.validate().catch(() => {})
+	if (!valid) return false
 
 	try {
-    loading.value = true;
-		form.id ? await putObj(form) : await addObj(form);
-		useMessage().success(form.id ? '修改成功' : '添加成功');
-		visible.value = false;
-		emit('refresh');
+		loading.value = true
+		form.id ? await putObj(form) : await addObj(form)
+		useMessage().success(form.id ? "修改成功" : "添加成功")
+		visible.value = false
+		emit("refresh")
 	} catch (err: any) {
-		useMessage().error(err.msg);
+		useMessage().error(err.msg)
 	} finally {
-    loading.value = false;
-  }
-};
-
+		loading.value = false
+	}
+}
 
 // 初始化表单数据
 const getmeetingDeskLayoutData = (id: string) => {
-  // 获取数据
-  loading.value = true
-  getObj(id).then((res: any) => {
-    Object.assign(form, res.data)
-  }).finally(() => {
-    loading.value = false
-  })
-};
+	// 获取数据
+	loading.value = true
+	getObj(id)
+		.then((res: any) => {
+			Object.assign(form, res.data)
+		})
+		.finally(() => {
+			loading.value = false
+		})
+}
 
 // 暴露变量
 defineExpose({
-  openDialog
-});
+	openDialog,
+})
 </script>
 
 <style scoped lang="scss">
 .el-form-item-msg {
-  font-size: 12px;
-  color: #909399;
-  line-height: 1.5;
-  margin-top: 4px;
+	font-size: 12px;
+	color: #909399;
+	line-height: 1.5;
+	margin-top: 4px;
 }
 
 :deep(.el-input-number) {
-  width: 100%;
+	width: 100%;
 }
 
 :deep(.el-textarea) {
-  .el-textarea__inner {
-    font-family: inherit;
-  }
+	.el-textarea__inner {
+		font-family: inherit;
+	}
 }
-</style>
+</style>

src/views/integrated/meeting/meetingDeskLayout/index.vue

@@ -1,69 +1,101 @@
 <template>
-  <div class="layout-padding">
-    <div class="layout-padding-auto layout-padding-view">
-      <el-row>
-        <div class="mb8" style="width: 100%">
-          <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
-            v-auth="'integrated_meetingDeskLayout_add'">
-            新 增
-          </el-button>
-          <el-button plain :disabled="multiple" icon="Delete" type="primary"
-            v-auth="'integrated_meetingDeskLayout_del'" @click="handleDelete(selectObjs)">
-            删除
-          </el-button>
-          <right-toolbar v-model:showSearch="showSearch" :export="'integrated_meetingDeskLayout_export'"
-                @exportExcel="exportExcel" class="ml10 mr20" style="float: right;"
-            @queryTable="getDataList"></right-toolbar>
-        </div>
-      </el-row>
-      <el-table :data="state.dataList" v-loading="state.loading" border 
-        :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
+	<div class="layout-padding">
+		<div class="layout-padding-auto layout-padding-view">
+			<el-row>
+				<div class="mb8" style="width: 100%">
+					<el-button
+						icon="folder-add"
+						type="primary"
+						class="ml10"
+						@click="formDialogRef.openDialog()"
+						v-auth="'integrated_meetingDeskLayout_add'"
+					>
+						新 增
+					</el-button>
+					<el-button
+						plain
+						:disabled="multiple"
+						icon="Delete"
+						type="primary"
+						v-auth="'integrated_meetingDeskLayout_del'"
+						@click="handleDelete(selectObjs)"
+					>
+						删除
+					</el-button>
+					<right-toolbar
+						v-model:showSearch="showSearch"
+						:export="'integrated_meetingDeskLayout_export'"
+						@exportExcel="exportExcel"
+						class="ml10 mr20"
+						style="float: right"
+						@queryTable="getDataList"
+					></right-toolbar>
+				</div>
+			</el-row>
+			<el-table
+				:data="state.dataList"
+				v-loading="state.loading"
+				border
+				:cell-style="tableStyle.cellStyle"
+				:header-cell-style="tableStyle.headerCellStyle"
 				@selection-change="selectionChangHandle"
-        @sort-change="sortChangeHandle">
-        <el-table-column type="selection" width="40" align="center" />
-        <el-table-column type="index" label="#" width="40" />
-          <el-table-column prop="layoutName" label="摆放形式名称"  show-overflow-tooltip/>
-          <el-table-column prop="layoutCode" label="摆放形式编码"  show-overflow-tooltip/>
-          <el-table-column prop="description" label="摆放形式描述"  show-overflow-tooltip/>
-          <el-table-column prop="capacityMin" label="最小容纳人数"  show-overflow-tooltip/>
-          <el-table-column prop="capacityMax" label="最大容纳人数"  show-overflow-tooltip/>
-          <el-table-column prop="layoutImage" label="摆放形式示意图"  show-overflow-tooltip/>
-          <el-table-column prop="setupTime" label="布置所需时间(分钟)"  show-overflow-tooltip/>
-          <el-table-column prop="isAvailable" label="是否可用" show-overflow-tooltip>
-      <template #default="scope">
-                <dict-tag :options="is_show" :value="scope.row.isAvailable"></dict-tag>
-            </template>
-          </el-table-column>
-          <el-table-column prop="sortOrder" label="排序"  show-overflow-tooltip/>
-          <el-table-column prop="remark" label="备注"  show-overflow-tooltip/>
-        <el-table-column label="操作" width="150">
-          <template #default="scope">
-            <el-button icon="edit-pen" text type="primary" v-auth="'integrated_meetingDeskLayout_edit'"
-              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
-            <el-button icon="delete" text type="primary" v-auth="'integrated_meetingDeskLayout_del'" @click="handleDelete([scope.row.id])">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
-    </div>
+				@sort-change="sortChangeHandle"
+			>
+				<el-table-column type="selection" width="40" align="center" />
+				<el-table-column type="index" label="#" width="40" />
+				<el-table-column prop="layoutName" label="摆放形式名称" show-overflow-tooltip />
+				<el-table-column prop="layoutCode" label="摆放形式编码" show-overflow-tooltip />
+				<el-table-column prop="description" label="摆放形式描述" show-overflow-tooltip />
+				<el-table-column prop="capacityMin" label="最小容纳人数" show-overflow-tooltip />
+				<el-table-column prop="capacityMax" label="最大容纳人数" show-overflow-tooltip />
+				<el-table-column prop="layoutImage" label="摆放形式示意图" show-overflow-tooltip>
+					<template #default="scope">
+						<preview-image :src="scope.row.layoutImage" />
+					</template>
+				</el-table-column>
+				<el-table-column prop="setupTime" label="布置所需时间(分钟)" show-overflow-tooltip />
+				<el-table-column prop="isAvailable" label="是否可用" show-overflow-tooltip>
+					<template #default="scope">
+						<dict-tag :options="is_show" :value="scope.row.isAvailable"></dict-tag>
+					</template>
+				</el-table-column>
+				<el-table-column prop="sortOrder" label="排序" show-overflow-tooltip />
+				<el-table-column prop="remark" label="备注" show-overflow-tooltip />
+				<el-table-column label="操作" width="150">
+					<template #default="scope">
+						<el-button
+							icon="edit-pen"
+							text
+							type="primary"
+							v-auth="'integrated_meetingDeskLayout_edit'"
+							@click="formDialogRef.openDialog(scope.row.id)"
+							>编辑</el-button
+						>
+						<el-button icon="delete" text type="primary" v-auth="'integrated_meetingDeskLayout_del'" @click="handleDelete([scope.row.id])"
+							>删除</el-button
+						>
+					</template>
+				</el-table-column>
+			</el-table>
+			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+		</div>
 
-    <!-- 编辑、新增  -->
-    <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
-
-  </div>
+		<!-- 编辑、新增  -->
+		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+	</div>
 </template>
 
 <script setup lang="ts" name="systemMeetingDeskLayout">
-import { BasicTableProps, useTable } from "/@/hooks/table";
-import { fetchList, delObjs } from "/@/api/integrated/meetingDeskLayout";
-import { useMessage, useMessageBox } from "/@/hooks/message";
-import { useDict } from '/@/hooks/dict';
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { fetchList, delObjs } from "/@/api/integrated/meetingDeskLayout"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useDict } from "/@/hooks/dict"
 
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
 // 定义查询字典
 
-const { is_show } = useDict('is_show')
+const { is_show } = useDict("is_show")
 // 定义变量内容
 const formDialogRef = ref()
 // 搜索变量
@@ -74,54 +106,47 @@ const selectObjs = ref([]) as any
 const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
-  queryForm: {},
-  pageList: fetchList
+	queryForm: {},
+	pageList: fetchList,
 })
 
 //  table hook
-const {
-  getDataList,
-  currentChangeHandle,
-  sizeChangeHandle,
-  sortChangeHandle,
-  downBlobFile,
-	tableStyle
-} = useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
-  // 清空搜索条件
-  queryRef.value?.resetFields()
-  // 清空多选
-  selectObjs.value = []
-  getDataList()
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	getDataList()
 }
 
 // 导出excel
 const exportExcel = () => {
-  downBlobFile('/integrated/meetingDeskLayout/export', Object.assign(state.queryForm, { ids: selectObjs }), 'meetingDeskLayout.xlsx')
+	downBlobFile("/integrated/meetingDeskLayout/export", Object.assign(state.queryForm, { ids: selectObjs }), "meetingDeskLayout.xlsx")
 }
 
 // 多选事件
 const selectionChangHandle = (objs: { id: string }[]) => {
-  selectObjs.value = objs.map(({ id }) => id);
-  multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
-  try {
-    await useMessageBox().confirm('此操作将永久删除');
-  } catch {
-    return;
-  }
+	try {
+		await useMessageBox().confirm("此操作将永久删除")
+	} catch {
+		return
+	}
 
-  try {
-    await delObjs(ids);
-    getDataList();
-    useMessage().success('删除成功');
-  } catch (err: any) {
-    useMessage().error(err.msg);
-  }
-};
-</script>
+	try {
+		await delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
+}
+</script>

src/views/integrated/meeting/meetingEquipment/form.vue

@@ -1,137 +1,134 @@
 <template>
-    <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible"
-      :close-on-click-modal="false" draggable>
-      <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
-       <el-row :gutter="24">
-    <el-col :span="24" class="mb20">
-      <el-form-item label="设备名称" prop="name">
-        <el-input v-model="form.name" placeholder="请输入设备名称"/>
-      </el-form-item>
-      </el-col>
+	<el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
+		<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
+			<el-row :gutter="24">
+				<el-col :span="24" class="mb20">
+					<el-form-item label="设备名称" prop="name">
+						<el-input v-model="form.name" placeholder="请输入设备名称" />
+					</el-form-item>
+				</el-col>
 
-    <el-col :span="24" class="mb20">
-  <el-form-item label="图片" prop="picUrl">
-    <upload-img v-model="form.picUrl"></upload-img>
-  </el-form-item>
-  </el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="图片" prop="picUrl">
+						<upload-img v-model:imageUrl="form.picUrl"></upload-img>
+					</el-form-item>
+				</el-col>
 
-    <el-col :span="12" class="mb20">
-      <el-form-item label="排序" prop="sort">
-        <el-input-number :min="1" :max="1000" v-model="form.sort" placeholder="请输入排序"></el-input-number>
-      </el-form-item>
-    </el-col>
+				<el-col :span="12" class="mb20">
+					<el-form-item label="排序" prop="sort">
+						<el-input-number :min="1" :max="1000" v-model="form.sort" placeholder="请输入排序"></el-input-number>
+					</el-form-item>
+				</el-col>
 
-    <el-col :span="12" class="mb20">
-      <el-form-item label="状态" prop="status">
-            <el-radio-group v-model="form.status">
-             <el-radio :label="item.value" v-for="(item, index) in meeting_status" border :key="index">{{ item.label }}
-            </el-radio>
-            </el-radio-group>
-<!--        <el-select v-model="form.status" placeholder="请选择反馈类型">-->
-<!--          <el-option :label="item.label" :value="item.value" v-for="(item, index) in meeting_status" :key="index"></el-option>-->
-<!--        </el-select>-->
-        </el-form-item>
-      </el-col>
-
-
-    <el-col :span="24" class="mb20">
-      <el-form-item label="备注" prop="remark">
-        <el-input type="textarea" v-model="form.remark" placeholder="请输入备注"/>
-      </el-form-item>
-      </el-col>
+				<el-col :span="12" class="mb20">
+					<el-form-item label="状态" prop="status">
+						<el-radio-group v-model="form.status">
+							<el-radio :label="item.value" v-for="(item, index) in meeting_status" border :key="index">{{ item.label }} </el-radio>
+						</el-radio-group>
+						<!--        <el-select v-model="form.status" placeholder="请选择反馈类型">-->
+						<!--          <el-option :label="item.label" :value="item.value" v-for="(item, index) in meeting_status" :key="index"></el-option>-->
+						<!--        </el-select>-->
+					</el-form-item>
+				</el-col>
 
+				<el-col :span="24" class="mb20">
+					<el-form-item label="备注" prop="remark">
+						<el-input type="textarea" v-model="form.remark" placeholder="请输入备注" />
+					</el-form-item>
+				</el-col>
 			</el-row>
-      </el-form>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="visible = false">取消</el-button>
-          <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
-        </span>
-      </template>
-    </el-dialog>
+		</el-form>
+		<template #footer>
+			<span class="dialog-footer">
+				<el-button @click="visible = false">取消</el-button>
+				<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+			</span>
+		</template>
+	</el-dialog>
 </template>
 
 <script setup lang="ts" name="MeetingEquipmentDialog">
-import { useDict } from '/src/hooks/dict';
-import { useMessage } from "/src/hooks/message";
-import { getObj, addObj, putObj } from '/src/api/integrated/meetingEquipment'
-import { rule } from '/src/utils/validate';
-const emit = defineEmits(['refresh']);
+import { useDict } from "/@/hooks/dict"
+import { useMessage } from "/@/hooks/message"
+import { getObj, addObj, putObj } from "/@/api/integrated/meetingEquipment"
+import { rule } from "/@/utils/validate"
+const emit = defineEmits(["refresh"])
 
 // 定义变量内容
-const dataFormRef = ref();
+const dataFormRef = ref()
 const visible = ref(false)
 const loading = ref(false)
 // 定义字典
-const { meeting_status } = useDict('meeting_status')
+const { meeting_status } = useDict("meeting_status")
 
 // 提交表单数据
 const form = reactive({
-		id:'',
-	  name: '',
-	  picUrl: '',
-		sort: 0,
-	  status: '0',
-	  deptId: '',
-	  remark: '',
-});
+	id: "",
+	name: "",
+	picUrl: "",
+	sort: 0,
+	status: "0",
+	deptId: "",
+	remark: "",
+})
 
 // 定义校验规则
 const dataRules = ref({
-        name: [{required: true, message: '设备名称不能为空', trigger: 'blur'}],
-        sort: [{ validator: rule.number, trigger: 'blur' }],
-        status: [{ validator: rule.number, trigger: 'blur' }],
+	name: [{ required: true, message: "设备名称不能为空", trigger: "blur" }],
+	sort: [{ validator: rule.number, trigger: "blur" }],
+	status: [{ validator: rule.number, trigger: "blur" }],
 })
 
 // 打开弹窗
 const openDialog = (id: string) => {
-  visible.value = true
-  form.id = ''
+	visible.value = true
+	form.id = ""
 
-  // 重置表单数据
+	// 重置表单数据
 	nextTick(() => {
-		dataFormRef.value?.resetFields();
-	});
+		dataFormRef.value?.resetFields()
+	})
 
-  // 获取meetingEquipment信息
-  if (id) {
-    form.id = id
-    getmeetingEquipmentData(id)
-  }
-};
+	// 获取meetingEquipment信息
+	if (id) {
+		form.id = id
+		getmeetingEquipmentData(id)
+	}
+}
 
 // 提交
 const onSubmit = async () => {
-	const valid = await dataFormRef.value.validate().catch(() => {});
-	if (!valid) return false;
+	const valid = await dataFormRef.value.validate().catch(() => {})
+	if (!valid) return false
 
 	try {
-    loading.value = true;
-		form.id ? await putObj(form) : await addObj(form);
-		useMessage().success(form.id ? '修改成功' : '添加成功');
-		visible.value = false;
-		emit('refresh');
+		loading.value = true
+		form.id ? await putObj(form) : await addObj(form)
+		useMessage().success(form.id ? "修改成功" : "添加成功")
+		visible.value = false
+		emit("refresh")
 	} catch (err: any) {
-		useMessage().error(err.msg);
+		useMessage().error(err.msg)
 	} finally {
-    loading.value = false;
-  }
-};
-
+		loading.value = false
+	}
+}
 
 // 初始化表单数据
 const getmeetingEquipmentData = (id: string) => {
-  // 获取数据
-  loading.value = true
-  getObj(id).then((res: any) => {
-    Object.assign(form, res.data)
-  }).finally(() => {
-    loading.value = false
-  })
-};
+	// 获取数据
+	loading.value = true
+	getObj(id)
+		.then((res: any) => {
+			Object.assign(form, res.data)
+		})
+		.finally(() => {
+			loading.value = false
+		})
+}
 
 // 暴露变量
 defineExpose({
-  openDialog
-});
+	openDialog,
+})
 </script>

src/views/integrated/meeting/meetingEquipment/index.vue

@@ -1,82 +1,112 @@
 <template>
-  <div class="layout-padding">
-    <div class="layout-padding-auto layout-padding-view">
-      <el-row v-show="showSearch">
-        <el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
-      <el-form-item label="设备名称" prop="name" >
-        <el-input placeholder="请输入设备名称" v-model="state.queryForm.name" />
-      </el-form-item>
-      <el-form-item label="设备状态" prop="status">
-            <el-select v-model="state.queryForm.status" placeholder="请选择状态">
-              <el-option :label="item.label" :value="item.value" v-for="(item, index) in meeting_status" :key="index"></el-option>
-            </el-select>
-      </el-form-item>
-          <el-form-item>
-            <el-button icon="search" type="primary" @click="getDataList">
-              查询
-            </el-button>
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-form>
-      </el-row>
-      <el-row>
-        <div class="mb8" style="width: 100%">
-          <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
-            v-auth="'integrated_meetingEquipment_add'">
-            新 增
-          </el-button>
-          <el-button plain :disabled="multiple" icon="Delete" type="primary"
-            v-auth="'integrated_meetingEquipment_del'" @click="handleDelete(selectObjs)">
-            删除
-          </el-button>
-          <right-toolbar v-model:showSearch="showSearch" :export="'integrated_meetingEquipment_export'"
-                @exportExcel="exportExcel" class="ml10 mr20" style="float: right;"
-            @queryTable="getDataList"></right-toolbar>
-        </div>
-      </el-row>
-      <el-table :data="state.dataList" v-loading="state.loading" border
-        :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
+	<div class="layout-padding">
+		<div class="layout-padding-auto layout-padding-view">
+			<el-row v-show="showSearch">
+				<el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
+					<el-form-item label="设备名称" prop="name">
+						<el-input placeholder="请输入设备名称" v-model="state.queryForm.name" />
+					</el-form-item>
+					<el-form-item label="设备状态" prop="status">
+						<el-select v-model="state.queryForm.status" placeholder="请选择状态">
+							<el-option :label="item.label" :value="item.value" v-for="(item, index) in meeting_status" :key="index"></el-option>
+						</el-select>
+					</el-form-item>
+					<el-form-item>
+						<el-button icon="search" type="primary" @click="getDataList"> 查询 </el-button>
+						<el-button icon="Refresh" @click="resetQuery">重置</el-button>
+					</el-form-item>
+				</el-form>
+			</el-row>
+			<el-row>
+				<div class="mb8" style="width: 100%">
+					<el-button
+						icon="folder-add"
+						type="primary"
+						class="ml10"
+						@click="formDialogRef.openDialog()"
+						v-auth="'integrated_meetingEquipment_add'"
+					>
+						新 增
+					</el-button>
+					<el-button
+						plain
+						:disabled="multiple"
+						icon="Delete"
+						type="primary"
+						v-auth="'integrated_meetingEquipment_del'"
+						@click="handleDelete(selectObjs)"
+					>
+						删除
+					</el-button>
+					<right-toolbar
+						v-model:showSearch="showSearch"
+						:export="'integrated_meetingEquipment_export'"
+						@exportExcel="exportExcel"
+						class="ml10 mr20"
+						style="float: right"
+						@queryTable="getDataList"
+					></right-toolbar>
+				</div>
+			</el-row>
+			<el-table
+				:data="state.dataList"
+				v-loading="state.loading"
+				border
+				:cell-style="tableStyle.cellStyle"
+				:header-cell-style="tableStyle.headerCellStyle"
 				@selection-change="selectionChangHandle"
-        @sort-change="sortChangeHandle">
-        <el-table-column type="selection" width="40" align="center" />
-        <el-table-column type="index" label="#" width="40" />
-          <el-table-column prop="name" label="设备名称"  show-overflow-tooltip/>
-          <el-table-column prop="picUrl" label="图片"  show-overflow-tooltip/>
-          <el-table-column prop="sort" label="排序"  show-overflow-tooltip/>
-          <el-table-column prop="status" label="状态" show-overflow-tooltip>
-      <template #default="scope">
-                <dict-tag :options="meeting_status" :value="scope.row.status"></dict-tag>
-            </template>
-          </el-table-column>
-          <el-table-column prop="remark" label="备注"  show-overflow-tooltip/>
-        <el-table-column label="操作" width="150">
-          <template #default="scope">
-            <el-button icon="edit-pen" text type="primary" v-auth="'integrated_meetingEquipment_edit'"
-              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
-            <el-button icon="delete" text type="primary" v-auth="'integrated_meetingEquipment_del'" @click="handleDelete([scope.row.id])">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
-    </div>
+				@sort-change="sortChangeHandle"
+			>
+				<el-table-column type="selection" width="40" align="center" />
+				<el-table-column type="index" label="#" width="40" />
+				<el-table-column prop="name" label="设备名称" show-overflow-tooltip />
+				<el-table-column prop="picUrl" label="图片" show-overflow-tooltip>
+					<template #default="scope">
+						<preview-image :src="scope.row.picUrl" />
+					</template>
+				</el-table-column>
+				<el-table-column prop="sort" label="排序" show-overflow-tooltip />
+				<el-table-column prop="status" label="状态" show-overflow-tooltip>
+					<template #default="scope">
+						<dict-tag :options="meeting_status" :value="scope.row.status"></dict-tag>
+					</template>
+				</el-table-column>
+				<el-table-column prop="remark" label="备注" show-overflow-tooltip />
+				<el-table-column label="操作" width="150">
+					<template #default="scope">
+						<el-button
+							icon="edit-pen"
+							text
+							type="primary"
+							v-auth="'integrated_meetingEquipment_edit'"
+							@click="formDialogRef.openDialog(scope.row.id)"
+							>编辑</el-button
+						>
+						<el-button icon="delete" text type="primary" v-auth="'integrated_meetingEquipment_del'" @click="handleDelete([scope.row.id])"
+							>删除</el-button
+						>
+					</template>
+				</el-table-column>
+			</el-table>
+			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+		</div>
 
-    <!-- 编辑、新增  -->
-    <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
-
-  </div>
+		<!-- 编辑、新增  -->
+		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+	</div>
 </template>
 
 <script setup lang="ts" name="systemMeetingEquipment">
-import { BasicTableProps, useTable } from "/src/hooks/table";
-import { fetchList, delObjs } from "/src/api/integrated/meetingEquipment";
-import { useMessage, useMessageBox } from "/src/hooks/message";
-import { useDict } from '/src/hooks/dict';
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { fetchList, delObjs } from "/@/api/integrated/meetingEquipment"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useDict } from "/@/hooks/dict"
 
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
 // 定义查询字典
 
-const { meeting_status } = useDict('meeting_status')
+const { meeting_status } = useDict("meeting_status")
 // 定义变量内容
 const formDialogRef = ref()
 // 搜索变量
@@ -87,54 +117,47 @@ const selectObjs = ref([]) as any
 const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
-  queryForm: {},
-  pageList: fetchList
+	queryForm: {},
+	pageList: fetchList,
 })
 
 //  table hook
-const {
-  getDataList,
-  currentChangeHandle,
-  sizeChangeHandle,
-  sortChangeHandle,
-  downBlobFile,
-	tableStyle
-} = useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
-  // 清空搜索条件
-  queryRef.value?.resetFields()
-  // 清空多选
-  selectObjs.value = []
-  getDataList()
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	getDataList()
 }
 
 // 导出excel
 const exportExcel = () => {
-  downBlobFile('/integrated/meetingEquipment/export', Object.assign(state.queryForm, { ids: selectObjs }), 'meetingEquipment.xlsx')
+	downBlobFile("/integrated/meetingEquipment/export", Object.assign(state.queryForm, { ids: selectObjs }), "meetingEquipment.xlsx")
 }
 
 // 多选事件
 const selectionChangHandle = (objs: { id: string }[]) => {
-  selectObjs.value = objs.map(({ id }) => id);
-  multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
-  try {
-    await useMessageBox().confirm('此操作将永久删除');
-  } catch {
-    return;
-  }
+	try {
+		await useMessageBox().confirm("此操作将永久删除")
+	} catch {
+		return
+	}
 
-  try {
-    await delObjs(ids);
-    getDataList();
-    useMessage().success('删除成功');
-  } catch (err: any) {
-    useMessage().error(err.msg);
-  }
-};
+	try {
+		await delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
+}
 </script>

src/views/integrated/meeting/meetingRoom/form.vue

@@ -1,216 +1,209 @@
 <template>
-    <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible"
-      :close-on-click-modal="false" draggable>
-      <el-tabs v-model="activeTab">
-        <el-tab-pane label="基本信息" name="basic">
-          <el-form ref="dataFormRef" :model="form" :rules="dataRules" label-width="90px" v-loading="loading">
-            <el-row :gutter="24">
-              <el-col :span="24" class="mb20">
-                <el-form-item label="会议室名称" prop="roomName">
-                  <el-input v-model="form.roomName" placeholder="请输入会议室名称"/>
-                </el-form-item>
-              </el-col>
+	<el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
+		<el-tabs v-model="activeTab">
+			<el-tab-pane label="基本信息" name="basic">
+				<el-form ref="dataFormRef" :model="form" :rules="dataRules" label-width="90px" v-loading="loading">
+					<el-row :gutter="24">
+						<el-col :span="24" class="mb20">
+							<el-form-item label="会议室名称" prop="roomName">
+								<el-input v-model="form.roomName" placeholder="请输入会议室名称" />
+							</el-form-item>
+						</el-col>
 
-              <el-col :span="24" class="mb20">
-                <el-form-item label="图片" prop="picUrl">
-                  <upload-img v-model="form.picUrl"></upload-img>
-                </el-form-item>
-              </el-col>
+						<el-col :span="24" class="mb20">
+							<el-form-item label="图片" prop="picUrl">
+								<upload-img v-model:imageUrl="form.picUrl"></upload-img>
+							</el-form-item>
+						</el-col>
 
-              <el-col :span="12" class="mb20">
-                <el-form-item label="排序" prop="sort">
-                  <el-input-number v-model="form.sort" placeholder="请输入排序"/>
-                </el-form-item>
-              </el-col>
+						<el-col :span="12" class="mb20">
+							<el-form-item label="排序" prop="sort">
+								<el-input-number v-model="form.sort" placeholder="请输入排序" />
+							</el-form-item>
+						</el-col>
 
-              <el-col :span="12" class="mb20">
-                <el-form-item label="状态" prop="status">
-                  <el-radio-group v-model="form.status">
-                    <el-radio :label="item.value" v-for="(item, index) in meeting_status" border :key="index">{{ item.label }}
-                    </el-radio>
-                  </el-radio-group>
-                </el-form-item>
-              </el-col>
+						<el-col :span="12" class="mb20">
+							<el-form-item label="状态" prop="status">
+								<el-radio-group v-model="form.status">
+									<el-radio :label="item.value" v-for="(item, index) in meeting_status" border :key="index">{{ item.label }} </el-radio>
+								</el-radio-group>
+							</el-form-item>
+						</el-col>
 
-<!--              <el-col :span="12" class="mb20">-->
-<!--                <el-form-item label="默认管理员" prop="adminId">-->
-<!--                  <el-select -->
-<!--                    v-model="form.adminId" -->
-<!--                    placeholder="请选择默认管理员" -->
-<!--                    clearable-->
-<!--                    filterable-->
-<!--                    remote-->
-<!--                    :remote-method="handleAdminUserSearch"-->
-<!--                    :loading="adminUserLoading"-->
-<!--                    @visible-change="handleAdminUserVisibleChange"-->
-<!--                  >-->
-<!--                    <el-option-->
-<!--                      v-for="item in adminUserOptions"-->
-<!--                      :key="item.id"-->
-<!--                      :label="item.nameWithMobile"-->
-<!--                      :value="item.id"-->
-<!--                    />-->
-<!--                  </el-select>-->
-<!--                </el-form-item>-->
-<!--              </el-col>-->
+						<!--              <el-col :span="12" class="mb20">-->
+						<!--                <el-form-item label="默认管理员" prop="adminId">-->
+						<!--                  <el-select -->
+						<!--                    v-model="form.adminId" -->
+						<!--                    placeholder="请选择默认管理员" -->
+						<!--                    clearable-->
+						<!--                    filterable-->
+						<!--                    remote-->
+						<!--                    :remote-method="handleAdminUserSearch"-->
+						<!--                    :loading="adminUserLoading"-->
+						<!--                    @visible-change="handleAdminUserVisibleChange"-->
+						<!--                  >-->
+						<!--                    <el-option-->
+						<!--                      v-for="item in adminUserOptions"-->
+						<!--                      :key="item.id"-->
+						<!--                      :label="item.nameWithMobile"-->
+						<!--                      :value="item.id"-->
+						<!--                    />-->
+						<!--                  </el-select>-->
+						<!--                </el-form-item>-->
+						<!--              </el-col>-->
 
-              <el-col :span="12" class="mb20">
-                <el-form-item label="容纳人数" prop="capacity">
-                  <el-input-number :min="1" :max="1000" v-model="form.capacity" placeholder="请输入容纳人数"></el-input-number>
-                </el-form-item>
-              </el-col>
+						<el-col :span="12" class="mb20">
+							<el-form-item label="容纳人数" prop="capacity">
+								<el-input-number :min="1" :max="1000" v-model="form.capacity" placeholder="请输入容纳人数"></el-input-number>
+							</el-form-item>
+						</el-col>
 
-              <el-col :span="12" class="mb20">
-                <el-form-item label="保洁信息" prop="cleanUserId">
-                  <el-select v-model="form.cleanUserId" placeholder="请选择保洁人员" clearable>
-                    <el-option
-                      v-for="item in cleanUserOptions"
-                      :key="item.id"
-                      :label="item.name || item.label || item.cleanUserName"
-                      :value="item.id || item.value"
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col>
+						<el-col :span="12" class="mb20">
+							<el-form-item label="保洁信息" prop="cleanUserId">
+								<el-select v-model="form.cleanUserId" placeholder="请选择保洁人员" clearable>
+									<el-option
+										v-for="item in cleanUserOptions"
+										:key="item.id"
+										:label="item.name || item.label || item.cleanUserName"
+										:value="item.id || item.value"
+									/>
+								</el-select>
+							</el-form-item>
+						</el-col>
 
-              <el-col :span="12" class="mb20">
-                <el-form-item label="会务人员" prop="serviceUserId">
-                  <el-select v-model="form.serviceUserId" placeholder="请选择会务人员" clearable>
-                    <el-option
-                      v-for="item in serviceUserOptions"
-                      :key="item.id"
-                      :label="item.name || item.label || item.serviceUserName"
-                      :value="item.id || item.value"
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col>
+						<el-col :span="12" class="mb20">
+							<el-form-item label="会务人员" prop="serviceUserId">
+								<el-select v-model="form.serviceUserId" placeholder="请选择会务人员" clearable>
+									<el-option
+										v-for="item in serviceUserOptions"
+										:key="item.id"
+										:label="item.name || item.label || item.serviceUserName"
+										:value="item.id || item.value"
+									/>
+								</el-select>
+							</el-form-item>
+						</el-col>
 
-<!--              <el-col :span="12" class="mb20">-->
-<!--                <el-form-item label="可用时间段" prop="availableTime">-->
-<!--                  <el-input v-model="form.availableTime" placeholder="请输入可用时间段"/>-->
-<!--                </el-form-item>-->
-<!--              </el-col>-->
+						<!--              <el-col :span="12" class="mb20">-->
+						<!--                <el-form-item label="可用时间段" prop="availableTime">-->
+						<!--                  <el-input v-model="form.availableTime" placeholder="请输入可用时间段"/>-->
+						<!--                </el-form-item>-->
+						<!--              </el-col>-->
 
-              <el-col :span="24" class="mb20">
-                <el-form-item label="位置" prop="location">
-                  <el-input v-model="form.location" placeholder="请输入位置"/>
-                </el-form-item>
-              </el-col>
+						<el-col :span="24" class="mb20">
+							<el-form-item label="位置" prop="location">
+								<el-input v-model="form.location" placeholder="请输入位置" />
+							</el-form-item>
+						</el-col>
 
-              <el-col :span="24" class="mb20">
-                <el-form-item label="描述" prop="description">
-                  <editor v-if="visible" v-model:get-html="form.description" placeholder="请输入描述"></editor>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </el-tab-pane>
+						<el-col :span="24" class="mb20">
+							<el-form-item label="描述" prop="description">
+								<editor v-if="visible" v-model:get-html="form.description" placeholder="请输入描述"></editor>
+							</el-form-item>
+						</el-col>
+					</el-row>
+				</el-form>
+			</el-tab-pane>
 
-        <el-tab-pane label="设备信息" name="equipment">
-          <div class="equipment-container">
-            <div class="equipment-header">
-              <el-button type="primary" @click="openEquipmentDialog">选择设备</el-button>
-            </div>
-            <el-table :data="equipmentList" border style="width: 100%">
-              <el-table-column prop="equipmentName" label="设备名称" />
-              <el-table-column prop="quantity" label="数量">
-                <template #default="scope">
-                  <el-input-number v-model="scope.row.quantity" :min="1" :max="100" />
-                </template>
-              </el-table-column>
-              <el-table-column label="操作" width="120">
-                <template #default="scope">
-                  <el-button type="danger" link @click="handleDeleteEquipment(scope.$index)">删除</el-button>
-                </template>
-              </el-table-column>
-            </el-table>
-          </div>
-        </el-tab-pane>
-      </el-tabs>
+			<el-tab-pane label="设备信息" name="equipment">
+				<div class="equipment-container">
+					<div class="equipment-header">
+						<el-button type="primary" @click="openEquipmentDialog">选择设备</el-button>
+					</div>
+					<el-table :data="equipmentList" border style="width: 100%">
+						<el-table-column prop="equipmentName" label="设备名称" />
+						<el-table-column prop="quantity" label="数量">
+							<template #default="scope">
+								<el-input-number v-model="scope.row.quantity" :min="1" :max="100" />
+							</template>
+						</el-table-column>
+						<el-table-column label="操作" width="120">
+							<template #default="scope">
+								<el-button type="danger" link @click="handleDeleteEquipment(scope.$index)">删除</el-button>
+							</template>
+						</el-table-column>
+					</el-table>
+				</div>
+			</el-tab-pane>
+		</el-tabs>
 
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="visible = false">取消</el-button>
-          <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
-        </span>
-      </template>
-    </el-dialog>
+		<template #footer>
+			<span class="dialog-footer">
+				<el-button @click="visible = false">取消</el-button>
+				<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+			</span>
+		</template>
+	</el-dialog>
 
-    <!-- 设备选择弹窗 -->
-    <el-dialog v-model="equipmentDialogVisible" title="选择设备" width="50%" append-to-body>
-      <div class="equipment-select-container">
-        <el-form :model="equipmentQuery" inline>
-          <el-form-item label="设备名称">
-            <el-input v-model="equipmentQuery.equipmentName" placeholder="请输入设备名称" clearable @keyup.enter="handleQuery" />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="handleQuery">查询</el-button>
-            <el-button @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-form>
+	<!-- 设备选择弹窗 -->
+	<el-dialog v-model="equipmentDialogVisible" title="选择设备" width="50%" append-to-body>
+		<div class="equipment-select-container">
+			<el-form :model="equipmentQuery" inline>
+				<el-form-item label="设备名称">
+					<el-input v-model="equipmentQuery.equipmentName" placeholder="请输入设备名称" clearable @keyup.enter="handleQuery" />
+				</el-form-item>
+				<el-form-item>
+					<el-button type="primary" @click="handleQuery">查询</el-button>
+					<el-button @click="resetQuery">重置</el-button>
+				</el-form-item>
+			</el-form>
 
-        <el-table
-          v-loading="equipmentLoading"
-          :data="equipmentOptions"
-          @selection-change="handleSelectionChange"
-          border
-        >
-          <el-table-column type="selection" width="55" />
-          <el-table-column prop="name" label="设备名称" />
-          <el-table-column prop="remark" label="设备描述" />
-        </el-table>
+			<el-table v-loading="equipmentLoading" :data="equipmentOptions" @selection-change="handleSelectionChange" border>
+				<el-table-column type="selection" width="55" />
+				<el-table-column prop="name" label="设备名称" />
+				<el-table-column prop="remark" label="设备描述" />
+			</el-table>
 
-        <el-pagination
-          v-model:current-page="equipmentQuery.pageNum"
-          v-model:page-size="equipmentQuery.pageSize"
-          :total="total"
-          :page-sizes="[10, 20, 30, 50]"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-        />
-      </div>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="equipmentDialogVisible = false">取消</el-button>
-          <el-button type="primary" @click="handleEquipmentConfirm">确认</el-button>
-        </span>
-      </template>
-    </el-dialog>
+			<el-pagination
+				v-model:current-page="equipmentQuery.pageNum"
+				v-model:page-size="equipmentQuery.pageSize"
+				:total="total"
+				:page-sizes="[10, 20, 30, 50]"
+				layout="total, sizes, prev, pager, next, jumper"
+				@size-change="handleSizeChange"
+				@current-change="handleCurrentChange"
+			/>
+		</div>
+		<template #footer>
+			<span class="dialog-footer">
+				<el-button @click="equipmentDialogVisible = false">取消</el-button>
+				<el-button type="primary" @click="handleEquipmentConfirm">确认</el-button>
+			</span>
+		</template>
+	</el-dialog>
 </template>
 
 <script setup lang="ts" name="MeetingRoomDialog">
-import { useDict } from '/src/hooks/dict';
-import { useMessage } from "/src/hooks/message";
-import { getObj, addObj, putObj } from '/src/api/integrated/meetingRoom'
-import { fetchList } from '/src/api/integrated/meetingEquipment'
-import { dropdown } from '/src/api/integrated/cleanUser'
-import { getSimpleUserAll } from '/src/api/admin/user'
-import { rule } from '/src/utils/validate';
-const emit = defineEmits(['refresh']);
+import { useDict } from "/@/hooks/dict"
+import { useMessage } from "/@/hooks/message"
+import { getObj, addObj, putObj } from "/@/api/integrated/meetingRoom"
+import { fetchList } from "/@/api/integrated/meetingEquipment"
+import { dropdown } from "/@/api/integrated/cleanUser"
+import { getSimpleUserAll } from "/@/api/admin/user"
+import { rule } from "/@/utils/validate"
+const emit = defineEmits(["refresh"])
 
 // 定义变量内容
-const dataFormRef = ref();
+const dataFormRef = ref()
 const visible = ref(false)
 const loading = ref(false)
-const activeTab = ref('basic')
+const activeTab = ref("basic")
 const cleanUserOptions = ref<any[]>([])
 const serviceUserOptions = ref<any[]>([])
 const adminUserOptions = ref<any[]>([])
 const adminUserLoading = ref(false)
-const adminUserSearchKeyword = ref('')
+const adminUserSearchKeyword = ref("")
 
 interface Equipment {
-  equipId: string;
-  equipmentName: string;
-  quantity: number;
+	equipId: string
+	equipmentName: string
+	quantity: number
 }
 
 interface EquipmentOption {
-  id: string;
-  name: string;
-  remark: string;
+	id: string
+	name: string
+	remark: string
 }
 
 const equipmentList = ref<Equipment[]>([])
@@ -224,254 +217,256 @@ const total = ref(0)
 
 // 查询参数
 const equipmentQuery = reactive({
-  pageNum: 1,
-  pageSize: 10,
-  equipmentName: ''
+	pageNum: 1,
+	pageSize: 10,
+	equipmentName: "",
 })
 
 // 定义字典
-const { meeting_status } = useDict('meeting_status')
+const { meeting_status } = useDict("meeting_status")
 
 // 提交表单数据
 const form = reactive({
-  id:'',
-  roomName: '',
-  picUrl: '',
-  sort: '',
-  description: '',
-  status: '0',
-  adminId: '',
-  location: '',
-  capacity: 0,
-  availableTime: '',
-  cleanUserId: '',
-  serviceUserId: '',
-});
+	id: "",
+	roomName: "",
+	picUrl: "",
+	sort: "",
+	description: "",
+	status: "0",
+	adminId: "",
+	location: "",
+	capacity: 0,
+	availableTime: "",
+	cleanUserId: "",
+	serviceUserId: "",
+})
 
 // 定义校验规则
 const dataRules = ref({
-  roomName: [{required: true, message: '会议室名称不能为空', trigger: 'blur'}],
-  capacity: [{ validator: rule.number, trigger: 'blur' }],
+	roomName: [{ required: true, message: "会议室名称不能为空", trigger: "blur" }],
+	capacity: [{ validator: rule.number, trigger: "blur" }],
 })
 
 // 打开设备选择弹窗
 const openEquipmentDialog = async () => {
-  equipmentDialogVisible.value = true
-  await getEquipmentList()
+	equipmentDialogVisible.value = true
+	await getEquipmentList()
 }
 
 // 获取设备列表
 const getEquipmentList = async () => {
-  equipmentLoading.value = true
-  try {
-    const res = await fetchList(equipmentQuery)
-    equipmentOptions.value = res.data.records
-    total.value = res.data.total
-  } catch (err: any) {
-    useMessage().error(err.msg)
-  } finally {
-    equipmentLoading.value = false
-  }
+	equipmentLoading.value = true
+	try {
+		const res = await fetchList(equipmentQuery)
+		equipmentOptions.value = res.data.records
+		total.value = res.data.total
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	} finally {
+		equipmentLoading.value = false
+	}
 }
 
 // 查询
 const handleQuery = () => {
-  equipmentQuery.pageNum = 1
-  getEquipmentList()
+	equipmentQuery.pageNum = 1
+	getEquipmentList()
 }
 
 // 重置查询
 const resetQuery = () => {
-  equipmentQuery.equipmentName = ''
-  handleQuery()
+	equipmentQuery.equipmentName = ""
+	handleQuery()
 }
 
 // 选择设备变化
 const handleSelectionChange = (selection: EquipmentOption[]) => {
-  selectedEquipment.value = selection
+	selectedEquipment.value = selection
 }
 
 // 分页大小变化
 const handleSizeChange = (val: number) => {
-  equipmentQuery.pageSize = val
-  getEquipmentList()
+	equipmentQuery.pageSize = val
+	getEquipmentList()
 }
 
 // 页码变化
 const handleCurrentChange = (val: number) => {
-  equipmentQuery.pageNum = val
-  getEquipmentList()
+	equipmentQuery.pageNum = val
+	getEquipmentList()
 }
 
 // 确认选择设备
 const handleEquipmentConfirm = () => {
-  // 过滤掉已经存在的设备
-  const newEquipment = selectedEquipment.value.filter(selected =>
-    !equipmentList.value.some(existing => existing.equipId === selected.id)
-  )
+	// 过滤掉已经存在的设备
+	const newEquipment = selectedEquipment.value.filter(
+		(selected) => !equipmentList.value.some((existing) => existing.equipId === selected.id),
+	)
 
-  // 添加新选择的设备
-  equipmentList.value.push(...newEquipment.map(item => ({
-    equipId: item.id,
-    equipmentName: item.name,
-    quantity: 1
-  })))
+	// 添加新选择的设备
+	equipmentList.value.push(
+		...newEquipment.map((item) => ({
+			equipId: item.id,
+			equipmentName: item.name,
+			quantity: 1,
+		})),
+	)
 
-  equipmentDialogVisible.value = false
+	equipmentDialogVisible.value = false
 }
 
 // 删除设备
 const handleDeleteEquipment = (index: number) => {
-  equipmentList.value.splice(index, 1)
+	equipmentList.value.splice(index, 1)
 }
 
 // 打开弹窗
 const openDialog = (id: string) => {
-  visible.value = true
-  form.id = ''
-  equipmentList.value = []
-  form.cleanUserId = ''
-  form.serviceUserId = ''
+	visible.value = true
+	form.id = ""
+	equipmentList.value = []
+	form.cleanUserId = ""
+	form.serviceUserId = ""
 
-  // 重置表单数据
-  nextTick(() => {
-    dataFormRef.value?.resetFields();
-  });
+	// 重置表单数据
+	nextTick(() => {
+		dataFormRef.value?.resetFields()
+	})
 
-  // 获取用户下拉数据（保洁和会务人员）
-  getUserOptions()
+	// 获取用户下拉数据（保洁和会务人员）
+	getUserOptions()
 
-  // 获取管理员用户数据
-  // getAdminUserOptions()
+	// 获取管理员用户数据
+	// getAdminUserOptions()
 
-  // 获取meetingRoom信息
-  if (id) {
-    form.id = id
-    getmeetingRoomData(id)
-  }
-};
+	// 获取meetingRoom信息
+	if (id) {
+		form.id = id
+		getmeetingRoomData(id)
+	}
+}
 
 // 获取用户下拉选项（保洁和会务人员）
 const getUserOptions = async () => {
-  try {
-    const res = await dropdown()
-    const allUsers = Array.isArray(res.data) ? res.data : []
+	try {
+		const res = await dropdown()
+		const allUsers = Array.isArray(res.data) ? res.data : []
 
-    // 根据type字段分别赋值（type为字符串类型）
-    cleanUserOptions.value = allUsers.filter(user => user.type === '1') // type: '1' 为保洁
-    serviceUserOptions.value = allUsers.filter(user => user.type === '2') // type: '2' 为会务人员
-  } catch (err: any) {
-    console.error('获取用户列表失败:', err)
-  }
+		// 根据type字段分别赋值（type为字符串类型）
+		cleanUserOptions.value = allUsers.filter((user) => user.type === "1") // type: '1' 为保洁
+		serviceUserOptions.value = allUsers.filter((user) => user.type === "2") // type: '2' 为会务人员
+	} catch (err: any) {
+		console.error("获取用户列表失败:", err)
+	}
 }
 
 // 获取管理员用户选项
 const getAdminUserOptions = async (searchKeyword?: string) => {
-  try {
-    adminUserLoading.value = true
-    const params: any = {}
+	try {
+		adminUserLoading.value = true
+		const params: any = {}
 
-    // 如果有搜索关键词，添加到参数中
-    if (searchKeyword) {
-      params.name = searchKeyword
-      params.mobile = searchKeyword
-    }
+		// 如果有搜索关键词，添加到参数中
+		if (searchKeyword) {
+			params.name = searchKeyword
+			params.mobile = searchKeyword
+		}
 
-    const res = await getSimpleUserAll(params)
-    let allUsers = Array.isArray(res.data) ? res.data : []
+		const res = await getSimpleUserAll(params)
+		let allUsers = Array.isArray(res.data) ? res.data : []
 
-    // 如果接口不支持搜索参数，在前端进行过滤
-    if (searchKeyword && allUsers.length > 0) {
-      allUsers = allUsers.filter(user =>
-        user.nameWithMobile.toLowerCase().includes(searchKeyword.toLowerCase())
-      )
-    }
+		// 如果接口不支持搜索参数，在前端进行过滤
+		if (searchKeyword && allUsers.length > 0) {
+			allUsers = allUsers.filter((user) => user.nameWithMobile.toLowerCase().includes(searchKeyword.toLowerCase()))
+		}
 
-    adminUserOptions.value = allUsers
-  } catch (err: any) {
-    console.error('获取管理员用户列表失败:', err)
-    adminUserOptions.value = []
-  } finally {
-    adminUserLoading.value = false
-  }
+		adminUserOptions.value = allUsers
+	} catch (err: any) {
+		console.error("获取管理员用户列表失败:", err)
+		adminUserOptions.value = []
+	} finally {
+		adminUserLoading.value = false
+	}
 }
 
 // 管理员用户搜索处理
 const handleAdminUserSearch = (keyword: string) => {
-  adminUserSearchKeyword.value = keyword
-  getAdminUserOptions(keyword)
+	adminUserSearchKeyword.value = keyword
+	getAdminUserOptions(keyword)
 }
 
 // 管理员用户下拉框显示状态变化
 const handleAdminUserVisibleChange = (visible: boolean) => {
-  if (visible && adminUserOptions.value.length === 0) {
-    getAdminUserOptions()
-  }
+	if (visible && adminUserOptions.value.length === 0) {
+		getAdminUserOptions()
+	}
 }
 
 // 提交
 const onSubmit = async () => {
-  const valid = await dataFormRef.value.validate().catch(() => {});
-  if (!valid) return false;
+	const valid = await dataFormRef.value.validate().catch(() => {})
+	if (!valid) return false
 
-  // 验证设备数量是否填写
-  if (equipmentList.value.some(item => !item.quantity)) {
-    useMessage().error('请填写所有设备的数量')
-    return false
-  }
+	// 验证设备数量是否填写
+	if (equipmentList.value.some((item) => !item.quantity)) {
+		useMessage().error("请填写所有设备的数量")
+		return false
+	}
 
-  try {
-    loading.value = true;
-    const submitData = {
-      ...form,
-      equipmentList: equipmentList.value
-    }
-    form.id ? await putObj(submitData) : await addObj(submitData);
-    useMessage().success(form.id ? '修改成功' : '添加成功');
-    visible.value = false;
-    emit('refresh');
-  } catch (err: any) {
-    useMessage().error(err.msg);
-  } finally {
-    loading.value = false;
-  }
-};
+	try {
+		loading.value = true
+		const submitData = {
+			...form,
+			equipmentList: equipmentList.value,
+		}
+		form.id ? await putObj(submitData) : await addObj(submitData)
+		useMessage().success(form.id ? "修改成功" : "添加成功")
+		visible.value = false
+		emit("refresh")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	} finally {
+		loading.value = false
+	}
+}
 
 // 初始化表单数据
 const getmeetingRoomData = (id: string) => {
-  // 获取数据
-  loading.value = true
-  getObj(id).then((res: any) => {
-    Object.assign(form, res.data)
-    if (res.data.equipmentList) {
-      equipmentList.value = res.data.equipmentList
-    }
-    // 确保保洁和会务信息正确回显
-    if (res.data.cleanUserId) {
-      form.cleanUserId = res.data.cleanUserId
-    }
-    if (res.data.serviceUserId) {
-      form.serviceUserId = res.data.serviceUserId
-    }
-  }).finally(() => {
-    loading.value = false
-  })
-};
+	// 获取数据
+	loading.value = true
+	getObj(id)
+		.then((res: any) => {
+			Object.assign(form, res.data)
+			if (res.data.equipmentList) {
+				equipmentList.value = res.data.equipmentList
+			}
+			// 确保保洁和会务信息正确回显
+			if (res.data.cleanUserId) {
+				form.cleanUserId = res.data.cleanUserId
+			}
+			if (res.data.serviceUserId) {
+				form.serviceUserId = res.data.serviceUserId
+			}
+		})
+		.finally(() => {
+			loading.value = false
+		})
+}
 
 // 暴露变量
 defineExpose({
-  openDialog
-});
+	openDialog,
+})
 </script>
 
 <style scoped>
 .equipment-container {
-  padding: 20px;
+	padding: 20px;
 }
 .equipment-header {
-  margin-bottom: 20px;
+	margin-bottom: 20px;
 }
 .equipment-select-container {
-  padding: 20px;
+	padding: 20px;
 }
 </style>

src/views/integrated/meeting/meetingRoom/index.vue

@@ -1,88 +1,114 @@
 <template>
-  <div class="layout-padding">
-    <div class="layout-padding-auto layout-padding-view">
-      <el-row>
-        <div class="mb8" style="width: 100%">
-          <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
-            v-auth="'integrated_meetingRoom_add'">
-            新 增
-          </el-button>
-          <el-button plain :disabled="multiple" icon="Delete" type="primary"
-            v-auth="'integrated_meetingRoom_del'" @click="handleDelete(selectObjs)">
-            删除
-          </el-button>
-          <right-toolbar v-model:showSearch="showSearch" :export="'integrated_meetingRoom_export'"
-                @exportExcel="exportExcel" class="ml10 mr20" style="float: right;"
-            @queryTable="getDataList"></right-toolbar>
-        </div>
-      </el-row>
-      <el-table :data="state.dataList" v-loading="state.loading" border
-        :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
+	<div class="layout-padding">
+		<div class="layout-padding-auto layout-padding-view">
+			<el-row>
+				<div class="mb8" style="width: 100%">
+					<el-button
+						icon="folder-add"
+						type="primary"
+						class="ml10"
+						@click="formDialogRef.openDialog()"
+						v-auth="'integrated_meetingRoom_add'"
+					>
+						新 增
+					</el-button>
+					<el-button
+						plain
+						:disabled="multiple"
+						icon="Delete"
+						type="primary"
+						v-auth="'integrated_meetingRoom_del'"
+						@click="handleDelete(selectObjs)"
+					>
+						删除
+					</el-button>
+					<right-toolbar
+						v-model:showSearch="showSearch"
+						:export="'integrated_meetingRoom_export'"
+						@exportExcel="exportExcel"
+						class="ml10 mr20"
+						style="float: right"
+						@queryTable="getDataList"
+					></right-toolbar>
+				</div>
+			</el-row>
+			<el-table
+				:data="state.dataList"
+				v-loading="state.loading"
+				border
+				:cell-style="tableStyle.cellStyle"
+				:header-cell-style="tableStyle.headerCellStyle"
 				@selection-change="selectionChangHandle"
-        @sort-change="sortChangeHandle">
-        <el-table-column type="selection" width="40" align="center" />
-        <el-table-column type="index" label="#" width="40" />
-          <el-table-column prop="roomName" label="会议室名称"  show-overflow-tooltip/>
-          <el-table-column prop="picUrl" label="图片"  show-overflow-tooltip/>
-          <el-table-column prop="sort" label="排序"  show-overflow-tooltip/>
-          <el-table-column prop="status" label="状态" show-overflow-tooltip>
-      <template #default="scope">
-                <dict-tag :options="meeting_status" :value="scope.row.status"></dict-tag>
-            </template>
-          </el-table-column>
-<!--          <el-table-column prop="deptId" label="部门id"  show-overflow-tooltip/>-->
-<!--          <el-table-column prop="adminId" label="默认管理员"  show-overflow-tooltip/>-->
-          <el-table-column prop="location" label="位置"  show-overflow-tooltip/>
-          <el-table-column prop="capacity" label="容纳人数"  show-overflow-tooltip/>
-<!--          <el-table-column prop="availableTime" label="可用时间段"  show-overflow-tooltip/>-->
-<!--          <el-table-column prop="cleanUserId" label="保洁人员"  show-overflow-tooltip/>-->
-<!--          <el-table-column prop="serviceUserId" label="会务人员"  show-overflow-tooltip/>-->
-        <el-table-column label="操作" width="200">
-          <template #default="scope">
-            <el-button icon="view" text type="primary" @click="viewBookingDetail(scope.row)">
-              预约详情
-            </el-button>
-            <el-button icon="edit-pen" text type="primary" v-auth="'integrated_meetingRoom_edit'"
-              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
-            <el-button icon="delete" text type="primary" v-auth="'integrated_meetingRoom_del'" @click="handleDelete([scope.row.id])">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
-    </div>
+				@sort-change="sortChangeHandle"
+			>
+				<el-table-column type="selection" width="40" align="center" />
+				<el-table-column type="index" label="#" width="40" />
+				<el-table-column prop="roomName" label="会议室名称" show-overflow-tooltip />
+				<el-table-column prop="picUrl" label="图片" show-overflow-tooltip>
+					<template #default="scope">
+						<preview-image :src="scope.row.picUrl" />
+					</template>
+				</el-table-column>
+				<el-table-column prop="sort" label="排序" show-overflow-tooltip />
+				<el-table-column prop="status" label="状态" show-overflow-tooltip>
+					<template #default="scope">
+						<dict-tag :options="meeting_status" :value="scope.row.status"></dict-tag>
+					</template>
+				</el-table-column>
+				<!--          <el-table-column prop="deptId" label="部门id"  show-overflow-tooltip/>-->
+				<!--          <el-table-column prop="adminId" label="默认管理员"  show-overflow-tooltip/>-->
+				<el-table-column prop="location" label="位置" show-overflow-tooltip />
+				<el-table-column prop="capacity" label="容纳人数" show-overflow-tooltip />
+				<!--          <el-table-column prop="availableTime" label="可用时间段"  show-overflow-tooltip/>-->
+				<!--          <el-table-column prop="cleanUserId" label="保洁人员"  show-overflow-tooltip/>-->
+				<!--          <el-table-column prop="serviceUserId" label="会务人员"  show-overflow-tooltip/>-->
+				<el-table-column label="操作" width="200">
+					<template #default="scope">
+						<el-button icon="view" text type="primary" @click="viewBookingDetail(scope.row)"> 预约详情 </el-button>
+						<el-button
+							icon="edit-pen"
+							text
+							type="primary"
+							v-auth="'integrated_meetingRoom_edit'"
+							@click="formDialogRef.openDialog(scope.row.id)"
+							>编辑</el-button
+						>
+						<el-button icon="delete" text type="primary" v-auth="'integrated_meetingRoom_del'" @click="handleDelete([scope.row.id])"
+							>删除</el-button
+						>
+					</template>
+				</el-table-column>
+			</el-table>
+			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+		</div>
 
-    <!-- 编辑、新增  -->
-    <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+		<!-- 编辑、新增  -->
+		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
 
-    <!-- 预约详情  -->
-    <BookingDetail 
-      v-model:visible="bookingDetailVisible"
-      :room-id="selectedRoomId"
-      :room-name="selectedRoomName"
-    />
-
-  </div>
+		<!-- 预约详情  -->
+		<BookingDetail v-model:visible="bookingDetailVisible" :room-id="selectedRoomId" :room-name="selectedRoomName" />
+	</div>
 </template>
 
 <script setup lang="ts" name="systemMeetingRoom">
-import { BasicTableProps, useTable } from "/src/hooks/table";
-import { fetchList, delObjs } from "/src/api/integrated/meetingRoom";
-import { useMessage, useMessageBox } from "/src/hooks/message";
-import { useDict } from '/src/hooks/dict';
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { fetchList, delObjs } from "/@/api/integrated/meetingRoom"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useDict } from "/@/hooks/dict"
 
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
-const BookingDetail = defineAsyncComponent(() => import('./bookingDetail.vue'));
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
+const BookingDetail = defineAsyncComponent(() => import("./bookingDetail.vue"))
 
 // 定义查询字典
 
-const { meeting_status } = useDict('meeting_status')
+const { meeting_status } = useDict("meeting_status")
 // 定义变量内容
 const formDialogRef = ref()
 // 预约详情相关
-const bookingDetailVisible = ref(false);
-const selectedRoomId = ref('');
-const selectedRoomName = ref('');
+const bookingDetailVisible = ref(false)
+const selectedRoomId = ref("")
+const selectedRoomName = ref("")
 // 搜索变量
 const queryRef = ref()
 const showSearch = ref(true)
@@ -91,61 +117,54 @@ const selectObjs = ref([]) as any
 const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
-  queryForm: {},
-  pageList: fetchList
+	queryForm: {},
+	pageList: fetchList,
 })
 
 //  table hook
-const {
-  getDataList,
-  currentChangeHandle,
-  sizeChangeHandle,
-  sortChangeHandle,
-  downBlobFile,
-	tableStyle
-} = useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
-  // 清空搜索条件
-  queryRef.value?.resetFields()
-  // 清空多选
-  selectObjs.value = []
-  getDataList()
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	getDataList()
 }
 
 // 导出excel
 const exportExcel = () => {
-  downBlobFile('/integrated/meetingRoom/export', Object.assign(state.queryForm, { ids: selectObjs }), 'meetingRoom.xlsx')
+	downBlobFile("/integrated/meetingRoom/export", Object.assign(state.queryForm, { ids: selectObjs }), "meetingRoom.xlsx")
 }
 
 // 多选事件
 const selectionChangHandle = (objs: { id: string }[]) => {
-  selectObjs.value = objs.map(({ id }) => id);
-  multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
 
 // 查看预约详情
 const viewBookingDetail = (row: any) => {
-  selectedRoomId.value = row.id;
-  selectedRoomName.value = row.roomName;
-  bookingDetailVisible.value = true;
-};
+	selectedRoomId.value = row.id
+	selectedRoomName.value = row.roomName
+	bookingDetailVisible.value = true
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
-  try {
-    await useMessageBox().confirm('此操作将永久删除');
-  } catch {
-    return;
-  }
+	try {
+		await useMessageBox().confirm("此操作将永久删除")
+	} catch {
+		return
+	}
 
-  try {
-    await delObjs(ids);
-    getDataList();
-    useMessage().success('删除成功');
-  } catch (err: any) {
-    useMessage().error(err.msg);
-  }
-};
+	try {
+		await delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
+}
 </script>

src/views/integrated/meeting/serviceUser/form.vue

@@ -1,116 +1,113 @@
 <template>
-    <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible"
-      :close-on-click-modal="false" draggable>
-      <el-form ref="dataFormRef" :model="form" :rules="dataRules" label-width="90px" v-loading="loading">
-       <el-row :gutter="24">
-    <el-col :span="12" class="mb20">
-      <el-form-item label="姓名" prop="name">
-        <el-input v-model="form.name" placeholder="请输入姓名"/>
-      </el-form-item>
-      </el-col>
+	<el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
+		<el-form ref="dataFormRef" :model="form" :rules="dataRules" label-width="90px" v-loading="loading">
+			<el-row :gutter="24">
+				<el-col :span="12" class="mb20">
+					<el-form-item label="姓名" prop="name">
+						<el-input v-model="form.name" placeholder="请输入姓名" />
+					</el-form-item>
+				</el-col>
 
-    <el-col :span="12" class="mb20">
-      <el-form-item label="手机号" prop="phone">
-        <el-input v-model="form.phone" placeholder="请输入手机号"/>
-      </el-form-item>
-      </el-col>
-
-
-    <el-col :span="12" class="mb20">
-  <el-form-item label="照片" prop="picUrl">
-    <upload-img v-model="form.picUrl"></upload-img>
-  </el-form-item>
-  </el-col>
+				<el-col :span="12" class="mb20">
+					<el-form-item label="手机号" prop="phone">
+						<el-input v-model="form.phone" placeholder="请输入手机号" />
+					</el-form-item>
+				</el-col>
 
+				<el-col :span="12" class="mb20">
+					<el-form-item label="照片" prop="picUrl">
+						<upload-img v-model:image-url="form.picUrl"></upload-img>
+					</el-form-item>
+				</el-col>
 			</el-row>
-      </el-form>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="visible = false">取消</el-button>
-          <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
-        </span>
-      </template>
-    </el-dialog>
+		</el-form>
+		<template #footer>
+			<span class="dialog-footer">
+				<el-button @click="visible = false">取消</el-button>
+				<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+			</span>
+		</template>
+	</el-dialog>
 </template>
 
 <script setup lang="ts" name="ServiceUserDialog">
-import { ref, reactive, nextTick } from 'vue';
-import { useDict } from '/src/hooks/dict';
-import { useMessage } from "/src/hooks/message";
-import { getObj, addObj, putObj } from '/src/api/integrated/cleanUser'
-import { rule } from '/src/utils/validate';
-const emit = defineEmits(['refresh']);
+import { ref, reactive, nextTick } from "vue"
+import { useMessage } from "/@/hooks/message"
+import { getObj, addObj, putObj } from "/@/api/integrated/cleanUser"
+
+const emit = defineEmits(["refresh"])
 
 // 定义变量内容
-const dataFormRef = ref();
+const dataFormRef = ref()
 const visible = ref(false)
 const loading = ref(false)
 // 定义字典
 
 // 提交表单数据
 const form = reactive({
-		id:'',
-	  name: '',
-	  phone: '',
-	  picUrl: '',
-	  type: '2', // 会务人员
-});
+	id: "",
+	name: "",
+	phone: "",
+	picUrl: "",
+	type: "2", // 会务人员
+})
 
 // 定义校验规则
 const dataRules = ref({
-        name: [{required: true, message: '姓名不能为空', trigger: 'blur'}],
-        phone: [{required: true, message: '手机号不能为空', trigger: 'blur'}],
+	name: [{ required: true, message: "姓名不能为空", trigger: "blur" }],
+	phone: [{ required: true, message: "手机号不能为空", trigger: "blur" }],
 })
 
 // 打开弹窗
 const openDialog = (id: string) => {
-  visible.value = true
-  form.id = ''
+	visible.value = true
+	form.id = ""
 
-  // 重置表单数据
+	// 重置表单数据
 	nextTick(() => {
-		dataFormRef.value?.resetFields();
-	});
+		dataFormRef.value?.resetFields()
+	})
 
-  // 获取serviceUser信息
-  if (id) {
-    form.id = id
-    getserviceUserData(id)
-  }
-};
+	// 获取serviceUser信息
+	if (id) {
+		form.id = id
+		getserviceUserData(id)
+	}
+}
 
 // 提交
 const onSubmit = async () => {
-	const valid = await dataFormRef.value.validate().catch(() => {});
-	if (!valid) return false;
+	const valid = await dataFormRef.value.validate().catch(() => {})
+	if (!valid) return false
 
 	try {
-    loading.value = true;
-		form.id ? await putObj(form) : await addObj(form);
-		useMessage().success(form.id ? '修改成功' : '添加成功');
-		visible.value = false;
-		emit('refresh');
+		loading.value = true
+		form.id ? await putObj(form) : await addObj(form)
+		useMessage().success(form.id ? "修改成功" : "添加成功")
+		visible.value = false
+		emit("refresh")
 	} catch (err: any) {
-		useMessage().error(err.msg);
+		useMessage().error(err.msg)
 	} finally {
-    loading.value = false;
-  }
-};
-
+		loading.value = false
+	}
+}
 
 // 初始化表单数据
 const getserviceUserData = (id: string) => {
-  // 获取数据
-  loading.value = true
-  getObj(id).then((res: any) => {
-    Object.assign(form, res.data)
-  }).finally(() => {
-    loading.value = false
-  })
-};
+	// 获取数据
+	loading.value = true
+	getObj(id)
+		.then((res: any) => {
+			Object.assign(form, res.data)
+		})
+		.finally(() => {
+			loading.value = false
+		})
+}
 
 // 暴露变量
 defineExpose({
-  openDialog
-});
+	openDialog,
+})
 </script>

src/views/integrated/meeting/serviceUser/index.vue

@@ -1,72 +1,95 @@
 <template>
-  <div class="layout-padding">
-    <div class="layout-padding-auto layout-padding-view">
-      <el-row v-show="showSearch">
-        <el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
-      <el-form-item label="姓名" prop="name" >
-        <el-input placeholder="请输入姓名" v-model="state.queryForm.name" />
-      </el-form-item>
-      <el-form-item label="手机号" prop="phone" >
-        <el-input placeholder="请输入手机号" v-model="state.queryForm.phone" />
-      </el-form-item>
-          <el-form-item>
-            <el-button icon="search" type="primary" @click="getDataList">
-              查询
-            </el-button>
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-form>
-      </el-row>
-      <el-row>
-        <div class="mb8" style="width: 100%">
-          <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
-            v-auth="'integrated_cleanUser_add'">
-            新 增
-          </el-button>
-          <el-button plain :disabled="multiple" icon="Delete" type="primary"
-            v-auth="'integrated_cleanUser_del'" @click="handleDelete(selectObjs)">
-            删除
-          </el-button>
-          <right-toolbar v-model:showSearch="showSearch" :export="'integrated_cleanUser_export'"
-                @exportExcel="exportExcel" class="ml10 mr20" style="float: right;"
-            @queryTable="getDataList"></right-toolbar>
-        </div>
-      </el-row>
-      <el-table :data="state.dataList" v-loading="state.loading" border
-        :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
+	<div class="layout-padding">
+		<div class="layout-padding-auto layout-padding-view">
+			<el-row v-show="showSearch">
+				<el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
+					<el-form-item label="姓名" prop="name">
+						<el-input placeholder="请输入姓名" v-model="state.queryForm.name" />
+					</el-form-item>
+					<el-form-item label="手机号" prop="phone">
+						<el-input placeholder="请输入手机号" v-model="state.queryForm.phone" />
+					</el-form-item>
+					<el-form-item>
+						<el-button icon="search" type="primary" @click="getDataList"> 查询 </el-button>
+						<el-button icon="Refresh" @click="resetQuery">重置</el-button>
+					</el-form-item>
+				</el-form>
+			</el-row>
+			<el-row>
+				<div class="mb8" style="width: 100%">
+					<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" v-auth="'integrated_cleanUser_add'">
+						新 增
+					</el-button>
+					<el-button
+						plain
+						:disabled="multiple"
+						icon="Delete"
+						type="primary"
+						v-auth="'integrated_cleanUser_del'"
+						@click="handleDelete(selectObjs)"
+					>
+						删除
+					</el-button>
+					<right-toolbar
+						v-model:showSearch="showSearch"
+						:export="'integrated_cleanUser_export'"
+						@exportExcel="exportExcel"
+						class="ml10 mr20"
+						style="float: right"
+						@queryTable="getDataList"
+					></right-toolbar>
+				</div>
+			</el-row>
+			<el-table
+				:data="state.dataList"
+				v-loading="state.loading"
+				border
+				:cell-style="tableStyle.cellStyle"
+				:header-cell-style="tableStyle.headerCellStyle"
 				@selection-change="selectionChangHandle"
-        @sort-change="sortChangeHandle">
-        <el-table-column type="selection" width="40" align="center" />
-        <el-table-column type="index" label="#" width="40" />
-          <el-table-column prop="name" label="姓名"  show-overflow-tooltip/>
-          <el-table-column prop="phone" label="手机号"  show-overflow-tooltip/>
-          <el-table-column prop="picUrl" label="照片"  show-overflow-tooltip/>
-        <el-table-column label="操作" width="150">
-          <template #default="scope">
-            <el-button icon="edit-pen" text type="primary" v-auth="'integrated_cleanUser_edit'"
-              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
-            <el-button icon="delete" text type="primary" v-auth="'integrated_cleanUser_del'" @click="handleDelete([scope.row.id])">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
-    </div>
+				@sort-change="sortChangeHandle"
+			>
+				<el-table-column type="selection" width="40" align="center" />
+				<el-table-column type="index" label="#" width="40" />
+				<el-table-column prop="name" label="姓名" show-overflow-tooltip />
+				<el-table-column prop="phone" label="手机号" show-overflow-tooltip />
+				<el-table-column prop="picUrl" label="照片" show-overflow-tooltip>
+					<template #default="scope">
+						<preview-image :src="scope.row.picUrl" />
+					</template>
+				</el-table-column>
+				<el-table-column label="操作" width="150">
+					<template #default="scope">
+						<el-button
+							icon="edit-pen"
+							text
+							type="primary"
+							v-auth="'integrated_cleanUser_edit'"
+							@click="formDialogRef.openDialog(scope.row.id)"
+							>编辑</el-button
+						>
+						<el-button icon="delete" text type="primary" v-auth="'integrated_cleanUser_del'" @click="handleDelete([scope.row.id])"
+							>删除</el-button
+						>
+					</template>
+				</el-table-column>
+			</el-table>
+			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+		</div>
 
-    <!-- 编辑、新增  -->
-    <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
-
-  </div>
+		<!-- 编辑、新增  -->
+		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+	</div>
 </template>
 
 <script setup lang="ts" name="systemServiceUser">
-import { ref, reactive, defineAsyncComponent } from 'vue';
-import { BasicTableProps, useTable } from "/src/hooks/table";
-import { fetchList, delObjs } from "/src/api/integrated/cleanUser";
-import { useMessage, useMessageBox } from "/src/hooks/message";
-import { useDict } from '/src/hooks/dict';
+import { ref, reactive, defineAsyncComponent } from "vue"
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { fetchList, delObjs } from "/@/api/integrated/cleanUser"
+import { useMessage, useMessageBox } from "/@/hooks/message"
 
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
 // 定义查询字典
 
 // 定义变量内容
@@ -79,54 +102,47 @@ const selectObjs = ref([]) as any
 const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
-  queryForm: { type: '2' }, // 会务人员
-  pageList: (params: any) => fetchList({ ...params, type: '2' })
+	queryForm: { type: "2" }, // 会务人员
+	pageList: (params: any) => fetchList({ ...params, type: "2" }),
 })
 
 //  table hook
-const {
-  getDataList,
-  currentChangeHandle,
-  sizeChangeHandle,
-  sortChangeHandle,
-  downBlobFile,
-	tableStyle
-} = useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
-  // 清空搜索条件
-  queryRef.value?.resetFields()
-  // 清空多选
-  selectObjs.value = []
-  getDataList()
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	getDataList()
 }
 
 // 导出excel
 const exportExcel = () => {
-  downBlobFile('/integrated/cleanUser/export', Object.assign(state.queryForm, { ids: selectObjs }), 'serviceUser.xlsx')
+	downBlobFile("/integrated/cleanUser/export", Object.assign(state.queryForm, { ids: selectObjs }), "serviceUser.xlsx")
 }
 
 // 多选事件
 const selectionChangHandle = (objs: { id: string }[]) => {
-  selectObjs.value = objs.map(({ id }) => id);
-  multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
-  try {
-    await useMessageBox().confirm('此操作将永久删除');
-  } catch {
-    return;
-  }
+	try {
+		await useMessageBox().confirm("此操作将永久删除")
+	} catch {
+		return
+	}
 
-  try {
-    await delObjs(ids);
-    getDataList();
-    useMessage().success('删除成功');
-  } catch (err: any) {
-    useMessage().error(err.msg);
-  }
-};
+	try {
+		await delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
+}
 </script>

src/views/mch/mch-manage/index.vue

@@ -1,8 +1,7 @@
 <template>
 	<div class="layout-padding">
 		<div class="layout-padding-auto layout-padding-view">
-			<el-form v-if="showSearch" ref="queryRef" :inline="true" :model="state.queryForm"
-				@keyup.enter="getDataList">
+			<el-form v-if="showSearch" ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
 				<el-row>
 					<el-form-item style="width: 250px" label="商户名" prop="name">
 						<el-input v-model="state.queryForm.name" placeholder="商户名" />
@@ -29,22 +28,41 @@
 			</el-form>
 			<el-row>
 				<div class="mb8" style="width: 100%">
-					<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
-						v-auth="'wallet_mchManage_add'">
+					<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" v-auth="'wallet_mchManage_add'">
 						新 增
 					</el-button>
-					<el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'wallet_mchManage_del'"
-						@click="handleDelete(selectObjs)">
+					<el-button
+						plain
+						:disabled="multiple"
+						icon="Delete"
+						type="primary"
+						v-auth="'wallet_mchManage_del'"
+						@click="handleDelete(selectObjs)"
+					>
 						删 除
 					</el-button>
-					<right-toolbar v-model:showSearch="showSearch" :export="'wallet_mchManage_export'"
-						@exportExcel="exportExcel" class="ml10 mr20" style="float: right" @queryTable="getDataList" />
+					<right-toolbar
+						v-model:showSearch="showSearch"
+						:export="'wallet_mchManage_export'"
+						@exportExcel="exportExcel"
+						class="ml10 mr20"
+						style="float: right"
+						@queryTable="getDataList"
+					/>
 				</div>
 			</el-row>
-			<el-table :data="state.dataList" v-loading="state.loading" :header-cell-style="tableStyle.headerCellStyle"
-				:row-class-name="tableRowClassName" @selection-change="selectionChangHandle"
-				@sort-change="sortChangeHandle" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-				:default-expand-all="false" :indent="30" row-key="id">
+			<el-table
+				:data="state.dataList"
+				v-loading="state.loading"
+				:header-cell-style="tableStyle.headerCellStyle"
+				:row-class-name="tableRowClassName"
+				@selection-change="selectionChangHandle"
+				@sort-change="sortChangeHandle"
+				:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+				:default-expand-all="false"
+				:indent="30"
+				row-key="id"
+			>
 				<el-table-column type="selection" width="40" align="center" />
 				<el-table-column type="index" label="#" width="50" align="center" />
 				<el-table-column prop="name" label="商户名" align="left" min-width="160" />
@@ -63,8 +81,7 @@
 				<el-table-column prop="collectionUrlCode" width="150" align="center" label="商户url收款码">
 					<template #default="{ row }">
 						<div class="flex flex-col justify-center items-center">
-							<preview-image :src="row.collectionUrlCode" download
-								:downloadName="`${row.name} 商户url收款码`" />
+							<preview-image :src="row.collectionUrlCode" download :downloadName="`${row.name} 商户url收款码`" />
 						</div>
 					</template>
 				</el-table-column>
@@ -82,15 +99,24 @@
 				</el-table-column>
 				<el-table-column prop="isSyncZy" label="是否同步正元" min-width="120" align="center">
 					<template #default="{ row }">
-						<el-switch :disabled="!useUserInfo().userInfos.roleCodes.includes('ROLE_ADMIN')"
-							active-value="1" inactive-value="0" v-model="row.isSyncZy" @change="isSyncZyChange(row)" />
+						<el-switch
+							:disabled="!useUserInfo().userInfos.roleCodes.includes('ROLE_ADMIN')"
+							active-value="1"
+							inactive-value="0"
+							v-model="row.isSyncZy"
+							@change="isSyncZyChange(row)"
+						/>
 					</template>
 				</el-table-column>
 				<el-table-column label="是否在移动端展示" min-width="150" align="center">
 					<template #default="{ row }">
-						<el-switch :disabled="!useUserInfo().userInfos.roleCodes.includes('ROLE_ADMIN')"
-							active-value="1" inactive-value="0" v-model="row.visibleMobile"
-							@change="visibleMobileChange(row)" />
+						<el-switch
+							:disabled="!useUserInfo().userInfos.roleCodes.includes('ROLE_ADMIN')"
+							active-value="1"
+							inactive-value="0"
+							v-model="row.visibleMobile"
+							@change="visibleMobileChange(row)"
+						/>
 					</template>
 				</el-table-column>
 				<el-table-column width="200" label="支付默认钱包" align="center">
@@ -124,29 +150,28 @@
 				</el-table-column>
 				<el-table-column prop="addressDes" label="地址" :min-width="160" align="center" />
 				<el-table-column prop="createTime" label="创建时间" :min-width="160" align="center" />
-				<el-table-column label="操作" fixed="right"
+				<el-table-column
+					label="操作"
+					fixed="right"
 					v-auths="['wallet_mchManage_refresh_qrcode', 'wallet_mchManage_setting', 'wallet_mchManage_edit', 'wallet_mchManage_del']"
-					min-width="300" align="center">
+					min-width="300"
+					align="center"
+				>
 					<template #default="{ row }">
-						<el-button icon="RefreshRight" text type="primary" v-auth="'wallet_mchManage_refresh_qrcode'"
-							@click="refreshQrcode(row)">
+						<el-button icon="RefreshRight" text type="primary" v-auth="'wallet_mchManage_refresh_qrcode'" @click="refreshQrcode(row)">
 							刷新二维码
 						</el-button>
-						<el-button icon="setting" text type="primary" v-auth="'wallet_mchManage_setting'"
-							@click="settingDialogRef.openDialog(row.id)">
+						<el-button icon="setting" text type="primary" v-auth="'wallet_mchManage_setting'" @click="settingDialogRef.openDialog(row.id)">
 							配置
 						</el-button>
-						<el-button icon="edit-pen" text type="primary" v-auth="'wallet_mchManage_edit'"
-							@click="formDialogRef.openDialog(row.id)">
+						<el-button icon="edit-pen" text type="primary" v-auth="'wallet_mchManage_edit'" @click="formDialogRef.openDialog(row.id)">
 							编辑
 						</el-button>
-						<el-button icon="delete" text type="primary" v-auth="'wallet_mchManage_del'"
-							@click="handleDelete([row.id])"> 删除 </el-button>
+						<el-button icon="delete" text type="primary" v-auth="'wallet_mchManage_del'" @click="handleDelete([row.id])"> 删除 </el-button>
 					</template>
 				</el-table-column>
 			</el-table>
-			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle"
-				v-bind="state.pagination" />
+			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
 		</div>
 
 		<!-- 编辑、新增  -->

src/views/panel/index.vue

@@ -14,12 +14,9 @@ const loading = ref(false)
 
 onMounted(async () => {
     try {
-        // 是否生成环境
-        if (import.meta.env.VITE_ENV === "prod") {
-            openPlanUrl("https://stgl.pj.gov.cn/cockpit/#/canteen")
-        } else {
-            openPlanUrl("http://localhost:5173/#/canteen")
-        }
+        const isDev = import.meta.env.MODE === "development"
+        const url = isDev ? "http://localhost:5173/#/canteen" : "https://stgl.pj.gov.cn/cockpit/#/canteen"
+        openPlanUrl(url)
         loading.value = true
         router.back()
     } catch (error: any) {

src/views/panel/setting/components/nutrition-setting.vue

@@ -42,6 +42,19 @@
         </el-form-item>
         <!-- **************************** end 营养分析 end **************************** -->
 
+
+        <!-- **************************** start 今日菜品复购排行 start **************************** -->
+        <el-divider class="my-12">今日菜品复购排行</el-divider>
+        <el-form-item prop="nutritionSetting.repurchaseTopExcludeCategoryIds">
+            <template #label>
+                <div class="flex items-center gap-1">
+                    <span>需要排除的菜品分类</span>
+                </div>
+            </template>
+            <select-ctcg v-model="form.nutritionSetting.repurchaseTopExcludeCategoryIds" multiple
+                placeholder="请选择需要排除的菜品分类" />
+        </el-form-item>
+        <!-- **************************** end 今日菜品复购排行 end **************************** -->
     </el-form>
 </template>
 
@@ -66,6 +79,8 @@ const form = reactive<any>({
         scCategoryIds: [],
         // 主食菜品分类
         zsCategoryIds: [],
+        // 复购排行需要排除的菜品分类
+        repurchaseTopExcludeCategoryIds: [],
     },
 })
 
@@ -91,6 +106,7 @@ async function getSetting() {
                 hcCategoryIds: [],
                 scCategoryIds: [],
                 zsCategoryIds: [],
+                repurchaseTopExcludeCategoryIds: [],
             }
         }
         if (data) {

src/views/supermarket/mallProduct/form.vue

@@ -30,18 +30,18 @@
 							</el-form-item>
 						</el-col>
 
-<!--						<el-col :span="12" class="mb20">-->
-<!--							<el-form-item label="计量单位" prop="unit">-->
-<!--								<el-input v-model="form.unit" placeholder="请输入计量单位" />-->
-<!--							</el-form-item>-->
-<!--						</el-col>-->
-            <el-col :span="8" class="mb20">
-              <el-form-item label="商品性质" prop="productNature">
-                <el-select v-model="form.productNature" placeholder="请选择商品性质">
-                  <el-option :value="item.value" :label="item.label" v-for="(item, index) in supermarket_nature" :key="index" />
-                </el-select>
-              </el-form-item>
-            </el-col>
+						<!--						<el-col :span="12" class="mb20">-->
+						<!--							<el-form-item label="计量单位" prop="unit">-->
+						<!--								<el-input v-model="form.unit" placeholder="请输入计量单位" />-->
+						<!--							</el-form-item>-->
+						<!--						</el-col>-->
+						<el-col :span="8" class="mb20">
+							<el-form-item label="商品性质" prop="productNature">
+								<el-select v-model="form.productNature" placeholder="请选择商品性质">
+									<el-option :value="item.value" :label="item.label" v-for="(item, index) in supermarket_nature" :key="index" />
+								</el-select>
+							</el-form-item>
+						</el-col>
 
 						<el-col :span="12" class="mb20">
 							<el-form-item label="状态" prop="status">
@@ -72,7 +72,7 @@
 
 						<el-col :span="24" class="mb20">
 							<el-form-item label="轮播图" prop="carouselImages">
-								<upload-img v-model:imageUrl="form.carouselImages" />
+								<upload-imgs v-model="form.carouselImages" />
 							</el-form-item>
 						</el-col>
 
@@ -134,7 +134,7 @@
 									<div class="sku-cell">
 										<el-input-number
 											v-model="scope.row.price"
-											:precision="2"
+											:precision="3"
 											:min="0"
 											size="small"
 											placeholder="0.00"
@@ -170,13 +170,13 @@
 								</template>
 							</el-table-column>
 
-							<el-table-column label="重量(克)" min-width="120" align="center">
+							<!-- <el-table-column label="重量(克)" min-width="120" align="center">
 								<template #default="scope">
 									<div class="sku-cell">
 										<el-input-number v-model="scope.row.weightG" :min="0" size="small" placeholder="0" />
 									</div>
 								</template>
-							</el-table-column>
+							</el-table-column> -->
 
 							<el-table-column label="状态" min-width="100" align="center">
 								<template #default="scope">

src/views/supermarketerp/report/inventory/index.vue

@@ -68,19 +68,19 @@
 				<el-table-column prop="packageNum" label="装数" show-overflow-tooltip min-width="80" align="right" />
 				<el-table-column prop="purchasePrice" label="参考进价(元)" show-overflow-tooltip min-width="110" align="right" />
 				<el-table-column prop="retailPrice" label="零售价(元)" show-overflow-tooltip min-width="110" align="right" />
-				
+
 				<el-table-column label="期初" align="center">
 					<el-table-column prop="openingQty" label="期初库存" show-overflow-tooltip min-width="100" align="right" />
 					<el-table-column prop="openingAmount" label="期初金额(元)" show-overflow-tooltip min-width="110" align="right" />
 				</el-table-column>
-				
+
 				<el-table-column label="采购" align="center">
 					<el-table-column prop="purchaseInQty" label="采购入库数量" show-overflow-tooltip min-width="120" align="right" />
 					<el-table-column prop="purchaseInAmount" label="采购入库金额(元)" show-overflow-tooltip min-width="130" align="right" />
 					<el-table-column prop="purchaseReturnQty" label="采购退货数量" show-overflow-tooltip min-width="120" align="right" />
 					<el-table-column prop="purchaseReturnAmount" label="采购退货金额(元)" show-overflow-tooltip min-width="130" align="right" />
 				</el-table-column>
-				
+
 				<el-table-column label="销售" align="center">
 					<el-table-column prop="salesQty" label="销售数量" show-overflow-tooltip min-width="100" align="right" />
 					<el-table-column prop="salesAmount" label="销售金额(元)" show-overflow-tooltip min-width="110" align="right" />
@@ -89,18 +89,26 @@
 					<el-table-column prop="actualSalesQty" label="实际销售数量" show-overflow-tooltip min-width="120" align="right" />
 					<el-table-column prop="actualSalesAmount" label="实际销售金额(元)" show-overflow-tooltip min-width="130" align="right" />
 				</el-table-column>
-				
+
 				<el-table-column label="成本与毛利" align="center">
-					<el-table-column prop="salesCost" label="销售成本(元)" show-overflow-tooltip min-width="120" align="right" />
-					<el-table-column prop="grossProfit" label="销售毛利(元)" show-overflow-tooltip min-width="120" align="right" />
+					<el-table-column prop="salesCost" label="销售成本(元)" show-overflow-tooltip min-width="120" align="right">
+						<template #default="{ row }">
+							{{ row.salesCost.toFixed(2) }}
+						</template>
+					</el-table-column>
+					<el-table-column prop="grossProfit" label="销售毛利(元)" show-overflow-tooltip min-width="120" align="right">
+						<template #default="{ row }">
+							{{ row.grossProfit.toFixed(2) }}
+						</template>
+					</el-table-column>
 				</el-table-column>
-				
+
 				<el-table-column label="期末" align="center">
 					<el-table-column prop="closingQty" label="期末数量" show-overflow-tooltip min-width="100" align="right" />
 					<el-table-column prop="closingAmount" label="期末库存金额(元)" show-overflow-tooltip min-width="130" align="right" />
 					<el-table-column prop="closingRetailAmount" label="期末库存售额(元)" show-overflow-tooltip min-width="130" align="right" />
 				</el-table-column>
-				
+
 				<el-table-column prop="firstPurchaseDate" label="首次进货日" show-overflow-tooltip min-width="120" />
 			</el-table>
 			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
@@ -157,7 +165,7 @@ const exportExcel = () => {
 		params.endDate = params.dateRange[1]
 	}
 	delete params.dateRange
-	
+
 	downBlobFile("/supermarket/superMarketReport/inventory/export", params, "进销存报表.xlsx")
 }
 
@@ -187,4 +195,3 @@ onMounted(() => {
 	getCategoryList()
 })
 </script>
-

src/views/wallet/wallet-manage/index.vue

@@ -1,43 +1,65 @@
 <template>
 	<div class="layout-padding">
 		<div class="layout-padding-auto layout-padding-view">
-			<DraggableDepTree ref="draggableDepTreeRef" placeholder="请输入部门名称" :show-expand="true"
-				@getSelectNode="handleGetSelectNode" switch-inactive-text="包含" switch-active-text="不包含"
-				:defaultTreeWidth="20" :nodeClickable="false">
+			<DraggableDepTree
+				ref="draggableDepTreeRef"
+				placeholder="请输入部门名称"
+				:show-expand="true"
+				@getSelectNode="handleGetSelectNode"
+				switch-inactive-text="包含"
+				switch-active-text="不包含"
+				:defaultTreeWidth="20"
+				:nodeClickable="false"
+			>
 				<template #default>
 					<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
-						<el-row>
-							<el-form-item style="width: 300px" label="用户" prop="userId">
-								<select-user v-model="state.queryForm.userId" />
-							</el-form-item>
-							<el-form-item style="width: 200px" label="饭卡卡号" prop="cardNumber">
-								<el-input v-model="state.queryForm.cardNumber" placeholder="饭卡卡号" clearable />
-							</el-form-item>
-							<el-form-item style="width: 200px" label="饭卡类型" prop="walletTypeId">
-								<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型"
-									clearable />
-							</el-form-item>
-							<el-form-item>
-								<el-button icon="Search" type="primary" @click="getDataList">{{ $t("common.queryBtn")
-								}}</el-button>
-								<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
-							</el-form-item>
-						</el-row>
+						<el-form-item style="width: 300px" label="用户" prop="userId">
+							<select-user v-model="state.queryForm.userId" />
+						</el-form-item>
+						<el-form-item style="width: 200px" label="饭卡卡号" prop="cardNumber">
+							<el-input v-model="state.queryForm.cardNumber" placeholder="饭卡卡号" clearable />
+						</el-form-item>
+						<el-form-item style="width: 200px" label="饭卡类型" prop="walletTypeId">
+							<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型" clearable />
+						</el-form-item>
+						<el-form-item>
+							<el-button icon="Search" type="primary" @click="getDataList">{{ $t("common.queryBtn") }}</el-button>
+							<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
+						</el-form-item>
 					</el-form>
 					<el-row>
 						<div class="mb8" style="width: 100%">
-							<el-button plain :disabled="multiple" icon="Delete" type="primary"
-								v-auth="'wallet_walletManage_del'" @click="handleDelete(selectObjs)">
+							<el-button
+								plain
+								:disabled="multiple"
+								icon="Delete"
+								type="primary"
+								v-auth="'wallet_walletManage_del'"
+								@click="handleDelete(selectObjs)"
+							>
 								删除
 							</el-button>
-							<right-toolbar v-model:showSearch="showSearch" :export="'wallet_walletManage_export'"
-								@exportExcel="exportExcel" class="ml10 mr20" style="float: right"
-								@queryTable="getDataList"></right-toolbar>
+							<right-toolbar
+								v-model:showSearch="showSearch"
+								:export="'wallet_walletManage_export'"
+								@exportExcel="exportExcel"
+								class="ml10 mr20"
+								style="float: right"
+								@queryTable="getDataList"
+							></right-toolbar>
 						</div>
 					</el-row>
-					<el-table :data="state.dataList" v-loading="state.loading" border :summary-method="getSummaries"
-						show-summary :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
-						@selection-change="selectionChangHandle" @sort-change="sortChangeHandle">
+					<el-table
+						:data="state.dataList"
+						v-loading="state.loading"
+						border
+						:summary-method="getSummaries"
+						show-summary
+						:cell-style="tableStyle.cellStyle"
+						:header-cell-style="tableStyle.headerCellStyle"
+						@selection-change="selectionChangHandle"
+						@sort-change="sortChangeHandle"
+					>
 						<el-table-column type="selection" width="40" align="center" />
 						<el-table-column type="index" label="#" width="80" />
 						<el-table-column prop="username" width="100" label="用户" />
@@ -81,29 +103,49 @@
 						</el-table-column>
 						<el-table-column v-if="false" prop="activeBindStatus" width="120" label="饭卡绑定状态" />
 						<el-table-column prop="createTime" width="200" label="创建时间" />
-						<el-table-column label="操作" fixed="right" width="250" v-auths="[
-							'wallet_walletManage_edit',
-							'wallet_walletTransaction_update_balance',
-							'wallet_walletRuleTransaction_transfer_accounts',
-						]">
+						<el-table-column
+							label="操作"
+							fixed="right"
+							width="250"
+							v-auths="[
+								'wallet_walletManage_edit',
+								'wallet_walletTransaction_update_balance',
+								'wallet_walletRuleTransaction_transfer_accounts',
+							]"
+						>
 							<template #default="{ row }">
 								<div class="flex items-start">
-									<el-button icon="InfoFilled" text type="primary" v-auth="'wallet_walletManage_edit'"
-										@click="formDialogRef.openDialog(row.id)">详情</el-button>
-									<el-button icon="Money" text type="primary"
+									<el-button
+										icon="InfoFilled"
+										text
+										type="primary"
+										v-auth="'wallet_walletManage_edit'"
+										@click="formDialogRef.openDialog(row.id)"
+										>详情</el-button
+									>
+									<el-button
+										icon="Money"
+										text
+										type="primary"
 										v-auth="'wallet_walletTransaction_update_balance'"
-										@click="changeBalanceRef.openDialog(row.userId, row.id)">充值/扣款</el-button>
-									<el-button v-if="row.isRule == 1" icon="SwitchFilled" text type="primary"
+										@click="changeBalanceRef.openDialog(row.userId, row.id)"
+										>充值/扣款</el-button
+									>
+									<el-button
+										v-if="row.isRule == 1"
+										icon="SwitchFilled"
+										text
+										type="primary"
 										v-auth="'wallet_walletRuleTransaction_transfer'"
-										@click="doTransferAccounts(row)">
+										@click="doTransferAccounts(row)"
+									>
 										转账
 									</el-button>
 								</div>
 							</template>
 						</el-table-column>
 					</el-table>
-					<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle"
-						v-bind="state.pagination" />
+					<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
 				</template>
 			</DraggableDepTree>
 		</div>

src/views/wallet/wallet-manage/transfer-accounts.vue

@@ -33,13 +33,15 @@
 						<span class="color-primary">{{ userConfigDetail.sourceWalletTypeName }}</span>
 					</el-descriptions-item>
 					<el-descriptions-item :rowspan="1" label="源钱包余额: ">
-						<span class="color-success">{{ displayPrice(userConfigDetail.sourceWalletBalance - form.balance * 100) }}</span>
+						<span class="color-success">{{ displayPrice(userConfigDetail.sourceWalletBalance - form.balance
+							* 100) }}</span>
 					</el-descriptions-item>
 					<el-descriptions-item :rowspan="1" label="目标钱包: ">
 						<span class="color-primary">{{ userConfigDetail.targetWalletTypeName }}</span>
 					</el-descriptions-item>
 					<el-descriptions-item :rowspan="1" label="目标钱包余额: ">
-						<span class="color-success">{{ displayPrice(userConfigDetail.targetWalletBalance + form.balance * 100) }}</span>
+						<span class="color-success">{{ displayPrice(userConfigDetail.targetWalletBalance + form.balance
+							* 100) }}</span>
 					</el-descriptions-item>
 				</el-descriptions>
 				<el-descriptions :column="2" border title="转账统计">
@@ -52,8 +54,8 @@
 					<el-descriptions-item :rowspan="1" label="源钱包支持最大转账金额: ">
 						<span class="color-primary">{{ displayPrice(userConfigDetail.maxTransferBalance) }}</span>
 					</el-descriptions-item>
-					<el-descriptions-item :rowspan="1" label="目标钱包已转账金额: "
-						>{{ displayPrice(userConfigDetail.totalTransferBalance) }}
+					<el-descriptions-item :rowspan="1" label="目标钱包已转账金额: ">{{
+						displayPrice(userConfigDetail.totalTransferBalance) }}
 					</el-descriptions-item>
 				</el-descriptions>
 			</div>
@@ -61,19 +63,14 @@
 				<span>用户</span>
 				<span class="color-primary">{{ walletDetail.username }}</span>
 				<span>将</span>
-				<el-input-number class="mx-1" style="width: 200px" :min="1" :max="5000" v-model="form.balance" placeholder="" />
+				<el-input-number class="mx-1" style="width: 200px" :min="1" :max="5000" v-model="form.balance"
+					placeholder="" />
 				<span>元从</span>
 				<span class="color-primary">{{ walletDetail.walletTypeName }}</span>
 				<span>转到</span>
-				<select-wallet-type
-					class="mx-1"
-					:clearable="false"
-					:autoFirst="true"
-					:apiParams="{ notWalletTypeIds: walletDetail.walletTypeId }"
-					style="width: 200px"
-					v-model="form.targetWalletTypeId"
-					@change="selectWalletTypeChange"
-				/>
+				<select-wallet-type class="mx-1" :clearable="false" :autoFirst="true"
+					:apiParams="{ notWalletTypeIds: walletDetail.walletTypeId }" style="width: 200px"
+					v-model="form.targetWalletTypeId" @change="selectWalletTypeChange" />
 			</div>
 		</div>
 		<template #footer>
@@ -182,7 +179,7 @@ const getUserConfig = async (userId: any, sourceWalletId: any, targetWalletId: a
 	const _pa = {
 		userId: userId,
 		sourceWalletTypeId: sourceWalletId,
-		targetWalletTypeId: targetWalletId,
+		targetWalletTypeId: targetWalletId ?? null,
 	}
 	try {
 		const { data } = await walletRuleJoin.userConfig(_pa)

src/views/wallet/wallet-setting/components/recharge-package/form.vue

@@ -1,6 +1,7 @@
 <template>
 	<el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" width="30%" :close-on-click-modal="false" draggable>
-		<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
+		<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px"
+			v-loading="loading">
 			<el-row :gutter="24">
 				<el-col :span="24" class="mb20">
 					<el-form-item label="套餐名" prop="name">
@@ -89,7 +90,7 @@ const openDialog = (id: string) => {
 
 // 提交
 const onSubmit = async () => {
-	const valid = await dataFormRef.value.validate().catch(() => {})
+	const valid = await dataFormRef.value.validate().catch(() => { })
 	if (!valid) return false
 
 	try {