修改bug

feige

2025-01-02 43e1199ca0c75787fb6b52bef7d595abd115ceab

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

@@ -77,12 +77,12 @@
<!--                  <el-input v-model="individualList.sex === 1 ? '男':'女' " placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">-->
<!--                  </el-input>-->
                  <template v-if="!isEditing">
                    <el-input v-model="individualList.sex === 1 ? inds='男':inds='女'" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
                    <el-input v-model="individualList.sex === 0 ? inds='男':inds='女'" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
                  </template>
                  <template v-else>
                    <el-select v-model="inds" placeholder="请选择性别" clearable :style="{width: '100%'}" :disabled="dsb">
                      <el-option label="男" value='1'></el-option>
                      <el-option label="女" value='0'></el-option>
                      <el-option label="男" value='0'></el-option>
                      <el-option label="女" value='1'></el-option>
                    </el-select>
                  </template>
                </el-form-item>
@@ -118,7 +118,7 @@
                  <template v-if="!isEditing" >
                    <el-input v-if="individualList.maritalStatus===0" placeholder="未婚"></el-input>
                    <el-input v-if="individualList.maritalStatus===1" placeholder="已婚"></el-input>
                    <el-input v-if="individualList.maritalStatus===2" placeholder="未婚"></el-input>
                    <el-input v-if="individualList.maritalStatus===2" placeholder="离婚"></el-input>

                  </template>
                  <template v-else>
@@ -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;" >
@@ -278,11 +278,11 @@
               </el-container>
             </el-form-item>
           </el-form>
	

         </div>
	

       </el-collapse-item> -->
	

         <!--主要学习及工作经历-->
         <el-collapse-item name="1"  >
           <template v-slot:title>
@@ -529,24 +529,25 @@
                 <el-tab-pane v-for="(item, index) in AutobiographyList"
                              :key='item.id' :label="item.ageBegin+'~'+item.ageEnd+'岁'+'('+item.term+')'">
                   <div>{{ item.content }}</div>
                   <el-button size='mini' type="text" class="btn_edit" @click="editAutobiography(item)" style='position: absolute;right:40px;top:5px;'>
                     <div style="margin-bottom: 20px;">
                   <el-button size='mini' type="text" class="btn_edit" @click="editAutobiography(item)" style='right:40px;top:5px;'>
                     <span v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></span>
                   </el-button>
	
                   <el-button size="mini" type="text" class="btn_del" @click="handleAutobiography(item)" style='position: absolute;right:10px;top:5px;'>

                   <el-button size="mini" type="text" class="btn_del" @click="handleAutobiography(item)" style='right:10px;top:5px;'>
                     <span v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></span>
                   </el-button>
	
   </div>
                 </el-tab-pane>
               </el-tabs></div>
           </el-container>
         </el-collapse-item>
	

       </el-collapse>
	
	
	
	




       <pagination
         v-show="total>0"
         :total="total"
@@ -554,7 +555,7 @@
         :limit.sync="queryParams.pageSize"
         @pagination="getList"
       />
	

       <!-- 新增主要经历信息配置对话框 -->
       <el-dialog title="新增主要经历信息" :visible.sync="dialogVisible.open" width="900px" append-to-body>
         <el-form ref="elForm1" :model="formDat" :rules="rules" size="medium" label-width="140px">
@@ -576,10 +577,10 @@
             <el-input v-model="formDat.witness" placeholder="请输入证明人" clearable :style="{width: '100%'}" >
             </el-input>
           </el-form-item>
	

         </el-form>
         <h4 class="form-header"> </h4>
	

         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="submitDataScope">保 存</el-button>
           <el-button @click="cancelData">取 消</el-button>
@@ -607,10 +608,10 @@
             <el-input v-model="formDat.otherPolitical" placeholder="请输入政治面貌" clearable :style="{width: '100%'}" >
             </el-input>
           </el-form-item>
	

         </el-form>
         <h4 class="form-header"> </h4>
	

         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="submitDataScope2">保 存</el-button>
           <el-button @click="cancelData">取 消</el-button>
@@ -628,8 +629,8 @@
               <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">
             <el-input v-model="formDat.ownStatus" placeholder="请输入持有情况" clearable :style="{width: '100%'}" >
@@ -650,7 +651,7 @@
             ></el-date-picker></el-form-item>
            </el-form>
         <h4 class="form-header"> </h4>
	

         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="submitDataScope4">保 存</el-button>
           <el-button @click="cancelData">取 消</el-button>
@@ -676,10 +677,10 @@
             <el-input v-model="formDat.cause" placeholder="请输入事由(旅游、走访、探亲、继承财产、其他)" clearable :style="{width: '100%'}" >
             </el-input>
           </el-form-item>
	

         </el-form>
         <h4 class="form-header"> </h4>
	

         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="submitDataScope5">保 存</el-button>
           <el-button @click="cancelData">取 消</el-button>
@@ -688,7 +689,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 +698,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,24 +710,24 @@
   <!--                <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>
           </el-form>
         </el-col>
         <h4 class="form-header"> </h4>
	

         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="submitDataScope6">保 存</el-button>
           <el-button @click="cancelData">取 消</el-button>
         </div>
       </el-dialog>
	

   </div>
</template>

@@ -740,7 +741,9 @@
  getAutobiographyList, getAutobiographyTermList, addAutobiography, updateAutobiography,delAutobiography,
  getCategory,
} from "@/api/self/index";
import {listNote,enload,getNote, addNote,updateNote, delNote,uploadPic} from "@/api/memo/index";
import {getAllInfo} from "@/api/system/user"
import {showShareUser} from "@/api/bignote/index";
import {listNote,enload,getNote, addNote,updateNote, delNote,uploadPic,uploadPics} from "@/api/memo/index";

import { Notification, MessageBox, Message, Loading } from 'element-ui'
export default {
@@ -748,6 +751,7 @@
  dicts: ['sys_normal_disable'],
  data() {
    return {
      userId: undefined,
      // 遮罩层
      disabled: false,
     inds:undefined,
@@ -757,7 +761,7 @@
      formData:[],
      // 选中数组
      ids: [],
          fit:['cover'],
      fit:'cover',
      // 非单个禁用
      single: true,
      // 非多个禁用
@@ -781,7 +785,7 @@
      // 日期范围
      dateRange: [],
      // 数据范围选项
      fot:[".jpg",".jif"],
      fot:[".jpg",".jif",'.M4A'],
      fileList:[],
      fileListOther:[],
     //下拉实现
@@ -793,22 +797,22 @@
        abroad:false,
        autobiography:false
      },
	  

     // 个人经历数据
     experienceList: [],
     experienceList: undefined,
     // isEdit:true,
     editStatus: {},
     //家庭成员关系数据
     relationList:[],
     relationList: undefined,
     //出入境证件情况
     certificateList:[],
     typeList:[],
     //出国情况
     AbroadList:[],
	  

      uploading: false,
      uploading1: false,
      fit:['fill'],
      fit1: ['fill'],
      keyword:'',
      rules: {
        //基本信息
@@ -897,19 +901,20 @@
        }],
        ageBegin: [{
          required: true,
          message: '',
          message: '请输入开始时间',
          trigger: 'blur'
        }],
        ageEnd: [{
          required: true,
          message: '',
          message: '请输入结束时间',
          trigger: 'blur'
        }],

      },
	  
	  


     open:false,
     formDat6: {},
      formDat: {
        //个人记事本详情
        id:undefined,
@@ -921,6 +926,7 @@
        url: undefined,
      },
       individualList:[],
     newOption: undefined,
      // 菜单列表
      menuOptions: [],
      // 部门列表
@@ -975,6 +981,7 @@
          trigger: 'blur'
        }],
      },
     typeOption: [],
      typeOptions: [],
      isShow:true,
            dsb:true,
@@ -998,32 +1005,48 @@
  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;
          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]})
    this.loading1 = true;
            let userId = this.$store.state.user.userId
          //  alert(userId)

            showShareUser(userId, 2062).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
           if(clanId!=null){
            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;
              }
              for(let i in this.userOptions){
                this.userList.push(this.userOptions[i].value)
              }
              console.log(this.userList,'userListuserListuserList')
              this.loading1 = false;
            }
          );
            );
         }
        },

    /** 查询记录列表 */
@@ -1109,7 +1132,7 @@
    // 取消按钮
    cancel() {
      this.open = false;
      this.reset();
     // this.reset();
    },
    getRowId(row)
    {
@@ -1138,16 +1161,21 @@
      }, `self_${new Date().getTime()}.xlsx`)
    },  //个人基本信息
    submitForm() {
      if(this.inds=='1')

      if(this.inds=='1'||this.inds=='女')
        this.individualList.sex = 1;
      else
        this.individualList.sex = 0;
      if(this.mrs=='0')
	  
      if(this.mrs=='0'||this.mrs=='未婚')
        this.individualList.maritalStatus = 0
      else if(this.mrs == '1')
      else if(this.mrs == '1'||this.mrs=='已婚')
        this.individualList.maritalStatus = 1
      else
        this.individualList.maritalStatus = 2
		
		
   //alert(123)
       // alert(10)
    //   let ul = this.fileList.map(function (elem){
    //     return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
@@ -1163,15 +1191,18 @@
            updateIndividual(this.individualList).then(response => {
              this.$modal.msgSuccess("修改成功");
              // 强制更新相关组件
              this.individualList={...this.individualList}

              // this.open = false;
			   
            //  this.individualList={...this.individualList}
         // alert(this.individualList.sex)
			  
   //            // this.open = false;
              this.dsb = true
              this.btn=false
              this.isShow_2=false
              this.isShow=true
              this.isEditing = false
            });
           //this.getList()
         })
          } else {
            this.$modal.msgSuccess("修改失败");

@@ -1192,17 +1223,19 @@
   requestUpload(params)
    {
      var file = params.file;
      console.log(file)
      var formData = new FormData();
      formData.append('uploadFile', file);
      let _this = this

console.log(formData)
      console.log('dddddddd===========')
     // console.log(this.individualList)
      this.$refs.uploadDemo.clearFiles();
    //  alert(234)
      uploadPic(formData).then(response => {
      //  alert(response.data.url)
      //  alert(response.data.originalFilename)
        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
      uploadPics(formData).then(response => {
     //  alert(response.data.url)
      // //  alert(response.data.originalFilename)
         let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)

        if(_this.fot.includes(pth) === true)
        {
@@ -1216,6 +1249,7 @@
        }
        _this.individualList.img = response.data.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
        _this.individualList.url = response.data.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
        console.log(_this.individualList)
        updateIndividual(_this.individualList).then(response => {
          // 将选中选项的文本设置为"term"字段的值
          // this.formDat.term = selectedOption.value;
@@ -1359,7 +1393,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;
@@ -1368,18 +1404,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;
@@ -1387,12 +1435,7 @@
          }
        }
      });
      // 清空formDat对象的数据
      Object.keys(this.formDat).forEach(key => {
        this.formDat[key] = '';
      });
      // 重置isEdit为false，以便下次点击新增时为新增操作
      this.isEdit1 = false;

    },

    editRow(row) {
@@ -1548,7 +1591,7 @@
       response.data.itemValues.replace("{", "").replace("}", "").split(",").map(elem => {
         const label = elem.split(":")[0].trim();
         const value = parseInt(elem.split(":")[1].trim());
	

         // 判断 typeOptions 数组中是否已存在相同的 value
         if (!_this.typeOptions.some(option => option.value === value)) {
           _this.typeOptions.push({ "label": label, "value": value });
@@ -1557,9 +1600,9 @@
         // _this.getSrc1(value)
       });
     });
	

   },
	

   // 取消按钮
   cancelData() {
   //   alert(23)
@@ -1569,49 +1612,71 @@
     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) {
     // 处理文件上传成功后的回调
     this.individualList.img = response.url;
   },
	

   //下拉
   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 !== '');
@@ -1628,7 +1693,7 @@
       }
       return options;
     }, []);
	

   },
   //隔行变色
   tableRowClassName({row, rowIndex}) {
@@ -1683,9 +1748,10 @@

.btn_edit{
  background:center no-repeat url('../../assets/icons/edit.png') ;
  float:right;
}
.btn_del{
  background:center no-repeat url('../../assets/images/删除2.png') ;
  background:center no-repeat url('../../assets/images/删除2.png') ;float:right;
}
.button-container {
  text-align: right;