修改bug

feige

2024-10-13 3119fa3f7f7a1791d918d77d3e8315d762719ab7

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

@@ -149,7 +149,7 @@
                           accept="image/*"
                           :multiple="false"
                           :http-request="requestUpload"
                           :on-success="handleSucess"
			              
                           :limit="1">

                  <el-avatar shape="square"  style="width: 200px;;height: 200px;" >
@@ -628,7 +628,7 @@
               <el-option v-for="(item, index) in typeOption" :key="index" :label="item.label" :value="item.value"
               ></el-option>
             </el-select>
             <el-input v-model="newOption" v-if="showInput" placeholder="若未在上述选项中找到对应类型，请在此输入新的证件类型" @change="addNewOption"></el-input>
             <el-input v-model="newOption" placeholder="若未在上述选项中找到对应类型，请在此输入新的证件类型" ></el-input>
   
           </el-form-item>
           <el-form-item label="持有情况" prop="ownStatus">
@@ -688,7 +688,7 @@
       <!--新增自传-->
       <el-dialog :title="isEdit1 ? '编辑记录' : '新增记录'" :visible.sync="dialogVisible.autobiography" width="900px" append-to-body>
         <el-col >
           <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-position="left" >
           <el-form ref="elFormzz" :model="formDat6" :rules="rules" size="medium" label-position="left" >
             <el-row :span="5">
   <!--            <el-form-item label="需要修改的记录：" prop="id">-->
   <!--              <el-select v-model="formDat.id" placeholder="请选择需要修改的记录" clearable :style="{width: '50%'}"  >-->
@@ -697,10 +697,10 @@
   <!--              </el-select>-->
   <!--            </el-form-item>-->
               <el-form-item label="年龄段：" prop="ageBegin ageEnd" label-width="70px">
                 <el-input type="number" v-model="formDat.ageBegin" placeholder="" clearable :style="{width: '20%'}" >
                 <el-input  @input="$forceUpdate()" type="number" v-model="formDat6.ageBegin" placeholder="" clearable :style="{width: '20%'}" >
                 </el-input>
                 <span> 岁 ——</span>
                 <el-input type="number" v-model="formDat.ageEnd" placeholder="" clearable :style="{width: '20%'}" >
                 <el-input  @input="$forceUpdate()" type="number" v-model="formDat6.ageEnd" placeholder="" clearable :style="{width: '20%'}" >
                 </el-input>
                 <span> 岁 </span>
             </el-form-item>
@@ -709,11 +709,11 @@
   <!--                <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"-->
   <!--                ></el-option>-->
   <!--              </el-select>-->
                 <el-input v-model="formDat.term"  placeholder="请输入时期" clearable :style="{width: '100%'}" >
                 <el-input @input="$forceUpdate()" v-model="formDat6.term"  placeholder="请输入时期" clearable :style="{width: '100%'}" >
                 </el-input>
               </el-form-item>
               <el-form-item label="内容编辑：" prop="content">
                 <el-input v-model="formDat.content" type="textarea" :rows="5" placeholder="" clearable :style="{width: '100%'}" >
                 <el-input  @input="$forceUpdate()" v-model="formDat6.content" type="textarea" :rows="5" placeholder="" clearable :style="{width: '100%'}" >
                 </el-input>
               </el-form-item>
             </el-row>
@@ -750,6 +750,7 @@
  dicts: ['sys_normal_disable'],
  data() {
    return {
      userId: undefined,
      // 遮罩层
      disabled: false,
     inds:undefined,
@@ -759,7 +760,7 @@
      formData:[],
      // 选中数组
      ids: [],
          fit:['cover'],
      fit:'cover',
      // 非单个禁用
      single: true,
      // 非多个禁用
@@ -797,11 +798,11 @@
      },
     
     // 个人经历数据
     experienceList: [],
     experienceList: undefined,
     // isEdit:true,
     editStatus: {},
     //家庭成员关系数据
     relationList:[],
     relationList: undefined,
     //出入境证件情况
     certificateList:[],
     typeList:[],
@@ -810,7 +811,7 @@
     
      uploading: false,
      uploading1: false,
      fit:['fill'],
      fit1: ['fill'],
      keyword:'',
      rules: {
        //基本信息
@@ -899,12 +900,12 @@
        }],
        ageBegin: [{
          required: true,
          message: '',
          message: '请输入开始时间',
          trigger: 'blur'
        }],
        ageEnd: [{
          required: true,
          message: '',
          message: '请输入结束时间',
          trigger: 'blur'
        }],

@@ -912,6 +913,7 @@
     
     
     open:false,
     formDat6: {},
      formDat: {
        //个人记事本详情
        id:undefined,
@@ -923,6 +925,7 @@
        url: undefined,
      },
       individualList:[],
     newOption: undefined,
      // 菜单列表
      menuOptions: [],
      // 部门列表
@@ -977,6 +980,7 @@
          trigger: 'blur'
        }],
      },
     typeOption: [],
      typeOptions: [],
      isShow:true,
            dsb:true,
@@ -1000,10 +1004,10 @@
  methods: {
   getInfo(){
          console.log('-----------------')
          getInfo().then(response=>{
            console.log(response.user.roles[0].roleId,'roleID')
            this.userId = response.user.roles[0].roleId
          })
          // getInfo().then(response=>{
          //   console.log(response.user.roles[0].roleId,'roleID')
          //   this.userId = response.user.roles[0].roleId
          // })
        },
   getList1() {
    this.loading1 = true;
@@ -1125,7 +1129,7 @@
    // 取消按钮
    cancel() {
      this.open = false;
      this.reset();
     // this.reset();
    },
    getRowId(row)
    {
@@ -1375,7 +1379,9 @@

          if (this.isEdit1) {
            // 执行修改操作
            updateAutobiography(this.formDat).then(response => {
			
         console.log(this.formDat6)
            updateAutobiography(this.formDat6).then(response => {
              // 将选中选项的文本设置为"term"字段的值
              // this.formDat.term = selectedOption.value;
              // this.formDat.id = selectedOption.id;
@@ -1384,18 +1390,30 @@
              this.dialogVisible.autobiography = false;
              this.isEdit1 = false;
              this.getList();
           // 清空formDat对象的数据
           Object.keys(this.formDat6).forEach(key => {
             this.formDat6[key] = '';
           });
			
            }).catch(error => {
         //   alert(24)
              console.log(error);
              this.isEdit1 = false;
              this.dialogVisible.autobiography = false;
            });
          } else {
            // 执行新增操作
            addAutobiography(this.formDat).then(response => {
            addAutobiography(this.formDat6).then(response => {
              // this.formDat.term = selectedOption.label;
              this.$modal.msgSuccess("新增成功");
              this.dialogVisible.autobiography = false;
              this.getList();
           // 清空formDat对象的数据
           Object.keys(this.formDat6).forEach(key => {
             this.formDat6[key] = '';
           });
           // 重置isEdit为false，以便下次点击新增时为新增操作
           this.isEdit1 = false;
            }).catch(error => {
              console.log(error);
              this.dialogVisible.autobiography = false;
@@ -1403,12 +1421,7 @@
          }
        }
      });
      // 清空formDat对象的数据
      Object.keys(this.formDat).forEach(key => {
        this.formDat[key] = '';
      });
      // 重置isEdit为false，以便下次点击新增时为新增操作
      this.isEdit1 = false;
   
    },

    editRow(row) {
@@ -1585,12 +1598,17 @@
     this.dialogVisible.abroad=false;
     this.dialogVisible.autobiography=false;
     this.isEdit1 = false;
     this.reset();
    // this.reset();
    // alert(32)
     // 清空formDat对象的数据
     Object.keys(this.formDat).forEach(key => {
       this.formDat[key] = '';
     });
     // 清空formDat对象的数据
     Object.keys(this.formDat6).forEach(key => {
       this.formDat6[key] = '';
     });
	  
   },
   handleUploadSuccess(response, file) {
     // 处理文件上传成功后的回调
@@ -1600,34 +1618,51 @@
   //下拉
   handleChange5(activeNames) {
     // console.log(activeNames);
     this.reset();
     //this.reset();
   },
   showDialog(dialogName) {
     this.dialogVisible[dialogName] = true;
     // alert(dialogName)
     // if(dialogName=="autobiography")
     // {
       //  alert(123)
     // }
   },
   
   //个人自传
   handleClick(tab, event) {
     // console.log(tab, event);
     alert(987)
     this.getAutobiographyInfor();
     // this.getSrc1(typeOptions)
   },
   //个人自传编辑
   editData(data) {
   //   alert(1234)
     this.isEdit1 = true; // 设置为编辑操作
     // 将要修改的数据填充到formDat对象中
     this.formDat.ageBegin = data.ageBegin;
     this.formDat.ageEnd = data.ageEnd;
     this.formDat.term = data.term;
     this.formDat.content = data.content;
	
	  
     this.formDat6.ageBegin = data.ageBegin;
     this.formDat6.ageEnd = data.ageEnd;
     this.formDat6.term = data.term;
     this.formDat6.content = data.content;

     // 打开弹窗
     this.dialogVisible.autobiography = true;
   },
   editAutobiography(item) {
   editAutobiography(data) {
      //alert(234)
      //alert(23)
      console.log(data)
     this.isEdit1 = true;
     this.formDat6.ageBegin = data.ageBegin;
     this.formDat6.ageEnd = data.ageEnd;
     this.formDat6.term = data.term;
     this.formDat6.content = data.content;
    // alert(data.id)
     this.formDat6.id = data.id
     this.dialogVisible.autobiography = true;
     this.formDat = { item };
     //this.formDat = { item };
   },
   getTypeOptions() {
     const filteredOptions = this.typeList.filter(item => typeof item === 'string' && item !== '');