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

src/xt_pages/dialysis/details/NavIgation.vue

@@ -583,7 +583,7 @@ export default {
       this.$refs.finish_dialog.show(this.dialysis_order);
     },
     showPrescription: function() {
-      this.$refs.prescription.show(this.prescription);
+      this.$refs.prescription.show(this.prescription,this.schedual);
     },
     showAccepts: function() {
       this.$refs.accepts.show(this.receiver_treatment_access);

src/xt_pages/user/components/PatientDetail.vue

@@ -245,8 +245,8 @@
             <el-col :span="24">
               <el-form-item label="传染病 : " required prop="is_infectious">
                 <el-radio-group v-model="form.is_infectious" disabled>
-                  <el-radio :label="1">无</el-radio>
-                  <el-radio :label="2">有</el-radio>
+                  <el-radio :label="1">阴性</el-radio>
+                  <el-radio :label="2">阳性</el-radio>
                 </el-radio-group>
                 <el-checkbox-group
                   v-model="form.contagions"

src/xt_pages/user/components/PatientForm.vue

@@ -301,8 +301,8 @@
               <el-col :span="24">
                 <el-form-item label="传染病 : " prop="contagions">
                   <el-radio-group v-model="form.is_infectious">
-                    <el-radio :label="1">无</el-radio>
-                    <el-radio :label="2">有</el-radio>
+                    <el-radio :label="1">阴性</el-radio>
+                    <el-radio :label="2">阳性</el-radio>
                   </el-radio-group>
                   <el-checkbox-group
                     v-model="form.contagions"
@@ -932,7 +932,7 @@ const defaultForm = {
   homeTelephone: "",
   relative_phone: "",
   relative_relations: "",
-  lapseto: "",
+  lapseto: 1,
   homeAddress: "",
   work: "",
   unit_address: "",