修改了一些bug

feige

2024-09-03 63b70dbc269b7b9d20a7a88f3dd7c8bb0934d3f4

 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" @click="handleVisibleChange" :visible.sync="open" width="800px" append-to-body :before-close="close" >
    <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,9 +262,11 @@
        </el-form-item>

        <el-form-item label="发生时间" prop="happenTime">
          <el-date-picker ref="datePicker" v-model="formDat.happenTime" type="date" placeholder="请选择日期"
                     :visible="isVisible"
                            @blur="handleVisibleChange"
          <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>
@@ -514,15 +516,16 @@


<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"
//在system/note/index.js中导入接口函数  --接好了
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";
@@ -531,7 +534,8 @@
  dicts: ['sys_normal_disable'],
  data() {
    return {
      isVisible:false,

      total1: 0,
      // 分享给谁的list
      listRoot: [],
      open1:false,
@@ -670,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)'
@@ -809,24 +821,39 @@
    },
    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;
              const kon = {}
              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')
              this.loading1 = false;
            }
          );
        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,'userListuserListuserList99999999999999')
   //            this.loading1 = false;
   //          }
   //        );
        },
    // 确认分享
    subShare(row) {
@@ -863,20 +890,16 @@
    isInFot(fileName) {
      return this.fot.includes(fileName);
    },
   handleVisibleChange(){
      alert(12)
      this.isVisible = false
      this.$refs.datePicker.hidePicker();
   },

   close(){
      //alert(234)
      this.$refs.datePicker.hidePicker()
	

      this.open = false
   },
    // 取消按钮
    cancelData() {
      this.$refs.datePicker.hidePicker()
		
      this.open = false;
      this.reset();
    },