修改了bug

yz3456

2024-05-28 eb8655f4b9c0df4a6f14805a22131e79dac03654

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

@@ -26,7 +26,7 @@
              </el-row>
              <el-row :span="16">
                <el-form-item label="出生日期" prop="birthday" label-width="75px">
                

                  <el-date-picker v-model="marryList.birthday"
                                  type="date"
                                  placeholder="请选择日期"
@@ -223,7 +223,7 @@
        <el-container >


          <el-row :gutter="10" class="mb8">
          <el-row :gutter="10" class="mb8" v-if="userId != 2">
            <el-col  >
              <el-button
                plain
@@ -358,7 +358,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>
@@ -539,13 +539,14 @@
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
import {listMarry,updateMarry,delMarryOld,addMarryOld,updateMarryOld} from "@/api/marry/index";
import { blobValidate } from '../../utils/ruoyi'
import {getInfo} from "@/api/login";

export default {
  name: "show",
  dicts: ['sys_normal_disable'],
  data() {
    return {

userId: undefined,
      showOldSpouse:false,//显示前任信息
      // 遮罩层
      disabled: false,
@@ -570,6 +571,7 @@
      limitCountImg:1,//上传图片的最大数量
      //个人信息数据
      marryList:{
        id:undefined,
        name:undefined,
        sex:undefined,
        birthday:undefined,
@@ -602,11 +604,14 @@
      activeNames:['1'],
      // 弹出层标题
      title: "",
      iddd:undefined,
      // 是否显示弹出层
      open: false,
      // open:true,
      // 是否显示弹出层（数据权限）
      bear:undefined,
      handsj:undefined,
      onebear:undefined,
      mrs:undefined,
      smrs:undefined,
      openDataScope: false,
@@ -670,13 +675,13 @@
      },
      // 表单校验
      rules: {
        id: [{
          required: true,
        idNo: [{
          // required: true,
          message: '请输入身份证号码',
          trigger: 'blur'
        }],
        name: [{
          required: true,
          // required: true,
          message: '请输入姓名',
          trigger: 'blur'
        }],
@@ -686,7 +691,7 @@
          trigger: 'change'
        }],
        marryStatus: [{
          required: true,
          // required: true,
          message: '请选择婚姻状况',
          trigger: 'change'
        }],
@@ -725,9 +730,16 @@
  },
  created() {
    this.getList()
    this.getInfo()
  },
  methods: {

    getInfo(){
          console.log('-----------------')
          getInfo().then(response=>{
            console.log(response.user.roles[0].roleId,'roleID')
            this.userId = response.user.roles[0].roleId
          })
        },
    handleMarryStatusChange() {
      // 判断当前选中的婚姻状态是否为再婚
      if (this.mrs === '3') {
@@ -751,6 +763,7 @@
    cancelData() {
      this.open = false;
      this.reset();

    },
    //下拉
    handleChange(val) {
@@ -780,7 +793,10 @@
            this.oldSpouseList = this.marryList.oldSpouseList;
            console.log(111)
            console.log("信息")
            console.log(this.marryList.marryStatus);
            console.log(this.marryList,'1111111111111111111');
            this.iddd = this.marryList.id
            console.log(this.iddd,'2222222222222')
         //alert(this.marryList.bearStatus)
            if(this.marryList.marryStatus===3){
              this.showOldSpouse = true;
            } else{
@@ -830,7 +846,7 @@
          deptCheckStrictly: true,
          remark: undefined
        };
      this.resetForm("form");
      this.resetForm("elForm");
    },


@@ -954,17 +970,22 @@
    //修改后的保存

    submitForm() {
      if(parseInt(this.mrs))
      if(this.mrs!=undefined)
        this.marryList.marryStatus = parseInt(this.mrs)
      if(parseInt(this.smrs))
      if(this.smrs!=undefined)
        this.marryList.spouseMarryStatus = parseInt(this.smrs)
      if(parseInt(this.bear))

      if(this.bear!=undefined)
        this.marryList.bearStatus = parseInt(this.bear)

      this.marryList.oneBorn = parseInt(this.onebear)
      this.marryList.handbookStatus =parseInt(this.handsj)
      this.marryList.sex = this.sinds
      this.marryList.spouseSex = this.inds
      console.log(this.marryList,'marryListmarryListmarryListmarryList')
      // this.marryList.id = this.iddd
      this.$refs['elForm'].validate(valid => {
        // alert(valid)
        if (valid) {
          if (this.marryList.id !== undefined) {
            updateMarry(this.marryList).then(response => {
@@ -975,6 +996,7 @@
              this.dsb = true
              this.isShow_2=false
              this.isShow = true
              this.getList()

            }).catch(error => {
              console.error(error);
@@ -986,6 +1008,7 @@
          }
        }
      })
      this.getList()
      // 刷新页面
      // window.location.reload();
    },