Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud
This commit is contained in:
dzc committed
commit
12ae0b3a97
3 files changed
+19
-62
No files matched your search
@@ -17,7 +17,7 @@
|
||||
<el-form-item style="width: 250px" label="用户" prop="userIdChild">
|
||||
<select-user v-model="state.queryForm.userIdChild" />
|
||||
</el-form-item>
|
||||
<el-form-item style="width: 200px" label="商户" prop="merchantIds">
|
||||
<el-form-item style="width: 220px" label="商户" prop="merchantIds">
|
||||
<select-mch v-model="state.queryForm.merchantIds" />
|
||||
</el-form-item>
|
||||
<el-form-item style="width: 200px" label="设备类型" prop="hardType">
|
||||
|
||||
@@ -2,22 +2,16 @@
|
||||
<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 :gutter="24">
|
||||
<el-col :span="4">
|
||||
<el-form-item class="w100" label="设备名" prop="name">
|
||||
<el-input v-model="state.queryForm.name" placeholder="设备名" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<el-form-item class="w100" label="设备类型" prop="type">
|
||||
<dict-select v-model="state.queryForm.type" dict-code="hard_type" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<el-form-item class="w100" label="商户" prop="merchantIds">
|
||||
<select-mch v-model="state.queryForm.merchantIds" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-row>
|
||||
<el-form-item style="width: 200px" label="设备名" prop="name">
|
||||
<el-input v-model="state.queryForm.name" placeholder="设备名" />
|
||||
</el-form-item>
|
||||
<el-form-item style="width: 200px" label="设备类型" prop="type">
|
||||
<dict-select v-model="state.queryForm.type" dict-code="hard_type" />
|
||||
</el-form-item>
|
||||
<el-form-item style="width: 220px" label="商户" prop="merchantIds">
|
||||
<select-mch v-model="state.queryForm.merchantIds" />
|
||||
</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>
|
||||
@@ -26,13 +20,7 @@
|
||||
</el-form>
|
||||
<el-row>
|
||||
<div class="mb8" style="width: 100%">
|
||||
<el-button
|
||||
icon="folder-add"
|
||||
type="primary"
|
||||
class="ml10"
|
||||
@click="formDialogRef.openDialog()"
|
||||
v-auth="'hard_hardManager_add'"
|
||||
>
|
||||
<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" v-auth="'hard_hardManager_add'">
|
||||
新 增
|
||||
</el-button>
|
||||
<el-button
|
||||
@@ -93,48 +81,18 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="createTime" width="200" label="创建时间" />
|
||||
<el-table-column
|
||||
v-auths="['hard_hardManager_edit', 'hard_hardManager_del']"
|
||||
label="操作"
|
||||
fixed="right"
|
||||
width="400"
|
||||
>
|
||||
<el-table-column v-auths="['hard_hardManager_edit', 'hard_hardManager_del']" label="操作" fixed="right" width="400">
|
||||
<template #default="{ row }">
|
||||
<el-button
|
||||
icon="edit-pen"
|
||||
text
|
||||
type="primary"
|
||||
v-auth="'hard_hardManager_edit'"
|
||||
@click="formDialogRef.openDialog(row.id)"
|
||||
<el-button icon="edit-pen" text type="primary" v-auth="'hard_hardManager_edit'" @click="formDialogRef.openDialog(row.id)"
|
||||
>编辑</el-button
|
||||
>
|
||||
<el-button
|
||||
icon="TrendCharts"
|
||||
link
|
||||
type="primary"
|
||||
v-auth="'hard_hardManager_edit'"
|
||||
@click="mqformDialogRef.openDialog(row.id)"
|
||||
>
|
||||
<el-button icon="TrendCharts" link type="primary" v-auth="'hard_hardManager_edit'" @click="mqformDialogRef.openDialog(row.id)">
|
||||
mq设置
|
||||
</el-button>
|
||||
<el-button
|
||||
icon="SetUp"
|
||||
link
|
||||
type="primary"
|
||||
v-auth="'hard_hardManager_edit'"
|
||||
@click="faceFormDialogRef.openDialog(row.id)"
|
||||
>
|
||||
<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>
|
||||
@@ -177,8 +135,7 @@ const state: BasicTableProps = reactive<BasicTableProps>({
|
||||
})
|
||||
|
||||
// table hook
|
||||
const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } =
|
||||
useTable(state)
|
||||
const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
|
||||
|
||||
// 清空搜索条件
|
||||
const resetQuery = () => {
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
<el-form-item style="width: 250px" label="用户" prop="userIds">
|
||||
<select-user v-model="state.queryForm.userIds" />
|
||||
</el-form-item>
|
||||
<el-form-item style="width: 200px" label="商户" prop="mchIds">
|
||||
<el-form-item style="width: 220px" label="商户" prop="mchIds">
|
||||
<select-mch v-model="state.queryForm.mchIds" />
|
||||
</el-form-item>
|
||||
<el-form-item style="width: 300px" label="用户部门" prop="deptId">
|
||||
|
||||
Reference in new issue
Block a user