浏览代码

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

XMLWAN 3 年前
父节点
当前提交
a32b8eb699

+ 11 - 0
src/xt_pages/data/components/addDrugs.vue 查看文件

@@ -757,6 +757,17 @@
757 757
           if(unitArr.indexOf(this.form.drug_dose_unit) == -1){
758 758
             this.form.drug_dose_unit = ''
759 759
           }
760
+          if(obj.dose_unit == obj.min_unit){
761
+            this.dosageShow = true
762
+          }else{
763
+            this.dosageShow = false
764
+          }
765
+
766
+          if(obj.min_unit == obj.max_unit){
767
+            this.minNumberShow = true
768
+          }else{
769
+            this.minNumberShow = false
770
+          }
760 771
 
761 772
         }
762 773
         this.getAdviceConfig()

+ 3 - 1
src/xt_pages/data/components/drugs.vue 查看文件

@@ -84,7 +84,9 @@
84 84
       <el-table-column prop="date" label="单位&规格" width="120" align="center">
85 85
         <template slot-scope="scope">
86 86
           <!-- <div>{{scope.row.drug_spec}}</div> -->
87
-          <div>{{scope.row.dose}}{{scope.row.dose_unit}}&nbsp;* &nbsp;{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}</div>
87
+          <div>
88
+            <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}}
89
+          </div>
88 90
         </template>
89 91
       </el-table-column>
90 92
       <!-- <el-table-column prop="date" label="最大单位" width="60" align="center">

+ 4 - 1
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue 查看文件

@@ -268,7 +268,10 @@
268 268
                                             <template slot-scope="scope">{{ scope.row.drug_name }}</template>
269 269
                                         </el-table-column>
270 270
                                         <el-table-column label="规格" width="60">
271
-                                            <template slot-scope="scope">{{ scope.row.drug_spec }}</template>
271
+                                            <template slot-scope="scope">
272
+                                              <!-- {{ scope.row.drug_spec }} -->
273
+                                              <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}}
274
+                                            </template>
272 275
                                         </el-table-column>
273 276
                                         <el-table-column label="库存" width="60">
274 277
                                             <template slot-scope="scope">