From 52bbd96db03f32b8d750622116d2b7720eed3d51 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期五, 23 八月 2024 10:43:30 +0800
Subject: [PATCH] 修改了一些bug
---
ruoyi-ui/src/views/travel/Info.vue | 2
ruoyi-ui/src/views/clanManager/clan/index.vue | 4
ruoyi-ui/src/views/travel/index.vue | 74 +--
ruoyi-ui/src/views/contacts/index.vue | 68 +--
ruoyi-ui/src/views/device/memo.vue | 2
ruoyi-ui/src/views/economy/index.vue | 68 +--
ruoyi-ui/src/views/secret/index.vue | 65 +--
ruoyi-ui/src/views/wish/index.vue | 67 +--
ruoyi-ui/src/views/doctor/index.vue | 69 +--
ruoyi-ui/src/views/honor/index.vue | 65 +--
ruoyi-ui/src/views/self/show.vue | 10
ruoyi-ui/src/views/pet/petnote.vue | 2
ruoyi-ui/src/views/genealogy/index.vue | 4
ruoyi-ui/src/views/system/family/index.vue | 2
ruoyi-ui/src/layout/components/TagsView/index.vue | 7
ruoyi-ui/src/views/meeting/approve.vue | 2
ruoyi-ui/src/views/clanManager/ancestor/index.vue | 2
ruoyi-ui/src/views/note/memo.vue | 2
ruoyi-ui/src/views/bignote/index.vue | 65 +--
ruoyi-ui/src/views/secret/memo.vue | 2
ruoyi-ui/src/views/pet/index.vue | 68 +--
ruoyi-ui/src/views/collection/index.vue | 67 +--
ruoyi-ui/src/views/healthy/index.vue | 2
ruoyi-ui/src/views/meeting/index.vue | 2
ruoyi-ui/src/components/RightToolbar/index.vue | 13
ruoyi-ui/src/views/device/index.vue | 70 +--
ruoyi-ui/src/views/clean/index.vue | 66 +--
ruoyi-ui/src/views/selfeconomy/index.vue | 67 +--
ruoyi-ui/src/views/note/index.vue | 69 +--
ruoyi-ui/src/views/selfeconomy/memo.vue | 2
30 files changed, 345 insertions(+), 663 deletions(-)
diff --git a/ruoyi-ui/src/components/RightToolbar/index.vue b/ruoyi-ui/src/components/RightToolbar/index.vue
index 527e07c..b5d693f 100644
--- a/ruoyi-ui/src/components/RightToolbar/index.vue
+++ b/ruoyi-ui/src/components/RightToolbar/index.vue
@@ -7,9 +7,13 @@
<el-tooltip class="item" effect="dark" content="鍒锋柊" placement="top">
<el-button size="mini" circle icon="el-icon-refresh" @click="refresh()" />
</el-tooltip>
+ <el-tooltip class="item" effect="dark" content="婕旂ず瑙嗛" placement="top">
+ <el-button size="mini" circle icon="el-icon-refresh" @click="showVideo()" />
+ </el-tooltip>
<el-tooltip class="item" effect="dark" content="鏄鹃殣鍒�" placement="top" v-if="columns">
<el-button size="mini" circle icon="el-icon-menu" @click="showColumn()" />
</el-tooltip>
+
</el-row>
<el-dialog :title="title" :visible.sync="open" append-to-body>
<el-transfer
@@ -46,6 +50,10 @@
type: Boolean,
default: true,
},
+ parentValue: {
+ type: String,
+ default: ""// 鎺ユ敹骞跺睍绀烘潵鑷埗缁勪欢鐨勫��
+ },
gutter: {
type: Number,
default: 10,
@@ -69,6 +77,11 @@
}
},
methods: {
+ //婕旂ず瑙嗛
+ showVideo()
+ {
+ alert(this.parentValue)
+ },
// 鎼滅储
toggleSearch() {
this.$emit("update:showSearch", !this.showSearch);
diff --git a/ruoyi-ui/src/layout/components/TagsView/index.vue b/ruoyi-ui/src/layout/components/TagsView/index.vue
index 3c0644e..40b1c87 100644
--- a/ruoyi-ui/src/layout/components/TagsView/index.vue
+++ b/ruoyi-ui/src/layout/components/TagsView/index.vue
@@ -250,6 +250,8 @@
position: relative;
cursor: pointer;
height: 26px;
+ text-align: center;
+ width: 175px;
line-height: 26px;
border: 1px solid #d8dce5;
color: #495060;
@@ -312,6 +314,9 @@
.el-icon-close {
width: 16px;
height: 16px;
+ boerder: 3px solid red;
+ float: right;
+ line-height: 16px;
vertical-align: 2px;
border-radius: 50%;
text-align: center;
@@ -320,7 +325,7 @@
&:before {
transform: scale(.6);
display: inline-block;
- vertical-align: -3px;
+ vertical-align: -2px;
}
&:hover {
background-color: #b4bccc;
diff --git a/ruoyi-ui/src/views/bignote/index.vue b/ruoyi-ui/src/views/bignote/index.vue
index 42c49d1..926c621 100644
--- a/ruoyi-ui/src/views/bignote/index.vue
+++ b/ruoyi-ui/src/views/bignote/index.vue
@@ -139,54 +139,27 @@
</el-upload>
</el-col>
+ <el-dropdown placement="鍒嗕韩鐩稿叧">
+ <el-button size="mini" type="primary"
+ plain
+ icon="el-icon-top">鍒嗕韩鐩稿叧</el-button>
+ <template #dropdown>
+ <el-dropdown-menu>
+ <el-dropdown-item :disabled="multiple" icon="el-icon-top" style="height: 32px;width:240px;color: #0099ff;" @click.native="handleShare">鍒嗕韩</el-dropdown-item>
+
+ <el-dropdown-item icon="el-icon-top" @click.native="whoShare">鍒嗕韩缁欐垜鐨勬暟鎹�</el-dropdown-item>
+ <el-dropdown-item icon="el-icon-top" @click.native="handleWho">鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-dropdown-item>
+ <el-dropdown-item icon="el-icon-top" @click.native="showData">灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-dropdown-item>
+ </el-dropdown-menu>
+ </template>
+ </el-dropdown>
+
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- :disabled="multiple"
- @click="handleShare"
-
- >鍒嗕韩</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="handleWho"
- >鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="whoShare"
- >鍒嗕韩缁欐垜鐨勬暟鎹�</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="showData"
- >灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-button>
- </el-col>
-
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ <right-toolbar :parentValue.sync="valueFromParent" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<!-- 搴忓彿銆佹椂闂淬�佷汉鐗┿�佸湴鐐广�佸ぇ浜嬫爣棰樸�佺數瀛愭枃浠躲�佸娉� -->
<!-- 杩欓噷鏈変釜familyList鏁扮粍 鏄湪data()涓畾涔夌殑 -->
- <el-table v-loading="loading" :data="familyList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
+ <el-table v-loading="loading" border :data="familyList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
<el-table-column type="selection" :reserve-selection="true" width="55" align="center" />
<el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80px"/>
@@ -587,7 +560,7 @@
dateRange1: [],
-
+valueFromParent: "瀹跺ぇ浜嬭",
userId: undefined,
// 閬僵灞�
disabled: false,
@@ -622,7 +595,7 @@
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a'],
fileList:[],
fileList1:[],
uploadFileList: [],
diff --git a/ruoyi-ui/src/views/clanManager/ancestor/index.vue b/ruoyi-ui/src/views/clanManager/ancestor/index.vue
index 45d8572..0a1f12b 100644
--- a/ruoyi-ui/src/views/clanManager/ancestor/index.vue
+++ b/ruoyi-ui/src/views/clanManager/ancestor/index.vue
@@ -102,7 +102,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" ></right-toolbar>
</el-row>
- <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+ <el-table v-loading="loading" border :data="userList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" />
<el-table-column label="鐢ㄦ埛缂栧彿" align="center" key="id" prop="id" />
<el-table-column label="鐢ㄦ埛鍚嶇О" align="center" key="name" prop="name" :show-overflow-tooltip="true" />
diff --git a/ruoyi-ui/src/views/clanManager/clan/index.vue b/ruoyi-ui/src/views/clanManager/clan/index.vue
index 6835b36..c2f2fcd 100644
--- a/ruoyi-ui/src/views/clanManager/clan/index.vue
+++ b/ruoyi-ui/src/views/clanManager/clan/index.vue
@@ -56,7 +56,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
- <el-table v-loading="loading" :data="roleList" :row-key="getRowId" @selection-change="handleSelectionChange">
+ <el-table v-loading="loading" border :data="roleList" :row-key="getRowId" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="100"/>
@@ -223,7 +223,7 @@
},
created() {
this.getList();
- this.getAllUser();
+ //this.getAllUser();
},
methods: {
chongf(){
diff --git a/ruoyi-ui/src/views/clean/index.vue b/ruoyi-ui/src/views/clean/index.vue
index 5a4f53a..05fc82b 100644
--- a/ruoyi-ui/src/views/clean/index.vue
+++ b/ruoyi-ui/src/views/clean/index.vue
@@ -122,53 +122,27 @@
</el-upload>
</el-col>
+ <el-dropdown placement="鍒嗕韩鐩稿叧">
+ <el-button size="mini" type="primary"
+ plain
+ icon="el-icon-top">鍒嗕韩鐩稿叧</el-button>
+ <template #dropdown>
+ <el-dropdown-menu>
+ <el-dropdown-item :disabled="multiple" icon="el-icon-top" style="height: 32px;width:240px;color: #0099ff;" @click.native="handleShare">鍒嗕韩</el-dropdown-item>
+
+ <el-dropdown-item icon="el-icon-top" @click.native="whoShare">鍒嗕韩缁欐垜鐨勬暟鎹�</el-dropdown-item>
+ <el-dropdown-item icon="el-icon-top" @click.native="handleWho">鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-dropdown-item>
+ <el-dropdown-item icon="el-icon-top" @click.native="showData">灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-dropdown-item>
+ </el-dropdown-menu>
+ </template>
+ </el-dropdown>
+
+
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- :disabled="multiple"
- @click="handleShare"
-
- >鍒嗕韩</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="handleWho"
- >鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="whoShare"
- >鍒嗕韩缁欐垜鐨勬暟鎹�</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="showData"
- >灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-button>
- </el-col>
-
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ <right-toolbar :parentValue.sync="valueFromParent" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
- <el-table v-loading="loading" :data="cleanList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
+ <el-table v-loading="loading" border :data="cleanList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
<el-table-column type="selection" :reserve-selection="true" width="55" align="center" />
<el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>
@@ -597,7 +571,7 @@
dateRange1: [],
total1:0,
-
+valueFromParent: "淇濇磥鏀剁撼",
userId: undefined,
// 閬僵灞�
disabled: false,
@@ -630,7 +604,7 @@
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','m4a'],
fileList:[
],
diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index bdc2c98..666a3aa 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -184,52 +184,28 @@
</el-upload>
</el-col>
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- :disabled="multiple"
- @click="handleShare"
-
- >鍒嗕韩</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="handleWho"
- >鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="whoShare"
- >鍒嗕韩缁欐垜鐨勬暟鎹�</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="showData"
- >灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-button>
- </el-col>
-
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ <el-dropdown placement="鍒嗕韩鐩稿叧">
+ <el-button size="mini" type="primary"
+ plain
+ icon="el-icon-top">鍒嗕韩鐩稿叧</el-button>
+ <template #dropdown>
+ <el-dropdown-menu>
+ <el-dropdown-item :disabled="multiple" icon="el-icon-top" style="height: 32px;width:240px;color: #0099ff;" @click.native="handleShare">鍒嗕韩</el-dropdown-item>
+
+ <el-dropdown-item icon="el-icon-top" @click.native="whoShare">鍒嗕韩缁欐垜鐨勬暟鎹�</el-dropdown-item>
+ <el-dropdown-item icon="el-icon-top" @click.native="handleWho">鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-dropdown-item>
+ <el-dropdown-item icon="el-icon-top" @click.native="showData">灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-dropdown-item>
+ </el-dropdown-menu>
+ </template>
+ </el-dropdown>
+
+
+
+ <right-toolbar :parentValue.sync="valueFromParent" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+
</el-row>
</div>
- <el-table v-loading="loading" :data="collectionList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" >
+ <el-table v-loading="loading" border :data="collectionList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" >
<el-table-column type="selection" :reserve-selection="true" width="55" align="center" />
<el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80px"/>
<el-table-column label="鑾峰緱鏃堕棿" prop="happenTime" sortable width="120" align="center">
@@ -718,10 +694,11 @@
deptExpand: true,
deptNodeAll: false,
// 鏃ユ湡鑼冨洿
+ valueFromParent: '鏀惰棌鍜岃崳瑾�',
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a'],
fileList:[],
fileList1:[],
uploadFileList: [],
diff --git a/ruoyi-ui/src/views/contacts/index.vue b/ruoyi-ui/src/views/contacts/index.vue
index 49f06e4..0bb73e2 100644
--- a/ruoyi-ui/src/views/contacts/index.vue
+++ b/ruoyi-ui/src/views/contacts/index.vue
@@ -139,55 +139,30 @@
>瀵煎叆</el-button>
</el-upload>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- :disabled="multiple"
- @click="handleShare"
-
- >鍒嗕韩</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="handleWho"
- >鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="whoShare"
- >鍒嗕韩缁欐垜鐨勬暟鎹�</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="showData"
- >灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-button>
- </el-col>
-
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ </el-col>
+ <el-dropdown placement="鍒嗕韩鐩稿叧">
+ <el-button size="mini" type="primary"
+ plain
+ icon="el-icon-top">鍒嗕韩鐩稿叧</el-button>
+ <template #dropdown>
+ <el-dropdown-menu>
+ <el-dropdown-item :disabled="multiple" icon="el-icon-top" style="height: 32px;width:240px;color: #0099ff;" @click.native="handleShare">鍒嗕韩</el-dropdown-item>
+
+ <el-dropdown-item icon="el-icon-top" @click.native="whoShare">鍒嗕韩缁欐垜鐨勬暟鎹�</el-dropdown-item>
+ <el-dropdown-item icon="el-icon-top" @click.native="handleWho">鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-dropdown-item>
+ <el-dropdown-item icon="el-icon-top" @click.native="showData">灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-dropdown-item>
+ </el-dropdown-menu>
+ </template>
+ </el-dropdown>
+
+
+
+ <right-toolbar :parentValue.sync="valueFromParent" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+
</el-row>
</div>
- <el-table v-loading="loading" :data="contactList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" >
+ <el-table v-loading="loading" border :data="contactList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" >
<el-table-column type="selection" :reserve-selection="true" width="55" align="center" />
<el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="100px"/>
@@ -658,6 +633,7 @@
title2: "",
loading1: false,
loading2: false,
+ valueFromParent: "閫氳褰�",
// 鏌ヨ鍙傛暟1
queryParams1: {
pageNum: 1,
diff --git a/ruoyi-ui/src/views/device/index.vue b/ruoyi-ui/src/views/device/index.vue
index 9356a84..53974cb 100644
--- a/ruoyi-ui/src/views/device/index.vue
+++ b/ruoyi-ui/src/views/device/index.vue
@@ -134,53 +134,29 @@
</el-upload>
</el-col>
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- :disabled="multiple"
- @click="handleShare"
-
- >鍒嗕韩</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="handleWho"
- >鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="whoShare"
- >鍒嗕韩缁欐垜鐨勬暟鎹�</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="showData"
- >灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-button>
- </el-col>
-
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ <el-dropdown placement="鍒嗕韩鐩稿叧">
+ <el-button size="mini" type="primary"
+ plain
+ icon="el-icon-top">鍒嗕韩鐩稿叧</el-button>
+ <template #dropdown>
+ <el-dropdown-menu>
+ <el-dropdown-item :disabled="multiple" icon="el-icon-top" style="height: 32px;width:240px;color: #0099ff;" @click.native="handleShare">鍒嗕韩</el-dropdown-item>
+
+ <el-dropdown-item icon="el-icon-top" @click.native="whoShare">鍒嗕韩缁欐垜鐨勬暟鎹�</el-dropdown-item>
+ <el-dropdown-item icon="el-icon-top" @click.native="handleWho">鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-dropdown-item>
+ <el-dropdown-item icon="el-icon-top" @click.native="showData">灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-dropdown-item>
+ </el-dropdown-menu>
+ </template>
+ </el-dropdown>
+
+
+
+ <right-toolbar :parentValue.sync="valueFromParent" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+
</el-row>
<!-- 搴忓彿銆佽澶囧悕绉般�佹椂闂淬�佽喘涔颁汉銆佷簨椤瑰唴瀹广�佸瓨鏀惧湴鐐广�佺數瀛愭枃浠躲�佸娉� 鎿嶄綔-->
<!-- 杩欓噷鏈変釜familyList鏁扮粍 鏄湪data()涓畾涔夌殑 -->
- <el-table v-loading="loading" :data="equipmentList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
+ <el-table v-loading="loading" border :data="equipmentList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column type="selection" :reserve-selection="true" width="55" align="center" />
<el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
<el-table-column label="璁惧鍚嶇О" prop="name" sortable width="150" />
@@ -477,7 +453,7 @@
</el-select>
</div>
- <el-table v-loading="loading2" :data="shareList1" :row-key="getRowId2" ref="multipleTable" @selection-change="handleSelectionChange2" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
+ <el-table v-loading="loading2" border :data="shareList1" :row-key="getRowId2" ref="multipleTable" @selection-change="handleSelectionChange2" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<!-- <el-table-column type="selection" :reserve-selection="true" width="55" align="center" /> -->
<!-- <el-table-column fixed label="搴忓彿" sortable type="index" align="center" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/> -->
<el-table-column label="璁惧鍚嶇О" prop="name" sortable width="150" />
@@ -616,7 +592,7 @@
single1: true,
multiple1: true,
dateRange1: [],
-
+ valueFromParent: '瀹跺涵璁惧',
userId: undefined,
// 閬僵灞�
@@ -650,7 +626,7 @@
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a'],
fileList:[
],
diff --git a/ruoyi-ui/src/views/device/memo.vue b/ruoyi-ui/src/views/device/memo.vue
index 738963d..934a537 100644
--- a/ruoyi-ui/src/views/device/memo.vue
+++ b/ruoyi-ui/src/views/device/memo.vue
@@ -4,7 +4,7 @@
<el-button class="button1" size="mini" type="text" @click="handleAdd" v-hasPermi="['system:role:add']">
<sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn> </el-button>
- <el-table v-loading="loading" :data="memoList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;width: 60%;">
+ <el-table v-loading="loading" border :data="memoList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;width: 60%;">
<el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="150"/>
<el-table-column label="鏃堕棿" prop="happenTime" sortable width="180px" align="center">
diff --git a/ruoyi-ui/src/views/doctor/index.vue b/ruoyi-ui/src/views/doctor/index.vue
index 3ec4f18..a09ac1c 100644
--- a/ruoyi-ui/src/views/doctor/index.vue
+++ b/ruoyi-ui/src/views/doctor/index.vue
@@ -132,54 +132,29 @@
</el-upload>
</el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- :disabled="multiple"
- @click="handleShare"
-
- >鍒嗕韩</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="handleWho"
- >鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="whoShare"
- >鍒嗕韩缁欐垜鐨勬暟鎹�</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="showData"
- >灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-button>
- </el-col>
-
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ <el-dropdown placement="鍒嗕韩鐩稿叧">
+ <el-button size="mini" type="primary"
+ plain
+ icon="el-icon-top">鍒嗕韩鐩稿叧</el-button>
+ <template #dropdown>
+ <el-dropdown-menu>
+ <el-dropdown-item :disabled="multiple" icon="el-icon-top" style="height: 32px;width:240px;color: #0099ff;" @click.native="handleShare">鍒嗕韩</el-dropdown-item>
+
+ <el-dropdown-item icon="el-icon-top" @click.native="whoShare">鍒嗕韩缁欐垜鐨勬暟鎹�</el-dropdown-item>
+ <el-dropdown-item icon="el-icon-top" @click.native="handleWho">鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-dropdown-item>
+ <el-dropdown-item icon="el-icon-top" @click.native="showData">灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-dropdown-item>
+ </el-dropdown-menu>
+ </template>
+ </el-dropdown>
+
+
+
+ <right-toolbar :parentValue.sync="valueFromParent" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+
</el-row>
</div>
- <el-table v-loading="loading" :data="doctorList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
+ <el-table v-loading="loading" border :data="doctorList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column type="selection" :reserve-selection="true" width="55" align="center" />
<el-table-column fixed label="搴忓彿" sortable type="index" align="center" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
<el-table-column label="绫诲埆" prop="type" sortable :show-overflow-tooltip="true" width="80" align="center">
@@ -618,6 +593,7 @@
title2: "",
loading1: false,
loading2: false,
+ valueFromParent: '瀹跺涵灏忓尰鐢�',
// 鏌ヨ鍙傛暟1
queryParams1: {
pageNum: 1,
@@ -668,7 +644,8 @@
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng',
+ '.m4a'],
fileList:[],
fileList1:[],
uploadFileList: [],
diff --git a/ruoyi-ui/src/views/economy/index.vue b/ruoyi-ui/src/views/economy/index.vue
index e363e03..db9f086 100644
--- a/ruoyi-ui/src/views/economy/index.vue
+++ b/ruoyi-ui/src/views/economy/index.vue
@@ -104,54 +104,29 @@
</el-upload>
</el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- :disabled="multiple"
- @click="handleShare"
-
- >鍒嗕韩</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="handleWho"
- >鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="whoShare"
- >鍒嗕韩缁欐垜鐨勬暟鎹�</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="showData"
- >灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-button>
- </el-col>
-
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ <el-dropdown placement="鍒嗕韩鐩稿叧">
+ <el-button size="mini" type="primary"
+ plain
+ icon="el-icon-top">鍒嗕韩鐩稿叧</el-button>
+ <template #dropdown>
+ <el-dropdown-menu>
+ <el-dropdown-item :disabled="multiple" icon="el-icon-top" style="height: 32px;width:240px;color: #0099ff;" @click.native="handleShare">鍒嗕韩</el-dropdown-item>
+
+ <el-dropdown-item icon="el-icon-top" @click.native="whoShare">鍒嗕韩缁欐垜鐨勬暟鎹�</el-dropdown-item>
+ <el-dropdown-item icon="el-icon-top" @click.native="handleWho">鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-dropdown-item>
+ <el-dropdown-item icon="el-icon-top" @click.native="showData">灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-dropdown-item>
+ </el-dropdown-menu>
+ </template>
+ </el-dropdown>
+
+
+
+ <right-toolbar :parentValue.sync="valueFromParent" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+
</el-row>
<!-- 搴忓彿銆佸熀閲�/鍙拌处銆佹椂闂淬�佹敹鍏�/鏀嚭銆佺敤閫斻�佷娇鐢ㄤ汉銆佺幇閲�/鑷姩鎵ｅ垝銆佷綑棰濄�佺數瀛愭枃浠躲�佸娉� 鎿嶄綔-->
<!-- 杩欓噷鏈変釜familyList鏁扮粍 鏄湪data()涓畾涔夌殑 -->
- <el-table v-loading="loading" :data="economyList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
+ <el-table v-loading="loading" border :data="economyList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column type="selection" width="55" align="center" />
<el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>
@@ -608,10 +583,11 @@
deptNodeAll: false,
// 鏃ユ湡鑼冨洿
dateRange: [],
+ valueFromParent: '瀹跺涵鏀舵敮鍙拌处',
// 鏁版嵁鑼冨洿閫夐」
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a'],
fileList:[
],
diff --git a/ruoyi-ui/src/views/genealogy/index.vue b/ruoyi-ui/src/views/genealogy/index.vue
index 5341ab5..f8a97c1 100644
--- a/ruoyi-ui/src/views/genealogy/index.vue
+++ b/ruoyi-ui/src/views/genealogy/index.vue
@@ -83,7 +83,7 @@
</el-row>
</div>
- <el-table v-loading="loading" :data="listRoot" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
+ <el-table v-loading="loading" border :data="listRoot" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column type="selection" width="55" align="center" />
<el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>
<el-table-column label="韬唤" prop="identity" sortable width="100" >
@@ -368,8 +368,6 @@
this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
this.queryParams.clanId = this.$store.state.user.clanId
- // this.queryParams.pageSize = this.pageSize; // 娣诲姞 pageSize 鍙傛暟
- // this.queryParams.pageNum = this.pageNum; // 娣诲姞 pageNum 鍙傛暟
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
listUserAll(this.queryParams).then(response => {
diff --git a/ruoyi-ui/src/views/healthy/index.vue b/ruoyi-ui/src/views/healthy/index.vue
index 63f02e2..faba6e9 100644
--- a/ruoyi-ui/src/views/healthy/index.vue
+++ b/ruoyi-ui/src/views/healthy/index.vue
@@ -126,7 +126,7 @@
</el-col>
</el-row>
- <el-table v-loading="loading" :data="healthList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
+ <el-table v-loading="loading" border :data="healthList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
diff --git a/ruoyi-ui/src/views/honor/index.vue b/ruoyi-ui/src/views/honor/index.vue
index e070a9b..afcaf30 100644
--- a/ruoyi-ui/src/views/honor/index.vue
+++ b/ruoyi-ui/src/views/honor/index.vue
@@ -113,52 +113,29 @@
</el-upload>
</el-col>
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- :disabled="multiple"
- @click="handleShare"
-
- >鍒嗕韩</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="handleWho"
- >鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="whoShare"
- >鍒嗕韩缁欐垜鐨勬暟鎹�</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="showData"
- >灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-button>
- </el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ <el-dropdown placement="鍒嗕韩鐩稿叧">
+ <el-button size="mini" type="primary"
+ plain
+ icon="el-icon-top">鍒嗕韩鐩稿叧</el-button>
+ <template #dropdown>
+ <el-dropdown-menu>
+ <el-dropdown-item :disabled="multiple" icon="el-icon-top" style="height: 32px;width:240px;color: #0099ff;" @click.native="handleShare">鍒嗕韩</el-dropdown-item>
+
+ <el-dropdown-item icon="el-icon-top" @click.native="whoShare">鍒嗕韩缁欐垜鐨勬暟鎹�</el-dropdown-item>
+ <el-dropdown-item icon="el-icon-top" @click.native="handleWho">鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-dropdown-item>
+ <el-dropdown-item icon="el-icon-top" @click.native="showData">灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-dropdown-item>
+ </el-dropdown-menu>
+ </template>
+ </el-dropdown>
+
+
+
+ <right-toolbar :parentValue.sync="valueFromParent" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+
</el-row>
</div>
- <el-table v-loading="loading" :data="honorList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
+ <el-table v-loading="loading" border :data="honorList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column type="selection" :reserve-selection="true" width="55" align="center" />
<el-table-column fixed label="搴忓彿" sortable type="index" align="center" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
<el-table-column label="绫诲埆" prop="type" sortable :show-overflow-tooltip="true" width="120" align="center" >
@@ -674,7 +651,7 @@
name:undefined,
},
// searchVal:"",
-
+ valueFromParent: "鑽ｈ獕璇佷功濂栭」",
// 琛ㄥ崟鍙傛暟
form: {},
defaultProps: {
diff --git a/ruoyi-ui/src/views/meeting/approve.vue b/ruoyi-ui/src/views/meeting/approve.vue
index 5e385e6..28fcbbd 100644
--- a/ruoyi-ui/src/views/meeting/approve.vue
+++ b/ruoyi-ui/src/views/meeting/approve.vue
@@ -62,7 +62,7 @@
</el-form>
- <el-table v-loading="loading" :data="meetingList" :row-key="getRowId" ref="multipleTable"
+ <el-table v-loading="loading" border :data="meetingList" :row-key="getRowId" ref="multipleTable"
@selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
<!-- <el-table-column type="selection" :reserve-selection="true" width="55" align="center" /> -->
diff --git a/ruoyi-ui/src/views/meeting/index.vue b/ruoyi-ui/src/views/meeting/index.vue
index a54459e..3c9b044 100644
--- a/ruoyi-ui/src/views/meeting/index.vue
+++ b/ruoyi-ui/src/views/meeting/index.vue
@@ -148,7 +148,7 @@
</el-row>
- <el-table v-loading="loading" :data="meetingList" :row-key="getRowId" ref="multipleTable"
+ <el-table v-loading="loading" border :data="meetingList" :row-key="getRowId" ref="multipleTable"
@selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
<el-table-column type="selection" :reserve-selection="true" width="55" align="center" />
diff --git a/ruoyi-ui/src/views/note/index.vue b/ruoyi-ui/src/views/note/index.vue
index e725ba0..fa96064 100644
--- a/ruoyi-ui/src/views/note/index.vue
+++ b/ruoyi-ui/src/views/note/index.vue
@@ -143,52 +143,28 @@
</el-upload>
</el-col>
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- :disabled="multiple"
- @click="handleShare"
-
- >鍒嗕韩</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="handleWho"
- >鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="whoShare"
- >鍒嗕韩缁欐垜鐨勬暟鎹�</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="showData"
- >灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-button>
- </el-col>
-
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ <el-dropdown placement="鍒嗕韩鐩稿叧">
+ <el-button size="mini" type="primary"
+ plain
+ icon="el-icon-top">鍒嗕韩鐩稿叧</el-button>
+ <template #dropdown>
+ <el-dropdown-menu>
+ <el-dropdown-item :disabled="multiple" icon="el-icon-top" style="height: 32px;width:240px;color: #0099ff;" @click.native="handleShare">鍒嗕韩</el-dropdown-item>
+
+ <el-dropdown-item icon="el-icon-top" @click.native="whoShare">鍒嗕韩缁欐垜鐨勬暟鎹�</el-dropdown-item>
+ <el-dropdown-item icon="el-icon-top" @click.native="handleWho">鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-dropdown-item>
+ <el-dropdown-item icon="el-icon-top" @click.native="showData">灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-dropdown-item>
+ </el-dropdown-menu>
+ </template>
+ </el-dropdown>
+
+
+
+ <right-toolbar :parentValue.sync="valueFromParent" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+
</el-row>
- <el-table v-loading="loading" :data="propertyList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
+ <el-table v-loading="loading" border aria-autocomplete="":data="propertyList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
<el-table-column type="selection" width="55" align="center" />
<el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="100"/>
@@ -273,7 +249,7 @@
<!-- 娣诲姞鎴栦慨鏀硅祫浜т俊鎭厤缃璇濇 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
- <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
+ <el-form ref="elForm" border :model="formDat" :rules="rules" size="medium" label-width="100px">
<!-- <el-form-item label="绫诲埆" prop="type">-->
<!-- <el-input v-model="formDat.type" placeholder="璇疯緭鍏ョ被鍒�" clearable :style="{width: '100%'}" ></el-input>-->
<!-- </el-form-item>-->
@@ -628,12 +604,13 @@
menuNodeAll: false,
deptExpand: true,
deptNodeAll: false,
+ valueFromParent: '瀹跺涵璧勪骇',
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a'],
fileList:[
],
diff --git a/ruoyi-ui/src/views/note/memo.vue b/ruoyi-ui/src/views/note/memo.vue
index b4266f2..65612a3 100644
--- a/ruoyi-ui/src/views/note/memo.vue
+++ b/ruoyi-ui/src/views/note/memo.vue
@@ -4,7 +4,7 @@
<el-button class="button1" size="mini" type="text" @click="handleAdd" v-hasPermi="['system:role:add']">
<sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn> </el-button>
- <el-table v-loading="loading" :data="memoList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;width: 60%;">
+ <el-table v-loading="loading" border :data="memoList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;width: 60%;">
<el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="150"/>
<el-table-column label="鏃堕棿" prop="happenTime" sortable width="180px" align="center">
diff --git a/ruoyi-ui/src/views/pet/index.vue b/ruoyi-ui/src/views/pet/index.vue
index ba8ad27..9329289 100644
--- a/ruoyi-ui/src/views/pet/index.vue
+++ b/ruoyi-ui/src/views/pet/index.vue
@@ -87,54 +87,28 @@
v-hasPermi="['system:role:remove']"
>鍒犻櫎</el-button>
</el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- :disabled="multiple"
- @click="handleShare"
-
- >鍒嗕韩</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="handleWho"
- >鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="whoShare"
- >鍒嗕韩缁欐垜鐨勬暟鎹�</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="showData"
- >灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-button>
- </el-col>
-
-
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ <el-dropdown placement="鍒嗕韩鐩稿叧">
+ <el-button size="mini" type="primary"
+ plain
+ icon="el-icon-top">鍒嗕韩鐩稿叧</el-button>
+ <template #dropdown>
+ <el-dropdown-menu>
+ <el-dropdown-item :disabled="multiple" icon="el-icon-top" style="height: 32px;width:240px;color: #0099ff;" @click.native="handleShare">鍒嗕韩</el-dropdown-item>
+
+ <el-dropdown-item icon="el-icon-top" @click.native="whoShare">鍒嗕韩缁欐垜鐨勬暟鎹�</el-dropdown-item>
+ <el-dropdown-item icon="el-icon-top" @click.native="handleWho">鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-dropdown-item>
+ <el-dropdown-item icon="el-icon-top" @click.native="showData">灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-dropdown-item>
+ </el-dropdown-menu>
+ </template>
+ </el-dropdown>
+
+
+
+ <right-toolbar :parentValue.sync="valueFromParent" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+
</el-row>
- <el-table v-loading="loading" :data="petList,PetNoteList" ref="table2" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
+ <el-table v-loading="loading" border :data="petList,PetNoteList" ref="table2" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
@@ -575,7 +549,7 @@
menuNodeAll: false,
deptExpand: true,
deptNodeAll: false,
-
+ valueFromParent: '瀹跺涵瀹犵墿',
dialogImageUrl: '',
dialogVisible: false,
// 鏃ユ湡鑼冨洿
diff --git a/ruoyi-ui/src/views/pet/petnote.vue b/ruoyi-ui/src/views/pet/petnote.vue
index 82c7f1d..17cbe1f 100644
--- a/ruoyi-ui/src/views/pet/petnote.vue
+++ b/ruoyi-ui/src/views/pet/petnote.vue
@@ -60,7 +60,7 @@
</el-upload>
</el-col>
</el-row>
- <el-table v-loading="loading" :data="PetNoteList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;width: 100%;">
+ <el-table v-loading="loading" border :data="PetNoteList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;width: 100%;">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80px"/>
<el-table-column label="鏃ユ湡" prop="happenTime" sortable width="200px" align="center">
diff --git a/ruoyi-ui/src/views/secret/index.vue b/ruoyi-ui/src/views/secret/index.vue
index ce05d69..2df9200 100644
--- a/ruoyi-ui/src/views/secret/index.vue
+++ b/ruoyi-ui/src/views/secret/index.vue
@@ -124,53 +124,29 @@
</el-upload>
</el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- :disabled="multiple"
- @click="handleShare"
-
- >鍒嗕韩</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="handleWho"
- >鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="whoShare"
- >鍒嗕韩缁欐垜鐨勬暟鎹�</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="showData"
- >灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-button>
- </el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ <el-dropdown placement="鍒嗕韩鐩稿叧">
+ <el-button size="mini" type="primary"
+ plain
+ icon="el-icon-top">鍒嗕韩鐩稿叧</el-button>
+ <template #dropdown>
+ <el-dropdown-menu>
+ <el-dropdown-item :disabled="multiple" icon="el-icon-top" style="height: 32px;width:240px;color: #0099ff;" @click.native="handleShare">鍒嗕韩</el-dropdown-item>
+
+ <el-dropdown-item icon="el-icon-top" @click.native="whoShare">鍒嗕韩缁欐垜鐨勬暟鎹�</el-dropdown-item>
+ <el-dropdown-item icon="el-icon-top" @click.native="handleWho">鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-dropdown-item>
+ <el-dropdown-item icon="el-icon-top" @click.native="showData">灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-dropdown-item>
+ </el-dropdown-menu>
+ </template>
+ </el-dropdown>
+
+
+
+ <right-toolbar :parentValue.sync="valueFromParent" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+
</el-row>
- <el-table v-loading="loading" :data="secretList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
+ <el-table v-loading="loading" border :data="secretList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column type="selection" :reserve-selection="true" width="55" align="center" />
<el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>
<el-table-column label="鍙戠敓鏃堕棿" prop="happenTime" sortable width="150" align="center">
@@ -610,6 +586,7 @@
title2: "",
loading1: false,
loading2: false,
+ valueFromParent: '闅愮',
// 鏌ヨ鍙傛暟1
queryParams1: {
pageNum: 1,
diff --git a/ruoyi-ui/src/views/secret/memo.vue b/ruoyi-ui/src/views/secret/memo.vue
index d9f4327..9f57582 100644
--- a/ruoyi-ui/src/views/secret/memo.vue
+++ b/ruoyi-ui/src/views/secret/memo.vue
@@ -4,7 +4,7 @@
<el-button class="button1" size="mini" type="text" @click="handleAdd" v-hasPermi="['system:role:add']">
<sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn> </el-button>
- <el-table v-loading="loading" :data="memoList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;width: 60%;">
+ <el-table v-loading="loading" border :data="memoList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;width: 60%;">
<el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="150"/>
<el-table-column label="鏃堕棿" prop="happenTime" sortable width="180px" align="center">
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index a4510b4..59779a3 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -220,7 +220,7 @@
</el-row>
</div>
- <el-table v-loading="loading" :data="noteList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
+ <el-table v-loading="loading" border :data="noteList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column type="selection" :reserve-selection="true" width="55" align="center" />
<el-table-column fixed label="搴忓彿" sortable type="index" align="center" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
@@ -503,7 +503,7 @@
</div>
</div>
</template>
- <el-table v-loading="loading" :data="experienceList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
+ <el-table v-loading="loading" border :data="experienceList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column label="寮�濮嬫棩鏈�" prop="startDate" sortable width="250" align="center" >
<template slot-scope="scope">
<template v-if="!scope.row.isEdit">{{ scope.row.startDate }}</template>
@@ -557,7 +557,7 @@
</div>
</div>
</template>
- <el-table v-loading="loading" :data="relationList" @selection-change="handleSelectionChange"
+ <el-table v-loading="loading" border :data="relationList" @selection-change="handleSelectionChange"
:row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column label="涓庢湰浜哄叧绯�" prop="relation" sortable width="260" align="center" >
<template slot-scope="scope">
@@ -610,7 +610,7 @@
<sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
</div>
</template>
- <el-table v-loading="loading" :data="certificateList" @selection-change="handleSelectionChange"
+ <el-table v-loading="loading" border :data="certificateList" @selection-change="handleSelectionChange"
:row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column label="璇佷欢鍚嶇О" prop="cerName" sortable width="230" align="center" >
<template slot-scope="scope">
@@ -675,7 +675,7 @@
<sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
</div>
</template>
- <el-table v-loading="loading" :data="AbroadList" @selection-change="handleSelectionChange"
+ <el-table v-loading="loading" border :data="AbroadList" @selection-change="handleSelectionChange"
:row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column label="寮�濮嬫椂闂�" prop="startTime" sortable width="200" align="center">
<template slot-scope="scope">
diff --git a/ruoyi-ui/src/views/selfeconomy/index.vue b/ruoyi-ui/src/views/selfeconomy/index.vue
index 6cd6e4c..f33fb95 100644
--- a/ruoyi-ui/src/views/selfeconomy/index.vue
+++ b/ruoyi-ui/src/views/selfeconomy/index.vue
@@ -132,53 +132,29 @@
</el-upload>
</el-col>
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- :disabled="multiple"
- @click="handleShare"
-
- >鍒嗕韩</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="handleWho"
- >鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="whoShare"
- >鍒嗕韩缁欐垜鐨勬暟鎹�</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="showData"
- >灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-button>
- </el-col>
-
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ <el-dropdown placement="鍒嗕韩鐩稿叧">
+ <el-button size="mini" type="primary"
+ plain
+ icon="el-icon-top">鍒嗕韩鐩稿叧</el-button>
+ <template #dropdown>
+ <el-dropdown-menu>
+ <el-dropdown-item :disabled="multiple" icon="el-icon-top" style="height: 32px;width:240px;color: #0099ff;" @click.native="handleShare">鍒嗕韩</el-dropdown-item>
+
+ <el-dropdown-item icon="el-icon-top" @click.native="whoShare">鍒嗕韩缁欐垜鐨勬暟鎹�</el-dropdown-item>
+ <el-dropdown-item icon="el-icon-top" @click.native="handleWho">鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-dropdown-item>
+ <el-dropdown-item icon="el-icon-top" @click.native="showData">灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-dropdown-item>
+ </el-dropdown-menu>
+ </template>
+ </el-dropdown>
+
+
+
+ <right-toolbar :parentValue.sync="valueFromParent" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+
</el-row>
</div>
- <el-table v-loading="loading" :data="selfeconomyList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
+ <el-table v-loading="loading" border :data="selfeconomyList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column type="selection" :reserve-selection="true" width="55" align="center" />
<el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
<el-table-column label="鏃ユ湡" prop="happenTime" sortable width="100" align="center">
@@ -671,6 +647,7 @@
wishList: [],
// 寮瑰嚭灞傛爣棰�
title: "",
+ valueFromParent: "璐骇",
// 鏄惁鏄剧ず寮瑰嚭灞�
open: false,
// 鏄惁鏄剧ず寮瑰嚭灞傦紙鏁版嵁鏉冮檺锛�
@@ -684,7 +661,7 @@
// 鏁版嵁鑼冨洿閫夐」
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a'],
fileList:[
],
diff --git a/ruoyi-ui/src/views/selfeconomy/memo.vue b/ruoyi-ui/src/views/selfeconomy/memo.vue
index db3adca..8a2ad78 100644
--- a/ruoyi-ui/src/views/selfeconomy/memo.vue
+++ b/ruoyi-ui/src/views/selfeconomy/memo.vue
@@ -4,7 +4,7 @@
<el-button class="button1" size="mini" type="text" @click="handleAdd" v-hasPermi="['system:role:add']">
<sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn> </el-button>
- <el-table v-loading="loading" :data="memoList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;width: 60%;">
+ <el-table v-loading="loading" border :data="memoList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;width: 60%;">
<el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="150"/>
<el-table-column label="鏃堕棿" prop="happenTime" sortable width="180px" align="center">
diff --git a/ruoyi-ui/src/views/system/family/index.vue b/ruoyi-ui/src/views/system/family/index.vue
index 23e196b..1d5db73 100644
--- a/ruoyi-ui/src/views/system/family/index.vue
+++ b/ruoyi-ui/src/views/system/family/index.vue
@@ -268,6 +268,7 @@
},
getAllUser(){
let clanId = this.$store.state.user.clanId
+
getAllInfo(clanId).then(response=>{
let fams = response.data
let _this = this;
@@ -288,6 +289,7 @@
this.loading = true;
let clanId = this.$store.state.user.clanId
// alert(clanId)
+ //alert(clanId)
this.queryParams.clanId = clanId;
listFamily(this.queryParams).then(response => {
console.log(response)
diff --git a/ruoyi-ui/src/views/travel/Info.vue b/ruoyi-ui/src/views/travel/Info.vue
index f9fa827..aad89a4 100644
--- a/ruoyi-ui/src/views/travel/Info.vue
+++ b/ruoyi-ui/src/views/travel/Info.vue
@@ -89,7 +89,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
- <el-table v-loading="loading" :data="travelBase" @selection-change="handleSelectionChange" @row-click="handleCheck" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
+ <el-table v-loading="loading" border :data="travelBase" @selection-change="handleSelectionChange" @row-click="handleCheck" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
diff --git a/ruoyi-ui/src/views/travel/index.vue b/ruoyi-ui/src/views/travel/index.vue
index 98a9dc0..c8d917f 100644
--- a/ruoyi-ui/src/views/travel/index.vue
+++ b/ruoyi-ui/src/views/travel/index.vue
@@ -83,56 +83,31 @@
>鍒犻櫎</el-button>
</el-col>
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- :disabled="multiple"
- @click="handleShare"
-
- >鍒嗕韩</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="handleWho"
- >鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="whoShare"
- >鍒嗕韩缁欐垜鐨勬暟鎹�</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="showData"
- >灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-button>
- </el-col>
-
-
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ <el-dropdown placement="鍒嗕韩鐩稿叧">
+ <el-button size="mini" type="primary"
+ plain
+ icon="el-icon-top">鍒嗕韩鐩稿叧</el-button>
+ <template #dropdown>
+ <el-dropdown-menu>
+ <el-dropdown-item :disabled="multiple" icon="el-icon-top" style="height: 32px;width:240px;color: #0099ff;" @click.native="handleShare">鍒嗕韩</el-dropdown-item>
+
+ <el-dropdown-item icon="el-icon-top" @click.native="whoShare">鍒嗕韩缁欐垜鐨勬暟鎹�</el-dropdown-item>
+ <el-dropdown-item icon="el-icon-top" @click.native="handleWho">鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-dropdown-item>
+ <el-dropdown-item icon="el-icon-top" @click.native="showData">灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-dropdown-item>
+ </el-dropdown-menu>
+ </template>
+ </el-dropdown>
+
+
+
+ <right-toolbar :parentValue.sync="valueFromParent" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+
</el-row>
<!-- 搴忓彿銆佸熀閲�/鍙拌处銆佹椂闂淬�佹敹鍏�/鏀嚭銆佺敤閫斻�佷娇鐢ㄤ汉銆佺幇閲�/鑷姩鎵ｅ垝銆佷綑棰濄�佺數瀛愭枃浠躲�佸娉� 鎿嶄綔-->
<!-- 杩欓噷鏈変釜familyList鏁扮粍 鏄湪data()涓畾涔夌殑 -->
- <el-table v-loading="loading" :data="travelpriceList" @row-click="getRowId" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
+ <el-table v-loading="loading" border :data="travelpriceList" @row-click="getRowId" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column type="selection" :reserve-selection="true" width="55" align="center" />
<el-table-column type="expand" :cell-class-name="expandRowClassName">
<template slot-scope="props">
@@ -273,7 +248,7 @@
<div style="background-color: #FEF7FC;">
- <el-dialog :title="title" :visible.sync="openDataScope" width="1300px" append-to-body >
+ <el-dialog :title="title" :visible.sync="openDataScope" width="1300px" append-to-body >
<div style="background-color: #FEF7FC;">
<el-table v-loading="loading" :data="detailList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" >
<el-table-column type="selection" width="50" align="center" />
@@ -327,7 +302,7 @@
<!-- 鏂板鏃呮父缁忓巻-->
- <el-dialog :title="title" :visible.sync="dialog1Visible" width="800px" append-to-body>
+ <el-dialog :title="title" border :visible.sync="dialog1Visible" width="800px" append-to-body>
<el-form ref="elForm2" :model="formDat4" :rules="rules2" size="medium" label-width="100px">
<el-form-item label="鏍囬" prop="name">
@@ -603,7 +578,7 @@
</el-select>
</div>
- <el-table v-loading="loading2" :data="shareList1" :row-key="getRowId2" ref="multipleTable" @selection-change="handleSelectionChange2" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
+ <el-table v-loading="loading2" border :data="shareList1" :row-key="getRowId2" ref="multipleTable" @selection-change="handleSelectionChange2" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column type="expand" :cell-class-name="expandRowClassName">
<template slot-scope="props">
@@ -838,10 +813,11 @@
deptNodeAll: false,
// 鏃ユ湡鑼冨洿
dateRange: [],
+ valueFromParent: '鏃呮父',
// 鏁版嵁鑼冨洿閫夐」
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a'],
fileList:[
],
diff --git a/ruoyi-ui/src/views/wish/index.vue b/ruoyi-ui/src/views/wish/index.vue
index 423e692..dd9f410 100644
--- a/ruoyi-ui/src/views/wish/index.vue
+++ b/ruoyi-ui/src/views/wish/index.vue
@@ -150,52 +150,28 @@
</el-upload>
</el-col>
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- :disabled="multiple"
- @click="handleShare"
-
- >鍒嗕韩</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="handleWho"
- >鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="whoShare"
- >鍒嗕韩缁欐垜鐨勬暟鎹�</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="showData"
- >灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-button>
- </el-col>
-
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ <el-dropdown placement="鍒嗕韩鐩稿叧">
+ <el-button size="mini" type="primary"
+ plain
+ icon="el-icon-top">鍒嗕韩鐩稿叧</el-button>
+ <template #dropdown>
+ <el-dropdown-menu>
+ <el-dropdown-item :disabled="multiple" icon="el-icon-top" style="height: 32px;width:240px;color: #0099ff;" @click.native="handleShare">鍒嗕韩</el-dropdown-item>
+
+ <el-dropdown-item icon="el-icon-top" @click.native="whoShare">鍒嗕韩缁欐垜鐨勬暟鎹�</el-dropdown-item>
+ <el-dropdown-item icon="el-icon-top" @click.native="handleWho">鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-dropdown-item>
+ <el-dropdown-item icon="el-icon-top" @click.native="showData">灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-dropdown-item>
+ </el-dropdown-menu>
+ </template>
+ </el-dropdown>
+
+
+
+ <right-toolbar :parentValue.sync="valueFromParent" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+
</el-row>
</div>
- <el-table v-loading="loading" :data="wishList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
+ <el-table v-loading="loading" border :data="wishList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column type="selection" :reserve-selection="true" width="55" align="center" />
<el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
<el-table-column label="鏃堕棿" prop="happenTime" sortable width="150" align="center">
@@ -675,10 +651,11 @@
deptNodeAll: false,
// 鏃ユ湡鑼冨洿
dateRange: [],
+ valueFromParent: '鐧惧勾蹇冩効',
// 鏁版嵁鑼冨洿閫夐」
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a'],
fileList:[],
fileList1:[],
--
Gitblit v1.9.1