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

src/xt_pages/data/components/addDrugs.vue

@@ -38,7 +38,7 @@
                               <el-input v-model="form.dose" type="number" style="width:100px;margin-right:5px;" placeholder="剂量" :disabled="dosageShow"></el-input>
                             </el-form-item>
                             <el-form-item prop="dose_unit" class="noMargin">
-                              <el-select v-model="form.dose_unit" style="width:160px;" placeholder="剂量单位" @change="changeMaxUnit">
+                              <el-select v-model="form.dose_unit" style="width:160px;" placeholder="剂量单位" @change="changeDoseUnit">
                                 <el-option
                                   v-for="(item,index) in getDataConfig('hemodialysis','units')"
                                   :key="index"
@@ -63,7 +63,7 @@
                             </el-form-item>
                           <span style="margin-bottom:20px;font-size:20px;padding:0 10px;">/</span>
                           <el-form-item prop="max_unit" class="noMargin">
-                            <el-select v-model="form.max_unit" style="width:160px;" placeholder="包装单位">
+                            <el-select v-model="form.max_unit" style="width:160px;" placeholder="包装单位" @change="changeMaxUnit">
                               <el-option
                                 v-for="(item,index) in getDataConfig('hemodialysis','units')"
                                 :key="index"
@@ -856,10 +856,10 @@
            }
         })
       },
-      changeMaxUnit(val){
+      changeDoseUnit(val){
         if(val == this.form.min_unit){
-          this.form.dose = 1
-          this.form.min_number = this.form.dose
+          // this.form.dose = 1
+          this.form.min_number = 1
           this.dosageShow = true
         }
         if(val !=this.form.min_unit){
@@ -895,14 +895,18 @@
 
       },
       changeMinUnit(val){
-        if(val == this.form.max_unit){
-          this.form.dose = 1
-          this.form.min_number = this.form.dose
+        if(val == this.form.dose_unit){
+          // this.form.dose = 1
+          this.form.min_number = 1
           this.dosageShow = true
         }
         if(val != this.form.max_unit){
           this.dosageShow = false
         }
+        if(val == this.form.max_unit){
+          this.form.min_number = 1
+          this.dosageShow = true
+        }
 
         // if(this.form.dosage == "" || this.form.max_unit == ""){
         //    this.form.min_number = 1
@@ -936,6 +940,12 @@
           return prevArr
         }, [])
 
+      },
+      changeMaxUnit(val){
+        if(val == this.form.min_unit){
+          this.form.min_number = 1
+          this.dosageShow = true
+        }
       }
     }, watch: {
       visible(val) {

src/xt_pages/dialysis/template/DialysisPrintOrderForty.vue

@@ -2185,65 +2185,65 @@ export default {
             for (let index = 0; index < this.doctor_advices.length; index++) {
               this.doctor_advices[index]['isShow'] = 2
             }
-            if (this.doctor_advices.length === 0) {
-              var obj = { advice_name: '', start_time: '' }
-              var obj1 = { advice_name: '', start_time: '' }
-              var obj2 = { advice_name: '', start_time: '' }
-              var obj3 = { advice_name: '', start_time: '' }
-              this.doctor_advices.push(obj)
-              this.doctor_advices.push(obj1)
-              this.doctor_advices.push(obj2)
-              this.doctor_advices.push(obj3)
-              this.doctor_advices.push(obj3)
-              this.doctor_advices.push(obj3)
-              this.doctor_advices.push(obj3)
-            }
-            if (this.doctor_advices.length === 1) {
-              var obj = { advice_name: '', start_time: '' }
-              var obj1 = { advice_name: '', start_time: '' }
-              var obj2 = { advice_name: '', start_time: '' }
-              this.doctor_advices.push(obj)
-              this.doctor_advices.push(obj1)
-              this.doctor_advices.push(obj2)
-              this.doctor_advices.push(obj2)
-              this.doctor_advices.push(obj2)
-              this.doctor_advices.push(obj2)
-            }
-            if (this.doctor_advices.length === 2) {
-              var obj = { advice_name: '', start_time: '' }
-              var obj1 = { advice_name: '', start_time: '' }
-              this.doctor_advices.push(obj)
-              this.doctor_advices.push(obj1)
-              this.doctor_advices.push(obj1)
-              this.doctor_advices.push(obj1)
-              this.doctor_advices.push(obj1)
-            }
-            if (this.doctor_advices.length === 3) {
-              // eslint-disable-next-line no-redeclare
-              var obj = { advice_name: '', start_time: '' }
-              this.doctor_advices.push(obj)
-              this.doctor_advices.push(obj)
-              this.doctor_advices.push(obj)
-              this.doctor_advices.push(obj)
-            }
-            if (this.doctor_advices.length === 4) {
-              // eslint-disable-next-line no-redeclare
-              var obj = { advice_name: '', start_time: '' }
-              this.doctor_advices.push(obj)
-              this.doctor_advices.push(obj)
-              this.doctor_advices.push(obj)
-            }
-            if (this.doctor_advices.length === 5) {
-              // eslint-disable-next-line no-redeclare
-              var obj = { advice_name: '', start_time: '' }
-              this.doctor_advices.push(obj)
-              this.doctor_advices.push(obj)
-            }
-            if (this.doctor_advices.length === 6) {
-              // eslint-disable-next-line no-redeclare
-              var obj = { advice_name: '', start_time: '' }
-              this.doctor_advices.push(obj)
-            }
+            // if (this.doctor_advices.length === 0) {
+            //   var obj = { advice_name: '', start_time: '' }
+            //   var obj1 = { advice_name: '', start_time: '' }
+            //   var obj2 = { advice_name: '', start_time: '' }
+            //   var obj3 = { advice_name: '', start_time: '' }
+            //   this.doctor_advices.push(obj)
+            //   this.doctor_advices.push(obj1)
+            //   this.doctor_advices.push(obj2)
+            //   this.doctor_advices.push(obj3)
+            //   this.doctor_advices.push(obj3)
+            //   this.doctor_advices.push(obj3)
+            //   this.doctor_advices.push(obj3)
+            // }
+            // if (this.doctor_advices.length === 1) {
+            //   var obj = { advice_name: '', start_time: '' }
+            //   var obj1 = { advice_name: '', start_time: '' }
+            //   var obj2 = { advice_name: '', start_time: '' }
+            //   this.doctor_advices.push(obj)
+            //   this.doctor_advices.push(obj1)
+            //   this.doctor_advices.push(obj2)
+            //   this.doctor_advices.push(obj2)
+            //   this.doctor_advices.push(obj2)
+            //   this.doctor_advices.push(obj2)
+            // }
+            // if (this.doctor_advices.length === 2) {
+            //   var obj = { advice_name: '', start_time: '' }
+            //   var obj1 = { advice_name: '', start_time: '' }
+            //   this.doctor_advices.push(obj)
+            //   this.doctor_advices.push(obj1)
+            //   this.doctor_advices.push(obj1)
+            //   this.doctor_advices.push(obj1)
+            //   this.doctor_advices.push(obj1)
+            // }
+            // if (this.doctor_advices.length === 3) {
+            //   // eslint-disable-next-line no-redeclare
+            //   var obj = { advice_name: '', start_time: '' }
+            //   this.doctor_advices.push(obj)
+            //   this.doctor_advices.push(obj)
+            //   this.doctor_advices.push(obj)
+            //   this.doctor_advices.push(obj)
+            // }
+            // if (this.doctor_advices.length === 4) {
+            //   // eslint-disable-next-line no-redeclare
+            //   var obj = { advice_name: '', start_time: '' }
+            //   this.doctor_advices.push(obj)
+            //   this.doctor_advices.push(obj)
+            //   this.doctor_advices.push(obj)
+            // }
+            // if (this.doctor_advices.length === 5) {
+            //   // eslint-disable-next-line no-redeclare
+            //   var obj = { advice_name: '', start_time: '' }
+            //   this.doctor_advices.push(obj)
+            //   this.doctor_advices.push(obj)
+            // }
+            // if (this.doctor_advices.length === 6) {
+            //   // eslint-disable-next-line no-redeclare
+            //   var obj = { advice_name: '', start_time: '' }
+            //   this.doctor_advices.push(obj)
+            // }
             this.adviceLength = this.doctor_advices.length + 1
 
             if (this.doctor_advices.length > 0) {