修改了相关bug

feige

2024-11-15 3910b79b0549b583387ff96ef5a21a2ad5313631

 ruoyi-ui/src/views/economy/index.vue

@@ -172,7 +172,7 @@
      <el-table-column label="备注" prop="remark" sortable width="100" >
        <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '————'}}</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
@@ -511,6 +511,7 @@
import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
import {getInfo} from "@/api/login";
import {getAllInfo} from "@/api/system/user"


//在system/note/index.js中导入接口函数  --接好了
@@ -519,13 +520,14 @@
} from "@/api/economy/index";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
import {listUserAll} from "@/api/root/index";

import {showShareUser} from "@/api/bignote/index";
export default {
  name: "Role",
  name: "ZfEconomy",
  dicts: ['sys_normal_disable'],
  data() {
    return {
      // 分享给谁的list
     total1:0,
      listRoot: [],
      open1:false,
      open2:false,
@@ -838,37 +840,55 @@
    },
    getList1() {
          this.loading1 = true;
          this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
          this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
             this.queryParams.clanId = this.$store.state.user.clanId
          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
	   
      this.userOptions = []
        showShareUser(userId, 2023).then(response=>{
                   console.log("===========ddddddddddddd")
                   console.log(response.data)
                   console.log("--------------------")
                   response.data.forEach(element =>{
                       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 = {}
                        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) {
      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;
@@ -962,12 +982,12 @@
    getCateInfor()
    {
      let _this = this
      getCategory().then(response=>{
      // getCategory().then(response=>{

        response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
          _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
        })
      })
      //   response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
      //     _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
      //   })
      // })
    },
    // 取消按钮
    cancel() {
@@ -1033,6 +1053,7 @@
    handleCheck(row){
     // alert(123)
      const id = row.id;
     this.open2 = false; 
      this.$router.push("/familymodel/economy/economyInfo/" + id);
    },
    /** 修改按钮操作 */