Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud

src/api/integrated/feedback.ts

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

src/api/integrated/feedbackLog.ts

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

src/api/integrated/meetingEquipment.ts

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

src/api/integrated/meetingRoom.ts

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

src/components/Select/SelectMch.vue

@@ -32,9 +32,11 @@ const selectId = defineModel()
 
 export type Props = {
 	placeholder?: string
+	apiParams?: any
 }
 const props = withDefaults(defineProps<Props>(), {
 	placeholder: "请选择",
+	apiParams: {},
 })
 
 const queryForm = reactive<any>({
@@ -64,6 +66,7 @@ async function getOptions() {
 		state.loading = true
 		const _pa = {
 			...queryForm,
+			...props.apiParams,
 		}
 		const { data } = await mchApi.select(_pa)
 		state.options = data.records ?? []

src/views/canteen/canteenDailyMenu/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="layout-padding" v-loading="loading">
 		<el-form-item label="商户" prop="merchantId" class="w-60 ml-10 my-6">
-			<select-mch v-model="merchantId" />
+			<select-mch v-model="merchantId" :apiParams="{ types: '1' }" />
 		</el-form-item>
 		<h1 class="mx-auto text-5xl mt-[-40px]">今日菜谱</h1>
 

src/views/canteen/canteenSpu/form.vue

@@ -49,11 +49,11 @@
 					</el-form-item>
 				</el-col>
 
-				<el-col :span="14" class="mb20">
+<!--				<el-col :span="14" class="mb20">-->
-					<el-form-item label="库存" prop="stock">
+<!--					<el-form-item label="库存" prop="stock">-->
-						<el-input-number v-model="form.stock" :min="0" :precision="0" />
+<!--						<el-input-number v-model="form.stock" :min="0" :precision="0" />-->
-					</el-form-item>
+<!--					</el-form-item>-->
-				</el-col>
+<!--				</el-col>-->
 
 				<!--				<el-col :span="8" class="mb20">-->
 				<!--					<el-form-item label="赠送积分" prop="giveIntegral">-->

src/views/canteen/canteenSpu/index.vue

@@ -79,10 +79,10 @@
 						{{ displayPrice(scope.row.marketPrice) }}
 					</template>
 				</el-table-column>
-				<el-table-column prop="costPrice" label="成本价" show-overflow-tooltip />
+<!--				<el-table-column prop="costPrice" label="成本价" show-overflow-tooltip />-->
-				<el-table-column prop="stock" label="库存" show-overflow-tooltip />
+<!--				<el-table-column prop="stock" label="库存" show-overflow-tooltip />-->
 				<!-- <el-table-column prop="giveIntegral" label="赠送积分" show-overflow-tooltip /> -->
-				<el-table-column prop="salesCount" label="商品销量" show-overflow-tooltip />
+<!--				<el-table-column prop="salesCount" label="商品销量" show-overflow-tooltip />-->
 				<!-- <el-table-column prop="virtualSalesCount" label="虚拟销量" show-overflow-tooltip /> -->
 				<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip min-width="160" />
 				<el-table-column label="操作" width="150" fixed="right">

src/views/hard/hard-payType-total/index.vue

@@ -135,7 +135,7 @@ const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, do
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile("/hard/hard-total/export-payType", Object.assign(state.queryForm), "设备交易记录.xlsx")
+	downBlobFile("/hard/hard-total/export-payType", Object.assign(state.queryForm), "支付方式交易记录.xlsx")
 }
 
 const getSummaries = (param: any) => {

src/views/hard/hard-sb/index.vue

@@ -0,0 +1,188 @@
+<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"
+			>
+				<template #default>
+					<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+						<el-row>
+							<el-form-item style="width: 200px" label="用餐时间段" prop="hourType" v-if="false">
+								<dict-select v-model="state.queryForm.hourType" dict-code="daily_menu" />
+							</el-form-item>
+							<el-form-item style="width: 450px" label="创建时间" prop="payTimeList">
+								<el-date-picker v-model="state.queryForm.payTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
+							</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%">
+							<right-toolbar
+								:search="false"
+								v-model:showSearch="showSearch"
+								:export="'wallet_walletTransaction_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"
+						:summary-method="getSummaries"
+						show-summary
+						@selection-change="selectionChangHandle"
+						@sort-change="sortChangeHandle"
+					>
+						<el-table-column type="selection" width="80" align="center" />
+						<el-table-column type="index" label="#" width="50" />
+						<el-table-column label="设备名" align="center">
+							<template #default="{ row }">
+								<span>{{ row.hardName }}</span>
+								<dict-tag :options="hard_pay_type" :value="row.payType" />
+							</template>
+						</el-table-column>
+						<el-table-column label="流水金额" align="center" prop="totalPayPrice">
+							<template #default="{ row }">
+								<span class="color-primary">
+									{{ displayPrice(row.totalPayPrice) }}
+								</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="流水次数" align="center" prop="totalPayCount">
+							<template #default="{ row }">
+								<span class="color-primary">
+									{{ row.totalPayCount || 0 }}
+								</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="退款金额" align="center" prop="totalRefundPrice">
+							<template #default="{ row }">
+								<span class="color-danger">
+									{{ displayPrice(row.totalRefundPrice) }}
+								</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="退款次数" align="center" prop="totalRefundCount">
+							<template #default="{ row }">
+								<span class="color-danger">
+									{{ row.totalRefundCount || 0 }}
+								</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="实际消费金额" align="center" prop="totalProfitPrice">
+							<template #default="{ row }">
+								<span class="color-success">
+									{{ displayPrice(row.totalProfitPrice) }}
+								</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="实际消费次数" align="center" prop="totalProfitCount">
+							<template #default="{ row }">
+								<span class="color-success">
+									{{ row.totalProfitCount || 0 }}
+								</span>
+							</template>
+						</el-table-column>
+					</el-table>
+				</template>
+			</DraggableDepTree>
+		</div>
+	</div>
+</template>
+
+<script setup lang="ts" name="hard-sb">
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import * as hardTotalApi from "/@/api/hard/hard-total"
+import { displayPrice } from "/@/utils/formatMoney"
+import { useDict } from "/@/hooks/dict"
+
+// 搜索变量
+const queryRef = ref()
+const showSearch = ref(true)
+
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+const draggableDepTreeRef = ref() // 树组件ref引用
+
+// 定义查询字典
+const { hard_pay_type } = useDict("hard_pay_type")
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+	isPage: false,
+	queryForm: {},
+	pageList: hardTotalApi.pageListSb,
+})
+
+//  table hook
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
+
+// 导出excel
+const exportExcel = () => {
+	downBlobFile("/hard/hard-total/export-sb", Object.assign(state.queryForm), "设备交易记录.xlsx")
+}
+
+const getSummaries = (param: any) => {
+	const { columns, data } = param
+	const totalColumns = ["totalPayPrice", "totalPayCount", "totalRefundPrice", "totalRefundCount", "totalProfitPrice", "totalProfitCount"]
+	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) => 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 resetQuery = () => {
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	state.queryForm.deptId = ""
+	state.queryForm.userDeptIds = []
+	draggableDepTreeRef.value.resetData()
+	getDataList()
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
+
+// 树节点选择时
+const handleGetSelectNode = (curClickedNode: any, checkedTreeNodes: any, isDeepTree: any) => {
+	state.queryForm.deptId = curClickedNode.id
+	state.queryForm.userDeptIds = checkedTreeNodes.map((item: any) => item.id)
+	state.queryForm.isInclude = !isDeepTree
+	getDataList()
+}
+</script>

src/views/hard/hard-sh/index.vue

@@ -125,18 +125,6 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 //  table hook
 const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
-// 清空搜索条件
-const resetQuery = () => {
-	// 清空搜索条件
-	queryRef.value?.resetFields()
-	// 清空多选
-	selectObjs.value = []
-	state.queryForm.deptId = ""
-	state.queryForm.deptIds = []
-	draggableDepTreeRef.value.resetData()
-	getDataList()
-}
-
 // 导出excel
 const exportExcel = () => {
 	downBlobFile("/hard/hard-total/export-cs", Object.assign(state.queryForm), "商户交易记录.xlsx")
@@ -169,10 +157,22 @@ const selectionChangHandle = (objs: { id: string }[]) => {
 	multiple.value = !objs.length
 }
 
+// 清空搜索条件
+const resetQuery = () => {
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	state.queryForm.deptId = ""
+	state.queryForm.userDeptIds = []
+	draggableDepTreeRef.value.resetData()
+	getDataList()
+}
+
 // 树节点选择时
 const handleGetSelectNode = (curClickedNode: any, checkedTreeNodes: any, isDeepTree: any) => {
 	state.queryForm.deptId = curClickedNode.id
-	state.queryForm.deptIds = checkedTreeNodes.map((item: any) => item.id)
+	state.queryForm.userDeptIds = checkedTreeNodes.map((item: any) => item.id)
 	state.queryForm.isInclude = !isDeepTree
 	getDataList()
 }

src/views/integrated/feedback/form.vue

@@ -0,0 +1,147 @@
+<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="12" class="mb20">
+      <el-form-item label="标题" prop="title">
+        <el-input v-model="form.title" 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="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="description">
+    <editor v-if="visible" v-model:get-html="form.description" placeholder="请输入描述"></editor>
+  </el-form-item>
+  </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="状态" prop="status">
+          <el-select v-model="form.status" placeholder="请选择状态）">
+            <el-option :value="item.value" :label="item.label" v-for="(item, index) in maintenance_status" :key="index"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="上报人" prop="userId">
+        <el-input v-model="form.userId" placeholder="请输入上报人"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="反馈类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择反馈类型">
+            <el-option :value="item.value" :label="item.label" v-for="(item, index) in feedback_type" :key="index"></el-option>
+          </el-select>
+        </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="FeedbackDialog">
+import { useDict } from '/@/hooks/dict';
+import { useMessage } from "/@/hooks/message";
+import { getObj, addObj, putObj } from '/@/api/integrated/feedback'
+import { rule } from '/@/utils/validate';
+const emit = defineEmits(['refresh']);
+
+// 定义变量内容
+const dataFormRef = ref();
+const visible = ref(false)
+const loading = ref(false)
+// 定义字典
+const { maintenance_status,feedback_type } = useDict('maintenance_status','feedback_type')
+
+// 提交表单数据
+const form = reactive({
+		id:'',
+	  title: '',
+	  picUrl: '',
+		sort: 0,
+	  description: '',
+	  status: '',
+	  userId: '',
+	  type: '',
+});
+
+// 定义校验规则
+const dataRules = ref({
+        title: [{required: true, message: '标题不能为空', trigger: 'blur'}],
+        sort: [{ validator: rule.number, trigger: 'blur' }],
+        type: [{required: true, message: '反馈类型不能为空', trigger: 'blur'}],
+})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+  visible.value = true
+  form.id = ''
+
+  // 重置表单数据
+	nextTick(() => {
+		dataFormRef.value?.resetFields();
+	});
+
+  // 获取feedback信息
+  if (id) {
+    form.id = id
+    getfeedbackData(id)
+  }
+};
+
+// 提交
+const onSubmit = async () => {
+	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');
+	} catch (err: any) {
+		useMessage().error(err.msg);
+	} finally {
+    loading.value = false;
+  }
+};
+
+
+// 初始化表单数据
+const getfeedbackData = (id: string) => {
+  // 获取数据
+  loading.value = true
+  getObj(id).then((res: any) => {
+    Object.assign(form, res.data)
+  }).finally(() => {
+    loading.value = false
+  })
+};
+
+// 暴露变量
+defineExpose({
+  openDialog
+});
+</script>

src/views/integrated/feedback/index.vue

@@ -0,0 +1,150 @@
+<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"
+				@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="图片"  show-overflow-tooltip/>
+          <el-table-column prop="sort" label="排序"  show-overflow-tooltip/>
+          <el-table-column prop="status" label="状态（0未处理，1已处理）" 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="userId" 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 label="操作" width="150">
+          <template #default="scope">
+            <el-button icon="edit-pen" text type="primary" v-auth="'integrated_feedback_edit'"
+              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
+            <el-button icon="delete" text type="primary" v-auth="'integrated_feedback_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>
+</template>
+
+<script setup lang="ts" name="systemFeedback">
+import { BasicTableProps, useTable } from "/@/hooks/table";
+import { fetchList, delObjs } from "/@/api/integrated/feedback";
+import { useMessage, useMessageBox } from "/@/hooks/message";
+import { useDict } from '/@/hooks/dict';
+
+// 引入组件
+const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+// 定义查询字典
+
+const { maintenance_status,feedback_type } = useDict('maintenance_status','feedback_type')
+// 定义变量内容
+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: fetchList
+})
+
+//  table hook
+const {
+  getDataList,
+  currentChangeHandle,
+  sizeChangeHandle,
+  sortChangeHandle,
+  downBlobFile,
+	tableStyle
+} = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+  // 清空搜索条件
+  queryRef.value?.resetFields()
+  // 清空多选
+  selectObjs.value = []
+  getDataList()
+}
+
+// 导出excel
+const exportExcel = () => {
+  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;
+};
+
+// 删除操作
+const handleDelete = async (ids: string[]) => {
+  try {
+    await useMessageBox().confirm('此操作将永久删除');
+  } catch {
+    return;
+  }
+
+  try {
+    await delObjs(ids);
+    getDataList();
+    useMessage().success('删除成功');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  }
+};
+</script>

src/views/integrated/feedbackLog/form.vue

@@ -0,0 +1,120 @@
+<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="12" 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-col :span="12" class="mb20">
+      <el-form-item label="状态（0未处理，1已处理）" prop="status">
+        <el-input v-model="form.status" placeholder="请输入状态（0未处理，1已处理）"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="部门id" prop="deptId">
+        <el-input v-model="form.deptId" placeholder="请输入部门id"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="主表id" prop="feedbackId">
+        <el-input v-model="form.feedbackId" placeholder="请输入主表id"/>
+      </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="FeedbackLogDialog">
+import { useDict } from '/@/hooks/dict';
+import { useMessage } from "/@/hooks/message";
+import { getObj, addObj, putObj } from '/@/api/integrated/feedbackLog'
+import { rule } from '/@/utils/validate';
+const emit = defineEmits(['refresh']);
+
+// 定义变量内容
+const dataFormRef = ref();
+const visible = ref(false)
+const loading = ref(false)
+// 定义字典
+const { maintenance_status } = useDict('maintenance_status')
+
+// 提交表单数据
+const form = reactive({
+		id:'',
+	  description: '',
+	  status: '',
+	  deptId: '',
+	  feedbackId: '',
+});
+
+// 定义校验规则
+const dataRules = ref({
+        description: [{required: true, message: '处理描述不能为空', trigger: 'blur'}],
+})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+  visible.value = true
+  form.id = ''
+
+  // 重置表单数据
+	nextTick(() => {
+		dataFormRef.value?.resetFields();
+	});
+
+  // 获取feedbackLog信息
+  if (id) {
+    form.id = id
+    getfeedbackLogData(id)
+  }
+};
+
+// 提交
+const onSubmit = async () => {
+	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');
+	} catch (err: any) {
+		useMessage().error(err.msg);
+	} finally {
+    loading.value = false;
+  }
+};
+
+
+// 初始化表单数据
+const getfeedbackLogData = (id: string) => {
+  // 获取数据
+  loading.value = true
+  getObj(id).then((res: any) => {
+    Object.assign(form, res.data)
+  }).finally(() => {
+    loading.value = false
+  })
+};
+
+// 暴露变量
+defineExpose({
+  openDialog
+});
+</script>

src/views/integrated/feedbackLog/index.vue

@@ -0,0 +1,139 @@
+<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="状态（0未处理，1已处理）" prop="status">
+            <el-select v-model="state.queryForm.status" placeholder="请选择状态（0未处理，1已处理）">
+              <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="主表id" prop="feedbackId" >
+        <el-input placeholder="请输入主表id" v-model="state.queryForm.feedbackId" />
+      </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_feedbackLog_add'">
+            新 增
+          </el-button>
+          <el-button plain :disabled="multiple" icon="Delete" type="primary"
+            v-auth="'integrated_feedbackLog_del'" @click="handleDelete(selectObjs)">
+            删除
+          </el-button>
+          <right-toolbar v-model:showSearch="showSearch" :export="'integrated_feedbackLog_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="description" label="处理描述"  show-overflow-tooltip/>
+          <el-table-column prop="status" label="状态（0未处理，1已处理）" 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="deptId" label="部门id"  show-overflow-tooltip/>
+          <el-table-column prop="feedbackId" label="主表id"  show-overflow-tooltip/>
+        <el-table-column label="操作" width="150">
+          <template #default="scope">
+            <el-button icon="edit-pen" text type="primary" v-auth="'integrated_feedbackLog_edit'"
+              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
+            <el-button icon="delete" text type="primary" v-auth="'integrated_feedbackLog_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>
+</template>
+
+<script setup lang="ts" name="systemFeedbackLog">
+import { BasicTableProps, useTable } from "/@/hooks/table";
+import { fetchList, delObjs } from "/@/api/integrated/feedbackLog";
+import { useMessage, useMessageBox } from "/@/hooks/message";
+import { useDict } from '/@/hooks/dict';
+
+// 引入组件
+const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+// 定义查询字典
+
+const { maintenance_status } = useDict('maintenance_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: fetchList
+})
+
+//  table hook
+const {
+  getDataList,
+  currentChangeHandle,
+  sizeChangeHandle,
+  sortChangeHandle,
+  downBlobFile,
+	tableStyle
+} = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+  // 清空搜索条件
+  queryRef.value?.resetFields()
+  // 清空多选
+  selectObjs.value = []
+  getDataList()
+}
+
+// 导出excel
+const exportExcel = () => {
+  downBlobFile('/integrated/feedbackLog/export', Object.assign(state.queryForm, { ids: selectObjs }), 'feedbackLog.xlsx')
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+  selectObjs.value = objs.map(({ id }) => id);
+  multiple.value = !objs.length;
+};
+
+// 删除操作
+const handleDelete = async (ids: string[]) => {
+  try {
+    await useMessageBox().confirm('此操作将永久删除');
+  } catch {
+    return;
+  }
+
+  try {
+    await delObjs(ids);
+    getDataList();
+    useMessage().success('删除成功');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  }
+};
+</script>

src/views/integrated/meetingEquipment/form.vue

@@ -0,0 +1,137 @@
+<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-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="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-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="MeetingEquipmentDialog">
+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 visible = ref(false)
+const loading = ref(false)
+// 定义字典
+const { meeting_status } = useDict('meeting_status')
+
+// 提交表单数据
+const form = reactive({
+		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' }],
+})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+  visible.value = true
+  form.id = ''
+
+  // 重置表单数据
+	nextTick(() => {
+		dataFormRef.value?.resetFields();
+	});
+
+  // 获取meetingEquipment信息
+  if (id) {
+    form.id = id
+    getmeetingEquipmentData(id)
+  }
+};
+
+// 提交
+const onSubmit = async () => {
+	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');
+	} catch (err: any) {
+		useMessage().error(err.msg);
+	} finally {
+    loading.value = false;
+  }
+};
+
+
+// 初始化表单数据
+const getmeetingEquipmentData = (id: string) => {
+  // 获取数据
+  loading.value = true
+  getObj(id).then((res: any) => {
+    Object.assign(form, res.data)
+  }).finally(() => {
+    loading.value = false
+  })
+};
+
+// 暴露变量
+defineExpose({
+  openDialog
+});
+</script>

src/views/integrated/meetingEquipment/index.vue

@@ -0,0 +1,140 @@
+<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"
+				@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>
+
+    <!-- 编辑、新增  -->
+    <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+
+  </div>
+</template>
+
+<script setup lang="ts" name="systemMeetingEquipment">
+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 { meeting_status } = useDict('meeting_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: fetchList
+})
+
+//  table hook
+const {
+  getDataList,
+  currentChangeHandle,
+  sizeChangeHandle,
+  sortChangeHandle,
+  downBlobFile,
+	tableStyle
+} = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+  // 清空搜索条件
+  queryRef.value?.resetFields()
+  // 清空多选
+  selectObjs.value = []
+  getDataList()
+}
+
+// 导出excel
+const exportExcel = () => {
+  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;
+};
+
+// 删除操作
+const handleDelete = async (ids: string[]) => {
+  try {
+    await useMessageBox().confirm('此操作将永久删除');
+  } catch {
+    return;
+  }
+
+  try {
+    await delObjs(ids);
+    getDataList();
+    useMessage().success('删除成功');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  }
+};
+</script>

src/views/integrated/meetingRoom/form.vue

@@ -0,0 +1,160 @@
+<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="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="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="adminId">
+          <el-select v-model="form.adminId" placeholder="请选择默认管理员">
+            <el-option label="请选择">0</el-option>
+          </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="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="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>
+</template>
+
+<script setup lang="ts" name="MeetingRoomDialog">
+import { useDict } from '/@/hooks/dict';
+import { useMessage } from "/@/hooks/message";
+import { getObj, addObj, putObj } from '/@/api/integrated/meetingRoom'
+import { rule } from '/@/utils/validate';
+const emit = defineEmits(['refresh']);
+
+// 定义变量内容
+const dataFormRef = ref();
+const visible = ref(false)
+const loading = ref(false)
+// 定义字典
+const { meeting_status } = useDict('meeting_status')
+
+// 提交表单数据
+const form = reactive({
+		id:'',
+	  roomName: '',
+	  picUrl: '',
+	  sort: '',
+	  description: '',
+	  status: '0',
+	  adminId: '',
+	  location: '',
+		capacity: 0,
+	  availableTime: '',
+});
+
+// 定义校验规则
+const dataRules = ref({
+        roomName: [{required: true, message: '会议室名称不能为空', trigger: 'blur'}],
+        capacity: [{ validator: rule.number, trigger: 'blur' }],
+})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+  visible.value = true
+  form.id = ''
+
+  // 重置表单数据
+	nextTick(() => {
+		dataFormRef.value?.resetFields();
+	});
+
+  // 获取meetingRoom信息
+  if (id) {
+    form.id = id
+    getmeetingRoomData(id)
+  }
+};
+
+// 提交
+const onSubmit = async () => {
+	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');
+	} 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)
+  }).finally(() => {
+    loading.value = false
+  })
+};
+
+// 暴露变量
+defineExpose({
+  openDialog
+});
+</script>

src/views/integrated/meetingRoom/index.vue

@@ -0,0 +1,126 @@
+<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"
+				@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 label="操作" width="150">
+          <template #default="scope">
+            <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)" />
+
+  </div>
+</template>
+
+<script setup lang="ts" name="systemMeetingRoom">
+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 { meeting_status } = useDict('meeting_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: fetchList
+})
+
+//  table hook
+const {
+  getDataList,
+  currentChangeHandle,
+  sizeChangeHandle,
+  sortChangeHandle,
+  downBlobFile,
+	tableStyle
+} = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+  // 清空搜索条件
+  queryRef.value?.resetFields()
+  // 清空多选
+  selectObjs.value = []
+  getDataList()
+}
+
+// 导出excel
+const exportExcel = () => {
+  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;
+};
+
+// 删除操作
+const handleDelete = async (ids: string[]) => {
+  try {
+    await useMessageBox().confirm('此操作将永久删除');
+  } catch {
+    return;
+  }
+
+  try {
+    await delObjs(ids);
+    getDataList();
+    useMessage().success('删除成功');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  }
+};
+</script>

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

@@ -1,160 +1,163 @@
 <template>
-  <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
+	<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-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
-      <el-row :gutter="24">
+			<el-row :gutter="24">
-        <el-col :span="12" class="mb20">
+				<el-col :span="12" class="mb20">
-          <el-form-item label="绑定的部门id" prop="deptId">
+					<el-form-item label="绑定的部门id" prop="deptId">
-            <el-select v-model="form.deptId" placeholder="请选择绑定的部门id">
+						<el-select v-model="form.deptId" placeholder="请选择绑定的部门id">
-              <el-option label="请选择">0</el-option>
+							<el-option label="请选择">0</el-option>
-            </el-select>
+						</el-select>
-          </el-form-item>
+					</el-form-item>
-        </el-col>
+				</el-col>
 
-        <el-col :span="12" class="mb20">
+				<el-col :span="12" class="mb20">
-          <el-form-item label="商户名" prop="name">
+					<el-form-item label="商户名" prop="name">
-            <el-input v-model="form.name" placeholder="请输入商户名" />
+						<el-input v-model="form.name" placeholder="请输入商户名" />
-          </el-form-item>
+					</el-form-item>
-        </el-col>
+				</el-col>
 
-        <el-col :span="12" class="mb20">
+				<el-col :span="12" class="mb20">
-          <el-form-item label="店铺类型,逗号分隔" prop="types">
+					<el-form-item label="店铺类型,逗号分隔" prop="types">
-            <el-select v-model="form.types" placeholder="请选择店铺类型,逗号分隔">
+						<el-select v-model="form.types" placeholder="请选择店铺类型,逗号分隔">
-              <el-option label="请选择">0</el-option>
+							<el-option label="请选择">0</el-option>
-            </el-select>
+						</el-select>
-          </el-form-item>
+					</el-form-item>
-        </el-col>
+				</el-col>
 
-        <el-col :span="12" class="mb20">
+				<el-col :span="12" class="mb20">
-          <el-form-item label="商户logo图片" prop="logoPic">
+					<el-form-item label="商户logo图片" prop="logoPic">
-            <upload-img v-model="form.logoPic"></upload-img>
+						<upload-img v-model="form.logoPic"></upload-img>
-          </el-form-item>
+					</el-form-item>
-        </el-col>
+				</el-col>
 
-        <el-col :span="12" class="mb20">
+				<el-col :span="12" class="mb20">
-          <el-form-item label="商户轮播图,逗号分隔" prop="swiperPic">
+					<el-form-item label="商户轮播图,逗号分隔" prop="swiperPic">
-            <upload-img v-model="form.swiperPic"></upload-img>
+						<upload-img v-model="form.swiperPic"></upload-img>
-          </el-form-item>
+					</el-form-item>
-        </el-col>
+				</el-col>
 
-        <el-col :span="12" class="mb20">
+				<el-col :span="12" class="mb20">
-          <el-form-item label="商户手机号" prop="phone">
+					<el-form-item label="商户手机号" prop="phone">
-            <el-input v-model="form.phone" placeholder="请输入商户手机号" />
+						<el-input v-model="form.phone" placeholder="请输入商户手机号" />
-          </el-form-item>
+					</el-form-item>
-        </el-col>
+				</el-col>
 
-        <el-col :span="12" class="mb20">
+				<el-col :span="12" class="mb20">
-          <el-form-item label="商户开始营业时间" prop="jobStartTime">
+					<el-form-item label="商户开始营业时间" prop="jobStartTime">
-            <el-input v-model="form.jobStartTime" placeholder="请输入商户开始营业时间" />
+						<el-input v-model="form.jobStartTime" placeholder="请输入商户开始营业时间" />
-          </el-form-item>
+					</el-form-item>
-        </el-col>
+				</el-col>
 
-        <el-col :span="12" class="mb20">
+				<el-col :span="12" class="mb20">
-          <el-form-item label="商户结束营业时间" prop="jobEndTime">
+					<el-form-item label="商户结束营业时间" prop="jobEndTime">
-            <el-input v-model="form.jobEndTime" placeholder="请输入商户结束营业时间" />
+						<el-input v-model="form.jobEndTime" placeholder="请输入商户结束营业时间" />
-          </el-form-item>
+					</el-form-item>
-        </el-col>
+				</el-col>
 
-        <el-col :span="12" class="mb20">
+				<el-col :span="12" class="mb20">
-          <el-form-item label="商户地址" prop="addressDes">
+					<el-form-item label="商户地址" prop="addressDes">
-            <el-input type="textarea" v-model="form.addressDes" placeholder="请输入商户地址" />
+						<el-input type="textarea" v-model="form.addressDes" placeholder="请输入商户地址" />
-          </el-form-item>
+					</el-form-item>
-        </el-col>
+				</el-col>
-
+			</el-row>
-      </el-row>
+		</el-form>
-    </el-form>
+		<template #footer>
-    <template #footer>
+			<span class="dialog-footer">
-      <span class="dialog-footer">
+				<el-button @click="visible = false">取消</el-button>
-        <el-button @click="visible = false">取消</el-button>
+				<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
-        <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+			</span>
-      </span>
+		</template>
-    </template>
+	</el-dialog>
-  </el-dialog>
 </template>
 
 <script setup lang="ts" name="MchManageDialog">
-import { useDict } from '/@/hooks/dict';
+import { useDict } from "/@/hooks/dict"
-import { useMessage } from "/@/hooks/message";
+import { useMessage } from "/@/hooks/message"
-import { getObj, addObj, putObj } from '../../../api/mch/mch-manage'
+import { getObj, addObj, putObj } from "../../../api/mch/mch-manage"
-import { rule } from '/@/utils/validate';
+import { rule } from "/@/utils/validate"
-const emit = defineEmits(['refresh']);
+const emit = defineEmits(["refresh"])
 
 // 定义变量内容
-const dataFormRef = ref();
+const dataFormRef = ref()
 const visible = ref(false)
 const loading = ref(false)
 // 定义字典
 
 // 提交表单数据
 const form = reactive({
-  id: '',
+	id: "",
-  deptId: '',
+	deptId: "",
-  name: '',
+	name: "",
-  types: '',
+	types: "",
-  logoPic: '',
+	logoPic: "",
-  swiperPic: '',
+	swiperPic: "",
-  phone: '',
+	phone: "",
-  jobStartTime: '',
+	jobStartTime: "",
-  jobEndTime: '',
+	jobEndTime: "",
-  addressDes: '',
+	addressDes: "",
-});
+})
 
 // 定义校验规则
 const dataRules = ref({
-  name: [{ required: true, message: '商户名不能为空', trigger: 'blur' }, { validator: rule.chinese, trigger: 'blur' }],
+	name: [
-  types: [{ required: true, message: '店铺类型,逗号分隔不能为空', trigger: 'blur' }],
+		{ required: true, message: "商户名不能为空", trigger: "blur" },
-  logoPic: [{ required: true, message: '商户logo图片不能为空', trigger: 'blur' }],
+		{ validator: rule.chinese, trigger: "blur" },
-  phone: [{ validator: rule.mobilePhone, trigger: 'blur' }],
+	],
+	types: [{ required: true, message: "店铺类型,逗号分隔不能为空", trigger: "blur" }],
+	logoPic: [{ required: true, message: "商户logo图片不能为空", trigger: "blur" }],
+	phone: [{ validator: rule.mobilePhone, trigger: "blur" }],
 })
 
 // 打开弹窗
 const openDialog = (id: string) => {
-  visible.value = true
+	visible.value = true
-  form.id = ''
+	form.id = ""
 
-  // 重置表单数据
+	// 重置表单数据
-  nextTick(() => {
+	nextTick(() => {
-    dataFormRef.value?.resetFields();
+		dataFormRef.value?.resetFields()
-  });
+	})
 
-  // 获取mchManage信息
+	// 获取mchManage信息
-  if (id) {
+	if (id) {
-    form.id = id
+		form.id = id
-    getmchManageData(id)
+		getmchManageData(id)
-  }
+	}
-};
+}
 
 // 提交
 const onSubmit = async () => {
-  const valid = await dataFormRef.value.validate().catch(() => { });
+	const valid = await dataFormRef.value.validate().catch(() => {})
-  if (!valid) return false;
+	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');
-  } catch (err: any) {
-    useMessage().error(err.msg);
-  } finally {
-    loading.value = false;
-  }
-};
 
+	try {
+		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)
+	} finally {
+		loading.value = false
+	}
+}
 
 // 初始化表单数据
 const getmchManageData = (id: string) => {
-  // 获取数据
+	// 获取数据
-  loading.value = true
+	loading.value = true
-  getObj(id).then((res: any) => {
+	getObj(id)
-    Object.assign(form, res.data)
+		.then((res: any) => {
-  }).finally(() => {
+			Object.assign(form, res.data)
-    loading.value = false
+		})
-  })
+		.finally(() => {
-};
+			loading.value = false
+		})
+}
 
 // 暴露变量
 defineExpose({
-  openDialog
+	openDialog,
-});
+})
 </script>

src/views/wallet/mch-manage/form.vue

@@ -31,12 +31,6 @@
 					</el-form-item>
 				</el-col>
 
-				<el-col :span="24" class="mb20">
-					<el-form-item v-if="useUserInfo().userInfos.roleCodes.includes('ROLE_ADMIN')" label="是否同步到正元" prop="isSyncZy">
-						<el-switch v-model="form.isSyncZy" />
-					</el-form-item>
-				</el-col>
-
 				<el-col :span="24" class="mb20">
 					<el-form-item label="商户logo" prop="logoPic">
 						<upload-img v-model:imageUrl="form.logoPic" />
@@ -133,7 +127,8 @@ const form = reactive({
 	logoPic: "",
 	collectMoneyCode: "",
 	swiperPic: "",
-	isSyncZy: false,
+	isSyncZy: "0",
+	visibleMobile: "0",
 	phone: "",
 	businessTime: "",
 	address: "",

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

@@ -51,19 +51,35 @@
 				<el-table-column prop="merchantType" label="商户类型" show-overflow-tooltip :min-width="100">
 					<template #default="{ row }">
 						<div class="flex justify-center items-center">
-							<div v-for="(v, i) in row.types.split(',')" :key="i" class="mr-1">
+							<div v-for="(v, i) in row.types?.split(',')" :key="i" class="mr-1">
 								<dict-tag :options="merchant_type" :value="v" />
 							</div>
 						</div>
 					</template>
 				</el-table-column>
-				<el-table-column prop="isSyncZy" label="同步正元" min-width="90">
+				<el-table-column prop="isSyncZy" label="是否同步正元" min-width="120">
 					<template #default="{ row }">
-						<el-tag v-if="row.isSyncZy == '1'" type="primary">是</el-tag>
+						<el-switch
-						<el-tag v-if="row.isSyncZy == '0'" type="info">否</el-tag>
+							: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 prop="walletTypeUniqueCode" width="200" label="支付默认钱包">
+				<el-table-column label="是否在移动端展示" min-width="150">
+					<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)"
+						/>
+					</template>
+				</el-table-column>
+				<el-table-column width="200" label="支付默认钱包">
 					<template #default="{ row }">
 						<div class="flex items-center justify-center">
 							<div class="color-primary">{{ row.walletTypeName }}</div>
@@ -73,9 +89,9 @@
 						</div>
 					</template>
 				</el-table-column>
-				<el-table-column prop="deptName" label="部门" min-width="120" />
+				<el-table-column prop="deptName" label="部门" show-overflow-tooltip min-width="300" />
-				<el-table-column prop="phone" label="联系电话" show-overflow-tooltip :min-width="120" />
+				<el-table-column prop="phone" label="联系电话" :min-width="120" />
-				<el-table-column prop="businessTime" label="营业时间" show-overflow-tooltip :min-width="160">
+				<el-table-column prop="businessTime" label="营业时间" :min-width="160">
 					<template #default="{ row }">
 						<div>{{ row.jobTime?.split(",")[0] ? "早上：" + row.jobTime?.split(",")[0] : "" }}</div>
 						<div>{{ row.jobTime?.split(",")[1] ? "中午：" + row.jobTime?.split(",")[1] : "" }}</div>
@@ -83,7 +99,7 @@
 					</template>
 				</el-table-column>
 				<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip :min-width="160" />
-				<el-table-column label="操作" min-width="300">
+				<el-table-column label="操作" fixed="right" min-width="300">
 					<template #default="{ row }">
 						<el-button icon="RefreshRight" text type="primary" v-auth="'wallet_mchManage_refresh_qrcode'" @click="refreshQrcode(row)">
 							刷新二维码
@@ -116,6 +132,7 @@ import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 import FormDialog from "./form.vue"
 import Setting from "./setting.vue"
+import { useUserInfo } from "/@/stores/userInfo"
 
 const { merchant_type, wallet_type } = useDict("merchant_type", "wallet_type")
 // 定义变量内容
@@ -161,6 +178,28 @@ const refreshQrcode = async (row: any) => {
 	}
 }
 
+// 修改是否在正元显示
+const isSyncZyChange = async (row: any) => {
+	try {
+		await mchManangeApi.putObj(row)
+		getDataList()
+		useMessage().success("操作成功")
+	} catch (e) {
+		useMessage().error("操作错误")
+	}
+}
+
+// 修改是否在移动端显示
+const visibleMobileChange = async (row: any) => {
+	try {
+		await mchManangeApi.putObj(row)
+		getDataList()
+		useMessage().success("操作成功")
+	} catch (e) {
+		useMessage().error("操作错误")
+	}
+}
+
 // 导出excel
 const exportExcel = () => {
 	downBlobFile("/canteen/merchantInfo/export", Object.assign(state.queryForm, { ids: selectObjs }), "商户管理.xlsx")