Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -139,7 +139,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          
+
 
          <el-col :span="8" v-if="isShows('抗凝剂商品名称')">
             <el-form-item label="抗凝剂商品名称：">
@@ -350,7 +350,7 @@
             </el-form-item>
           </el-col>
 
-      
+
 
           <el-col :span="8" v-if="isShows('透析器/灌流器')">
             <el-form-item label="透析器/灌流器">
@@ -1307,27 +1307,27 @@
         this.InnerDialogProps.visibility = true
         switch (val) {
           case '5': // 透析器/灌流器
-             var arr = this.dialysisPrescription.dialyzer_perfusion_apparatus
-             var newArr =  arr.split(",")
-            console.log("透析器/灌流器",newArr)
-            var Arr = []
-            for(let i=0;i<newArr.length;i++){
-              for(let j=0;j<this.dialyzerPerfusionApparatus.length;j++){
-                 var newarr = newArr[i].toUpperCase()
-
-                 var dialy = this.dialyzerPerfusionApparatus[j].name.toUpperCase()
-
-                 if(newarr == dialy){
-                    Arr.push(this.dialyzerPerfusionApparatus[j].name)
-                 }
-              }
-            }
-            var arrtwo = Arr.join(",")
-            console.log("Arr",arrtwo)
+            //  var arr = this.dialysisPrescription.dialyzer_perfusion_apparatus
+            //  var newArr =  arr.split(",")
+            // console.log("透析器/灌流器",newArr)
+            // var Arr = []
+            // for(let i=0;i<newArr.length;i++){
+            //   for(let j=0;j<this.dialyzerPerfusionApparatus.length;j++){
+            //      var newarr = newArr[i].toUpperCase()
+            //
+            //      var dialy = this.dialyzerPerfusionApparatus[j].name.toUpperCase()
+            //
+            //      if(newarr == dialy){
+            //         Arr.push(this.dialyzerPerfusionApparatus[j].name)
+            //      }
+            //   }
+            // }
+            // var arrtwo = Arr.join(",")
+            // console.log("Arr",arrtwo)
             this.InnerDialogProps.values = this.dialyzerPerfusionApparatus
             this.InnerDialogProps.titles = '透析器/灌流器'
             this.InnerDialogProps.type = 'dialyzer_perfusion_apparatus'
-            this.InnerDialogProps.selected = arrtwo
+            this.InnerDialogProps.selected = this.dialysisPrescription.dialyzer_perfusion_apparatus
             this.InnerDialogProps.isShowTextArea = false
             break
 
@@ -1337,10 +1337,10 @@
             this.InnerDialogProps.titles = '抽血'
             this.InnerDialogProps.type = 'blood'
             this.InnerDialogProps.selected = this.dialysisPrescription.blood
-            this.InnerDialogProps.isShowTextArea = false    
-          
+            this.InnerDialogProps.isShowTextArea = false
+
            case '7': // 透析器
-          
+
         }
       },
       innerDialogComfirm: function(val) {
@@ -1919,7 +1919,7 @@
         this.isVisibility = false
       },
       changeThisAnticoagulant: function(val) {
-        
+
         var thismode = val
         if (isNaN(thismode) || thismode <= 0) {
           return false
@@ -3197,9 +3197,9 @@
         const res = new Map();
         return arr.filter((arr) => !res.has(arr.name) && res.set(arr.name, 1));
       },
-     
+
     },
-  
+
     watch: {
       'dialysisPrescription.dialysis_duration_hour': function() {
         let dialysis_duration_minute = 0
@@ -3254,7 +3254,7 @@
           this.dialysisPrescription.anticoagulant_zongliang = ''
         }
 
-       
+
       },
       'dialysisPrescription.anticoagulant_shouji': function() {
         let dialysis_duration_minute = 0
@@ -3286,7 +3286,7 @@
           this.dialysisPrescription.anticoagulant_zongliang = ''
         }
 
-        
+
       },
       'dialysisPrescription.anticoagulant_weichi': function() {
         let dialysis_duration_minute = 0
@@ -3313,7 +3313,7 @@
           this.dialysisPrescription.anticoagulant_zongliang = ''
         }
 
-      
+
       },
       'prescription.id': {
         immediate: true,

src/xt_pages/qcd/officesControlAnalysis/project.vue

@@ -598,6 +598,11 @@ export default {
         const  decStart = moment().month(11).startOf('month').format("YYYY-MM-DD")
         const decEnd = moment().month(11).endOf('month').format("YYYY-MM-DD")
 
+        for(let i=0;i<this.normdata.length;i++){
+          if(this.normdata[i].inspection_minor == this.mode_type){
+            this.range_type = this.normdata[i].range_type
+          }
+        }
 
         const params = {
           lapseto:this.lapseto,