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

src/xt_pages/hospitalStation/components/prescriptionTable.vue

         </template>
       </el-table-column>
 
+      <el-table-column label="规格" width="60">
+        <template slot-scope="scope">
+          <!-- {{ scope.row.drug_spec }} -->
+          <span v-if="scope.row.drug.min_unit != scope.row.drug.dose_unit">{{scope.row.drug.dose}}{{scope.row.drug.dose_unit}}&nbsp;* &nbsp;</span>{{scope.row.drug.min_number}}{{scope.row.drug.min_unit}}/{{scope.row.drug.max_unit}}
+        </template>
+      </el-table-column>
+
 
       <el-table-column align="center" prop="single_dose" width="120" label="单次用量">
         <template slot-scope="scope">
         <template slot-scope="scope"><span :title="scope.row.project_name">{{ scope.row.project_name }}</span>
         </template>
       </el-table-column>
+      <el-table-column align="center"  width="60" label="规格">
+        <template slot-scope="scope">
+          {{scope.row.type == 2?'':scope.row.good_info.specification_name}}
+        </template>
+      </el-table-column>
       <el-table-column align="center" prop="statistical_classification" width="100" label="组">
         <template slot-scope="scope">{{scope.row.type ==
           2?getGroup(scope.row.statistical_classification):'耗材'}}