7月8日检验检查

src/pages/doctorAdvice/components/new_Inspectiondetails.vue

@@ -37,14 +37,27 @@
           {{ getTime(scope.row.inspect_date) }}
          </template>
         </el-table-column>
-        <el-table-column v-for="(item,index) in columns" :key="index"
+        <el-table-column
+          v-for="(item,index) in columns" :key="index"
+          :prop="item.prop"
+          :label="item.label" 
+          width="150">
+         <!-- <template slot-scope="scope" >
+          {{ scope.row.prop }}
+         </template> -->
+        </el-table-column>
+        <!-- <el-table-column v-for="(item,index) in columns" :key="index"
           :prop="item.prop"
           :label="item.label"
           width="">
           <template slot-scope="scope">
-            {{ getname(scope.row,item.prop) }}
+            <div >
+              {{ getname(scope.row.prop) }}
+              {{ scope.row.prop }}
+            </div>
+            
           </template>
-        </el-table-column>
+        </el-table-column> -->
 
       </el-table>
     </div>
@@ -128,6 +141,7 @@ export default {
       blood_id:0,
       route_date:0,
       patient_name:'',
+      datable:[]
     }
   },
   mounted(){
@@ -172,55 +186,60 @@ export default {
        
         const list = response.data.data.inspection
         console.log('response11111',list);
+
         // this.tableData = list
         var columns = []
         const date = []
         var date1 =[]
         let table = [{inspect_date:''}]
         const datable =[]
-        // columns = Object.keys(list[0]).map((item,key) =>({
-        //   prop:item[8],
-        //   label:item[6],
-        // }))
-        // console.log('Object.keys(response.data.data.list[0])',columns);
-        list.forEach((item,index) => {
-          const obj1={
-            prop:'inspect_value'+(index+1),
-            label:item.item_name
+        // const arr ={}
+        const child = list[0].Child
+        for(let i=0;i<child.length;i++){
+          const obj ={
+            label:child[i].item_name,
+            // prop:child[i].item_name
+            prop:'value'+(i+1)
           }
-          date.push(item.inspect_date)
-           date1=[...new Set(date)]
-          
-          columns.push(obj1)
-          // for(let i in columns){
-          //   if(columns[i].label == item.item_name){
-          //     table[0][columns[i].prop]=item.inspect_value
-          //   }
-          // }
-          // table.push(obj2)
-        });
-          for(let i in date1){
+          columns.push(obj)
+        }
+        console.log('list[0].Child121',columns);
+        
+        list.forEach(item =>{
+          const datable1 ={
+            inspect_date:item.inspect_date,
+          }
+          datable.push(datable1)
+
+          item.Child.forEach((item1,index1) =>{
             const arr={
-              inspect_date:date1[i]
+              inspect_date:item.inspect_date,
+              name:item1.item_name,
+              id:item1.id,
+              value:item1.inspect_value
             }
-            datable.push(arr)
-          }
-          list.forEach(item =>{
-            for(let i in columns){
-              for(let j in datable){
-                if(columns[i].label == item.item_name && datable[j].inspect_date == item.inspect_date){
-                  datable[j][columns[i].prop]=item.inspect_value
+            for(let i in datable){
+              for(let j in columns){
+                if(item1.inspect_date == datable[i].inspect_date && columns[j].label == item1.item_name){
+                  if(item1.inspect_value !=''){
+                    datable[i][columns[j].prop] = item1.inspect_value
+                  }else{
+                    datable[i][columns[j].prop] = 0
+                  }
+                  
                 }
               }
             }
           })
-          table =datable
-        console.log('bbbbb',datable);
-        console.log('ppppp',table);
+          // datable.push(arr)
+        })
         table =datable
+        this.datable = datable
+        console.log('ppppp',columns);
+        
         this.tableData = table
-        this.columns = columns      
-        // console.log('Object.keys(response.data.data.list[0])',this.columns,this.tableData);
+        this.columns = columns    
+        console.log('11111',this.tableData);  
       })
       
     },