完善婚姻模块（完）

linwenling

2023-08-13 0039b22ae537bc95dc22f1bcc684c5e9d644622a

完善婚姻模块（完）

 ruoyi-ui/src/api/marry/index.js

@@ -58,15 +58,6 @@
  })
}

//拿到类别
export function getCategory()
{
  return request({
    url: '/zDict/byId',
    method: 'get',
    params: {'id':22}
  })
}


//上传文件

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

@@ -39,7 +39,7 @@
              </el-row>
              <el-row :span="16">
                <el-form-item label="出生日期" prop="birthday" label-width="70px">
                  <el-input v-model="marryList.birthday" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  <el-input v-model="marryList.birthday" placeholder="" type="date" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>
@@ -114,7 +114,7 @@
              </el-row>
              <el-row :span="16">
                <el-form-item label="结婚时间" prop="marryTime" label-width="70px">
                  <el-input v-model="marryList.marryTime" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  <el-input v-model="marryList.marryTime" placeholder=""  type="date" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>
@@ -160,13 +160,13 @@
              </el-row>
              <el-row :span="16">
                <el-form-item label="出生日期" prop="spouseBirthday" label-width="70px">
                  <el-input v-model="marryList.spouseBirthday" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  <el-input v-model="marryList.spouseBirthday" placeholder="" type="date" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>
              <el-row :span="16">
                <el-form-item label="身份证号码" prop="spouseId" label-width="85px">
                  <el-input v-model="marryList.spouseId" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                <el-form-item label="身份证号码" prop="spouseIdNo" label-width="85px">
                  <el-input v-model="marryList.spouseIdNo" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>
@@ -234,8 +234,8 @@
                </el-form-item>
              </el-row>
              <el-row :span="16">
                <el-form-item label="结婚时间" prop="marryTime" label-width="70px">
                  <el-input v-model="marryList.marryTime" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                <el-form-item label="结婚时间" prop="spouseMarryTime" label-width="70px">
                  <el-input v-model="marryList.spouseMarryTime" placeholder=""  type="date" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>
@@ -256,92 +256,35 @@
      <!--      </el-dialog> self:user:export-->
    </el-container>

    <!-- <h2 style="font-size:16px " >前任情况</h2> -->
    <!-- <div>
     <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-column type="selection" width="55"  align="center" />
      <el-table-column  label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="70"/>
      <el-table-column label="名字" prop="name" sortable width="120" />
      <el-table-column label="出生时间" prop="birthday" sortable width="120" />
      <el-table-column label="户籍地址" prop="address" sortable width="120" />
      <el-table-column label="工作地址" prop="workAddress" sortable width="120" />
      <el-table-column label="婚姻状态" prop="marryStatus" sortable width="120" >
        <template slot-scope="scope">
        <span v-if="scope.row.marryStatus== 0">未婚</span>
        <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>

      </el-table-column>
      <el-table-column label="性别" prop="sex" sortable width="100" >
        <template slot-scope="scope">
        <span v-if="scope.row.sex== 0">女</span>
        <span v-if="scope.row.sex== 1">男</span>
      </template>
      </el-table-column>
      <el-table-column label="民族" prop="nation" sortable width="100" />
      <el-table-column label="电话号码" prop="phone" sortable width="150" />
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
            <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>
              <el-button size="mini" type="text"
                v-if="editStatus[scope.row.id]" @click="saveRowExperienceList(scope.row)">保存</el-button>
              <el-button size="mini" type="text" icon="el-icon-delete"
                @click="handleExperienceDelete(scope.row)" v-hasPermi="['system:role:remove']">删除</el-button>
            </template>
          </el-table-column>
    </el-table>
  </div> -->
    <div>
      <el-collapse v-model="activeNames" @change="handleChange">

        <el-collapse-item name="1"  >
          <template v-slot:title>
            <div class="title-wrapper">
              <h2 style="font-size:16px ">前任情况</h2>
            <div class="title-wrapper">
              <div>
                <el-button class="button" size="mini" type="text"  @click="showDialog('open')">
                <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>


            </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-column label="姓名" prop="name" sortable width="180" align="center" >
            <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>
                <template v-else><el-input v-model="scope.row.name"></el-input></template>
              </template>
            </el-table-column>
            <el-table-column label="出生日期" prop="birthday" sortable width="180" align="center" >
              <template slot-scope="scope">
                <template v-if="!scope.row.isEdit">{{ scope.row.birthday }}</template>
                <template v-else><el-input v-model="scope.row.birthday"></el-input></template>
              </template>
            </el-table-column>
            <el-table-column label="户籍地址" prop="address" sortable width="180" align="center" >
              <template slot-scope="scope">
                <template v-if="!scope.row.isEdit">{{ scope.row.address }}</template>
                <template v-else><el-input v-model="scope.row.address"></el-input></template>
              </template>
            </el-table-column>
            <el-table-column label="工作地址" prop="workAddress" sortable width="180" align="center" >
              <template slot-scope="scope">
                <template v-if="!scope.row.isEdit">{{ scope.row.workAddress }}</template>
                <template v-else><el-input v-model="scope.row.workAddress"></el-input></template>
              </template>
            </el-table-column>
            <el-table-column label="户籍地址" prop="address" sortable width="180" align="center" >
              <template slot-scope="scope">
                <template v-if="!scope.row.isEdit">{{ scope.row.address }}</template>
                <template v-else><el-input v-model="scope.row.address"></el-input></template>
              </template>
            </el-table-column>
            <el-table-column label="性别" prop="sex" sortable width="100" align="center" >
            <el-table-column label="性别" prop="sex" sortable width="80" align="center" >
              <template slot-scope="scope">
                <template v-if="!scope.row.isEdit">{{ scope.row.sex }}</template>
                <template v-else><el-input v-model="scope.row.sex"></el-input></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-select></template>
              </template>
            </el-table-column>
            <el-table-column label="民族" prop="nation" sortable width="100" align="center" >
@@ -350,13 +293,55 @@
                <template v-else><el-input v-model="scope.row.nation"></el-input></template>
              </template>
            </el-table-column>
            <el-table-column label="婚姻状态" prop="marryStatus" sortable width="140" align="center" >
            <el-table-column label="出生日期" prop="birthday" sortable width="150" align="center" >
              <template slot-scope="scope">
                <template v-if="!scope.row.isEdit">{{ scope.row.marryStatus }}</template>
                <template v-else>  <span v-if="scope.row.marryStatus== 0">未婚</span>
                <template v-if="!scope.row.isEdit">{{ scope.row.birthday }}</template>
                <template v-else><el-input v-model="scope.row.birthday" type="date" placeholder="选择日期">
                </el-input></template>
              </template>
            </el-table-column>
            <el-table-column label="户籍地址" prop="address" sortable width="180" align="center" >
              <template slot-scope="scope">
                <template v-if="!scope.row.isEdit">{{ scope.row.address }}</template>
                <template v-else><el-input v-model="scope.row.address"></el-input></template>
              </template>
            </el-table-column>
            <el-table-column label="身份证号" prop="idNo" sortable width="180" align="center" >
              <template slot-scope="scope">
                <template v-if="!scope.row.isEdit">{{ scope.row.idNo }}</template>
                <template v-else><el-input v-model="scope.row.idNo"></el-input></template>
              </template>
            </el-table-column>
            <el-table-column label="工作地址" prop="address" sortable width="180" align="center" >
              <template slot-scope="scope">
                <template v-if="!scope.row.isEdit">{{ scope.row.address }}</template>
                <template v-else><el-input v-model="scope.row.address"></el-input></template>
              </template>
            </el-table-column>


            <el-table-column label="婚姻状态" prop="marryStatus" sortable width="100" align="center" >
              <template slot-scope="scope">
                <template v-if="!scope.row.isEdit">
                  <span v-if="scope.row.marryStatus== 0">未婚</span>
                  <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="scope.row.marryStatus" 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>
                </el-select></template>
              </template>
            </el-table-column>


            <el-table-column label="结婚时间" prop="marryTime" sortable width="150" align="center" >
              <template slot-scope="scope">
                <template v-if="!scope.row.isEdit">{{ scope.row.marryTime }}</template>
                <template v-else><el-input v-model="scope.row.marryTime" type="date" placeholder="选择日期">
                </el-input></template>
              </template>
            </el-table-column>
            <!-- 操作 -->
@@ -387,25 +372,50 @@
                     v-loading="loading" :data="marryList" @selection-change="handleSelectionChange" >
              <el-row :span="16">
                <el-form-item label="生育情况" prop="bearStatus" label-width="80px">
                  <template >
                    <el-input v-if="marryList.bearStatus===0" placeholder="未生育"  :disabled="dsb"></el-input>
                  <template v-if="!isEditing">
                    <el-input v-if="marryList.bearStatus===0" placeholder="未生育" style="" :disabled="dsb"></el-input>
                    <el-input v-if="marryList.bearStatus===1" placeholder="在孕"  :disabled="dsb"></el-input>
                    <el-input v-if="marryList.bearStatus===2" placeholder="已生育"  :disabled="dsb"></el-input>

                  </template>
                  <template v-else>
                    <el-select v-model="bear" placeholder="请选择生育情况" clearable :style="{width: '100%'}">
                      <el-option label="未生育" value='0'></el-option>
                      <el-option label="在孕" value='1'></el-option>
                      <el-option label="已生育" value='2'></el-option>
                    </el-select>
                  </template>

                </el-form-item>
              </el-row>
              <el-row :span="16">
                <el-form-item label="领取《计划生育服务手册》" prop="handbookStatus" label-width="180px">
                  <el-input v-model="marryList.handbookStatus ===1 ? '是':'否' " placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
                  <template v-if="!isEditing">
                    <el-input v-if="marryList.handbookStatus===0" placeholder="否" style="" :disabled="dsb"></el-input>
                    <el-input v-if="marryList.handbookStatus===1" placeholder="是"  :disabled="dsb"></el-input>

                  </template>
                  <template v-else>
                    <el-select v-model="handsj" placeholder="请选择是/否" clearable :style="{width: '100%'}">
                      <el-option label="否" value='0'></el-option>
                      <el-option label="是" value='1'></el-option>
                    </el-select>
                  </template>

                </el-form-item>
              </el-row>
              <el-row :span="16">
                <el-form-item label="领取《独生子女证》" prop="oneBorn" label-width="150px">
                  <el-input v-model="marryList.oneBorn  ===1 ? '是':'否' " placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
                  <template v-if="!isEditing">
                    <el-input v-if="marryList.oneBorn===0" placeholder="否" style="" :disabled="dsb"></el-input>
                    <el-input v-if="marryList.oneBorn===1" placeholder="是"  :disabled="dsb"></el-input>

                  </template>
                  <template v-else>
                    <el-select v-model="onebear" placeholder="请选择是/否" clearable :style="{width: '100%'}">
                      <el-option label="否" value='0'></el-option>
                      <el-option label="是" value='1'></el-option>
                    </el-select>
                  </template>
                </el-form-item>
              </el-row>

@@ -421,13 +431,13 @@

              <el-row :span="16"  >
                <el-form-item label="领证时间" prop="handbookTime" label-width="70px">
                  <el-input v-model="marryList.handbookTime " placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  <el-input v-model="marryList.handbookTime " placeholder=""  type="date" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>
              <el-row :span="16">
                <el-form-item label="领证时间" prop="oneBornTime" label-width="70px">
                  <el-input v-model="marryList.oneBornTime" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  <el-input v-model="marryList.oneBornTime" placeholder="" type="date" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>
@@ -446,7 +456,7 @@

    <h2 style="font-size:16px " >需声明的情况</h2>
    <el-container>
      <el-input v-model="marryList.content " placeholder="" clearable :style="{width: '80%'}" :disabled="dsb"> </el-input>
      <el-input v-model="marryList.notion " placeholder="" clearable :style="{width: '80%'}" :disabled="dsb"> </el-input>
    </el-container>
    <h2 style="font-size:16px " >备注</h2>
    <el-container>
@@ -454,248 +464,73 @@
    </el-container>

    <!-- 新增  -->
    <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body>

    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
      <el-form ref="elForm" :model="formDat" :rules="rules" size="medium"  label-width="100px">
        <h2 style="margin-left: 50px;">基本情况</h2>
        <div style="width: 500px; display:table-cell;">
          <el-form-item label="姓名" prop="name">
            <el-input v-model="formDat.name" placeholder="请输入姓名" clearable :style="{width: '100%'}" ></el-input>
          </el-form-item>

          <el-form-item label="出生时间" prop="birthday" >
            <el-date-picker
        <el-form-item label="性别" prop="sex">
          <el-select v-model="formDat.sex" placeholder="请选择性别" clearable :style="{width: '100%'}"  >
            <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
            ></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="出生日期" prop="birthday">
          <el-input
              v-model='formDat.birthday'
              type='date'
              placeholder='选择日期'
              style="width: 100%;"
            ></el-date-picker>
          </el-form-item>
          <el-form-item label="身份证号" prop="id">
            <el-input v-model="formDat.id" placeholder="请输入身份证号" clearable :style="{width: '100%'}" >
            </el-input>
          </el-form-item>
          <el-form-item label="婚姻状况" prop="marryStatus">
            <el-select v-model="formDat.marryStatus" placeholder="请选择婚姻状况" clearable :style="{width: '100%'}"  >
              <el-option v-for="(item, index) in typeOption" :key="index" :label="item.label" :value="item.value"
              ></el-option>
            </el-select>
          </el-form-item>
          <el-form-item label="户籍地址" prop="address">
            <el-input v-model="formDat.address" placeholder="请输入户籍地址" clearable :style="{width: '100%'}" >
            </el-input>
          </el-form-item>


        </div>
        <div style=" width: 500px;display:table-cell;">
          <el-form-item label="性别" prop="sex">
            <el-select v-model="formDat.sex" placeholder="请选择性别" clearable :style="{width: '100%'}"  >
              <el-option v-for="(item, index) in typeOption1" :key="index" :label="item.label" :value="item.value"
              ></el-option>
            </el-select>
          ></el-input>
          </el-form-item>
          <el-form-item label="民族" prop="nation">
            <el-input v-model="formDat.nation" placeholder="请输入民族" clearable :style="{width: '100%'}" >
            </el-input>
          </el-form-item>
          <el-form-item label="联系电话" prop="phone">
            <el-input v-model="formDat.phone" placeholder="请输入联系电话" clearable :style="{width: '100%'}" >
        <el-form-item label="身份证号" prop="idNo">
          <el-input v-model="formDat.idNo" placeholder="请输入身份证号" clearable :style="{width: '100%'}" >
            </el-input>
          </el-form-item>

        <el-form-item label="手机号码" prop="phone">
          <el-input v-model="formDat.phone" placeholder="请输入手机号码" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="地址" prop="address">
          <el-input v-model="formDat.address" placeholder="请输入地址" clearable :style="{width: '100%'}" ></el-input>
        </el-form-item>
        <el-form-item label="婚姻状态" prop="marryStatus">
          <el-select v-model="formDat.marryStatus" placeholder="请选择婚姻状态" clearable :style="{width: '100%'}"  >
            <el-option v-for="(item, index) in typeOptions1" :key="index" :label="item.label" :value="item.value"
            ></el-option>
          </el-select>
        </el-form-item>
          <el-form-item label="结婚时间" prop="marryTime">
            <el-date-picker
          <el-input
              v-model='formDat.marryTime'
              type='date'
              placeholder='选择结婚日期'
              style="width: 100%;"
            ></el-date-picker>
          </el-form-item>
        </div>

        <h2 style="margin-left: 50px;">配偶情况</h2>
        <div style="width: 500px; display:table-cell;">
          <el-form-item label="姓名" prop="spouseName">
            <el-input v-model="formDat.spouseName" placeholder="请输入姓名" clearable :style="{width: '100%'}" ></el-input>
          </el-form-item>

          <el-form-item label="出生时间" prop="spouseBirthday" >
            <el-date-picker
              v-model='formDat.spouseBirthday'
              type='date'
              placeholder='选择日期'
              style="width: 100%;"
            ></el-date-picker>
          </el-form-item>
          <el-form-item label="身份证号" prop="spouseId">
            <el-input v-model="formDat.spouseId" placeholder="请输入身份证号" clearable :style="{width: '100%'}" >
            </el-input>
          </el-form-item>
          <el-form-item label="婚姻状况" prop="spouseMarryStatus">
            <el-select v-model="formDat.spouseMarryStatus" placeholder="请选择婚姻状况" clearable :style="{width: '100%'}"  >
              <el-option v-for="(item, index) in typeOption" :key="index" :label="item.label" :value="item.value"
              ></el-option>
            </el-select>
          </el-form-item>
          <el-form-item label="户籍地址" prop="spouseAddress">
            <el-input v-model="formDat.spouseAddress" placeholder="请输入户籍地址" clearable :style="{width: '100%'}" >
            </el-input>
          ></el-input>
          </el-form-item>


        </div>
        <div style=" width: 500px;display:table-cell;">
          <el-form-item label="性别" prop="spouseSex">
            <el-select v-model="formDat.spouseSex" placeholder="请选择性别" clearable :style="{width: '100%'}"  >
              <el-option v-for="(item, index) in typeOption1" :key="index" :label="item.label" :value="item.value"
              ></el-option>
            </el-select>
          </el-form-item>
          <el-form-item label="民族" prop="spouseNation">
            <el-input v-model="formDat.spouseNation" placeholder="请输入民族" clearable :style="{width: '100%'}" >
            </el-input>
          </el-form-item>
          <el-form-item label="联系电话" prop="spousePhone">
            <el-input v-model="formDat.spousePhone" placeholder="请输入联系电话" clearable :style="{width: '100%'}" >
            </el-input>
          </el-form-item>

          <el-form-item label="结婚时间" prop="marryTime">
            <el-date-picker
              v-model='formDat.marryTime'
              type='date'
              placeholder='选择结婚日期'
              style="width: 100%;"
            ></el-date-picker>
          </el-form-item>
        </div>


        <h2 style="margin-left: 50px;">前任情况</h2>
        <div style="width: 500px; display:table-cell;">
          <el-form-item label="姓名" prop="spouseName">
            <el-input v-model="formDat.spouseName" placeholder="请输入姓名" clearable :style="{width: '100%'}" ></el-input>
          </el-form-item>

          <el-form-item label="出生时间" prop="spouseBirthday" >
            <el-date-picker
              v-model='formDat.spouseBirthday'
              type='date'
              placeholder='选择日期'
              style="width: 100%;"
            ></el-date-picker>
          </el-form-item>
          <el-form-item label="身份证号" prop="spouseId">
            <el-input v-model="formDat.spouseId" placeholder="请输入身份证号" clearable :style="{width: '100%'}" >
            </el-input>
          </el-form-item>
          <el-form-item label="婚姻状况" prop="spouseMarryStatus">
            <el-select v-model="formDat.spouseMarryStatus" placeholder="请选择婚姻状况" clearable :style="{width: '100%'}"  >
              <el-option v-for="(item, index) in typeOption" :key="index" :label="item.label" :value="item.value"
              ></el-option>
            </el-select>
          </el-form-item>
          <el-form-item label="户籍地址" prop="spouseAddress">
            <el-input v-model="formDat.spouseAddress" placeholder="请输入户籍地址" clearable :style="{width: '100%'}" >
            </el-input>
          </el-form-item>


        </div>
        <div style=" width: 500px;display:table-cell;">
          <el-form-item label="性别" prop="spouseSex">
            <el-select v-model="formDat.spouseSex" placeholder="请选择性别" clearable :style="{width: '100%'}"  >
              <el-option v-for="(item, index) in typeOption1" :key="index" :label="item.label" :value="item.value"
              ></el-option>
            </el-select>
          </el-form-item>
          <el-form-item label="民族" prop="spouseNation">
            <el-input v-model="formDat.spouseNation" placeholder="请输入民族" clearable :style="{width: '100%'}" >
            </el-input>
          </el-form-item>
          <el-form-item label="联系电话" prop="spousePhone">
            <el-input v-model="formDat.spousePhone" placeholder="请输入联系电话" clearable :style="{width: '100%'}" >
            </el-input>
          </el-form-item>

          <el-form-item label="结婚时间" prop="marryTime">
            <el-date-picker
              v-model='formDat.marryTime'
              type='date'
              placeholder='选择结婚日期'
              style="width: 100%;"
            ></el-date-picker>
          </el-form-item>
        </div>

        <h2 style="margin-left: 50px;">生育情况</h2>
        <div style="width: 500px; display:table-cell;">
          <el-form-item label="生育情况" prop="bearStatus">
            <el-select v-model="formDat.bearStatus" placeholder="请选择生育情况" clearable :style="{width: '100%'}"  >
              <el-option v-for="(item, index) in typeOption2" :key="index" :label="item.label" :value="item.value"
              ></el-option>
            </el-select>
          </el-form-item>
          <el-form-item label="领取《计划生育服务手册》" prop="handbookStatus">
            <el-select v-model="formDat.handbookStatus" placeholder="请选择" clearable :style="{width: '100%'}"  >
              <el-option v-for="(item, index) in typeOption3" :key="index" :label="item.label" :value="item.value"
              ></el-option>
            </el-select>
          </el-form-item>
          <el-form-item label="手册领取时间" prop="handbookTime" >
            <el-date-picker
              v-model='formDat.handbookTime'
              type='date'
              placeholder='选择日期'
              style="width: 100%;"
            ></el-date-picker>
          </el-form-item>
          <el-form-item label="领取《独生子女证》" prop="oneBorn">
            <el-select v-model="formDat.oneBorn" placeholder="请选择" clearable :style="{width: '100%'}"  >
              <el-option v-for="(item, index) in typeOption3" :key="index" :label="item.label" :value="item.value"
              ></el-option>
            </el-select>
          </el-form-item>
          <el-form-item label="《独生子女证》领取时间" prop="oneBornTime" >
            <el-date-picker
              v-model='formDat.oneBornTime'
              type='date'
              placeholder='选择日期'
              style="width: 100%;"
            ></el-date-picker>
          </el-form-item>


        </div>
        <el-form-item label="备注" prop="remark">
          <el-input v-model="formDat.remark" placeholder="请输入备注" clearable :style="{width: '80%'}" ></el-input>
        </el-form-item>
        <el-form-item label="需声明情况" prop="content">
          <el-input v-model="formDat.content" placeholder="请输入需声明情况" clearable :style="{width: '80%'}" ></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 type="primary" @click="submitDataScope">确 定</el-button>
        <el-button @click="cancelData">取 消</el-button>
      </div>
    </el-dialog>

  </div>
</template>

<script>
import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";



//在system/note/index.js中导入接口函数  --接好了
import {listMarry,updateMarry,delMarry,addMarry} from "@/api/marry/index";
import { delFamilyevent, uploadPic } from '../../api/bignote'
import {listMarry,updateMarry,delMarryOld,addMarryOld,updateMarryOld} from "@/api/marry/index";
import { blobValidate } from '../../utils/ruoyi'

export default {
@@ -726,7 +561,33 @@
      noneBtnImg:false,
      limitCountImg:1,//上传图片的最大数量
      //个人信息数据
      marryList:{},
      marryList:{
        name:undefined,
        sex:undefined,
        birthday:undefined,
        nation:undefined,
        idNo:undefined,
        phone:undefined,
        marryStatus:undefined,
        marryTime:undefined,
        address:undefined,
        bearStatus:undefined,
        handbookStatus:undefined,
        handbookTime:undefined,
        oneBorn:undefined,
        oneBornTime:undefined,
        notion:undefined,
        remark:undefined,
        spouseName:undefined,
        spouseSex:undefined,
        spouseBirthday:undefined,
        spouseIdNo:undefined,
        spouseAddress:undefined,
        spouseMarryStatus:undefined,
        spouseNation:undefined,
        spouseMarryTime:undefined,
        spousePhone:undefined,
      },
      fit:['fill'],

      oldSpouseList:{},
@@ -738,6 +599,7 @@
      open: false,
      // open:true,
      // 是否显示弹出层（数据权限）
      bear:undefined,
      mrs:undefined,
      smrs:undefined,
      openDataScope: false,
@@ -759,10 +621,29 @@
      btn:false,
      isShow:true,
      isShow_2:false,

      formDat: {

        oldSpouseList:undefined,
      oldSpouseList:{
        name:undefined,
        sex:undefined,
        birthday:undefined,
        nation:undefined,
        idNo:undefined,
        phone:undefined,
        marryStatus:undefined,
        marryTime:undefined,
        address:undefined,
      },
      formDat: {
        //前任信息
        name:undefined,
        sex:undefined,
        birthday:undefined,
        nation:undefined,
        idNo:undefined,
        phone:undefined,
        marryStatus:undefined,
        marryTime:undefined,
        address:undefined,
      },
      // 菜单列表
      menuOptions: [],
@@ -770,11 +651,7 @@
      deptOptions: [],
      // 查询参数
      queryParams: {
        pageNum: 1,
        pageSize: 5,
        startDate:undefined,
        content:undefined,
        witness:undefined,

      },
      // 表单参数
      form: {},
@@ -784,135 +661,48 @@
      },
      // 表单校验
      rules: {
        //基本信息
        nickName: [{
          // required: true,
          message: '请输入姓名',
          trigger: 'blur'
        }],
        oldName: [{
          // required: true,
          message: '请输入曾用名',
          trigger: 'blur'
        }],
        idNum: [{
          // required: true,
          message: '请输入身份证号',
          trigger: 'blur'
        }],
        nationality: [{
          // required: true,
          message: '请输入国籍',
          trigger: 'blur'
        }],
        maritalStatus: [{
          // required: true,
          message: '请输入民族',
          trigger: 'blur'
        }],
        locationAddress: [{
          // required: true,
          message: '请输入户籍地址',
          trigger: 'blur'
        }],
        alwaysAddress: [{
          // required: true,
          message: '请输入常住地址',
          trigger: 'blur'
        }],
        unit: [{
          // required: true,
          message: '请输入单位',
          trigger: 'blur'
        }],
        position: [{
          // required: true,
          message: '请输入职务职称',
          trigger: 'blur'
        }],
        locationPolice: [{
          // required: true,
          message: '请输入户籍地公安机关',
          trigger: 'blur'
        }],
        alwaysPolice: [{
          // required: true,
          message: '请输入常住地公安机关',
          trigger: 'blur'
        }],

        //主要学习及工作经历
        startDate: [{
          required: true,
          message: '请输入起始日期',
          trigger: 'blur'
        }],
        content: [{
          required: true,
          message: '请输入主要学习经历、工作单位及任职情况',
          trigger: 'blur'
        }],
        witness: [{
          required: true,
          message: '请输入证明人',
          trigger: 'blur'
        }],

      },
      typeOptions: [],
      //婚姻状况
      typeOption: [{
      typeOptions: [ {
        value: '女',
        label: '女',
      },
        {
          value: '男',
          label: '男',
        }],
      typeOptions1: [ {
        value:'0',
        label:'未婚'
      },{
        label: '未婚',
      },
        {
        value:'1',
        label:'初婚'
      },{
          label: '初婚',
        },
        {
        value:'2',
        label:'离婚'
          label: '离婚',
      },
        {
          value:'3',
          label:'再婚'
        }],
      //性别
      typeOption1: [{
        value:'0',
        label:'女'
      },{
        value:'1',
        label:'男'
      }],

      //生育情况

      typeOption2: [{
        value:'0',
        label:'未生育'
      },{
        value:'1',
        label:'在孕'
      },
        {
          value:'2',
          label:'已生育'
        }],
      //领取证件
      typeOption3: [{
        value:'0',
        label:'否'
      },{
        value:'1',
        label:'是'
      },
      ],
          label: '再婚',
        },],
    };
  },
  created() {
    this.getList()
  },
  methods: {

    //性别
    getSrc1(sex) {
      if (sex === '女') {
        return '女'
      }else {
        return '男'
      }
    },

    // 取消按钮
    cancelData() {
@@ -935,19 +725,18 @@
      this.loading = false;
      //个人信息
      listMarry(this.queryParams).then(response => {
        console.log(response.data)

          if(response.data.length == 0){
            this.loading = false;
            this.marryList={};

            this.oldSpouseList = {};
          }
          else{
            this.marryList = response.data;

            this.oldSpouseList = this.marryList.oldSpouseList;
            this.loading = false;

            console.log(111)
            console.log(this.oldSpouseList)
          }

        }
@@ -992,37 +781,13 @@
        };
      this.resetForm("form");
    },
    /** 搜索按钮操作 */
    handleQuery() {
      this.queryParams.pageNum = 1;
      this.getList();
    },
    /** 重置按钮操作 */
    resetQuery() {
      this.dateRange = [];
      this.resetForm("queryForm");
      this.handleQuery();
    },
    // 多选框选中数据
    handleSelectionChange(selection) {
      this.ids = selection.map(item => item.id)
      console.log(this.ids)
      this.single = selection.length!=1
      this.multiple = !selection.length
    },


    /** 新增按钮操作 */
    handleAdd() {
      this.reset();
      this.open = true;
      this.title = "新增婚姻信息";
    },


    /** 查看详细信息 */
    handleCheck(row){
      const id = row.id;
      this.$router.push("/self/self/edit/" + id);
    },
    /** 修改按钮操作 */
    handleUpdate() {
@@ -1059,12 +824,18 @@
              else if(this.marryList.spouseMarryStatus == 2)
                  this.smrs = '离婚'
          else
              this.smrs = '再婚'// this.isEdit=false
      // this.isEdit=false
        this.smrs = '再婚'
      if(this.marryList.bearStatus == 0)
        this.bear = '未生育'
      else if(this.marryList.bearStatus == 1)
        this.bear = '在孕'
      else if(this.marryList.bearStatus == 2)
        this.bear = '已生育'

    },

    handleRemoveFile(file) {
      alert(23)
      alert(操作成功)
    },
    handleRemove(file) {
      alert("操作成功")
@@ -1091,47 +862,17 @@

    /** 提交按钮（数据权限） */
    submitDataScope: function() {

      let ul = this.fileList.map(function (elem){
        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      }).join(",")
      let uls = this.fileListOther.map(function (elem){
        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      }).join(",")
      this.formDat.url = ul+","+uls
      this.$refs["elForm"].validate(valid => {
        if (valid) {

          addMarry(this.formDat).then(response => {
          addMarryOld(this.formDat).then(response => {
            // marryList.oldSpouseList.push(this.formDat);
            this.$modal.msgSuccess("新增成功");
            this.open = false;
            this.getList();
          });
        }
      });
    },
    requestUpload(params)
    {
      var file = params.file;
      var formData = new FormData();
      formData.append('uploadFile', file);
      let _this = this

      uploadPic(formData).then(response => {
        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)

        if(_this.fot.includes(pth) === true)
        {
          _this.fileList.push({name:response.data.fileName, "url":response.data.url})

        }

        else{
          _this.fileListOther.push({name:response.data.fileName, url:response.data.url})

        }
      })

    },

    editRow(row) {
@@ -1145,6 +886,10 @@
      this.marryList.marryStatus = parseInt(this.mrs)
      if(parseInt(this.smrs))
       this.marryList.spouseMarryStatus = parseInt(this.smrs)
      if(parseInt(this.bear))
        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
      this.$refs['elForm'].validate(valid => {
@@ -1159,6 +904,9 @@
              this.isShow_2=false
              this.isShow = true

            }).catch(error => {
              console.error(error);
              this.$modal.msgError("修改失败");
            });
          } else {
            this.$modal.msgSuccess("修改失败");
@@ -1169,16 +917,23 @@
      // 刷新页面
      // window.location.reload();
    },
    //主要经历
    //前任修改
    saveRowmarryList(row) {
      this.$refs['elForm'].validate(valid => {

        console.log(this.oldSpouseList)
        if (valid) {
          this.oldSpouseList = this.marryList.oldSpouseList
          this.marryList.oldSpouseList =  this.oldSpouseList

          const foundIndex = this.oldSpouseList.findIndex(item => item.id === row.id);
          if (foundIndex !== -1) {
            const updatedData = Object.assign({}, this.marryList.oldSpouseList[foundIndex], row);
            updateMarry(updatedData).then(response => {
            updateMarryOld(updatedData).then(response => {
              this.oldSpouseList = this.marryList.oldSpouseList
              this.$modal.msgSuccess("修改成功");
              console.log(updatedData)
              this.getList();
              // console.log(this.oldSpouseList)
            }).catch(error => {
              this.$modal.msgError("修改失败");
              console.log(error);
@@ -1200,15 +955,24 @@
        return "statistics-warning-row";
      }
    },
    /** 删除个人经历按钮操作 */
    /** 删除前任 */
    handleDelete(row) {
      const Ids = row.id || this.ids;
      console.log(this.oldSpouseList)
      const id = row.id || this.oldSpouseList.id
      console.log(id)

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

        console.log(this.oldSpouseList)
        this.$modal.msgSuccess("删除成功");
        window.location.reload();
        this.getList();

        // window.location.reload();
      }).catch(() => {});

    },
@@ -1222,3 +986,17 @@
  }
};
</script>
<style>
.el-table__row.statistics-warning-row {
  background: #E0EEFE;

}
.el-table__row.statistics-warning-row1 {
  background: #FFEFF2;

}
.button {
  background:center no-repeat url('../../assets/icons/add1.png') ;
  margin-left: 69.5vw;

}</style>