Browse Source

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

See999 4 years ago
parent
commit
d368dca0b4

+ 8 - 7
src/xt_pages/dialysis/details/index.vue View File

1043
           this.lastDialysisPrescribe = lastDialysisPrescribe
1043
           this.lastDialysisPrescribe = lastDialysisPrescribe
1044
           this.lastDryWeightDislysis = lastDryWeightDislysis
1044
           this.lastDryWeightDislysis = lastDryWeightDislysis
1045
           this.headNurses = headNurses
1045
           this.headNurses = headNurses
1046
-          this.system_prescribe = system_prescribe 
1047
-          
1046
+          this.system_prescribe = system_prescribe
1047
+
1048
 
1048
 
1049
 
1049
 
1050
           this.niprocart_info = []
1050
           this.niprocart_info = []
1315
         query: {
1315
         query: {
1316
           patient_id: patient_id,
1316
           patient_id: patient_id,
1317
           date: date,
1317
           date: date,
1318
-          patient_name: schedual.patient.name
1318
+          patient_name: schedual.patient.name,
1319
+          mode_id:schedual.mode_id
1319
         }
1320
         }
1320
       })
1321
       })
1321
     },
1322
     },
1654
     websocketSend(data) {
1655
     websocketSend(data) {
1655
       try {
1656
       try {
1656
         this.websocket.send(JSON.stringify(data))
1657
         this.websocket.send(JSON.stringify(data))
1657
-          
1658
+
1658
       } catch (error) {
1659
       } catch (error) {
1659
         this.showError = true;
1660
         this.showError = true;
1660
         this.showIndex = 4;
1661
         this.showIndex = 4;
1740
             arr.push(item.patient_id)
1741
             arr.push(item.patient_id)
1741
           })
1742
           })
1742
           if(arr.indexOf(parseInt(res.data.data.patientInfo.patient_id)) > -1){
1743
           if(arr.indexOf(parseInt(res.data.data.patientInfo.patient_id)) > -1){
1743
-            
1744
+
1744
             this.showView = false
1745
             this.showView = false
1745
             this.$router.push({
1746
             this.$router.push({
1746
               path: '/dialysis/details',
1747
               path: '/dialysis/details',
1753
                 showView:false
1754
                 showView:false
1754
               }
1755
               }
1755
             })
1756
             })
1756
-            
1757
+
1757
           }else {
1758
           }else {
1758
-            
1759
+
1759
             this.showView = true
1760
             this.showView = true
1760
             this.$router.push({
1761
             this.$router.push({
1761
               path: '/dialysis/details',
1762
               path: '/dialysis/details',

+ 4 - 0
src/xt_pages/stock/selfPreparedMedicine/components/addMedicine.vue View File

176
              this.$message.error("请添加药品规格")
176
              this.$message.error("请添加药品规格")
177
              return
177
              return
178
           }
178
           }
179
+        
179
           const params = {
180
           const params = {
180
              patient_id:this.patient_id,
181
              patient_id:this.patient_id,
181
              medicineData:this.multipleSelection
182
              medicineData:this.multipleSelection
186
                 this.$message.success("保存成功")
187
                 this.$message.success("保存成功")
187
                 this.visible = false
188
                 this.visible = false
188
                 this.$emit('getlist');
189
                 this.$emit('getlist');
190
+                for(let i=0;i<this.multipleSelection.length;i++){
191
+                   this.multipleSelection[i].isSelected = false
192
+                }
189
              }else {
193
              }else {
190
                 this.$message.error("药品名称规格已存在")
194
                 this.$message.error("药品名称规格已存在")
191
              }
195
              }