Merge branch '20230223_pad_vue_new_branch' of http://git.shengws.com/csx/Pad_New into 20230223_pad_vue_new_branch

src/pages/doctorAdvice/components/new_Inspectiondetails.vue

@@ -39,26 +39,25 @@
         </el-table-column>
         <el-table-column
           v-for="(item,index) in columns" :key="index"
-          :prop="item.prop"
+          :prop="item.item_id"
           :label="item.item_name"
           width="150">
          <template slot-scope="scope" >
-           
           <span v-if="item.range_type == 3">
-            {{ getItemValueOne(scope.row.inspect_date,item.item_name) }} 
+            {{ getItemValueOne(scope.row.inspect_date,item.item_name) }}
           </span>
 
           <span v-if="item.range_type == 2">
             <span v-if="getItemValue(scope.row.inspect_date,item.item_name)=='阳性'" style="color: red"> {{ getItemValue(scope.row.inspect_date,item.item_name) }}</span>
-            <span v-if="getItemValue(scope.row.inspect_date,item.item_name)=='阴性'"> {{ getItemValue(scope.row.inspect_date,item.item_name) }}</span>
+            <span v-else> {{ getItemValue(scope.row.inspect_date,item.item_name) }}</span>
           </span>
 
           <span v-if="item.range_type == 1">
              <span v-if="parseFloat(getItemValue(scope.row.inspect_date,item.item_name)) < parseFloat(item.range_min) ">
               {{ getItemValue(scope.row.inspect_date,item.item_name) }} <span style="color: blue;" v-if="getItemValue(scope.row.inspect_date,item.item_name)>0">↓</span>
              </span>
-             <span v-if="parseFloat(item.range_min)<= parseFloat( getItemValue(scope.row.inspect_date,item.item_name)) && parseFloat(getItemValue(scope.row.inspect_date,item.item_name))  <= parseFloat(item.range_max) ">
-               {{ getItemValue(scope.row.inspect_date,item.item_name) }} 
+             <span v-if="parseFloat(item.range_min)<= parseFloat( getItemValue(scope.row.inspect_date,item.item_name)) && parseFloat(getItemValue(scope.row.inspect_date,item.item_name))<= parseFloat(item.range_max) ">
+               {{ getItemValue(scope.row.inspect_date,item.item_name) }}
              </span>
              <span v-if="parseFloat(item.range_min) =='' || parseFloat(item.range_max) == '' ">
                {{ getItemValue(scope.row.inspect_date,item.item_name) }} 
@@ -68,7 +67,7 @@
              </span>
 
           </span>
-         
+
          </template>
         </el-table-column>
         <!-- <el-table-column v-for="(item,index) in columns" :key="index"
@@ -211,7 +210,7 @@ export default {
 
         const list = response.data.data.inspection
         const tablehed = response.data.data.referenceList
-        console.log('response11111',tablehed);
+        console.log('response11111',response.data.data);
 
         this.tableData = list
         var columns = []
@@ -232,8 +231,9 @@ export default {
 
         this.columns = tablehed
 
-        // console.log('list[0].Child121',columns);
-
+        console.log('list[0].Child121',this.columns);
+        console.log('this.tableData',this.tableData);
+        
         // list.forEach(item =>{
         //   const datable1 ={
         //     inspect_date:item.inspect_date,
@@ -246,7 +246,7 @@ export default {
         //         if(item1.inspect_date == datable[i].inspect_date && columns[j].label == item1.item_name){
         //             console.log("item1---------------",item1)
         //             if(item1.inspect_type == 2){
-        //               datable[i][columns[j].prop] = item1.inspect_value 
+        //               datable[i][columns[j].prop] = item1.inspect_value
         //             }
         //             datable[i][columns[j].prop] = item1.inspect_value
         //         }
@@ -273,7 +273,7 @@ export default {
       }
     },
     getItemValue(inspect_date,item_name){
-   
+
       var inspect_value = ""
       for(let i=0;i<this.tableData.length;i++){
         for(let j=0;j<this.tableData[i].Child.length;j++){
@@ -281,7 +281,6 @@ export default {
             inspect_value = this.tableData[i].Child[j].inspect_value
           }
         }
-        
       }
       return inspect_value
     },
@@ -293,7 +292,7 @@ export default {
             inspect_value = this.tableData[i].Child[j].inspect_value
           }
         }
-        
+
       }
       return inspect_value
     },