Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

feige

2024-06-10 b6929a606c64d1b6063521ed8a183da88463a5e1

 ruoyi-ui/src/views/self/show.vue

@@ -115,7 +115,7 @@
    </el-form>
    <div>

      <el-row :gutter="10" class="mb8">
      <el-row :gutter="10" class="mb8" v-if="userId != 2">
        <el-col :span="1.5">
          <el-button
            type="primary"
@@ -220,7 +220,7 @@
      </el-table-column>

      <!--      </el-table-column>-->
      <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width">
      <el-table-column 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
@@ -364,7 +364,7 @@
            ></video>
            <img v-else
                 class="el-upload-list__item-thumbnail"
                 :src="file.url"
                 src="../../assets/images/deviceLis.png"
                 alt=""
                 style="width: 100%; height: 100%"
                 fit="cover"></img>
@@ -485,7 +485,7 @@
            </template>
          </el-table-column>
          <!--      操作-->
          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="userId != 2">
            <template slot-scope="scope" v-if="scope.row.roleId !== 1">
              <el-button size="mini" type="text" icon="el-icon-edit" v-if="!editStatus[scope.row.id]"
               @click="editRow(scope.row)" v-hasPermi="['system:role:edit']">修改</el-button>
@@ -540,7 +540,7 @@
              <template v-else><el-input v-model="scope.row.otherPolitical"></el-input></template>
            </template>
          </el-table-column>
          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="userId != 2">
            <template slot-scope="scope" v-if="scope.row.roleId !== 1">
              <el-button size="mini" type="text" icon="el-icon-edit" v-if="!editStatus[scope.row.id]"
                @click="editRow(scope.row)" v-hasPermi="['system:role:edit']">修改</el-button>
@@ -605,7 +605,7 @@
              ></el-date-picker></template>
            </template>
          </el-table-column>
          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="userId != 2">
            <template slot-scope="scope" v-if="scope.row.roleId !== 1">
              <el-button size="mini" type="text" icon="el-icon-edit" v-if="!editStatus[scope.row.id]"
                         @click="editRow(scope.row)" v-hasPermi="['system:role:edit']">修改</el-button>
@@ -658,7 +658,7 @@
              <template v-else><el-input v-model="scope.row.cause"></el-input></template>
            </template>
          </el-table-column>
          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="userId != 2">
            <template slot-scope="scope" v-if="scope.row.roleId !== 1">
              <el-button size="mini" type="text" icon="el-icon-edit" v-if="!editStatus[scope.row.id]"
                         @click="editRow(scope.row)" v-hasPermi="['system:role:edit']">修改</el-button>
@@ -910,7 +910,7 @@

//导入接口函数
import {listNote,enload,getNote, addNote,updateNote, delNote,uploadPic} from "@/api/memo/index";

import {getInfo} from "@/api/login";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
//import { delFamilyevent, uploadPic } from '../../api/bignote'
import { blobValidate } from '../../utils/ruoyi'
@@ -923,6 +923,7 @@

  data() {
    return {
      userId: undefined,
       uploadFileList: [],
      uploadFileList1: [],
      // 遮罩层
@@ -1216,6 +1217,74 @@
          trigger: 'blur'
        }],

        relation: [{
          required: true,
          message: '请输入关系',
          trigger: 'blur'
        }],
        otherName: [{
          required: true,
          message: '请输入姓名',
          trigger: 'blur'
        }],
        otherUnit: [{
          required: true,
          message: '请输入单位',
          trigger: 'blur'
        }],
        otherPosition: [{
          required: true,
          message: '请输入职务',
          trigger: 'blur'
        }],
        otherPolitical: [{
          required: true,
          message: '请输入政治面貌',
          trigger: 'blur'
        }],

        cerName: [{
          required: true,
          message: '请输入证件名称',
          trigger: 'blur'
        }],
        type: [{
          required: true,
          message: '请输入证件类型',
          trigger: 'blur'
        }],
        ownStatus: [{
          required: true,
          message: '请输入持有情况',
          trigger: 'blur'
        }],
        idNo: [{
          required: true,
          message: '请输入证件号码',
          trigger: 'blur'
        }],

        startTime: [{
          required: true,
          message: '请输入开始时间',
          trigger: 'blur'
        }],
        endTime: [{
          required: true,
          message: '请输入结束时间',
          trigger: 'blur'
        }],
        destination: [{
          required: true,
          message: '请输入所到地区',
          trigger: 'blur'
        }],
        cause: [{
          required: true,
          message: '请输入事由',
          trigger: 'blur'
        }]

      },
      selectedOption:'',
      typeOptions:[],
@@ -1227,9 +1296,16 @@
  created() {
    this.getList();
    this.getAutobiographyInfor()

    this.getInfo()
  },
  methods: {
    getInfo(){
          console.log('-----------------')
          getInfo().then(response=>{
            console.log(response.user.roles[0].roleId,'roleID')
            this.userId = response.user.roles[0].roleId
          })
        },
    handleRemoveFile(file) {
      for(let i = 0; i < this.fileListOther.length; i++)
      {
@@ -1562,7 +1638,7 @@
          deptCheckStrictly: true,
          remark: undefined
        };
      this.resetForm("form");
      this.resetForm("elForm");
    },
    /** 搜索按钮操作 */
    handleQuery() {
@@ -1840,6 +1916,7 @@
        }
      });
      // 清空formDat对象的数据
      this.newOption=undefined
      Object.keys(this.formDat).forEach(key => {
        this.formDat[key] = '';
      });