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

config/index.js

@@ -27,10 +27,10 @@ module.exports = {
     // can be overwritten by process.env.HOST
     // if you want dev by ip, please set host: '0.0.0.0'
 
-    //  host: 'xt.test.sgjyun.com',
+     host: 'xt.test.sgjyun.com',
     //  host: 'xt.kuyicloud.com',
     // host: 'xt.test.sgjyun.com',
-    host: 'xt.test.sgjyun.com',
+    // host: 'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

src/api/his/his.js

@@ -322,6 +322,26 @@ export function getChargeHisPatientInfo (params) {
 }
 
 
+export function getHisOrderDetail (params) {
+  return request({
+    url: '/api/orderdetail/get',
+    method: 'get',
+    params:params,
+  })
+}
+
+
+
+
+
+
+export function getHisOrderDetailCollect (params) {
+  return request({
+    url: '/api/orderdetaicollect/get',
+    method: 'get',
+    params:params,
+  })
+}
 
 
 

src/lang/zh.js

@@ -232,7 +232,7 @@ export default {
     dictionaryManagement:'字典管理',
     templateManagement:'模板管理',
     drugStockUserDetail:"出库人明细",
-    DepartManage:"部门管理",
+    DepartManage:"科室管理",
     basicConfig:'基础配置',
 
     histemplate:'处方模版',

src/store/modules/globalConfig.js

@@ -495,7 +495,7 @@ const global_config = {
       // 16: { id: 16, name: 'HD后置换', dialysis_duration: 1, replacement_way: 2, hemodialysis_machine: 1, blood_filter: 2, perfusion_apparatus: 2, blood_flow_volume: 1, dialysate_flow: 1, kalium: 1, sodium: 1, calcium: 1, bicarbonate: 1 },
       // 17: { id: 17, name: 'HDF前置换', dialysis_duration: 1, replacement_way: 1, hemodialysis_machine: 2, blood_filter: 1, perfusion_apparatus: 2, blood_flow_volume: 1, dialysate_flow: 1, kalium: 1, sodium: 1, calcium: 1, bicarbonate: 1 },
       // 18: { id: 18, name: 'HDF后置换', dialysis_duration: 1, replacement_way: 1, hemodialysis_machine: 2, blood_filter: 1, perfusion_apparatus: 2, blood_flow_volume: 1, dialysate_flow: 1, kalium: 1, sodium: 1, calcium: 1, bicarbonate: 1 }
-      19: {
+      20: {
         id: 19,
         name: 'UF',
         dialysis_duration: 1,
@@ -1821,7 +1821,7 @@ const global_config = {
       id: 27,
       name: '万u'
     },
-   
+
     ],
     body_fluid: [{
       id: 1,

src/xt_pages/data/components/drugs.vue

@@ -372,10 +372,9 @@
         // this.$refs.maintain.show();
       },
       openForm(id) {
-
+        this.current_id = id
         this.getAllManufacturer()
         if (id > 0) {
-          this.current_id = id
           let params = {
             id: this.current_id
           }
@@ -462,7 +461,7 @@
           }
           this.$refs.addDrugs.show(0, this.formValue)
         }
-      }, 
+      },
 
        deleteDurg(id,index){
          console.log("id",id)

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyFour.vue

@@ -178,9 +178,13 @@
                     <div class="inline_block" style="flex:1;">
                         透析时间：
                         <div class="under_line" style="width: 50px;text-align: center">
-                        {{ prescription.dialysis_duration_hour ? prescription.dialysis_duration_hour : "/" }}
+                        {{ prescription.dialysis_duration_hour ? prescription.dialysis_duration_hour : "" }}
                         </div>
                         小时
+                        <div class="under_line" style="width: 50px;text-align: center">
+                        {{ prescription.dialysis_duration_minute ? prescription.dialysis_duration_minute : "" }}
+                        </div>
+                        分钟
                     </div>
                     <div class="inline_block" style="margin-left:20px;flex:1;">
                         血流量：
@@ -203,6 +207,30 @@
                         </div>
                     </div>
                 </div>
+                <div class="row" style="padding: 2px 0;line-height:23px;">
+                  <div class="inline_block" style="flex:1;">
+                    置换方式：
+                    <label-box
+                      :isChecked="
+                        prescription.displace_liqui_part == 1 ? true : false
+                      "
+                      showValue="前置换"
+                    ></label-box>&nbsp;
+                    <label-box
+                      :isChecked="
+                        prescription.displace_liqui_part == 2 ? true : false
+                      "
+                      showValue="后置换"
+                    ></label-box>
+                  </div>
+                  <div class="inline_block" style="margin-left:20px;flex:1;">
+                    置换量：
+                    <div class="under_line" style="width: 70px;text-align: center">
+                    {{ prescription.replacement_total ? prescription.replacement_total : "" }}
+                    </div>
+                    ml
+                  </div>
+                </div>
               </td>
             </tr>
             <tr>
@@ -242,16 +270,14 @@
                   </td> -->
                       <!-- <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td> -->
                       <td height="32px">
-                        <span v-if="setAdminUserES(advice.advice_doctor) == ''">{{ getAdminUser(advice.advice_doctor) }}</span>
-                        <img style="height:30px;" :src="setAdminUserES(advice.advice_doctor)" alt="" srcset="" v-else />
+                        <span>{{ getAdminUser(advice.advice_doctor) }}</span>
                       </td>
                       <!-- <td height="35px">
                     <span v-if="setAdminUserES(advice.checker) == ''">{{getAdminUser(advice.checker)}}</span>
                     <img style="height:20px;" :src="setAdminUserES(advice.checker)" alt="" srcset="" v-else>
                   </td> -->
                       <td height="32px">
-                        <span v-if="setAdminUserES(advice.execution_staff) == ''">{{ getAdminUser(advice.execution_staff) }}</span>
-                        <img style="height:30px;" :src="setAdminUserES(advice.execution_staff)" alt="" srcset="" v-else />
+                        <span>{{ getAdminUser(advice.execution_staff) }}</span>
                       </td>
                       <td height="32px">
                         <span v-if="advice.execution_time">{{ getTime(advice.execution_time, "{h}:{i}") }}</span>
@@ -311,12 +337,9 @@
                             </div>
                         </td>
                         <td>
-                            <span v-if="setAdminUserES(monitor.monitoring_nurse) == ''">
+                            <span>
                                 {{ getAdminUser(monitor.monitoring_nurse) }}
                             </span>
-                            <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
-                                <img style="height:30px;" :src="setAdminUserES(monitor.monitoring_nurse)" alt srcset />
-                            </span>
                         </td>
                     </tr>
                   </tbody>
@@ -332,28 +355,32 @@
                             {{ afterdialysis.actual_treatment_hour ? afterdialysis.actual_treatment_hour : "" }}
                             </div>
                             小时
+                            <div class="under_line" style="width: 30px;text-align: center">
+                            {{ afterdialysis.actual_treatment_minute ? afterdialysis.actual_treatment_minute : "" }}
+                            </div>
+                            分钟
                         </div>
-                        <div class="inline_block" style="margin-left:20px;">
+                        <div class="inline_block" style="margin-left:10px;">
                             实际脱水量：
                             <div class="under_line" style="width: 70px;text-align: center">
                             {{ afterdialysis.actual_ultrafiltration ? afterdialysis.actual_ultrafiltration : "" }}
                             </div>
                             ml
                         </div>
-                        <div class="inline_block" style="margin-left:20px;">
+                        <div class="inline_block" style="margin-left:10px;">
                             透后体重：
                             <div class="under_line" style="width: 70px;text-align: center">
                             {{ afterdialysis.weight_after ? afterdialysis.weight_after : "" }}
                             </div>
                             kg
                         </div>
-                        <div class="inline_block" style="margin-left:20px;">
+                        <div class="inline_block" style="margin-left:10px;">
                             透析器级别
                             <div class="under_line" style="width: 100px;text-align: center">
                                 {{ afterdialysis.cruor ? afterdialysis.cruor : '' }}
                             </div>
                         </div>
-                        <div class="inline_block" style="margin-left:20px;">
+                        <div class="inline_block" style="margin-left:10px;">
                             离科时间
                             <div class="under_line" style="width: 70px;text-align: center">
                                 {{ dialysisOrder ? getTime(dialysisOrder.end_time, "{h}:{i}") : '' }}
@@ -364,48 +391,41 @@
                         <div class="inline_block">
                             预冲者
                             <div class="under_line" style="width: 70px;text-align: center">
-                                <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.washpipe_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.washpipe_nurse)}}</span>
-                                <img class="es-img" style="height:30px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.washpipe_nurse)" alt="" srcset="" v-else>
+                                <span>{{getAdminUser(dialysisOrder==null?0:dialysisOrder.washpipe_nurse)}}</span>
                             </div>
                         </div>
                         <div class="inline_block" style="margin-left:20px;">
                             穿刺者/换药者
                             <div class="under_line" style="width: 70px;text-align: center">
-                                <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.puncture_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.puncture_nurse)}}</span>
-                                <img class="es-img" style="height:30px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.puncture_nurse)" alt="" srcset="" v-else>
+                                <span>{{getAdminUser(dialysisOrder==null?0:dialysisOrder.puncture_nurse)}}</span>
                             </div>
                         </div>
                         <div class="inline_block" style="margin-left:20px;">
                             责任护士
                             <div class="under_line" style="width: 70px;text-align: center">
-                                <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.start_nurse)}}</span>
-                                <img class="es-img" style="height:30px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse)" alt="" srcset="" v-else>
+                                <span>{{getAdminUser(dialysisOrder==null?0:dialysisOrder.start_nurse)}}</span>
                             </div>
                         </div>
                         <div class="inline_block" style="margin-left:20px;">
                             查对者
                             <div class="under_line" style="width: 70px;text-align: center">
-                                <span v-if="setAdminUserES(check == null ? 0 : check.creater) == ''">
+                                <span>
                                     {{ getAdminUser(check == null ? 0 : check.creater) }}
                                 </span>
-                                <img style="height:30px;" :src="setAdminUserES(check == null ? 0 : check.creater)" alt srcset v-else />
                             </div>
                         </div>
                         <div class="inline_block" style="margin-left:20px;">
                             交叉核对者
                             <div class="under_line" style="width: 70px;text-align: center">
-                                <span v-if="setAdminUserES(check == null ? 0 : check.modifier) == ''">
+                                <span>
                                 {{ getAdminUser(check == null ? 0 : check.modifier) }}
                                 </span>
-                                <img style="height:30px;" :src="setAdminUserES(check == null ? 0 : check.modifier)" alt srcset v-else />
                             </div>
                         </div>
                         <div class="inline_block" style="margin-left:20px;">
                             下机护士
                             <div class="under_line" style="width: 70px;text-align: center">
-                                <span v-if="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.finish_nurse) == ''">
-                                    {{ getAdminUser(dialysisOrder == null ? 0 : dialysisOrder.finish_nurse) }}</span>
-                                <img class="es-img" style="height:30px" :src="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.finish_nurse)" alt="" srcset="" v-else />
+                                <span>{{ getAdminUser(dialysisOrder == null ? 0 : dialysisOrder.finish_nurse) }}</span>
                             </div>
                         </div>
                         
@@ -424,10 +444,9 @@
         <div class="row" style="padding: 2px 0;line-height:30px; display:flex;">
             <div class="inline_block">
                 医生签字
-                <!-- <div class="under_line" style="width: 70px;text-align: center">
-                    <span v-if="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) }} </span>
-                    <img style="height:30px;" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:''))" alt="" srcset="" v-else />
-                </div> -->
+                <div class="under_line" style="width: 70px;text-align: center">
+                    <span> {{ getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) }} </span>
+                </div>
             </div>
         </div>
       </div>
@@ -861,8 +880,8 @@ export default {
         this.summary = response.data.data.summary
         this.org_template_info = response.data.data.org_template_info
 
-        if (this.monitors.length < 10) {
-            var nl = 10 - this.monitors.length
+        if (this.monitors.length < 9) {
+            var nl = 9 - this.monitors.length
             for (let index = 0; index < nl; index++) {
               this.monitors.push([])
             }

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyEight.vue

@@ -342,7 +342,7 @@
               <tbody>
               <tr>
                 <td width="70">血管通路:</td>
-                <td width="620">
+                <td width="590">
                   <div>
                     <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('自体内瘘') > -1 ? true : false" showValue="自体内瘘"></label-box>
                     &nbsp;
@@ -350,10 +350,11 @@
                     &nbsp;
                     <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('直穿') > -1 ? true : false" showValue="直穿"></label-box>
                     &nbsp;
-                    <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('颈内静脉') > -1 ? true : false" showValue="颈内静脉"></label-box>
+                    <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('颈内静脉-左') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('颈内静脉-右') > -1 ? true : false" showValue="颈内静脉"></label-box>
                     &nbsp;
-                    <!-- <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('颈内静脉-右') > -1 ? true : false" showValue="颈内静脉-右"></label-box>
-                    &nbsp; -->
+                    （<label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('颈内静脉-左') > -1 ? true : false" showValue="左"></label-box>
+                    &nbsp;
+                    <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('颈内静脉-右') > -1 ? true : false" showValue="右"></label-box>）
                     <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('股静脉') > -1 ? true : false" showValue="股静脉"></label-box>
                     &nbsp;
                     <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('锁骨下') > -1 ? true : false" showValue="锁骨下"></label-box>

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFour.vue

@@ -1049,7 +1049,7 @@
                     <td width='40'>其他</td>
                     <td width='160'>
                       <div class="under-line">
-                        &nbsp;{{ afterdialysis.complication ? getComplication(afterdialysis.complication) : '' }}
+                        &nbsp;{{ afterdialysis.other_complication ? afterdialysis.other_complication : '' }}
                       </div>
                     </td>
                     <td></td>

src/xt_pages/outpatientCharges/allListPrint.vue

@@ -0,0 +1,478 @@
+<template>
+  <div>
+    <template>
+      <el-button
+        style="position:fixed;right:25px;z-index:999"
+        :loading="loading"
+        size="small"
+        icon="el-icon-printer"
+        @click="printThisPage"
+        type="primary"
+      >打印
+      </el-button
+      >
+    </template>
+
+    <div class='dialysisPage' style="padding-top:40px;">
+      <printOne :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getHisOrderDetailCollect } from '@/api/his/his'
+  import { uParseTime } from '@/utils/tools'
+  import printOne from './allListTemplate/printOne'
+
+  export default {
+    name: 'allListPrint',
+    components: {
+      printOne
+    },
+    props: {
+      paramsObj: Object
+    },
+    data() {
+      return {
+        list: [],
+        patient: {},
+        order: {},
+        admin: {}
+      }
+    },
+
+    created() {
+      this.getInfo(this.paramsObj.id)
+
+    },
+    methods: {
+      getTimes(time) {
+        return uParseTime(time, '{y}-{m}-{d} {h}:{i}')
+      }, getInfo(order_id) {
+        let params = {
+          id: order_id
+        }
+        getHisOrderDetailCollect(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.order = response.data.data.order
+            this.patient = response.data.data.patient
+            this.admin = response.data.data.admin_info
+            var order_info = response.data.data.order_info
+
+            //获取所有项目类型进行去重
+            let med_chrgitm_types = []
+            for (let i = 0; i < order_info.length; i++) {
+              med_chrgitm_types.push(order_info[i].med_chrgitm_type)
+            }
+            const obj = {}
+            med_chrgitm_types = med_chrgitm_types.reduce((cur, next) => {
+              obj[next] ? '' : obj[next] = true && cur.push(next)
+              return cur
+            }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+
+            let tempOrderInfo = []
+
+            for (let i = 0; i < med_chrgitm_types.length; i++) {
+              let obj = {
+                total: 0,
+                details: []
+              }
+              let tempDetails = []
+              for (let b = 0; b < order_info.length; b++) {
+                if (med_chrgitm_types[i] == order_info[b].med_chrgitm_type) {
+                  tempDetails.push(order_info[b])
+                }
+              }
+
+              obj.details = this.setNewData(tempDetails)
+              obj.total = this.getTotal(obj.details)
+
+              obj.details.push({
+                total: obj.total,
+                is_total: 1,
+              })
+              this.list =  this.list.concat(obj.details)
+            }
+
+
+
+
+          }
+        })
+      }, getTotal:function(items){
+        let total = 0
+        for(let i = 0; i < items.length; i++){
+          total = Number(total) + Number((parseFloat(items[i].count) * parseFloat(items[i].price)).toFixed(2))
+        }
+        return total.toFixed(2)
+      },setNewData(details) {
+        let drug_ids = []
+        let project_ids = []
+
+        for (let i = 0; i < details.length; i++) {
+          if (details[i].advice && details[i].advice.id > 0 && details[i].advice.prescription && details[i].advice.prescription.type == 1) { //药品
+            let obj = {
+              id: details[i].advice.drug_id,
+              price: details[i].advice.price
+            }
+            drug_ids.push(obj)
+          } else if (details[i].project && details[i].project.id > 0 && details[i].project.prescription && details[i].project.prescription.type == 2) { //项目
+            let obj = {
+              id: details[i].project.project_id,
+              price: details[i].project.price
+
+            }
+            project_ids.push(obj)
+
+          }
+
+        }
+        //
+        // console.log('old ids')
+        // console.log(drug_ids)
+        // console.log(project_ids)
+        // console.log('old ids')
+
+        let new_drug_ids = this.unique(drug_ids)
+        let new_project_ids = this.unique(project_ids)
+        let list = []
+
+        console.log('ids')
+        console.log(new_drug_ids)
+        console.log(new_project_ids)
+        console.log('ids')
+
+        if (new_drug_ids.length > 0 && new_project_ids.length == 0) {
+          for (let i = 0; i < new_drug_ids.length; i++) {
+            let obj = {}
+            let count = 0
+            for (let a = 0; a < details.length; a++) {
+              if (new_drug_ids[i].id == details[a].advice.drug_id && new_drug_ids[i].price == details[a].advice.price) {
+                obj['name'] = details[a].advice.advice_name
+                obj['spec'] = details[a].advice.drug.drug_spec
+                obj['med_chrgitm_type'] = this.getType(details[a].med_chrgitm_type)
+                obj['price'] = parseFloat(details[a].pric)
+                obj['is_total'] = 2
+                count = count + details[a].cnt
+              }
+            }
+            obj['count'] = count
+            list.push(obj)
+          }
+        }
+
+        if (new_drug_ids.length == 0 && new_project_ids.length > 0) {
+          for (let i = 0; i < new_project_ids.length; i++) {
+            let obj = {}
+            let count = 0
+            for (let a = 0; a < details.length; a++) {
+              if (new_project_ids[i].id == details[a].project.project_id && new_project_ids[i].price == details[a].project.price) {
+                obj['name'] = details[a].project.project.project_name
+                obj['spec'] = '1'
+                obj['med_chrgitm_type'] = this.getType(details[a].med_chrgitm_type)
+                obj['price'] = parseFloat(details[a].pric)
+                obj['is_total'] = 2
+
+                count = count + details[a].cnt
+              }
+            }
+            obj['count'] = count
+            list.push(obj)
+          }
+        }
+
+        return list
+
+      }, unique(array) {
+        // res用来存储结果
+        var res = []
+        for (var i = 0, arrayLen = array.length; i < arrayLen; i++) {
+          for (var j = 0, resLen = res.length; j < resLen; j++) {
+            if (array[i].id === res[j].id && array[i].price === res[j].price) {
+              break
+            }
+          }
+          // 如果array[i]是唯一的，那么执行完循环，j等于resLen
+          if (j === resLen) {
+            res.push(array[i])
+          }
+        }
+        return res
+      },
+
+      getType(med_chrgitm_type) {
+        switch (med_chrgitm_type) {
+          case '01':
+            return '床位费'
+            break
+          case '02':
+            return '诊察费'
+
+            break
+          case '03':
+            return '检查费'
+
+            break
+          case '04':
+            return '化验费'
+            break
+          case '05':
+            return '治疗费'
+
+            break
+          case '06':
+            return '手术费'
+
+            break
+          case '07':
+            return '护理费'
+
+            break
+          case '08':
+            return '材料费'
+
+            break
+          case '09':
+            return '西药费'
+
+            break
+          case '10':
+            return '中药饮片费'
+
+            break
+          case '11':
+            return '中成药费'
+
+            break
+          case '12':
+            return '一般诊疗费'
+
+            break
+          case '13':
+            return '挂号费'
+
+            break
+          case '14':
+            return '其他费'
+
+            break
+
+        }
+
+      },
+      printThisPage() {
+
+        const style =
+          '@media print {.allListTitle{font-size: 28px;text-align: center;font-weight: bold;margin-bottom: 10px;}.allListInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .allListTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 16px;border-color: #000;text-align:left;}.allListTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
+        printJS({
+          printable: 'allList-print',
+          type: 'html',
+          style: style,
+          scanStyles: false
+        })
+
+        // if (this.org_template_info.template_id == 1) {
+        //   printJS({
+        //     printable: "dialysis-print-box",
+        //     type: "html",
+        //     style: style,
+        //     scanStyles: false
+        //   });
+        // }
+      }
+    }
+
+  }
+</script>
+
+<style>
+  .dialysis-print-order {
+    width: 960px;
+    margin: 0 auto;
+  }
+
+  .dialysis-print-order .order-yy-name {
+    margin: auto;
+    text-align: center;
+    font-size: 20px;
+    letter-spacing: 5px;
+  }
+
+  .dialysis-print-order .order-title {
+    margin: auto;
+    font-weight: 600;
+    text-align: center;
+    font-size: 22px;
+    padding: 10px;
+  }
+
+  .dialysis-print-order .table-box {
+    width: 100%;
+    line-height: 23px;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .print-table {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    line-height: 40px;
+    font-size: 14px;
+    border-color: #000;
+  }
+
+  .dialysis-print-order .print-table-no {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .under-line {
+    border-bottom: 1px solid #999;
+    width: 95%;
+    text-align: center;
+    margin-left: 2px;
+  }
+
+  .dialysis-print-order .title-box {
+    text-align: center;
+    font-size: 16px;
+  }
+
+  .dialysis-print-order .radio-lebel-box {
+    font-weight: 400;
+    cursor: pointer;
+  }
+
+  .dialysis-print-order .radio-no {
+    opacity: 0;
+    outline: none;
+    position: absolute;
+    margin: 0;
+    width: 0;
+    height: 0;
+    z-index: -1;
+  }
+
+  .dialysis-print-order .radio-inner {
+    white-space: nowrap;
+    cursor: pointer;
+    outline: none;
+    display: inline-block;
+    line-height: 1;
+    position: relative;
+    vertical-align: middle;
+  }
+
+  .dialysis-print-order .radio-fang {
+    display: inline-block;
+    position: relative;
+    border: 1px solid #000;
+    box-sizing: border-box;
+    width: 14px;
+    height: 14px;
+    background-color: #fff;
+    z-index: 1;
+    transition: border-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46),
+    background-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46);
+  }
+
+  .dialysis-print-order .is-checked-radio::after {
+    content: "√";
+    font-size: 15px;
+  }
+
+  .dialysis-print-order .print-table-no tr td {
+    padding: 8px 5px;
+    line-height: 25px;
+  }
+
+  .dialysis-print-order .print-table tr td {
+    padding: 1px 1px;
+    /*line-height: 25px;*/
+  }
+
+  .es-img {
+    height: 30px;
+  }
+
+  .advice-name {
+    text-align: left;
+  }
+
+  .advice-children {
+    display: flex;
+  }
+
+  .title-box-pro {
+    border: 0 #fff;
+    line-height: 25px;
+    height: 25px;
+    text-align: left;
+    padding-left: 10px !important;
+  }
+
+  .title-box-pro-tr {
+    border: 0 #fff;
+  }
+
+  .text-align-left {
+    text-align: left !important;
+    padding-left: 10px !important;
+    font-size: 14px !important;
+    line-height: 25px;
+  }
+
+  .print-table-tr-new td {
+    line-height: 20px !important;
+  }
+
+  .border-top-solid {
+    border: solid 1px #000;
+  }
+
+  .print-template-two tr {
+    line-height: 30px;
+  }
+
+  .table-box1 {
+    border: 1px solid #000;
+    width: 100%;
+    line-height: 30px;
+    font-size: 14px;
+    border-collapse: collapse;
+  }
+
+  .table-box1 tr {
+    border-bottom: 1px solid #000;
+  }
+</style>
+
+<style lang="scss">
+
+  .newContainer {
+
+  .dialysisPage::-webkit-scrollbar {
+    height: 15px;
+  }
+
+  .el-date-editor {
+
+  .el-input__inner {
+    padding-right: 0px;
+  }
+
+  }
+  .el-table td, .el-table th {
+    text-align: center;
+  }
+
+  }
+  .newContainer::-webkit-scrollbar {
+    height: 15px !important;
+  }
+</style>

src/xt_pages/outpatientCharges/allListTemplate/printOne.vue

@@ -0,0 +1,174 @@
+<template>
+    <div id="allList-print" class="allList-print">
+        <div v-for='(i,index) in pageArr.length' :key="index">
+            <div class="allListTitle">翁源沅胜透析中心费用汇总</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_start_time)}} 至 {{getTimes(order.settle_end_time)}}</div>
+
+            </div>
+            <table class="allListTable" border="1">
+                <tr>
+                    <td style="width:10%">类别</td>
+                    <td style="width:50%">项目名称</td>
+                    <td style="width:10%">规格</td>
+                    <td style="width:10%">单价(元)</td>
+                    <td style="width:10%">数量</td>
+                    <td style="width:10%">金额(元)</td>
+                </tr>
+                <template v-for='item in list.slice(index * 13,(index * 14) + pageArr[index])'>
+                    <tr v-if="item.is_total == 2">
+                        <td style="width:10%">{{item.med_chrgitm_type}}</td>
+                        <td style="width:50%">{{item.name}}</td>
+                        <td style="width:10%">{{item.spec}}</td>
+                        <td style="width:10%">{{(item.price).toFixed(2)}}</td>
+                        <td style="width:10%">{{item.count}}</td>
+                        <td style="width:10%">{{(item.price * item.count).toFixed(2)}}</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 {};
+        }
+      },
+    },
+    data(){
+        return{
+            page:1,
+            pageArr:[],
+        }
+    },
+    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 <= 13){
+            this.page = 1
+            this.pageArr.push(this.list.length)
+        }else if(this.list.length > 13){
+            this.page = parseInt(this.list.length / 13)
+            let num = this.list.length % 13
+            for (var i=0;i<this.page;i++){ 
+                this.pageArr.push(13)
+            }
+            if(num != 0){
+                this.pageArr.push(num)
+            }
+        }
+      }
+
+    },
+    watch:{
+        list: {
+            handler(newVal) {
+                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: 28px;
+    text-align: center;
+    font-weight: bold;
+    margin-bottom: 10px;
+}
+.allListInfo{
+    display: flex;
+    font-size: 16px;
+    justify-content: space-between;
+    margin: 10px 0;
+}
+.allListTable{
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    line-height: 40px;
+    font-size: 16px;
+    border-color: #000;
+    text-align: left;
+}
+.allListTable tr td {
+    padding: 0 5px;
+}
+.tableBottom{
+    font-size: 16px;
+    display: flex;
+    margin-top: 20px;
+}
+.tableBottomOne{
+    margin-right: 40px;
+}
+</style>

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -412,6 +412,8 @@
         }
         let params = {
           'id_card_type': this.form.id_card_type,
+          'admin_user_id':this.$store.getters.xt_user.user.id,
+
         }
         axios.get('http://127.0.0.1:9532/api/sscard', {
           params: params
@@ -455,6 +457,7 @@
         return getDictionaryDataConfig(module, filed_name)
       },
       show: function () {
+        this.form = Object.assign({}, this.resetForm)
         // this.form.name = patientInfo.name
         // this.form.gender = patientInfo.gender
         // this.form.age = patientInfo.age
@@ -472,6 +475,7 @@
 
       }, hide: function () {
         this.visibility = false
+        this.$refs['formValue'].resetFields()
       }, cancel: function (formName) {
         this.$emit('cancel', this.getValue())
         this.$refs['formValue'].resetFields()
@@ -482,7 +486,6 @@
             let value = {}
             value = this.getValue()
             this.$emit('confirm', value)
-            this.form = Object.assign({}, this.resetForm)
           }
         })
       },

src/xt_pages/outpatientCharges/listPrint.vue

@@ -0,0 +1,365 @@
+<template>
+  <div>
+    <template>
+      <el-button
+        style="position:fixed;right:25px;z-index:999"
+        :loading="loading"
+        size="small"
+        icon="el-icon-printer"
+        @click="printThisPage"
+        type="primary"
+      >打印
+      </el-button
+      >
+    </template>
+
+    <div class='dialysisPage' style="padding-top:40px;">
+      <printOne :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
+    </div>
+  </div>
+</template>
+
+<script>
+  import printOne from './listTemplate/printOne'
+  import { getHisOrderDetail } from '@/api/his/his'
+  import { uParseTime } from '@/utils/tools'
+
+  export default {
+    name: 'listPrint',
+    components: {
+      printOne
+    },
+    props: {
+      paramsObj: Object
+    },
+    data() {
+      return {
+        list: [],
+        patient:{},
+        order:{},
+        admin:{},
+      }
+    },
+    created() {
+      this.getInfo(this.paramsObj.id)
+    },
+
+    methods: {
+      getTimes(time) {
+        return uParseTime(time, '{y}-{m}-{d} {h}:{i}')
+      },
+      getInfo(order_id) {
+        let params = {
+          id: order_id
+        }
+        getHisOrderDetail(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.order = response.data.data.order
+            this.patient = response.data.data.patient
+            console.log(this.patient)
+            this.admin = response.data.data.admin_info
+
+
+            for (let i = 0; i < response.data.data.order_info.length; i++) {
+              var infos = response.data.data.order_info[i]
+              let obj = {
+                med_chrgitm_type: this.getType(infos.med_chrgitm_type),
+                price: infos.pric,
+                count: infos.cnt
+              }
+              if (infos.advice && infos.advice.id == 0 && infos.project && infos.project.id > 0) {
+                obj['p_time'] = this.getTimes(infos.project.prescription.ctime)
+                obj['name'] = infos.project.project.project_name
+                obj['spec'] = 1
+              }
+
+              if (infos.advice && infos.advice.id > 0 && infos.project && infos.project.id == 0) {
+                obj['p_time'] = this.getTimes(infos.advice.prescription.ctime)
+                obj['name'] = infos.advice.advice_name
+                obj['spec'] = infos.advice.drug.drug_spec
+              }
+              this.list.push(obj)
+              this.list.sort(function(a, b) {
+                return b.p_time < a.p_time ? 1 : -1
+              })
+
+            }
+          }
+        })
+      },
+      getType(med_chrgitm_type) {
+        switch (med_chrgitm_type) {
+          case '01':
+            return '床位费'
+            break
+          case '02':
+            return '诊察费'
+
+            break
+          case '03':
+            return '检查费'
+
+            break
+          case '04':
+            return '化验费'
+            break
+          case '05':
+            return '治疗费'
+
+            break
+          case '06':
+            return '手术费'
+
+            break
+          case '07':
+            return '护理费'
+
+            break
+          case '08':
+            return '材料费'
+
+            break
+          case '09':
+            return '西药费'
+
+            break
+          case '10':
+            return '中药饮片费'
+
+            break
+          case '11':
+            return '中成药费'
+
+            break
+          case '12':
+            return '一般诊疗费'
+
+            break
+          case '13':
+            return '挂号费'
+
+            break
+          case '14':
+            return '其他费'
+
+            break
+
+        }
+
+      },
+      printThisPage() {
+
+        const style =
+          '@media print {.listTitle{font-size: 28px;text-align: center;font-weight: bold;margin-bottom: 10px;}.listInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 16px;border-color: #000;text-align:left;}.listTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
+        printJS({
+          printable: 'list-print',
+          type: 'html',
+          style: style,
+          scanStyles: false
+        })
+
+        // if (this.org_template_info.template_id == 1) {
+        //   printJS({
+        //     printable: "dialysis-print-box",
+        //     type: "html",
+        //     style: style,
+        //     scanStyles: false
+        //   });
+        // }
+      }
+    }
+
+  }
+</script>
+
+<style>
+  .dialysis-print-order {
+    width: 960px;
+    margin: 0 auto;
+  }
+
+  .dialysis-print-order .order-yy-name {
+    margin: auto;
+    text-align: center;
+    font-size: 20px;
+    letter-spacing: 5px;
+  }
+
+  .dialysis-print-order .order-title {
+    margin: auto;
+    font-weight: 600;
+    text-align: center;
+    font-size: 22px;
+    padding: 10px;
+  }
+
+  .dialysis-print-order .table-box {
+    width: 100%;
+    line-height: 23px;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .print-table {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    line-height: 40px;
+    font-size: 14px;
+    border-color: #000;
+  }
+
+  .dialysis-print-order .print-table-no {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .under-line {
+    border-bottom: 1px solid #999;
+    width: 95%;
+    text-align: center;
+    margin-left: 2px;
+  }
+
+  .dialysis-print-order .title-box {
+    text-align: center;
+    font-size: 16px;
+  }
+
+  .dialysis-print-order .radio-lebel-box {
+    font-weight: 400;
+    cursor: pointer;
+  }
+
+  .dialysis-print-order .radio-no {
+    opacity: 0;
+    outline: none;
+    position: absolute;
+    margin: 0;
+    width: 0;
+    height: 0;
+    z-index: -1;
+  }
+
+  .dialysis-print-order .radio-inner {
+    white-space: nowrap;
+    cursor: pointer;
+    outline: none;
+    display: inline-block;
+    line-height: 1;
+    position: relative;
+    vertical-align: middle;
+  }
+
+  .dialysis-print-order .radio-fang {
+    display: inline-block;
+    position: relative;
+    border: 1px solid #000;
+    box-sizing: border-box;
+    width: 14px;
+    height: 14px;
+    background-color: #fff;
+    z-index: 1;
+    transition: border-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46),
+    background-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46);
+  }
+
+  .dialysis-print-order .is-checked-radio::after {
+    content: "√";
+    font-size: 15px;
+  }
+
+  .dialysis-print-order .print-table-no tr td {
+    padding: 8px 5px;
+    line-height: 25px;
+  }
+
+  .dialysis-print-order .print-table tr td {
+    padding: 1px 1px;
+    /*line-height: 25px;*/
+  }
+
+  .es-img {
+    height: 30px;
+  }
+
+  .advice-name {
+    text-align: left;
+  }
+
+  .advice-children {
+    display: flex;
+  }
+
+  .title-box-pro {
+    border: 0 #fff;
+    line-height: 25px;
+    height: 25px;
+    text-align: left;
+    padding-left: 10px !important;
+  }
+
+  .title-box-pro-tr {
+    border: 0 #fff;
+  }
+
+  .text-align-left {
+    text-align: left !important;
+    padding-left: 10px !important;
+    font-size: 14px !important;
+    line-height: 25px;
+  }
+
+  .print-table-tr-new td {
+    line-height: 20px !important;
+  }
+
+  .border-top-solid {
+    border: solid 1px #000;
+  }
+
+  .print-template-two tr {
+    line-height: 30px;
+  }
+
+  .table-box1 {
+    border: 1px solid #000;
+    width: 100%;
+    line-height: 30px;
+    font-size: 14px;
+    border-collapse: collapse;
+  }
+
+  .table-box1 tr {
+    border-bottom: 1px solid #000;
+  }
+</style>
+
+<style lang="scss">
+
+  .newContainer {
+
+  .dialysisPage::-webkit-scrollbar {
+    height: 15px;
+  }
+
+  .el-date-editor {
+
+  .el-input__inner {
+    padding-right: 0px;
+  }
+
+  }
+  .el-table td, .el-table th {
+    text-align: center;
+  }
+
+  }
+  .newContainer::-webkit-scrollbar {
+    height: 15px !important;
+  }
+</style>

src/xt_pages/outpatientCharges/listTemplate/printOne.vue

@@ -0,0 +1,170 @@
+<template>
+    <div id="list-print" class="list-print">
+        <div v-for='(i,index) in pageArr.length' :key="index">
+        <div class="listTitle">翁源沅胜透析中心费用清单</div>
+        <div class="listInfo">
+
+            <div>患者姓名：{{patient.name}}</div>
+            <div>透析号：{{patient.dialysis_no}}</div>
+            <div>性别：{{patient.gender == 1 ? '男': '女'}}</div>
+            <div>年龄：{{patient.age}}  岁</div>
+            <div>收费日期：{{getTimes(order.settle_start_time)}} 至 {{getTimes(order.settle_end_time)}}</div>
+
+        </div>
+        <table class="listTable" border="1">
+            <tr>
+                <td style="width:19%">开方日期</td>
+                <td style="width:10%">类别</td>
+                <td style="width:31%">项目名称</td>
+                <td style="width:14%">规格</td>
+                <td style="width:10%">单价(元)</td>
+                <td style="width:6%">数量</td>
+                <td style="width:10%">金额(元)</td>
+            </tr>
+            <tr v-for="item in list.slice(index * 13,(index * 14) + pageArr[index])">
+                <td style="width:19%">{{item.p_time}}</td>
+                <td style="width:10%">{{item.med_chrgitm_type}}</td>
+                <td style="width:31%">{{item.name}}</td>
+                <td style="width:14%">{{item.spec}}</td>
+                <td style="width:10%">{{(item.price).toFixed(2)}}</td>
+                <td style="width:6%">{{item.count}}</td>
+                <td style="width:10%">{{(item.price * item.count).toFixed(2)}}</td>
+            </tr>
+        </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 {};
+        }
+      },
+    },
+    data(){
+        return{
+            page:1,
+            pageArr:[],
+        }
+    },
+    // mounted(){
+    //     this.getPage()
+    // },
+    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}')
+      },
+      getPage(){
+        if(this.list.length <= 13){
+            this.page = 1
+            this.pageArr.push(this.list.length)
+        }else if(this.list.length > 13){
+            this.page = parseInt(this.list.length / 13)
+            let num = this.list.length % 13
+            for (var i=0;i<this.page;i++){
+                this.pageArr.push(13)
+            }
+            if(num != 0){
+                this.pageArr.push(num)
+            }
+        }
+      }
+
+    },
+    watch:{
+        list: {
+            handler(newVal) {
+                this.getPage()
+            },
+            deep: true
+        }
+    }
+
+  }
+
+
+</script>
+
+<style lang="scss" scoped>
+.list-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;
+}
+.listTitle{
+    font-size: 28px;
+    text-align: center;
+    font-weight: bold;
+    margin-bottom: 10px;
+}
+.listInfo{
+    display: flex;
+    font-size: 16px;
+    justify-content: space-between;
+    margin: 10px 0;
+}
+.listTable{
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    line-height: 40px;
+    font-size: 16px;
+    border-color: #000;
+    text-align: left;
+}
+.listTable tr td {
+    padding: 0 5px;
+}
+.tableBottom{
+    font-size: 16px;
+    display: flex;
+    margin-top: 20px;
+}
+.tableBottomOne{
+    margin-right: 40px;
+}
+</style>

src/xt_pages/outpatientCharges/newStatementPrint.vue

@@ -0,0 +1,422 @@
+<template>
+  <div>
+    <template>
+      <el-button
+        style="position:fixed;right:25px;z-index:999"
+        :loading="loading"
+        size="small"
+        icon="el-icon-printer"
+        @click="printThisPage"
+        type="primary"
+      >打印</el-button
+      >
+    </template>
+
+    <div class='dialysisPage' style="padding-top:40px;">
+      <printOne :info="info" :p_admin="p_admin" :charge_admin="charge_admin"></printOne>
+    </div>
+  </div>
+</template>
+
+<script>
+
+
+  import { parseTime } from "@/utils";
+  import { getDialysisRecord } from "@/api/dialysis";
+  import { getDataConfig } from "@/utils/data";
+  import { jsGetAge, uParseTime } from "@/utils/tools";
+  import axios from 'axios'
+
+  import BreadCrumb from "@/xt_pages/components/bread-crumb";
+  import print from "print-js";
+  import printOne from "./statementTemplate/printOne"
+  import { getAllDoctorList,getAllHisPatientList,getPrescriptionPrint } from "@/api/project/project"
+  export default {
+    name: "newStatementPrint",
+    components: {
+      BreadCrumb,
+      printOne
+    },
+    props:{
+      paramsObj:Object
+    },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '门诊医生站' },
+          { path: false, name: '打印' }
+        ],
+        record_date:"",
+        patientTableData:[],
+        advicePrint:[],
+        hisPatient:{},
+        patient:{},
+        search_input:"",
+        loading:false,
+        patient_id:0,
+        prescription_id:0,
+        ids:'',
+        info:null,
+        p_admin:{},
+        charge_admin:{},
+      };
+    },
+    methods:{
+      printThisPage() {
+        var ptime = Math.round(new Date().getTime() / 1000);
+        this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
+
+        const style =
+          '@media print {.statementTitle{font-size: 28px;text-align: center;font-weight: bold;margin-bottom: 10px;}.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 16px;border-color: #000;}}';
+        printJS({
+          printable: "statement-print",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
+
+        // if (this.org_template_info.template_id == 1) {
+        //   printJS({
+        //     printable: "dialysis-print-box",
+        //     type: "html",
+        //     style: style,
+        //     scanStyles: false
+        //   });
+        // }
+      },
+      getAllDoctorList(){
+        getAllDoctorList().then(response=>{
+          if(response.data.state == 1){
+            var doctor =  response.data.data.doctor
+
+            this.doctorList = doctor
+          }
+        })
+      },
+      getAllHisPatientList(){
+        const params = {
+          record_date:this.record_date
+        }
+        getAllHisPatientList(params).then(response=>{
+          if(response.data.state == 1){
+            this.patientTableData = response.data.data.list
+            this.patientTableDataTwo = response.data.data.list
+
+            console.log('222', this.patientTableData)
+            let cal_one = 0
+            let cal_two = 0
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              if (response.data.data.list[i].prescription == null || response.data.data.list[i].prescription.length == 0) {
+                cal_one = cal_one + 1
+              }
+              if (response.data.data.list[i].prescription != null && response.data.data.list[i].prescription.length > 0) {
+                cal_two = cal_two + 1
+              }
+            }
+            // this.$refs.tab.setCurrentRow(this.patientTableData[0])
+            // console.log(this.patientTableData[0])
+            // this.choosePatient(this.patientTableData[0])
+            this.cal_one = cal_one
+            this.cal_two = cal_two
+          }
+        })
+      },
+
+      changePatient(row){
+        console.log("row",row)
+        this.patient_id = row.patient_id
+        this.record_date = this.record_date
+        this.prescription_id = this.prescription_id
+        //   var params = {
+        //     patient_id:row.patient_id,
+        //     record_date:this.record_date,
+        //     prescription_id:this.prescription_id,
+        //   }
+        // getPrescriptionPrint(params).then(response=>{
+        //     if(response.data.state == 1){
+        //       var advicePrint =  response.data.data.advicePrint
+        //       console.log("adviceprint",advicePrint)
+        //       this.advicePrint = advicePrint
+        //       // var hisPatient =  response.data.data.hisPatient
+        //       // console.log("hispatient",hisPatient)
+        //       // this.hisPatient = hisPatient
+        //       var patient =  response.data.data.patient
+        //       console.log("patient",patient)
+        //       this.patient = patient
+        //       var doctorPorject = response.data.data.doctorPorject
+        //       console.log("doctorporject",doctorPorject)
+        //     }
+        // })
+      },
+      searchAction(){
+
+      },
+      getInfo(order_id) {
+        if (this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919) {
+
+          var that = this
+
+          axios.get('http://127.0.0.1:9532/api/settle/query', {
+            params: {
+              order_id: order_id,
+              admin_user_id:that.$store.getters.xt_user.user.id
+            }
+          })
+            .then(function (response) {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                console.log("logloglog")
+
+                console.log(response.data.data.info)
+                that.info = response.data.data.info
+                that.p_admin = response.data.data.printor_admin
+                that.charge_admin = response.data.data.charge_admin
+
+
+                console.log(that.info)
+
+                that.info['bed_cost_total'] = response.data.data.bedCostTotal
+                that.info['bed_cost_self_total'] = response.data.data.bedCostSelfTotal
+                that.info['bed_cost_part_self_total'] = response.data.data.bedCostPartSelfTotal
+
+                that.info['operation_cost_total'] = response.data.data.operationCostTotal
+                that.info['operation_cost_self_total'] = response.data.data.operationCostSelfTotal
+                that.info['operation_cost_part_self_total'] = response.data.data.operationCostPartSelfTotal
+
+                that.info['other_cost_total'] = response.data.data.otherCostTotal
+                that.info['other_cost_self_total'] = response.data.data.otherCostSelfTotal
+                that.info['other_cost_part_self_total'] = response.data.data.otherCostPartSelfTotal
+
+                that.info['material_cost_total'] = response.data.data.materialCostTotal
+                that.info['material_cost_self_total'] = response.data.data.materialCostSelfTotal
+                that.info['material_cost_part_self_total'] = response.data.data.materialCostPartSelfTotal
+
+                that.info['western_medicine_cost_total'] = response.data.data.westernMedicineCostTotal
+                that.info['western_medicine_cost_self_total'] = response.data.data.westernMedicineCostSelfTotal
+                that.info['western_medicine_cost_part_self_total'] = response.data.data.westernMedicineCostPartSelfTotal
+
+                that.info['chinese_traditional_medicine_cost_total'] = response.data.data.chineseTraditionalMedicineCostTotal
+                that.info['chinese_traditional_medicine_cost_self_total'] = response.data.data.chineseTraditionalMedicineCostSelfTotal
+                that.info['chinese_traditional_medicine_cost_part_self_total'] = response.data.data.chineseTraditionalMedicineCostPartSelfTotal
+
+
+                that.info['check_cost_total'] = response.data.data.checkCostTotal
+                that.info['check_cost_self_total'] = response.data.data.checkCostSelfTotal
+                that.info['check_cost_part_self_total'] = response.data.data.checkCostPartSelfTotal
+
+
+                that.info['laboratory_cost_total'] = response.data.data.laboratoryCostTotal
+                that.info['laboratory_cost_self_total'] = response.data.data.laboratoryCostSelfTotal
+                that.info['laboratory_cost_part_self_total'] = response.data.data.laboratoryCostPartSelfTotal
+
+                that.info['treat_cost_total'] = response.data.data.treatCostTotal
+                that.info['treat_cost_self_total'] = response.data.data.treatCostSelfTotal
+                that.info['treat_cost_part_self_total'] = response.data.data.treatCostPartSelfTotal
+                console.log(this.info)
+              }
+            })
+            .catch(function (error) {
+
+            });
+        }
+      }
+
+    },
+
+    created() {
+      this.getInfo(this.paramsObj.order_id)
+    },
+    watch:{
+      paramsObj:{//深度监听，可监听到对象、数组的变化
+        handler(val, oldVal){
+          this.paramsObj = val
+          this.getInfo(this.paramsObj.order_id)
+
+        },
+        deep:true
+      }
+    }
+
+  };
+</script>
+
+<style>
+  .dialysis-print-order {
+    width: 960px;
+    margin: 0 auto;
+  }
+
+  .dialysis-print-order .order-yy-name {
+    margin: auto;
+    text-align: center;
+    font-size: 20px;
+    letter-spacing: 5px;
+  }
+
+  .dialysis-print-order .order-title {
+    margin: auto;
+    font-weight: 600;
+    text-align: center;
+    font-size: 22px;
+    padding: 10px;
+  }
+
+  .dialysis-print-order .table-box {
+    width: 100%;
+    line-height: 23px;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .print-table {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    line-height: 40px;
+    font-size: 14px;
+    border-color: #000;
+  }
+
+  .dialysis-print-order .print-table-no {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .under-line {
+    border-bottom: 1px solid #999;
+    width: 95%;
+    text-align: center;
+    margin-left: 2px;
+  }
+
+  .dialysis-print-order .title-box {
+    text-align: center;
+    font-size: 16px;
+  }
+
+  .dialysis-print-order .radio-lebel-box {
+    font-weight: 400;
+    cursor: pointer;
+  }
+
+  .dialysis-print-order .radio-no {
+    opacity: 0;
+    outline: none;
+    position: absolute;
+    margin: 0;
+    width: 0;
+    height: 0;
+    z-index: -1;
+  }
+
+  .dialysis-print-order .radio-inner {
+    white-space: nowrap;
+    cursor: pointer;
+    outline: none;
+    display: inline-block;
+    line-height: 1;
+    position: relative;
+    vertical-align: middle;
+  }
+
+  .dialysis-print-order .radio-fang {
+    display: inline-block;
+    position: relative;
+    border: 1px solid #000;
+    box-sizing: border-box;
+    width: 14px;
+    height: 14px;
+    background-color: #fff;
+    z-index: 1;
+    transition: border-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46),
+    background-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46);
+  }
+
+  .dialysis-print-order .is-checked-radio::after {
+    content: "√";
+    font-size: 15px;
+  }
+
+  .dialysis-print-order .print-table-no tr td {
+    padding: 8px 5px;
+    line-height: 25px;
+  }
+
+  .dialysis-print-order .print-table tr td {
+    padding: 1px 1px;
+    /*line-height: 25px;*/
+  }
+
+  .es-img {
+    height: 30px;
+  }
+
+  .advice-name {
+    text-align: left;
+  }
+
+  .advice-children {
+    display: flex;
+  }
+
+  .title-box-pro {
+    border: 0 #fff;
+    line-height: 25px;
+    height: 25px;
+    text-align: left;
+    padding-left: 10px !important;
+  }
+  .title-box-pro-tr {
+    border: 0 #fff;
+  }
+  .text-align-left {
+    text-align: left !important;
+    padding-left: 10px !important;
+    font-size: 14px !important;
+    line-height: 25px;
+  }
+  .print-table-tr-new td {
+    line-height: 20px !important;
+  }
+  .border-top-solid {
+    border: solid 1px #000;
+  }
+  .print-template-two tr {
+    line-height: 30px;
+  }
+
+  .table-box1 {
+    border: 1px solid #000;
+    width: 100%;
+    line-height: 30px;
+    font-size: 14px;
+    border-collapse: collapse;
+  }
+  .table-box1 tr {
+    border-bottom: 1px solid #000;
+  }
+</style>
+
+<style lang="scss">
+
+  .newContainer{
+  .dialysisPage::-webkit-scrollbar {
+    height: 15px;
+  }
+
+  .el-date-editor{
+  .el-input__inner{
+    padding-right:0px;
+  }
+  }
+  .el-table td, .el-table th{
+    text-align: center;
+  }
+  }
+  .newContainer::-webkit-scrollbar{
+    height: 15px !important;
+  }
+</style>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -73,9 +73,13 @@
                      @click="open(4)"
                      type="primary">收费
           </el-button>
+
           <el-button size="small" @click="open(5)" type="primary"
-                    >退费
+                     v-if="this.hisPatientInfo.id > 0 && this.order.id > 0 &&  this.order.order_status == 2">退费
           </el-button>
+          <!-- <el-button size="small" @click="open(5)" type="primary"
+                    >退费
+          </el-button> -->
 
 
           <!--<el-button v-if="this.info.prescription_status >= 2" size="small" @click="open(7)" type="primary"-->
@@ -91,7 +95,7 @@
           </el-button>
 
           <!--<el-button v-if="this.$store.getters.xt_user.org_id == 9919"-->
-                     <!--size="small" @click="open(10)" type="primary"-->
+          <!--size="small" @click="open(10)" type="primary"-->
           <!--&gt;退号-->
           <!--</el-button>-->
 
@@ -110,6 +114,10 @@
           <!--&gt;查待遇-->
           <!--</el-button>-->
 
+          <!--<el-button  size="small" @click="query" type="primary"-->
+          <!--&gt;查询-->
+          <!--</el-button>-->
+
 
         </div>
 
@@ -460,6 +468,25 @@
       this.getPatientList()
     },
     methods: {
+      query() {
+        if (this.$store.getters.xt_user.org_id == 4) {
+          var that = this
+          axios.get('http://127.0.0.1:9532/api/org/info', {
+            params: {}
+          })
+            .then(function(response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.msg)
+                return false
+              } else {
+
+              }
+            })
+            .catch(function(error) {
+
+            })
+        }
+      },
       getDepartment(department_id) {
         for (let i = 0; i < this.department.length; i++) {
           if (this.department[i].id == department_id) {
@@ -1723,7 +1750,8 @@
 
           }
         })
-      }, setMonthPrescription(month_prescriptions) {
+      },
+      setMonthPrescription(month_prescriptions) {
         this.month_prescriptions = []
 
         let drug_month_prescriptions = {
@@ -1745,47 +1773,45 @@
         for (let i = 0; i < month_prescriptions.length; i++) {
           if (month_prescriptions[i].type == 1) { //药品
             for (let a = 0; a < month_prescriptions[i].advices.length; a++) {
-              drug_ids.push(month_prescriptions[i].advices[a].drug_id)
+              let obj = {
+                id: month_prescriptions[i].advices[a].drug_id,
+                price: month_prescriptions[i].advices[a].price
+
+              }
+              drug_ids.push(obj)
+              // drug_ids.push(month_prescriptions[i].advices[a].drug_id)
+
               drug_month_prescriptions.advices.push(month_prescriptions[i].advices[a])
             }
 
           } else if (month_prescriptions[i].type == 2) { //项目
             for (let a = 0; a < month_prescriptions[i].project.length; a++) {
-              project_ids.push(month_prescriptions[i].project[a].project_id)
+              let obj = {
+                id: month_prescriptions[i].project[a].project_id,
+                price: month_prescriptions[i].project[a].price
+
+              }
+              project_ids.push(obj)
               project_month_prescriptions.project.push(month_prescriptions[i].project[a])
             }
           }
           //附加收费
           for (let a = 0; a < month_prescriptions[i].addition.length; a++) {
-            additions_ids.push(month_prescriptions[i].addition[a].item_id)
+            let obj = {
+              id: month_prescriptions[i].addition[a].item_id,
+              price: month_prescriptions[i].addition[a].price
+
+            }
+            additions_ids.push(obj)
             addition_month_prescriptions.addition.push(month_prescriptions[i].addition[a])
 
           }
 
         }
 
-        const obj = {}
-        const obj1 = {}
-        const obj2 = {}
-
-        drug_ids = drug_ids.reduce((cur, next) => {
-          obj[next] ? '' : obj[next] = true && cur.push(next)
-          return cur
-        }, []) // 设置cur默认类型为数组，并且初始值为空的数组
-        project_ids = project_ids.reduce((cur, next) => {
-          obj1[next] ? '' : obj1[next] = true && cur.push(next)
-          return cur
-        }, []) // 设置cur默认类型为数组，并且初始值为空的数组
-        additions_ids = additions_ids.reduce((cur, next) => {
-          obj2[next] ? '' : obj2[next] = true && cur.push(next)
-          return cur
-        }, []) // 设置cur默认类型为数组，并且初始值为空的数组
-
-        console.log(drug_ids)
-        console.log(project_ids)
-        console.log(additions_ids)
-
-        console.log(additions_ids)
+        drug_ids = this.unique_two(drug_ids)
+        project_ids = this.unique_two(project_ids)
+        additions_ids = this.unique_two(additions_ids)
 
         let drugs = []
         let projects = []
@@ -1795,7 +1821,8 @@
           let obj = {}
           let count = 0
           for (let a = 0; a < drug_month_prescriptions.advices.length; a++) {
-            if (drug_ids[i] == drug_month_prescriptions.advices[a].drug_id) {
+            if (drug_ids[i].price == drug_month_prescriptions.advices[a].price && drug_ids[i].id == drug_month_prescriptions.advices[a].drug_id) {
+
               obj['drug_name'] = drug_month_prescriptions.advices[a].advice_name
               obj['single_dose'] = drug_month_prescriptions.advices[a].single_dose
               obj['delivery_way'] = drug_month_prescriptions.advices[a].delivery_way
@@ -1819,7 +1846,7 @@
           let obj = {}
           let count = 0
           for (let a = 0; a < project_month_prescriptions.project.length; a++) {
-            if (project_ids[i] == project_month_prescriptions.project[a].project_id) {
+            if (project_ids[i].price == project_month_prescriptions.project[a].price &&project_ids[i].id == project_month_prescriptions.project[a].project_id ) {
               obj['project_name'] = project_month_prescriptions.project[a].project.project_name
               obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification
               obj['single_dose'] = project_month_prescriptions.project[a].single_dose
@@ -1842,10 +1869,9 @@
         for (let i = 0; i < additions_ids.length; i++) {
           let obj = {}
           let count = 0
-          console.log(addition_month_prescriptions.addition)
           if (addition_month_prescriptions.addition) {
             for (let a = 0; a < addition_month_prescriptions.addition.length; a++) {
-              if (project_ids[i] == addition_month_prescriptions.addition[a].item_id) {
+              if (additions_ids[i].price == addition_month_prescriptions.addition[a].price &&additions_ids[i].id == addition_month_prescriptions.addition[a].item_id) {
                 obj['item_name'] = addition_month_prescriptions.addition[a].item_name
                 obj['id'] = addition_month_prescriptions.addition[a].id
                 obj['item_id'] = addition_month_prescriptions.addition[a].item_id
@@ -1858,10 +1884,6 @@
           }
         }
 
-        console.log(drugs)
-        console.log(projects)
-        console.log(additions)
-
         let p1 = {
           name: '处方' + 1,
           advices: drugs,
@@ -1875,16 +1897,28 @@
           project: projects,
           advices: [],
           addition: []
-
         }
-        console.log(this.month_prescriptions)
-        console.log(this.curMonthPrescriptions)
 
         this.month_prescriptions.push(p1)
         this.month_prescriptions.push(p2)
 
         this.curMonthPrescriptions = this.month_prescriptions[0]
 
+      }, unique_two(array) {
+        // res用来存储结果
+        var res = []
+        for (var i = 0, arrayLen = array.length; i < arrayLen; i++) {
+          for (var j = 0, resLen = res.length; j < resLen; j++) {
+            if (array[i].id === res[j].id && array[i].price === res[j].price) {
+              break
+            }
+          }
+          // 如果array[i]是唯一的，那么执行完循环，j等于resLen
+          if (j === resLen) {
+            res.push(array[i])
+          }
+        }
+        return res
       },
 
       unique(arr) {

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -157,6 +157,8 @@ export default {
         axios.get('http://127.0.0.1:9532/api/settle/query', {
           params: {
             order_id: order_id,
+            admin_user_id:this.$store.getters.xt_user.user.id,
+
           }
         })
           .then(function (response) {

src/xt_pages/outpatientCharges/statementTemplate/printOne.vue

@@ -1,251 +1,342 @@
 <template>
-    <div id="statement-print" class="statement-print">
-        <div class="statementTitle">广东省社会医疗保险医疗费用结算单</div>
-        <table class="statementTable" border="1">
-            <tr>
-                <td width="80">机构名称</td>
-                <td colspan="4">{{info.fixmedins_name}}</td>
-                <td width="80">机构编码</td>
-                <td colspan="4">{{info.fixmedins_code}}</td>
-                <td width="100">医保结算级别</td>
-                <td width="100"></td>
-            </tr>
-            <tr>
-                <td width="90">就医登记号</td>
-                <td colspan="11">{{info.psn_no}}</td>
-            </tr>
-            <tr>
-                <td width="80">姓名</td>
-                <td width="80">{{info.psn_name}}</td>
-                <td width="80">性别</td>
-                <td width="50" v-if="info.gend == '1'">男</td>
-              <td width="50" v-if="info.gend == '2'">女</td>
+  <div id="statement-print" class="statement-print">
+    <div class="statementTitle">广东省社会医疗保险医疗费用结算单</div>
+    <table class="statementTable" border="1">
+      <tr>
+        <td width="80">机构名称</td>
+        <td colspan="4">{{info.fixmedins_name}}</td>
+        <td width="80">机构编码</td>
+        <td colspan="4">{{info.fixmedins_code}}</td>
+        <td width="100">医保结算级别</td>
+        <td width="100" v-if="info.hosp_lv == '1'">三级特等</td>
+        <td width="100" v-if="info.hosp_lv == '2'">三级甲等</td>
+        <td width="100" v-if="info.hosp_lv == '3'">三级乙等</td>
+        <td width="100" v-if="info.hosp_lv == '4'">三级丙等</td>
+        <td width="100" v-if="info.hosp_lv == '5'">二级甲等</td>
+        <td width="100" v-if="info.hosp_lv == '6'">二级乙等</td>
+        <td width="100" v-if="info.hosp_lv == '7'">二级丙等</td>
+        <td width="100" v-if="info.hosp_lv == '8'">一级甲等</td>
+        <td width="100" v-if="info.hosp_lv == '9'">一级乙等</td>
+        <td width="100" v-if="info.hosp_lv == '10'">一级丙等</td>
+        <td width="100" v-if="info.hosp_lv == '11'">无等级</td>
 
-              <td width="80">出生日期</td>
-                <td width="100">{{info.brdy}}</td>
-                <td width="90">个人电脑号</td>
-                <td width="110"></td>
-                <td width="80">人员类别</td>
-                <td colspan="3"></td>
-            </tr>
-            <tr>
-                <td>单位名称</td>
-                <td colspan="5">{{info.emp_name}}</td>
-                <td width="80">联系电话</td>
-                <td width="110"></td>
-                <td width="80">身份证号</td>
-                <td colspan="3">{{info.certno}}</td>
-            </tr>
-            <tr>
-                <td>住院号</td>
-                <td></td>
-                <td>科别</td>
-                <td width="100"></td>
-                <td>床号</td>
-                <td></td>
-                <td>入院日期</td>
-                <td></td>
-                <td>出院日期</td>
-                <td width="100"></td>
-                <td>住院天数</td>
-                <td></td>
-            </tr>
-            <tr>
-                <td>险种</td>
-                  <td colspan="2" v-if="info.insutype == '310'">职工基本医疗保险</td>
-                  <td colspan="2" v-if="info.insutype == '320'">公务员医疗补助</td>
-                  <td colspan="2" v-if="info.insutype == '330'">大额医疗费用补助</td>
-                  <td colspan="2" v-if="info.insutype == '340'">离休人员医疗保障</td>
-                  <td colspan="2" v-if="info.insutype == '390'">城乡居民基本医疗保险</td>
-                  <td colspan="2" v-if="info.insutype == '392'">城乡居民大病医疗保险</td>
-                  <td colspan="2" v-if="info.insutype == '510'">生育保险</td>
 
+      </tr>
+      <tr>
+        <td width="90">就医登记号</td>
+        <td colspan="11">{{info.psn_no}}</td>
+      </tr>
+      <tr>
+        <td width="80">姓名</td>
+        <td width="80">{{info.psn_name}}</td>
+        <td width="80">性别</td>
+        <td width="50" v-if="info.gend == '1'">男</td>
+        <td width="50" v-if="info.gend == '2'">女</td>
 
-              <td>入院第一诊断</td>
-                <td colspan="3"></td>
-                <td>出院第一诊断</td>
-                <td colspan="4"></td>
-            </tr>
-            <tr>
-                <td>业务类别</td>
-                <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '11'">普通门诊</td>
-                 <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '12'">门诊挂号</td>
-                <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '13'">急诊</td>
-                <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '14'">门诊特殊病</td>
-                <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '15'">门诊统筹</td>
-                <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '16'">门诊慢性病</td>
-              <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '21'">普通住院</td>
+        <td width="80">出生日期</td>
+        <td width="100">{{info.brdy}}</td>
+        <td width="90">个人电脑号</td>
+        <td width="110"></td>
+        <td width="80">人员类别</td>
+        <td colspan="3" v-if="info.psn_type == '11'">在职</td>
+        <td colspan="3" v-if="info.psn_type == '1101'">职工在职</td>
+        <td colspan="3" v-if="info.psn_type == '1102'">公务员在职</td>
+        <td colspan="3" v-if="info.psn_type == '1103'">灵活就业人员在职</td>
+        <td colspan="3" v-if="info.psn_type == '1160'">地方其他扩展人员</td>
 
-              <td>结算时间</td>
-                <td colspan="5" style="text-align:left;padding-left:10px;">{{info.setl_time}}</td>
-            </tr>
-            <tr>
-                <td colspan="12" style="text-align:left;padding-left:10px;">
-                    本次就医：总费用{{info.medfee_sumamt}}元，基金支付{{info.fund_pay_sumamt}}元，个人支付{{info.psn_pay}}元。
-                </td>
-            </tr>
-            <tr>
-                <td>费用名称</td>
-                <td colspan="2">总费用</td>
-                <td>自费</td>
-                <td colspan="2">部分项目自付</td>
-                <td>费用名称</td>
-                <td colspan="2">总费用</td>
-                <td>自费</td>
-                <td colspan="2">部分项目自付</td>
-            </tr>
-            <tr>
-                <td>床位费</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">{{info.bed_cost_total}}</td>
-                <td style="text-align:right;padding-right:10px;">{{info.bed_cost_self_total}}</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">{{info.bed_cost_part_self_total}}</td>
-                <td>西成药</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">{{info.western_medicine_cost_total}}</td>
-                <td style="text-align:right;padding-right:10px;">{{info.western_medicine_cost_self_total}}</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">{{info.western_medicine_cost_part_self_total}}</td>
-            </tr>
-            <tr>
-                <td>中药费</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
-                <td style="text-align:right;padding-right:10px;">0</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
-                <td>中成药</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">{{info.chinese_traditional_medicine_cost_total}}</td>
-                <td style="text-align:right;padding-right:10px;">{{info.chinese_traditional_medicine_cost_self_total}}</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">{{info.chinese_traditional_medicine_cost_part_self_total}}</td>
-            </tr>
-            <tr>
-                <td>中草药</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
-                <td style="text-align:right;padding-right:10px;">0</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
-                <td>检查费</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">{{info.check_cost_total}}</td>
-                <td style="text-align:right;padding-right:10px;">{{info.check_cost_self_total}}</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">{{info.check_cost_part_self_total}}</td>
-            </tr>
-            <tr>
-                <td>治疗费</td>
-              <td colspan="2" style="text-align:right;padding-right:10px;">{{info.treat_cost_total}}</td>
-              <td style="text-align:right;padding-right:10px;">{{info.treat_cost_self_total}}</td>
-              <td colspan="2" style="text-align:right;padding-right:10px;">{{info.treat_cost_part_self_total}}</td>
-                <td>放射费</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
-                <td style="text-align:right;padding-right:10px;">0</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
-            </tr>
-            <tr>
-                <td>手术费</td>
-              <td colspan="2" style="text-align:right;padding-right:10px;">{{info.operation_cost_total}}</td>
-              <td style="text-align:right;padding-right:10px;">{{info.operation_cost_self_total}}</td>
-              <td colspan="2" style="text-align:right;padding-right:10px;">{{info.operation_cost_part_self_total}}</td>
-                <td>化验费</td>
-              <td colspan="2" style="text-align:right;padding-right:10px;">{{info.laboratory_cost_total}}</td>
-              <td style="text-align:right;padding-right:10px;">{{info.laboratory_cost_self_total}}</td>
-              <td colspan="2" style="text-align:right;padding-right:10px;">{{info.laboratory_cost_part_self_total}}</td>
-            </tr>
-            <tr>
-                <td>输血费</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
-                <td style="text-align:right;padding-right:10px;">0</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
-                <td>输氧费</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
-                <td style="text-align:right;padding-right:10px;">0</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
-            </tr>
-            <tr>
-                <td>其他</td>
-              <td colspan="2" style="text-align:right;padding-right:10px;">{{info.other_cost_total}}</td>
-              <td style="text-align:right;padding-right:10px;">{{info.other_cost_self_total}}</td>
-              <td colspan="2" style="text-align:right;padding-right:10px;">{{info.other_cost_part_self_total}}</td>
-                <td>麻醉费</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
-                <td style="text-align:right;padding-right:10px;">0</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
-            </tr>
-            <tr>
-                <td>材料费</td>
-              <td colspan="2" style="text-align:right;padding-right:10px;">{{info.material_cost_total}}</td>
-              <td style="text-align:right;padding-right:10px;">{{info.material_cost_self_total}}</td>
-              <td colspan="2" style="text-align:right;padding-right:10px;">{{info.material_cost_part_self_total}}</td>
-                <td>特殊检查费</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
-                <td style="text-align:right;padding-right:10px;">0</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
-            </tr>
-            <tr>
-                <td>特殊治疗费</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
-                <td style="text-align:right;padding-right:10px;">0</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
-                <td style="text-align:right;padding-right:10px;"></td>
-                <td colspan="2" style="text-align:right;padding-right:10px;"></td>
-                <td style="text-align:right;padding-right:10px;"></td>
-                <td colspan="2" style="text-align:right;padding-right:10px;"></td>
-            </tr>
-            <tr>
-                <td>合计</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_total) + parseFloat(info.operation_cost_total) + parseFloat(info.other_cost_total) + parseFloat(info.material_cost_total) + parseFloat(info.western_medicine_cost_total) + parseFloat(info.chinese_traditional_medicine_cost_total) + parseFloat(info.check_cost_total) + parseFloat(info.laboratory_cost_total) + parseFloat(info.treat_cost_total)).toFixed(2) }}</td>
-                <td style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_self_total )+ parseFloat(info.operation_cost_self_total) + parseFloat(info.other_cost_self_total) + parseFloat(info.material_cost_self_total) + parseFloat(info.western_medicine_cost_self_total) + parseFloat(info.chinese_traditional_medicine_cost_self_total) + parseFloat(info.check_cost_self_total) + parseFloat(info.laboratory_cost_self_total) + parseFloat(info.treat_cost_self_total)).toFixed(2)}}</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_part_self_total) + parseFloat(info.operation_cost_part_self_total) + parseFloat(info.other_cost_part_self_total) + parseFloat(info.material_cost_part_self_total) + parseFloat(info.western_medicine_cost_part_self_total) + parseFloat(info.chinese_traditional_medicine_cost_part_self_total) + parseFloat(info.check_cost_part_self_total) + parseFloat(info.laboratory_cost_part_self_total) + parseFloat(info.treat_cost_part_self_total)).toFixed(2)}}</td>
-                <td style="text-align:right;padding-right:10px;"></td>
-                <td colspan="2" style="text-align:right;padding-right:10px;"></td>
-                <td style="text-align:right;padding-right:10px;"></td>
-                <td colspan="2" style="text-align:right;padding-right:10px;"></td>
-            </tr>
-            <tr>
-                <td colspan="3" style="text-align:left;padding-left:10px;">基本医疗保险统筹基金支付</td>
-                <td colspan="3">{{info.hifp_pay}}</td>
-                <td colspan="3" style="text-align:left;padding-left:10px;">大额基金支付</td>
-                <td colspan="3">{{info.hifob_pay}}</td>
-            </tr>
-            <tr>
-                <td colspan="3" style="text-align:left;padding-left:10px;">大病基金支付</td>
-                <td colspan="3">{{info.hifmi_pay}}</td>
-                <td colspan="3" style="text-align:left;padding-left:10px;">补充保险基金支付</td>
-                <td colspan="3">{{info.hifes_pay}}</td>
-            </tr>
-            <tr>
-                <td colspan="3" style="text-align:left;padding-left:10px;">医疗救助基金支付</td>
-                <td colspan="3">{{info.maf_pay}}</td>
-                <td colspan="3" style="text-align:left;padding-left:10px;">公务员基金支付</td>
-                <td colspan="3">{{info.cvlserv_pay}}</td>
-            </tr>
-            <tr>
-                <td>收款人:</td>
-                <td colspan="2"></td>
-                <td>审核人:</td>
-                <td colspan="2"></td>
-                <td>制单人:</td>
-                <td colspan="2"></td>
-                <td>打印日期</td>
-                <td colspan="2"></td>
-            </tr>
-            <tr>
-                <td colspan="12" style="text-align:left;padding-left:10px;line-height:20px;">
-                    注: 1、部分项目自付金额是指基本医疗保险范围内的项目需参保人先按规定比例自付的金额。<br />
-                    &ensp;&ensp;&ensp;2、此表由医院打印。<br />
-                    &ensp;&ensp;&ensp;3、此表一式两份，医院、参保人各一份。
-                </td>
-            </tr>
-            <tr>
-                <td colspan="12" style="text-align:left;padding-left:10px;">
-                    病人家属签字:
-                </td>
-            </tr>
-        </table>
-    </div>
+
+        <td colspan="3" v-if="info.psn_type == '12'">退休人员</td>
+        <td colspan="3" v-if="info.psn_type == '1201'">职工退休</td>
+        <td colspan="3" v-if="info.psn_type == '1202'">公务员退休</td>
+        <td colspan="3" v-if="info.psn_type == '1203'">灵活就业人员退休</td>
+        <td colspan="3" v-if="info.psn_type == '1260'">地方其他扩展人员</td>
+
+
+        <td colspan="3" v-if="info.psn_type == '13'">离休</td>
+        <td colspan="3" v-if="info.psn_type == '1300'">离休人员</td>
+        <td colspan="3" v-if="info.psn_type == '1360'">地方其他扩展人员</td>
+
+        <td colspan="3" v-if="info.psn_type == '14'">居民(未成年)</td>
+        <td colspan="3" v-if="info.psn_type == '1401'">新生儿</td>
+        <td colspan="3" v-if="info.psn_type == '1402'">学龄前儿童</td>
+        <td colspan="3" v-if="info.psn_type == '1403'">中小学生</td>
+        <td colspan="3" v-if="info.psn_type == '1404'">大学生</td>
+        <td colspan="3" v-if="info.psn_type == '1405'">未成年(未入学)</td>
+
+
+        <td colspan="3" v-if="info.psn_type == '15'">居民(成年)</td>
+        <td colspan="3" v-if="info.psn_type == '1501'">普通居民(成年)</td>
+        <td colspan="3" v-if="info.psn_type == '1560'">地方其他扩展身份</td>
+
+        <td colspan="3" v-if="info.psn_type == '16'">居民(老年)</td>
+
+
+
+      </tr>
+      <tr>
+        <td>单位名称</td>
+        <td colspan="5">{{info.emp_name}}</td>
+        <td width="80">联系电话</td>
+        <td width="110"></td>
+        <td width="80">身份证号</td>
+        <td colspan="3">{{info.certno}}</td>
+      </tr>
+      <tr>
+        <td>住院号</td>
+        <td></td>
+        <td>科别</td>
+        <td width="100"></td>
+        <td>床号</td>
+        <td></td>
+        <td>入院日期</td>
+        <td></td>
+        <td>出院日期</td>
+        <td width="100"></td>
+        <td>住院天数</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>险种</td>
+        <td colspan="2" v-if="info.insutype == '310'">职工基本医疗保险</td>
+        <td colspan="2" v-if="info.insutype == '320'">公务员医疗补助</td>
+        <td colspan="2" v-if="info.insutype == '330'">大额医疗费用补助</td>
+        <td colspan="2" v-if="info.insutype == '340'">离休人员医疗保障</td>
+        <td colspan="2" v-if="info.insutype == '390'">城乡居民基本医疗保险</td>
+        <td colspan="2" v-if="info.insutype == '392'">城乡居民大病医疗保险</td>
+        <td colspan="2" v-if="info.insutype == '510'">生育保险</td>
+
+
+        <td>入院第一诊断</td>
+        <td colspan="3"></td>
+        <td>出院第一诊断</td>
+        <td colspan="4"></td>
+      </tr>
+      <tr>
+        <td>业务类别</td>
+        <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '11'">普通门诊</td>
+        <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '12'">门诊挂号</td>
+        <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '13'">急诊</td>
+        <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '14'">门诊特殊病</td>
+        <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '15'">门诊统筹</td>
+        <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '16'">门诊慢性病</td>
+        <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '21'">普通住院</td>
+
+        <td>结算时间</td>
+        <td colspan="5" style="text-align:left;padding-left:10px;">{{info.setl_time}}</td>
+      </tr>
+      <tr>
+        <td colspan="12" style="text-align:left;padding-left:10px;">
+          本次就医：总费用{{info.medfee_sumamt}}元，基金支付{{info.fund_pay_sumamt}}元，个人支付{{info.psn_pay}}元。
+        </td>
+      </tr>
+      <tr>
+        <td>费用名称</td>
+        <td colspan="2">总费用</td>
+        <td>自费</td>
+        <td colspan="2">部分项目自付</td>
+        <td>费用名称</td>
+        <td colspan="2">总费用</td>
+        <td>自费</td>
+        <td colspan="2">部分项目自付</td>
+      </tr>
+      <tr>
+        <td>床位费</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.bed_cost_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{info.bed_cost_self_total}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.bed_cost_part_self_total}}</td>
+        <td>西成药</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.western_medicine_cost_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{info.western_medicine_cost_self_total}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.western_medicine_cost_part_self_total}}</td>
+      </tr>
+      <tr>
+        <td>中药费</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+        <td style="text-align:right;padding-right:10px;">0</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+        <td>中成药</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.chinese_traditional_medicine_cost_total}}
+        </td>
+        <td style="text-align:right;padding-right:10px;">{{info.chinese_traditional_medicine_cost_self_total}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">
+          {{info.chinese_traditional_medicine_cost_part_self_total}}
+        </td>
+      </tr>
+      <tr>
+        <td>中草药</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+        <td style="text-align:right;padding-right:10px;">0</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+        <td>检查费</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.check_cost_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{info.check_cost_self_total}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.check_cost_part_self_total}}</td>
+      </tr>
+      <tr>
+        <td>治疗费</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.treat_cost_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{info.treat_cost_self_total}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.treat_cost_part_self_total}}</td>
+        <td>放射费</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+        <td style="text-align:right;padding-right:10px;">0</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+      </tr>
+      <tr>
+        <td>手术费</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.operation_cost_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{info.operation_cost_self_total}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.operation_cost_part_self_total}}</td>
+        <td>化验费</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.laboratory_cost_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{info.laboratory_cost_self_total}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.laboratory_cost_part_self_total}}</td>
+      </tr>
+      <tr>
+        <td>输血费</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+        <td style="text-align:right;padding-right:10px;">0</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+        <td>输氧费</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+        <td style="text-align:right;padding-right:10px;">0</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+      </tr>
+      <tr>
+        <td>其他</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.other_cost_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{info.other_cost_self_total}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.other_cost_part_self_total}}</td>
+        <td>麻醉费</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+        <td style="text-align:right;padding-right:10px;">0</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+      </tr>
+      <tr>
+        <td>材料费</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.material_cost_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{info.material_cost_self_total}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.material_cost_part_self_total}}</td>
+        <td>特殊检查费</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+        <td style="text-align:right;padding-right:10px;">0</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+      </tr>
+      <tr>
+        <td>特殊治疗费</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+        <td style="text-align:right;padding-right:10px;">0</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+        <td style="text-align:right;padding-right:10px;"></td>
+        <td colspan="2" style="text-align:right;padding-right:10px;"></td>
+        <td style="text-align:right;padding-right:10px;"></td>
+        <td colspan="2" style="text-align:right;padding-right:10px;"></td>
+      </tr>
+      <tr>
+        <td>合计</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_total) +
+          parseFloat(info.operation_cost_total) + parseFloat(info.other_cost_total) +
+          parseFloat(info.material_cost_total) + parseFloat(info.western_medicine_cost_total) +
+          parseFloat(info.chinese_traditional_medicine_cost_total) + parseFloat(info.check_cost_total) +
+          parseFloat(info.laboratory_cost_total) + parseFloat(info.treat_cost_total)).toFixed(2) }}
+        </td>
+        <td style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_self_total )+
+          parseFloat(info.operation_cost_self_total) + parseFloat(info.other_cost_self_total) +
+          parseFloat(info.material_cost_self_total) + parseFloat(info.western_medicine_cost_self_total) +
+          parseFloat(info.chinese_traditional_medicine_cost_self_total) + parseFloat(info.check_cost_self_total) +
+          parseFloat(info.laboratory_cost_self_total) + parseFloat(info.treat_cost_self_total)).toFixed(2)}}
+        </td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_part_self_total) +
+          parseFloat(info.operation_cost_part_self_total) + parseFloat(info.other_cost_part_self_total) +
+          parseFloat(info.material_cost_part_self_total) + parseFloat(info.western_medicine_cost_part_self_total) +
+          parseFloat(info.chinese_traditional_medicine_cost_part_self_total) +
+          parseFloat(info.check_cost_part_self_total) + parseFloat(info.laboratory_cost_part_self_total) +
+          parseFloat(info.treat_cost_part_self_total)).toFixed(2)}}
+        </td>
+        <td style="text-align:right;padding-right:10px;"></td>
+        <td colspan="2" style="text-align:right;padding-right:10px;"></td>
+        <td style="text-align:right;padding-right:10px;"></td>
+        <td colspan="2" style="text-align:right;padding-right:10px;"></td>
+      </tr>
+      <tr>
+        <td colspan="3" style="text-align:left;padding-left:10px;">基本医疗保险统筹基金支付</td>
+        <td colspan="3">{{info.hifp_pay}}</td>
+        <td colspan="3" style="text-align:left;padding-left:10px;">大额基金支付</td>
+        <td colspan="3">{{info.hifob_pay}}</td>
+      </tr>
+      <tr>
+        <td colspan="3" style="text-align:left;padding-left:10px;">大病基金支付</td>
+        <td colspan="3">{{info.hifmi_pay}}</td>
+        <td colspan="3" style="text-align:left;padding-left:10px;">补充保险基金支付</td>
+        <td colspan="3">{{info.hifes_pay}}</td>
+      </tr>
+      <tr>
+        <td colspan="3" style="text-align:left;padding-left:10px;">医疗救助基金支付</td>
+        <td colspan="3">{{info.maf_pay}}</td>
+        <td colspan="3" style="text-align:left;padding-left:10px;">公务员基金支付</td>
+        <td colspan="3">{{info.cvlserv_pay}}</td>
+      </tr>
+      <tr>
+        <td>收款人:</td>
+        <td colspan="2">{{charge_admin.user_name}}</td>
+        <td>审核人:</td>
+        <td colspan="2"></td>
+        <td>制单人:</td>
+        <td colspan="2">{{p_admin.user_name}}</td>
+        <td>打印日期</td>
+        <td colspan="2">{{getNowTime()}}</td>
+      </tr>
+      <tr>
+        <td colspan="12" style="text-align:left;padding-left:10px;line-height:20px;">
+          注: 1、部分项目自付金额是指基本医疗保险范围内的项目需参保人先按规定比例自付的金额。<br/>
+          &ensp;&ensp;&ensp;2、此表由医院打印。<br/>
+          &ensp;&ensp;&ensp;3、此表一式两份，医院、参保人各一份。
+        </td>
+      </tr>
+      <tr>
+        <td colspan="12" style="text-align:left;padding-left:10px;">
+          病人家属签字:
+        </td>
+      </tr>
+    </table>
+  </div>
 </template>
 <script>
   export default {
     props: {
       info: {
         type: Object,
-        default: function () {
-          return {};
+        default: function() {
+          return {}
+        }
+      }, p_admin: {
+        type: Object,
+        default: function() {
+          return {}
         }
+      }, charge_admin: {
+        type: Object,
+        default: function() {
+          return {}
+        }
+      }
+    },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
       },
+
     }
   }
 
@@ -253,27 +344,28 @@
 </script>
 
 
-
 <style lang="scss" scoped>
-.statement-print{
+  .statement-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;
-}
-.statementTitle{
+    padding: 20px 10px;
+  }
+
+  .statementTitle {
     font-size: 28px;
     text-align: center;
     font-weight: bold;
     margin-bottom: 10px;
-}
-.statementTable{
+  }
+
+  .statementTable {
     width: 100%;
     text-align: center;
     border-collapse: collapse;
     line-height: 40px;
     font-size: 14px;
     border-color: #000;
-}
+  }
 </style>

src/xt_pages/outpatientCharges/summary.vue

@@ -39,7 +39,18 @@
           <!--<el-radio v-model="radio" label="1">明细</el-radio>-->
           <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
         </div>
-        <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
+        <div>
+          <el-popover
+            placement="bottom"
+            width="210"
+            trigger="click">
+            <el-button size="small" ref="button_two" @click="open(1)">打印清单</el-button>
+            <el-button size="small" ref="button_six" @click="open(2)">打印汇总</el-button>
+            <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
+
+          </el-popover>
+          <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
+        </div>
       </div>
       <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }"
                 :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
@@ -85,6 +96,7 @@
         <el-table-column align="center" prop="name" label="操作">
           <template slot-scope="scope">
             <el-button size="mini" type="primary" @click="toDetail(scope.row)">详情</el-button>
+            <el-button size="mini" type="primary" @click="toPrint(scope.row)" v-if="$store.getters.xt_user.org_id == 9919 && scope.row.order_status == 2">结算单</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -102,6 +114,29 @@
       </el-pagination>
     </div>
 
+    <el-dialog
+      class="centerDialog"
+      width="1200px"
+      title="打印"
+      :visible.sync="statementVisible">
+      <!--<statementPrint ref="print" :paramsObj='orderObj'></statementPrint>-->
+    <new-statement-print ref="print" :paramsObj='orderObj'></new-statement-print>
+    </el-dialog>
+    <el-dialog
+      class="centerDialog"
+      width="900px"
+      title="打印"
+      :visible.sync="listVisible">
+      <listPrint></listPrint>
+    </el-dialog>
+    <el-dialog
+      class="centerDialog"
+      width="900px"
+      title="打印"
+      :visible.sync="allListVisible">
+      <allListPrint :paramsObj='paramsObj'></allListPrint>
+    </el-dialog>
+
 
   </div>
 </template>
@@ -111,13 +146,23 @@
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import { getHisOrderList,getDoctorList,getExportConsumeDetailList } from '@/api/his/his'
   import { uParseTime } from '@/utils/tools'
+  import statementPrint from './statementPrint'
+  import NewStatementPrint from './newStatementPrint'
+  import listPrint from './listPrint'
+  import allListPrint from './allListPrint'
+
 
   export default {
     components: {
-      BreadCrumb
+      NewStatementPrint,
+      BreadCrumb,
+      listPrint,
+      allListPrint
     },
     data() {
       return {
+        orderObj: {},
+        statementVisible: false,
         crumbs: [
           { path: false, name: '门诊收费' },
           { path: false, name: '项目消费明细汇总' }
@@ -131,10 +176,20 @@
         total:"",
         doctors:[],
         admin_user_id:"",
+        listVisible:false,
+        allListVisible:false
 
       }
     },
     methods: {
+      toPrint(row){
+        this.statementVisible = true
+        let obj = {
+          order_id: row.id
+        }
+        this.orderObj = obj
+
+      },
       export_detail(){
         let params= {
           start_time:this.start_time,
@@ -273,7 +328,7 @@
         return uParseTime(time, "{y}-{m}-{d}");
       },
       toDetail(row) {
-        this.$router.push('/outpatientCharges/summaryDetail?patient_id='+row.patient.id+"&number="+row.number)
+        this.$router.push('/outpatientCharges/summaryDetail?patient_id='+row.patient.id+"&number="+row.number+"&id="+row.id)
       }, getTime(value, temp) {
         if (value != undefined) {
           return uParseTime(value, temp)
@@ -307,8 +362,13 @@
             this.doctors = response.data.data.doctors
           }
         })
-
-
+      },
+      open(index){
+        if(index == 1){
+          this.listVisible = true
+        }else if(index == 2){
+          this.allListVisible = true
+        }
       }
     }, created() {
      this.getDoctorList()

src/xt_pages/outpatientCharges/summaryDetail.vue

@@ -3,6 +3,15 @@
         <div class="position">
             <bread-crumb :crumbs='crumbs'></bread-crumb>
         </div>
+      <el-popover
+        placement="bottom"
+        width="210"
+        trigger="click">
+        <el-button size="small" ref="button_two" @click="open(1)">打印清单</el-button>
+        <el-button size="small" ref="button_six" @click="open(2)">打印汇总</el-button>
+        <el-button  slot="reference" style="margin:10px 10px;float: right" type="primary" size="small" >打印</el-button>
+
+      </el-popover>
         <div class="app-container" style="display:flex;flex: 1;padding: 20px 20px 0px 20px;">
             <div class="mainCenter">
                 <div class="centerLeft">
@@ -78,7 +87,7 @@
 
                     </div>
                     <div class="costBox">
-                      <span>当前处方总费用：<span style="color:red;">{{ order.medfee_sumamt }}元</span></span>
+                      <span>当前处方总费用：<span style="color:red;">{{ order.medfee_sumamt}}元</span></span>
                       <span v-if="order.order_status == 1">待结算</span>
                       <span v-if="order.order_status == 2">已结算</span>
                       <span v-if="order.order_status == 3">已退费</span>
@@ -112,6 +121,28 @@
                 </div>
             </div>
         </div>
+
+      <div v-if="listVisible">
+      <el-dialog
+        class="centerDialog"
+        width="900px"
+        title="打印"
+        :visible.sync="listVisible">
+        <list-print  :paramsObj='paramsObj'></list-print>
+      </el-dialog>
+      </div>
+
+      <div v-if="allListVisible">
+      <el-dialog
+        class="centerDialog"
+        width="900px"
+        title="打印"
+        :visible.sync="allListVisible">
+        <all-list-print :paramsObj='paramsObj'></all-list-print>
+      </el-dialog>
+      </div>
+
+
     </div>
 </template>
 
@@ -121,15 +152,24 @@ import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import { getHisOrder } from '@/api/his/his'
 import prescriptionTable from './components/prescriptionTable'
 import { getDictionaryDataConfig} from "@/utils/data";
+import ListPrint from './listPrint'
+import AllListPrint from './allListPrint'
 
 export default {
     components:{
+      AllListPrint,
+      ListPrint,
         BreadCrumb,
       prescriptionTable,
 
     },
     data(){
         return{
+          listVisible:false,
+          allListVisible:false,
+          paramsObj:{
+            id:this.$route.query.id
+          },
             crumbs: [
                 { path: false, name: '门诊收费' },
                 { path: false, name: '项目消费明细汇总详情' }
@@ -165,6 +205,43 @@ export default {
     },created(){
       this.GetOrderDetail()
   },methods:{
+      open(val){
+        if(val == 1){
+          this.paramsObj.id == this.$route.query.id
+          this.listVisible = true
+
+        }else if(val == 2){
+          this.paramsObj.id == this.$route.query.id
+          this.allListVisible = true
+        }
+      },
+    // getTotal() {
+    //   var total = 0
+    //   for (let i = 0; i < this.prescriptions.length; i++) {
+    //     if (this.prescriptions[i].advices != null) {
+    //       for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
+    //         console.log(this.prescriptions[i].advices[a].price )
+    //         console.log(this.prescriptions[i].advices[a].prescribing_number)
+    //
+    //         total = parseFloat(total) + parseFloat(this.prescriptions[i].advices[a].price * this.prescriptions[i].advices[a].prescribing_number)
+    //       }
+    //     }
+    //     if (this.prescriptions[i].project != null) {
+    //       for (let a = 0; a < this.prescriptions[i].project.length; a++) {
+    //
+    //         total = parseFloat(total) + parseFloat(this.prescriptions[i].project[a].price * this.prescriptions[i].project[a].count)
+    //       }
+    //     }
+    //
+    //     if (this.prescriptions[i].addition != null) {
+    //       for (let b = 0; b < this.prescriptions[i].addition.length; b++) {
+    //         total = parseFloat(total) + parseFloat(this.prescriptions[i].addition[a].price * this.prescriptions[i].addition[b].count)
+    //       }
+    //     }
+    //   }
+    //   return total.toFixed(2)
+    //
+    // },
     getDictionaryDataConfig(module, filed_name) {
       return getDictionaryDataConfig(module, filed_name)
     },
@@ -193,7 +270,6 @@ export default {
     },  getGroup(id){
       var name = ""
       var statistics_category =  getDictionaryDataConfig('system','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
@@ -221,7 +297,154 @@ export default {
       if (tab == 'more') {
         return false
       }
+    },  unique(array) {
+      // res用来存储结果
+      var res = []
+      for (var i = 0, arrayLen = array.length; i < arrayLen; i++) {
+        for (var j = 0, resLen = res.length; j < resLen; j++) {
+          if (array[i].id === res[j].id && array[i].price === res[j].price) {
+            break
+          }
+        }
+        // 如果array[i]是唯一的，那么执行完循环，j等于resLen
+        if (j === resLen) {
+          res.push(array[i])
+        }
+      }
+      return res
     },
+    setMonthPrescription(month_prescriptions) {
+      console.log(month_prescriptions)
+      let drug_month_prescriptions = {
+        advices: []
+      }
+      let drug_ids = []
+      let project_month_prescriptions = {
+        project: []
+
+      }
+      let project_ids = []
+
+      let addition_month_prescriptions = {
+        addition: []
+
+      }
+      let additions_ids = []
+
+      for (let i = 0; i < month_prescriptions.length; i++) {
+        if (month_prescriptions[i].type == 1) { //药品
+          for (let a = 0; a < month_prescriptions[i].advices.length; a++) {
+            let obj = {
+              id: month_prescriptions[i].advices[a].drug_id,
+              price: month_prescriptions[i].advices[a].price
+
+            }
+            drug_ids.push(obj)
+            drug_month_prescriptions.advices.push(month_prescriptions[i].advices[a])
+          }
+
+        } else if (month_prescriptions[i].type == 2) { //项目
+          for (let a = 0; a < month_prescriptions[i].project.length; a++) {
+            let obj = {
+              id: month_prescriptions[i].project[a].project_id,
+              price: month_prescriptions[i].project[a].price
+
+            }
+            project_ids.push(obj)
+            project_month_prescriptions.project.push(month_prescriptions[i].project[a])
+          }
+        }
+        //附加收费
+        for (let a = 0; a < month_prescriptions[i].addition.length; a++) {
+          let obj = {
+            id: month_prescriptions[i].addition[a].item_id,
+            price: month_prescriptions[i].addition[a].price
+
+          }
+          additions_ids.push(obj)
+          addition_month_prescriptions.addition.push(month_prescriptions[i].addition[a])
+
+        }
+
+      }
+
+      drug_ids = this.unique(drug_ids)
+      project_ids= this.unique(project_ids)
+      additions_ids= this.unique(additions_ids)
+
+
+
+
+
+      for (let i = 0; i < drug_ids.length; i++) {
+        let obj = {}
+        let count = 0
+        for (let a = 0; a < drug_month_prescriptions.advices.length; a++) {
+          if (drug_ids[i].price == drug_month_prescriptions.advices[a].price && drug_ids[i].id ==  drug_month_prescriptions.advices[a].drug_id) {
+            obj['name'] = drug_month_prescriptions.advices[a].advice_name
+            obj['statistical_classification'] = ''
+            obj['type'] = 1
+            obj['single_dose'] = drug_month_prescriptions.advices[a].single_dose
+            obj['delivery_way'] = drug_month_prescriptions.advices[a].delivery_way
+            obj['execution_frequency'] = drug_month_prescriptions.advices[a].execution_frequency
+            obj['day'] = drug_month_prescriptions.advices[a].day
+            obj['prescribing_number_unit'] = drug_month_prescriptions.advices[a].prescribing_number_unit
+            obj['remark'] = drug_month_prescriptions.advices[a].remark
+            obj['price'] = parseFloat(drug_month_prescriptions.advices[a].price)
+            count = count + drug_month_prescriptions.advices[a].prescribing_number
+
+          }
+        }
+        obj['count'] = count
+        this.tableData.push(obj)
+      }
+
+      for (let i = 0; i < project_ids.length; i++) {
+        let obj = {}
+        let count = 0
+        for (let a = 0; a < project_month_prescriptions.project.length; a++) {
+          if (project_ids[i].price == project_month_prescriptions.project[a].price &&project_ids[i].id == project_month_prescriptions.project[a].project_id ) {
+            obj['name'] = project_month_prescriptions.project[a].project.project_name
+            obj['statistical_classification'] = ''
+            obj['single_dose'] = project_month_prescriptions.project[a].single_dose
+            obj['delivery_way'] = project_month_prescriptions.project[a].delivery_way
+            obj['execution_frequency'] = project_month_prescriptions.project[a].execution_frequency
+            obj['day'] = project_month_prescriptions.project[a].day
+            obj['single_dose_unit'] = project_month_prescriptions.project[a].unit
+            obj['prescribing_number_unit'] = project_month_prescriptions.project[a].unit
+            count = count + project_month_prescriptions.project[a].count
+            obj['price'] = parseFloat(project_month_prescriptions.project[a].price)
+            obj['remark'] = project_month_prescriptions.project[a].remark
+            obj['type'] = 2
+
+
+          }
+        }
+        obj['count'] = count
+        this.tableData.push(obj)
+
+      }
+
+      for (let i = 0; i < additions_ids.length; i++) {
+        let obj = {}
+        let count = 0
+        console.log(addition_month_prescriptions.addition)
+        if (addition_month_prescriptions.addition) {
+          for (let a = 0; a < addition_month_prescriptions.addition.length; a++) {
+            if (additions_ids[i].price == addition_month_prescriptions.addition[a].price &&additions_ids[i].id == addition_month_prescriptions.addition[a].item_id) {
+              obj['item_name'] = addition_month_prescriptions.addition[a].item_name
+              count = count + addition_month_prescriptions.addition[a].count
+              obj['price'] = parseFloat(addition_month_prescriptions.addition[a].price)
+            }
+          }
+          obj['count'] = count
+          this.additions.push(obj)
+
+        }
+      }
+
+    },
+
     GetOrderDetail(){
       let params={
         number:this.$route.query.number,
@@ -240,50 +463,56 @@ export default {
           this.prescriptions = []
           this.tableData = []
 
-          for (let i = 0; i < response.data.data.prescription.length; i++) {
-            var prescription = response.data.data.prescription[i]
-
-
-            for (let b = 0; b < prescription.advices.length; b++) {
-              let obj = {
-                name: prescription.advices[b].advice_name,
-                statistical_classification:"",
-                type:1,
-                single_dose: prescription.advices[b].single_dose,
-                delivery_way: prescription.advices[b].delivery_way,
-                execution_frequency: prescription.advices[b].execution_frequency,
-                price: prescription.advices[b].price.toString(),
-                day: prescription.advices[b].day,
-                count:prescription.advices[b].prescribing_number.toString(),
-                remark: prescription.advices[b].remark,
-                single_dose_unit: prescription.advices[b].single_dose_unit,
-                prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
-
-              }
-              this.tableData.push(obj)
-            }
 
-            for (let b = 0; b < prescription.project.length; b++) {
-              let obj = {
-                name: prescription.project[b].project.project_name,
-                statistical_classification: prescription.project[b].project.statistical_classification,
-                single_dose: prescription.project[b].single_dose,
-                delivery_way: prescription.project[b].delivery_way,
-                execution_frequency: prescription.project[b].execution_frequency,
-                price: prescription.project[b].price,
-                day: prescription.project[b].day,
-                count: prescription.project[b].count.toString(),
-                remark: prescription.project[b].remark,
-                single_dose_unit:prescription.project[b].project.unit,
-                prescribing_number_unit:prescription.project[b].project.unit,
-                type:2,
-              }
-              this.tableData.push(obj)
-            }
-
-            for (let b = 0; b < prescription.addition.length; b++) {
-                this.additions.push( prescription.addition[b])
-            }
+          var prescription = response.data.data.prescription
+          this.prescriptions = prescription
+          this.setMonthPrescription(prescription)
+
+
+          // for (let i = 0; i < response.data.data.prescription.length; i++) {
+          //   var prescription = response.data.data.prescription[i]
+
+
+            // for (let b = 0; b < prescription.advices.length; b++) {
+            //   let obj = {
+            //     name: prescription.advices[b].advice_name,
+            //     statistical_classification:"",
+            //     type:1,
+            //     single_dose: prescription.advices[b].single_dose,
+            //     delivery_way: prescription.advices[b].delivery_way,
+            //     execution_frequency: prescription.advices[b].execution_frequency,
+            //     price: prescription.advices[b].price.toString(),
+            //     day: prescription.advices[b].day,
+            //     count:prescription.advices[b].prescribing_number.toString(),
+            //     remark: prescription.advices[b].remark,
+            //     single_dose_unit: prescription.advices[b].single_dose_unit,
+            //     prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
+            //
+            //   }
+            //   this.tableData.push(obj)
+            // }
+            //
+            // for (let b = 0; b < prescription.project.length; b++) {
+            //   let obj = {
+            //     name: prescription.project[b].project.project_name,
+            //     statistical_classification: prescription.project[b].project.statistical_classification,
+            //     single_dose: prescription.project[b].single_dose,
+            //     delivery_way: prescription.project[b].delivery_way,
+            //     execution_frequency: prescription.project[b].execution_frequency,
+            //     price: prescription.project[b].price,
+            //     day: prescription.project[b].day,
+            //     count: prescription.project[b].count.toString(),
+            //     remark: prescription.project[b].remark,
+            //     single_dose_unit:prescription.project[b].project.unit,
+            //     prescribing_number_unit:prescription.project[b].project.unit,
+            //     type:2,
+            //   }
+            //   this.tableData.push(obj)
+            // }
+            //
+            // for (let b = 0; b < prescription.addition.length; b++) {
+            //     this.additions.push( prescription.addition[b])
+            // }
 
 
 
@@ -298,7 +527,7 @@ export default {
             // this.prescriptions.push(obj)
             // this.curPrescriptions = this.prescriptions[0]
 
-          }
+          // }
           // this.tableData = response.data.data.order
 
         }

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -325,46 +325,70 @@
           }
         })
       },
-      setMonthPrescription(month_prescriptions){
+      setMonthPrescription(month_prescriptions) {
+        console.log("11111111")
+        console.log(month_prescriptions)
+
+
+        this.month_prescriptions = []
+
         let drug_month_prescriptions = {
-          advices:[],
+          advices: []
         }
-        let drug_ids=[]
-        let project_month_prescriptions ={
-          project:[],
+        let drug_ids = []
+        let project_month_prescriptions = {
+          project: []
 
         }
-        let project_ids=[]
+        let project_ids = []
 
-        let addition_month_prescriptions ={
-          addtions:[],
+        let addition_month_prescriptions = {
+          addition: []
 
         }
-        let additions_ids=[]
+        let additions_ids = []
 
+        for (let i = 0; i < month_prescriptions.length; i++) {
+          if (month_prescriptions[i].type == 1) { //药品
+            for (let a = 0; a < month_prescriptions[i].advices.length; a++) {
+              let obj = {
+                id: month_prescriptions[i].advices[a].drug_id,
+                price:month_prescriptions[i].advices[a].price,
 
-        for (let i = 0; i < month_prescriptions.length; i++){
-          if(month_prescriptions[i].type == 1){ //药品
-            for (let a = 0; a < month_prescriptions[i].advices.length; a++){
-              drug_ids.push(month_prescriptions[i].advices[a].drug_id)
+              }
+              drug_ids.push(obj)
               drug_month_prescriptions.advices.push(month_prescriptions[i].advices[a])
             }
 
-          }else if(month_prescriptions[i].type == 2){ //项目
-            for (let a = 0; a < month_prescriptions[i].project.length; a++){
-              project_ids.push(month_prescriptions[i].project[a].project_id)
+          } else if (month_prescriptions[i].type == 2) { //项目
+            for (let a = 0; a < month_prescriptions[i].project.length; a++) {
+              let obj = {
+                id: month_prescriptions[i].project[a].project_id,
+                price:month_prescriptions[i].project[a].price,
+
+              }
+              project_ids.push(obj)
               project_month_prescriptions.project.push(month_prescriptions[i].project[a])
             }
           }
           //附加收费
           for (let a = 0; a < month_prescriptions[i].addition.length; a++) {
-            additions_ids.push(month_prescriptions[i].addition[a].item_id)
-            addition_month_prescriptions.addtions.push(month_prescriptions[i].addition[a])
-          }
+            let obj = {
+              id: month_prescriptions[i].addition[a].item_id,
+              price:month_prescriptions[i].addition[a].price,
 
-        }
+            }
+            additions_ids.push(obj)
+            addition_month_prescriptions.addition.push(month_prescriptions[i].addition[a])
 
+          }
 
+        }
+        console.log("00000000000000")
+        console.log(drug_ids)
+        console.log(project_ids)
+        console.log(additions_ids)
+        console.log("00000000000000")
 
 
         const obj = {}
@@ -372,119 +396,278 @@
         const obj2 = {}
 
         drug_ids = drug_ids.reduce((cur, next) => {
-          obj[next] ? '' : obj[next] = true && cur.push(next)
+          obj[next.price] ? '' : obj[next.price] = true && cur.push(next)
           return cur
         }, []) // 设置cur默认类型为数组，并且初始值为空的数组
         project_ids = project_ids.reduce((cur, next) => {
-          obj1[next] ? '' : obj1[next] = true && cur.push(next)
+            obj[next.price] ? '' : obj[next.price] = true &&  cur.push(next)
           return cur
         }, []) // 设置cur默认类型为数组，并且初始值为空的数组
         additions_ids = additions_ids.reduce((cur, next) => {
-          obj2[next] ? '' : obj2[next] = true && cur.push(next)
+          obj[next.price] ? '' : obj[next.price] = true  && cur.push(next)
           return cur
         }, []) // 设置cur默认类型为数组，并且初始值为空的数组
 
 
 
+        let drugs = []
+        let projects = []
+        let additions = []
 
-
-        let drugs =[]
-        let projects =[]
-        let additions =[]
-
-
-        for (let i = 0; i < drug_ids.length; i++){
+        for (let i = 0; i < drug_ids.length; i++) {
           let obj = {}
-          let price = 0
           let count = 0
-          for (let a = 0; a < drug_month_prescriptions.advices.length; a++){
-            if(drug_ids[i] ==  drug_month_prescriptions.advices[a].drug_id){
+          for (let a = 0; a < drug_month_prescriptions.advices.length; a++) {
+            if (drug_ids[i].price == drug_month_prescriptions.advices[a].price) {
               obj['drug_name'] = drug_month_prescriptions.advices[a].advice_name
               obj['single_dose'] = drug_month_prescriptions.advices[a].single_dose
               obj['delivery_way'] = drug_month_prescriptions.advices[a].delivery_way
               obj['execution_frequency'] = drug_month_prescriptions.advices[a].execution_frequency
               obj['day'] = drug_month_prescriptions.advices[a].day
               // obj['prescribing_number'] =  obj['prescribing_number']  + drug_month_prescriptions.advices[a].prescribing_number
-              obj['prescribing_number_unit'] =  drug_month_prescriptions.advices[a].prescribing_number_unit
-              obj['medical_insurance_number'] =  drug_month_prescriptions.advices[a].drug.medical_insurance_number
-              obj['id'] =  drug_month_prescriptions.advices[a].drug_id
+              obj['prescribing_number_unit'] = drug_month_prescriptions.advices[a].prescribing_number_unit
+              obj['medical_insurance_number'] = drug_month_prescriptions.advices[a].drug.medical_insurance_number
+              obj['id'] = drug_month_prescriptions.advices[a].drug_id
               // obj['retail_price'] = obj['retail_price'] +  drug_month_prescriptions.advices[a].drug.retail_price
-
-
-              count = count +  drug_month_prescriptions.advices[a].prescribing_number
-              price = price +   drug_month_prescriptions.advices[a].price
+              obj['retail_price'] = parseFloat(drug_month_prescriptions.advices[a].price)
+              count = count + drug_month_prescriptions.advices[a].prescribing_number
 
             }
           }
-          obj['retail_price'] = price
           obj['prescribing_number'] = count
           drugs.push(obj)
         }
 
-
-
-
-        for (let i = 0; i < project_ids.length; i++){
+        for (let i = 0; i < project_ids.length; i++) {
           let obj = {}
-          let price = 0
           let count = 0
-          for (let a = 0; a < project_month_prescriptions.project.length; a++){
-            if(project_ids[i] ==  project_month_prescriptions.project[a].project_id){
+          for (let a = 0; a < project_month_prescriptions.project.length; a++) {
+            if (project_ids[i].price == project_month_prescriptions.project[a].price) {
               obj['project_name'] = project_month_prescriptions.project[a].project.project_name
               obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification
               obj['single_dose'] = project_month_prescriptions.project[a].single_dose
               obj['delivery_way'] = project_month_prescriptions.project[a].delivery_way
               obj['execution_frequency'] = project_month_prescriptions.project[a].execution_frequency
               obj['number_days'] = project_month_prescriptions.project[a].day
-              obj['medical_code'] =  project_month_prescriptions.project[a].project.medical_code
-              obj['unit'] =  project_month_prescriptions.project[a].unit
-              obj['project_id'] =  project_month_prescriptions.project[a].project_id
-              count = count +  project_month_prescriptions.project[a].count
-              price = price +   project_month_prescriptions.project[a].price
+              obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code
+              obj['unit'] = project_month_prescriptions.project[a].unit
+              obj['project_id'] = project_month_prescriptions.project[a].project_id
+              count = count + project_month_prescriptions.project[a].count
+              // price = price + project_month_prescriptions.project[a].price
+              obj['price'] = parseFloat(project_month_prescriptions.project[a].price)
+
             }
           }
-          obj['price'] = price
           obj['total'] = count
           projects.push(obj)
         }
 
-
-        for (let i = 0; i < additions_ids.length; i++){
+        for (let i = 0; i < additions_ids.length; i++) {
           let obj = {}
-          let price = 0
           let count = 0
-          for (let a = 0; a < addition_month_prescriptions.addition.length; a++){
-            if(project_ids[i] ==  addition_month_prescriptions.addition[a].item_id){
-              obj['item_name'] = addition_month_prescriptions.addition[a].item_name
-              obj['id'] = addition_month_prescriptions.addition[a].id
-              obj['item_id'] =  addition_month_prescriptions.addition[a].item_id
-              count = count +  addition_month_prescriptions.addition[a].count
-              price = price +   addition_month_prescriptions.addition[a].price
+          console.log(addition_month_prescriptions.addition)
+          if (addition_month_prescriptions.addition) {
+            for (let a = 0; a < addition_month_prescriptions.addition.length; a++) {
+              if (project_ids[i].price == addition_month_prescriptions.addition[a].price) {
+                obj['item_name'] = addition_month_prescriptions.addition[a].item_name
+                obj['id'] = addition_month_prescriptions.addition[a].id
+                obj['item_id'] = addition_month_prescriptions.addition[a].item_id
+                count = count + addition_month_prescriptions.addition[a].count
+                obj['price'] = parseFloat(addition_month_prescriptions.addition[a].price)
+              }
             }
+            obj['count'] = count
+            additions.push(obj)
           }
-          obj['price'] = price
-          obj['count'] = count
-          additions.push(obj)
         }
 
+        console.log(drugs)
+        console.log(projects)
+        console.log(additions)
 
         let p1 = {
           name: '处方' + 1,
           advices: drugs,
           project: [],
-          type:1,
-          addition: additions,
+          type: 1,
+          addition: additions
         }
         let p2 = {
           name: '处方' + 2,
-          type:2,
+          type: 2,
           project: projects,
           advices: [],
+          addition: []
+
         }
+
         this.month_prescriptions.push(p1)
         this.month_prescriptions.push(p2)
 
+        this.curMonthPrescriptions = this.month_prescriptions[0]
+
       },
+
+      // setMonthPrescription(month_prescriptions){
+      //   let drug_month_prescriptions = {
+      //     advices:[],
+      //   }
+      //   let drug_ids=[]
+      //   let project_month_prescriptions ={
+      //     project:[],
+      //
+      //   }
+      //   let project_ids=[]
+      //
+      //   let addition_month_prescriptions ={
+      //     addtions:[],
+      //
+      //   }
+      //   let additions_ids=[]
+      //
+      //
+      //   for (let i = 0; i < month_prescriptions.length; i++){
+      //     if(month_prescriptions[i].type == 1){ //药品
+      //       for (let a = 0; a < month_prescriptions[i].advices.length; a++){
+      //         drug_ids.push(month_prescriptions[i].advices[a].drug_id)
+      //         drug_month_prescriptions.advices.push(month_prescriptions[i].advices[a])
+      //       }
+      //
+      //     }else if(month_prescriptions[i].type == 2){ //项目
+      //       for (let a = 0; a < month_prescriptions[i].project.length; a++){
+      //         project_ids.push(month_prescriptions[i].project[a].project_id)
+      //         project_month_prescriptions.project.push(month_prescriptions[i].project[a])
+      //       }
+      //     }
+      //     //附加收费
+      //     for (let a = 0; a < month_prescriptions[i].addition.length; a++) {
+      //       additions_ids.push(month_prescriptions[i].addition[a].item_id)
+      //       addition_month_prescriptions.addtions.push(month_prescriptions[i].addition[a])
+      //     }
+      //
+      //   }
+      //
+      //
+      //
+      //
+      //   const obj = {}
+      //   const obj1 = {}
+      //   const obj2 = {}
+      //
+      //   drug_ids = drug_ids.reduce((cur, next) => {
+      //     obj[next] ? '' : obj[next] = true && cur.push(next)
+      //     return cur
+      //   }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+      //   project_ids = project_ids.reduce((cur, next) => {
+      //     obj1[next] ? '' : obj1[next] = true && cur.push(next)
+      //     return cur
+      //   }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+      //   additions_ids = additions_ids.reduce((cur, next) => {
+      //     obj2[next] ? '' : obj2[next] = true && cur.push(next)
+      //     return cur
+      //   }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+      //
+      //
+      //
+      //
+      //
+      //   let drugs =[]
+      //   let projects =[]
+      //   let additions =[]
+      //
+      //
+      //   for (let i = 0; i < drug_ids.length; i++){
+      //     let obj = {}
+      //     let price = 0
+      //     let count = 0
+      //     for (let a = 0; a < drug_month_prescriptions.advices.length; a++){
+      //       if(drug_ids[i] ==  drug_month_prescriptions.advices[a].drug_id){
+      //         obj['drug_name'] = drug_month_prescriptions.advices[a].advice_name
+      //         obj['single_dose'] = drug_month_prescriptions.advices[a].single_dose
+      //         obj['delivery_way'] = drug_month_prescriptions.advices[a].delivery_way
+      //         obj['execution_frequency'] = drug_month_prescriptions.advices[a].execution_frequency
+      //         obj['day'] = drug_month_prescriptions.advices[a].day
+      //         // obj['prescribing_number'] =  obj['prescribing_number']  + drug_month_prescriptions.advices[a].prescribing_number
+      //         obj['prescribing_number_unit'] =  drug_month_prescriptions.advices[a].prescribing_number_unit
+      //         obj['medical_insurance_number'] =  drug_month_prescriptions.advices[a].drug.medical_insurance_number
+      //         obj['id'] =  drug_month_prescriptions.advices[a].drug_id
+      //         // obj['retail_price'] = obj['retail_price'] +  drug_month_prescriptions.advices[a].drug.retail_price
+      //
+      //
+      //         count = count +  drug_month_prescriptions.advices[a].prescribing_number
+      //         price = price +   drug_month_prescriptions.advices[a].price
+      //
+      //       }
+      //     }
+      //     obj['retail_price'] = price
+      //     obj['prescribing_number'] = count
+      //     drugs.push(obj)
+      //   }
+      //
+      //
+      //
+      //
+      //   for (let i = 0; i < project_ids.length; i++){
+      //     let obj = {}
+      //     let price = 0
+      //     let count = 0
+      //     for (let a = 0; a < project_month_prescriptions.project.length; a++){
+      //       if(project_ids[i] ==  project_month_prescriptions.project[a].project_id){
+      //         obj['project_name'] = project_month_prescriptions.project[a].project.project_name
+      //         obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification
+      //         obj['single_dose'] = project_month_prescriptions.project[a].single_dose
+      //         obj['delivery_way'] = project_month_prescriptions.project[a].delivery_way
+      //         obj['execution_frequency'] = project_month_prescriptions.project[a].execution_frequency
+      //         obj['number_days'] = project_month_prescriptions.project[a].day
+      //         obj['medical_code'] =  project_month_prescriptions.project[a].project.medical_code
+      //         obj['unit'] =  project_month_prescriptions.project[a].unit
+      //         obj['project_id'] =  project_month_prescriptions.project[a].project_id
+      //         count = count +  project_month_prescriptions.project[a].count
+      //         price = price +   project_month_prescriptions.project[a].price
+      //       }
+      //     }
+      //     obj['price'] = price
+      //     obj['total'] = count
+      //     projects.push(obj)
+      //   }
+      //
+      //
+      //   for (let i = 0; i < additions_ids.length; i++){
+      //     let obj = {}
+      //     let price = 0
+      //     let count = 0
+      //     for (let a = 0; a < addition_month_prescriptions.addition.length; a++){
+      //       if(project_ids[i] ==  addition_month_prescriptions.addition[a].item_id){
+      //         obj['item_name'] = addition_month_prescriptions.addition[a].item_name
+      //         obj['id'] = addition_month_prescriptions.addition[a].id
+      //         obj['item_id'] =  addition_month_prescriptions.addition[a].item_id
+      //         count = count +  addition_month_prescriptions.addition[a].count
+      //         price = price +   addition_month_prescriptions.addition[a].price
+      //       }
+      //     }
+      //     obj['price'] = price
+      //     obj['count'] = count
+      //     additions.push(obj)
+      //   }
+      //
+      //
+      //   let p1 = {
+      //     name: '处方' + 1,
+      //     advices: drugs,
+      //     project: [],
+      //     type:1,
+      //     addition: additions,
+      //   }
+      //   let p2 = {
+      //     name: '处方' + 2,
+      //     type:2,
+      //     project: projects,
+      //     advices: [],
+      //   }
+      //   this.month_prescriptions.push(p1)
+      //   this.month_prescriptions.push(p2)
+      //
+      // },
       getList() {
         let params = {
           'record_date': this.record_date,

src/xt_pages/outpatientRegistration/registrationHistory.vue

@@ -102,10 +102,10 @@
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="操作" width="180">
                     <template slot-scope="scope">
-                      <el-button size="mini" type="primary" v-if="scope.row.record_date < startUnix" :disabled="true">已过号</el-button> 
-                      <el-button size="mini" type="primary" v-if="scope.row.is_return == 1 && scope.row.record_date >= startUnix" @click ="toReturnPatient(scope.row.id)">退号</el-button> 
+                      <el-button size="mini" type="primary" v-if=" scope.row.order.order_status == 0 && scope.row.record_date < startUnix" :disabled="true">已过号</el-button>
+                      <el-button size="mini" type="primary" v-if="scope.row.is_return == 1 && scope.row.record_date >= startUnix && scope.row.order.order_status != 2" @click ="toReturnPatient(scope.row.id)">退号</el-button>
                       <el-button size="mini" type="primary" v-if="scope.row.record_date == startUnix && scope.row.is_return == 2" :disabled="true">已退号</el-button>
-                      <el-button size="mini" type="primary" v-if="scope.row.record_date == startUnix && scope.row.is_return == 3" :disabled="true">已就诊</el-button>  
+                      <el-button size="mini" type="primary" v-if="scope.row.record_date == startUnix && scope.row.is_return == 3" :disabled="true">已就诊</el-button>
                       <el-button size="mini" type="primary" @click="open(scope.row)">详情</el-button>
                     </template>
                 </el-table-column>
@@ -187,11 +187,11 @@
                     <el-form-item label="科室："  prop="department" :validate-event="is_Name">
                       <div>{{ getDepartMent(form.departments) }}</div>
                     </el-form-item>
-                    <!-- <el-form-item label="是否需要工本费："> 
+                    <!-- <el-form-item label="是否需要工本费：">
                       <div v-if="form.is_need_cost_of_production == 1">是</div>
                       <div v-else>否</div>
                     </el-form-item> -->
-                    
+
                     <el-form-item label="挂号费：">
                       <div>{{ form.register_cost }}</div>
                     </el-form-item>
@@ -297,7 +297,7 @@ export default {
               value: 6,
               label: "港澳地区身份证"
             }],
-            settlement: 
+            settlement:
             [
               {value: 1,label: '医保'},
               {value: 2,label: '自费'},
@@ -346,7 +346,7 @@ export default {
               value: 5,
               label: "专家"
             }],
-            
+
             tablePatient:[],
             creator:"",
             startUnix:'',
@@ -364,16 +364,16 @@ export default {
         //         item.create_time = moment(item.create_time * 1000).format('YYYY-MM-DD')
         //         arr.push(item)
         //     }
-            
+
         // })
         // this.tableData = arr
        //获取所有挂号号的患者
 
        this.creator = this.$store.getters.xt_user.user.user_name
        var today = moment().startOf('day').format('YYYY-MM-DD')
-       var todayUnix = Date.parse(today)/1000 
+       var todayUnix = Date.parse(today)/1000
        this.startUnix = todayUnix - 28800
-      
+
        this.getlist()
        this.getDictionaryDataConfig()
     },
@@ -444,7 +444,7 @@ export default {
                 this.doctorList = doctor
              }
           })
- 
+
         },
         getDepartMent(id){
           var name = ""
@@ -459,7 +459,7 @@ export default {
           var user_name = ""
           for(let i=0;i<this.doctorList.length;i++){
             if(id == this.doctorList[i].admin_user_id){
-               user_name = this.doctorList[i].user_name 
+               user_name = this.doctorList[i].user_name
             }
           }
           return user_name
@@ -504,7 +504,7 @@ export default {
           key = keyword
         }
         let searchArray = []
-       
+
         var params = {
            keyword:key
         }
@@ -519,7 +519,7 @@ export default {
         return searchArray
       },
 
-      handleSelect(val){   
+      handleSelect(val){
         this.search_input = val.name
         this.getlist()
       },
@@ -585,7 +585,7 @@ export default {
         })
         return str
       },
-      
+
       getBanlance(id){
         var label = ""
          for(let i=0;i<this.settlement.length;i++){

src/xt_pages/qcd/officesControlAnalysis/project.vue

@@ -830,7 +830,7 @@ export default {
            four_qurter_end:four_qurter_end,
            bloodType:this.bloodType
          }
-        //  console.log("params",params)
+         // console.log("params",params)
        getBloodPressureList(params).then(response=>{
           if(response.data.state == 1){
 

src/xt_pages/role/departManage.vue

@@ -69,7 +69,7 @@
           </template>
         </el-table-column>
       </el-table>
-      
+
 
         <el-pagination
             @size-change="handleSizeChange"
@@ -84,9 +84,9 @@
          >
         </el-pagination>
 
-     
-       
-      
+
+
+
       <el-dialog
         title="添加科室"
         :visible.sync="dialogVisible"
@@ -97,14 +97,14 @@
                  <el-col :span="10">
                    <el-form-item label="科室名称:">
                       <el-input v-model="form.name" style="width:200px"></el-input>
-                  </el-form-item> 
+                  </el-form-item>
                  </el-col>
              </el-row >
              <el-row :span="24" >
                  <el-col :span="12">
                    <el-form-item label="医保科室编号:">
                       <el-input v-model="form.number"  style="width:200px"></el-input>
-                  </el-form-item> 
+                  </el-form-item>
                  </el-col>
              </el-row>
           </el-form>
@@ -115,7 +115,7 @@
         </span>
     </el-dialog>
 
-     
+
       <el-dialog
         title="编辑科室"
         :visible.sync="editDialogVisible"
@@ -126,14 +126,14 @@
                  <el-col :span="10">
                    <el-form-item label="科室名称:">
                       <el-input v-model="form.name" style="width:200px"></el-input>
-                  </el-form-item> 
+                  </el-form-item>
                  </el-col>
              </el-row >
              <el-row :span="24" >
                  <el-col :span="12">
                    <el-form-item label="医保科室编号:">
                       <el-input v-model="form.number"  style="width:200px"></el-input>
-                  </el-form-item> 
+                  </el-form-item>
                  </el-col>
              </el-row>
           </el-form>
@@ -161,7 +161,7 @@ export default {
     return {
       crumbs: [
         { path: false, name: "管理中心" },
-        { path: false, name: "部门管理" }
+        { path: false, name: "科室管理" }
       ],
       tableData:[],
       dialogVisible:false,
@@ -201,7 +201,7 @@ export default {
     SaveDepartment(formName){
          var params = {
             name:this.form.name,
-            number:this.form.number, 
+            number:this.form.number,
          }
        this.$refs[formName].validate((valid)=>{
           SaveDepartment(params).then(response=>{
@@ -246,12 +246,12 @@ export default {
          }
       })
     },
-    
+
     UpdatedDepartment(formName){
          var params = {
             id:this.form.id,
             name:this.form.name,
-            number:this.form.number, 
+            number:this.form.number,
          }
        this.$refs[formName].validate((valid)=>{
           UpdatedDepartment(params).then(response=>{
@@ -265,7 +265,7 @@ export default {
           })
        })
     },
-    
+
    DeleteDepartment(id,index){
       this.$confirm("确认删除此部门吗?", "删除", {
         confirmButtonText: "确 定",
@@ -282,13 +282,13 @@ export default {
        });
      }).catch(() => {});
     }
-  
-    
+
+
   },
-    
-  
- 
- 
+
+
+
+
 };
 </script>
 

src/xt_pages/sign/lineUp.vue

@@ -398,6 +398,7 @@ export default {
                     }else if(res.channel == 'patientCallInfo'){
                         console.log(999999999999,res.data)
                         let second = res.data.second
+                        let newType = res.data.type
                     
                         console.log('执行几次',this.voiceNum)
                         if(this.voice == true){
@@ -420,7 +421,7 @@ export default {
                                     this.voice = true 
                                     let obj = {
                                         cmd: "queue/callreturn",
-                                        data: {patient_id:this.patient_id},
+                                        data: {patient_id:this.patient_id,type:newType},
                                     };
                                     this.websocketSend(obj)
                                     clearInterval(this.voiceTime);

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -421,7 +421,7 @@
         this.isVisibility = true
       }, 
       comfirm: function(val) {
-
+        console.log("Val2222222",val)
         this.$refs.dialog.hide()
         if (val.selectedGoodInfo.length > 0) {
           for (let i = val.selectedGoodInfo.length - 1; i >= 0; i--) {
@@ -429,7 +429,7 @@
               this.recordInfo.recordData[this.currentIndex].drug_id = val.selectedGoodInfo[i].id
               this.recordInfo.recordData[this.currentIndex].price = val.selectedGoodInfo[i].last_price.toString()
               this.recordInfo.recordData[this.currentIndex].retail_price = val.selectedGoodInfo[i].retail_price.toString()
-              // this.recordInfo.recordData[this.currentIndex].min_unit = val.selectedGoodInfo[i].min_unit
+              this.recordInfo.recordData[this.currentIndex].min_unit = val.selectedGoodInfo[i].min_unit
             } else {
               const tempForm = {}
               tempForm["id"] = 0;
@@ -443,7 +443,7 @@
               tempForm['remark'] = ''
               tempForm['dealer'] = ''
               tempForm['manufacturer'] = ''
-              tempForm['min_unit']=''
+              tempForm['min_unit']= val.selectedGoodInfo[i].min_unit
               this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
             }
           }
@@ -487,7 +487,9 @@
           loading.close()
 
         })
-      }, typeName: function(drug_id) {
+      },
+       typeName: function(drug_id) {
+        
         let name = "";
         for (let i = 0; i < this.goodInfo.length; i++) {
           if (this.goodInfo[i].id == drug_id) {
@@ -504,7 +506,8 @@
           }
         }
         return name;
-      }, handleEdit: function(index, row) {
+      },
+       handleEdit: function(index, row) {
         const tempObj = {}
         tempObj['drug_id'] = 0
         tempObj['number'] = ''
@@ -516,6 +519,7 @@
         tempObj['remark'] = ''
         tempObj['dealer'] = ''
         tempObj['manufacturer'] = ''
+        tempObj['min_unit'] = ''
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
         if (this.recordInfo.recordData.length <= 1) {

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -341,6 +341,7 @@ export default {
             tempForm['price'] =  val.selectedGoodInfo[i].last_price.toString()
             tempForm['count'] = ''
             tempForm['remark'] = ''
+            tempForm['min_unit'] = val.selectedGoodInfo[i].min_unit
             this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
           }
         }
@@ -417,6 +418,7 @@ export default {
       });
     },
     typeName: function(drug_id) {
+    
       let name = "";
       for (let i = 0; i < this.goodInfo.length; i++) {
         if (this.goodInfo[i].id == drug_id) {
@@ -425,7 +427,8 @@ export default {
         }
       }
       return name;
-    }, specificationName: function(drug_id) {
+    },
+     specificationName: function(drug_id) {
       let name = "";
       for (let i = 0; i < this.goodInfo.length; i++) {
         if (this.goodInfo[i].id == drug_id) {
@@ -441,7 +444,7 @@ export default {
       tempObj["price"] = "";
       tempObj["retail_price"] = "";
       tempObj["remark"] = "";
-
+      tempObj["min_unit"] = "";
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -469,6 +472,7 @@ export default {
       }
     },
     showDialog(index, row) {
+      
       const loading = this.$loading({
         lock: true,
         text: 'Loading',
@@ -594,7 +598,7 @@ export default {
     tempObj["return_count"] = 0;
     tempObj["price"] = "";
     tempObj["remark"] = "";
-
+    tempObj["min_unit"] = "";
 
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();

src/xt_pages/stock/drugs/drugsStockDialog/index.vue

@@ -151,6 +151,7 @@
 
       },
       comfirm: function(formName) {
+       
         this.goodInfoTableData = []
         this.$emit('dialog-comfirm', this.getValue())
         this.$refs.multipleTable.clearSelection()
@@ -158,6 +159,7 @@
       },
       getValue: function() {
         this.multipleSelection = []
+        console.log("库存22222",this.propForm.goods)
         for (let i = 0; i < this.propForm.goods.length; i++) {
           for (let a = 0; a < this.propForm.goods[i].drug_specs.length; a++) {
                 if (this.propForm.goods[i].drug_specs[a].isSelected) {
@@ -170,7 +172,8 @@
         }
         console.log(obj)
         return obj
-      }, goodTypeSelect: function(id) {
+      },
+       goodTypeSelect: function(id) {
         this.tempGoodInfo = []
         this.goodInfo = []
         for (let i = 0; i < this.propForm.goodInfo.length; i++) {

src/xt_pages/stock/stockInOrderAdd.vue

@@ -475,6 +475,7 @@
         tempObj['remark'] = ''
         tempObj['dealer'] = ''
         tempObj['manufacturer'] = ''
+        tempObj['good_unit'] = ''
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
         if (this.recordInfo.recordData.length <= 1) {
@@ -496,7 +497,7 @@
         this.recordInfo.recordData = []
         getWarehouseInfoByOrdeNumber(params).then(response => {
           if (response.data.state != 0) {
-             console.log("8888888888mma",response.data.data.info)
+            
             for (let i = 0; i < response.data.data.info.length; i++) {
               this.recordInfo.recordData.push(response.data.data.info[i])
             }

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -463,7 +463,7 @@ export default {
       tempObj["count"] = "";
       tempObj["price"] = "";
       tempObj["remark"] = "";
-
+      tempObj["good_unit"] = "";
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {