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

src/api/hard/hard-door-manager.ts

@@ -6,11 +6,11 @@ import request from "/@/utils/request"
  * @param systemVolume 系统音量
  * @param mediaVolume 媒体音量
  */
-export function getByCabinetNo(query?: { hardId: any; systemVolume: any; mediaVolume: any }) {
+export function getByCabinetNo(data?: { hardId: any; systemVolume: any; mediaVolume: any }) {
 	return request({
 		url: "/hard/hard-door-manager/change-volume",
 		method: "post",
-		params: query,
+		data,
 	})
 }
 

src/views/hard/hard-door-manager/form.vue

@@ -93,28 +93,10 @@
 				</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="HardDoorManagerDialog">
-import { useDict } from "/@/hooks/dict"
-import { useMessage } from "/@/hooks/message"
-import * as hardDoorManager from "/@/api/hard/hard-door-manager"
-import { rule } from "/@/utils/validate"
-const emit = defineEmits(["refresh"])
-
-// 定义变量内容
-const dataFormRef = ref()
-const visible = ref(false)
-const loading = ref(false)
-// 定义字典
-
 // 提交表单数据
 const form = reactive({
 	id: "",
@@ -132,61 +114,4 @@ const form = reactive({
 	cabinetList: "",
 	restartTime: "",
 })
-
-// 定义校验规则
-const dataRules = ref({})
-
-// 打开弹窗
-const openDialog = (id: string) => {
-	visible.value = true
-	form.id = ""
-
-	// 重置表单数据
-	nextTick(() => {
-		dataFormRef.value?.resetFields()
-	})
-
-	// 获取hardDoorManager信息
-	if (id) {
-		form.id = id
-		gethardDoorManagerData(id)
-	}
-}
-
-// 提交
-const onSubmit = async () => {
-	const valid = await dataFormRef.value.validate().catch(() => {})
-	if (!valid) return false
-
-	try {
-		loading.value = true
-		form.id ? await hardDoorManager.putObj(form) : await hardDoorManager.addObj(form)
-		useMessage().success(form.id ? "修改成功" : "添加成功")
-		visible.value = false
-		emit("refresh")
-	} catch (err: any) {
-		useMessage().error(err.msg)
-	} finally {
-		loading.value = false
-	}
-}
-
-// 初始化表单数据
-const gethardDoorManagerData = (id: string) => {
-	// 获取数据
-	loading.value = true
-	hardDoorManager
-		.getObj(id)
-		.then((res: any) => {
-			Object.assign(form, res.data)
-		})
-		.finally(() => {
-			loading.value = false
-		})
-}
-
-// 暴露变量
-defineExpose({
-	openDialog,
-})
 </script>

src/views/hard/hard-door-manager/goods-putaway.vue

@@ -0,0 +1,142 @@
+<template>
+	<el-dialog title="智能柜设置" v-model="visible" width="80%" :close-on-click-modal="true" draggable>
+		<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+			<el-row>
+				<el-form-item style="width: 300px" label="商品名" prop="name">
+					<el-input v-model="state.queryForm.name" placeholder="商品名" />
+				</el-form-item>
+				<el-form-item style="width: 300px" label="商品类型" prop="skuType">
+					<dict-select v-model="state.queryForm.skuType" dict-code="hard_ks_sku_type" />
+				</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-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="80" />
+			<el-table-column prop="name" width="120" label="商品名" />
+			<el-table-column prop="pic" width="120" label="商品图片">
+				<template #default="{ row }">
+					<preview-image width="50px" height="50px" :src="row.pic" />
+				</template>
+			</el-table-column>
+			<el-table-column prop="categoryName" width="120" label="分类" />
+			<el-table-column prop="price" label="单价">
+				<template #default="{ row }">
+					<span class="color-success">{{ displayPrice(row.price) }}</span>
+				</template>
+			</el-table-column>
+			<el-table-column label="类型">
+				<template #default="{ row }">
+					<dict-tag :options="hard_ks_sku_type" :value="row.skuType" />
+				</template>
+			</el-table-column>
+			<el-table-column prop="price" width="240" label="规格">
+				<template #default="{ row }">
+					<span>口味:</span>
+					<span class="color-primary">{{ row.specsTaste }}</span>
+					<span>容量:</span>
+					<span class="color-primary">{{ row.specsCapacity }}</span>
+					<span>重量:</span>
+					<span class="color-primary">{{ row.specsWeight }}</span>
+				</template>
+			</el-table-column>
+			<el-table-column prop="salesCount" label="销量">
+				<template #default="{ row }">
+					<span class="color-primary">{{ row.salesCount }}</span>
+				</template>
+			</el-table-column>
+			<el-table-column prop="repertoryCount" label="库存">
+				<template #default="{ row }">
+					<span class="color-primary">{{ row.repertoryCount }}</span>
+				</template>
+			</el-table-column>
+			<el-table-column prop="sort" label="排序" />
+			<el-table-column prop="status" label="是否启用">
+				<template #default="{ row }">
+					<dict-tag :options="yes_no_type" :value="row.status" />
+				</template>
+			</el-table-column>
+			<el-table-column prop="isDefault" label="是否标品">
+				<template #default="{ row }">
+					<dict-tag :options="yes_no_type" :value="row.isDefault" />
+				</template>
+			</el-table-column>
+			<el-table-column label="操作" fixed="right" width="150">
+				<template #default="{ row }">
+					<el-button text type="primary" @click="confirmPutaway">点击上架</el-button>
+				</template>
+			</el-table-column>
+		</el-table>
+		<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+
+		<template #footer>
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="onConfirm" :disabled="loading">确认上架</el-button>
+		</template>
+	</el-dialog>
+</template>
+
+<script setup lang="ts">
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import * as hardSpu from "/@/api/hard/hard-spu"
+import { useDict } from "/@/hooks/dict"
+import { displayPrice } from "/@/utils/formatMoney"
+import { useMessage } from "/@/hooks/message"
+
+const { yes_no_type, hard_ks_sku_type } = useDict("yes_no_type", "hard_ks_sku_type")
+const queryRef = ref()
+const selectObjs = ref([]) as any
+const multiple = ref(false)
+const visible = ref(false)
+const loading = ref(false)
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+	queryForm: {},
+	pageList: hardSpu.pageJoin,
+})
+
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, tableStyle } = useTable(state)
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
+
+const resetQuery = () => {
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	getDataList()
+}
+
+const openDialog = async (id: string) => {
+	if (!id) return useMessage().error("设备id不存在")
+	visible.value = true
+	resetQuery()
+}
+
+// 确认上架
+const confirmPutaway = async () => {}
+
+// 确认选择
+const onConfirm = async () => {}
+
+defineExpose({
+	openDialog,
+})
+</script>

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

@@ -3,7 +3,7 @@
 		<div v-loading="loading" class="layout-padding-auto layout-padding-view" style="overflow: scroll !important">
 			<el-descriptions :column="3" title="经营信息" border>
 				<template #extra>
-					<el-tooltip class="item" effect="dark" :content="$t('queryTree.refresh')" placement="top">
+					<el-tooltip class="item" effect="dark" content="刷新" placement="top">
 						<el-button circle icon="Refresh" @click="doRefresh" />
 					</el-tooltip>
 				</template>
@@ -12,14 +12,14 @@
 				<el-descriptions-item label="本年交易金额:">{{ displayPrice(0) }}</el-descriptions-item>
 			</el-descriptions>
 
-			<el-descriptions :column="4" title="智能柜设置">
+			<el-descriptions :column="4" title="智能柜设置" border>
 				<template #extra>
 					<div class="flex justify-center items-center">
 						<el-button icon="Edit" type="primary" @click="doBind">修改</el-button>
 					</div>
 				</template>
 				<el-descriptions-item label="商户名称：">{{}}</el-descriptions-item>
-				<el-descriptions-item label="设备编号：">{{ doorSetting.id }}</el-descriptions-item>
+				<el-descriptions-item label="设备编号：">{{ doorSettingData.id }}</el-descriptions-item>
 				<el-descriptions-item label="设备名称：">{{}}</el-descriptions-item>
 				<el-descriptions-item label="机器编号：">{{}}</el-descriptions-item>
 				<el-descriptions-item label="外部设备编号：">{{}}</el-descriptions-item>
@@ -28,7 +28,7 @@
 				<el-descriptions-item label="地址：">{{}}</el-descriptions-item>
 			</el-descriptions>
 
-			<el-descriptions :column="3" title="运行信息">
+			<el-descriptions :column="3" title="运行信息" border>
 				<template #extra>
 					<div class="flex justify-center items-center">
 						<el-button icon="Edit" type="primary" @click="doVolumeSetting">音量设置</el-button>
@@ -38,53 +38,73 @@
 				<el-descriptions-item label="设备状态：">{{}}</el-descriptions-item>
 				<el-descriptions-item label="电源状态：">{{}}</el-descriptions-item>
 				<el-descriptions-item label="网络状态：">{{}}</el-descriptions-item>
-				<el-descriptions-item label="媒体音量：">{{}}</el-descriptions-item>
-				<el-descriptions-item label="系统音量：">{{}}</el-descriptions-item>
+				<el-descriptions-item label="媒体音量：">{{ doorSettingData.mediaVolume }}</el-descriptions-item>
+				<el-descriptions-item label="系统音量：">{{ doorSettingData.systemVolume }}</el-descriptions-item>
 			</el-descriptions>
 
-			<el-descriptions :column="0" title="货柜商品">
-				<template #extra>
+			<el-descriptions :column="0" title="货柜商品" border>
+				<!-- <template #extra>
 					<div class="flex justify-center items-center">
 						<el-button icon="Edit" type="primary">设置</el-button>
 					</div>
-				</template>
+				</template> -->
 			</el-descriptions>
 
 			<el-tabs type="border-card">
 				<el-tab-pane label="114514-1">
-					<div class="bg-slate-400 my-4 p-4 text-black flex items-center" v-for="(item, index) in new Array(6).fill('某层')" :key="index">
-						<div>{{ item }}</div>
-						<div></div>
+					<div v-for="(item, index) in new Array(6).fill('某层')" :key="index">
+						<el-divider />
+						<div class="text-black flex items-center">
+							<div class="text-center w-24 text-lg font-bold">第 {{ index + 1 }} 层:</div>
+							<div class="flex flex-wrap">
+								<div
+									class="bg-blue-50 w-20 h-20 border border-black mx-4 my-2 flex items-center justify-center cursor-pointer rounded"
+									v-for="(item, index) in new Array(10).fill('某品')"
+									:key="index"
+									@click="clickPutaway"
+								>
+									点击上架
+								</div>
+							</div>
+						</div>
 					</div>
 				</el-tab-pane>
 				<el-tab-pane label="114514-2">22</el-tab-pane>
 			</el-tabs>
 		</div>
 
+		<!-- 柜子设置 -->
+		<info-setting ref="infoSettingRef" @refreshInfo="refreshInfo" />
+
 		<!-- 音量设置 -->
 		<volume-setting ref="volumeSettingRef" @refreshVolume="refreshVolume" />
+
+		<!-- 商品上架 -->
+		<goods-putaway ref="goodsPutawayRef" />
 	</div>
 </template>
 
 <script setup lang="ts" name="systemHardDoorManager">
-import VolumeSetting from "./volume-setting.vue"
+import { onMounted, ref } from "vue"
 import { useMessage } from "/@/hooks/message"
 import { displayPrice } from "/@/utils/formatMoney"
-
 import * as hardDoorManager from "/@/api/hard/hard-door-manager"
 
+const InfoSetting = defineAsyncComponent(() => import("./volume-setting.vue"))
+const VolumeSetting = defineAsyncComponent(() => import("./volume-setting.vue"))
+const GoodsPutaway = defineAsyncComponent(() => import("./goods-putaway.vue"))
+
 const { query } = useRoute()
-
-const doorSetting = ref<any>({})
-
 const loading = ref(false)
-
+const doorSettingData = ref<any>({})
 const state = reactive<any>({
 	mediaVolume: "",
 	systemVolume: "",
 	queryForm: {},
 })
+const infoSettingRef = ref()
 const volumeSettingRef = ref()
+const goodsPutawayRef = ref()
 
 onMounted(async () => {
 	await getDetail()
@@ -92,45 +112,43 @@ onMounted(async () => {
 
 const getDetail = async () => {
 	const id = query.id as unknown as any
-	if (!id) return
+	if (!id) return useMessage().error("设备id不存在")
 	state.queryForm.orderId = id
+
 	const { data: orderData } = await hardDoorManager.getByHardId({ hardId: id })
 	if (orderData) {
-		doorSetting.value = orderData
+		doorSettingData.value = orderData
 	}
-	if (!doorSetting.value.hardId) {
-		doorSetting.value.hardId = id
+	if (!doorSettingData.value.hardId) {
+		doorSettingData.value.hardId = id
 	}
 }
 
-// 绑定
+// 绑定信息
 const doBind = async () => {
-	const pa = {
-		id: doorSetting.value.id,
-		hardId: doorSetting.value.hardId,
-		imei: doorSetting.value.imei,
-		deviceCode: doorSetting.value.deviceCode,
-	}
-	loading.value = true
-	try {
-		await hardDoorManager.bind(pa)
-		useMessage().success("绑定成功")
-	} catch (e: any) {
-		useMessage().error(e.msg)
-	} finally {
-		loading.value = false
+	if (infoSettingRef.value) {
+		infoSettingRef.value.openDialog(doorSettingData.value.hardId)
 	}
 }
+// 基本信息
+const refreshInfo = () => {}
 
 // 音量设置
 const doVolumeSetting = async () => {
 	if (volumeSettingRef.value) {
-		volumeSettingRef.value.openDialog()
+		volumeSettingRef.value.openDialog(doorSettingData.value.hardId)
 	}
 }
 const refreshVolume = (data: { hardId: string; mediaVolume: number; systemVolume: number }) => {
-	state.mediaVolume = data.mediaVolume
-	state.systemVolume = data.systemVolume
+	doorSettingData.value.mediaVolume = data.mediaVolume
+	doorSettingData.value.systemVolume = data.systemVolume
+}
+
+// 点击上架
+const clickPutaway = () => {
+	if (goodsPutawayRef.value) {
+		goodsPutawayRef.value.openDialog(doorSettingData.value.hardId)
+	}
 }
 
 const doRefresh = async () => {

src/views/hard/hard-door-manager/info-setting.vue

@@ -0,0 +1,100 @@
+<template>
+	<el-dialog title="智能柜设置" v-model="visible" :close-on-click-modal="true" draggable>
+		<el-form ref="dataFormRef" :model="form" :rules="dataRules" label-width="120px" v-loading="loading">
+			<el-row :gutter="24">
+				<el-col :span="12" class="mb20">
+					<el-form-item label="设备IMEI卡号：" prop="imei">
+						<el-input v-model="form.imei" placeholder="请输入设备IMEI卡号" />
+					</el-form-item>
+				</el-col>
+
+				<el-col :span="12" class="mb20">
+					<el-form-item label="内置设备号：" prop="bbb">
+						<el-input v-model="form.bbb" placeholder="请输入内置设备号" />
+					</el-form-item>
+				</el-col>
+
+				<el-col :span="12" class="mb20">
+					<el-form-item label="外部设备编号：" prop="hardId">
+						<el-input v-model="form.hardId" placeholder="请输入外部设备编号" />
+					</el-form-item>
+				</el-col>
+
+				<el-col :span="12" class="mb20">
+					<el-form-item label="SIM卡号：" prop="sim">
+						<el-input v-model="form.sim" placeholder="请输入SIM卡号" />
+					</el-form-item>
+				</el-col>
+
+				<el-col :span="12" class="mb20">
+					<el-form-item label="柜子层数：" prop="aaa">
+						<el-input v-model="form.aaa" placeholder="请输入柜子层数" />
+					</el-form-item>
+				</el-col>
+			</el-row>
+		</el-form>
+		<template #footer>
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="onSubmit" :disabled="loading">保存</el-button>
+		</template>
+	</el-dialog>
+</template>
+
+<script setup lang="ts" name="volume-setting">
+import { useMessage } from "/@/hooks/message"
+import * as hardDoorManager from "/@/api/hard/hard-door-manager"
+
+const emit = defineEmits(["refreshInfo"])
+
+const dataFormRef = ref()
+const visible = ref(false)
+const loading = ref(false)
+const form = reactive<any>({
+	id: "",
+	hardId: "",
+	imei: "",
+	deviceCode: "",
+})
+
+const dataRules = ref({})
+
+// 打开弹窗
+const openDialog = async (id: string) => {
+	visible.value = true
+	form.id = ""
+
+	dataFormRef.value?.resetFields()
+
+	if (id) {
+		form.id = id
+		const res = await hardDoorManager.getObj(id)
+		Object.assign(form, res.data)
+	}
+}
+
+// 提交
+const onSubmit = async () => {
+	if (!form.id) return useMessage().error("设备id不存在")
+
+	const valid = await dataFormRef.value.validate().catch(() => {})
+	if (!valid) return
+
+	try {
+		loading.value = true
+		const res = await hardDoorManager.bind(form)
+		if (res.code == 0) {
+			useMessage().success("保存成功")
+			visible.value = false
+			emit("refreshInfo")
+		}
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	} finally {
+		loading.value = false
+	}
+}
+
+defineExpose({
+	openDialog,
+})
+</script>

src/views/hard/hard-door-manager/volume-setting.vue

@@ -1,5 +1,5 @@
 <template>
-	<el-dialog title="音量设置" v-model="visible" :close-on-click-modal="true" draggable>
+	<el-dialog title="音量设置" width="30%" v-model="visible" :close-on-click-modal="true" draggable>
 		<el-form :model="form" label-width="90px" v-loading="loading">
 			<el-row :gutter="24">
 				<el-col :span="24" class="mb20">
@@ -41,12 +41,10 @@ const form = reactive<{
 	systemVolume: 80,
 })
 
-// 打开弹窗
 const openDialog = (id: string) => {
+	if (!id) return useMessage().warning("设备id不存在")
 	visible.value = true
-	if (id) {
-		// gethardDoorManagerData(id)
-	}
+	form.hardId = id
 }
 
 // 提交

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

@@ -84,7 +84,9 @@
 				<el-table-column prop="createTime" width="200" label="创建时间" />
 				<el-table-column v-auths="['hard_hardManager_edit', 'hard_hardManager_del']" label="操作" fixed="right" width="400">
 					<template #default="{ row }">
-						<el-button icon="InfoFilled" text type="primary" v-auth="'hard_hardManager_edit'" @click="doInfo(row)"> 详情 </el-button>
+						<el-button v-if="row.type == '4'" icon="InfoFilled" text type="primary" v-auth="'hard_hardManager_edit'" @click="doInfo(row)">
+							详情
+						</el-button>
 						<el-button icon="edit-pen" text type="primary" v-auth="'hard_hardManager_edit'" @click="formDialogRef.openDialog(row.id)">
 							编辑
 						</el-button>
@@ -94,7 +96,7 @@
 						<el-button icon="SetUp" link type="primary" v-auth="'hard_hardManager_edit'" @click="faceFormDialogRef.openDialog(row.id)">
 							人脸sdk设置
 						</el-button>
-						<el-button icon="delete" text type="primary" v-auth="'hard_hardManager_del'" @click="handleDelete([row.id])"> 删除 </el-button>
+						<el-button icon="delete" text type="primary" v-auth="'hard_hardManager_del'" @click="handleDelete([row.id])">删除</el-button>
 					</template>
 				</el-table-column>
 			</el-table>