修改了bug

feige

2024-03-12 d75975f18f3d4e57eb7a94646b32c8a8b3f33ade

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

@@ -11,7 +11,7 @@
    <el-divider />

    <!--    基本信息-->
    <h2 style="font-size:21px">基本情况</h2>
    <!-- <h2 style="font-size:21px">基本情况</h2>
    <el-container>
      <div style="padding-left:0px;width: 28%;" >
        <el-container >
@@ -26,8 +26,7 @@
              </el-row>
              <el-row :span="16">
                <el-form-item label="出生日期" prop="birthday" label-width="75px">
                  <!-- <el-input v-model="marryList.birthday" placeholder="" type="date" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input> -->
                
                  <el-date-picker v-model="marryList.birthday"
                                  type="date"
                                  placeholder="请选择日期"
@@ -119,47 +118,8 @@



      <div style="padding-left:400px;padding-top:30px" >
        <el-container >


          <el-row :gutter="10" class="mb8">
            <el-col  >
              <el-button
                plain
                @click="handleEdit()"
                style="width: 80px;height: 32px;background: #E0EEFE;"
                v-if="isShow"
                v-hasPermi="['system:role:edit']"
              >编辑</el-button>
              <el-button v-if="isShow_2"  style="width: 80px;height: 32px;background: #E0EEFE;" @click="submitForm" :disabled="dsb">完成</el-button>
              <br>

            </el-col>

            <el-col style="padding-top: 10px;">
              <el-button
                plain
                style="width: 80px;height: 32px;background: #D2F3E0;"
                @click="handleExport"
                v-hasPermi="['family:note:export']"
              >导出</el-button></el-col>

            <el-col style="padding-top: 10px;">
              <el-button
                plain
                style="width: 80px;height: 32px;background: #FFDDE3;"
                v-print="'#printable-content'"
                v-hasPermi="['family:note:export']"
              >打印</el-button></el-col>


          </el-row>

        </el-container>
      </div>
      <!--      </el-dialog> self:user:export-->
    </el-container>
    </el-container> -->
    <h2 style="font-size:16px " >配偶情况</h2>
    <el-container>
      <div style="padding-top:15px;width: 28%;" >
@@ -259,7 +219,45 @@
        </el-container>
      </div>

 <div style="padding-left:400px;padding-top:30px" >
        <el-container >


          <el-row :gutter="10" class="mb8">
            <el-col  >
              <el-button
                plain
                @click="handleEdit()"
                style="width: 80px;height: 32px;background: #E0EEFE;"
                v-if="isShow"
                v-hasPermi="['system:role:edit']"
              >编辑</el-button>
              <el-button v-if="isShow_2"  style="width: 80px;height: 32px;background: #E0EEFE;" @click="submitForm" :disabled="dsb">完成</el-button>
              <br>

            </el-col>

            <el-col style="padding-top: 10px;">
              <el-button
                plain
                style="width: 80px;height: 32px;background: #D2F3E0;"
                @click="handleExport"
                v-hasPermi="['family:note:export']"
              >导出</el-button></el-col>

            <el-col style="padding-top: 10px;">
              <el-button
                plain
                style="width: 80px;height: 32px;background: #FFDDE3;"
                v-print="'#printable-content'"
                v-hasPermi="['family:note:export']"
              >打印</el-button></el-col>


          </el-row>

        </el-container>
      </div>

      <div style="padding-left:30px;padding-top:30px" >
        <el-container >
@@ -619,7 +617,10 @@
      // 日期范围
      dateRange: [],
      // 数据范围选项
      fot:[".jpg",".jif"],
      // 数据范围选项
      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],

      fileList:[
      ],
      fileListOther:[
@@ -780,6 +781,7 @@
            console.log(111)
            console.log("信息")
            console.log(this.marryList.marryStatus);
         //alert(this.marryList.bearStatus)
            if(this.marryList.marryStatus===3){
              this.showOldSpouse = true;
            } else{
@@ -923,12 +925,14 @@

    /** 提交按钮（数据权限） */
    submitDataScope: function() {
      let _this = this
      this.$refs["elForm"].validate(valid => {
        if (valid) {

          console.log(this.formDat)
          addMarryOld(this.formDat).then(response => {
            // marryList.oldSpouseList.push(this.formDat);
            this.$modal.msgSuccess("新增成功");
            _this.formDat = {}
            this.open = false;
            this.getList();
          });
@@ -951,12 +955,16 @@
    //修改后的保存

    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))
     // console.log(this.bear)
     // alert(this.bear)
     // 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