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

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

@@ -121,6 +121,7 @@
             </el-form-item>
           </el-col>
 
+
           <el-col :span="8" v-if="anticoagulant.weichi != -1 && isShows('维持')" >
             <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '" v-if="anticoagulant.weichi != -1" >
               <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1" v-model="dialysisPrescription.anticoagulant_weichi" ></el-input>
@@ -1217,6 +1218,10 @@ export default {
         'dialyzer_perfusion_apparatus'
       )
       console.log('灌流器', this.dialyzerPerfusionApparatus)
+
+
+
+
       if (this.$route.query && this.$route.query.date) {
         var date = this.$route.query && this.$route.query.date
         this.record_date = uParseTime(date, '{y}-{m}-{d}')
@@ -1280,6 +1285,8 @@ export default {
           this.totalShow = false
         }
         this.dialysisPrescription.mode_id = schedual.mode_id
+
+
       }
       var thismode = parseInt(this.dialysisPrescription.anticoagulant)
       if (isNaN(thismode) || thismode <= 0) {
@@ -1292,6 +1299,19 @@ export default {
         return false
       }
       this.anticoagulant = this.$store.getters.anticoagulants_confit[thismode]
+
+
+      for (let i = 0; i < this.dialyzerPerfusionApparatus.length; i++) {
+        if (this.dialysisPrescription.dialyzer_perfusion_apparatus == this.dialyzerPerfusionApparatus[i].name) {
+          this.dialysisPrescription.dialyzer_perfusion_apparatus = this.dialyzerPerfusionApparatus[
+            i
+            ].id
+        }
+      }
+
+
+
+
     },
     menuMsgTip: function() {
       this.msgtip_visibility = false
@@ -3047,6 +3067,14 @@ export default {
         this.huShow = true
         this.totalShow = true
       }
+
+      for (let i = 0; i < this.dialyzerPerfusionApparatus.length; i++) {
+        if (this.dialysisPrescription.dialyzer_perfusion_apparatus == this.dialyzerPerfusionApparatus[i].name) {
+          this.dialysisPrescription.dialyzer_perfusion_apparatus = this.dialyzerPerfusionApparatus[
+            i
+            ].id
+        }
+      }
     },
     handlePatientInfo() {
       this.isVisibility = false

src/xt_pages/user/components/PatientForm.vue

@@ -1139,7 +1139,7 @@ export default {
       }
       if (
         !value.match(
-          /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/
+          /^1\d{10}$/
         )
       ) {
         return callback(new Error("请填写正确的电话（手机号码）"));
@@ -1152,7 +1152,7 @@ export default {
       }
       if (
         !value.match(
-          /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/
+          /^1\d{10}$/
         )
       ) {
         return callback(new Error("请填写正确的电话（手机号码）"));