1

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/router/modules/dialysis.js

@@ -89,28 +89,28 @@ export default {
     //     noCache: true
     //   }
     // },
-    // {
-    //   path: '/dialysis/dialysisParameters_print',
-    //   component: () => import('@/xt_pages/dialysis/dialysisParameters_print'),
-    //   hidden: true,
-    //   is_menu: false,
-    //   name: 'dialysisParameters_print',
-    //   meta: {
-    //     title: 'dialysisParameters_print',
-    //     noCache: true
-    //   }
-    // },
-    // {
-    //   path: '/dialysis/allSummary_print',
-    //   component: () => import('@/xt_pages/dialysis/allSummary_print'),
-    //   hidden: true,
-    //   is_menu: false,
-    //   name: 'allSummary_print',
-    //   meta: {
-    //     title: 'allSummary_print',
-    //     noCache: true
-    //   }
-    // },
+    {
+      path: '/dialysis/dialysisParameters_print',
+      component: () => import('@/xt_pages/dialysis/dialysisParameters_print'),
+      hidden: true,
+      is_menu: false,
+      name: 'dialysisParameters_print',
+      meta: {
+        title: 'dialysisParameters_print',
+        noCache: true
+      }
+    },
+    {
+      path: '/dialysis/allSummary_print',
+      component: () => import('@/xt_pages/dialysis/allSummary_print'),
+      hidden: true,
+      is_menu: false,
+      name: 'allSummary_print',
+      meta: {
+        title: 'allSummary_print',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/record/:id',
       component: () => import('@/xt_pages/dialysis/dialysisPage'),

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/dialysis/consumableDrugs.vue

@@ -8,9 +8,9 @@
                 <el-tab-pane label="透析耗材" name="1">
                     <consumables></consumables>
                 </el-tab-pane>
-                <el-tab-pane label="透析药品" name="second">
-                    <dialysis-drugs></dialysis-drugs>
-                </el-tab-pane>
+<!--                <el-tab-pane label="透析药品" name="second">-->
+<!--                    <dialysis-drugs></dialysis-drugs>-->
+<!--                </el-tab-pane>-->
                 <el-tab-pane label="透析参数" name="2">
                     <dialysis-parameters></dialysis-parameters>
                 </el-tab-pane>

src/xt_pages/dialysis/consumableDrugs_print.vue

@@ -8,9 +8,9 @@
                 <el-tab-pane label="透析耗材" name="first">
                     <consumables></consumables>
                 </el-tab-pane>
-                <el-tab-pane label="透析药品" name="second">
-                    <dialysis-drugs></dialysis-drugs>
-                </el-tab-pane>
+<!--                <el-tab-pane label="透析药品" name="second">-->
+<!--                    <dialysis-drugs></dialysis-drugs>-->
+<!--                </el-tab-pane>-->
                 <el-tab-pane label="透析参数" name="third">
                     <dialysis-parameters></dialysis-parameters>
                 </el-tab-pane>

src/xt_pages/outpatientCharges/allListPrint.vue

@@ -8,58 +8,274 @@
         icon="el-icon-printer"
         @click="printThisPage"
         type="primary"
-      >打印</el-button
+      >打印
+      </el-button
       >
     </template>
 
     <div class='dialysisPage' style="padding-top:40px;">
-      <printOne :info="info"></printOne>
+      <printOne :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
     </div>
   </div>
 </template>
 
 <script>
-  import print from "print-js";
-  import printOne from "./allListTemplate/printOne"
+  import { getHisOrderDetailCollect } from '@/api/his/his'
+  import { uParseTime } from '@/utils/tools'
+  import printOne from './allListTemplate/printOne'
+
   export default {
-    name: "allListPrint",
+    name: 'allListPrint',
     components: {
       printOne
     },
-    props:{
-      paramsObj:Object
+    props: {
+      paramsObj: Object
     },
     data() {
       return {
-      };
+        list: [],
+        patient: {},
+        order: {},
+        admin: {}
+      }
     },
 
     created() {
+      this.getInfo(this.paramsObj.id)
+
     },
-    methods:{
-        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
-            //   });
-            // }
-        },
+    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)
+              tempOrderInfo.push(obj)
+            }
+            this.list = tempOrderInfo
+            console.log(this.list)
+          }
+        })
+      }, 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_spec
+                obj['med_chrgitm_type'] = this.getType(details[a].med_chrgitm_type)
+                obj['price'] = parseFloat(details[a].pric)
+                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)
+                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>
@@ -189,21 +405,26 @@
     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;
   }
@@ -215,6 +436,7 @@
     font-size: 14px;
     border-collapse: collapse;
   }
+
   .table-box1 tr {
     border-bottom: 1px solid #000;
   }
@@ -222,21 +444,25 @@
 
 <style lang="scss">
 
-  .newContainer{
+  .newContainer {
+
   .dialysisPage::-webkit-scrollbar {
     height: 15px;
   }
 
-  .el-date-editor{
-  .el-input__inner{
-    padding-right:0px;
+  .el-date-editor {
+
+  .el-input__inner {
+    padding-right: 0px;
   }
+
   }
-  .el-table td, .el-table th{
+  .el-table td, .el-table th {
     text-align: center;
   }
+
   }
-  .newContainer::-webkit-scrollbar{
+  .newContainer::-webkit-scrollbar {
     height: 15px !important;
   }
 </style>

src/xt_pages/outpatientCharges/allListTemplate/printOne.vue

@@ -2,11 +2,12 @@
     <div id="allList-print" class="allList-print">
         <div class="allListTitle">翁源沅胜透析中心费用汇总</div>
         <div class="allListInfo">
-            <div>患者姓名：邓红平</div>
-            <div>透析号：21000022</div>
-            <div>性别：女</div>
-            <div>年龄：45  岁</div>
-            <div>日期：2020-11-22 至 2020-11-22</div>
+          <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>
@@ -17,28 +18,86 @@
                 <td style="width:10%">数量</td>
                 <td style="width:10%">金额(元)</td>
             </tr>
-            <template v-for='i in 2'>
-                <tr v-for="item in 8">
-                    <td style="width:10%">化验费</td>
-                    <td style="width:50%">血清葡萄糖测定（化学法或酶法）</td>
-                    <td style="width:10%">1</td>
-                    <td style="width:10%">23.00</td>
-                    <td style="width:10%">1次</td>
-                    <td style="width:10%">23.00</td>
+            <template v-for='item in list'>
+                <tr v-for="sub_item in item.details">
+                    <td style="width:10%">{{sub_item.med_chrgitm_type}}</td>
+                    <td style="width:50%">{{sub_item.name}}</td>
+                    <td style="width:10%">{{sub_item.spec}}</td>
+                    <td style="width:10%">{{(sub_item.price).toFixed(2)}}</td>
+                    <td style="width:10%">{{sub_item.count}}</td>
+                    <td style="width:10%">{{(sub_item.price * sub_item.count).toFixed(2)}}</td>
                 </tr>
                 <tr>
-                    <td colspan="6" style="text-align:right;">合计：212.22元</td>
+                    <td colspan="6" style="text-align:right;">合计：{{item.total}}元</td>
                 </tr>
             </template>
         </table>
         <div class="tableBottom">
-            <div class="tableBottomOne">制表人：指标人</div>
-            <div class="tableBottomOne">制表日期：2020-12-12 12:12:12</div>
-            <div class="tableBottomOne">总费用：12323.90元</div>
+          <div class="tableBottomOne">制表人：{{admin.user_name}}</div>
+          <div class="tableBottomOne">制表日期：{{ getNowTime()}}</div>
+          <div class="tableBottomOne">总费用：{{order.medfee_sumamt}}元</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 {};
+        }
+      },
+    },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
+
+      }
+
+    }
+  }
+
+
+</script>
 
 <style lang="scss" scoped>
 .allList-print{
@@ -80,4 +139,4 @@
 .tableBottomOne{
     margin-right: 40px;
 }
-</style>
+</style>

src/xt_pages/outpatientCharges/listPrint.vue

@@ -8,58 +8,171 @@
         icon="el-icon-printer"
         @click="printThisPage"
         type="primary"
-      >打印</el-button
+      >打印
+      </el-button
       >
     </template>
 
     <div class='dialysisPage' style="padding-top:40px;">
-      <printOne :info="info"></printOne>
+      <printOne :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
     </div>
   </div>
 </template>
 
 <script>
-  import print from "print-js";
-  import printOne from "./listTemplate/printOne"
+  import printOne from './listTemplate/printOne'
+  import { getHisOrderDetail } from '@/api/his/his'
+  import { uParseTime } from '@/utils/tools'
+
   export default {
-    name: "listPrint",
+    name: 'listPrint',
     components: {
       printOne
     },
-    props:{
-      paramsObj:Object
+    props: {
+      paramsObj: Object
     },
     data() {
       return {
-      };
+        list: [],
+        patient:{},
+        order:{},
+        admin:{},
+      }
     },
-
     created() {
+      this.getInfo(this.paramsObj.id)
     },
-    methods:{
-        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
-            //   });
-            // }
-        },
+
+    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_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>
@@ -189,21 +302,26 @@
     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;
   }
@@ -215,6 +333,7 @@
     font-size: 14px;
     border-collapse: collapse;
   }
+
   .table-box1 tr {
     border-bottom: 1px solid #000;
   }
@@ -222,21 +341,25 @@
 
 <style lang="scss">
 
-  .newContainer{
+  .newContainer {
+
   .dialysisPage::-webkit-scrollbar {
     height: 15px;
   }
 
-  .el-date-editor{
-  .el-input__inner{
-    padding-right:0px;
+  .el-date-editor {
+
+  .el-input__inner {
+    padding-right: 0px;
   }
+
   }
-  .el-table td, .el-table th{
+  .el-table td, .el-table th {
     text-align: center;
   }
+
   }
-  .newContainer::-webkit-scrollbar{
+  .newContainer::-webkit-scrollbar {
     height: 15px !important;
   }
 </style>

src/xt_pages/outpatientCharges/listTemplate/printOne.vue

@@ -1,78 +1,119 @@
 <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>患者姓名：邓红平</div>
-                <div>透析号：21000022</div>
-                <div>性别：女</div>
-                <div>年龄：45  岁</div>
-                <div>日期：2020-11-22 至 2020-11-22</div>
-            </div>
-            <table class="listTable" border="1">
-                <tr>
-                    <td style="width:19%">开方日期</td>
-                    <td style="width:10%">类别</td>
-                    <td style="width:35%">项目名称</td>
-                    <td style="width:10%">规格</td>
-                    <td style="width:10%">单价(元)</td>
-                    <td style="width:6%">数量</td>
-                    <td style="width:10%">金额(元)</td>
-                </tr>
-                <tr v-for="item in pageArr[index]">
-                    <td style="width:19%">2020-12-12 13:11</td>
-                    <td style="width:10%">化验费</td>
-                    <td style="width:35%">血清葡萄糖测定（化学法或酶法）</td>
-                    <td style="width:10%">1</td>
-                    <td style="width:10%">23.00</td>
-                    <td style="width:6%">1次</td>
-                    <td style="width:10%">23.00</td>
-                </tr>
-            </table>
-            <div class="tableBottom">
-                <div class="tableBottomOne">制表人：指标人</div>
-                <div class="tableBottomOne">制表日期：2020-12-12 12:12:12</div>
-                <div class="tableBottomOne">总费用：12323.90元</div>
-            </div>
+        <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:35%">项目名称</td>
+                <td style="width:10%">规格</td>
+                <td style="width:10%">单价(元)</td>
+                <td style="width:6%">数量</td>
+                <td style="width:10%">金额(元)</td>
+            </tr>
+            <tr v-for="item in list">
+                <td style="width:19%">{{item.p_time}}</td>
+                <td style="width:10%">{{item.med_chrgitm_type}}</td>
+                <td style="width:35%">{{item.name}}</td>
+                <td style="width:10%">{{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>
-export default {
+  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{
-            adviceLength:20,
             page:1,
             pageArr:[]
         }
     },
-    created(){
-        this.getPage()
-    },
     methods:{
-        getPage(){
+      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.adviceLength <= 13){
-                this.page = 1
-            }else if(this.adviceLength > 13){
-                this.page = parseInt(this.adviceLength / 13)
-                let num = this.adviceLength % 13
-                for (var i=0;i<this.page;i++){ 
-                    this.pageArr.push(13)
-                }
-                if(num != 0){
-                    this.pageArr.push(num)
-                }
+        if(this.list <= 13){
+            this.page = 1
+        }else if(this.list > 13){
+            this.page = parseInt(this.list / 13)
+            let num = this.list % 13
+            for (var i=0;i<this.page;i++){ 
+                this.pageArr.push(13)
+            }
+            if(num != 0){
+                this.pageArr.push(num)
             }
-            
-            
         }
+      }
+
     }
-}
-</script>
+  }
 
 
+</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;
@@ -113,4 +154,4 @@ export default {
 .tableBottomOne{
     margin-right: 40px;
 }
-</style>
+</style>

src/xt_pages/outpatientCharges/newStatementPrint.vue

@@ -13,7 +13,7 @@
     </template>
 
     <div class='dialysisPage' style="padding-top:40px;">
-      <printOne :info="info"></printOne>
+      <printOne :info="info" :p_admin="p_admin" :charge_admin="charge_admin"></printOne>
     </div>
   </div>
 </template>
@@ -57,6 +57,8 @@
         prescription_id:0,
         ids:'',
         info:null,
+        p_admin:{},
+        charge_admin:{},
       };
     },
     methods:{
@@ -157,6 +159,7 @@
           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) {
@@ -168,6 +171,10 @@
 
                 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

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -75,7 +75,7 @@
           </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" >退费
+                     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"
                     >退费
@@ -95,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>-->
 
@@ -114,6 +114,10 @@
           <!--&gt;查待遇-->
           <!--</el-button>-->
 
+          <!--<el-button  size="small" @click="query" type="primary"-->
+          <!--&gt;查询-->
+          <!--</el-button>-->
+
 
         </div>
 
@@ -464,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) {
@@ -1727,7 +1750,8 @@
 
           }
         })
-      }, setMonthPrescription(month_prescriptions) {
+      },
+      setMonthPrescription(month_prescriptions) {
         this.month_prescriptions = []
 
         let drug_month_prescriptions = {
@@ -1749,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 = []
@@ -1799,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
@@ -1823,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
@@ -1846,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
@@ -1862,10 +1884,6 @@
           }
         }
 
-        console.log(drugs)
-        console.log(projects)
-        console.log(additions)
-
         let p1 = {
           name: '处方' + 1,
           advices: drugs,
@@ -1889,6 +1907,21 @@
 
         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/statementTemplate/printOne.vue

@@ -1,251 +1,322 @@
 <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 == '21'">退休</td>
+        <td colspan="3" v-if="info.psn_type == '31'">离休</td>
+        <td colspan="3" v-if="info.psn_type == '32'">老红军</td>
+        <td colspan="3" v-if="info.psn_type == '33'">一至六级残废军人</td>
+        <td colspan="3" v-if="info.psn_type == '34'">医疗照顾人员</td>
+        <td colspan="3" v-if="info.psn_type == '41'">学龄前儿童</td>
+        <td colspan="3" v-if="info.psn_type == '42'">中小学生</td>
+        <td colspan="3" v-if="info.psn_type == '43'">大学生</td>
+        <td colspan="3" v-if="info.psn_type == '50'">成年居民（非从业）</td>
+        <td colspan="3" v-if="info.psn_type == '60'">老年居民</td>
+        <td colspan="3" v-if="info.psn_type == '91'">其他人员</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>
+
+      </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 +324,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

@@ -40,7 +40,11 @@
           <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
         </div>
         <div>
+<<<<<<< HEAD
           <el-popover
+=======
+        <el-popover
+>>>>>>> d3b7e304402742c1d1973613d211171842d623fe
             placement="bottom"
             width="210"
             trigger="click">
@@ -122,6 +126,7 @@
       <!--<statementPrint ref="print" :paramsObj='orderObj'></statementPrint>-->
     <new-statement-print ref="print" :paramsObj='orderObj'></new-statement-print>
     </el-dialog>
+<<<<<<< HEAD
     <el-dialog
       class="centerDialog"
       width="900px"
@@ -136,6 +141,9 @@
       :visible.sync="allListVisible">
       <allListPrint :paramsObj='paramsObj'></allListPrint>
     </el-dialog>
+=======
+
+>>>>>>> d3b7e304402742c1d1973613d211171842d623fe
 
 
   </div>
@@ -328,7 +336,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)

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">
@@ -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,16 @@ 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++) {
@@ -220,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
@@ -248,7 +297,23 @@ export default {
       if (tab == 'more') {
         return false
       }
-    },   setMonthPrescription(month_prescriptions) {
+    },  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: []
@@ -302,28 +367,11 @@ export default {
         }
 
       }
-      console.log(drug_ids)
-      console.log(project_ids)
-      console.log(additions_ids)
-
-
 
-      const obj = {}
-      const obj1 = {}
-      const obj2 = {}
+      drug_ids = this.unique(drug_ids)
+      project_ids= this.unique(project_ids)
+      additions_ids= this.unique(additions_ids)
 
-      drug_ids = drug_ids.reduce((cur, next) => {
-        obj[next.price] ? '' : obj[next.price] = true && cur.push(next)
-        return cur
-      }, []) // 设置cur默认类型为数组，并且初始值为空的数组
-      project_ids = project_ids.reduce((cur, next) => {
-        obj1[next.price] ? '' : obj1[next.price] = true && cur.push(next)
-        return cur
-      }, []) // 设置cur默认类型为数组，并且初始值为空的数组
-      additions_ids = additions_ids.reduce((cur, next) => {
-        obj2[next.price] ? '' : obj2[next.price] = true && cur.push(next)
-        return cur
-      }, []) // 设置cur默认类型为数组，并且初始值为空的数组
 
 
 
@@ -332,7 +380,7 @@ export default {
         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) {
+          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
@@ -355,7 +403,7 @@ export default {
         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) {
+          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
@@ -383,7 +431,7 @@ export default {
         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) {
+            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)

src/xt_pages/stock/stockOutOrder.vue

@@ -121,7 +121,7 @@
 
         <el-table-column label="操作" align="center" width="300px">
           <template slot-scope="scope">
-           
+
             <el-tooltip
               class="item"
               effect="dark"
@@ -215,7 +215,7 @@
          <el-row :gutter="12" style="margin-top: 10px">
           <el-table :data="warehousingOutInfo.warehousingOutData" :class="signAndWeighBoxPatients" style="width: 100%"
                     border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
-                  
+
           >
             <el-table-column min-width="35" align="center">
               <template slot="header" slot-scope="scope">
@@ -286,7 +286,7 @@
               <div style="color: #589ff8" @click="jump(scope.row.id)">使用明细</div>
               </template>
             </el-table-column>
-             
+
 
 
           </el-table>
@@ -308,7 +308,7 @@
       <div class="filter-container">
         <span style="font-size: 18px;color: #606266">商品使用明细</span>
       </div>
-     
+
       <div class="cell clearfix">
         <span style="width: 300px;color: #606266">商品类型: {{type_name}} </span>
         <span style="width: 300px;color: #606266">规格名称: {{specification_name}}</span>
@@ -365,12 +365,12 @@
       <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
     </span>
   </el-dialog>
-  
+
 
 
   <!-- 编辑 -->
-  
-  
+
+
   </div>
 </template>
 
@@ -414,7 +414,7 @@ export default {
       (nowDay < 10 ? "0" + nowDay : nowDay);
     this.GetConfigInfo();
     this.GetWarehouseOut();
-   
+
     this.fetchAllAdminUsers();
   },
   data() {
@@ -562,7 +562,7 @@ export default {
       } else {
         this.GetWarehouseOut();
       }
-      this.GetWarehouseOut();
+
     },
     endTimeChange(val) {
       var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
@@ -608,7 +608,7 @@ export default {
       }
     },
     handleEdit: function(index, row) {
-      
+
       this.$router.push({
         name: "stockOutDetail",
         query: { id: row.id, type: this.type,warehouse_out_time:row.warehouse_out_time }
@@ -706,19 +706,19 @@ export default {
         .catch(() => {});
     },
 
- 
 
-    
+
+
     //新增
-    handleSearch(id,row){ 
+    handleSearch(id,row){
       console.log("row2233r5",row)
       this.warehousingOutInfo.info = []
       this.warehousingOutInfo.warehousingOutData = []
       this.GetOrderDetailOne(id)
       this.GetTotalCount(row.warehouse_out_time)
-      
+
     },
-  
+
     //获取出库单详情数据
     GetOrderDetailOne(id) {
         const params = {
@@ -738,7 +738,7 @@ export default {
             // this.handleSpanTempArr()
           }
         })
-     }, 
+     },
 
       getTypeName: function(id) {
         let name = ''
@@ -775,19 +775,19 @@ export default {
             return this.manufacturer[i].manufacturer_name
           }
         }
-      }, 
+      },
 
     jump(id){
       this.userList = []
       this.GetOrderDetail(id)
-     
+
     },
 
      GetOrderDetail: function(order_id) {
         const params = {
           'id': order_id
         }
-      
+
         getWarehouseOutUser(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -815,7 +815,7 @@ export default {
       },
 
       editRecord(){
-     
+
       },
       deleteRecord(){
 
@@ -836,7 +836,7 @@ export default {
       },
 
      getOutStockCount(id){
-         var count = 0 
+         var count = 0
          for(let i=0;i<this.stockCount.length;i++){
             if(id == this.stockCount[i].good_id){
               count = this.stockCount[i].count