Sfoglia il codice sorgente

Merge remote-tracking branch 'origin/20230223_pad_vue_new_branch' into 20230223_pad_vue_new_branch

yq1 3 mesi fa
parent
commit
48522740a2

+ 1 - 1
build/cdn.json Vedi File

@@ -1,3 +1,3 @@
1 1
 {
2
-  "version": "2999.999.13737"
2
+  "version": "2999.999.13738"
3 3
 }

+ 4 - 2
src/pages/doctorAdvice/components/new_Inspectiondetails.vue Vedi File

@@ -56,10 +56,12 @@
56 56
              <span v-if="parseFloat(getItemValue(scope.row.inspect_date,item.item_name)) < parseFloat(item.range_min) ">
57 57
               {{ getItemValue(scope.row.inspect_date,item.item_name) }} <span style="color: blue;" v-if="getItemValue(scope.row.inspect_date,item.item_name)>0">↓</span>
58 58
              </span>
59
-
60 59
              <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) ">
61 60
                {{ getItemValue(scope.row.inspect_date,item.item_name) }}
62 61
              </span>
62
+             <span v-if="parseFloat(item.range_min) =='' || parseFloat(item.range_max) == '' ">
63
+               {{ getItemValue(scope.row.inspect_date,item.item_name) }}
64
+             </span>
63 65
              <span v-if="parseFloat(getItemValue(scope.row.inspect_date,item.item_name)) >parseFloat(item.range_max) ">
64 66
               {{ getItemValue(scope.row.inspect_date,item.item_name) }} <span style="color: red;" v-if="getItemValue(scope.row.inspect_date,item.item_name)>0">↑</span>
65 67
              </span>
@@ -233,7 +235,7 @@ export default {
233 235
 
234 236
         console.log('list[0].Child121',this.columns);
235 237
         console.log('this.tableData',this.tableData);
236
-        
238
+
237 239
         // list.forEach(item =>{
238 240
         //   const datable1 ={
239 241
         //     inspect_date:item.inspect_date,