From 77416e26f3b6f160a397802d8b3e20032c165531 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Fri, 31 Mar 2023 14:19:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/person/index.vue  | 49 +++++++++++++++++++++++++-----
 src/views/system/person/indexjs.js | 31 +++++++++++++++++--
 2 files changed, 70 insertions(+), 10 deletions(-)

diff --git a/src/views/system/person/index.vue b/src/views/system/person/index.vue
index 14788ea..2e340e2 100644
--- a/src/views/system/person/index.vue
+++ b/src/views/system/person/index.vue
@@ -15,7 +15,7 @@
           }}
         </el-button>
       </el-form-item>
-      <el-form-item label="所属科室" prop="departmentName" style="margin-left: 25px">
+      <el-form-item label="所属科室" prop="departmentName">
         <el-input
           v-model="queryParams.departmentName"
           placeholder="请输入所属科室"
@@ -31,6 +31,34 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="联系电话" prop="phone">
+        <el-input
+          v-model="queryParams.phone"
+          placeholder="请输入联系电话"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="职称级别" prop="positionalTitleLevel">
+        <el-select v-model="queryParams.positionalTitleLevel" clearable>
+          <el-option
+            v-for="item in positionalTitleLevellist"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="审核状态" prop="modifyCheckStatus">
+        <el-select v-model="queryParams.modifyCheckStatus" clearable>
+          <el-option
+            v-for="item in modifyCheckStatuslist"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -87,7 +115,6 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
-
       <el-table-column
         label="护理站名称"
         align="center"
@@ -96,21 +123,19 @@
       />
       <el-table-column label="科室名称" align="center" prop="departmentName" />
       <el-table-column label="姓名" align="center" prop="nursePersonName" />
-
       <el-table-column label="性别" align="center" prop="sex">
         <template slot-scope="scope">
           {{ scope.row.sex == "MALE" ? "男" : "" }}
           {{ scope.row.sex == "FEMALE" ? "女" : "" }}
         </template>
       </el-table-column>
-
       <el-table-column label="联系电话" align="center" prop="phone" />
       <el-table-column label="居住地址" align="center" prop="address" :show-overflow-tooltip="true" />
       <el-table-column label="创建人" align="center" prop="createBy" />
       <el-table-column label="创建时间" align="center" prop="createTime" />
-
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-s-check">审核</el-button>
           <el-button
             size="mini"
             type="text"
@@ -262,7 +287,7 @@
     <el-dialog
       :title="title"
       :visible.sync="open"
-      width="1300px"
+      width="900px"
       append-to-body
       :before-close="cancel"
     >
@@ -347,8 +372,18 @@
             style="width: 300px"
           />
         </el-form-item>
+        <el-form-item label="职称级别" prop="positionalTitleLevel">
+          <el-select v-model="form.positionalTitleLevel" style="width: 300px" clearable>
+            <el-option
+              v-for="item in positionalTitleLevellist"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item label="证书资质" required>
-          <el-table :data="form.nurseStationPersonCertificateList" style="width: 1100px">
+          <el-table :data="form.nurseStationPersonCertificateList" style="width: 850px">
             <el-table-column property="consumableCount" label="证书名称" align="center">
               <template slot-scope="scope">
                 <el-input maxlength="50" v-model="scope.row.certificateName" placeholder="请输入证书名称"></el-input>
diff --git a/src/views/system/person/indexjs.js b/src/views/system/person/indexjs.js
index eb8c858..2a04157 100644
--- a/src/views/system/person/indexjs.js
+++ b/src/views/system/person/indexjs.js
@@ -53,6 +53,23 @@ export default {
                     value: "FEMALE",
                 },
             ],
+            positionalTitleLevellist: [{
+                label: "初级",
+                value: "'PRIMARY_LEVEL",
+            }, {
+                label: "中级",
+                value: "MIDDLE_LEVEL",
+            }, {
+                label: "高级",
+                value: "HIGH_LEVEL",
+            }],
+            modifyCheckStatuslist: [{
+                label: "已审核",
+                value: "CHECKED",
+            }, {
+                label: "未审核",
+                value: "NOT_CHECK",
+            }],
             nursePersonTypes: [{
                     label: "护士",
                     value: "NURSE",
@@ -60,7 +77,7 @@ export default {
                 {
                     label: "护理师",
                     value: "NURSE_TEACHER",
-                },
+                }
             ],
             innerVisiblexg: false,
             innerVisiblexg2: false,
@@ -133,7 +150,6 @@ export default {
                 id: null,
                 nurseStationId: null,
             },
-
             queryParams3: {
                 pageNum: 1,
                 pageSize: 10,
@@ -151,12 +167,14 @@ export default {
                 pageNum: 1,
                 pageSize: 10,
             },
-
             // 表单参数
             form: {},
             index: "",
             // 表单校验
             rules: {
+                positionalTitleLevel: [
+                    { required: true, message: "请选择职称级别", trigger: "blur" },
+                ],
                 nurseStationId: [
                     { required: true, message: "请选择所属护理站", trigger: "blur" },
                 ],
@@ -301,6 +319,13 @@ export default {
             // 护理站名称
             this.loading = true;
             listPerson(this.queryParams).then((response) => {
+                response.rows.forEach(e => {
+                    if (e.modifyCheckStatus == 'CHECKED') {
+                        e.modifyCheckStatus = true
+                    } else {
+                        e.modifyCheckStatus = false
+                    }
+                })
                 this.nurseStationPersonList = response.rows;
                 this.total = response.total;
                 this.loading = false;