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

@@ -21,6 +21,15 @@
           </div>
         </template>
       </el-table-column>
+
+      <el-table-column align="center" prop="single_dose" width="90" label="规格">
+        <template slot-scope="scope">
+          <div style="display:flex;align-items:center;">
+                <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}}
+          </div>
+        </template>
+      </el-table-column>
+
       <el-table-column align="center" prop="delivery_way" width="100" label="用法">
         <template slot-scope="scope">
           <el-select v-model="scope.row.delivery_way" placeholder="请选择">
@@ -90,6 +99,11 @@
       <el-table-column align="center" prop="statistical_classification" width="100" label="组">
         <template slot-scope="scope">{{scope.row.type == 2?getGroup(scope.row.statistical_classification):"耗材"}}</template>
       </el-table-column>
+
+      <el-table-column align="center" prop="statistical_classification" width="100" 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="single_dose" width="80" label="单次用量">
         <template slot-scope="scope">
           <el-input v-model="scope.row.single_dose" @input="getProjectSingleDose(scope)" placeholder=""></el-input>

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -1116,7 +1116,9 @@
                     id: prescription.advices[b].drug_id,
                     drug: prescription.advices[b].drug,
                     groupno: prescription.advices[b].groupno,
-                    hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString()
+                    hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
+
+
 
                   }
                   tempAdvice.push(obj)