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

src/views/admin/system/role/index.vue

@@ -69,8 +69,8 @@
 						<el-button text type="primary" icon="edit-pen" v-auth="'sys_role_edit'" @click="roleDialogRef.openDialog(scope.row.roleId)">{{
 							$t("common.editBtn")
 						}}</el-button>
-
+						<!-- v-auth="'sys_role_perm'" -->
-						<el-button text type="primary" icon="turn-off" v-auth="'sys_role_perm'" @click="permessionRef.openDialog(scope.row)">{{
+						<el-button text type="primary" icon="turn-off" @click="permessionRef.openDialog(scope.row)">{{
 							$t("sysrole.permissionTip")
 						}}</el-button>
 

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

@@ -7,6 +7,11 @@
 						<el-input v-model="form.title" placeholder="请输入标题" />
 					</el-form-item>
 				</el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="类型" prop="hourType">
+						<dict-select v-model="form.hourType" dict-code="daily_menu" />
+					</el-form-item>
+				</el-col>
 				<el-col :span="24" class="mb20">
 					<el-form-item label="预约时间" prop="displayTime">
 						<el-time-picker v-model="form.displayTime" value-format="HH:mm" format="HH:mm" is-range />
@@ -55,6 +60,7 @@ const { yes_no_type } = useDict("yes_no_type")
 const form = reactive({
 	id: "",
 	title: "",
+	hourType: "",
 	displayTime: [],
 	startTime: "",
 	endTime: "",
@@ -65,6 +71,7 @@ const form = reactive({
 // 定义校验规则
 const dataRules = ref({
 	title: [{ required: true, message: "标题不能为空", trigger: "blur" }],
+	hourType: [{ required: true, message: "类型不能为空", trigger: "blur" }],
 	displayTime: [{ required: true, message: "预约时间不能为空", type: "array", trigger: "change" }],
 	status: [{ required: true, message: "是否启用不能为空", trigger: "change" }],
 })

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

@@ -42,6 +42,11 @@
 				<el-table-column type="selection" width="40" align="center" />
 				<el-table-column type="index" label="#" width="40" />
 				<el-table-column prop="title" label="标题" />
+				<el-table-column prop="title" label="类型">
+					<template #default="{ row }">
+						<dict-tag :options="daily_menu" :value="row.hourType" />
+					</template>
+				</el-table-column>
 				<el-table-column label="预约时间">
 					<template #default="{ row }">
 						<span> {{ row.startTime }}</span>
@@ -81,7 +86,7 @@ import { useDict } from "/@/hooks/dict"
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import("./form.vue"))
 // 定义查询字典
-const { yes_no_type } = useDict("yes_no_type")
+const { yes_no_type, daily_menu } = useDict("yes_no_type", "daily_menu")
 // 定义变量内容
 const formDialogRef = ref()
 // 搜索变量

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

@@ -68,7 +68,6 @@
 				<el-table-column prop="isTakeFood" width="200" label="是否为当前商户的取餐机器">
 					<template #default="{ row }">
 						<el-switch
-							v-if="row.type == 1"
 							:disabled="!useUserInfo().userInfos.roleCodes.includes('ROLE_ADMIN')"
 							:loading="switchTakeFoodLoading"
 							active-text="是"
@@ -78,7 +77,6 @@
 							v-model="row.isTakeFood"
 							@change="changeTakeFood($event, row)"
 						/>
-						<div v-else>只有超市需要设置</div>
 					</template>
 				</el-table-column>
 				<el-table-column prop="createTime" width="200" label="创建时间" />
@@ -156,10 +154,18 @@ const resetQuery = () => {
 const changeTakeFood = async (e: any, row: any) => {
 	switchTakeFoodLoading.value = true
 	try {
-		await hardManageApi.putObj({ id: row.id, isTakeFood: e })
+		const pa = {
-		getDataList()
+			id: row.id,
+			merchantId: row.merchantId,
+			isTakeFood: e,
+		}
+		await hardManageApi.putObj(pa)
+	} catch (error: any) {
+		console.error(error)
+		useMessage().error(error.msg)
 	} finally {
 		switchTakeFoodLoading.value = false
+		getDataList()
 	}
 }