feige
昨天 f43ef0c77c6f437bd0f7459d75168e6f77e334bb
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,7 +1064,7 @@
    /** 查看详细信息 */
    handleCheck(row){
      const id = row.id;
     this.open2 = false;
     this.open2 = false;
      this.$router.push("/familymodel/property/propertyInfo/" + id);
    },
    /** 修改按钮操作 */
@@ -1061,7 +1088,7 @@
    /** 提交按钮(数据权限) */
    submitDataScope: function() {
      this.$refs["elForm"].validate(valid => {
        if (valid) {