JSK

src/api/healthCenter/index.js

@@ -157,6 +157,17 @@ export function delHealthInfoApi(data) {
         data: data
     })
 }
+
+export function getHealthReportPageApi(data) {
+  return request({
+    url: '/smart-canteen/health_person_medical_report/list',
+    method: 'get',
+    headers: {
+        //"merchant-id":"378915229716713472",
+    },
+    params:data
+  })
+}
 // 模板-列表
 export function getModelListApi() {
   return request({

src/views/canteen/healthCenter/examinationReport/index.vue

@@ -42,8 +42,6 @@
             </el-table-column>
             <el-table-column label="住院日期" align="center" prop="inpatientDate" :show-overflow-tooltip="true">
             </el-table-column>
-            <el-table-column label="慢性病" align="center" prop="chronicNames" :show-overflow-tooltip="true">
-            </el-table-column>
             <el-table-column label="劳动强度" align="center" prop="labourIntensity" :show-overflow-tooltip="true">
               <template slot-scope="scope">
                   <span v-if="scope.row.labourIntensity==1">轻劳动</span>
@@ -302,7 +300,7 @@
 
 <script>
   import { deptTreeSelect } from '@/api/system/user'
-  import { dictHealthChronicApi,addHealthScienceApi,editHealthScienceApi,delHealthScienceApi,getHealthInfoPageApi
+  import { dictHealthChronicApi,addHealthScienceApi,editHealthScienceApi,delHealthScienceApi,getHealthInfoPageApi,getHealthReportPageApi
     ,getModelListApi,getHealthInfoDetailApi,getModelByIdApi,addReportApi,getReportApi,delReportListApi,getReportByIdApi  } from "@/api/healthCenter/index";
   import { imgUpLoadTwo } from '@/api/system/upload'
   import { decryptWithSM4,encryptWithSM4 } from '@/utils/sm';
@@ -351,6 +349,7 @@ export default {
             dateRange:[new Date(),new Date()],
             chronicOptions:[],
             personData:{
+              'nickName':''
             },
             reportDatas:[
               {"medicalProjectName":"身体","medicalProjectDetailNames":[
@@ -470,7 +469,7 @@ export default {
             // }else{
             //     this.queryParams.chronicIds = ""
             // }
-            getHealthInfoPageApi(param).then(response => {
+            getHealthReportPageApi(param).then(response => {
                 this.tableListData = response.rows;
                 this.tableListData.forEach(item=>{
                   if(item.mobile&&item.mobile!=""){
@@ -542,6 +541,7 @@ export default {
             this.title = "新增";
         },
         handleReport(row) {
+          console.log("体检报告",)
             this.form = Object.assign({}, row);
             this.selectUser=this.form.userId;
             this.openAddReport = true;
@@ -552,7 +552,9 @@ export default {
                 this.loading = false;
             });
             getHealthInfoDetailApi(this.form).then(response => {
+              if(response.data){
               this.personData=response.data;
+
                 console.log("this.personData",this.personData)
                 if(this.personData.bloodType==1){
                   this.personData.bloodType="A型";
@@ -606,6 +608,8 @@ export default {
                 }else if(this.personData.labourIntensity==3){
                   this.personData.labourIntensity="重强度劳动";
                 }
+              }
+
             });
         },
         getReportList(){