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

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

@@ -413,7 +413,7 @@
                         </div>
                       </div>
 
-                     
+
                       <div
                         class="inline_block"
                         style="margin-left: 10px; flex: 1"
@@ -958,7 +958,7 @@
                               : "/"
                           }}
                         </span>
-                        
+
                         </div>
                          <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id==10460">ml</span>
                          <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469  && org_id!=10471 && org_id!=10460">L</span>
@@ -1442,7 +1442,7 @@
                                 ? monitor_record.diastolic_blood_pressure
                                 : "拒测"
                             }}
-                            </span> 
+                            </span>
                           </td>
                           <td>
                             <span v-if="monitor_record.operate_time>0">
@@ -1765,7 +1765,7 @@
                           </td>
                           <td style="font-size: 16px" width="10%">时间</td>
                           <td style="font-size: 16px" width="10%">医生签名</td>
-                        
+
                           <td style="font-size: 16px" width="10%">
                             执行人签名
                           </td>
@@ -1856,7 +1856,7 @@
                               />
                             </td>
 
-                          
+
 
                             <td height="35px">
                               <span

src/xt_pages/outpatientCharges/allListPrint.vue

@@ -13,11 +13,12 @@
     </template>
 <!--  -->
     <div class='dialysisPage' style="padding-top:40px;">
-      <printOne  v-if="org_id != 10215  && org_id !=9671&&org_id !=9675&& org_id !=10515 && org_id !=10489  " :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printOne>
+      <printOne  v-if="org_id != 10215  && org_id !=9671&&org_id !=9675&& org_id !=10515 && org_id !=10489 && org_id !=10644 && org_id !=0" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printOne>
       <summary-print v-if="org_id == 10215|| org_id ==9671 ||org_id ==9675" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></summary-print>
       <printTwo v-if="org_id==10515 " :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printTwo>
       <printthree  v-if="org_id == 10489" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printthree>
-<!--      <list-print-two :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></list-print-two>-->
+      <printFour v-if="org_id == 10644 || org_id == 0" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printFour>
+      <!--      <list-print-two :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></list-print-two>-->
     </div>
   </div>
 </template>
@@ -30,6 +31,7 @@
   import SummaryPrint from './allListTemplate/summaryPrint'
   import printTwo from './allListTemplate/printTwo'
   import printthree from './allListTemplate/printthree'
+  import printFour from './allListTemplate/printFour'
   export default {
     name: 'allListPrint',
     components: {
@@ -37,7 +39,8 @@
       ListPrintTwo,
       printOne,
       printTwo,
-      printthree
+      printthree,
+      printFour
     },
     props: {
       paramsObj: Object

src/xt_pages/outpatientCharges/allListTemplate/printFour.vue

@@ -0,0 +1,223 @@
+<template>
+  <div id="allList-print" class="allList-print">
+    <div v-for='(i,index) in pageArr.length' :key="index">
+      <div class="allListTitle">{{ $store.getters.xt_user.org.org_name }}费用汇总</div>
+      <div class="allListInfo">
+        <div>患者姓名：{{ patient.name }}</div>
+        <div>透析号：{{ patient.dialysis_no }}</div>
+        <div>性别：{{ patient.gender == 1 ? '男' : '女' }}</div>
+        <div>年龄：{{ patient.age }} 岁</div>
+        <div >开方日期：{{ getTimes(order.settle_accounts_date) }}
+          <!-- {{ hospital.in_hosptial_time }} 至
+          {{ hospital.out_hosptial_time }} -->
+        </div>
+        <!-- <div v-else>日期：{{ getTimes(order.settle_start_time) }} 至 {{ getTimes(order.settle_end_time) }}</div> -->
+      </div>
+      <table class="allListTable" border="1">
+        <tr>
+          <td style="width:8%">类别</td>
+          <td style="width:35%">项目名称</td>
+          <td style="width:19%">规格</td>
+          <td style="width:8%">单价(元)</td>
+          <td style="width:8%">数量</td>
+          <td style="width:8%">金额(元)</td>
+          <!-- <td style="width:10%" v-if="org_id==10489 ||org_id==0">报销等级</td> -->
+        </tr>
+        <!-- list.slice(index * 13,(index * 13) + pageArr[index]) -->
+        <template v-for='item in list.slice(index * 27,(index * 27) + pageArr[index])'>
+          <tr v-if="item.is_total == 2">
+            <td style="">{{ item.med_chrgitm_type }}</td>
+            <td style="">{{ item.name }}</td>
+            <td style="">{{ item.spec }}</td>
+            <td style="">{{ (item.price).toFixed(2) }}</td>
+            <td style="">{{ item.count }}{{ item.unit }}</td>
+            <td style="">{{ (item.price * item.count).toFixed(2) }}</td>
+            <!-- <td style="width:10%" v-if="org_id==10489 ||org_id==0">
+              {{item.chrgitm_lv!=''?getMedicineInsuranceType(item.chrgitm_lv): '丙类' }}
+            </td> -->
+          </tr>
+          <tr>
+            <td colspan="6" style="text-align:right;" v-if="item.is_total == 1">合计：{{ item.total }}元</td>
+          </tr>
+        </template>
+      </table>
+      <div class="tableBottom">
+        <div class="tableBottomOne">制表人：{{ admin.user_name }}</div>
+        <div class="tableBottomOne">制表日期：{{ getNowTime() }}</div>
+        <div class="tableBottomOne">总费用：{{ order.medfee_sumamt }}元</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { uParseTime } from '@/utils/tools'
+
+export default {
+  props: {
+    list: {
+      type: Array,
+      default: function() {
+        return []
+      }
+    }, patient: {
+      type: Object,
+      default: function() {
+        return {}
+      }
+    }, order: {
+      type: Object,
+      default: function() {
+        return {}
+      }
+    }, admin: {
+      type: Object,
+      default: function() {
+        return {}
+      }
+    }, hospital: {
+      type: Object,
+      default: function() {
+        return {}
+      }
+
+    }
+  },
+  data() {
+    return {
+      page: 1,
+      pageArr: [],
+      org_id:'',
+    }
+  },
+  methods: {
+    getNowTime: function() {
+      let dateTime
+      let yy = new Date().getFullYear()
+      let mm = new Date().getMonth() + 1
+      let dd = new Date().getDate()
+      let hh = new Date().getHours()
+      let mf = new Date().getMinutes() < 10 ? '0' + new Date().getMinutes()
+          :
+          new Date().getMinutes()
+      let ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds()
+          :
+          new Date().getSeconds()
+      dateTime = yy + '-' + mm + '-' + dd + ' ' + hh + ':' + mf + ':' + ss
+      return dateTime
+    },
+    getTimes(time) {
+      return uParseTime(time, '{y}-{m}-{d}')
+    }, getTotal: function(items) {
+      let total = 0
+      for (let i = 0; i < items.length; i++) {
+        total = total + (items[i].count * items[i].price).toFixed(2)
+      }
+      return total
+
+    },
+    getPage() {
+     
+      if (this.list.length <= 27) {
+        this.page = 1
+        this.pageArr.push(this.list.length)
+      } else if (this.list.length > 27) {
+        this.page = parseInt(this.list.length / 27)
+        let num = this.list.length % 27
+        for (var i = 0; i < this.page; i++) {
+          this.pageArr.push(27)
+        }
+        if (num != 0) {
+          this.pageArr.push(num)
+        }
+      }
+    },
+    getMedicineInsuranceType(type) {
+      switch (type) {
+        case "01":
+          return '甲类'
+          break
+        case "02":
+          return '乙类'
+
+          break
+        case "03":
+          return '自费'
+          break
+
+      }
+
+    },
+    // 日期转时间戳
+    gettime(val){
+      const date = Date.parse(val)
+      return this.getTimes(date)
+    }
+  },
+  created(){
+    this.org_id = this.$store.getters.xt_user.org_id
+    console.log('hospital',this.hospital);
+    console.log('order',this.order);
+    console.log('kkkkkk',this.list);
+  },
+  watch: {
+    list: {
+      handler(newVal) {
+        // this.list
+        this.getPage()
+      },
+      deep: true
+    }
+  }
+}
+
+
+</script>
+
+<style lang="scss" scoped>
+.allList-print {
+  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
+  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+  margin-bottom: 20px;
+  padding: 20px 10px;
+}
+
+.allListTitle {
+  font-size: 22px;
+  text-align: center;
+  font-weight: bold;
+  margin-bottom: 10px;
+}
+
+.allListInfo {
+  display: flex;
+  font-size: 14px;
+  justify-content: space-between;
+  margin: 10px 0;
+}
+
+.allListTable {
+  width: 100%;
+  text-align: center;
+  border-collapse: collapse;
+  line-height: 20px;
+  font-size: 12px;
+  border-color: #000;
+  text-align: left;
+}
+
+.allListTable tr td {
+  padding: 0 5px;
+}
+
+.tableBottom {
+  font-size: 14px;
+  display: flex;
+  margin-top: 20px;
+}
+
+.tableBottomOne {
+  margin-right: 40px;
+}
+</style>

src/xt_pages/outpatientCharges/components/chargeMonthPrescriptionTable.vue

@@ -7,7 +7,12 @@
       <el-table-column align="center" prop="name" label="名称">
         <template slot-scope="scope"><span :title='scope.row.drug_name'>{{ scope.row.drug_name }}</span></template>
       </el-table-column>
-
+      <el-table-column align="center" prop="name" width="90" label="规格/型号">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.single_dose" readonly style="width:65%;"></el-input>-->
+          <div>{{scope.row.spec}}</div>
+        </template>
+      </el-table-column>
       <el-table-column align="center" prop="name" width="90" label="单次用量">
         <template slot-scope="scope">
           <!--<el-input v-model="scope.row.single_dose" readonly style="width:65%;"></el-input>-->
@@ -60,6 +65,9 @@
       <el-table-column align="center" prop="project_name" label="名称">
         <template slot-scope="scope">{{ scope.row.project_name }}</template>
       </el-table-column>
+      <el-table-column align="center" prop="project_name" label="规格">
+        <template slot-scope="scope">{{ scope.row.project_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):"耗材"}}</template>
       </el-table-column>
@@ -71,7 +79,6 @@
         <template slot-scope="scope">
           <!--<el-input v-model="scope.row.delivery_way" placeholder="" readonly></el-input>-->
           {{scope.row.delivery_way}}
-
         </template>
       </el-table-column>
       <el-table-column align="center" prop="execution_frequency" width="80" label="频率">
@@ -168,6 +175,9 @@
       },
 
 
+    },
+    created(){
+      console.log('prescription1111',this.prescription);
     }
   }
 </script>

src/xt_pages/outpatientCharges/components/dayPrescriptionTable.vue

@@ -6,7 +6,13 @@
       <el-table-column align="center" prop="drug_name" label="名称">
         <template slot-scope="scope"><span :title="scope.row.drug_name">{{ scope.row.drug_name }}</span></template>
       </el-table-column>
-
+      <el-table-column align="center" prop="drug_name" label="规格">
+          <template slot-scope="scope">
+            <span>
+              {{ scope.row.drug.dose }}{{ scope.row.drug.dose_unit }}*{{ scope.row.drug.min_number }}{{ scope.row.drug.min_unit }}/{{ scope.row.drug.max_unit }}
+            </span>
+          </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;">
@@ -81,6 +87,11 @@
       <el-table-column align="center" prop="project_name" label="名称">
         <template slot-scope="scope"><span :title="scope.row.project_name">{{ scope.row.project_name }}</span></template>
       </el-table-column>
+      <el-table-column align="center" prop="project_name" label="规格">
+          <template slot-scope="scope">
+            <span>{{ scope.row.project_name }}</span>
+          </template>
+      </el-table-column>
       <el-table-column align="center" prop="statistical_classification" width="100" label="组">
         <template slot-scope="scope">{{getGroup(scope.row.statistical_classification)}}</template>
       </el-table-column>
@@ -376,6 +387,9 @@
     },mounted(){
       this.getInitData()
     },
+    created(){
+      console.log('111111',this.prescription);
+    }
   }
 </script>
 

src/xt_pages/outpatientCharges/components/monthPrescriptionTable.vue

@@ -6,6 +6,13 @@
       <el-table-column align="center" prop="drug_name" label="名称">
         <template slot-scope="scope"><span :title="scope.row.drug_name">{{ scope.row.drug_name }}</span></template>
       </el-table-column>
+      <el-table-column align="center" prop="drug_name" label="规格">
+          <template slot-scope="scope">
+            <span>
+              {{ scope.row.drug.dose }}{{ scope.row.drug.dose_unit }}*{{ scope.row.drug.min_number }}{{ scope.row.drug.min_unit }}/{{ scope.row.drug.max_unit }}
+            </span>
+          </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;">
@@ -78,6 +85,11 @@
       <el-table-column align="center" prop="project_name" label="名称">
         <template slot-scope="scope"><span :title="scope.row.project_name">{{ scope.row.project_name }}</span></template>
       </el-table-column>
+      <el-table-column align="center" prop="project_name" label="规格">
+          <template slot-scope="scope">
+            <span>{{ scope.row.project_name }}</span>
+          </template>
+      </el-table-column>
       <el-table-column align="center" prop="statistical_classification" width="100" label="组">
         <template slot-scope="scope">{{getGroup(scope.row.statistical_classification)}}</template>
       </el-table-column>

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

@@ -34,7 +34,6 @@
           }}</span></template
         >
       </el-table-column>
-
       <el-table-column align="center" prop="name" width="80" label="单次用量">
         <template slot-scope="scope">
           <!--<el-input v-model="scope.row.delivery_way" readonly></el-input>-->
@@ -380,7 +379,7 @@ export default {
         "system",
         "statistics_category"
       );
-      console.log("2235", statistics_category);
+      // console.log("2235", statistics_category);
       for (let i = 0; i < statistics_category.length; i++) {
         if (id == statistics_category[i].id) {
           name = statistics_category[i].name;
@@ -396,6 +395,9 @@ export default {
         // table加ref="multipleTable"
       })
     }
+  },
+  created(){
+    console.log('prescription',this.prescription);
   }
 };
 </script>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -505,8 +505,6 @@
                           <charge-month-prescription-table
                             :prescription="items.curMonthPrescriptions"></charge-month-prescription-table>
                         </el-tabs>
-
-
                       </div>
                       <div class="costBox">
                                           <span>当前处方总费用：<span
@@ -1250,8 +1248,8 @@ export default {
       temp_ids: '',
 
       other_prescriptions: [],
-      newLoading: false
-
+      newLoading: false,
+      advices2:[]
     }
   },
   created() {
@@ -2772,7 +2770,7 @@ export default {
       if (this.search_input.length == 0) {
         this.patientTableData = this.all_patient
       } else {
-        console.log('6666666',all_patient);
+
         let arr = []
         for (let i = 0; i < all_patient.length; i++) {
           if(all_patient[i].first_letter != 'undefined'){
@@ -2793,20 +2791,29 @@ export default {
 
       }
     },
+    // 标签页选中
     tabclickEventTwo(val) {
+      console.log('val',val.name,this.big_month_prescriptions)
       for (let b = 0; b < this.big_month_prescriptions.length; b++) {
         for (let i = 0; i < this.big_month_prescriptions[b].month_prescriptions.length; i++) {
           if (this.big_month_prescriptions[b].month_prescriptions[i].name == val.name) {
             this.big_month_prescriptions[b].curMonthPrescriptions = {}
+            const advicearr = this.big_month_prescriptions[b].month_prescriptions[i].advices
+            for(let x in this.advices2){
+              for(let s in advicearr){
+                if(this.advices2[x].drug_id == advicearr[s].id){
+                  advicearr[s]['spec'] = this.advices2[x].spec
+                }
+              }
+            }
             var temp = this.deepClone(this.big_month_prescriptions[b].month_prescriptions[i])
             this.big_month_prescriptions[b].curMonthPrescriptions = temp
             this.big_month_prescriptions[b].month_total = this.getMonthTotalTwo(temp)
           }
+          
         }
       }
-      // this.prescription_id = this.month_prescriptions.id
-      // this.month_total = 0
-
+     
     },
     tabclickEventThree(val) {
       for (let i = 0; i < this.big_prescriptions_two.length; i++) {
@@ -2839,6 +2846,7 @@ export default {
 
     },
     deepClone(source) {
+      // console.log('source',source);
       if (!source && typeof source !== 'object') {
         throw new Error('error arguments', 'shallowClone')
       }
@@ -5307,16 +5315,34 @@ export default {
         }
       })
     },
-
+    // 月结数据
     setMonthPrescription(month_prescriptions) {
+      console.log('vvvvvv',month_prescriptions);
       let big_prescriptions = []
       for (let i = 0; i < this.unique_three(month_prescriptions).length; i++) {
         let obj = {
           med_type: this.unique_three(month_prescriptions)[i].med_type,
           prescriptions: []
         }
+        console.log('333333',obj);
         big_prescriptions.push(obj)
       }
+      const advices2 = []
+      for(let i in month_prescriptions){
+        if(month_prescriptions[i].advices.length>0){
+          for(let j in month_prescriptions[i].advices){
+            const obj ={
+              drug_id: month_prescriptions[i].advices[j].drug_id,
+              spec:month_prescriptions[i].advices[j].drug.dose + month_prescriptions[i].advices[j].drug.dose_unit + '*' + 
+              month_prescriptions[i].advices[j].drug.min_number + month_prescriptions[i].advices[j].drug.min_unit + '/' + 
+              month_prescriptions[i].advices[j].drug.max_unit
+            }
+            advices2.push(obj)
+          }
+        }
+      }
+      this.advices2 = advices2
+      console.log('5555555',advices2);
 
       this.month_prescriptions = []
 
@@ -5392,8 +5418,6 @@ export default {
         }
       }
 
-      //
-      //
       for (let y = 0; y < big_prescriptions.length; y++) {
         let drug_ids = this.unique_two(big_prescriptions[y].drug_ids)
         let project_ids = this.unique_two(big_prescriptions[y].project_ids)
@@ -5482,7 +5506,7 @@ export default {
         //     additions.push(obj)
         //   }
         // }
-        console.log('ids==')
+        // console.log('ids==',big_prescriptions[y].curMonthPrescriptions)
         console.log(drug_prescriptions_ids)
         console.log(project_prescriptions_ids)
 
@@ -5507,8 +5531,10 @@ export default {
         big_prescriptions[y]['month_prescriptions'].push(p1)
         big_prescriptions[y]['month_prescriptions'].push(p2)
       }
+      console.log('bbbbbbbb',big_prescriptions)
       this.big_month_prescriptions = big_prescriptions
-      console.log(this.big_month_prescriptions)
+      console.log('月结this.big_month_prescriptions',this.big_month_prescriptions)
+
 
       for (let i = 0; i < this.big_month_prescriptions.length; i++) {
         if (this.big_month_prescriptions[i].month_prescriptions.length > 0) {
@@ -5516,8 +5542,19 @@ export default {
         } else {
           this.big_month_prescriptions[i]['curMonthPrescriptions'] = {}
         }
+        const advicearr = this.big_month_prescriptions[i].curMonthPrescriptions.advices
         this.big_month_prescriptions[i]['month_total'] = this.getMonthTotalTwo(this.big_month_prescriptions[i].month_prescriptions[0])
+        for(let x in advices2){
+          for(let s in advicearr){
+            if(advices2[x].drug_id == advicearr[s].id){
+              advicearr[s]['spec'] = advices2[x].spec
+            }
+          }
+        }
       }
+      
+        
+      console.log('kkkkk',big_prescriptions[0].curMonthPrescriptions);
       if (this.big_month_prescriptions.length > 0) {
         this.editableTabsValue = this.big_month_prescriptions[0].curMonthPrescriptions.name
       }
@@ -5736,6 +5773,7 @@ export default {
             this.$message.error(response.data.msg)
             return false
           } else {
+            console.log('111111日结',response.data.data);
             this.prescriptions = []
             this.month_prescriptions = []
             this.big_month_prescriptions = []
@@ -5978,6 +6016,7 @@ export default {
             this.$message.error(response.data.msg)
             return false
           } else {
+            console.log('22222月结',response.data.data);
             this.prescriptions = []
             this.month_prescriptions = []
             this.big_month_prescriptions = []

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -16,7 +16,13 @@
                 </template>
             </el-table-column>
 
-
+            <el-table-column align="center" prop="drug_name" label="规格">
+                <template slot-scope="scope">
+                  <span>
+                    {{ scope.row.drug.dose }}{{ scope.row.drug.dose_unit }}*{{ scope.row.drug.min_number }}{{ scope.row.drug.min_unit }}/{{ scope.row.drug.max_unit }}
+                  </span>
+                </template>
+            </el-table-column>
             <el-table-column align="center" prop="single_dose" width="120" label="单次用量">
                 <template slot-scope="scope">
                     <div style="display:flex;align-items:center;">
@@ -149,6 +155,11 @@
 
                 </template>
             </el-table-column>
+            <el-table-column align="center" prop="project_name" label="规格">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.project_name }}</span>
+                </template>
+            </el-table-column>
             <el-table-column align="center" prop="statistical_classification" width="100" label="组">
                 <template slot-scope="scope">{{scope.row.statistical_classification}}
                 </template>
@@ -361,10 +372,10 @@
         })
 
       }, deleteDrug: function(index, row) {
-        // if (this.prescription.is_medicine_status){
-        //   this.$message.error('该处方包含已发药的药品，无法删除')
-        //   return
-        // }
+        if (this.prescription.is_medicine_status){
+          this.$message.error('该处方包含已发药的药品，无法删除')
+          return
+        }
         if (this.prescription.order_status == 2 ||  this.prescription.order_status ==5) {
           this.$message.error('该处方已经结算或记账，无法删除')
           return

src/xt_pages/outpatientDoctorStation/template/printTwoteen.vue

@@ -19,12 +19,13 @@
             prescriptions[index].med_type != '1112'
           "
         >
-          {{ orgname }}处方笺
+          <!-- {{ orgname }} -->
+          处方笺
         </div>
-        <div class="printTitle" v-else>
-          <span>{{ orgname }}处方笺</span>
-          <span style="font-size: 14px;font-weight: normal;color: red;" 
-            v-if="prescriptions[index].med_type == '1112'">(精)</span>
+        <div class="printTitle" v-else >
+          <span style="display: inline-block;">处方笺</span>
+          <span style="font-size: 14px;display: inline-block;border: 1px solid black;padding: 5px;border-radius: 5px;"
+            v-if="prescriptions[index].med_type == '1112'">精二处方</span>
         </div>
         <div >
           <div class="">
@@ -128,6 +129,7 @@
               </div>
             </template>
             <div style="position: relative;">
+              <!-- 有子母药 -->
               <div v-if="it.arr !== undefined">
                 <div class="drugsOne" :style="{'border-right':it.arr.length>0 ? '1px solid black': 'none','width':'80%'}">
                   <span style="font-weight: bold" >
@@ -187,6 +189,7 @@
                     </div>
                 </template>
               </div>
+              <!-- 没有子母药 -->
               <div v-if="it.arr === undefined">
                 <div class="drugsOne" >
                   <span style="font-weight: bold" >
@@ -197,7 +200,7 @@
                     {{ it.drug.dose }}{{ it.drug.dose_unit }}&nbsp;* {{ it.drug.min_number }}{{ it.drug.min_unit }}/
                     {{it.drug.max_unit}}
                   </span>&nbsp;
-                  
+
                   <div style="margin-left: 70px" >
                     <template>
                         用法：
@@ -235,8 +238,8 @@
                 <div class="actionBar">
                   <p>审核：</p>
                   <p>配对：</p>
-                  <p>核对：</p>
-                  <p>发药：</p>
+                  <p>核对、发药：</p>
+                  <!-- <p>发药：</p> -->
                   <p>
                     药费：{{
                       getTotalOne(item.id).toFixed(2)
@@ -308,8 +311,8 @@
         <div class="actionBar">
           <p>审核：</p>
           <p>配对：</p>
-          <p>核对：</p>
-          <p>发药：</p>
+          <p>核对、发药：</p>
+          <!-- <p>发药：</p> -->
           <p>
             药费：{{
               getTotalOne(item.id).toFixed(2)

src/xt_pages/outpatientTool/detailPrint.vue

@@ -157,15 +157,15 @@
       </div> -->
       <table class="listTable" border="1">
         <tr style="height:45px">
-          <td width="100" style="text-align: center">序号</td>
-          <td width="200" style="text-align: center">处方日期</td>
-          <td width="300" style="text-align: center">费用编码</td>
-          <td width="300" style="text-align: center">项目名称</td>
-          <td width="180" style="text-align: center">规格</td>
-          <td width="100" style="text-align: center">数量</td>
-          <td width="100" style="text-align: center">单位</td>
-          <td width="100" style="text-align: center">单价(元)</td>
-          <td width="150" style="text-align: center">金额</td>
+          <td width="50" style="text-align: center">序号</td>
+          <td width="150" style="text-align: center">处方日期</td>
+          <td width="230" style="text-align: center">费用编码</td>
+          <td width="320" style="text-align: center">项目名称</td>
+          <td width="200" style="text-align: center">规格</td>
+          <td width="50" style="text-align: center">数量</td>
+          <td width="60" style="text-align: center">单位</td>
+          <td width="80" style="text-align: center">单价(元)</td>
+          <td width="100" style="text-align: center">金额</td>
         </tr>
         <tr v-for="(item, index) in tableData" :key="index">
           <td style="text-align: center">