有无类型数据处理

src/common/RadioSelect.vue

@@ -46,7 +46,7 @@ import OptionInp from '../common/OptionInp.vue';
             data[i].controlType = 8;
           }
         }
-        let temp = concatVal(data);
+        let temp = concatVal(data,true);
         const newData = Object.assign({},this.datas,{questionDetailList:data,value:temp.value,valueP:temp.valueP})
         this.$emit("updata",newData);
       },

src/components/Department.vue

@@ -12,16 +12,6 @@
                         <p>挂号信息：{{item.registerNum}}</p>
                     </div>
                 </div>
-                <div class="list">
-                    <div class="top">
-                        <p>挂号科室：急诊科 <img src="../images/right.png" alt=""></p>
-                    </div>
-                    <div class="main">
-                        <p>预约时间：2019-8-18 14:00</p>
-                        <p>病历号：1234567</p>
-                        <p>挂号信息：1234567</p>
-                    </div>
-                </div>
             </div>
         </div>
     </div>
@@ -60,7 +50,7 @@
                     patientCode:msg.patientCode,
                     recordId:msg.recordId
                 }
-                this.$router.replace({
+                this.$router.push({
                     path:'/',
                     query:params
                 })

src/components/Login.vue

@@ -106,7 +106,7 @@
                           this.defaultWaring('请输入正确的身份证号')
                           return
                       }
-                  }else if(type == 104){//病历号
+                  }else if(type == 104){//病历号只能输入数字字母
                       if(!jgpattern.test(value)){//验证不通过
                           this.defaultWaring('请输入正确的市民卡号')
                           return
@@ -120,7 +120,7 @@
                       const result = res.data;
                       if (result.code == 0) {
                           if(result.data.length>1){
-                              this.$router.replace({
+                              this.$router.push({
                                   name:'Department',
                                   params:{"result":result.data}
                               })
@@ -133,7 +133,7 @@
                                 patientCode:msg.patientCode,
                                 recordId:msg.recordId
                             }
-                            this.$router.replace({
+                            this.$router.push({
                                 path:'/',
                                 query:params
                             })

src/components/PathInfo.vue

@@ -121,6 +121,7 @@
           'patientCode':!hasQuery&&query.patientCode||'',
           'recordId':!hasQuery&&query.recordId||''
         }
+        localStorage.setItem('infoParam',JSON.stringify(params))
         api.getPathInfo(params).then((res)=>{
           const result = res.data;
           if(result.code==0){

src/utils/tools.js

@@ -112,7 +112,7 @@ const phoneTest = /^[1]([3-9])[0-9]{9}$/;
 //身份证验证
 const identify =/(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}$)/;
 //只能是数字和字母
-const jgpattern =/^[A-Za-z0-9]+$/; 
+const jgpattern =/^[A-Za-z0-9]+$/;
 
 const getAllStr = (allData) =>{//获取界面数据，拼接字符串
   // console.log(allData,777777)
@@ -253,24 +253,28 @@ function trimDots(str){
 }
 
 // 拼值，并去掉占位符
-function concatVal(data){
+function concatVal(data,flg){
   console.log(data,111)
   let value = ""; //医生
   let valueP = ""; //患者
-  for(let k in data){
-    if(data[k].select){
-      if(data[k].value){
-        let str = data[k].name.replace(patt,data[k].value);
-        let strP = (data[k].description || data[k].name).replace(patt,data[k].value);
-        value += str + '，';
-        valueP += strP + '，';
-      }else{
-        if(data[k].controlType==8){
-          let tmpStr = data[k].select==1?'有':'无';
-          let tmpStrHas = '';
-          let tmpStrNo = '';
-          value += tmpStr+data[k].name.replace(patt,'') + '，';
-          valueP += tmpStr+(data[k].description || data[k].name).replace(patt,'') + '，';
+  let tmpStrHas = [],tmpStrNo = [],tmpAll=[];
+  if(flg){
+    tmpStrHas = data.filter((item)=>item.select == 1)
+    tmpStrNo = data.filter((item)=>item.select == 2)
+    tmpAll = tmpStrHas.concat(tmpStrNo)
+    for(let k in tmpAll){
+      let tmpStr = tmpAll[k].select==1?'有':'无';
+      value += tmpStr+tmpAll[k].name.replace(patt,'') + '，';
+      valueP += tmpStr+(tmpAll[k].description || tmpAll[k].name).replace(patt,'') + '，';
+    }
+  }else{
+    for(let k in data){
+      if(data[k].select){
+        if(data[k].value){
+          let str = data[k].name.replace(patt,data[k].value);
+          let strP = (data[k].description || data[k].name).replace(patt,data[k].value);
+          value += str + '，';
+          valueP += strP + '，';
         }else{
           value += data[k].name.replace(patt,'') + '，';
           valueP += (data[k].description || data[k].name).replace(patt,'') + '，';