亲属关系界面优化

admin-ui/src/views/work/nk/edit.vue

@@ -1,15 +1,12 @@
 <template>
   <div class="cmain">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="序号" prop="nkNumber">
-          <el-input v-model="form.nkNumber" placeholder="请输入序号"  clearable />
+        <el-form-item label="患者ID" prop="patientId">
+          <el-input v-model="form.patId" placeholder="请输入患者ID" clearable/>
         </el-form-item>
         <el-form-item label="近亲姓名" prop="name">
           <el-input v-model="form.name" placeholder="请输入近亲姓名" clearable/>
         </el-form-item>
-        <el-form-item label="患者id" prop="patientId">
-          <el-input v-model="form.patientId" placeholder="请输入患者id" clearable/>
-        </el-form-item>
         <el-form-item label="近亲关系" prop="kinship">
           <el-select v-model="form.kinship" placeholder="请选择近亲关系" clearable>
             <el-option v-for="dict in dict.type.nk_kinship" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>

admin-ui/src/views/work/nk/index.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" @submit.native.prevent>
+      <el-form-item label="患者ID" prop="patientId">
+        <el-input v-model="queryParams.patId" placeholder="请输入患者ID"  @keyup.enter.native="handleQuery" clearable class="inp"/>
+      </el-form-item>
       <el-form-item label="近亲姓名" prop="name">
         <el-input v-model="queryParams.name" placeholder="请输入近亲姓名"  @keyup.enter.native="handleQuery" clearable class="inp"/>
       </el-form-item>
-      <el-form-item label="患者id" prop="patientId">
-        <el-input v-model="queryParams.patientId" placeholder="请输入患者id"  @keyup.enter.native="handleQuery" clearable class="inp"/>
-      </el-form-item>
       <el-form-item label="近亲关系" prop="kinship">
         <el-select v-model="queryParams.kinship" placeholder="请选择近亲关系" clearable class="se">
           <el-option v-for="dict in dict.type.nk_kinship" :key="dict.value" :label="dict.label" :value="dict.value"/>
@@ -37,10 +37,9 @@
 
     <el-table :data="response.rows" border @selection-change="selects" height="calc(100vh - 270px)">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键ID" align="center" prop="id" />
-      <el-table-column label="序号" align="center" prop="nkNumber" />
+      <el-table-column label="ID" align="center" prop="id" />
+      <el-table-column label="患者ID" align="center" prop="patId" />
       <el-table-column label="近亲姓名" align="center" prop="name" />
-      <el-table-column label="患者id" align="center" prop="patientId" />
       <el-table-column label="近亲关系" align="center" prop="kinship">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.nk_kinship" :value="scope.row.kinship"/>
@@ -74,9 +73,9 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        id:null,
+        patId: null,
         name: null,
-        patientId: null,
-        nkNumber: null,
         kinship: null,
         address: null,
         phone: null,