rydj

src/components/patientRegister/PatientRegisterList.vue

@@ -11,20 +11,118 @@
         highlight-current-row
         @row-click="rowick"
         ref="dataList"
-      >
-        <el-table-column prop="is_complete" label="完成" />
-        <el-table-column label="单位"></el-table-column>
-        <el-table-column label="部门"></el-table-column>
-        <el-table-column label="姓名"></el-table-column>
-        <el-table-column label="性别"></el-table-column>
-        <el-table-column label="年龄"></el-table-column>
-        <el-table-column label="条码号"></el-table-column>
-        <el-table-column label="档案号"></el-table-column>
-        <el-table-column label="计划ID"></el-table-column>
-        <el-table-column label="次数"></el-table-column>
-        <el-table-column label="分组/套餐"></el-table-column>          
-        <el-table-column label="民族"></el-table-column>
+      >   
+        <el-table-column prop="completeFlag" label="体检进度">
+          <template slot-scope="scope">
+            <div>{{ ldddw(dict.completeFlag, 'id', scope.row.completeFlag, 'displayName') }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="isLock" label="锁住">
+          <template slot-scope="scope">
+            <div>{{ scope.row.isLock == 'Y' ? '是':'否' }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="customerOrgId" label="单位">
+          <template slot-scope="scope">
+            <div>{{ ldddw(patientRegister.customerOrgTreeAll, 'id', scope.row.customerOrgId, 'displayName') }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="部门">
+          
+        </el-table-column>
+        <el-table-column prop="patientName" label="姓名" />
+        <el-table-column prop="sexId" label="性别">
+          <template slot-scope="scope">
+            <div>{{ ldddw(dict.sex, 'id', scope.row.sexId, 'displayName') }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="age" label="年龄" />
+        <el-table-column prop="patientRegisterNo" label="条码号" />
+        <el-table-column prop="patientNo" label="档案号" /> 
+        <el-table-column prop="medicalTimes" label="体检次数"></el-table-column>
+        <el-table-column label="分组/套餐">
+          <template slot-scope="scope">
+            <div :v-if="scope.row.customerOrgId === dict.personOrgId">
+              {{ ldddw(dict.medicalPackage, 'id', scope.row.medicalPackageId, 'displayName') }}
+            </div>
+            <div :v-if="scope.row.customerOrgId !== dict.personOrgId">
+              {{ ldddw(dict.customerOrgGroupAll, 'id', scope.row.customerOrgGroupId, 'displayName') }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="nationId" label="民族">
+          <template slot-scope="scope">
+            <div>{{ ldddw(dict.nation, 'id', scope.row.nationId, 'displayName') }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="idNo" label="身份证" />
+        <el-table-column prop="birthDate" label="出生日期" />
+        <el-table-column prop="email" label="邮箱" />        
+        <el-table-column prop="mobileTelephone" label="手机" />
+        <el-table-column prop="telephone" label="电话" /> 
+        <el-table-column prop="address" label="地址" />
+        <el-table-column prop="medicalCardNo" label="体检卡号" />
+        <el-table-column prop="jobCardNo" label="工卡号" />
+        <el-table-column prop="maritalStatusId" label="婚姻状况">
+          <template slot-scope="scope">
+            <div>{{ ldddw(dict.maritalStatus, 'id', scope.row.maritalStatusId, 'displayName') }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="medicalTypeId" label="体检类别">
+          <template slot-scope="scope">
+            <div>{{ ldddw(dict.medicalType, 'id', scope.row.medicalTypeId, 'displayName') }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="personnelTypeId" label="人员类别">
+          <template slot-scope="scope">
+            <div>{{ ldddw(dict.personnelType, 'id', scope.row.personnelTypeId, 'displayName') }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="jobPost" label="职务" />
+        <el-table-column prop="jobTitle" label="职称" />
+        <el-table-column prop="salesman" label="介绍人" />
+        <el-table-column prop="isVip" label="是否VIP">
+          <template slot-scope="scope">
+            <div>{{ scope.row.isVip == 'Y' ? '是':'否' }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="creatorName" label="登记人" />
+        <el-table-column prop="creationTime" label="登记日期" />
+        <el-table-column prop="isUpload" label="是否上传">
+          <template slot-scope="scope">
+            <div>{{ scope.row.isUpload == 'Y' ? '是':'否' }}</div>
+          </template>
+        </el-table-column>
+
+        <!--
+        "sexHormoneTermId": "00000000-0000-0000-0000-000000000000",
+        "interposeMeasure": null,
+        "medicalConclusionId": "00000000-0000-0000-0000-000000000000",
+        "reportPrintTimes": 0,        
+        "isMedicalStart": "N",
+        "medicalStartDate": "6/28/2023",
+        "isRecoverGuide": "N",
+        "summaryDate": "",
+        "summaryDoctor": null,
+        "isAudit": "N",
+        "auditDoctor": null,
+        "auditDate": "",        
+        "isNameHide": "N",
+        "isPhoneFollow": "N",
+        "thirdInfo": null,
+        "guidePrintTimes": null,
+        "remark": null,
+        "organizationUnitId": "00000000-0000-0000-0000-000000000000",
+        "customerOrgRegisterId": "00000000-0000-0000-0000-000000000000",
+        "lastModifierName": "",
+        "lastModificationTime": null,
+        "lastModifierId": null,
+        "creatorId": null,
+        "id": "3a0c196d-a6d0-37fe-5c32-4806bdc4530f"
+        -->
+
       </el-table>
+
       <div style="margin-left: 10px;">
         <div class="listBtn">
           <el-button type="success" @click="add">人员登记</el-button>
@@ -75,6 +173,8 @@
 import { mapState } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import PatientRegisterEdit from '../../components/patientRegister/PatientRegisterEdit.vue'
+import { dddw } from "@/utlis/proFunc";
+
 export default {
   components: {
     PatientRegisterEdit
@@ -128,8 +228,39 @@ export default {
       this.dialogVisible = true
     },
 
+    ldddw(arrayData,key,value,display){
+      return dddw(arrayData,key,value,display)
+    },
+
+    //查询
+    query(){      
+      getapi("/api/app/patient-register/in-filter").then(
+        (res) => {
+          this.dataList = res.data.items;
+        }
+      );      
+    },
+
     
   },
+
+  //监听事件
+  watch: {
+    //触发查询事件
+    'patientRegister.query.times'(newVal, oldVal) {
+      if (newVal != oldVal) {
+        alert('触发查询事件')
+        this.query()
+      }
+    },
+    'patientRegister.patientRegisterRd.id'(newVal, oldVal) {
+      if (newVal != oldVal) {
+        //console.log('patientRegister.patientRegisterRd.customerOrgId',this.patientRegister.patientRegisterRd.customerOrgId)
+        objCopy(this.patientRegister.patientRegisterRd, this.form)
+      }
+    },
+  },
+
 };
 </script>
 <style scoped>

src/components/patientRegister/patientRegisterQuery.vue

@@ -112,8 +112,8 @@ export default {
 
     //查询
     btnQuery() {
-      alert("查询")
-      console.log('this.patientRegister.query.dateRange',this.patientRegister.query.dateRange)
+      this.patientRegister.query.times++
+      console.log('this.patientRegister.query',this.patientRegister.query)
     },
     
     //读身份证

src/store/index.js

@@ -38,16 +38,22 @@ export default new Vuex.Store({
 
     //公共字典数据 add by pengjun
     dict:{
+      personOrgId:'00000000-0000-0000-0000-000000000000',  //个人体检单位ID
       organization:[],  //体检中心
       sex:[],         //性别
       medicalType:[], //体检类别
+      personnelType:[], //人员类别
       maritalStatus:[],//婚姻状况
       sexHormoneTerm:[],//性激素期
+      nation:[], //民族
+      birthPlace:[], //籍惯 ，出生地
       completeFlag:[ //体检完成标志
         {id:'0',displayName:'预登记'},{id:'1',displayName:'正式登记'},{id:'2',displayName:'部份已检'},{id:'3',displayName:'已总检'},
       ],
-      medicalPackage:[], //套餐
+      medicalPackage:[], //所有套餐
+      customerOrgGroupAll:[], //所有分组，不限单位，不限次数
     },
+
     
   },
   getters: {},

src/utlis/proFunc.js

@@ -23,13 +23,13 @@ exports.objCopy = (from,to) => {
 exports.dddw = (arrayData,key,value,display) => {
   //console.log(arrayData,key,value,display)
   let ret = value
-
-  for(let i=0;i<arrayData.length;i++){    
-    if(arrayData[i][key] == value){
-      ret = arrayData[i][display]
-      break
+  if(arrayData){
+    for(let i=0;i<arrayData.length;i++){    
+      if(arrayData[i][key] == value){
+        ret = arrayData[i][display]
+        break
+      }
     }
-  }
-  
+  }  
   return ret
 }

src/views/customerOrg/patientRegister.vue

@@ -100,12 +100,34 @@ export default {
         }
       );
       
+      //民族
+      getapi("/api/app/nation/in-filter").then(
+        (res) => {
+          this.dict.nation = res.data.items;
+        }
+      );
+
+      //籍惯 ，出生地
+      getapi("/api/app/birth-place/in-filter").then(
+        (res) => {
+          this.dict.birthPlace = res.data.items;
+        }
+      );
+      
       //套餐 
       getapi("/api/app/medical-package/in-filter").then(
         (res) => {
           this.dict.medicalPackage = res.data.items;
         }
       );
+      
+      //分组，所有分组，不限单位，不限次数 
+      getapi("/api/app/customer-org-group").then(
+        (res) => {
+          this.dict.customerOrgGroupAll = res.data.items;
+        }
+      );
+      
 
       console.log('dict',this.dict)
     }