Selaa lähdekoodia

Merge branch 'showNumConf' into test

zhangxc 5 vuotta sitten
vanhempi
commit
9aa005c005
1 muutettua tiedostoa jossa 3 lisäystä ja 3 poistoa
  1. 3 3
      src/js/util.js

+ 3 - 3
src/js/util.js

@@ -22,14 +22,14 @@ const transConf = function(arr) {
     //     {hospitalCode: "A001", sysType: 16, name: "警惕诊断", code: "vigilant_no", value: 3}
     //     {hospitalCode: "A001", sysType: 16, name: "警惕诊断", code: "vigilant_no", value: 3}
     // ]
     // ]
     const reg = /_show$/g;
     const reg = /_show$/g;
-    let newArr = arr.filter(item => item.code.match(reg) && item.value === 1 )
+    let newArr = arr.filter(item => item.code.match(reg) && +item.value === 1 )
     for(let i = 0; i < newArr.length; i++) {
     for(let i = 0; i < newArr.length; i++) {
         for (let j = 0; j < arr.length; j++) {
         for (let j = 0; j < arr.length; j++) {
             if(arr[j].code.match(/_no$/g) && arr[j].code.replace('_no', ' ') === newArr[i].code.replace('_show', ' ')) {
             if(arr[j].code.match(/_no$/g) && arr[j].code.replace('_no', ' ') === newArr[i].code.replace('_show', ' ')) {
-                newArr[i].orderNo = arr[j].value
+                newArr[i].orderNo = +arr[j].value
             }
             }
             if(arr[j].code.match(/_num$/g) && arr[j].code.replace('_num', ' ') === newArr[i].code.replace('_show', ' ')) {
             if(arr[j].code.match(/_num$/g) && arr[j].code.replace('_num', ' ') === newArr[i].code.replace('_show', ' ')) {
-                newArr[i].showNum = arr[j].value
+                newArr[i].showNum = +arr[j].value
             }
             }
         }
         }
     }
     }