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

src/xt_pages/dialysis/details/index.vue

@@ -1043,8 +1043,8 @@ export default {
           this.lastDialysisPrescribe = lastDialysisPrescribe
           this.lastDryWeightDislysis = lastDryWeightDislysis
           this.headNurses = headNurses
-          this.system_prescribe = system_prescribe 
-          
+          this.system_prescribe = system_prescribe
+
 
 
           this.niprocart_info = []
@@ -1315,7 +1315,8 @@ export default {
         query: {
           patient_id: patient_id,
           date: date,
-          patient_name: schedual.patient.name
+          patient_name: schedual.patient.name,
+          mode_id:schedual.mode_id
         }
       })
     },
@@ -1654,7 +1655,7 @@ export default {
     websocketSend(data) {
       try {
         this.websocket.send(JSON.stringify(data))
-          
+
       } catch (error) {
         this.showError = true;
         this.showIndex = 4;
@@ -1740,7 +1741,7 @@ export default {
             arr.push(item.patient_id)
           })
           if(arr.indexOf(parseInt(res.data.data.patientInfo.patient_id)) > -1){
-            
+
             this.showView = false
             this.$router.push({
               path: '/dialysis/details',
@@ -1753,9 +1754,9 @@ export default {
                 showView:false
               }
             })
-            
+
           }else {
-            
+
             this.showView = true
             this.$router.push({
               path: '/dialysis/details',

src/xt_pages/stock/selfPreparedMedicine/components/addMedicine.vue

@@ -176,6 +176,7 @@ export default {
              this.$message.error("请添加药品规格")
              return
           }
+        
           const params = {
              patient_id:this.patient_id,
              medicineData:this.multipleSelection
@@ -186,6 +187,9 @@ export default {
                 this.$message.success("保存成功")
                 this.visible = false
                 this.$emit('getlist');
+                for(let i=0;i<this.multipleSelection.length;i++){
+                   this.multipleSelection[i].isSelected = false
+                }
              }else {
                 this.$message.error("药品名称规格已存在")
              }