zianxin/pj_admin_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
weiwei committed 2025-04-17 12:33:38 +08:00
2 parents 219c730751 e60454b496
commit 3fa0011ebf
4 files changed
+51 -20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/components/Select/SelectHardSpu.vue
+2 -2
View File
@@ -16,9 +16,9 @@
<el-option v-for="v in state.options" :key="v.id" :label="`${v.name}`" :value="v.id">
<div class="flex items-center">
<div class="color-primary">{{ v.name }}</div>
<div class="flex items-center justify-center ml5">
<div v-if="v.categoryName" class="flex items-center justify-center ml5">
<div class="flex items-center justify-center ml5">
<el-tag size="small"> {{ v.merchantName }} </el-tag>
<el-tag size="small"> {{ v.categoryName }} </el-tag>
</div>
</div>
</div>
src/views/hard/hard-auth/index.vue
+43 -18
View File
@@ -2,13 +2,33 @@
<div class="layout-padding">
<div class="layout-padding-auto layout-padding-view">
<el-row>
<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
<el-row>
<el-form-item style="width: 250px" label="用户" prop="userId">
<select-user v-model="state.queryForm.userId" />
</el-form-item>
<el-form-item style="width: 250px" label="智能柜设备" prop="hardId">
<select-hard v-model="state.queryForm.hardId" :apiParams="{ type: '4' }" />
</el-form-item>
<el-form-item style="width: 250px" label="是否授权" prop="authStatus">
<dict-select v-model="state.queryForm.authStatus" dict-code="yes_no_type" />
</el-form-item>
<el-form-item style="width: 250px" label="是否完成" prop="isDone">
<dict-select v-model="state.queryForm.isDone" dict-code="yes_no_type" />
</el-form-item>
<el-form-item style="width: 400px" label="授权时间" prop="authTimeList">
<el-date-picker v-model="state.queryForm.authTimeList" value-format="YYYY-MM-DD" type="daterange" />
</el-form-item>
<el-form-item style="width: 400px" label="完成时间" prop="isDoneTimeList">
<el-date-picker v-model="state.queryForm.isDoneTimeList" value-format="YYYY-MM-DD" type="daterange" />
</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>
<div class="mb8" style="width: 100%">
<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" v-auth="'hard_hardAuth_add'">
新 增
</el-button>
<el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'hard_hardAuth_del'" @click="handleDelete(selectObjs)">
删除
</el-button>
<right-toolbar
v-model:showSearch="showSearch"
:export="'hard_hardAuth_export'"
@@ -29,25 +49,30 @@
@sort-change="sortChangeHandle"
>
<el-table-column type="selection" width="40" align="center" />
<el-table-column type="index" label="#" width="40" />
<el-table-column prop="userId" label="预定用户" show-overflow-tooltip />
<el-table-column prop="hardId" label="硬件id" show-overflow-tooltip />
<el-table-column prop="authStatus" label="是否授权" show-overflow-tooltip />
<el-table-column prop="authTime" label="授权时间" show-overflow-tooltip />
<el-table-column prop="isDone" label="是否完成" show-overflow-tooltip />
<el-table-column prop="isDoneTime" label="完成时间" show-overflow-tooltip />
<el-table-column type="index" label="#" width="80" />
<el-table-column prop="username" label="授权用户" />
<el-table-column prop="userMobile" label="授权用户手机号" />
<el-table-column prop="hardName" label="授权硬件设备" />
<el-table-column prop="authStatus" label="是否授权">
<template #default="{ row }">
<dict-tag :options="yes_no_type" :value="row.authStatus" />
</template>
</el-table-column>
<el-table-column prop="authTime" label="授权时间" />
<el-table-column prop="isDone" label="是否完成">
<template #default="{ row }">
<dict-tag :options="yes_no_type" :value="row.isDone" />
</template>
</el-table-column>
<el-table-column prop="isDoneTime" label="完成时间" />
<el-table-column label="操作" width="150">
<template #default="scope">
<el-button icon="edit-pen" text type="primary" v-auth="'hard_hardAuth_edit'" @click="formDialogRef.openDialog(scope.row.id)"
>编辑</el-button
>
<el-button icon="delete" text type="primary" v-auth="'hard_hardAuth_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>
@@ -62,7 +87,7 @@ import { useDict } from "/@/hooks/dict"
// 引入组件
const FormDialog = defineAsyncComponent(() => import("./form.vue"))
// 定义查询字典
const { yes_no_type } = useDict("yes_no_type")
// 定义变量内容
const formDialogRef = ref()
// 搜索变量
src/views/hard/hard-door-manager/goods-putaway.vue
+3
View File
@@ -8,6 +8,9 @@
<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 style="width: 300px" label="商品分类" prop="spuCategoryId">
<select-hard-spu-category v-model="state.queryForm.spuCategoryId" placeholder="请输入商品分类" />
</el-form-item>
<el-form-item>
<el-button icon="Search" type="primary" @click="getDataList">查询</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
src/views/hard/hard-spu/index.vue
+3
View File
@@ -9,6 +9,9 @@
<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 style="width: 300px" label="商品分类" prop="spuCategoryId">
<select-hard-spu-category v-model="state.queryForm.spuCategoryId" placeholder="请输入商品分类" />
</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>