接口还没连好

Tcsm

2023-03-30 16e6425b5acec7cdea6aa5f331b48b71f2afc32a

接口还没连好

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

@@ -1,6 +1,6 @@
import request from '@/utils/request'

// 根据id查询个人详细信息
// 查询个人信息
export function getIndividualInfo(id) {
  return request({
    url: '/self/user' ,
@@ -12,7 +12,7 @@
// 查看用户主要成员关系
export function getIndividualRelation(Id) {
  return request({
    url: '/self/user/relation' + Id,
    url: '/self/user/relation' ,
    method: 'get',

  })
@@ -21,7 +21,7 @@
// 删除个人信息
export function delIndividual(Ids) {
  return request({
    url: '/self/user' + Ids,
    url: '/self/user' ,
    method: 'delete'
  })
}
@@ -44,3 +44,42 @@
    data: data
  })
}



//查询所有个人经历
export function listExperience(query) {
  return request({
    url: '/zExperience/all',
    method: 'get',
    params: query
  })
}

//修改个人经历
export function updateExperience(data) {
  return request({
    url: '/zExperience',
    method: 'put',
    data: data
  })
}

//增加个人经历
export function addExperience(data)
{
  return request({
    url: '/zExperience',
    method: 'post',
    data: data
  })
}

//删除个人经历
export function delExperience(ids)
{
  return request({
    url: '/zExperience' +ids,
    method: 'del',
  })
}

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

@@ -14,7 +14,7 @@
      <div style="padding-left:30px">
        <el-container>
          <el-col>
            <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="60px" label-position="left">
            <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="70px" label-position="left">
              <el-row :span="6">
                <el-form-item label="姓名" prop="nickName">
                  <el-input v-model="formData.nickName" placeholder="请输入姓名" clearable :style="{width: '100%'}">
@@ -28,8 +28,8 @@
                </el-form-item>
              </el-row>
              <el-row :span="8">
                <el-form-item label="身份证号" prop="field107">
                  <el-input v-model="formData.field107" placeholder="请输入身份证号" clearable :style="{width: '100%'}">
                <el-form-item label="身份证号" prop="idNum">
                  <el-input v-model="formData.idNum" placeholder="请输入身份证号" clearable :style="{width: '100%'}">
                  </el-input>
                </el-form-item>
              </el-row>
@@ -48,14 +48,14 @@
                </el-form-item>
              </el-row>
              <el-row :span="6">
                <el-form-item label="民族" prop="field105">
                  <el-input v-model="formData.field105" placeholder="请输入民族" clearable :style="{width: '100%'}">
                <el-form-item label="民族" prop="nation">
                  <el-input v-model="formData.nation" placeholder="请输入民族" clearable :style="{width: '100%'}">
                  </el-input>
                </el-form-item>
              </el-row>
              <el-row :span="8">
                <el-form-item label="联系方式" prop="field107">
                  <el-input v-model="formData.field107" placeholder="请输入联系方式" clearable :style="{width: '100%'}">
                <el-form-item label="联系方式" prop="phoneNumber">
                  <el-input v-model="formData.phoneNumber" placeholder="请输入联系方式" clearable :style="{width: '100%'}">
                  </el-input>
                </el-form-item>
              </el-row>
@@ -114,20 +114,20 @@
          <el-col>
            <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px" label-position="left">
              <el-row :span="15">
                <el-form-item label="户籍地址" prop="field108">
                  <el-input v-model="formData.field108" placeholder="请输入户籍地址" clearable :style="{width: '100%'}">
                <el-form-item label="户籍地址" prop="locationAddress">
                  <el-input v-model="formData.locationAddress" placeholder="请输入户籍地址" clearable :style="{width: '100%'}">
                  </el-input>
                </el-form-item>
              </el-row>
              <el-row :span="15">
                <el-form-item label="常住地址" prop="field110">
                  <el-input v-model="formData.field110" placeholder="请输入常住地址" clearable :style="{width: '100%'}">
                <el-form-item label="常住地址" prop="alwaysAddress">
                  <el-input v-model="formData.alwaysAddress" placeholder="请输入常住地址" clearable :style="{width: '100%'}">
                  </el-input>
                </el-form-item>
              </el-row>
              <el-row :span="15">
                <el-form-item label="单位及职务职称" prop="field112">
                  <el-input v-model="formData.field112" placeholder="请输入单位及职务职称" clearable :style="{width: '100%'}">
                <el-form-item label="单位及职务职称" prop="position">
                  <el-input v-model="formData.position" placeholder="请输入单位及职务职称" clearable :style="{width: '100%'}">
                  </el-input>
                </el-form-item>
              </el-row>
@@ -141,14 +141,14 @@
          <el-col>
            <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px" label-position="left">
              <el-row :span="12">
                <el-form-item label="户籍地公安机关" prop="field109">
                  <el-input v-model="formData.field109" placeholder="请输入户籍地公安机关" clearable :style="{width: '100%'}">
                <el-form-item label="户籍地公安机关" prop="locationPolice">
                  <el-input v-model="formData.locationPolice" placeholder="请输入户籍地公安机关" clearable :style="{width: '100%'}">
                  </el-input>
                </el-form-item>
              </el-row>
              <el-row :span="12">
                <el-form-item label="常住地公安机关" prop="field111">
                  <el-input v-model="formData.field111" placeholder="请输入常住地公安机关" clearable :style="{width: '100%'}">
                <el-form-item label="常住地公安机关" prop=" alwaysPolice">
                  <el-input v-model="formData. alwaysPolice" placeholder="请输入常住地公安机关" clearable :style="{width: '100%'}">
                  </el-input>
                </el-form-item>
              </el-row>
@@ -160,40 +160,78 @@
    </el-container>



    <div style="padding-top:30px">
    <el-container>
      <div style="width:100%"><h2 style="font-size:15px" >主要学习及工作经历</h2></div>
      <el-button type="primary" icon="el-icon-edit" round></el-button>
    <el-button type="primary" icon="el-icon-delete" round></el-button>
    </el-container>
    <el-table v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
      <el-table-column label="起止日期" prop="time" sortable width="350" align="center" />
      <el-table-column label="主要学习经历、工作单位及任职情况" prop="circumstance" sortable width="400" align="center" />
      <el-table-column label="证明人" prop="witness" sortable width="350" align="center" />

      <el-table v-loading="loading" :data="experiencelList" @selection-change="handleSelectionChange">
        <el-table-column type="selection" width="16"  align="center" />
        <el-table-column label="起止日期" prop="startDate" sortable width="300" align="center" />
        <el-table-column label="主要学习经历、工作单位及任职情况" prop="content" sortable width="350" align="center" />
        <el-table-column label="证明人" prop="witness" sortable width="300" align="center" />
      <el-table-column label="删除" align="center" class-name="small-padding fixed-width" sortable width="100">
        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
          <el-button
            size="mini"
            type="text"
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['system:role:edit']"
          >修改</el-button>

          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
            v-hasPermi="['system:role:remove']"
          >删除</el-button>
          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">
            <el-button size="mini" type="text" icon="el-icon-d-arrow-right"  @click="handleCheck(scope.row)">查看详情</el-button>

          </el-dropdown>
        </template>
      </el-table-column>
    </el-table>
    </div>

    <div style="padding-top:30px">
    <el-container>
      <div style="width:100%"><h2 style="font-size:15px" >家庭成员及主要社会关系情况</h2></div>
      <el-button type="primary" icon="el-icon-edit" round></el-button>
      <el-button type="primary" icon="el-icon-delete" round></el-button>
    </el-container>
      <!--      :data =""内的东西不知道要不要改-->
    <el-table v-loading="loading" :data="experiencelList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="16"  align="center" />
      <el-table-column label="与本人关系"  sortable width="270" align="center" />
      <el-table-column label="姓名"  sortable width="270" align="center" />
      <el-table-column label="单位及职务"  sortable width="270" align="center" />
      <el-table-column label="政治面貌"  sortable width="270" align="center">
      </el-table-column>
    </el-table>
    </div>

    <el-container>
      <div style="width:100%"><h2 style="font-size:15px" >移居国（境）情况</h2></div>

    </el-container>

    <div style="padding-top:30px">
      <el-container>
        <div style="width:100%"><h2 style="font-size:15px" >持有出入境证件情况</h2></div>
        <el-button type="primary" icon="el-icon-edit" round></el-button>
        <el-button type="primary" icon="el-icon-delete" round></el-button>
      </el-container>
        <!--      :data =""内的东西不知道要不要改-->
        <el-table v-loading="loading" :data="experiencelList" @selection-change="handleSelectionChange">
          <el-table-column type="selection" width="16"  align="center" />
          <el-table-column label="证件名称"  sortable width="270" align="center" />
          <el-table-column label="持有情况"  sortable width="270" align="center" />
          <el-table-column label="证件号码"  sortable width="270" align="center" />
          <el-table-column label="有效期"  sortable width="270" align="center">
          </el-table-column>
        </el-table>
    </div>
    <div style="padding-top:30px">
      <el-container>
        <div style="width:100%"><h2 style="font-size:15px" >出国（境）情况</h2></div>
        <el-button type="primary" icon="el-icon-edit" round></el-button>
        <el-button type="primary" icon="el-icon-delete" round></el-button>
      </el-container>
      <el-table v-loading="loading" :data="experiencelList" @selection-change="handleSelectionChange">
        <el-table-column type="selection" width="16"  align="center" />
        <el-table-column label="起止日期" prop="startDate" sortable width="300" align="center" />
        <el-table-column label="所到国家或者地区" prop="content" sortable width="350" align="center" />
        <el-table-column label="事由（旅游、走访、探亲、继承财产、其他）" prop="witness" sortable width="300" align="center" />
        <el-table-column label="删除" align="center" class-name="small-padding fixed-width" sortable width="100">
        </el-table-column>
      </el-table>

    </div>
    <pagination
      v-show="total>0"
      :total="total"
@@ -206,7 +244,8 @@
</template>

<script>
import {getIndividualInfo, getIndividualRelation, delIndividual, updateIndividual, addIndividual} from "@/api/self/index";
import {getIndividualInfo, getIndividualRelation, delIndividual, updateIndividual, addIndividual,listExperience,updateExperience,
  addExperience,delExperience} from "@/api/self/index";

export default {
  name: 'index',
@@ -233,8 +272,8 @@
      showSearch: true,
      // 总条数
      total: 0,
      // 资产表格数据
      individualList: [],
      // 个人经历数据
      experiencelList: [],
      // 弹出层标题
      title: "",
      // 是否显示弹出层
@@ -259,17 +298,19 @@

      formData: {
        nickName: undefined,
        oldName: undefined,
        sex: undefined,
        nationality: undefined,
        oldName: undefined,
        field105: undefined,
        nation: undefined,
        maritalStatus: undefined,
        field107: undefined,
        field108: undefined,
        field109: undefined,
        field110: undefined,
        field111: undefined,
        field112: undefined,
        idNum: undefined,
        politicalOutlook: undefined,
        phoneNumber: undefined,
        locationAddress: undefined,
        alwaysPolice: undefined,
        alwaysAddress: undefined,
        position: undefined,
        locationPolice: undefined,
      },
      rules: {
        nickName: [{
@@ -292,9 +333,14 @@
          message: '请输入曾用名',
          trigger: 'blur'
        }],
        field105: [{
        nation: [{
          required: true,
          message: '请输入民族',
          trigger: 'blur'
        }],
        idNum: [{
          // required: true,
          message: '请输入身份证号',
          trigger: 'blur'
        }],
        maritalStatus: [{
@@ -302,47 +348,44 @@
          message: '请输入婚姻状况',
          trigger: 'blur'
        }],
        field107: [{
        phoneNumber: [{
          // required: true,
          message: '请输入联系方式',
          trigger: 'blur'
        }],
        field108: [{
        locationAddress: [{
          // required: true,
          message: '请输入户籍地址',
          trigger: 'blur'
        }],
        field109: [{
        locationPolice: [{
          // required: true,
          message: '请输入户籍地公安机关',
          trigger: 'blur'
        }],
        field110: [{
        alwaysAddress: [{
          // required: true,
          message: '请输入常住地址',
          trigger: 'blur'
        }],
        field111: [{
        alwaysPolice: [{
          // required: true,
          message: '请输入常住地公安机关',
          trigger: 'blur'
        }],
        field112: [{
        position: [{
          // required: true,
          message: '请输入单位及职务职称',
          trigger: 'blur'
        }],
      },
      // 菜单列表
      menuOptions: [],
      // 部门列表
      deptOptions: [],

      // 查询参数
      queryParams: {
        pageNum: 1,
        pageSize: 5,
        time:undefined,
        circumstance:undefined,
        startDate:undefined,
        content:undefined,
        witness:undefined,
        createTime:undefined
      },
@@ -431,32 +474,19 @@
      this.loading = true;
      // console.log(this.queryParams)
      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
      listIndividual(this.queryParams).then(response => {
      listExperience(this.queryParams).then(response => {
          //  alert(123)
          //   console.log(response.data)
          this.individualList = response.data.data;
          this.experiencelList = response.data.data;

          this.total = response.data.total;
          this.loading = false;
        }

      );
    },

    /** 删除按钮操作 */
    handleDelete(row) {
      const Ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除编号为"' + Ids + '"的数据项？').then(function() {
        return delProperty(Ids);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
    },
    /** 查看详细信息 */
    handleCheck(row){
      const id = row.id;
      this.$router.push("/family/note1/propertyInfo/" + id);
    },

  }
}
</script>