新功能开发

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.1.335"
+  "version": "1.1.351"
 }

src/pages/main/dialog/AcceptsDialog.vue

@@ -300,6 +300,8 @@ export default {
             this.receiveTreatmentAsses.precaution_other = this.accepts.precaution_other;
           }
         }
+      }).catch(error => {
+        Toast.fail("请求失败")
       });
     } else {
       if (
@@ -432,6 +434,8 @@ export default {
           }
           this.finish();
         }
+      }).catch(error => {
+        Toast.fail("请求失败")
       });
     },
     finish: function() {

src/pages/main/dialog/AssessmentDialog.vue

@@ -640,7 +640,7 @@ export default {
           this.body_weight_before = weight
         } else {
           this.body_weight_before = ''
-        }       
+        }
       },
       deep: true,
       immediate: true
@@ -655,7 +655,7 @@ export default {
           } else {
             this.body_weight_before = ''
           }
-        }       
+        }
       },
       deep: true,
       immediate: true
@@ -1475,7 +1475,9 @@ export default {
           Toast('提交完成')
           this.$emit('evaluation', response.data.data.evaluation)
         }
-      })
+      }).catch(error => {
+        Toast.fail("请求失败")
+      });
     },
     showDryWeight: function () {
       if (this.$store.getters.user.user.user_type == 3) {

src/pages/main/dialog/ComputerDialog.vue

@@ -360,7 +360,9 @@
               this.$set(record, key, response.data.data.dialysis_order[key])
             }
           }
-        })
+        }).catch(error => {
+          Toast.fail("请求失败")
+        });
       },
       didSelectStartTime: function (time) {
         this.start_time_str = parseTime(time, '{y}-{m}-{d} {h}:{i}') + ':00'
@@ -409,7 +411,9 @@
               // this.record[key] = response.data.data.dialysis_order[key]
             }
           }
-        })
+        }).catch(error => {
+          Toast.fail("请求失败")
+        });
       },
       close: function () {
         this.$emit('close')

src/pages/main/dialog/DoubleDialog.vue

@@ -299,6 +299,8 @@ export default {
           }
           this.$emit("did_update", response.data.data.doubleCheck);
         }
+      }).catch(error => {
+        Toast.fail("请求失败")
       });
     },
     close: function() {

src/pages/main/dialog/MonitDialog.vue

@@ -1040,6 +1040,8 @@ export default {
           this.loading = false
           Toast.fail(resp.msg)
         }
+      }).catch(error => {
+        Toast.fail("请求失败")
       })
     },
     submitAction: function () {

src/pages/main/dialog/PlaneDialog.vue

@@ -234,6 +234,8 @@ export default {
             this.$set(record, key, response.data.data.dialysis_order[key]);
           }
         }
+      }).catch(err => {
+        Toast.fail(err)
       });
     },
     didSelectStartTime: function(time) {
@@ -285,6 +287,8 @@ export default {
           }
           // console.log(this.record)
         }
+      }).catch(err => {
+        Toast.fail(err)
       });
     },
     close: function() {

src/pages/main/dialog/PrescriptionDialog.vue

@@ -562,6 +562,9 @@
           return new Array()
         }
       },
+      system_prescription:{
+        type: Object
+      },
       predialysis: {
         type: Object
       },
@@ -1074,7 +1077,10 @@
 
                 this.finish()
               }
-            })
+            }).catch(error => {
+              Toast.fail("请求失败")
+
+            });
 
           } else if (this.is_pre == 2) {
             Toast.loading({forbidClick: true, duration: 0})
@@ -1130,7 +1136,9 @@
                 })
                 this.finish()
               }
-            })
+            }).catch(error => {
+              Toast.fail("请求失败")
+            });
           }
         } else {
           if (this.is_pre == 1) {
@@ -1165,7 +1173,9 @@
                 this.$emit('prescription', response.data.data.prescription, this.doctorAdvices)
                 this.finish()
               }
-            })
+            }).catch(error => {
+              Toast.fail("请求失败")
+            });
           }
 
         }
@@ -1205,6 +1215,14 @@
                         this.dialysisPrescription[key] = response.data.data.prescription[key]
                       }
                     }
+                  } else if(response.data.data.system_prescription != null){
+
+                    for (const key in response.data.data.system_prescription) {
+                      if (key != 'target_ultrafiltration') {
+                        this.dialysisPrescription[key] = response.data.data.system_prescription[key]
+                      }
+                    }
+
                   } else {
                     for (const key in this.dialysisPrescription) { //临时处方为空
                       if (key != 'target_ultrafiltration') {
@@ -1228,7 +1246,9 @@
                 this.timeValue = this.dialysisPrescription.dialysis_duration_hour + '小时' + this.dialysisPrescription.dialysis_duration_minute + '分钟'
                 this.time = (this.dialysisPrescription.dialysis_duration_hour > 10 ? this.dialysisPrescription.dialysis_duration_hour : '0' + this.dialysisPrescription.dialysis_duration_hour) + ':' + (this.dialysisPrescription.dialysis_duration_minute > 10 ? this.dialysisPrescription.dialysis_duration_minute : '0' + this.dialysisPrescription.dialysis_duration_minute)
               }
-            })
+            }).catch(error => {
+              Toast.fail("请求失败")
+            });
             break
           case 2:
             this.dialysisPrescription.dialyzer = val.selectId
@@ -1384,7 +1404,9 @@
                 this.$emit('prescription', response.data.data.prescription, this.doctorAdvices)
                 this.finish()
               }
-            })
+            }).catch(error => {
+              Toast.fail("请求失败")
+            });
           } else if (this.is_open == 1) {
 
             if (this.targetAdvices.length > 0) {
@@ -1413,7 +1435,9 @@
                   this.$emit('prescription', response.data.data.prescription, this.doctorAdvices)
                   this.finish()
                 }
-              })
+              }).catch(error => {
+                Toast.fail("请求失败")
+              });
             }
 
           } else if (this.is_open == 2) {
@@ -1471,7 +1495,9 @@
 
                   this.finish()
                 }
-              })
+              }).catch(error => {
+                Toast.fail("请求失败")
+              });
             } else {
               Toast.loading({forbidClick: true, duration: 0})
               let ParamsQuery = this.dialysisPrescription
@@ -1488,7 +1514,9 @@
                   this.$emit('prescription', response.data.data.prescription, this.doctorAdvices)
                   this.finish()
                 }
-              })
+              }).catch(error => {
+                Toast.fail("请求失败")
+              });
             }
 
           }
@@ -1512,7 +1540,9 @@
                   this.finish()
 
                 }
-              })
+              }).catch(error => {
+                Toast.fail("请求失败")
+              });
 
             } else if (this.is_open == 1) {
               if (this.targetAdvices.length > 0) {
@@ -1544,7 +1574,9 @@
                     this.finish()
 
                   }
-                })
+                }).catch(error => {
+                  Toast.fail("请求失败")
+                });
 
               }
 
@@ -1609,7 +1641,9 @@
                     this.finish()
 
                   }
-                })
+                }).catch(error => {
+                  Toast.fail("请求失败")
+                });
               } else {
                 Toast.loading({forbidClick: true, duration: 0})
                 let ParamsQuery = this.dialysisPrescription
@@ -1626,7 +1660,9 @@
                     this.finish()
 
                   }
-                })
+                }).catch(error => {
+                  Toast.fail("请求失败")
+                });
 
               }
             }
@@ -1646,7 +1682,9 @@
                 this.finish()
 
               }
-            })
+            }).catch(error => {
+              Toast.fail("请求失败")
+            });
 
           }
 
@@ -1715,7 +1753,9 @@
                   this.finish()
 
                 }
-              })
+              }).catch(error => {
+                Toast.fail("请求失败")
+              });
 
             }
 
@@ -1780,7 +1820,9 @@
                   this.finish()
 
                 }
-              })
+              }).catch(error => {
+                Toast.fail("请求失败")
+              });
             } else {
               Toast.loading({forbidClick: true, duration: 0})
               let ParamsQuery = this.dialysisPrescription
@@ -1799,7 +1841,9 @@
                   this.finish()
 
                 }
-              })
+              }).catch(error => {
+                Toast.fail("请求失败")
+              });
             }
 
           }
@@ -1823,7 +1867,9 @@
                   this.finish()
 
                 }
-              })
+              }).catch(error => {
+                Toast.fail("请求失败")
+              });
 
             } else if (this.is_open == 1) {
               if (this.targetAdvices.length > 0) {
@@ -1857,7 +1903,9 @@
                     this.finish()
 
                   }
-                })
+                }).catch(error => {
+                  Toast.fail("请求失败")
+                });
 
               }
 
@@ -1921,7 +1969,9 @@
                     this.finish()
 
                   }
-                })
+                }).catch(error => {
+                  Toast.fail("请求失败")
+                });
               } else {
                 Toast.loading({forbidClick: true, duration: 0})
                 let ParamsQuery = this.dialysisPrescription
@@ -1938,7 +1988,9 @@
                     this.$emit('prescription', response.data.data.prescription)
                     this.finish()
                   }
-                })
+                }).catch(error => {
+                  Toast.fail("请求失败")
+                });
               }
             }
           } else {
@@ -1958,7 +2010,9 @@
                 this.finish()
 
               }
-            })
+            }).catch(error => {
+              Toast.fail("请求失败")
+            });
 
           }
 
@@ -1999,7 +2053,9 @@
             }
             Toast.success('签名成功')
           }
-        })
+        }).catch(error => {
+          Toast.fail("请求失败")
+        });
       }, getBodyFluid: function (val) {
         let body_fluid_name = ''
         let body_fluid = this.bodyFluidOptions
@@ -2154,9 +2210,17 @@
             this.dialysisPrescription[key] = this.last_prescription[key]
           }
         }
-      } else {
+      } else if(this.system_prescription != null && typeof this.system_prescription.id != 'undefined' && this.system_prescription.id){
+        for (const key in this.system_prescription) {
+          if (key != "target_ultrafiltration") {
+            this.dialysisPrescription[key] = this.system_prescription[key]
+          }
+        }
+      }else{
+
         this.dialysisPrescription.mode_id = this.schedual.mode_id
 
+
       }
 
       if (this.dialysisPrescription.dialysis_duration_hour.length == 0 || this.dialysisPrescription.dialysis_duration_minute.length == 0) {

src/pages/main/dialog/ThorougDialog.vue

@@ -724,7 +724,7 @@ export default {
           this.body_weight_after = weight
         } else {
           this.body_weight_after = ''
-        }       
+        }
       },
       deep: true,
       immediate: true
@@ -739,7 +739,7 @@ export default {
           } else {
             this.body_weight_after = ''
           }
-        }       
+        }
       },
       deep: true,
       immediate: true
@@ -1413,7 +1413,9 @@ export default {
             this.record[key] = response.data.data.assessmentAfterDislysis[key]
           }
         }
-      })
+      }).catch(err => {
+        Toast.fail(err)
+      });
     },
     close: function () {
       this.$emit('close')

src/pages/main/dialog/TreatmentDialog.vue

@@ -299,6 +299,8 @@ export default {
             this.record[key] = response.data.data.summary[key];
           }
         }
+      }).catch(err => {
+        Toast.fail(err)
       });
     },
     close: function() {

src/pages/main/today/TodayTab.vue

@@ -138,7 +138,7 @@
                            :last_record="last_assessment_after_dislysis"
                            :last_prescription="last_prescription"
                            :dry_weight="dryWeight"
-
+                           :system_prescription ="system_prescription"
                            :schedual="schedual"
                            @longSolution="longSolutionFunc" ref="prescription_dialog"></prescription-dialog>
 
@@ -371,6 +371,7 @@ import {parseTime} from '@/utils'
         prescription: {}, // 透析处方
         solution: {}, // 透析方案
         last_prescription:{},
+        system_prescription:{},//系统透析模版
         thoroug_dialog_reset: true,
         prescription_dialog_reset: true,
         monit_dialog_reset: true,
@@ -858,6 +859,7 @@ import {parseTime} from '@/utils'
           var predialysis_evaluation = resp.data.predialysis_evaluation // 透前评估
           var doctor_advices = resp.data.doctor_advices // 临时医嘱
           var last_prescription = resp.data.last_prescription
+          var system_prescription = resp.data.system_prescription
 
           this.dryWeight = resp.data.dry_weight
 
@@ -912,6 +914,7 @@ import {parseTime} from '@/utils'
             }
             this.$store.dispatch('SetScheduals', {scheduals: scheduals})
           }
+          this.system_prescription = system_prescription == null ? {id: ''} : system_prescription
 
           this.patient = patient
           this.schedual = schedual == null ? {} : schedual
@@ -1447,6 +1450,8 @@ import {parseTime} from '@/utils'
           var predialysis_evaluation = resp.data.predialysis_evaluation // 透前评估
           var doctor_advices = resp.data.doctor_advices // 临时医嘱
           var last_prescription = resp.data.last_prescription
+          var system_prescription = resp.data.system_prescription
+
 
           this.dryWeight = resp.data.dry_weight
 
@@ -1514,6 +1519,7 @@ import {parseTime} from '@/utils'
           this.solution = solution == null ? {id: ''} : solution
           this.last_prescription = last_prescription == null ? {id: ''} : last_prescription
 
+          this.system_prescription = system_prescription == null ? {id: ''} : system_prescription
 
 
           this.receiver_treatment_access = receiver_treatment_access == null ? {id: ''} : receiver_treatment_access
@@ -1612,7 +1618,13 @@ import {parseTime} from '@/utils'
           })
           this.loading = false
         }
-      })
+      }).catch(error => {
+        this.loading = false
+        this.$toast({
+          message: "请求超时"
+        })
+
+      });
     },
 
   }

src/utils/request.js

@@ -35,8 +35,10 @@ service.interceptors.response.use(
     }
   },
   error => {
-
-    return Promise.reject(error)
+    if(error.message.includes('timeout')){   // 判断请求异常信息中是否含有超时timeout字符串
+      return Promise.reject(error);          // reject这个错误信息
+    }
+    return Promise.reject(error);
   })
 
 export default service