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

@@ -757,6 +757,17 @@
           if(unitArr.indexOf(this.form.drug_dose_unit) == -1){
             this.form.drug_dose_unit = ''
           }
+          if(obj.dose_unit == obj.min_unit){
+            this.dosageShow = true
+          }else{
+            this.dosageShow = false
+          }
+
+          if(obj.min_unit == obj.max_unit){
+            this.minNumberShow = true
+          }else{
+            this.minNumberShow = false
+          }
 
         }
         this.getAdviceConfig()

src/xt_pages/data/components/drugs.vue

@@ -84,7 +84,9 @@
       <el-table-column prop="date" label="单位&规格" width="120" align="center">
         <template slot-scope="scope">
           <!-- <div>{{scope.row.drug_spec}}</div> -->
-          <div>{{scope.row.dose}}{{scope.row.dose_unit}}&nbsp;* &nbsp;{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}</div>
+          <div>
+            <span v-if="scope.row.min_unit != scope.row.dose_unit">{{scope.row.dose}}{{scope.row.dose_unit}}&nbsp;* &nbsp;</span>{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
+          </div>
         </template>
       </el-table-column>
       <!-- <el-table-column prop="date" label="最大单位" width="60" align="center">

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -268,7 +268,10 @@
                                             <template slot-scope="scope">{{ scope.row.drug_name }}</template>
                                         </el-table-column>
                                         <el-table-column label="规格" width="60">
-                                            <template slot-scope="scope">{{ scope.row.drug_spec }}</template>
+                                            <template slot-scope="scope">
+                                              <!-- {{ scope.row.drug_spec }} -->
+                                              <span v-if="scope.row.min_unit != scope.row.dose_unit">{{scope.row.dose}}{{scope.row.dose_unit}}&nbsp;* &nbsp;</span>{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
+                                            </template>
                                         </el-table-column>
                                         <el-table-column label="库存" width="60">
                                             <template slot-scope="scope">