From 80e0b09695493b7f811f746dfb7158244088afe3 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 22 九月 2024 11:02:56 +0800
Subject: [PATCH] 修改了多个bug

---
 ruoyi-ui/src/views/bignote/index.vue |   80 +++++++++++++++++++++++++++++----------
 1 files changed, 59 insertions(+), 21 deletions(-)

diff --git a/ruoyi-ui/src/views/bignote/index.vue b/ruoyi-ui/src/views/bignote/index.vue
index 926c621..6efa7e2 100644
--- a/ruoyi-ui/src/views/bignote/index.vue
+++ b/ruoyi-ui/src/views/bignote/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container" style="opacity: 1;">
+  <div class="app-container" style="opacity: 1;" >
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
 
       <el-form-item label="澶т簨鏍囬" prop="title">
@@ -244,7 +244,7 @@
     />
 
     <!-- 娣诲姞鎴栦慨鏀硅祫浜т俊鎭厤缃璇濇 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+    <el-dialog :title="title"   @click.native="handleDialogClick" :visible.sync="open" width="800px" :append-to-body="true">
       <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
 
 
@@ -262,8 +262,12 @@
         </el-form-item>
 
         <el-form-item label="鍙戠敓鏃堕棿" prop="happenTime">
-          <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  v-model="formDat.happenTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+                   @click.native.stop
+                   				      ref="datePicker"
+                   
+			
+    :editable="false" :clearable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
           ></el-date-picker>
         </el-form-item>
         <el-form-item label="澶囨敞" prop="remark">
@@ -397,12 +401,12 @@
     <el-table v-loading="loading1" :data="listRoot" :row-key="getRowId1" ref="table1"  @selection-change="handleSelectionChange1"  :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="(queryParams1.pageNum-1)*queryParams1.pageSize+1" width="130"/>
-          <el-table-column label="韬唤" prop="identity" sortable width="130" >
+     <!--     <el-table-column label="韬唤" prop="identity" sortable width="130" >
             <template slot-scope="scope" >
               <span v-if="scope.row.isMyFamily==1">绗瑊{scope.row.identity}}浠�</span>
               <span v-else>鈥斺��</span>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="濮撳悕" prop="nickName" sortable :show-overflow-tooltip="true" width="145" align="center"/>
         </el-table>
 
@@ -512,23 +516,26 @@
 
 
 <script>
-import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
+import { listRole, getRole, delRole, addRole, 
+updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
 import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
 
 
 import { Notification, MessageBox, Message, Loading } from 'element-ui'
-
+import {getAllInfo} from "@/api/system/user"
 //鍦╯ystem/note/index.js涓鍏ユ帴鍙e嚱鏁�  --鎺ュソ浜�
 import {listFamilyevent,enload, delFamilyevent  , addFamilyevent , uploadPic,
-        share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
+        share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData,showShareUser
         } from "@/api/bignote/index";
 import {listUserAll} from "@/api/root/index";
 import {getInfo} from "@/api/login";
 export default {
-  name: "Role",
+  name: "ZfEvent",
   dicts: ['sys_normal_disable'],
   data() {
     return {
+
+		total1: 0,
       // 鍒嗕韩缁欒皝鐨刲ist
       listRoot: [],
       open1:false,
@@ -667,14 +674,22 @@
       typeOptions: [],
     };
   },
+
   created() {
     this.getList();
     //   this.getCateInfor()
     this.getInfo()
 
     this.getList1();
+	
+
   },
   methods: {
+	  handleDialogClick()
+	  {
+	  	// 鍏抽棴鏃ユ湡閫夋嫨鍣�
+	  	      this.$refs.datePicker.handleClose();
+	  },
     // 鍒嗛〉
     fenYe(){
       // @pagination='ifNum === 1 ? selectValue : (ifNum === 2 ? whoShare : showData)'
@@ -806,21 +821,36 @@
     },
     getList1() {
           this.loading1 = true;
-          this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
-          this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
-          listUserAll(this.queryParams1).then(response => {
-              this.listRoot = response.data.data;
+		  let userId = this.$store.state.user.userId
+		//  alert(userId)
+		  
+		  showShareUser(userId, 2013).then(response=>{
+			  console.log("===========ddddddddddddd")
+			  console.log(response.data)
+			  console.log("--------------------")
+			  response.data.forEach(element =>{
+				   this.userOptions.push({label: element.oldName,value: element.userId})
+			  })
+		  })
+  //         this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
+  //         this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
+		// //  alert(this.$store.state.user.clanId)
+		//       this.listRoot = []
+		 let clanId = this.$store.state.user.clanId
+          getAllInfo(clanId).then(response => {
+              this.listRoot = response.data;
               const kon = {}
+			         console.log(response.data,'userListuserListuserList99999999999999')
               this.listRoot.forEach(element => {
                 kon[element['nickName']] = element['userId']
               })
-              for(let i in kon){
-                this.userOptions.push({label: i,value: kon[i]})
-              }
-              for(let i in this.userOptions){
-                this.userList.push(this.userOptions[i].value)
-              }
-              console.log(this.userList,'userListuserListuserList')
+              // for(let i in kon){
+              //   this.userOptions.push({label: i,value: kon[i]})
+              // }
+              // for(let i in this.userOptions){
+              //   this.userList.push(this.userOptions[i].value)
+              // }
+              // console.log(this.userList,'userListuserListuserList99999999999999')
               this.loading1 = false;
             }
           );
@@ -860,8 +890,16 @@
     isInFot(fileName) {
       return this.fot.includes(fileName);
     },
+
+	close(){
+		//alert(234)
+	
+
+		this.open = false
+	},
     // 鍙栨秷鎸夐挳
     cancelData() {
+		
       this.open = false;
       this.reset();
     },

--
Gitblit v1.9.1