From 2e3adf807c3c198746d3d51fbab4d71bdf22af81 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 10 十一月 2023 10:14:20 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev
---
admin/src/views/business/sites.vue | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/admin/src/views/business/sites.vue b/admin/src/views/business/sites.vue
index c33845b..dd0ce29 100644
--- a/admin/src/views/business/sites.vue
+++ b/admin/src/views/business/sites.vue
@@ -8,7 +8,7 @@
<el-form-item label="绔欑偣鍚嶇О" prop="name">
<el-input v-model="searchForm.name" placeholder="璇疯緭鍏ョ珯鐐瑰悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
-
+
<!-- <el-form-item label="缂栫爜" prop="id">
<el-input v-model="searchForm.id" placeholder="璇疯緭鍏ョ紪鐮�" @keypress.enter.native="search"></el-input>
</el-form-item>
@@ -30,7 +30,7 @@
<el-form-item label="澶囨敞" prop="info">
<el-input v-model="searchForm.info" placeholder="璇疯緭鍏ュ娉�" @keypress.enter.native="search"></el-input>
</el-form-item>
-
+
<el-form-item label="鐘舵�� 0姝ｅ父 1绂佺敤" prop="status">
<el-input v-model="searchForm.status" placeholder="璇疯緭鍏ョ姸鎬� 0姝ｅ父 1绂佺敤" @keypress.enter.native="search"></el-input>
</el-form-item>
@@ -85,6 +85,7 @@
fixed="right"
>
<template slot-scope="{row}">
+ <el-button type="text" @click="$refs.QRcode.open('鏌ョ湅浜岀淮鐮�', row.code)" icon="el-icon-picture-outline-round">鏌ョ湅浜岀淮鐮�</el-button>
<el-button type="text" @click="$refs.operaSitesWindow.open('缂栬緫绔欑偣', row)" icon="el-icon-edit" v-permissions="['business:sites:update']">缂栬緫</el-button>
<el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:sites:delete']">鍒犻櫎</el-button>
</template>
@@ -99,6 +100,8 @@
</template>
<!-- 鏂板缓/淇敼 -->
<OperaSitesWindow ref="operaSitesWindow" @success="handlePageChange"/>
+ <!-- 鏌ョ湅浜岀淮鐮� -->
+ <QRcode ref="QRcode" />
</TableLayout>
</template>
@@ -107,10 +110,11 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaSitesWindow from '@/components/business/OperaSitesWindow'
+import QRcode from '@/components/business/QRcode'
export default {
name: 'Sites',
extends: BaseTable,
- components: { TableLayout, Pagination, OperaSitesWindow },
+ components: { TableLayout, Pagination, OperaSitesWindow, QRcode },
data () {
return {
// 鎼滅储
--
Gitblit v1.9.3