修改了对应的bug

feige

2025-01-16 0bed59a7c83975e466e31aa2fa14d8ee15473813

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

@@ -126,7 +126,7 @@
        <el-container >
          <el-col >
            <el-form ref="elForm" :model="marryList" :rules="rules" size="medium"  label-position="left"
                     v-loading="loading" :data="marryList" @selection-change="handleSelectionChange" >
                    :data="marryList" @selection-change="handleSelectionChange" >
              <el-row :span="16">
                <el-form-item label="姓名" prop="spouseName" label-width="40px">
                  <el-input v-model="marryList.spouseName" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
@@ -179,7 +179,7 @@
      </div>
      <div style="padding-left:100px;padding-top:15px;width: 30%;">
        <el-container>
          <el-col v-loading="loading" :data="marryList" @selection-change="handleSelectionChange">
          <el-col  :data="marryList" @selection-change="handleSelectionChange">
            <el-form ref="elForm" :model="marryList" :rules="rules" size="medium"  label-position="left">
              <el-row :span="16">
                <el-form-item label="性别" prop="spouseSex" label-width="40px">
@@ -276,15 +276,15 @@
          <template v-slot:title>
            <h2 style="font-size:16px ">前任情况</h2>
            <div class="title-wrapper">
              <div>
             <!-- <div>
                <el-button class="button" size="mini" type="text"  @click="handleAdd">
                  <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
              </div>
                  <span v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></span></el-button>
              </div> -->


            </div>
          </template>
          <el-table v-loading="loading" :data="oldSpouseList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
          <el-table :data="oldSpouseList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
            <el-table-column label="姓名" prop="name" sortable width="160" align="center" >
              <template slot-scope="scope">
                <template v-if="!scope.row.isEdit">{{ scope.row.name }}</template>
@@ -295,8 +295,8 @@
              <template slot-scope="scope">
                <template v-if="!scope.row.isEdit">{{ scope.row.sex }}</template>
                <template v-else><el-select v-model="scope.row.sex" placeholder="请选择">
                  <el-option label="女" value="0"></el-option>
                  <el-option label="男" value="1"></el-option>
                 <el-option label="女" value='女'></el-option>
                  <el-option label="男" value='男'></el-option>
                </el-select></template>
              </template>
            </el-table-column>
@@ -340,11 +340,9 @@
                  <span v-if="scope.row.marryStatus== 1">初婚</span>
                  <span v-if="scope.row.marryStatus== 2">离婚</span>
                  <span v-if="scope.row.marryStatus== 3">再婚</span></template>
                <template v-else>  <el-select v-model="qianren" placeholder="请选择">
                  <el-option label="未婚" value="0"></el-option>
                  <el-option label="初婚" value="1"></el-option>
                  <el-option label="离婚" value="2"></el-option>
                  <el-option label="再婚" value="3"></el-option>
                <template v-else>  <el-select v-model="qianren" placeholder="请选择" @change="getMarryStatus">
                  <el-option v-for="item in qianrenOptions"
                    :key="item.value" :label="item.label" :value="item.value"/>
                </el-select></template>
              </template>
            </el-table-column>
@@ -382,7 +380,7 @@
        <el-container >
          <el-col >
            <el-form ref="elForm" :model="marryList" :rules="rules" size="medium"  label-position="left"
                     v-loading="loading" :data="marryList" @selection-change="handleSelectionChange" >
                      :data="marryList" @selection-change="handleSelectionChange" >
              <el-row :span="16">
                <el-form-item label="生育情况" prop="bearStatus" label-width="80px">
                  <template v-if="!isEditing">
@@ -439,7 +437,7 @@
      </div>
      <div style="padding-left:200px; padding-top: 58px; ">
        <el-container>
          <el-col v-loading="loading" :data="marryList" @selection-change="handleSelectionChange">
          <el-col  :data="marryList" @selection-change="handleSelectionChange">
            <el-form ref="elForm" :model="marryList" :rules="rules" size="medium"  label-position="left" >

              <el-row :span="16"  >
@@ -542,10 +540,11 @@
import {getInfo} from "@/api/login";

export default {
  name: "show",
  name: "ZMarry",
  dicts: ['sys_normal_disable'],
  data() {
    return {
      qianren:undefined,
userId: undefined,
      showOldSpouse:false,//显示前任信息
      // 遮罩层
@@ -624,7 +623,7 @@
      // 数据范围选项
      // 数据范围选项
      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.M4A'],

      fileList:[
      ],
@@ -726,6 +725,27 @@
          value: '3',
          label: '再婚',
        },],

        qianrenOptions:[
          {
            value: '0',
            label: '未婚',
          },
            {
              value: '1',
              label: '初婚',
            },
            {
              value: '2',
              label: '离婚',
            },
            {
              value: '3',
              label: '再婚',
            }
        ],


    };
  },
  created() {
@@ -778,9 +798,9 @@


    getList() {
      this.loading = false;
      this.loading = true;
      //个人信息
      listMarry(this.queryParams).then(response => {
      listMarry().then(response => {

          if(response.data.length === 0){
            this.loading = false;
@@ -956,11 +976,12 @@
    },

    editRow(row) {
      if(this.oldSpouseList.marryStatus == 0)

      if(row.marryStatus == '0')
        this.qianren = '未婚'
      else if(this.oldSpouseList.marryStatus == 1)
      else if(row.marryStatus == '1')
        this.qianren = '初婚'
      else if(this.oldSpouseList.marryStatus == 2)
      else if(row.marryStatus == '2')
        this.qianren = '离婚'
      else
        this.qianren = '再婚'// this.isEdit=false
@@ -1012,21 +1033,47 @@
      // 刷新页面
      // window.location.reload();
    },
    getMarryStatus(value){
      // alert(value)
      if(value == '0')
        this.qianren = '未婚'
      else if(value == '1')
        this.qianren = '初婚'
      else if(value == '2')
        this.qianren = '离婚'
      else
        this.qianren = '再婚'// this.isEdit=false
    },
    //前任修改
    saveRowmarryList(row) {
      this.$refs['elForm'].validate(valid => {

        console.log(this.oldSpouseList)
        console.log(this.oldSpouseList,'oldSpouseListoldSpouseListoldSpouseListoldSpouseList')
        if (valid) {

          if(this.qianren == '未婚')
            row.marryStatus = 0
          else if(this.qianren == '初婚')
            row.marryStatus = 1
          else if(this.qianren == '离婚')
            row.marryStatus = 2
          else
            row.marryStatus = 3
          this.marryList.oldSpouseList =  this.oldSpouseList

          const foundIndex = this.oldSpouseList.findIndex(item => item.id === row.id);
          if (foundIndex !== -1) {

            this.marryList.oldSpouseList[foundIndex].marryStatus = Number(this.marryList.oldSpouseList[foundIndex].marryStatus)
            // alert(this.marryList.oldSpouseList[foundIndex].marryStatus)

            const updatedData = Object.assign({}, this.marryList.oldSpouseList[foundIndex], row);
            updateMarryOld(updatedData).then(response => {

              this.oldSpouseList = this.marryList.oldSpouseList
              this.$modal.msgSuccess("修改成功");
              console.log(updatedData)
              console.log(updatedData,'updatedDataupdatedDataupdatedData')
              console.log(response,'responseresponseresponseresponse')
              this.getList();
              // console.log(this.oldSpouseList)
            }).catch(error => {
@@ -1041,7 +1088,8 @@
      this.$set(row, 'isEdit', false);
      this.$set(this.editStatus, row.id, false);
    },

handleSelectionChange()
{},
    //隔行变色
    tableRowClassName({ row, rowIndex }) {
      if (rowIndex % 2 == 0) {
@@ -1052,24 +1100,25 @@
    },
    /** 删除前任 */
    handleDelete(row) {
      console.log(this.oldSpouseList)
      // console.log(this.oldSpouseList,'123123123123')
      const id = row.id || this.oldSpouseList.id

      console.log(id)

      this.$modal.confirm('是否确认删除所选数据项？').then(function() {
        return delMarryOld({id});
      }).then(() => {
        this.oldSpouseList = this.oldSpouseList.filter(item => item.id !== id);
        this.marryList.oldSpouseList=this.oldSpouseList
        console.log(this.marryList.oldSpouseList)
        return delMarryOld(id);
      }).then((res) => {
        console.log(res)
        // this.oldSpouseList = this.oldSpouseList.filter(item => item.id !== id);
        // this.marryList.oldSpouseList=this.oldSpouseList
        // console.log(this.marryList.oldSpouseList,'oldSpouseListoldSpouseListoldSpouseList1')

        console.log(this.oldSpouseList)
        // console.log(this.oldSpouseList,'oldSpouseListoldSpouseListoldSpouseList2')
        this.$modal.msgSuccess("删除成功");
        this.getList();

        console.log(this.marryList.oldSpouseList,'oldSpouseListoldSpouseListoldSpouseList1')
        // window.location.reload();
      }).catch(() => {});

    },

    /** 导出按钮操作 */