Browse Source

11月20日,打印单

yq1 1 month ago
parent
commit
082e997678
1 changed files with 10 additions and 6 deletions
  1. 10 6
      src/pages/main/template/DialysisPrintOrderSixtyeight.vue

+ 10 - 6
src/pages/main/template/DialysisPrintOrderSixtyeight.vue View File

@@ -849,7 +849,7 @@
849 849
                                         it.execution_frequency
850 850
                                       }}</span>
851 851
                                       <!-- {{ it.remark }} -->
852
-                                     <span v-if="it.remark!=''">{{ it.remark }}</span>
852
+                                     <span v-if="it.remark!=''">({{ it.remark }})</span>
853 853
                               </div> 
854 854
                             </div>
855 855
                           </div>
@@ -1966,15 +1966,19 @@ export default {
1966 1966
             let newArr = Object.values(dataInfo)
1967 1967
 
1968 1968
             if(newArr!=null && newArr.length >0){
1969
-            for(let i=0;i<newArr.length;i++){
1970
-              for(let j=0;j<this.doctor_advices.length;j++){
1971
-                if(newArr[i].groupPrescriptionId == this.doctor_advices[j].groupPrescriptionId){
1972
-                    newArr[i].prescriptionChild.push(this.doctor_advices[j])
1969
+              for(let i=0;i<newArr.length;i++){
1970
+                for(let j=0;j<this.doctor_advices.length;j++){
1971
+                  if(newArr[i].groupPrescriptionId == this.doctor_advices[j].groupPrescriptionId){
1972
+                      newArr[i].prescriptionChild.push(this.doctor_advices[j])
1973
+                  }
1973 1974
                 }
1974 1975
               }
1975 1976
             }
1977
+            for(let i in newArr){
1978
+              if(newArr[i].parent_id == undefined){
1979
+                newArr.splice(i,1)
1980
+              }
1976 1981
             }
1977
-            
1978 1982
             this.doctor_advices = []
1979 1983
             this.doctor_advices = newArr
1980 1984
             console.log("newArr",this.doctor_advices)