From f43ef0c77c6f437bd0f7459d75168e6f77e334bb Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期一, 22 十二月 2025 11:18:11 +0800
Subject: [PATCH] 修改了代码
---
ruoyi-ui/src/views/note/index.vue | 58 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 15 deletions(-)
diff --git a/ruoyi-ui/src/views/note/index.vue b/ruoyi-ui/src/views/note/index.vue
index cf5c502..665b3da 100644
--- a/ruoyi-ui/src/views/note/index.vue
+++ b/ruoyi-ui/src/views/note/index.vue
@@ -8,7 +8,7 @@
height: 35px;
border-radius: 16px 16px 16px 16px;
opacity: 0.5;" allow-create
- filterable clearable :style="{width: '100%'}" >
+ filterable :style="{width: '100%'}" >
<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
></el-option>
</el-select>
@@ -148,21 +148,21 @@
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" border aria-autocomplete="":data="propertyList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
@@ -174,6 +174,8 @@
<el-table-column label="鏍囬" prop="title" sortable :show-overflow-tooltip="true" width="150" />
<el-table-column label="瀛樺偍鍦板潃" prop="location" sortable width="150" />
<el-table-column label="鎸佹湁浜�" prop="holder" sortable width="150" />
+ <el-table-column label="浠峰�煎尯闂�" prop="valueRange" sortable width="150" />
+
<el-table-column label="鍏蜂綋浣嶇疆" prop="address" sortable width="150" />
<el-table-column label="澶囨敞" prop="remark" sortable width="130" >
<template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
@@ -207,7 +209,7 @@
></div>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width" v-if="userId != 2">
+ <el-table-column fixed="right" label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width" v-if="userId != 2">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<div class="button-container">
<el-button
@@ -280,6 +282,11 @@
<el-date-picker v-model="formDat.happenTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
:editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd"
></el-date-picker>
+ </el-form-item>
+ <el-form-item label="浠峰�艰寖鍥�" prop="valueRange">
+ <el-radio-group v-model="formDat.valueRange" :style="{width: '100%'}">
+ <el-radio v-for="(item, index) in valueRangeOptions" :key="index" :label="item.value">{{ item.label }}</el-radio>
+ </el-radio-group>
</el-form-item>
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="formDat.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>
@@ -613,7 +620,7 @@
// 鏁版嵁鑼冨洿閫夐」
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a','.M4A'],
fileList:[
],
@@ -632,7 +639,7 @@
remark: undefined,
happenTime:undefined,
url: "",
-
+ valueRange: undefined
},
// 鑿滃崟鍒楄〃
menuOptions: [],
@@ -684,14 +691,26 @@
message: '璇疯緭鍏ュ叿浣撲綅缃�',
trigger: 'blur'
}],
-
happenTime: [{
required: true,
message: '璇烽�夋嫨鏃ユ湡閫夋嫨',
trigger: 'blur'
}],
+ valueRange: [{
+ required: true,
+ message: '璇烽�夋嫨浠峰�艰寖鍥�',
+ trigger: 'change'
+ }],
},
typeOptions: [],
+ // 浠峰�艰寖鍥撮�夐」
+ valueRangeOptions: [
+ { label: '10000浠ヤ笅', value: '10000浠ヤ笅' },
+ { label: '1w鍒�10w', value: '1w鍒�10w' },
+ { label: '10w鍒�100w', value: '10w鍒�100w' },
+ { label: '100w-1000w', value: '100w-1000w' },
+ { label: '1000w浠ヤ笂', value: '1000w浠ヤ笂' }
+ ],
};
},
created() {
@@ -837,6 +856,8 @@
getList1() {
this.loading1 = true;
let userId = this.$store.state.user.userId
+
+ this.userOptions = []
showShareUser(userId, 2002).then(response=>{
console.log("===========ddddddddddddd")
console.log(response.data)
@@ -845,10 +866,10 @@
this.userOptions.push({label: element.oldName,value: element.userId})
})
})
-
-
+
+
let clanId = this.$store.state.user.clanId
-
+
getAllInfo(clanId).then(response => {
this.listRoot = response.data;
const kon = {}
@@ -872,12 +893,18 @@
const shareList = {}
shareList.shareContents = this.id1 || this.ids;
shareList.shareIds = this.ids1
+ if(shareList.shareIds.length==0)
+ {
+ this.$modal.msgSuccess("璇烽�夋嫨鍒嗕韩瀵硅薄");
+ return;
+ }
console.log(shareList,'sharelistsharelist')
this.$modal.confirm('鏄惁纭鍒嗕韩锛�').then(function() {
return share(shareList);
}).then(() => {
this.getList();
+ this.getList1();
this.$modal.msgSuccess("鍒嗕韩鎴愬姛");
this.id1 = undefined
this.open1 = false;
@@ -1037,6 +1064,7 @@
/** 鏌ョ湅璇︾粏淇℃伅 */
handleCheck(row){
const id = row.id;
+ this.open2 = false;
this.$router.push("/familymodel/property/propertyInfo/" + id);
},
/** 淇敼鎸夐挳鎿嶄綔 */
@@ -1060,7 +1088,7 @@
/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
submitDataScope: function() {
-
+
this.$refs["elForm"].validate(valid => {
if (valid) {
--
Gitblit v1.9.1