From 4904693c6fcc4998a7b624466d207cb9b6f57705 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Thu, 28 Mar 2024 16:51:32 +0800
Subject: [PATCH] test

---
 src/components/customerOrg/customerOrgEdit.vue         | 9 ++++++++-
 src/components/customerOrg/customerOrgRegister.vue     | 1 +
 src/components/patientRegister/PatientRegisterEdit.vue | 3 +++
 src/components/patientRegister/PatientRegisterList.vue | 1 +
 src/views/customerOrg/customerOrgGroup.vue             | 3 ++-
 src/views/customerOrg/patientRegister.vue              | 2 +-
 6 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/components/customerOrg/customerOrgEdit.vue b/src/components/customerOrg/customerOrgEdit.vue
index 8037cd7..e9eeaba 100644
--- a/src/components/customerOrg/customerOrgEdit.vue
+++ b/src/components/customerOrg/customerOrgEdit.vue
@@ -10,7 +10,7 @@
                 :props="{ checkStrictly: true, expandTrigger: 'hover', ...customerOrg.treeprops, }"
                 :show-all-levels="false" clearable filterable disabled
                 :style="'width:' + Math.floor((window.pageWidth - 585) / 3) + 'px;'">
-              </el-cascader>
+              </el-cascader>              
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -147,6 +147,13 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="16">
+            <el-form-item label="id" prop="id">
+              <el-input v-model="form.id" disabled/>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </div>
     <!-- 按钮区域 -->
diff --git a/src/components/customerOrg/customerOrgRegister.vue b/src/components/customerOrg/customerOrgRegister.vue
index ce83255..37cce31 100644
--- a/src/components/customerOrg/customerOrgRegister.vue
+++ b/src/components/customerOrg/customerOrgRegister.vue
@@ -4,6 +4,7 @@
       <el-table :data="customerOrg.customerOrgRegisterList" border
         :height="window.pageHeight < 600 ? 200 : window.pageHeight - 400" size="small" highlight-current-row
         @row-click="rowClick" ref="customerOrg.customerOrgRegisterList">
+        <el-table-column prop="id" label="id" min-width="200" align="center" />
         <el-table-column prop="medicalTimes" label="体检次数" width="70" align="center" />
         <el-table-column prop="beginTime" label="开始日期" min-width="80" align="center">
           <template slot-scope="scope">
diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index ad04db9..d7f8709 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -2,6 +2,9 @@
   <div>
     <div style="display: flex">
       <div :style="'width:' + (window.pageWidth - 110 - 20) + 'px;'">
+        <div v-show="checkPagePriv(pagePriv.privs,'查找')" style="position: absolute;top:5px;left:180px;">
+          人员ID: {{ form.id }}
+        </div>
         <!--查询条件-->
         <div v-show="checkPagePriv(pagePriv.privs,'查找')" style="position: absolute;top:28px;left:180px;">
           <PatientRegisterEditQuery/>
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index e267260..7240a33 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -260,6 +260,7 @@ export default {
       //拖动列
       dropCol: [
         { label: "序号", prop: "sn", minWidth: 40, align: "center" },
+        { label: "id", prop: "id", minWidth: 200, align: "center" },
         { label: "体检进度", prop: "completeFlag", minWidth: 80, align: "center" },
         { label: "打印", prop: "guidePrintTimes", minWidth: 55, align: "center" },
         { label: "锁住", prop: "isLock", minWidth: 55, align: "center" },
diff --git a/src/views/customerOrg/customerOrgGroup.vue b/src/views/customerOrg/customerOrgGroup.vue
index 5a21ff3..586c21e 100644
--- a/src/views/customerOrg/customerOrgGroup.vue
+++ b/src/views/customerOrg/customerOrgGroup.vue
@@ -31,7 +31,8 @@
             <el-table :data="customerOrgGroups" ref="customerOrgGroups" style="margin-top: 2px" row-key="id" border
               height="240px" size="small" highlight-current-row :row-class-name="handleRowClassName"
               @row-click="rowClick">
-              <el-table-column type="index" label="序号" min-width="50" align="center" />
+              <el-table-column type="index" label="序号" width="50" align="center" />
+              <el-table-column label="id" prop="id" min-width="200" align="center" />
               <el-table-column prop="displayName" label="名称" min-width="150" />
               <el-table-column prop="price" label="价格" min-width="60" align="center" />
               <el-table-column prop="forSexId" label="适用性别" min-width="60" align="center">
diff --git a/src/views/customerOrg/patientRegister.vue b/src/views/customerOrg/patientRegister.vue
index 658aea0..407132d 100644
--- a/src/views/customerOrg/patientRegister.vue
+++ b/src/views/customerOrg/patientRegister.vue
@@ -6,7 +6,7 @@
       </div>  
       <div style="display: flex;">
         <!-- 单位树组件 -->
-        <div :style="'margin-right:15px;background-color: #fff;border-radius: 8px;width:208px; height:' +
+        <div :style="'margin-right:5px;background-color: #fff;border-radius: 8px;width:208px; height:' +
           (window.pageHeight < 600 ? 450 : window.pageHeight - 100) +
           'px;'
           ">